Skip to content

Commit 491d234

Browse files
committed
when you tune the pid
#justjonnythings
1 parent 815f7d4 commit 491d234

File tree

2 files changed

+13
-9
lines changed

2 files changed

+13
-9
lines changed

MarkII.c

-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ void setWheelSpeeds (int left, int right) {
7171
setRightWheelSpeed(right);
7272
}
7373

74-
//2 inv
7574
/** Sets all the catapult motors. **/
7675
void setCatapultSpeed (int speed) {
7776
motor[catapult1] = speed;

gyroTest.c

+13-8
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ task calculateError() {
5858
}
5959
*/
6060

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;
6464
task orient () {
6565
float error, integral, derivative, lastError;
6666
int speed;
@@ -84,11 +84,16 @@ task orient () {
8484

8585

8686
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;
9297
spin(speed);
9398
}
9499
}

0 commit comments

Comments
 (0)