Skip to content

Commit d46ae0a

Browse files
authored
Merge pull request #4 from hsp-iit/fix/def_context
Fixed default context for r1-cart-control
2 parents 20fdf11 + 5231a5d commit d46ae0a

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

src/r1_cartesian_control/app/conf/config_left_sim_r1.ini

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
rate 100.0
22
traj_duration 5.0
33
rpc_local_port_name /r1-cartesian-control/left_arm/rpc:i
4-
position_error_th 0.0005
4+
position_error_th 0.005
55
max_iteration 10000
6-
module_logging false
7-
module_verbose false
6+
module_logging true
7+
module_verbose true
88
qp_verbose false
99

1010
[ARM]
@@ -24,7 +24,7 @@ orientation_param (10.0 0.5) #(cost weight, proportional gain)
2424
joint_pos_param (2.5 10.0 5.0) #(cost weight, proportional gain, derivative gain)
2525
max_joint_position_variation 25.0 #[deg]
2626
max_joint_position_track_error 1.5 #[deg]
27-
#joint_ref (0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0)
27+
# joint_ref (0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0)
2828

2929
[FK_PARAM]
3030

@@ -33,4 +33,4 @@ ee_frame_name l_hand_palm
3333

3434
[FSM_PARAM]
3535

36-
stop_speed 0.001 #[rad] = 0.286478898 deg
36+
stop_speed 0.005 #[rad] = 0.286478898 deg

src/r1_cartesian_control/app/conf/config_right_sim_r1.ini

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
rate 100.0
22
traj_duration 5.0
33
rpc_local_port_name /r1-cartesian-control/right_arm/rpc:i
4-
position_error_th 0.0005
4+
position_error_th 0.005
55
max_iteration 10000
6-
module_logging false
7-
module_verbose false
6+
module_logging true
7+
module_verbose true
88
qp_verbose false
99

1010
[ARM]
@@ -24,7 +24,7 @@ orientation_param (10.0 0.5) #(cost weight, proportional gain)
2424
joint_pos_param (2.5 10.0 5.0) #(cost weight, proportional gain, derivative gain)
2525
max_joint_position_variation 25.0 #[deg]
2626
max_joint_position_track_error 1.5 #[deg]
27-
#joint_ref (0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0)
27+
# joint_ref (0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0)
2828

2929
[FK_PARAM]
3030

@@ -33,4 +33,4 @@ ee_frame_name r_hand_palm
3333

3434
[FSM_PARAM]
3535

36-
stop_speed 0.001 #[rad] = 0.286478898 deg
36+
stop_speed 0.005 #[rad] = 0.286478898 deg

src/r1_cartesian_control/src/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ int main(int argc, char** argv)
2222
/* Load configuration file. */
2323
yarp::os::ResourceFinder rf;
2424
rf.setVerbose(false);
25-
rf.setDefaultContext("gb-ergocub-cartesian-controller");
25+
rf.setDefaultContext("r1-cartesian-control");
2626
rf.setDefaultConfigFile("config_right.ini");
2727
rf.configure(argc, argv);
2828

0 commit comments

Comments
 (0)