Skip to content

Commit e53413b

Browse files
committed
fix: Fixed regression that made conf unreadable.
1 parent 8c714bc commit e53413b

File tree

9 files changed

+20
-4
lines changed

9 files changed

+20
-4
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
[COMMON]
2+
13
rate 100.0
24
traj_duration 5.0
35
rpc_local_port_name /cartesian-control/left_arm/rpc:i

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
[COMMON]
2+
13
rate 100.0
24
traj_duration 5.0
35
rpc_local_port_name /cartesian-control/left_arm/rpc:i

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
[COMMON]
2+
13
rate 100.0
24
traj_duration 5.0
35
rpc_local_port_name /cartesian-control/right_arm/rpc:i

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
[COMMON]
2+
13
rate 100.0
24
traj_duration 5.0
35
rpc_local_port_name /cartesian-control/right_arm/rpc:i

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
[COMMON]
2+
13
rate 100.0
24
traj_duration 5.0
35
rpc_local_port_name /cartesian-control/left_arm/rpc:i

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
[COMMON]
2+
13
rate 100.0
24
traj_duration 5.0
35
rpc_local_port_name /cartesian-control/left_arm/rpc:i

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
[COMMON]
2+
13
rate 100.0
24
traj_duration 5.0
35
rpc_local_port_name /cartesian-control/right_arm/rpc:i

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
[COMMON]
2+
13
rate 100.0
24
traj_duration 5.0
35
rpc_local_port_name /cartesian-control/right_arm/rpc:i

src/ergocub_cartesian_control/src/module.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ bool Module::configure(yarp::os::ResourceFinder &rf)
113113
return false;
114114

115115
yarp::os::Bottle FSM_PARAM_bot;
116-
if (!groupCheckAndRetrieve(COMMON_bot, "FSM_PARAM", FSM_PARAM_bot))
116+
if (!groupCheckAndRetrieve(rf, "FSM_PARAM", FSM_PARAM_bot))
117117
return false;
118118

119119
yarp::os::Bottle ARM_bot;
@@ -123,7 +123,7 @@ bool Module::configure(yarp::os::ResourceFinder &rf)
123123

124124

125125
yarp::os::Bottle IK_PARAM_bot;
126-
if (!groupCheckAndRetrieve(COMMON_bot, "IK_PARAM", IK_PARAM_bot))
126+
if (!groupCheckAndRetrieve(rf, "IK_PARAM", IK_PARAM_bot))
127127
return false;
128128

129129

@@ -170,7 +170,7 @@ bool Module::configure(yarp::os::ResourceFinder &rf)
170170
(IK_PARAM_bot.find("limits_param").asFloat64() >= 0.0) && (IK_PARAM_bot.find("limits_param").asFloat64() <= 1.0)) ||
171171
!utils::checkParameters({{"max_joint_position_variation", "max_joint_position_track_error"}}, "", IK_PARAM_bot, "", utils::ParameterType::Float64, false) ||
172172
!utils::checkParameters({{"joint_acc_weight", "position_param", "orientation_param", "joint_pos_param"}}, "", IK_PARAM_bot, "", utils::ParameterType::Float64, true) ||
173-
!utils::checkParameters({{"torso_joints_to_stiffen"}}, "", IK_PARAM_bot, "", utils::ParameterType::Int8, false))
173+
!utils::checkParameters({{"torso_joints_to_stiffen"}}, "", IK_PARAM_bot, "", utils::ParameterType::Int32, false))
174174
{
175175
yError() << module_name_ + "::configure(). Error: mandatory parameter(s) for IK_PARAM group missing or invalid.";
176176
return false;
@@ -192,7 +192,7 @@ bool Module::configure(yarp::os::ResourceFinder &rf)
192192
Eigen::VectorXd joint_pos_param;
193193
extractFromBottle(*IK_PARAM_bot.find("joint_pos_param").asList(), joint_pos_param);
194194

195-
int torso_joints_to_stiffen = IK_PARAM_bot.find("torso_joints_to_stiffen").asInt8();
195+
int torso_joints_to_stiffen = IK_PARAM_bot.find("torso_joints_to_stiffen").asInt32();
196196

197197
max_joint_position_variation_ = IK_PARAM_bot.find("max_joint_position_variation").asFloat64();
198198

0 commit comments

Comments
 (0)