Skip to content

Commit 8c714bc

Browse files
authored
Merge pull request #9 from hsp-iit/fix/torso_stiffness_conf
fix: now the pid increase of torso joints is configurable
2 parents 25d7456 + dd2a454 commit 8c714bc

15 files changed

+235
-123
lines changed

src/ergocub_cartesian_control/app/conf/real/common_left.ini

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

src/ergocub_cartesian_control/app/conf/real/common_right.ini

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

src/ergocub_cartesian_control/app/conf/real/config_left_ergoCub.ini

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,30 @@
1-
[include COMMON "common_left.ini"]
1+
rate 100.0
2+
traj_duration 5.0
3+
rpc_local_port_name /cartesian-control/left_arm/rpc:i
4+
position_error_th 0.0005
5+
max_iteration 10000
6+
module_logging true
7+
module_verbose true
8+
qp_verbose false
9+
10+
[IK_PARAM]
11+
12+
limits_param 0.90 # 0 < limits_param < 1
13+
joint_acc_weight (2.5 0.0) #(cost weight, cost offset)
14+
position_param (10.0 100.0 25.0) #(cost weight, proportional gain, derivative gain)
15+
orientation_param (0.1 100.0 25.0) #(cost weight, proportional gain, derivative gain)
16+
joint_pos_param (0.01 3.0 4.5) #(cost weight, proportional gain, derivative gain)
17+
max_joint_position_variation 20.0 #[deg]
18+
max_joint_position_track_error 1.5 #[deg]
19+
torso_joints_to_stiffen 3
20+
#joint_home (0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0)
21+
# Gain used in the manipulability constraint
22+
improve_manip_dyn 5.0
23+
improve_manip_th 0.01
24+
25+
[FSM_PARAM]
26+
27+
stop_vel 0.0175 #[rad] 0.0175 = 1.0 deg; 0.0314159 rad = 2.0 deg; 0.0087 rad = 0.5 deg
228

329
[ARM]
430

src/ergocub_cartesian_control/app/conf/real/config_left_r1.ini

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,30 @@
1-
[include COMMON "common_left.ini"]
1+
rate 100.0
2+
traj_duration 5.0
3+
rpc_local_port_name /cartesian-control/left_arm/rpc:i
4+
position_error_th 0.0005
5+
max_iteration 10000
6+
module_logging true
7+
module_verbose true
8+
qp_verbose false
9+
10+
[IK_PARAM]
11+
12+
limits_param 0.90 # 0 < limits_param < 1
13+
joint_acc_weight (2.5 0.0) #(cost weight, cost offset)
14+
position_param (10.0 100.0 25.0) #(cost weight, proportional gain, derivative gain)
15+
orientation_param (0.1 100.0 25.0) #(cost weight, proportional gain, derivative gain)
16+
joint_pos_param (0.01 3.0 4.5) #(cost weight, proportional gain, derivative gain)
17+
max_joint_position_variation 20.0 #[deg]
18+
max_joint_position_track_error 1.5 #[deg]
19+
torso_joints_to_stiffen 1
20+
#joint_home (0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0)
21+
# Gain used in the manipulability constraint
22+
improve_manip_dyn 5.0
23+
improve_manip_th 0.01
24+
25+
[FSM_PARAM]
26+
27+
stop_vel 0.0175 #[rad] 0.0175 = 1.0 deg; 0.0314159 rad = 2.0 deg; 0.0087 rad = 0.5 deg
228

329
[ARM]
430

src/ergocub_cartesian_control/app/conf/real/config_right_ergoCub.ini

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,30 @@
1-
[include COMMON "common_right.ini"]
1+
rate 100.0
2+
traj_duration 5.0
3+
rpc_local_port_name /cartesian-control/right_arm/rpc:i
4+
position_error_th 0.0005
5+
max_iteration 10000
6+
module_logging true
7+
module_verbose true
8+
qp_verbose false
9+
10+
[IK_PARAM]
11+
12+
limits_param 0.90 # 0 < limits_param < 1
13+
joint_acc_weight (2.5 0.0) #(cost weight, cost offset)
14+
position_param (10.0 100.0 25.0) #(cost weight, proportional gain, derivative gain)
15+
orientation_param (0.1 100.0 25.0) #(cost weight, proportional gain, derivative gain)
16+
joint_pos_param (0.01 3.0 4.5) #(cost weight, proportional gain, derivative gain)
17+
max_joint_position_variation 20.0 #[deg]
18+
max_joint_position_track_error 1.5 #[deg]
19+
joint_home (0.0 0.0 0.1 0.0 0.1 0.0 0.0 0.0)
20+
torso_joints_to_stiffen 3
21+
# Gain used in the manipulability constraint
22+
improve_manip_dyn 5.0
23+
improve_manip_th 0.01
24+
25+
[FSM_PARAM]
26+
27+
stop_vel 0.001 #[rad] 0.0175 = 1.0 deg; 0.0314159 rad = 2.0 deg; 0.0087 rad = 0.5 deg
228

