Skip to content

Commit 13c4eac

Browse files
feat!: vector-valued nullspace params
1 parent 6663f8d commit 13c4eac

22 files changed

Lines changed: 34 additions & 68 deletions

config/control/clipped_cartesian_impedance.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ limit_torques: true
33

44
max_delta_tau: 0.5
55

6-
nullspace.stiffness: 5.0
6+
nullspace.stiffness: [5.0]
77

88
stop_commands: false
99

config/control/default_cartesian_impedance.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ limit_torques: true
33

44
max_delta_tau: 0.5
55

6-
nullspace.stiffness: 5.0
6+
nullspace.stiffness: [5.0]
77

88
stop_commands: false
99

config/control/default_operational_space_controller.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ limit_torques: true
33

44
max_delta_tau: 0.5
55

6-
nullspace.stiffness: 5.0
6+
nullspace.stiffness: [5.0]
77

88
stop_commands: false
99

config/control/dynaarm_cic_soft.yaml

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,11 @@ log.timing: false
2222
max_delta_tau: 0.5
2323
noise.add_random_noise: false
2424
noise.amplitude: 0.0
25-
nullspace.damping: 1.0
26-
nullspace.max_tau: 5.0
25+
nullspace.damping: [0.0]
26+
nullspace.max_tau: [5.0]
2727
nullspace.projector_type: none
2828
nullspace.regularization: 1.0e-06
29-
nullspace.stiffness: 0.0
30-
nullspace.weights.elbow_flexion.value: 0.0
31-
nullspace.weights.forearm_rotation.value: 0.0
32-
nullspace.weights.shoulder_flexion.value: 0.0
33-
nullspace.weights.shoulder_rotation.value: 0.0
34-
nullspace.weights.wrist_flexion.value: 0.0
35-
nullspace.weights.wrist_rotation.value: 0.0
29+
nullspace.stiffness: [0.0]
3630
operational_space_regularization: 1.0
3731
stop_commands: false
3832

config/control/dynaarm_gravity.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ log.enabled: false
99

1010
max_delta_tau: 0.5
1111

12-
nullspace.damping: -1.0
13-
nullspace.max_tau: 5.0
12+
nullspace.damping: [-1.0]
13+
nullspace.max_tau: [5.0]
1414
nullspace.projector_type: none
1515
nullspace.regularization: 1.0e-06
16-
nullspace.stiffness: 0.0
16+
nullspace.stiffness: [0.0]
1717

1818
operational_space_regularization: 1.0
1919
stop_commands: false

config/control/gravity_compensation.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ limit_torques: true
33

44
max_delta_tau: 0.5
55

6-
nullspace.stiffness: 5.0
6+
nullspace.stiffness: [5.0]
77

88
stop_commands: false
99

config/control/gravity_compensation_on_fix_position.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ limit_torques: true
33

44
max_delta_tau: 0.5
55

6-
nullspace.stiffness: 5.0
6+
nullspace.stiffness: [5.0]
77

88
stop_commands: false
99

config/control/gravity_compensation_on_plane.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ limit_torques: true
33

44
max_delta_tau: 0.5
55

6-
nullspace.stiffness: 5.0
6+
nullspace.stiffness: [5.0]
77

88
stop_commands: false
99

config/control/joint_control.yaml

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,10 @@ max_delta_tau: 0.5
55

66
nullspace.projector_type: none # So we are directly controlling the joints!
77

8-
nullspace.stiffness: 5.0
9-
nullspace.damping: 1.0
10-
nullspace.max_tau: 5.0
8+
nullspace.stiffness: [75.0, 75.0, 40.0, 40.0, 40.0, 25.0, 25.0]
9+
nullspace.damping: [15.0, 15.0, 8.0, 8.0, 8.0, 5.0, 5.0]
10+
nullspace.max_tau: [5.0]
1111
nullspace.regularization: 1.0e-06
12-
nullspace.weights.right_fr3_joint1.value: 15.0
13-
nullspace.weights.right_fr3_joint2.value: 15.0
14-
nullspace.weights.right_fr3_joint3.value: 8.0
15-
nullspace.weights.right_fr3_joint4.value: 8.0
16-
nullspace.weights.right_fr3_joint5.value: 8.0
17-
nullspace.weights.right_fr3_joint6.value: 5.0
18-
nullspace.weights.right_fr3_joint7.value: 5.0
1912

2013
stop_commands: false
2114

config/control/joint_velocity_control.yaml

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,10 @@ limit_torques: true
44
max_delta_tau: 0.5
55

66
nullspace.projector_type: none # So we are directly controlling the joints!
7-
nullspace.stiffness: 0.0
8-
nullspace.damping: 10.0
9-
nullspace.max_tau: 5.0
7+
nullspace.stiffness: [0.0]
8+
nullspace.damping: [150.0, 150.0, 80.0, 80.0, 80.0, 50.0, 50.0]
9+
nullspace.max_tau: [5.0]
1010
nullspace.regularization: 1.0e-06
11-
nullspace.weights.right_fr3_joint1.value: 15.0
12-
nullspace.weights.right_fr3_joint2.value: 15.0
13-
nullspace.weights.right_fr3_joint3.value: 8.0
14-
nullspace.weights.right_fr3_joint4.value: 8.0
15-
nullspace.weights.right_fr3_joint5.value: 8.0
16-
nullspace.weights.right_fr3_joint6.value: 5.0
17-
nullspace.weights.right_fr3_joint7.value: 5.0
1811

1912
stop_commands: false
2013

0 commit comments

Comments
 (0)