Skip to content

Commit e79d3bd

Browse files
pattacinipattacini
committed
Merge branch 'master' into devel
2 parents 3ee19d2 + f6c68bd commit e79d3bd

File tree

8 files changed

+1660
-72
lines changed

8 files changed

+1660
-72
lines changed

‎naoPrague01/hardware/conf/nao_head.ini‎

100644100755
Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@ height 360
44

55
[SENSORS]
66
# Number X Y Orientation (degree) Gain Mirror Boh
7-
triangle_10pad 0 100.00 100.00 -120.00 5 0
8-
triangle_10pad 1 116.00 109.24 -60.00 5 0
9-
triangle_10pad 2 132.00 100.00 -120.00 5 0
10-
triangle_10pad 3 148.00 109.24 -60.00 5 0
11-
triangle_10pad 4 148.00 127.71 0.00 5 0
12-
triangle_10pad 5 164.00 136.95 -60.00 5 0
13-
triangle_10pad 6 164.00 155.43 0.00 5 0
14-
triangle_10pad 7 148.00 164.66 60.00 5 0
15-
triangle_10pad 12 116.00 127.71 0.00 5 0
16-
triangle_10pad 13 132.00 136.95 -60.00 5 0
17-
triangle_10pad 8 132.00 155.43 0.00 5 0
7+
triangle_10pad 0 62.9903810568 94.10254037844388 -90.0 5 0
8+
triangle_10pad 1 72.2267875173 110.10461510941208 -30.0 5 0
9+
triangle_10pad 2 90.7031939779 110.10254037844388 -90.0 5 0
10+
triangle_10pad 3 99.9396004384 126.10461510941208 -30.0 5 0
11+
triangle_10pad 4 90.7046004384 142.10010431731067 30.0 5 0
12+
triangle_10pad 5 99.941006899 158.10217904827886 -30.0 5 0
13+
triangle_10pad 6 90.701006899 174.10632851021532 30.0 5 0
14+
triangle_10pad 7 72.2296004384 174.09974298714567 90.0 5 0
15+
triangle_10pad 12 62.9917875173 126.10010431731067 30.0 5 0
16+
triangle_10pad 13 72.2281939779 142.10217904827886 -30.0 5 0
17+
triangle_10pad 8 62.9881939779 158.10632851021532 30.0 5 0
1818

1919

2020

@@ -27,18 +27,19 @@ triangle_10pad 8 132.00 155.43 0.00 5 0
2727

2828

2929

30-
triangle_10pad 15 148.00 183.14 0.00 5 0
31-
triangle_10pad 16 -100.00 100.00 120.00 5 1
32-
triangle_10pad 17 -116.00 109.24 60.00 5 1
33-
triangle_10pad 18 -132.00 100.00 120.00 5 1
34-
triangle_10pad 19 -148.00 109.24 60.00 5 1
35-
triangle_10pad 20 -148.00 127.71 0.00 5 1
36-
triangle_10pad 21 -164.00 136.95 60.00 5 1
37-
triangle_10pad 22 -164.00 155.43 0.00 5 1
38-
triangle_10pad 23 -148.00 164.66 -60.00 5 1
39-
triangle_10pad 28 -116.00 127.71 0.00 5 1
40-
triangle_10pad 29 -132.00 136.95 60.00 5 1
41-
triangle_10pad 24 -132.00 155.43 0.00 5 1
30+
triangle_10pad 15 62.9896004384 190.10389244908208 30.0 5 0
31+
triangle_10pad 16 37.01039956158034 190.10389244908208 90.0 5 0
32+
triangle_10pad 17 27.770399561580348 174.09974298714567 150.0 5 0
33+
triangle_10pad 18 9.298993101029325 174.10632851021532 90.0 5 0
34+
triangle_10pad 19 0.05899310102931565 158.10217904827886 150.0 5 0
35+
triangle_10pad 20 9.295399561580354 142.10010431731067 -150.0 5 0
36+
triangle_10pad 21 0.06039956158035409 126.10461510941208 150.0 5 0
37+
triangle_10pad 22 9.29680602213137 110.10254037844388 -150.0 5 0
38+
triangle_10pad 23 27.77321248268239 110.10461510941208 -90.0 5 0
39+
triangle_10pad 28 37.01180602213137 158.10632851021532 -150.0 5 0
40+
triangle_10pad 29 27.771806022131358 142.10217904827886 150.0 5 0
41+
triangle_10pad 24 37.00821248268239 126.10010431731067 -150.0 5 0
42+
4243

