add ExchangerMsg.msg,modify EngineerUi.msg and time_change_ui.cpp .

rm-controls · Dec 13, 2023 · 78bdb9e · 78bdb9e
1 parent f2a892e
commit 78bdb9e
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 13 deletions.
diff --git a/rm_msgs/CMakeLists.txt b/rm_msgs/CMakeLists.txt
@@ -13,21 +13,23 @@ add_message_files(
         FILES
         ActuatorState.msg
         BalanceState.msg
-        DbusData.msg
         ChassisCmd.msg
-        ShootCmd.msg
-        ShootState.msg
+        DbusData.msg
+        ExchangerMsg.msg
         GimbalCmd.msg
         GimbalDesError.msg
-        LpData.msg
+        GpioData.msg
         KalmanData.msg
+        LpData.msg
         MovingAverageData.msg
-        GpioData.msg
-        TofRadarData.msg
         MultiDofCmd.msg
+        SentryDeviate.msg
+        ShootCmd.msg
+        ShootState.msg
         TagMsg.msg
         TagMsgArray.msg
-        SentryDeviate.msg
+        TofRadarData.msg
+
 )
 
 add_service_files(

diff --git a/rm_msgs/msg/ExchangerMsg.msg b/rm_msgs/msg/ExchangerMsg.msg
@@ -0,0 +1,4 @@
+uint8 flag
+uint8 shape
+geometry_msgs/Point middle_point
+geometry_msgs/Pose pose
diff --git a/rm_msgs/msg/referee/EngineerUi.msg b/rm_msgs/msg/referee/EngineerUi.msg
@@ -1,7 +1,6 @@
-string current_step_name
-uint32 finished_step
-uint32 total_steps
+string gripper_state
+string drag_state
+string stone_num
 
-string step_queue_name
 bool symbol
 time stamp
diff --git a/rm_referee/src/ui/time_change_ui.cpp b/rm_referee/src/ui/time_change_ui.cpp
@@ -127,8 +127,6 @@ void ProgressTimeChangeUi::updateConfig()
 void ProgressTimeChangeUi::updateEngineerUiData(const rm_msgs::EngineerUi::ConstPtr data,
                                                 const ros::Time& last_get_data_time)
 {
-  total_steps_ = data->total_steps;
-  finished_data_ = data->finished_step;
   TimeChangeUi::update();
 }