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

diff --git a/src/robofsm/common-states.cc b/src/robofsm/common-states.cc
index 55efaa0107c379aa170260b4aa35c100489c38e7..db98c716fdb7fed8d2380c7a8f967705900855c0 100644 (file)
--- a/src/robofsm/common-states.cc
+++ b/src/robofsm/common-states.cc
@@ -51,6 +51,7 @@ void start_entry()
        robot.check_turn_safety = false;
        pthread_create(&thid, NULL, timing_thread, NULL);
        start_timer();
+       act_camera_on();
 }
 
 // We set initial position periodically in order for it to be updated

diff --git a/src/types/robottype.ortegen b/src/types/robottype.ortegen
index b32e359f3ea18e59736e2c8bfeb7b8c36a45b256..201bc42477f01d513c01bc37bc49136ecacc7e47 100644 (file)
--- a/src/types/robottype.ortegen
+++ b/src/types/robottype.ortegen
@@ -20,7 +20,7 @@ type=robot_pos                topic=ref_pos
 type=robot_cmd         topic=robot_cmd         deadline=1
 type=robot_switches    topic=robot_switches    deadline=1
 type=camera_result     topic=camera_result
-type=camera_control    topic=camera_control
+type=camera_control    topic=camera_control    pubdelay=1
 type=fsm_state         topic=fsm_main          pubdelay=1
 type=fsm_state         topic=fsm_act           pubdelay=1
 type=fsm_state         topic=fsm_motion        pubdelay=1