Merge

include/vars.h

@@ -1,5 +1,5 @@
 #pragma once
-#define DEBUG Serial3
+#define DEBUG Serial
 
 #ifdef VARS
 #define extr

src/main.cpp

@@ -27,12 +27,11 @@ 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();

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);
 }

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");
@@ -98,6 +100,7 @@ void TestMenu :: testMenu(){
                         DEBUG.println("INVALID ROLE");
                     break;
                     }
+                }
             break;
             default:
             break;