Modify switch_camera method.

rm-controls · May 11, 2024 · a76825b · a76825b
1 parent 780b5bc
commit a76825b
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/chassis_gimbal_shooter_manual.cpp b/src/chassis_gimbal_shooter_manual.cpp
@@ -370,13 +370,17 @@ 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());
 }
 
 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();