4344

4445

@@ -51,4 +52,4 @@ triangle_10pad 24 -132.00 155.43 0.00 5 1
5152

5253

5354

54-
triangle_10pad 31 -148.00 183.14 0.00 5 1
55+
triangle_10pad 31 37.00961894323341 94.10254037844388 -150.0 5 0

‎naoPrague01/hardware/conf/nao_left_hand.ini‎

100644100755
Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -4,29 +4,29 @@ height 360
44

55
[SENSORS]
66
# Number X Y Orientation (degree) Gain Mirror Boh
7-
triangle_10pad 0 100.00 100.00 -120.00 5 0
8-
triangle_10pad 1 116.00 109.24 -60.00 5 0
9-
triangle_10pad 2 132.00 100.00 -120.00 5 0
10-
triangle_10pad 3 148.00 109.24 -60.00 5 0
11-
triangle_10pad 4 148.00 127.71 0.00 5 0
12-
triangle_10pad 5 164.00 136.95 -60.00 5 0
13-
triangle_10pad 6 164.00 155.43 0.00 5 0
14-
triangle_10pad 7 148.00 164.66 60.00 5 0
15-
triangle_10pad 12 116.00 127.71 0.00 5 0
16-
triangle_10pad 13 132.00 136.95 -60.00 5 0
17-
triangle_10pad 8 132.00 155.43 0.00 5 0
18-
triangle_10pad 9 116.00 164.66 60.00 5 0
7+
triangle_10pad 0 186.602540378 98.397459622 -180.0 5 0
8+
triangle_10pad 1 202.604615109 89.161053161 -120.0 5 0
9+
triangle_10pad 2 202.602540378 70.6846467005 -180.0 5 0
10+
triangle_10pad 3 218.604615109 61.4482402399 -120.0 5 0
11+
triangle_10pad 4 234.600104317 70.6832402399 -60.0 5 0
12+
triangle_10pad 5 250.602179048 61.4468337794 -120.0 5 0
13+
triangle_10pad 6 266.60632851 70.6868337794 -60.0 5 0
14+
triangle_10pad 7 266.599742987 89.15824024 0.0 5 0
15+
triangle_10pad 12 218.600104317 98.396053161 -60.0 5 0
16+
triangle_10pad 13 234.602179048 89.1596467 -120.0 5 0
17+
triangle_10pad 8 250.60632851 98.3996467 -60.0 5 0
18+
triangle_10pad 9 250.599742987 116.871053161 0.0 5 0
1919

2020

2121

2222

23-
triangle_10pad 10 100.00 155.43 120.00 5 0
23+
triangle_10pad 10 234.60632851 126.112459622 60.0 5 0
2424

2525

2626

27-
triangle_10pad 11 100.00 136.95 180.00 5 0
28-
triangle_10pad 14 84.00 127.71 120.00 5 0
29-
triangle_10pad 15 84.00 109.24 180.00 5 0
27+
triangle_10pad 11 218.602179048 116.872459622 120.0 5 0
28+
triangle_10pad 14 202.600104317 126.108866082 60.0 5 0
29+
triangle_10pad 15 186.604615109 116.873866082 120.0 5 0
3030

3131

3232

@@ -39,14 +39,14 @@ triangle_10pad 15 84.00 109.24 180.00 5 0
3939

4040

4141

42-
triangle_10pad 25 182.79 14.60 30.00 5 0
43-
triangle_10pad 22 192.03 30.60 -30.00 5 0
44-
triangle_10pad 23 210.50 30.60 -90.00 5 0
45-
triangle_10pad 19 182.79 46.60 30.00 5 0
46-
triangle_10pad 20 164.32 46.60 90.00 5 0
47-
triangle_10pad 26 164.32 14.60 90.00 5 0
48-
triangle_10pad 21 155.08 30.60 30.00 5 0
49-
triangle_10pad 31 136.60 30.60 90.00 5 0
42+
triangle_10pad 25 232.79 21.6 510.0 5 1
43+
triangle_10pad 22 242.03 5.6 210.0 5 1
44+
triangle_10pad 23 260.5 5.6 270.0 5 1
45+
triangle_10pad 19 232.79 -10.4 510.0 5 1
46+
triangle_10pad 20 214.32 -10.4 450.0 5 1
47+
triangle_10pad 26 214.32 21.6 450.0 5 1
48+
triangle_10pad 21 205.08 5.6 510.0 5 1
49+
triangle_10pad 31 186.6 5.6 450.0 5 1
5050

5151

5252

‎naoPrague01/hardware/conf/nao_right_hand.ini‎

100644100755
Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -4,29 +4,29 @@ height 360
44

55
[SENSORS]
66
# Number X Y Orientation (degree) Gain Mirror Boh
7-
triangle_10pad 0 100.00 -100.00 -210.00 5 0
8-
triangle_10pad 1 109.24 -116.00 -150.00 5 0
9-
triangle_10pad 2 100.00 -132.00 -210.00 5 0
10-
triangle_10pad 3 109.24 -148.00 -150.00 5 0
11-
triangle_10pad 4 127.71 -148.00 -90.00 5 0
12-
triangle_10pad 5 136.95 -164.00 -150.00 5 0
13-
triangle_10pad 6 155.43 -164.00 -90.00 5 0
14-
triangle_10pad 7 164.66 -148.00 -30.00 5 0
15-
triangle_10pad 12 127.71 -116.00 -90.00 5 0
16-
triangle_10pad 13 136.95 -132.00 -150.00 5 0
17-
triangle_10pad 8 155.43 -132.00 -90.00 5 0
18-
triangle_10pad 9 164.66 -116.00 -30.00 5 0
7+
triangle_10pad 0 -50.00000000000006 225.0 -300.0 5 0
8+
triangle_10pad 1 -66.00000000000006 215.76 -240.0 5 0
9+
triangle_10pad 2 -82.00000000000009 225.0 -300.0 5 0
10+
triangle_10pad 3 -98.00000000000007 215.75999999999993 -240.0 5 0
11+
triangle_10pad 4 -98.00000000000003 197.28999999999996 -180.0 5 0
12+
triangle_10pad 5 -114.00000000000004 188.04999999999998 -240.0 5 0
13+
triangle_10pad 6 -114.00000000000001 169.57 -180.0 5 0
14+
triangle_10pad 7 -98.00000000000003 160.33999999999997 -120.0 5 0
15+
triangle_10pad 12 -66.00000000000006 197.28999999999996 -180.0 5 0
16+
triangle_10pad 13 -82.00000000000003 188.05 -240.0 5 0
17+
triangle_10pad 8 -82.00000000000003 169.57 -180.0 5 0
18+
triangle_10pad 9 -66.00000000000003 160.33999999999997 -120.0 5 0
1919

2020

2121

2222

23-
triangle_10pad 10 155.43 -100.00 30.00 5 0
23+
triangle_10pad 10 -50.000000000000036 169.57 -60.0 5 0
2424

2525

2626

27-
triangle_10pad 11 136.95 -100.00 90.00 5 0
28-
triangle_10pad 14 127.71 -84.00 30.00 5 0
29-
triangle_10pad 15 109.24 -84.00 90.00 5 0
27+
triangle_10pad 11 -50.00000000000004 188.05 0.0 5 0
28+
triangle_10pad 14 -34.00000000000004 197.28999999999996 -60.0 5 0
29+
triangle_10pad 15 -34.00000000000007 215.76 0.0 5 0
3030

3131

3232

@@ -39,14 +39,14 @@ triangle_10pad 15 109.24 -84.00 90.00 5 0
3939

4040

4141

42-
triangle_10pad 25 -200.60 -51.87 180.00 5 0
43-
triangle_10pad 22 -216.60 -61.11 120.00 5 0
44-
triangle_10pad 23 -232.60 -51.87 60.00 5 0
45-
triangle_10pad 19 -216.60 -79.59 180.00 5 0
46-
triangle_10pad 20 -200.60 -88.82 240.00 5 0
47-
triangle_10pad 26 -184.60 -61.11 240.00 5 0
48-
triangle_10pad 21 -184.60 -79.59 180.00 5 0
49-
triangle_10pad 31 -168.60 -88.82 240.00 5 0
42+
triangle_10pad 25 -79.8438161191 88.49100581 690.0 5 1
43+
triangle_10pad 22 -89.0838161191 104.495155272 750.0 5 1
44+
triangle_10pad 23 -107.56022258 104.497230003 450.0 5 1
45+
triangle_10pad 19 -79.8474096586 120.497230003 690.0 5 1
46+
triangle_10pad 20 -61.371003198 120.495155272 630.0 5 1
47+
triangle_10pad 26 -61.3724096586 88.497591333 630.0 5 1
48+
triangle_10pad 21 -52.131003198 104.49100581 690.0 5 1
49+
triangle_10pad 31 -33.6595967375 104.497591333 630.0 5 1
5050

5151

5252

0 commit comments

Comments
 (0)