]> rtime.felk.cvut.cz Git - eurobot/public.git/commitdiff
robofsm: FIxed warnings
authorMichal Sojka <sojkam1@fel.cvut.cz>
Fri, 24 Apr 2009 19:44:43 +0000 (21:44 +0200)
committerMichal Sojka <sojkam1@fel.cvut.cz>
Fri, 24 Apr 2009 19:44:43 +0000 (21:44 +0200)
src/robofsm/competition.cc
src/robofsm/homologation.cc

index fc0b97a8b08bccfc08dc8e6c76d10ef42b4d50df..e701a35d71f5882aceba0d8d52cb7ba489af8b4d 100644 (file)
@@ -25,6 +25,7 @@
 #include <string.h>
 #include <robodim.h>
 #include <stdbool.h>
+#include <error.h>
 
 #ifdef COMPETITION
 #define WAIT_FOR_START
@@ -52,7 +53,7 @@ typedef enum {
        //LOOK_AROUND_FAIL      // obsolete, no sharp sensor
 } SUBFSM_RET_VAL;
 
-#define FSM_EVENT_RET_VAL ((SUBFSM_RET_VAL)FSM_EVENT_PTR)
+#define FSM_EVENT_RET_VAL ((SUBFSM_RET_VAL)FSM_EVENT_INT)
 
 /************************************************************************
  * Trajectory constraints used, are initialized in the init state
index 6dbd7dc1eb91a14f7ad33a9125afcb7f31e37490..09c324b014b44302d031651e0d16bc0fd1958f0c 100644 (file)
@@ -84,7 +84,6 @@ FSM_STATE(wait_for_start)
 #else
                case EV_START:
                case EV_ENTRY:
-               case EV_START:
 #endif
                        robot_set_est_pos_trans(0.16,
                                                PLAYGROUND_HEIGHT_M - 0.16,