X-Git-Url: http://git.droids-corp.org/?p=aversive.git;a=blobdiff_plain;f=projects%2Fmicrob2010%2Fmainboard%2Fstrat.h;h=ea2a6ecb878b64b6cecd1f617c5a21b243b2aa1c;hp=2fa2e5bacdeebd64ce08cb3488468a5cd463e346;hb=HEAD;hpb=28da5858ac871c626153f47566e968ecb05ff52b

diff --git a/projects/microb2010/mainboard/strat.h b/projects/microb2010/mainboard/strat.h
index 2fa2e5b..ea2a6ec 100644
--- a/projects/microb2010/mainboard/strat.h
+++ b/projects/microb2010/mainboard/strat.h
@@ -131,7 +131,7 @@
 #define TRAJ_FLAGS_SMALL_DIST (END_TRAJ|END_BLOCKING|END_INTR)
 
 /* default acc */
-#define ACC_DIST  16.
+#define ACC_DIST  12.
 #define ACC_ANGLE 16.
 
 /* default speeds */
@@ -153,7 +153,11 @@ struct strat_conf {
 	uint8_t opp_orange;
 	uint8_t orphan_tomato;
 
-#define STRAT_CONF_OUR_ORANGE   0x01
+	int8_t prev_wait_obstacle;
+
+#define STRAT_CONF_OUR_ORANGE      0x01
+#define STRAT_CONF_WAIT_OBSTACLE   0x02
+#define STRAT_CONF_STRAIGHT_BEGIN  0x04
 	uint8_t flags;
 };