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

diff --git a/src/robofsm/eb2008/fsmdisplay.cc b/src/robofsm/eb2008/fsmdisplay.cc
index 9510dc2ac8aa781a472a3368cf7799179c8b2aee..c7ec889eb6736fec9e90545904cec5ad9eaa3d8e 100644 (file)
--- a/src/robofsm/eb2008/fsmdisplay.cc
+++ b/src/robofsm/eb2008/fsmdisplay.cc
@@ -261,6 +261,7 @@ FSM_STATE(status)
                        uoled_send_state(fsm->state_name, strlen(fsm->state_name));
                        uoled_set_balls((uint8_t*)&robot.carousel);
                        uoled_send_position(&robot.gorte.est_pos);
+                       uoled_send_hw_status(robot.hw_status);
                        ROBOT_LOCK(disp);
                        if(msg_waiting) {
                                memcpy(buff, msg, 10);

diff --git a/src/robofsm/eb2008/robot_orte.c b/src/robofsm/eb2008/robot_orte.c
index 5c6d54d80b0994fcf7d38c909c25ab311144b1ef..f17521592e1589bcb7aae4baed326189ad68e27a 100644 (file)
--- a/src/robofsm/eb2008/robot_orte.c
+++ b/src/robofsm/eb2008/robot_orte.c
@@ -221,8 +221,8 @@ void rcv_laser_data_cb(const ORTERecvInfo *info, void *vinstance,
                                DBG("%s: MCL is busy - not updating\n", __FUNCTION__);
                                free(meas_angles);
                        }
-                       break;
                        robot.hw_status[STATUS_LASER] = HW_STATUS_OK;
+                       break;
                }
                case DEADLINE:
                        robot.hw_status[STATUS_LASER] = HW_STATUS_FAILED;