Merge branch 'master' into final-gimbal

# Conflicts: # rm_gimbal_controllers/cfg/GimbalBase.cfg # rm_gimbal_controllers/include/rm_gimbal_controllers/gimbal_base.h # rm_gimbal_controllers/src/gimbal_base.cpp
rm-controls · Apr 23, 2024 · 5f77ef5 · 5f77ef5
2 parents 27ed0d9 + 98dc199
commit 5f77ef5
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 25 deletions.
diff --git a/rm_gimbal_controllers/CMakeLists.txt b/rm_gimbal_controllers/CMakeLists.txt
@@ -24,11 +24,10 @@ find_package(catkin REQUIRED
         visualization_msgs
         dynamic_reconfigure
         angles
-)
+        )
 
 generate_dynamic_reconfigure_options(
         cfg/BulletSolver.cfg
-        cfg/GimbalBase.cfg
 )
 
 ###################################

diff --git a/rm_shooter_controllers/include/rm_shooter_controllers/standard.h b/rm_shooter_controllers/include/rm_shooter_controllers/standard.h
@@ -56,7 +56,7 @@ namespace rm_shooter_controllers
 struct Config
 {
   double block_effort, block_speed, block_duration, block_overtime, anti_block_angle, anti_block_threshold,
-      forward_push_threshold,exit_push_threshold;
+      forward_push_threshold, exit_push_threshold;
   double extra_wheel_speed;
 };
 
@@ -88,6 +88,7 @@ class Controller : public controller_interface::MultiInterfaceController<hardwar
   std::vector<double> wheel_speed_offset_l_, wheel_speed_offset_r_;
   int push_per_rotation_{};
   double push_wheel_speed_threshold_{};
+  double freq_threshold_{};
   bool dynamic_reconfig_initialized_ = false;
   bool state_changed_ = false;
   bool maybe_block_ = false;

diff --git a/rm_shooter_controllers/src/standard.cpp b/rm_shooter_controllers/src/standard.cpp
@@ -56,6 +56,7 @@ bool Controller::init(hardware_interface::RobotHW* robot_hw, ros::NodeHandle& ro
   config_rt_buffer.initRT(config_);
   push_per_rotation_ = getParam(controller_nh, "push_per_rotation", 0);
   push_wheel_speed_threshold_ = getParam(controller_nh, "push_wheel_speed_threshold", 0.);
+  freq_threshold_ = getParam(controller_nh, "freq_threshold", 20.);
 
   cmd_subscriber_ = controller_nh.subscribe<rm_msgs::ShootCmd>("command", 1, &Controller::commandCB, this);
   shoot_state_pub_.reset(new realtime_tools::RealtimePublisher<rm_msgs::ShootState>(controller_nh, "state", 10));
@@ -111,8 +112,9 @@ void Controller::update(const ros::Time& time, const ros::Duration& period)
     if (state_ != BLOCK)
       if ((state_ != PUSH || cmd_.mode != READY) ||
           (cmd_.mode == READY &&
-           std::fmod(std::abs(ctrl_trigger_.command_struct_.position_ - ctrl_trigger_.getPosition()), 2. * M_PI) <
-               config_.exit_push_threshold))
+           (std::fmod(std::abs(ctrl_trigger_.command_struct_.position_ - ctrl_trigger_.getPosition()), 2. * M_PI) <
+                config_.exit_push_threshold ||
+            cmd_.hz >= freq_threshold_)))
       {
         state_ = cmd_.mode;
         state_changed_ = true;
@@ -197,28 +199,19 @@ void Controller::push(const ros::Time& time, const ros::Duration& period)
   }
   if ((cmd_.wheel_speed == 0. || wheel_speed_ready) && (time - last_shoot_time_).toSec() >= 1. / cmd_.hz)
   {  // Time to shoot!!!
-    if (cmd_.hz >= 20)
+    if (cmd_.hz >= freq_threshold_)
     {
-      config_.forward_push_threshold += 0.5;
-      if (std::fmod(std::abs(ctrl_trigger_.command_struct_.position_ - ctrl_trigger_.getPosition()), 2. * M_PI) <
-          config_.forward_push_threshold)
-      {
-        ctrl_trigger_.setCommand(ctrl_trigger_.command_struct_.position_ -
-                                     2. * M_PI / static_cast<double>(push_per_rotation_),
-                                 -1 * cmd_.hz * 2. * M_PI / static_cast<double>(push_per_rotation_));
-        last_shoot_time_ = time;
-      }
-      config_.forward_push_threshold -= 0.5;
+      ctrl_trigger_.setCommand(ctrl_trigger_.command_struct_.position_ -
+                                   2. * M_PI / static_cast<double>(push_per_rotation_),
+                               -1 * cmd_.hz * 2. * M_PI / static_cast<double>(push_per_rotation_));
+      last_shoot_time_ = time;
     }
-    else
+    else if (std::fmod(std::abs(ctrl_trigger_.command_struct_.position_ - ctrl_trigger_.getPosition()), 2. * M_PI) <
+             config_.forward_push_threshold)
     {
-      if (std::fmod(std::abs(ctrl_trigger_.command_struct_.position_ - ctrl_trigger_.getPosition()), 2. * M_PI) <
-          config_.forward_push_threshold)
-      {
-        ctrl_trigger_.setCommand(ctrl_trigger_.command_struct_.position_ -
-                                 2. * M_PI / static_cast<double>(push_per_rotation_));
-        last_shoot_time_ = time;
-      }
+      ctrl_trigger_.setCommand(ctrl_trigger_.command_struct_.position_ -
+                               2. * M_PI / static_cast<double>(push_per_rotation_));
+      last_shoot_time_ = time;
     }
     // Check block
     if ((ctrl_trigger_.joint_.getEffort() < -config_.block_effort &&
@@ -277,7 +270,8 @@ void Controller::setSpeed(const rm_msgs::ShootCmd& cmd)
 void Controller::normalize()
 {
   double push_angle = 2. * M_PI / static_cast<double>(push_per_rotation_);
-  ctrl_trigger_.setCommand(push_angle * std::floor((ctrl_trigger_.joint_.getPosition() + 0.01) / push_angle));
+  ctrl_trigger_.setCommand(
+      push_angle * std::floor((ctrl_trigger_.joint_.getPosition() + 0.01 + config_.exit_push_threshold) / push_angle));
 }
 
 void Controller::reconfigCB(rm_shooter_controllers::ShooterConfig& config, uint32_t /*level*/)