Merge branch 'master' of trandk1@rtime.felk.cvut.cz:/var/git/eurobot

Conflicts:

	src/robofsm/eb2008/fsmmain.cc

diff --cc src/robofsm/eb2008/fsmmain.cc
index 148fdbe38620d503cf8f7a4325dd67477d8ef614,9fcb5b8803da0b95f4885123afffc3c752e68727..c3dca2821a7d143c1725fefcc37941e95e772268
--- 1/src/robofsm/eb2008/fsmmain.cc
--- 2/src/robofsm/eb2008/fsmmain.cc
+++ b/src/robofsm/eb2008/fsmmain.cc
@@@ -231,28 -210,13 +231,24 @@@ FSM_STATE_DECL(deposite_balls)
   */
  FSM_STATE(main_init) 
  {
 -      pthread_t thid;
 -
        /* start event ocurred */
        switch (FSM_EVENT) {
 -#ifndef WAIT_FOR_START
                case EV_ENTRY:
-                       /* init map and shared memory if required */
-                       ShmapInit(1);
-                       /* starting position of the robot */
-                       robot_set_act_pos_trans(ROBOT_WIDTH_M/2,
 -#endif
++                      robot_set_est_pos_trans(ROBOT_WIDTH_M/2,
 +                                              PLAYGROUND_HEIGHT_M - ROBOT_AXIS_TO_BACK_M,
 +                                              DEG2RAD(135));
-                       /* waste counter */
 +                      FSM_TRANSITION(wait_for_start);
 +                      break;
 +              default: break;
 +      }
 +}
 +
 +FSM_STATE(wait_for_start)
 +{
 +      pthread_t thid;
 +
 +      switch (FSM_EVENT) {
 +#ifdef WAIT_FOR_START
                case EV_START:
                        /* start competition timer */
                        pthread_create(&thid, NULL, wait_for_end, NULL);

diff --cc src/robofsm/eb2008/roboevent_eb2008.py
Simple merge

diff --cc src/robofsm/eb2008/robot_eb2008.h
Simple merge