Skip to content

Commit

Permalink
Merge branch 'master' into devel
Browse files Browse the repository at this point in the history
  • Loading branch information
pattacini committed Nov 9, 2023
2 parents 0ba4670 + 7a44f9f commit 58883ab
Show file tree
Hide file tree
Showing 28 changed files with 158 additions and 15 deletions.
File renamed without changes.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
<param name="calibration1"> 1333 1333 1333 600 500 500 </param>
<param name="calibration2"> 40 40 40 -20 20 20 </param>
<param name="calibration3"> 0 0 0 0 0 0 </param>
<param name="calibration4"> 0.00 0.00 0.00 0.00 0.00 0.00 </param>
<param name="calibration5"> 0.00 0.00 0.00 0.00 0.00 0.00 </param>
<param name="calibrationZero"> 0.00 0.00 0.00 0.00 0.00 0.00 </param>
<param name="calibrationDelta"> 0.00 0.00 0.00 0.00 0.00 0.00 </param>
<!--><param name="calibration4"> 0.00 0.00 0.00 0.00 0.00 0.00 </param><-->
<!--><param name="calibration5"> 0.00 0.00 0.00 0.00 0.00 0.00 </param><-->
<!--><param name="calibrationZero"> 0.00 0.00 0.00 0.00 0.00 0.00 </param>
<param name="calibrationDelta"> 0.00 0.00 0.00 0.00 0.00 0.00 </param> <-->
<param name="startupPosition"> 0 0 0 0 0 0 </param>
<param name="startupVelocity"> 10 10 10 10 10 10 </param>
<param name="startupMaxPwm"> 1300 1300 1330 1300 1300 1300 </param>
Expand Down
67 changes: 67 additions & 0 deletions robots-icebox/iCubHalfie01/calibrators/head_calib_appiccicoso.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
<?xml version="1.0" encoding="UTF-8" ?>

<device xmlns:xi="http://www.w3.org/2001/XInclude" name="head_calibrator" type="parametricCalibrator">
<xi:include href="../general.xml" />
<group name="GENERAL">
<param name="joints"> 6 </param>
<param name="deviceName"> Head_Calibrator </param>
</group>

<group name="CALIBRATION">

<param name="calibrationType"> 0 0 0 0 0 0 </param>
<param name="calibration1"> 1333 1333 1333 600 500 500 </param>
<param name="calibration2"> 40 40 40 -20 20 20 </param>
<param name="calibration3"> 0 0 0 0 0 0 </param>
<param name="startupPosition"> 0 0 0 0 0 0 </param>
<param name="startupVelocity"> 10 10 10 10 10 10 </param>
<param name="startupMaxPwm"> 1300 1300 1330 1300 1300 1300 </param>
<param name="startupPosThreshold"> 2 2 180 2 180 180 </param>
</group>

<group name="HOME">
<param name="positionHome"> -40 0 0 0 0 0 </param>
<param name="velocityHome"> 10 10 10 10 10 10 </param>
</group>

<param name="CALIB_ORDER"> (0) (1) (2 3) (5) (4) </param>


<action phase="startup" level="10" type="calibrate">
<param name="target">head_mc_wrapper</param>
</action>

<action phase="interrupt1" level="1" type="park">
<param name="target">head_mc_wrapper</param>
</action>

<action phase="interrupt3" level="1" type="abort" />

</device>



























Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@ capabilities COLOR
width 640
height 480
video_type 3
white_balance 0.477 0.514
white_balance 0.524 0.671
gain 0.0
shutter 0.666
exposure 0.177
shutter 0.869
name /icub/cam/left
brightness 0
brightness 0.658
DR2
stamp
sharpness 1.0
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -19,20 +19,21 @@ drawCenterCross 0

w 320
h 240
fx 221.045
fy 220.894
cx 163.713
cy 115.808
k1 -0.364935
k2 0.123069
p1 0.000974915
p2 -0.000583483
fx 219.823
fy 220.197
cx 165.19
cy 118.094
k1 -0.368733
k2 0.112347
p1 0.00180194
p2 0.000771325

[STEREO_CALIBRATION_CONFIGURATION]
boardWidth 8
boardHeight 6
boardSize 0.09241
numberOfPairs 30
MonoCalib 1

[STEREO_DISPARITY]
HN (0.999322 -0.0112121 -0.0350689 -0.070484 0.010871 0.999892 -0.00990243 -0.00396789 0.0351761 0.00951449 0.999336 -0.00342919 0 0 0 1)
Expand Down
37 changes: 37 additions & 0 deletions robots-icebox/iCubHalfie01/icubEyes_640x480.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
CAMERA_CALIBRATION_RIGHT]
projection pinhole
drawCenterCross 0

w 640
h 480
fx 446.30787465601099
fy 448.44778322512855
cx 313.73434091798771
cy 224.4691342181579
k1 -0.32616218659596552
k2 0.086072743232755614
p1 -0.001835706149853529
p2 -0.001007764102799745

[CAMERA_CALIBRATION_LEFT]
projection pinhole
drawCenterCross 0

w 640
h 480
fx 439.673
fy 437.366
cx 325.21
cy 237.093
k1 -0.391234
k2 0.156156
p1 0.00185163
p2 0.00252081


[STEREO_CALIBRATION_CONFIGURATION]
boardWidth 8
boardHeight 6
boardSize 0.09241
numberOfPairs 30
MonoCalib 1
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,12 @@


<!-- MTX INERTIAL SENSOR & SKIN INERTIAL SENSOR-->
<!--
<xi:include href="wrappers/inertials/head-imuFilter_wrapper.xml" />
<xi:include href="wrappers/inertials/head-imuFilter.xml" />
<xi:include href="wrappers/inertials/head-inertials_wrapper.xml" />
<xi:include href="hardware/inertials/head-inertial.xml" />
-->

<!-- CALIBRATORS -->
<xi:include href="calibrators/head_calib.xml" />
Expand Down
13 changes: 13 additions & 0 deletions robots-icebox/iCubHalfie01/outputCalib.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
[CAMERA_CALIBRATION_LEFT]

w 320
h 240
fx 219.823
fy 220.197
cx 165.19
cy 118.094
k1 -0.368733
k2 0.112347
p1 0.00180194
p2 0.000771325

Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8" ?>

<device xmlns:xi="http://www.w3.org/2001/XInclude" name="head_mc_wrapper" type="controlBoard_nws_yarp">
<paramlist name="networks">
<elem name="head_joints"> 0 5 0 5 </elem>
</paramlist>

<param name="period"> 0.01 </param>
<param name="name"> /icub/head </param>
<param name="ports"> head </param>
<param name="joints"> 6 </param>


<action phase="startup" level="5" type="attach">
<paramlist name="networks">
<elem name="head_joints"> head_mc </elem>
</paramlist>
</action>

<action phase="shutdown" level="5" type="detach" />
</device>

0 comments on commit 58883ab

Please sign in to comment.