X-Git-Url: http://git.droids-corp.org/?p=aversive.git;a=blobdiff_plain;f=projects%2Fmicrob2010%2Fmainboard%2Fmain.h;h=ff86dd26798e929c8e840a16bea1b03a044849db;hp=53cfe69acbabc90b9181ec058f6a09f356e8c7d7;hb=4e7801883ed4076cb14b63a0571467747894c0f8;hpb=ebfaaedd491e61696cc93b353471be15408d23e4

diff --git a/projects/microb2010/mainboard/main.h b/projects/microb2010/mainboard/main.h
index 53cfe69..ff86dd2 100755
--- a/projects/microb2010/mainboard/main.h
+++ b/projects/microb2010/mainboard/main.h
@@ -19,6 +19,8 @@
  *
  */
 
+/* was mechboard in 2009 */
+
 #define LED_TOGGLE(port, bit) do {		\
 		if (port & _BV(bit))		\
 			port &= ~_BV(bit);	\
@@ -53,13 +55,13 @@
 #define LED1_OFF() 	cbi(PORTJ, 2)
 #define LED1_TOGGLE() 	LED_TOGGLE(PORTJ, 2)
 
-#define LED2_ON() 	sbi(PORTL, 7)
-#define LED2_OFF() 	cbi(PORTL, 7)
-#define LED2_TOGGLE() 	LED_TOGGLE(PORTL, 7)
+#define LED2_ON() 	sbi(PORTJ, 3)
+#define LED2_OFF() 	cbi(PORTJ, 3)
+#define LED2_TOGGLE() 	LED_TOGGLE(PORTJ, 3)
 
-#define LED3_ON() 	sbi(PORTJ, 3)
-#define LED3_OFF() 	cbi(PORTJ, 3)
-#define LED3_TOGGLE() 	LED_TOGGLE(PORTJ, 3)
+#define LED3_ON() 	sbi(PORTL, 7)
+#define LED3_OFF() 	cbi(PORTL, 7)
+#define LED3_TOGGLE() 	LED_TOGGLE(PORTL, 7)
 
 #define LED4_ON() 	sbi(PORTL, 6)
 #define LED4_OFF() 	cbi(PORTL, 6)
@@ -74,18 +76,19 @@
 #define MATCH_TIME 89
 
 /* decrease track to decrease angle */
-#define EXT_TRACK_MM 302.0188
+#define EXT_TRACK_MM 304.61875
 #define VIRTUAL_TRACK_MM EXT_TRACK_MM
 
-#define ROBOT_LENGTH 320
+#define ROBOT_HALF_LENGTH_FRONT 130
+#define ROBOT_HALF_LENGTH_REAR 120
 #define ROBOT_WIDTH 320
 
-/* it is a 2048 imps -> 8192 because we see 1/4 period
- * and diameter: 55mm -> perimeter 173mm 
- * 8192/173 -> 473 */
+/* it is a 1024 imps -> 4096 because we see 1/4 period
+ * and diameter: 55mm -> perimeter 134mm
+ * dist_imp_mm = 4096/134 x 10 -> 304 */
 /* increase it to go further */
-#define IMP_ENCODERS 2048
-#define WHEEL_DIAMETER_MM 55.0
+#define IMP_ENCODERS 1024
+#define WHEEL_DIAMETER_MM 42.9
 #define WHEEL_PERIM_MM (WHEEL_DIAMETER_MM * M_PI)
 #define IMP_COEF 10.
 #define DIST_IMP_MM (((IMP_ENCODERS*4) / WHEEL_PERIM_MM) * IMP_COEF)
@@ -118,7 +121,8 @@
 #define I2C_POLL_PRIO       20
 #define EEPROM_TIME_PRIO    10
 
-#define CS_PERIOD 5000L
+#define CS_PERIOD 5000L /* in microsecond */
+#define CS_HZ (1000000. / CS_PERIOD)
 
 #define NB_LOGS 4
 
@@ -166,6 +170,7 @@ struct mainboard {
 #define DO_BD       16
 #define DO_TIMER    32
 #define DO_POWER    64
+#define DO_ERRBLOCKING 128
 	uint8_t flags;                /* misc flags */
 
 	/* control systems */
@@ -198,15 +203,15 @@ struct cobboard {
 
 /* state of ballboard, synchronized through i2c */
 struct ballboard {
-	uint8_t mode;
+	volatile uint8_t mode;
 	uint8_t status;
 	uint8_t ball_count;
 };
 
 extern struct genboard gen;
 extern struct mainboard mainboard;
-extern struct cobboard cobboard;
-extern struct ballboard ballboard;
+extern volatile struct cobboard cobboard;
+extern volatile struct ballboard ballboard;
 
 /* start the bootloader */
 void bootloader(void);