From: Michal Sojka Date: Fri, 24 Apr 2009 19:44:43 +0000 (+0200) Subject: robofsm: FIxed warnings X-Git-Tag: eb2009~22^2~3 X-Git-Url: http://rtime.felk.cvut.cz/gitweb/eurobot/public.git/commitdiff_plain/e7cf58416e18f65e83ecaaf67b715fc38b8fe290 robofsm: FIxed warnings --- diff --git a/src/robofsm/competition.cc b/src/robofsm/competition.cc index fc0b97a8..e701a35d 100644 --- a/src/robofsm/competition.cc +++ b/src/robofsm/competition.cc @@ -25,6 +25,7 @@ #include #include #include +#include #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 diff --git a/src/robofsm/homologation.cc b/src/robofsm/homologation.cc index 6dbd7dc1..09c324b0 100644 --- a/src/robofsm/homologation.cc +++ b/src/robofsm/homologation.cc @@ -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,