From c9a66c6aee4b02815790c251b35e1fa56bfb5123 Mon Sep 17 00:00:00 2001 From: liyixin135 <421159734@qq.com> Date: Wed, 10 Jul 2024 10:58:39 +0800 Subject: [PATCH] Make a reset. --- include/rm_manual/chassis_gimbal_shooter_manual.h | 3 +-- src/chassis_gimbal_shooter_manual.cpp | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/rm_manual/chassis_gimbal_shooter_manual.h b/include/rm_manual/chassis_gimbal_shooter_manual.h index c5083969..a03017d1 100644 --- a/include/rm_manual/chassis_gimbal_shooter_manual.h +++ b/include/rm_manual/chassis_gimbal_shooter_manual.h @@ -128,10 +128,9 @@ class ChassisGimbalShooterManual : public ChassisGimbalManual geometry_msgs::PointStamped point_out_; - bool prepare_shoot_ = false, turn_flag_ = false, is_balance_ = false, use_scope_ = false, + bool prepare_shoot_ = false, turn_flag_ = false, is_balance_ = false, use_scope_ = false, is_auto_ = false, adjust_image_transmission_ = false; double yaw_current_{}; - bool is_auto_ = false; ros::Time hit_time_; int count_{}, target_hit_by_dart{}, time_hit_by_dart{}, last_time_hit_by_dart{}; }; diff --git a/src/chassis_gimbal_shooter_manual.cpp b/src/chassis_gimbal_shooter_manual.cpp index f056189e..9bea91c0 100644 --- a/src/chassis_gimbal_shooter_manual.cpp +++ b/src/chassis_gimbal_shooter_manual.cpp @@ -190,6 +190,7 @@ void ChassisGimbalShooterManual::remoteControlTurnOff() gimbal_calibration_->stop(); turn_flag_ = false; use_scope_ = false; + is_auto_ = false; adjust_image_transmission_ = false; } @@ -208,6 +209,7 @@ void ChassisGimbalShooterManual::robotDie() shooter_cmd_sender_->setMode(rm_msgs::ShootCmd::STOP); turn_flag_ = false; use_scope_ = false; + is_auto_ = false; adjust_image_transmission_ = false; }