Skip to content
This repository was archived by the owner on Dec 1, 2020. It is now read-only.

Commit 6a9da45

Browse files
authored
Merge pull request #172 from project-march/fix-PM-72-synchronzing-joint-orders
synchronzing joint orders
2 parents f6b7b1a + 3283ea3 commit 6a9da45

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

march_hardware_interface/config/march4/controllers.yaml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,32 +14,32 @@ march:
1414
allow_partial_joints_goal: true
1515
# When you switch to effort actuationmode, 'position_controllers' must be substituted with 'effort_controllers' and the gains must be added
1616
joints:
17-
- right_hip_fe
17+
- left_ankle
18+
- left_hip_aa
1819
- left_hip_fe
19-
- right_knee
2020
- left_knee
2121
- right_ankle
22-
- left_ankle
2322
- right_hip_aa
24-
- left_hip_aa
23+
- right_hip_fe
24+
- right_knee
2525
# gains: # Required because we're controlling an effort interface
26-
# right_hip_fe: {p: 80, i: 0, d: 10, i_clamp: 100, publish_state: true, antiwindup: true}
26+
# left_ankle: {p: 160, i: 0, d: 6, i_clamp: 100, publish_state: true, antiwindup: true}
27+
# left_hip_aa: {p: 290, i: 0, d: 5, i_clamp: 100, publish_state: true, antiwindup: true}
2728
# left_hip_fe: {p: 80, i: 0, d: 10, i_clamp: 100, publish_state: true, antiwindup: true}
28-
# right_knee: {p: 50, i: 0, d: 10, i_clamp: 100, publish_state: true, antiwindup: true}
2929
# left_knee: {p: 50, i: 0, d: 10, i_clamp: 100, publish_state: true, antiwindup: true}
3030
# right_ankle: {p: 140, i: 0, d: 5, i_clamp: 100, publish_state: true, antiwindup: true}
31-
# left_ankle: {p: 160, i: 0, d: 6, i_clamp: 100, publish_state: true, antiwindup: true}
3231
# right_hip_aa: {p: 290, i: 0, d: 5, i_clamp: 100, publish_state: true, antiwindup: true} # TODO(BaCo) tune HAA joints
33-
# left_hip_aa: {p: 290, i: 0, d: 5, i_clamp: 100, publish_state: true, antiwindup: true}
32+
# right_hip_fe: {p: 80, i: 0, d: 10, i_clamp: 100, publish_state: true, antiwindup: true}
33+
# right_knee: {p: 50, i: 0, d: 10, i_clamp: 100, publish_state: true, antiwindup: true}
3434

3535
constraints:
36-
right_hip_fe:
36+
left_ankle:
3737
trajectory: 0.305
3838
goal: 0.305
39-
left_hip_fe:
39+
left_hip_aa:
4040
trajectory: 0.305
4141
goal: 0.305
42-
right_knee:
42+
left_hip_fe:
4343
trajectory: 0.305
4444
goal: 0.305
4545
left_knee:
@@ -48,12 +48,12 @@ march:
4848
right_ankle:
4949
trajectory: 0.305
5050
goal: 0.305
51-
left_ankle:
51+
right_hip_aa:
5252
trajectory: 0.305
5353
goal: 0.305
54-
right_hip_aa:
54+
right_hip_fe:
5555
trajectory: 0.305
5656
goal: 0.305
57-
left_hip_aa:
57+
right_knee:
5858
trajectory: 0.305
5959
goal: 0.305

0 commit comments

Comments
 (0)