329
[ARM]
430

src/ergocub_cartesian_control/app/conf/real/config_right_r1.ini

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,30 @@
1-
[include COMMON "common_right.ini"]
1+
rate 100.0
2+
traj_duration 5.0
3+
rpc_local_port_name /cartesian-control/right_arm/rpc:i
4+
position_error_th 0.0005
5+
max_iteration 10000
6+
module_logging true
7+
module_verbose true
8+
qp_verbose false
9+
10+
[IK_PARAM]
11+
12+
limits_param 0.90 # 0 < limits_param < 1
13+
joint_acc_weight (2.5 0.0) #(cost weight, cost offset)
14+
position_param (10.0 100.0 25.0) #(cost weight, proportional gain, derivative gain)
15+
orientation_param (0.1 100.0 25.0) #(cost weight, proportional gain, derivative gain)
16+
joint_pos_param (0.01 3.0 4.5) #(cost weight, proportional gain, derivative gain)
17+
max_joint_position_variation 20.0 #[deg]
18+
max_joint_position_track_error 1.5 #[deg]
19+
joint_home (0.0 0.0 0.1 0.0 0.1 0.0 0.0 0.0)
20+
torso_joints_to_stiffen 1
21+
# Gain used in the manipulability constraint
22+
improve_manip_dyn 5.0
23+
improve_manip_th 0.01
24+
25+
[FSM_PARAM]
26+
27+
stop_vel 0.001 #[rad] 0.0175 = 1.0 deg; 0.0314159 rad = 2.0 deg; 0.0087 rad = 0.5 deg
228

329
[ARM]
430

src/ergocub_cartesian_control/app/conf/sim/common_left.ini

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

src/ergocub_cartesian_control/app/conf/sim/common_right.ini

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

src/ergocub_cartesian_control/app/conf/sim/config_left_ergoCub.ini

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,30 @@
1-
[include COMMON "common_left.ini"]
1+
rate 100.0
2+
traj_duration 5.0
3+
rpc_local_port_name /cartesian-control/left_arm/rpc:i
4+
position_error_th 0.0005
5+
max_iteration 10000
6+
module_logging true
7+
module_verbose true
8+
qp_verbose false
9+
10+
[IK_PARAM]
11+
12+
limits_param 0.90 # 0 < limits_param < 1
13+
joint_acc_weight (2.5 0.0) #(cost weight, cost offset)
14+
position_param (10.0 100.0 25.0) #(cost weight, proportional gain, derivative gain)
15+
orientation_param (0.1 100.0 25.0) #(cost weight, proportional gain, derivative gain)
16+
joint_pos_param (0.01 3.0 4.5) #(cost weight, proportional gain, derivative gain)
17+
max_joint_position_variation 20.0 #[deg]
18+
max_joint_position_track_error 1.5 #[deg]
19+
torso_joints_to_stiffen 3
20+
#joint_home (0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0)
21+
# Gain used in the manipulability constraint
22+
improve_manip_dyn 5.0
23+
improve_manip_th 0.01
24+
25+
[FSM_PARAM]
26+
27+
stop_vel 0.0175 #[rad] 0.0175 = 1.0 deg; 0.0314159 rad = 2.0 deg; 0.0087 rad = 0.5 deg
228

329
[ARM]
430

src/ergocub_cartesian_control/app/conf/sim/config_left_r1.ini

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,30 @@
1-
[include COMMON "common_left.ini"]
1+
rate 100.0
2+
traj_duration 5.0
3+
rpc_local_port_name /cartesian-control/left_arm/rpc:i
4+
position_error_th 0.0005
5+
max_iteration 10000
6+
module_logging true
7+
module_verbose true
8+
qp_verbose false
9+
10+
[IK_PARAM]
11+
12+
limits_param 0.90 # 0 < limits_param < 1
13+
joint_acc_weight (2.5 0.0) #(cost weight, cost offset)
14+
position_param (10.0 100.0 25.0) #(cost weight, proportional gain, derivative gain)
15+
orientation_param (0.1 100.0 25.0) #(cost weight, proportional gain, derivative gain)
16+
joint_pos_param (0.01 3.0 4.5) #(cost weight, proportional gain, derivative gain)
17+
max_joint_position_variation 20.0 #[deg]
18+
max_joint_position_track_error 1.5 #[deg]
19+
torso_joints_to_stiffen 1
20+
#joint_home (0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0)
21+
# Gain used in the manipulability constraint
22+
improve_manip_dyn 5.0
23+
improve_manip_th 0.01
24+
25+
[FSM_PARAM]
26+
27+
stop_vel 0.0175 #[rad] 0.0175 = 1.0 deg; 0.0314159 rad = 2.0 deg; 0.0087 rad = 0.5 deg
228

329
[ARM]
430

0 commit comments

Comments
 (0)