fix build failure on engineer.

rm-controls · Oct 18, 2023 · 7f3c6d3 · 7f3c6d3
1 parent bcfad31
commit 7f3c6d3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/rm_referee/include/rm_referee/ui/trigger_change_ui.h b/rm_referee/include/rm_referee/ui/trigger_change_ui.h
@@ -201,8 +201,9 @@ class CameraTriggerChangeUi : public TriggerChangeUi
 class StringTriggerChangeUi : public TriggerChangeUi
 {
 public:
-  explicit StringTriggerChangeUi(XmlRpc::XmlRpcValue& rpc_value, Base& base, const std::string& name)
-    : TriggerChangeUi(rpc_value, base, name){};
+  explicit StringTriggerChangeUi(XmlRpc::XmlRpcValue& rpc_value, Base& base, const std::string& name,
+                                 std::vector<Graph>* graph_queue)
+    : TriggerChangeUi(rpc_value, base, name, graph_queue){};
   void updateStringUiData(const std::string& data);
 
 private:

diff --git a/rm_referee/src/referee_base.cpp b/rm_referee/src/referee_base.cpp
@@ -23,7 +23,7 @@ RefereeBase::RefereeBase(ros::NodeHandle& nh, Base& base) : base_(base), nh_(nh)
                                                                   &RefereeBase::gimbalCmdDataCallback, this);
   RefereeBase::card_cmd_sub_ = nh.subscribe<rm_msgs::StateCmd>("/controllers/card_controller/command", 10,
                                                                &RefereeBase::cardCmdDataCallback, this);
-  RefereeBase::engineer_cmd_sub_ =
+  RefereeBase::engineer_ui_sub_ =
       nh.subscribe<rm_msgs::EngineerUi>("/engineer_ui", 10, &RefereeBase::engineerUiDataCallback, this);
   RefereeBase::manual_data_sub_ =
       nh.subscribe<rm_msgs::ManualToReferee>("/manual_to_referee", 10, &RefereeBase::manualDataCallBack, this);
@@ -67,8 +67,6 @@ RefereeBase::RefereeBase(ros::NodeHandle& nh, Base& base) : base_(base), nh_(nh)
         capacitor_time_change_ui_ = new CapacitorTimeChangeUi(rpc_value[i], base_, &graph_queue_);
       if (rpc_value[i]["name"] == "effort")
         effort_time_change_ui_ = new EffortTimeChangeUi(rpc_value[i], base_, &graph_queue_);
-      if (rpc_value[i]["name"] == "progress")
-        progress_time_change_ui_ = new ProgressTimeChangeUi(rpc_value[i], base_, &graph_queue_);
       if (rpc_value[i]["name"] == "dart_status")
         dart_status_time_change_ui_ = new DartStatusTimeChangeUi(rpc_value[i], base_, &graph_queue_);
       if (rpc_value[i]["name"] == "rotation")
@@ -136,8 +134,6 @@ void RefereeBase::addUi()
     fixed_ui_->addForQueue();
   if (effort_time_change_ui_)
     effort_time_change_ui_->addForQueue();
-  if (progress_time_change_ui_)
-    progress_time_change_ui_->addForQueue();
   if (dart_status_time_change_ui_)
     dart_status_time_change_ui_->addForQueue();
   if (capacitor_time_change_ui_)
@@ -310,8 +306,12 @@ void RefereeBase::cardCmdDataCallback(const rm_msgs::StateCmd::ConstPtr& data)
 }
 void RefereeBase::engineerUiDataCallback(const rm_msgs::EngineerUi::ConstPtr& data)
 {
-  if (progress_time_change_ui_ && !is_adding_)
-    progress_time_change_ui_->updateEngineerUiData(data, ros::Time::now());
+  if (stone_num_trigger_change_ui_ && !is_adding_)
+    stone_num_trigger_change_ui_->updateStringUiData(data->stone_num);
+  if (gripper_state_trigger_change_ui_ && !is_adding_)
+    gripper_state_trigger_change_ui_->updateStringUiData(data->gripper_state);
+  if (drag_state_trigger_change_ui_ && !is_adding_)
+    drag_state_trigger_change_ui_->updateStringUiData(data->drag_state);
 }
 void RefereeBase::manualDataCallBack(const rm_msgs::ManualToReferee::ConstPtr& data)
 {