File tree Expand file tree Collapse file tree 7 files changed +22
-15
lines changed Expand file tree Collapse file tree 7 files changed +22
-15
lines changed Original file line number Diff line number Diff line change 15
15
<param name =" ampsToSensor" > 1000.0 1000.0 1000.0 1000.0 </param >
16
16
<param name =" Gearbox_M2J" > 256 256 256 256 </param >
17
17
<param name =" Gearbox_E2J" > 1 1 1 1 </param >
18
- <param name =" useMotorSpeedFbk" > 0 0 0 0 </param >
18
+ <param name =" useMotorSpeedFbk" > 1 1 1 1 </param >
19
19
<param name =" MotorType" > "DC" "DC" "DC" "DC" </param >
20
20
<param name =" Verbose" > 0 </param >
21
21
</group >
Original file line number Diff line number Diff line change 15
15
<param name =" ampsToSensor" > 1000.0 1000.0 1000.0 1000.0 </param >
16
16
<param name =" Gearbox_M2J" > 256 256 256 256 </param >
17
17
<param name =" Gearbox_E2J" > 1 1 1 1 </param >
18
- <param name =" useMotorSpeedFbk" > 0 0 0 0 </param >
18
+ <param name =" useMotorSpeedFbk" > 1 1 1 1 </param >
19
19
<param name =" MotorType" > "DC" "DC" "DC" "DC" </param >
20
20
<param name =" Verbose" > 0 </param >
21
21
</group >
Original file line number Diff line number Diff line change 15
15
<param name =" ampsToSensor" > 1000.0 1000.0 1000.0 1000.0 </param >
16
16
<param name =" Gearbox_M2J" > 256 256 256 256 </param >
17
17
<param name =" Gearbox_E2J" > 1 1 1 1 </param >
18
- <param name =" useMotorSpeedFbk" > 0 0 0 0 </param >
18
+ <param name =" useMotorSpeedFbk" > 1 1 1 1 </param >
19
19
<param name =" MotorType" > "DC" "DC" "DC" "DC" </param >
20
20
<param name =" Verbose" > 0 </param >
21
21
</group >
31
31
32
32
<param name =" matrixJ2M" >
33
33
1.000 0.000 0.000 0.000
34
- 1.000 +1.000 0.000 0.000
34
+ - 1.000 +1.000 0.000 0.000
35
35
0.000 0.000 1.000 0.000
36
36
0.000 0.000 0.000 1.000
37
37
</param >
38
38
39
39
<param name =" matrixM2J" >
40
40
1.000 0.000 0.000 0.000
41
- - 1.000 +1.000 0.000 0.000
41
+ + 1.000 +1.000 0.000 0.000
42
42
0.000 0.000 1.000 0.000
43
43
0.000 0.000 0.000 1.000
44
44
</param >
Original file line number Diff line number Diff line change 15
15
<param name =" ampsToSensor" > 1000.0 1000.0 1000.0 1000.0 </param >
16
16
<param name =" Gearbox_M2J" > 256 256 256 256 </param >
17
17
<param name =" Gearbox_E2J" > 1 1 1 1 </param >
18
- <param name =" useMotorSpeedFbk" > 0 0 0 0 </param >
18
+ <param name =" useMotorSpeedFbk" > 1 1 1 1 </param >
19
19
<param name =" MotorType" > "DC" "DC" "DC" "DC" </param >
20
20
<param name =" Verbose" > 0 </param >
21
21
</group >
Original file line number Diff line number Diff line change 47
47
<param name =" outputType" > pwm </param >
48
48
<param name =" fbkControlUnits" > metric_units </param >
49
49
<param name =" outputControlUnits" > machine_units </param >
50
- <param name =" kp" > -1000 .0 -500.0 -500.0 -500.0 </param >
51
- <param name =" kd" > -25.0 0.0 0.0 0.0 </param >
52
- <param name =" ki" > -250 .0 -50.0 -50.0 -50.0 </param >
50
+ <param name =" kp" > -200 .0 -500.0 -500.0 -500.0 </param >
51
+ <param name =" kd" > 0.0 0.0 0.0 0.0 </param >
52
+ <param name =" ki" > -200 .0 -50.0 -50.0 -50.0 </param >
53
53
<param name =" maxOutput" > 3360 3360 3360 3360 </param >
54
54
<param name =" maxInt" > 3360 3360 3360 3360 </param >
55
55
<param name =" stictionUp" > 0 0 0 0 </param >
67
67
<param name =" outputType" > pwm </param >
68
68
<param name =" fbkControlUnits" > metric_units </param >
69
69
<param name =" outputControlUnits" > machine_units </param >
70
- <param name =" kp" > -900 0 0 0 </param >
70
+ <param name =" kp" > -1000 0 0 0 </param >
71
71
<param name =" kd" > 0 0 0 0 </param >
72
72
<param name =" ki" > 0 0 0 0 </param >
73
73
<param name =" maxOutput" > 3360 0 0 0 </param >
Original file line number Diff line number Diff line change 47
47
<param name =" outputType" > pwm </param >
48
48
<param name =" fbkControlUnits" > metric_units </param >
49
49
<param name =" outputControlUnits" > machine_units </param >
50
- <param name =" kp" > 1000 .0 500.0 500.0 500.0 </param >
51
- <param name =" kd" > 25 .0 0.0 0.0 0.0 </param >
52
- <param name =" ki" > 2500 .0 50.0 50.0 50.0 </param >
50
+ <param name =" kp" > 200 .0 500.0 500.0 500.0 </param >
51
+ <param name =" kd" > 0 .0 0.0 0.0 0.0 </param >
52
+ <param name =" ki" > 200 .0 50.0 50.0 50.0 </param >
53
53
<param name =" maxOutput" > 3360 3360 3360 3360 </param >
54
54
<param name =" maxInt" > 3360 3360 3360 3360 </param >
55
55
<param name =" stictionUp" > 0 0 0 0 </param >
67
67
<param name =" outputType" > pwm </param >
68
68
<param name =" fbkControlUnits" > metric_units </param >
69
69
<param name =" outputControlUnits" > machine_units </param >
70
- <param name =" kp" > 900 0 0 0 </param >
70
+ <param name =" kp" > 1000 0 0 0 </param >
71
71
<param name =" kd" > 0 0 0 0 </param >
72
72
<param name =" ki" > 0 0 0 0 </param >
73
73
<param name =" maxOutput" > 3360 0 0 0 </param >
Original file line number Diff line number Diff line change 51
51
52
52
<!-- INERTIAL SENSOR-->
53
53
<xi : include href =" wrappers/inertials/head-imuFilter_wrapper.xml" />
54
- <xi : include href =" wrappers/inertials/head-imuFilter.xml" />
54
+ <xi : include href =" wrappers/inertials/head-imuFilter.xml" />
55
55
<xi : include href =" wrappers/inertials/head-inertials_wrapper.xml" />
56
56
<xi : include href =" hardware/inertials/head-inertial.xml" />
57
57
58
+ <xi : include href =" wrappers/inertials/waist-inertials_remapper.xml" />
59
+ <xi : include href =" wrappers/inertials/waist-inertials_wrapper.xml" />
60
+ <xi : include href =" wrappers/inertials/waist-inertials_wrapper-deprecated.xml" />
61
+ <xi : include href =" hardware/inertials/waist-inertial.xml" />
62
+ <xi : include href =" hardware/inertials/waist-eb5-inertials.xml" />
63
+
64
+
58
65
<!-- ANALOG SENSOR MAIS -->
59
66
<xi : include href =" wrappers/MAIS/left_arm-mais_wrapper.xml" />
60
67
<xi : include href =" wrappers/MAIS/right_arm-mais_wrapper.xml" />
You can’t perform that action at this time.
0 commit comments