Skip to content

Commit 1e5f496

Browse files
committed
Added some controller handling to captain, removed old ramping logic. Links and Topics
1 parent 26350ac commit 1e5f496

File tree

5 files changed

+112
-185
lines changed

5 files changed

+112
-185
lines changed

messages/dji_msgs/msg/Links.msg

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,12 @@
33
# Most are published by the dji_captain node
44
#
55

6-
string ODOM = 'odom'
76
string UTM = 'utm'
7+
string MAP = 'map'
8+
string ODOM = 'odom'
9+
string HOME_POINT = 'home_point'
10+
811
string BASE_LINK = 'base_link'
912
string BASE_FLAT = 'base_flat_link'
1013
string BASE_ENU = 'base_ENU_link'
11-
string HOME_POINT = 'home_point'
1214

messages/dji_msgs/msg/Topics.msg

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
# Used by the dji_captain, namespaced as needed.
2-
# Usually under /Quadrotor
2+
# Usually under /M350
33
string MOVE_TO_SETPOINT_TOPIC = 'move_to_setpoint'
4-
string JOYSTICK_INPUT_TOPIC = 'joy'
4+
string CONTROLLER_INPUT_TOPIC = 'joy'
5+
string CONTROLLER_VIBRATION_TOPIC = 'joy/set_feedback'
56
string TTS_TOPIC = 'speak'
67

78

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<launch>
2+
<arg name="robot_name" default="M350"/>
3+
4+
<group>
5+
<push-ros-namespace namespace="$(var robot_name)"/>
6+
<node name="joy" pkg="joy" exec="game_controller_node" output="screen"/>
7+
<node name="speaker" pkg="smarc_utilities" exec="simple_tts" output="screen"/>
8+
</group>
9+
10+
</launch>

scripts/smarc_bringups/scripts/quad_bringup.sh

Lines changed: 0 additions & 85 deletions
This file was deleted.

0 commit comments

Comments
 (0)