Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
F
franka_description
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
Container registry
Model registry
Operate
Environments
Monitor
Incidents
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
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
CeTI
ROS
ROS Packages
franka_description
Commits
4e7a7cba
"ragconnect.base/src/main/resources/mqtt.mustache" did not exist on "d0cd0239bfb1695e27f469e29836e4a7b365dd6f"
Commit
4e7a7cba
authored
5 years ago
by
Christoph Jähne
Browse files
Options
Downloads
Patches
Plain Diff
removed robot ips from combined control yaml, ips mandatory in launch
parent
e96769e4
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
franka_control/config/franka_combined_control_node.yaml
+0
-2
0 additions, 2 deletions
franka_control/config/franka_combined_control_node.yaml
franka_control/launch/franka_combined_control.launch
+1
-1
1 addition, 1 deletion
franka_control/launch/franka_combined_control.launch
with
1 addition
and
3 deletions
franka_control/config/franka_combined_control_node.yaml
+
0
−
2
View file @
4e7a7cba
...
@@ -5,7 +5,6 @@ robot_hardware:
...
@@ -5,7 +5,6 @@ robot_hardware:
panda_1
:
panda_1
:
type
:
franka_hw/FrankaCombinableHW
type
:
franka_hw/FrankaCombinableHW
arm_id
:
panda_1
arm_id
:
panda_1
robot_ip
:
robot_1
joint_names
:
joint_names
:
-
panda_1_joint1
-
panda_1_joint1
-
panda_1_joint2
-
panda_1_joint2
...
@@ -38,7 +37,6 @@ panda_1:
...
@@ -38,7 +37,6 @@ panda_1:
panda_2
:
panda_2
:
type
:
franka_hw/FrankaCombinableHW
type
:
franka_hw/FrankaCombinableHW
arm_id
:
panda_2
arm_id
:
panda_2
robot_ip
:
robot_2
joint_names
:
joint_names
:
-
panda_2_joint1
-
panda_2_joint1
-
panda_2_joint2
-
panda_2_joint2
...
...
This diff is collapsed.
Click to expand it.
franka_control/launch/franka_combined_control.launch
+
1
−
1
View file @
4e7a7cba
...
@@ -17,7 +17,7 @@
...
@@ -17,7 +17,7 @@
<!-- Optional arg to manually configure the ips of all robots, overwriting ips that are configured in hw_config_file -->
<!-- Optional arg to manually configure the ips of all robots, overwriting ips that are configured in hw_config_file -->
<!-- The ips must be set as dictionary like {<arm_id_1>/robot_ip: <my_ip_1>, <arm_id_2>/robot_ip: <my_ip_2>} -->
<!-- The ips must be set as dictionary like {<arm_id_1>/robot_ip: <my_ip_1>, <arm_id_2>/robot_ip: <my_ip_2>} -->
<arg
name=
"robot_ips"
default=
"{}"
/>
<arg
name=
"robot_ips"
/>
<!-- The config file containing the parameterization for all controllers to start with this launch file -->
<!-- The config file containing the parameterization for all controllers to start with this launch file -->
<arg
name=
"controllers_file"
default=
"$(find franka_control)/config/default_combined_controllers.yaml"
/>
<arg
name=
"controllers_file"
default=
"$(find franka_control)/config/default_combined_controllers.yaml"
/>
...
...
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