Merge pull request #89 from robotology/devel

Merge devel in master and do a release
robotology · May 30, 2021 · 955de8f · 955de8f
2 parents 1c9dd81 + 85debb1
commit 955de8f
Show file tree

Hide file tree

Showing 16 changed files with 2,048 additions and 2,042 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,12 @@ All notable changes to this project will be documented in this file.
 
 The format of this document is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+
+## [1.20.0] - 2021-05-30
+
+### Changed
+The gains and damping parameters of `iCubGazeboV3` have been changed (https://github.com/robotology/icub-models-generator/pull/199).
+
 ## [1.19.0] - 2021-02-24
 
 ### Added 

diff --git a/iCub/conf_icub3/gazebo_icub_left_leg.ini b/iCub/conf_icub3/gazebo_icub_left_leg.ini
@@ -37,9 +37,9 @@ max_damping   100.0  100.0  100.0  100.0  100.0  100.0
 [POSITION_CONTROL]
 controlUnits  metric_units
 controlLaw    joint_pid_gazebo_v1
-kp            15.453 22.453 17.453 30.00  25.453 25.453
-kd            0.174  0.174  0.174  0.174  0.174  0.174
-ki            0.174  0.174  0.174  0.174  0.174  5.174
+kp            40.0   40.0   40.0   40.0   40.0   40.0
+kd            0.35   0.35   0.35   0.35   0.35   0.35
+ki            0.35   0.35   0.35   0.35   0.35   0.35
 maxInt        9999   9999   9999   9999   9999   9999
 maxOutput     9999   9999   9999   9999   9999   9999
 shift         0.0    0.0    0.0    0.0    0.0    0.0

diff --git a/iCub/conf_icub3/gazebo_icub_right_leg.ini b/iCub/conf_icub3/gazebo_icub_right_leg.ini
@@ -37,9 +37,9 @@ max_damping   100.0  100.0  100.0  100.0  100.0  100.0
 [POSITION_CONTROL]
 controlUnits  metric_units
 controlLaw    joint_pid_gazebo_v1
-kp            15.453 22.453 17.453 30.00  25.453 25.453
-kd            0.174  0.174  0.174  0.174  0.174  0.174
-ki            0.174  0.174  0.174  0.174  0.174  5.174
+kp            40.0   40.0   40.0   40.0   40.0   40.0
+kd            0.35   0.35   0.35   0.35   0.35   0.35
+ki            0.35   0.35   0.35   0.35   0.35   0.35
 maxInt        9999   9999   9999   9999   9999   9999
 maxOutput     9999   9999   9999   9999   9999   9999
 shift         0.0    0.0    0.0    0.0    0.0    0.0

diff --git a/iCub/conf_icub3/gazebo_icub_torso.ini b/iCub/conf_icub3/gazebo_icub_torso.ini
@@ -37,9 +37,9 @@ max_damping   100.0  100.0  100.0
 [POSITION_CONTROL]
 controlUnits  metric_units
 controlLaw    joint_pid_gazebo_v1
-kp            1.745 5.745 15.745
-kd            0.174 0.174 0.174
-ki            0.174 4.174 3.174
+kp            40.0  40.0  40.0
+kd            0.35  0.35  0.35
+ki            0.35  0.35  0.35
 maxInt        9999  9999  9999
 maxOutput     9999  9999  9999
 shift         0.0   0.0   0.0

diff --git a/iCub/robots/iCubDarmstadt01/model.urdf b/iCub/robots/iCubDarmstadt01/model.urdf
diff --git a/iCub/robots/iCubErzelli02/model.urdf b/iCub/robots/iCubErzelli02/model.urdf
diff --git a/iCub/robots/iCubGazeboV2_5/model.urdf b/iCub/robots/iCubGazeboV2_5/model.urdf
diff --git a/iCub/robots/iCubGazeboV2_5_plus/model.urdf b/iCub/robots/iCubGazeboV2_5_plus/model.urdf
diff --git a/iCub/robots/iCubGazeboV2_6/model.urdf b/iCub/robots/iCubGazeboV2_6/model.urdf
diff --git a/iCub/robots/iCubGazeboV2_7/model.urdf b/iCub/robots/iCubGazeboV2_7/model.urdf
diff --git a/iCub/robots/iCubGazeboV3/model.urdf b/iCub/robots/iCubGazeboV3/model.urdf
diff --git a/iCub/robots/iCubGenova01/model.urdf b/iCub/robots/iCubGenova01/model.urdf
diff --git a/iCub/robots/iCubGenova02/model.urdf b/iCub/robots/iCubGenova02/model.urdf
diff --git a/iCub/robots/iCubGenova04/model.urdf b/iCub/robots/iCubGenova04/model.urdf
diff --git a/iCub/robots/iCubGenova04_plus/model.urdf b/iCub/robots/iCubGenova04_plus/model.urdf
diff --git a/iCub/robots/iCubGenova09/model.urdf b/iCub/robots/iCubGenova09/model.urdf