diff --git a/include/vars.h b/include/vars.h index 4c42379..1f56cda 100755 --- a/include/vars.h +++ b/include/vars.h @@ -1,5 +1,5 @@ #pragma once -#define DEBUG Serial3 +#define DEBUG Serial #ifdef VARS #define extr diff --git a/src/main.cpp b/src/main.cpp index d44002f..4ff75dc 100755 --- a/src/main.cpp +++ b/src/main.cpp @@ -27,13 +27,12 @@ void setup() { void loop() { updateSensors(); - + //TestMenu testmenu; + //testmenu.testMenu(); goalie->play(role==1); keeper->play(role==0); - camera->test(); - // Last thing to do: movement and update status vector drive->drivePrepared(); updateStatusVector(); -} +} \ No newline at end of file diff --git a/src/motors_movement/motor.cpp b/src/motors_movement/motor.cpp index c0e301e..cb1589f 100644 --- a/src/motors_movement/motor.cpp +++ b/src/motors_movement/motor.cpp @@ -41,9 +41,9 @@ void Motor::test(){ digitalWrite(pinA, 1); digitalWrite(pinB, 0); analogWrite(pinPwm, 255); - delay(150); + delay(1500); digitalWrite(pinA, 0); digitalWrite(pinB, 1); analogWrite(pinPwm, 255); - delay(150); + delay(1500); } \ No newline at end of file diff --git a/src/test_menu.cpp b/src/test_menu.cpp index dddcc3f..1b10f00 100644 --- a/src/test_menu.cpp +++ b/src/test_menu.cpp @@ -56,6 +56,7 @@ void TestMenu :: testMenu(){ case '0': DEBUG.println("Exiting test menu, may the odds be in your favor c:"); flagtest = false; + DEBUG.flush(); return; break; case '1': @@ -83,6 +84,7 @@ void TestMenu :: testMenu(){ break; case '7': case '8': + if(DEBUG.available() == 0){ DEBUG.println("To do Line Sensors test, decide the role first"); DEBUG.println("1)Keeper"); DEBUG.println("2)Goalie"); @@ -97,6 +99,7 @@ void TestMenu :: testMenu(){ default: DEBUG.println("INVALID ROLE"); break; + } } break; default: