Skip to content
Snippets Groups Projects
Commit 4cccd3fc authored by Zhaoliang Zheng's avatar Zhaoliang Zheng
Browse files

Merge remote-tracking branch 'origin/main' into main

parents 5c0af070 2e7b7f43
Branches
No related merge requests found
...@@ -25,6 +25,7 @@ void loop() { ...@@ -25,6 +25,7 @@ void loop() {
motorVL->setSpeed(largeVal); motorVL->setSpeed(largeVal);
motorVL->run(FORWARD); motorVL->run(FORWARD);
delay(2000); delay(2000);
<<<<<<< HEAD
<<<<<<< Updated upstream <<<<<<< Updated upstream
Serial.println(" Vertical Left - Backward Slow"); Serial.println(" Vertical Left - Backward Slow");
motorVL->setSpeed(smallVal); motorVL->setSpeed(smallVal);
...@@ -36,10 +37,18 @@ void loop() { ...@@ -36,10 +37,18 @@ void loop() {
motorVL->run(BACKWARD); motorVL->run(BACKWARD);
delay(2000); delay(2000);
>>>>>>> Stashed changes >>>>>>> Stashed changes
=======
Serial.println(" Vertical Left - Backward Slow");
motorVL->setSpeed(smallVal);
motorVL->run(BACKWARD);
delay(2000);
Serial.println(" Vertical Right - Forward Fast");
>>>>>>> main
motorVL->setSpeed(0); motorVL->setSpeed(0);
motorVR->setSpeed(largeVal); motorVR->setSpeed(largeVal);
motorVR->run(FORWARD); motorVR->run(FORWARD);
delay(2000); delay(2000);
<<<<<<< HEAD
<<<<<<< Updated upstream <<<<<<< Updated upstream
Serial.println(" Vertical Right - Backward Slow"); Serial.println(" Vertical Right - Backward Slow");
motorVR->setSpeed(smallVal); motorVR->setSpeed(smallVal);
...@@ -51,25 +60,39 @@ void loop() { ...@@ -51,25 +60,39 @@ void loop() {
motorVR->run(BACKWARD); motorVR->run(BACKWARD);
delay(2000); delay(2000);
>>>>>>> Stashed changes >>>>>>> Stashed changes
=======
Serial.println(" Vertical Right - Backward Slow");
motorVR->setSpeed(smallVal);
motorVR->run(BACKWARD);
delay(2000);
Serial.println(" Horizontal Left - Forward Fast");
>>>>>>> main
motorVR->setSpeed(0); motorVR->setSpeed(0);
motorHL->setSpeed(largeVal); motorHL->setSpeed(largeVal);
motorHL->run(FORWARD); motorHL->run(FORWARD);
delay(2000); delay(2000);
<<<<<<< HEAD
<<<<<<< Updated upstream <<<<<<< Updated upstream
=======
>>>>>>> main
Serial.println(" Horizontal Left - Backward Slow"); Serial.println(" Horizontal Left - Backward Slow");
motorHL->setSpeed(smallVal); motorHL->setSpeed(smallVal);
motorHL->run(BACKWARD); motorHL->run(BACKWARD);
delay(2000); delay(2000);
Serial.println(" Horizontal Right - Forward Fast"); Serial.println(" Horizontal Right - Forward Fast");
<<<<<<< HEAD
======= =======
motorHL->setSpeed(smallVal); motorHL->setSpeed(smallVal);
motorHL->run(BACKWARD); motorHL->run(BACKWARD);
delay(2000); delay(2000);
>>>>>>> Stashed changes >>>>>>> Stashed changes
=======
>>>>>>> main
motorHL->setSpeed(0); motorHL->setSpeed(0);
motorHR->setSpeed(largeVal); motorHR->setSpeed(largeVal);
motorHR->run(FORWARD); motorHR->run(FORWARD);
delay(2000); delay(2000);
<<<<<<< HEAD
<<<<<<< Updated upstream <<<<<<< Updated upstream
Serial.println(" Horizontal Right - Backward Slow"); Serial.println(" Horizontal Right - Backward Slow");
motorHR->setSpeed(smallVal); motorHR->setSpeed(smallVal);
...@@ -82,4 +105,12 @@ void loop() { ...@@ -82,4 +105,12 @@ void loop() {
motorHR->run(BACKWARD); motorHR->run(BACKWARD);
delay(2000); delay(2000);
>>>>>>> Stashed changes >>>>>>> Stashed changes
=======
Serial.println(" Horizontal Right - Backward Slow");
motorHR->setSpeed(smallVal);
motorHR->run(BACKWARD);
delay(2000);
Serial.println();
Serial.println();
>>>>>>> main
} }
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment