lines now working: angle of each motor was est to 0 in constructor
parent
c3bb06f89d
commit
049b0c1830
|
@ -28,6 +28,10 @@ DriveController::DriveController(Motor* m1_, Motor* m2_, Motor* m3_, Motor* m4_)
|
|||
errorP = 0;
|
||||
errorI = 0;
|
||||
errorD = 0;
|
||||
|
||||
errorePre = 0;
|
||||
pidfactor = 0;
|
||||
integral = 0;
|
||||
}
|
||||
|
||||
void DriveController::prepareDrive(int dir, int speed, int tilt){
|
||||
|
|
|
@ -50,7 +50,7 @@ void DataSourceCtrlLines::read(){
|
|||
}
|
||||
|
||||
void DataSourceCtrlLines::postProcess(){
|
||||
if ((inV > 0) || (outV > 0)) {
|
||||
if ((inV > 0) || (outV > 0)) {
|
||||
fboundsOX = true;
|
||||
fboundsOY = true;
|
||||
if(exitTimer > EXTIME) {
|
||||
|
@ -64,7 +64,7 @@ void DataSourceCtrlLines::postProcess(){
|
|||
}
|
||||
|
||||
void DataSourceCtrlLines::outOfBounds(){
|
||||
//handleExtern();
|
||||
handleExtern();
|
||||
handleIntern();
|
||||
}
|
||||
|
||||
|
@ -144,8 +144,8 @@ void DataSourceCtrlLines::handleIntern(){
|
|||
break;
|
||||
}
|
||||
|
||||
if(exitTimer < 45) outVel = 200;
|
||||
else outVel = 150;
|
||||
if(exitTimer < 45) outVel = 350;
|
||||
else outVel = 330;
|
||||
drive->prepareDrive(outDir, outVel, 0);
|
||||
// keeper_backToGoalPost = true;
|
||||
// keeper_tookTimer = true;
|
||||
|
@ -154,7 +154,7 @@ void DataSourceCtrlLines::handleIntern(){
|
|||
inVOldX = 0;
|
||||
inVOldY = 0;
|
||||
// lineSensByteBak = 30;
|
||||
//drive->canUnlock = true;
|
||||
drive->canUnlock = true;
|
||||
}
|
||||
|
||||
// lineSensByteBak = linesensbyteI;
|
||||
|
|
|
@ -11,12 +11,12 @@ void setup() {
|
|||
delay(2000);
|
||||
}
|
||||
|
||||
|
||||
void loop() {
|
||||
updateSensors();
|
||||
|
||||
drive->prepareDrive(0,0,0);
|
||||
linesCtrl->update();
|
||||
|
||||
drive->drivePrepared();
|
||||
|
||||
}
|
||||
|
|
|
@ -11,8 +11,6 @@ Motor::Motor(int a, int b, int pwm, int angle_){
|
|||
pinMode(pinA, OUTPUT);
|
||||
pinMode(pinB, OUTPUT);
|
||||
pinMode(pinPwm, OUTPUT);
|
||||
|
||||
angle = 0;
|
||||
}
|
||||
|
||||
Motor::Motor(){ }
|
||||
|
|
Loading…
Reference in New Issue