Skip to content

Commit b562ef1

Browse files
committed
dm motor kp bug fix
1 parent d8d6aef commit b562ef1

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

decomposition/metav_description/urdf/playground/dm_motor.xacro

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,22 +38,22 @@
3838
<hardware>
3939
<plugin>meta_hardware/MetaRobotDmMotorNetwork</plugin>
4040
<param name="can_network_name">can0</param>
41-
<param name="master_id">0x30</param>
41+
<param name="master_id">0x00</param>
4242
</hardware>
4343
<joint name="motor_joint">
4444
<command_interface name="position" />
4545
<state_interface name="position" />
4646
<state_interface name="velocity" />
4747
<state_interface name="effort" />
4848
<param name="motor_model">DaMiao</param>
49-
<param name="motor_id">2</param>
49+
<param name="motor_id">1</param>
5050
<param name="mechanical_reduction">1.0</param>
5151
<param name="max_pos">3.141593</param>
5252
<param name="max_vel">30</param>
5353
<param name="max_effort">10</param>
5454
<param name="offset">0.0</param>
5555
<param name="control_mode">mit</param>
56-
<param name="Kp">150.0</param>
56+
<param name="Kp">30.0</param>
5757
<param name="Kd">0.5</param>
5858
</joint>
5959
</ros2_control>

execution/meta_hardware/include/meta_hardware/motor_driver/dm_motor_driver.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ class DmMotor {
6363

6464
double Kp_;
6565
double Kd_;
66-
uint8_t Kp_raw_;
66+
uint16_t Kp_raw_;
6767
uint16_t Kd_raw_;
6868

6969
// Motor feedback

execution/meta_hardware/src/motor_driver/dm_motor_driver.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ DmMotor::DmMotor(const std::unordered_map<std::string, std::string> &motor_param
3939
Kp_ = std::stod(motor_param.at("Kp"));
4040
Kd_ = std::stod(motor_param.at("Kd"));
4141

42-
Kp_raw_ = static_cast<uint8_t>((Kp_ - MIN_KP)/(MAX_KP - MIN_KP) * ( (1 << 8) - 1));
42+
Kp_raw_ = static_cast<uint16_t>((Kp_ - MIN_KP)/(MAX_KP - MIN_KP) * ( (1 << 12) - 1));
4343
Kd_raw_ = static_cast<uint16_t>((Kd_ - MIN_KD)/(MAX_KD - MIN_KD) * ( (1 << 12) - 1));
4444

4545
run_mode_ = RunMode::MIT;

0 commit comments

Comments
 (0)