display-qt: Change names in hw status enum

I change names in hw status enum to remove collision with other declaration.

diff --git a/src/display-qt/display_orte.cpp b/src/display-qt/display_orte.cpp
index 272b94537b5de18455a71a1ba250c406472c2b31..7aa73a911f043f696d4764fb829b69a71c546a82 100644 (file)
--- a/src/display-qt/display_orte.cpp
+++ b/src/display-qt/display_orte.cpp
@@ -54,16 +54,16 @@ bool miliseconds_elapsed_since(struct timespec *t, unsigned miliseconds)
 void rcv_match_time_cb (const ORTERecvInfo *info, void *vinstance, void *recvCallBackParam)
 {
        OrteSignals *inst=(OrteSignals *)recvCallBackParam;
-       UDE_hw_status_t status = STATUS_FAILED;
+       UDE_hw_status_t status = UDE_HW_STATUS_FAILED;
        static UDE_hw_status_t last_status;
        static struct timespec last_sent;
         switch (info->status) {
                case NEW_DATA:
                        inst->time_con();
-                       status = STATUS_OK;
+                       status = UDE_HW_STATUS_OK;
                        break;
                case DEADLINE:
-                       status = STATUS_FAILED;
+                       status = UDE_HW_STATUS_FAILED;
                        break;
        }
        if (status != last_status ||
@@ -77,16 +77,16 @@ void rcv_match_time_cb (const ORTERecvInfo *info, void *vinstance, void *recvCal
 void rcv_pwr_voltage_cb (const ORTERecvInfo *info, void *vinstance, void *recvCallBackParam)
 {
        OrteSignals *inst=(OrteSignals *)recvCallBackParam;
-       UDE_hw_status_t status = STATUS_FAILED;
+       UDE_hw_status_t status = UDE_HW_STATUS_FAILED;
        static UDE_hw_status_t last_status;
        static struct timespec last_sent;
         switch (info->status) {
                case NEW_DATA:
                        inst->pwr_con();
-                       status = STATUS_OK;
+                       status = UDE_HW_STATUS_OK;
                        break;
                case DEADLINE:
-                       status = STATUS_FAILED;
+                       status = UDE_HW_STATUS_FAILED;
                        break;
        }
        if (status != last_status ||
@@ -100,15 +100,15 @@ void rcv_pwr_voltage_cb (const ORTERecvInfo *info, void *vinstance, void *recvCa
 void rcv_odo_data_cb(const ORTERecvInfo *info, void *vinstance, void *recvCallBackParam)
 {
        OrteSignals *inst=(OrteSignals *)recvCallBackParam;
-       UDE_hw_status_t status = STATUS_FAILED;
+       UDE_hw_status_t status = UDE_HW_STATUS_FAILED;
        static UDE_hw_status_t last_status;
        static struct timespec last_sent;
        switch (info->status) {
                case NEW_DATA:
-                       status = STATUS_OK;
+                       status = UDE_HW_STATUS_OK;
                        break;
                case DEADLINE:
-                       status = STATUS_FAILED;
+                       status = UDE_HW_STATUS_FAILED;
                        break;
        }
        if (status != last_status ||
@@ -122,7 +122,7 @@ void rcv_odo_data_cb(const ORTERecvInfo *info, void *vinstance, void *recvCallBa
 void rcv_robot_cmd_cb(const ORTERecvInfo *info, void *vinstance, void *recvCallBackParam)
 {
        OrteSignals *inst=(OrteSignals *)recvCallBackParam;
-       UDE_hw_status_t status = STATUS_FAILED;
+       UDE_hw_status_t status = UDE_HW_STATUS_FAILED;
        static UDE_hw_status_t last_status;
        static struct timespec last_sent;
        struct robot_cmd_type *instance = (struct robot_cmd_type *)vinstance;
@@ -130,12 +130,12 @@ void rcv_robot_cmd_cb(const ORTERecvInfo *info, void *vinstance, void *recvCallB
        switch (info->status) {
                case NEW_DATA:
                        if (instance->start_condition)
-                               status = STATUS_WARNING; /* Start plug must be plugged before competition start */
+                               status = UDE_HW_STATUS_WARNING; /* Start plug must be plugged before competition start */
                        else
-                               status = STATUS_OK;
+                               status = UDE_HW_STATUS_OK;
                        break;
                case DEADLINE:
-                       status = STATUS_FAILED;
+                       status = UDE_HW_STATUS_FAILED;
                        break;
        }
        if (status != last_status ||
@@ -150,7 +150,7 @@ void rcv_robot_cmd_cb(const ORTERecvInfo *info, void *vinstance, void *recvCallB
 void rcv_robot_swicthes_cb(const ORTERecvInfo *info, void *vinstance, void *recvCallBackParam)
 {
        OrteSignals *inst=(OrteSignals *)recvCallBackParam;
-       UDE_hw_status_t status = STATUS_FAILED;
+       UDE_hw_status_t status = UDE_HW_STATUS_FAILED;
        static char last_color;
        static struct timespec last_sent;
        struct robot_switches_type *instance = (struct robot_switches_type *)vinstance;
@@ -164,7 +164,7 @@ void rcv_robot_swicthes_cb(const ORTERecvInfo *info, void *vinstance, void *recv
                        }
                        last_color = instance->team_color;
                case DEADLINE:
-                       status = STATUS_FAILED;
+                       status = UDE_HW_STATUS_FAILED;
                        break;
        }
 }
@@ -173,18 +173,18 @@ void rcv_motion_status_cb(const ORTERecvInfo *info, void *vinstance, void *recvC
 {
        OrteSignals *inst=(OrteSignals *)recvCallBackParam;
        struct motion_status_type *m = (struct motion_status_type *)vinstance;
-       UDE_hw_status_t status = STATUS_FAILED;
+       UDE_hw_status_t status = UDE_HW_STATUS_FAILED;
        static UDE_hw_status_t last_status;
        static struct timespec last_sent;
        switch (info->status) {
                case NEW_DATA:
                        if (m->err_left == 0 && m->err_right == 0)
-                               status = STATUS_OK;
+                               status = UDE_HW_STATUS_OK;
                        else
-                               status = STATUS_WARNING;
+                               status = UDE_HW_STATUS_WARNING;
                        break;
                case DEADLINE:
-                       status = STATUS_FAILED;
+                       status = UDE_HW_STATUS_FAILED;
                        break;
        }
        if (status != last_status ||
@@ -199,18 +199,18 @@ void rcv_lift_status_cb(const ORTERecvInfo *info, void *vinstance, void *recvCal
 {
        OrteSignals *inst=(OrteSignals *)recvCallBackParam;
        struct lift_status_type *m = (struct lift_status_type *)vinstance;
-       UDE_hw_status_t status = STATUS_FAILED;
+       UDE_hw_status_t status = UDE_HW_STATUS_FAILED;
        static UDE_hw_status_t last_status;
        static struct timespec last_sent;
        switch (info->status) {
                case NEW_DATA:
                        if (m->flags)
-                               status = STATUS_OK;
+                               status = UDE_HW_STATUS_OK;
                        else
-                               status = STATUS_WARNING;
+                               status = UDE_HW_STATUS_WARNING;
                        break;
                case DEADLINE:
-                       status = STATUS_FAILED;
+                       status = UDE_HW_STATUS_FAILED;
                        break;
        }
        if (status != last_status ||
@@ -225,18 +225,18 @@ void rcv_jaws_status_cb(const ORTERecvInfo *info, void *vinstance, void *recvCal
 {
         OrteSignals *inst=(OrteSignals *)recvCallBackParam;
         struct jaws_status_type *m = (struct jaws_status_type *)vinstance;
-        UDE_hw_status_t status = STATUS_FAILED;
+        UDE_hw_status_t status = UDE_HW_STATUS_FAILED;
         static UDE_hw_status_t last_status;
         static struct timespec last_sent;
         switch (info->status) {
                 case NEW_DATA:
                         if (m->flags.left == 0 && m->flags.right == 0)
-                                status = STATUS_OK;
+                                status = UDE_HW_STATUS_OK;
                         else
-                                status = STATUS_WARNING;
+                                status = UDE_HW_STATUS_WARNING;
                         break;
                 case DEADLINE:
-                        status = STATUS_FAILED;
+                        status = UDE_HW_STATUS_FAILED;
                         break;
         }
         if (status != last_status ||
@@ -255,15 +255,15 @@ void rcv_camera_result_cb(const ORTERecvInfo *info, void *vinstance, void *recvC
 void rcv_hokuyo_scan_cb(const ORTERecvInfo *info, void *vinstance, void *recvCallBackParam)
 {
        OrteSignals *inst=(OrteSignals *)recvCallBackParam;
-       UDE_hw_status_t status = STATUS_FAILED;
+       UDE_hw_status_t status = UDE_HW_STATUS_FAILED;
        static UDE_hw_status_t last_status;
        static struct timespec last_sent;
        switch (info->status) {
                case NEW_DATA:
-                       status = STATUS_OK;
+                       status = UDE_HW_STATUS_OK;
                        break;
                case DEADLINE:
-                       status = STATUS_FAILED;
+                       status = UDE_HW_STATUS_FAILED;
                        break;
        }
        if (status != last_status ||
@@ -277,21 +277,21 @@ void rcv_hokuyo_scan_cb(const ORTERecvInfo *info, void *vinstance, void *recvCal
 void rcv_est_pos_best_cb (const ORTERecvInfo *info, void *vinstance, void *recvCallBackParam)
 {
        OrteSignals *inst=(OrteSignals *)recvCallBackParam;
-       UDE_hw_status_t status = STATUS_FAILED;
+       UDE_hw_status_t status = UDE_HW_STATUS_FAILED;
        static UDE_hw_status_t last_status;
        static struct timespec last_sent;
         switch (info->status) {
                case NEW_DATA:
-                       status = STATUS_OK;
+                       status = UDE_HW_STATUS_OK;
                        break;
                case DEADLINE:
-                       status = STATUS_FAILED;
+                       status = UDE_HW_STATUS_FAILED;
                        break;
        }
        if (status != last_status ||
            miliseconds_elapsed_since(&last_sent, 100)) {
                inst->status_con(APP, status);
-               if (status == STATUS_OK)
+               if (status == UDE_HW_STATUS_OK)
                        inst->position_con();
                clock_gettime(CLOCK_MONOTONIC, &last_sent);
        }

diff --git a/src/display-qt/displayqt.cpp b/src/display-qt/displayqt.cpp
index 2f41663b19ab04a23c5d3c938994e03b24fb73d2..85a989ec3a3b8d83d1e24b5857e8b9c1d4ae12c8 100644 (file)
--- a/src/display-qt/displayqt.cpp
+++ b/src/display-qt/displayqt.cpp
@@ -166,33 +166,33 @@ void DisplayQT::display_status(UDE_component_t c, UDE_hw_status_t s)
        switch(c){
                case 0:break;
                case MOT:
-                       if(s==STATUS_OK)
+                       if(s==UDE_HW_STATUS_OK)
                                ui->comp_MOT->setStyleSheet(GREEN);
-                       else if(s==STATUS_FAILED)
+                       else if(s==UDE_HW_STATUS_FAILED)
                                ui->comp_MOT->setStyleSheet(RED);
                        else
                                ui->comp_MOT->setStyleSheet(YELLOW);
                break;
                case ODO:
-                       if(s==STATUS_OK)
+                       if(s==UDE_HW_STATUS_OK)
                                ui->comp_ODO->setStyleSheet(GREEN);
-                       else if(s==STATUS_FAILED)
+                       else if(s==UDE_HW_STATUS_FAILED)
                                ui->comp_ODO->setStyleSheet(RED);
                        else
                                ui->comp_ODO->setStyleSheet(YELLOW);
                break;
                case JAW:
-                       if(s==STATUS_OK)
+                       if(s==UDE_HW_STATUS_OK)
                                ui->comp_JAW->setStyleSheet(GREEN);
-                       else if(s==STATUS_FAILED)
+                       else if(s==UDE_HW_STATUS_FAILED)
                                ui->comp_JAW->setStyleSheet(RED);
                        else
                                ui->comp_JAW->setStyleSheet(YELLOW);
                        break;
                case PWR:
-                       if(s==STATUS_OK)
+                       if(s==UDE_HW_STATUS_OK)
                                ui->comp_PWR->setStyleSheet(GREEN);
-                       else if(s==STATUS_FAILED){
+                       else if(s==UDE_HW_STATUS_FAILED){
                                ui->comp_PWR->setStyleSheet(RED);
 
                                ui->voltage_33->setText("v.33 = ?");
@@ -209,17 +209,17 @@ void DisplayQT::display_status(UDE_component_t c, UDE_hw_status_t s)
                                ui->comp_PWR->setStyleSheet(YELLOW);
                break;
                case HOK:
-                       if(s==STATUS_OK)
+                       if(s==UDE_HW_STATUS_OK)
                                ui->comp_HOK->setStyleSheet(GREEN);
-                       else if(s==STATUS_FAILED)
+                       else if(s==UDE_HW_STATUS_FAILED)
                                ui->comp_HOK->setStyleSheet(RED);
                        else
                                ui->comp_HOK->setStyleSheet(YELLOW);
                        break;
                case APP:
-                       if(s==STATUS_OK)
+                       if(s==UDE_HW_STATUS_OK)
                                ui->comp_APP->setStyleSheet(GREEN);
-                       else if(s==STATUS_FAILED){
+                       else if(s==UDE_HW_STATUS_FAILED){
                                ui->comp_APP->setStyleSheet(RED);
 
                                pos.positionIsActual=false;
@@ -232,25 +232,25 @@ void DisplayQT::display_status(UDE_component_t c, UDE_hw_status_t s)
                                ui->comp_APP->setStyleSheet(YELLOW);
                        break;
                case LFT:
-                       if(s==STATUS_OK)
+                       if(s==UDE_HW_STATUS_OK)
                                ui->comp_LFT->setStyleSheet(GREEN);
-                       else if(s==STATUS_FAILED)
+                       else if(s==UDE_HW_STATUS_FAILED)
                                ui->comp_LFT->setStyleSheet(RED);
                        else
                                ui->comp_LFT->setStyleSheet(YELLOW);
                        break;
                case STA:
-                       if(s==STATUS_OK)
+                       if(s==UDE_HW_STATUS_OK)
                                ui->comp_STA->setStyleSheet(GREEN);
-                       else if(s==STATUS_FAILED)
+                       else if(s==UDE_HW_STATUS_FAILED)
                                ui->comp_STA->setStyleSheet(RED);
                        else
                                ui->comp_STA->setStyleSheet(YELLOW);
                         break;
                 case TIM:
-                        if(s==STATUS_OK)
+                        if(s==UDE_HW_STATUS_OK)
                                 ui->matchTime->setStyleSheet(GREEN);
-                        else if(s==STATUS_FAILED)
+                        else if(s==UDE_HW_STATUS_FAILED)
                                 ui->matchTime->setStyleSheet(RED);
                         else
                                 ui->matchTime->setStyleSheet(YELLOW);

diff --git a/src/display-qt/promene.h b/src/display-qt/promene.h
index d38a988cadf62723aa692381b188dffd98efdd46..334b1db5022d8dfac4609c44fb6c82e2d8f045e2 100644 (file)
--- a/src/display-qt/promene.h
+++ b/src/display-qt/promene.h
@@ -31,9 +31,9 @@ typedef enum {
  * 10 = HW_STATUS_WARNING
  */
 typedef enum {
-        STATUS_FAILED = 0,
-        STATUS_OK = 1,
-        STATUS_WARNING = 2
+        UDE_HW_STATUS_FAILED = 0,
+        UDE_HW_STATUS_OK = 1,
+        UDE_HW_STATUS_WARNING = 2
 } UDE_hw_status_t;
 
 /** ID_DISPLAY_FSM + ...