Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
I
iri_twist_to_manual_control
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mobile_robotics
ADC
ADC_2018
iri_twist_to_manual_control
Commits
960affb6
Commit
960affb6
authored
7 years ago
by
Fernando Herrero
Browse files
Options
Downloads
Patches
Plain Diff
Remapped speed to manual_control/speed
parent
849d8915
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
launch/node.launch
+1
-1
1 addition, 1 deletion
launch/node.launch
launch/teleop_keyboard.launch
+6
-2
6 additions, 2 deletions
launch/teleop_keyboard.launch
launch/teleop_ps3.launch
+2
-2
2 additions, 2 deletions
launch/teleop_ps3.launch
with
9 additions
and
5 deletions
launch/node.launch
+
1
−
1
View file @
960affb6
...
...
@@ -6,7 +6,7 @@
<arg name="invert_steering" default="True"/>
<arg name="twist_topic" default="/cmd_vel"/>
<arg name="steering_topic" default="/steering"/>
<arg name="speed_topic" default="/speed"/>
<arg name="speed_topic" default="/
manual_control/
speed"/>
<node pkg ="iri_twist_to_manual_control"
type="iri_twist_to_manual_control"
...
...
This diff is collapsed.
Click to expand it.
launch/teleop_keyboard.launch
+
6
−
2
View file @
960affb6
...
...
@@ -2,7 +2,7 @@
<launch>
<arg name="name" default="teleop_keyboard"/>
<arg name="speed_topic" default="/speed"/>
<arg name="speed_topic" default="/
manual_control/
speed"/>
<arg name="steering_topic" default="/steering"/>
<node pkg ="teleop_twist_keyboard"
...
...
@@ -10,13 +10,17 @@
type="teleop_twist_keyboard.py"
output="screen">
<remap from="cmd_vel" to="$(arg name)/cmd_vel"/>
<!--
<param name="~speed" value="0.25"/>
<param name="~turn" value="0.5"/>
-->
</node>
<include file="$(find iri_twist_to_manual_control)/launch/node.launch">
<arg name="node_name" value="$(arg name)_twist_to_manual_control"/>
<arg name="invert_speed" value="False"/>
<arg name="invert_steering" value="True"/>
<arg name="twist_topic"
default
="$(arg name)/cmd_vel"/>
<arg name="twist_topic"
value
="$(arg name)/cmd_vel"/>
<arg name="steering_topic" value="$(arg steering_topic)"/>
<arg name="speed_topic" value="$(arg speed_topic)"/>
</include>
...
...
This diff is collapsed.
Click to expand it.
launch/teleop_ps3.launch
+
2
−
2
View file @
960affb6
...
...
@@ -4,7 +4,7 @@
<arg name="name" default="teleop_ps3"/>
<arg name="dev" default="/dev/input/ps3joy"/>
<arg name="config_filepath" default="$(find twist_to_manual_control)/config/ps3.yaml" />
<arg name="speed_topic" default="/speed"/>
<arg name="speed_topic" default="/
manual_control/
speed"/>
<arg name="steering_topic" default="/steering"/>
<node pkg="joy" type="joy_node" name="joy_node">
...
...
@@ -22,7 +22,7 @@
<arg name="node_name" value="$(arg name)_twist_to_manual_control"/>
<arg name="invert_speed" value="False"/>
<arg name="invert_steering" value="True"/>
<arg name="twist_topic"
default
="$(arg name)/cmd_vel"/>
<arg name="twist_topic"
value
="$(arg name)/cmd_vel"/>
<arg name="steering_topic" value="$(arg steering_topic)"/>
<arg name="speed_topic" value="$(arg speed_topic)"/>
</include>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment