Modify a param name.

rm-controls · Jul 26, 2024 · 8b91573 · 8b91573
1 parent 1b90fb4
commit 8b91573
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/include/rm_manual/chassis_gimbal_shooter_manual.h b/include/rm_manual/chassis_gimbal_shooter_manual.h
@@ -131,7 +131,7 @@ class ChassisGimbalShooterManual : public ChassisGimbalManual
     MOVE_BASE = 3
   };
 
-  ros::Time hit_time_{};
+  ros::Time start_timer_time_{};
 
   bool prepare_shoot_ = false, turn_flag_ = false, is_balance_ = false, use_scope_ = false, is_auto_ = false,
        adjust_image_transmission_ = false;

diff --git a/src/chassis_gimbal_shooter_manual.cpp b/src/chassis_gimbal_shooter_manual.cpp
@@ -635,12 +635,12 @@ void ChassisGimbalShooterManual::eventDataCallback(const rm_msgs::EventData::Con
   if (data->be_hit_time != last_time_hit_by_dart_)
   {
     last_time_hit_by_dart_ = data->be_hit_time;
-    hit_time_ = ros::Time::now();
+    start_timer_time_ = ros::Time::now();
     count_ = 0;
   }
-  if ((data->be_hit_target == OUTPOST && (ros::Time::now() - hit_time_).toSec() <= 5) ||
-      (data->be_hit_target == BASE && (ros::Time::now() - hit_time_).toSec() <= 10) ||
-      (data->be_hit_target == MOVE_BASE && (ros::Time::now() - hit_time_).toSec() <= 15))
+  if ((data->be_hit_target == OUTPOST && (ros::Time::now() - start_timer_time_).toSec() <= 5) ||
+      (data->be_hit_target == BASE && (ros::Time::now() - start_timer_time_).toSec() <= 10) ||
+      (data->be_hit_target == MOVE_BASE && (ros::Time::now() - start_timer_time_).toSec() <= 15))
     is_auto_ = true;
   else
     is_auto_ = false;