Skip to content

Commit a5837f1

Browse files
committed
fix hero xacro binding
1 parent 0afdb8c commit a5837f1

8 files changed

Lines changed: 66 additions & 10 deletions

File tree

decision/hero_vehicle/src/dbus_interpreter.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ void DbusInterpreter::input_video_link_vt03(const operation_interface::msg::VT03
113113
wheel = (msg->wheel-1024)/684.0; apply_deadzone(wheel);
114114

115115
if(msg->cns == 1) lsw = "MID";
116-
if(msg->cns == 0) lsw = ""; //rough shit
116+
if(msg->cns == 0) lsw = ""; // TODO rough shit
117117
}
118118

119119
void DbusInterpreter::update()

decomposition/metav_description/urdf/hero/hero.xacro

Lines changed: 39 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,47 @@
4949

5050
<ros2_control name="dm_motors_yaw" type="system">
5151
<hardware>
52-
<plugin>meta_hardware/MetaRobotDjiMotorNetwork</plugin>
52+
<plugin>meta_hardware/MetaRobotDmMotorNetwork</plugin>
5353
<param name="can_network_name">can_1</param>
54+
<param name="master_id">0x30</param>
55+
</hardware>
56+
<joint name="yaw_gimbal_joint">
57+
<command_interface name="position" />
58+
<state_interface name="position" />
59+
<state_interface name="velocity" />
60+
<state_interface name="effort" />
61+
<param name="motor_model">DaMiao</param>
62+
<param name="motor_id">9</param>
63+
<param name="mechanical_reduction">1.0</param>
64+
<param name="max_pos">12.5</param>
65+
<param name="max_vel">45.0</param>
66+
<param name="max_effort">12.0</param>
67+
<param name="offset">0.0</param>
68+
<param name="control_mode">mit</param>
69+
<param name="Kp">30.0</param>
70+
<param name="Kd">0.5</param>
71+
</joint>
72+
</ros2_control>
73+
<ros2_control name="mi_motors_pitch" type="system">
74+
<hardware>
75+
<plugin>meta_hardware/MetaRobotMiMotorNetwork</plugin>
76+
<param name="can_network_name">can_2</param>
5477
</hardware>
55-
<xacro:gimbal_transmission prefix="pitch" mechanical_reduction="20.0" motor_id="7" offset="0"/>
56-
<xacro:gimbal_transmission prefix="yaw" mechanical_reduction="20.0" motor_id="8" offset="0"/>
57-
78+
<!-- <xacro:gimbal_transmission prefix="pitch" mechanical_reduction="20.0" motor_id="1" offset="0"/>
79+
-->
80+
<joint name="pitch_gimbal_joint">
81+
<command_interface name="position" />
82+
<state_interface name="position" />
83+
<state_interface name="velocity" />
84+
<state_interface name="effort" />
85+
<param name="motor_model">CyberGear</param>
86+
<param name="motor_id">1</param>
87+
<param name="mechanical_reduction">1.0</param>
88+
<param name="offset">0.7599</param> <!-- read from (int("7842",16)-65535/2)/(65535/2)*4*pi = -0.75990, remember to negate -->
89+
<param name="control_mode">dynamic</param>
90+
<param name="Kp">30.0</param>
91+
<param name="Kd">1.0</param>
92+
</joint>
5893
</ros2_control>
5994

6095
<ros2_control name="dji_motors_gimbal" type="system">

decomposition/metav_description/urdf/playground/multiple_motors.xacro

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,9 @@
7474
<param name="motor_model">CyberGear</param>
7575
<param name="motor_id">1</param>
7676
<param name="mechanical_reduction">1.0</param>
77-
<param name="offset">0.0</param>
77+
<!-- cansend can_2 01000001#0000.0000.0000.000 -->
78+
<!-- can_2 020001FD [8] 77 2C 7F F5 7F FF 01 2 -->
79+
<param name="offset">0.86652061961</param> <!-- -0.7338292567 (int("772C",16)-65535/2)/(65535/2)*4*pi -->
7880
<param name="control_mode">dynamic</param>
7981
<param name="Kp">30.0</param>
8082
<param name="Kd">1.0</param>

execution/meta_hardware/package.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
<depend>angles</depend>
2121

2222
<depend>serial_driver</depend>
23+
24+
<depend>forward_command_cntroller</depend>
2325

2426
<test_depend>ament_lint_auto</test_depend>
2527
<test_depend>ament_lint_common</test_depend>

meta_bringup/config/hero.yaml

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,11 @@ controller_manager:
1616

1717
shoot_controller:
1818
type: meta_shoot_controller/ShootController
19+
20+
forward_pitch_controller:
21+
type: forward_command_controller/ForwardCommandController
22+
forward_yaw_controller:
23+
type: forward_command_controller/ForwardCommandController
1924

2025
omni_chassis_controller:
2126
ros__parameters:
@@ -133,4 +138,14 @@ referee_serial:
133138
video_link_baud: 921600
134139
isDebug: false
135140
debugUnhandledShown: false
136-
warningShown: false
141+
warningShown: false
142+
forward_pitch_controller:
143+
ros__parameters:
144+
joints:
145+
- pitch_gimbal_joint
146+
interface_name: position
147+
forward_yaw_controller:
148+
ros__parameters:
149+
joints:
150+
- yaw_gimbal_joint
151+
interface_name: position

meta_bringup/launch/hero.launch.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,9 @@ def generate_launch_description():
101101
load_controller('wheels_pid_controller'),
102102
# load_controller('gimbal_controller'),
103103
load_controller('omni_chassis_controller'),
104-
load_controller('shoot_controller')
104+
load_controller('shoot_controller'),
105+
load_controller('forward_yaw_controller'),
106+
load_controller('forward_pitch_controller')
105107
]
106108
referee_system_node = Node(
107109
package='referee_serial',

perception/ahrs_feedback/fdilink_ahrs/launch/ahrs_driver.launch.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ def generate_launch_description():
1919
package="fdilink_ahrs",
2020
executable="ahrs_driver_node",
2121
parameters=[{'if_debug_': False,
22-
'serial_port_':'/dev/fdilink_ahrs',
22+
'serial_port_':'/dev/tty_IMU',
2323
'serial_baud_':921600,
2424
'imu_topic':'/imu',
2525
'imu_frame_id_':'gyro_link',

0 commit comments

Comments
 (0)