Merge branch 'master' of jaresf1@rtime:/var/git/eurobot

diff --cc src/robofsm/fsmmain.c
Simple merge

diff --cc src/robofsm/homologation.cc
index 09c324b014b44302d031651e0d16bc0fd1958f0c,8ad9eb5256e45e17d2e5739693378bf233f107e6..6dbd7dc1eb91a14f7ad33a9125afcb7f31e37490
--- 1/src/robofsm/homologation.cc
--- 2/src/robofsm/homologation.cc
+++ b/src/robofsm/homologation.cc
@@@ -82,8 -80,8 +82,9 @@@ FSM_STATE(wait_for_start
                        pthread_create(&thid, NULL, wait_to_deposition, NULL);
                        }
  #else
 +              case EV_START:
                case EV_ENTRY:
+               case EV_START:
  #endif
                        robot_set_est_pos_trans(0.16,
                                                PLAYGROUND_HEIGHT_M - 0.16,

diff --cc src/robofsm/robot.h
Simple merge