X-Git-Url: http://git.droids-corp.org/?p=aversive.git;a=blobdiff_plain;f=projects%2Fmicrob2010%2Fmainboard%2Fstrat_base.h;h=efc9af451f8df62c4abb8abace50aa55797ab874;hp=27e1497f543400da9bdfa6792d2ffe9ae716fbc9;hb=HEAD;hpb=5918edd6f4f713ef3c8b0b0020dd30a4fb8222ae

diff --git a/projects/microb2010/mainboard/strat_base.h b/projects/microb2010/mainboard/strat_base.h
index 27e1497..efc9af4 100644
--- a/projects/microb2010/mainboard/strat_base.h
+++ b/projects/microb2010/mainboard/strat_base.h
@@ -26,8 +26,9 @@
 #define END_OBSTACLE   8 /* There is an obstacle in front of us */
 #define END_ERROR     16 /* Cannot do the command */
 #define END_INTR      32 /* interrupted by user */
-#define END_TIMER     64 /* we don't a lot of time */
-#define END_RESERVED 128 /* reserved */
+#define END_TIMER     64 /* we don't have a lot of time */
+#define END_RESERVED 128 /* reserved... be careful, sometimes error is
+			    coded on a int8_t */
 
 /* only valid after a END_OBSTACLE */
 struct opponent_obstacle {
@@ -44,7 +45,7 @@ void strat_hardstop(void);
 #define DO_NOT_SET_POS -1000
 /* Reset position. If arg == DO_NOT_SET_POS, don't update value for
  * it. */
-void strat_reset_pos(int16_t x, int16_t y, int16_t a);
+void strat_reset_pos(int16_t x, int16_t y, double a);
 
 /* decrease gain on angle PID, and go forward until we reach the
  * border. */
@@ -59,16 +60,14 @@ void strat_start(void);
  * times. */
 uint8_t strat_goto_xy_force(int16_t x, int16_t y);
 
-/* escape from disc polygon or another zone */
-struct build_zone;
-uint8_t strat_escape(struct build_zone *zone, uint8_t flags);
-
 /* return true if we have to brake due to an obstacle */
 uint8_t strat_obstacle(void);
 
 /* set/get user strat speed */
 void strat_set_speed(uint16_t d, uint16_t a);
 void strat_get_speed(uint16_t *d, uint16_t *a);
+void strat_set_acc(double d, double a);
+void strat_get_acc(double *d, double *a);
 
 /* when user type ctrl-c we can interrupt traj */
 void interrupt_traj(void);