robomon: Change event name and orte subsriber/publisher

diff --git a/src/robomon/RobomonAtlantis.cpp b/src/robomon/RobomonAtlantis.cpp
index 98d9c70ce74b5c2a98670fb4f4e5983c4665b395..a05dc302d0ed3545717715ecf264b4297b727226 100644 (file)
--- a/src/robomon/RobomonAtlantis.cpp
+++ b/src/robomon/RobomonAtlantis.cpp
@@ -518,11 +518,11 @@ void RobomonAtlantis::paintMap()
 void RobomonAtlantis::setSimulation(int state)
 {
        if(state) {
-               robottype_publisher_hokuyo_scan_create(&orte, NULL, this);
+               robottype_publisher_sick_scan_create(&orte, NULL, this);
        } else {
                if (!simulationEnabled)
                        return;
-               robottype_publisher_hokuyo_scan_destroy(&orte);
+               robottype_publisher_sick_scan_destroy(&orte);
        }
        simulationEnabled = state;
 }
@@ -587,7 +587,7 @@ bool RobomonAtlantis::event(QEvent *event)
                case QEVENT(QEV_MOTION_STATUS):
                        emit motionStatusReceivedSignal();
                        break;
-               case QEVENT(QEV_HOKUYO_SCAN):
+               case QEVENT(QEV_SICK_SCAN):
                        hokuyoScan->newScan(&orte.sick_scan);
                        break;
                case QEVENT(QEV_JAWS_CMD):
@@ -802,8 +802,8 @@ void RobomonAtlantis::createOrte()
                        generic_rcv_cb, new OrteCallbackInfo(this, QEV_ESTIMATED_POSITION_INDEP_ODO));
        robottype_subscriber_est_pos_best_create(&orte,
                        generic_rcv_cb, new OrteCallbackInfo(this, QEV_ESTIMATED_POSITION_BEST));
-       robottype_subscriber_hokuyo_scan_create(&orte,
-                       generic_rcv_cb, new OrteCallbackInfo(this, QEV_HOKUYO_SCAN));
+       robottype_subscriber_sick_scan_create(&orte,
+                       generic_rcv_cb, new OrteCallbackInfo(this, QEV_SICK_SCAN));
        robottype_subscriber_jaws_cmd_create(&orte,
                       generic_rcv_cb, new OrteCallbackInfo(this, QEV_JAWS_CMD));
        robottype_subscriber_fsm_main_create(&orte,

diff --git a/src/robomon/robomon_orte.h b/src/robomon/robomon_orte.h
index 02e47eff5388fdba9a2d7fd47ac1407f98b590fa..6649fefd77eb678c7a230c18c2d9f51d6d91322c 100644 (file)
--- a/src/robomon/robomon_orte.h
+++ b/src/robomon/robomon_orte.h
@@ -34,7 +34,7 @@ enum robomon_qev {
        QEV_FSM_MAIN,
        QEV_FSM_ACT,
        QEV_FSM_MOTION,
-       QEV_HOKUYO_SCAN,
+       QEV_SICK_SCAN,
        QEV_JAWS_CMD,
 };