X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=projects%2Fmicrob2010%2Fmainboard%2Fmain.c;h=ea9d240d434364ba967648689821b4487d28e830;hb=81e4a9146e5c5ae192e66eb3f68076cd2a7abd0d;hp=8616303a10cf1e55ce53cb3f170a9a75374281e6;hpb=4f7bc6a1332aa9cd2ac3cf8f34bf990203cb03e7;p=aversive.git

diff --git a/projects/microb2010/mainboard/main.c b/projects/microb2010/mainboard/main.c
index 8616303..ea9d240 100755
--- a/projects/microb2010/mainboard/main.c
+++ b/projects/microb2010/mainboard/main.c
@@ -68,7 +68,10 @@
 #include "cs.h"
 #include "strat_base.h"
 #include "strat_db.h"
+#include "strat_avoid.h"
 #include "i2c_protocol.h"
+#include "beacon.h"
+
 
 /* 0 means "programmed"
  * ---- with 16 Mhz quartz
@@ -86,6 +89,7 @@ struct genboard gen;
 struct mainboard mainboard;
 volatile struct cobboard cobboard;
 volatile struct ballboard ballboard;
+volatile struct beaconboard beaconboard;
 
 #ifndef HOST_VERSION
 /***********************/
@@ -185,6 +189,11 @@ int main(void)
 	memset(&mainboard, 0, sizeof(mainboard));
 	mainboard.flags = DO_ENCODERS | DO_CS | DO_RS |
 		DO_POS | DO_POWER | DO_BD | DO_ERRBLOCKING;
+	ballboard.lcob = I2C_COB_NONE;
+	ballboard.rcob = I2C_COB_NONE;
+
+	beaconboard.oppx = I2C_OPPONENT_NOT_THERE;
+	beaconboard.posx = I2C_BEACON_NOT_FOUND;
 
 	/* UART */
 	uart_init();
@@ -282,10 +291,13 @@ int main(void)
 	/* TIME */
 	time_init(TIME_PRIO);
 
-#ifndef HOST_VERSION
 	/* sensors, will also init hardware adc */
 	sensor_init();
 
+	/* beacon */
+	beacon_init();
+
+#ifndef HOST_VERSION
 	/* start i2c slave polling */
 	scheduler_add_periodical_event_priority(i2c_poll_slaves, NULL,
 						8000L / SCHEDULER_UNIT, I2C_POLL_PRIO);
@@ -294,11 +306,10 @@ int main(void)
 	/* strat */
  	gen.logs[0] = E_USER_STRAT;
  	gen.log_level = 5;
-	strat_db_init();
 
 	/* strat-related event */
 	scheduler_add_periodical_event_priority(strat_event, NULL,
-						10000L / SCHEDULER_UNIT,
+						25000L / SCHEDULER_UNIT,
 						STRAT_PRIO);
 
 #ifndef HOST_VERSION
@@ -310,6 +321,8 @@ int main(void)
 
 	sei();
 
+	strat_db_init();
+
 	printf_P(PSTR("\r\n"));
 	printf_P(PSTR("Respect et robustesse.\r\n"));
 #ifndef HOST_VERSION