diff --git a/src/chassis_gimbal_shooter_manual.cpp b/src/chassis_gimbal_shooter_manual.cpp index 2fcffb68..91882699 100644 --- a/src/chassis_gimbal_shooter_manual.cpp +++ b/src/chassis_gimbal_shooter_manual.cpp @@ -370,6 +370,8 @@ void ChassisGimbalShooterManual::mouseRightPress() void ChassisGimbalShooterManual::ePress() { + if (camera_switch_cmd_sender_) + camera_switch_cmd_sender_->switchCamera(); switch_armor_target_srv_->setArmorTargetType(rm_msgs::StatusChangeRequest::ARMOR_OUTPOST_BASE); switch_armor_target_srv_->callService(); shooter_cmd_sender_->setArmorType(switch_armor_target_srv_->getArmorTarget()); @@ -377,6 +379,8 @@ void ChassisGimbalShooterManual::ePress() void ChassisGimbalShooterManual::eRelease() { + if (camera_switch_cmd_sender_) + camera_switch_cmd_sender_->switchCamera(); switch_armor_target_srv_->setArmorTargetType(rm_msgs::StatusChangeRequest::ARMOR_ALL); switch_armor_target_srv_->callService(); shooter_cmd_sender_->setArmorType(switch_armor_target_srv_->getArmorTarget()); @@ -414,8 +418,6 @@ void ChassisGimbalShooterManual::bRelease() void ChassisGimbalShooterManual::rPress() { - if (camera_switch_cmd_sender_) - camera_switch_cmd_sender_->switchCamera(); if (scope_cmd_sender_) { use_scope_ = !scope_cmd_sender_->getState();