File tree 2 files changed +13
-9
lines changed
2 files changed +13
-9
lines changed Original file line number Diff line number Diff line change @@ -71,7 +71,6 @@ void setWheelSpeeds (int left, int right) {
71
71
setRightWheelSpeed (right );
72
72
}
73
73
74
- //2 inv
75
74
/** Sets all the catapult motors. **/
76
75
void setCatapultSpeed (int speed ) {
77
76
motor [catapult1 ] = speed ;
Original file line number Diff line number Diff line change @@ -58,9 +58,9 @@ task calculateError() {
58
58
}
59
59
*/
60
60
61
- float Kp = 0.21 ;
62
- float Ki = 0.03 ;
63
- float Kd = 0.17 ;
61
+ float Kp = 0.1 ;
62
+ float Ki = 0.18 ;
63
+ float Kd = 0.16 ;
64
64
task orient () {
65
65
float error , integral , derivative , lastError ;
66
66
int speed ;
@@ -84,11 +84,16 @@ task orient () {
84
84
85
85
86
86
speed = Kp * error + Ki * integral + Kd * derivative ;
87
- if (speed > 80 )
88
- speed = 80 ;
89
- if (speed < -80 )
90
- speed = -80 ;
91
-
87
+ if (speed > -5 && speed < 5 )
88
+ speed = 0 ;
89
+ else if (speed > 127 )
90
+ speed = 127 ;
91
+ else if (speed < -127 )
92
+ speed = -127 ;
93
+ else if (speed < 19 && speed > 0 )
94
+ speed = 19 ;
95
+ else if (speed > -19 && speed < 0 )
96
+ speed = -19 ;
92
97
spin (speed );
93
98
}
94
99
}
You can’t perform that action at this time.
0 commit comments