diff --git a/rm_common/include/rm_common/decision/command_sender.h b/rm_common/include/rm_common/decision/command_sender.h index 162bc1e2..6993fe79 100644 --- a/rm_common/include/rm_common/decision/command_sender.h +++ b/rm_common/include/rm_common/decision/command_sender.h @@ -360,9 +360,9 @@ class ShooterCommandSender : public TimeStampCommandSenderBase gimbal_error_tolerance_ && time - gimbal_des_error_.stamp < ros::Duration(0.1)) || (track_data_.accel > target_acceleration_tolerance_)) || (!suggest_fire_.data && armor_type_ == rm_msgs::StatusChangeRequest::ARMOR_OUTPOST_BASE)) || - (allow_shoot_.cmd == rm_msgs::ShootBeforehandCmd::JUDGE_BY_ERROR && - time - allow_shoot_.stamp < ros::Duration(0.1))) + (shoot_beforehand_cmd_.cmd == rm_msgs::ShootBeforehandCmd::JUDGE_BY_ERROR && + time - shoot_beforehand_cmd_.stamp < ros::Duration(0.1))) if (msg_.mode == rm_msgs::ShootCmd::PUSH) setMode(rm_msgs::ShootCmd::READY); } @@ -477,7 +477,7 @@ class ShooterCommandSender : public TimeStampCommandSenderBase