Merge pull request #100 from ljq-lv/modified_msgs_name

Modified msgs name
rm-controls · Feb 8, 2023 · 55f0bad · 55f0bad
2 parents ae4facf + 3460424
commit 55f0bad
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/rm_msgs/CMakeLists.txt b/rm_msgs/CMakeLists.txt
@@ -49,7 +49,7 @@ add_message_files(
         GameRobotStatus.msg
         GameStatus.msg
         StateCmd.msg
-        EngineerCmd.msg
+        StepQueueState.msg
         GameRobotHp.msg
         PowerHeatData.msg
         EventData.msg

diff --git a/rm_msgs/msg/referee/EngineerCmd.msg → rm_msgs/msg/referee/StepQueueState.msg b/rm_msgs/msg/referee/EngineerCmd.msg → rm_msgs/msg/referee/StepQueueState.msg
diff --git a/rm_referee/include/rm_referee/common/data.h b/rm_referee/include/rm_referee/common/data.h
@@ -60,7 +60,7 @@
 #include <rm_msgs/ChassisCmd.h>
 #include <rm_msgs/GameStatus.h>
 #include <rm_msgs/RfidStatus.h>
-#include <rm_msgs/EngineerCmd.h>
+#include <rm_msgs/StepQueueState.h>
 #include <rm_msgs/GameRobotHp.h>
 #include <rm_msgs/CapacityData.h>
 #include <rm_msgs/DartClientCmd.h>

diff --git a/rm_referee/include/rm_referee/referee_base.h b/rm_referee/include/rm_referee/referee_base.h
@@ -40,7 +40,7 @@ class RefereeBase
   virtual void shootCmdDataCallback(const rm_msgs::ShootCmd::ConstPtr& data);
   virtual void gimbalCmdDataCallback(const rm_msgs::GimbalCmd::ConstPtr& data);
   virtual void cardCmdDataCallback(const rm_msgs::StateCmd::ConstPtr& data);
-  virtual void engineerCmdDataCallback(const rm_msgs::EngineerCmd ::ConstPtr& data);
+  virtual void stepQueueStateDataCallback(const rm_msgs::StepQueueState ::ConstPtr& data);
   virtual void manualDataCallBack(const rm_msgs::ManualToReferee::ConstPtr& data);
   virtual void radarDataCallBack(const std_msgs::Int8MultiArrayConstPtr& data);
 

diff --git a/rm_referee/include/rm_referee/ui/time_change_ui.h b/rm_referee/include/rm_referee/ui/time_change_ui.h
@@ -51,7 +51,7 @@ class ProgressTimeChangeUi : public TimeChangeUi
 public:
   explicit ProgressTimeChangeUi(XmlRpc::XmlRpcValue& rpc_value, Base& base)
     : TimeChangeUi(rpc_value, base, "progress"){};
-  void updateEngineerCmdData(const rm_msgs::EngineerCmd ::ConstPtr data, const ros::Time& last_get_data_time);
+  void updateStepQueueStateData(const rm_msgs::StepQueueState ::ConstPtr data, const ros::Time& last_get_data_time);
 
 private:
   void display(const ros::Time& time) override;

diff --git a/rm_referee/src/referee_base.cpp b/rm_referee/src/referee_base.cpp
@@ -24,7 +24,7 @@ RefereeBase::RefereeBase(ros::NodeHandle& nh, Base& base) : base_(base), nh_(nh)
   RefereeBase::card_cmd_sub_ = nh.subscribe<rm_msgs::StateCmd>("/controllers/card_controller/command", 10,
                                                                &RefereeBase::cardCmdDataCallback, this);
   RefereeBase::engineer_cmd_sub_ =
-      nh.subscribe<rm_msgs::EngineerCmd>("/engineer_cmd", 10, &RefereeBase::engineerCmdDataCallback, this);
+      nh.subscribe<rm_msgs::StepQueueState>("/step_queue_state", 10, &RefereeBase::stepQueueStateDataCallback, this);
   RefereeBase::manual_data_sub_ =
       nh.subscribe<rm_msgs::ManualToReferee>("/manual_to_referee", 10, &RefereeBase::manualDataCallBack, this);
   if (base_.robot_id_ == rm_referee::RobotId::RED_RADAR || base_.robot_id_ == rm_referee::RobotId::BLUE_RADAR)
@@ -183,10 +183,10 @@ void RefereeBase::gimbalCmdDataCallback(const rm_msgs::GimbalCmd::ConstPtr& data
 void RefereeBase::cardCmdDataCallback(const rm_msgs::StateCmd::ConstPtr& data)
 {
 }
-void RefereeBase::engineerCmdDataCallback(const rm_msgs::EngineerCmd ::ConstPtr& data)
+void RefereeBase::stepQueueStateDataCallback(const rm_msgs::StepQueueState ::ConstPtr& data)
 {
   if (progress_time_change_ui_)
-    progress_time_change_ui_->updateEngineerCmdData(data, ros::Time::now());
+    progress_time_change_ui_->updateStepQueueStateData(data, ros::Time::now());
 }
 void RefereeBase::manualDataCallBack(const rm_msgs::ManualToReferee::ConstPtr& data)
 {

diff --git a/rm_referee/src/ui/time_change_ui.cpp b/rm_referee/src/ui/time_change_ui.cpp
@@ -110,8 +110,8 @@ void ProgressTimeChangeUi::updateConfig()
   graph_->setOperation(rm_referee::GraphOperation::UPDATE);
 }
 
-void ProgressTimeChangeUi::updateEngineerCmdData(const rm_msgs::EngineerCmd ::ConstPtr data,
-                                                 const ros::Time& last_get_data_time)
+void ProgressTimeChangeUi::updateStepQueueStateData(const rm_msgs::StepQueueState::ConstPtr data,
+                                                    const ros::Time& last_get_data_time)
 {
   total_steps_ = data->total_steps;
   finished_data_ = data->finished_step;