camera display

diff --git a/src/robofsm/robot.c b/src/robofsm/robot.c
index 2419d2af09497c25850e642ffd6768e8f6dfaf23..cc1c9b660f966db934045a24772a59798218d49b 100644 (file)
--- a/src/robofsm/robot.c
+++ b/src/robofsm/robot.c
@@ -174,6 +174,8 @@ int robot_init()
        robot.orte.pwr_ctrl.voltage50 = 1;
        robot.orte.pwr_ctrl.voltage80 = 1;
 
+       robot.orte.camera_control.on = true;
+       
        robot.fsm.motion.state = &fsm_state_motion_init;
 
        robot.fsm.act.state = &fsm_state_act_wait_for_command; // puck handling actuators FSM's initial state

diff --git a/src/robofsm/robot.h b/src/robofsm/robot.h
index 0cefd7b4f35263c1a0b4f4bc56b6e1490b47ccd9..8930ae16ed58f093c2a893b414ae29b58ff85157 100644 (file)
--- a/src/robofsm/robot.h
+++ b/src/robofsm/robot.h
@@ -127,7 +127,8 @@ struct robot {
        pthread_mutex_t lock_camera;
 
        /* competition parameters */
-        enum team_color team_color;
+#define team_color     orte.camera_control.game_color
+//        enum team_color team_color;
 
        /** State variable used for controlling the robot by pluggin
         * in and out start connector. */