Add code from the new years dance off.

Author: jerhon

Diff for: Danceoff.cpp

@@ -1,6 +1,7 @@
 #include "Danceoff.h"
 
-Danceoff::Danceoff(Car* car) {
+Danceoff::Danceoff(Car *car)
+{
     _car = car;
 }
 
@@ -13,11 +14,13 @@ Danceoff::Danceoff(Car* car) {
 // car->stop();
 // delay(milliseconds)
 
-void Danceoff::dance0() {
-    
+void Danceoff::dance0()
+{
+
     _car->setSpeed(100);
 
-    for (int i = 0; i < 10; i++) {
+    for (int i = 0; i < 10; i++)
+    {
         _car->moveForward();
         delay(500);
         _car->turnLeft();
@@ -27,13 +30,140 @@ void Danceoff::dance0() {
         _car->turnLeft();
         delay(500);
     }
+
     _car->stop();
 }
 
+void Danceoff::dance1()
+{
+    _car->setSpeed(100);
+
+    for (int i = 0; i < 20; i++)
+    {
+        _car->turnLeft();
+        delay(250);
+        _car->moveForward();
+        delay(250);
+    }
+
+    _car->moveBackward();
+    delay(2000);
+
+    _car->moveForward();
+    delay(2000);
+
+    _car->turnRight();
+    delay(2000);
+
+    _car->turnLeft();
+    delay(2000);
 
-void Danceoff::dance1() {
+    _car->moveBackward();
+    delay(2000);
+
+    _car->stop();
+}
 
+void Danceoff::dance2()
+{
     _car->setSpeed(100);
-    
 
+    _car->turnLeft();
+    delay(5000);
+
+    _car->moveForward();
+    delay(500);
+
+    _car->turnRight();
+    delay(5000);
+
+    _car->moveForward();
+    delay(500);
+
+    _car->moveBackward();
+    delay(500);
+
+    _car->turnLeft();
+    delay(500);
+
+    _car->moveBackward();
+    delay(2500);
+
+    _car->turnRight();
+    delay(500);
+
+    _car->moveForward();
+    delay(500);
+
+    _car->moveBackward();
+    delay(500);
+
+    _car->stop();
+}
+
+void Danceoff::dance3()
+{
+
+    _car->setSpeed(100);
+
+    for (int i = 0; i < 10; i++)
+    {
+        _car->moveBackward();
+        delay(250);
+
+        _car->moveForward();
+        delay(250);
+    }
+
+    for (int i = 0; i < 3; i++)
+    {
+        _car->turnLeft();
+        delay(1000);
+
+        _car->turnRight();
+        delay(1000);
+    }
+
+    for (int i = 0; i < 10; i++)
+    {
+        _car->moveForward();
+        delay(250);
+
+        _car->turnLeft();
+        delay(250);
+
+        _car->moveBackward();
+        delay(250);
+
+        _car->turnRight();
+        delay(250);
+    }
+
+    _car->stop();
+}
+
+int Danceoff::length()
+{
+    return 4;
+}
+
+void Danceoff::dance(int number)
+{
+    switch (number)
+    {
+    case 0:
+        dance0();
+        break;
+    case 1:
+        dance1();
+        break;
+    case 2:
+        dance2();
+        break;
+    case 3:
+        dance3();
+        break;
+    default:
+        break;
+    }
 }

Diff for: Danceoff.h

@@ -4,17 +4,22 @@
 #include <Arduino.h>
 #include "Car.h"
 
+// TODO: split each dance into a seperate class
+
 class Danceoff
 {
-    Car* _car;
+    Car *_car;
 
 public:
     Danceoff(Car *car);
-    
+
     void dance0();
     void dance1();
     void dance2();
     void dance3();
+
+    int length();
+    void dance(int number);
 };
 
 #endif

Diff for: README.md

@@ -2,16 +2,18 @@
 
 ## License
 
-Read the LICENSE  file included in the repository.
+Read the LICENSE file included in the repository.
 
 ## Overview
 
 This is a personal arduino project based on the LAFVIIN Multi-Functional Smart Car Kit.
 
 ### Danceoff
 
-This is a class I wrote with my kids to program the robot to do certian dances.  After we were done, we had a danceoff where we had someone vote for their favorite dance.
+This is a class I wrote with my kids and wife to program the robot to do a dance they came up with.  After we were done, we had a danceoff where we had a 3rd party vote for their favorite dance.
+
+dance3 was the winner.
 
 ## Tooling
 
-Use the arduino IDE to load, or VS code after setting it up for c++/arduino development.
+Use the Arduino IDE to load, or Arduino extension for VS Code after setting it up for C++/Arduino development.

Diff for: arduino-bot.ino

@@ -17,46 +17,70 @@ void setup()
 
     tinyDancer = new Danceoff(car);
 
-    // Setup Serial
+    // I have a bluetooth card which is wired to send data over the serial port.
     Serial.begin(9600);
 }
 
+void allDances()
+{
+    for (int i = 0; i < tinyDancer->length(); i++)
+    {
+        tinyDancer->dance(i);
+    }
+}
+
 void serialControl()
 {
     if (Serial.available())
     {
-        unsigned char direction = Serial.read();
-
+        unsigned char command = Serial.read();
         car->setSpeed(100);
-        switch (direction)
+        switch (command)
         {
         case 'F':
             car->moveForward();
+            delay(1000);
+            car->stop();
+
             break;
         case 'B':
             car->moveBackward();
+            delay(1000);
+            car->stop();
+
             break;
         case 'L':
             car->turnLeft();
+
             break;
         case 'R':
             car->turnRight();
             break;
         case 'S':
             car->stop();
             break;
-        case 'D':
-            //dance();
+
+        // TODO: store this in some sort of dictionary, and get rid of the switch
+        case '0':
+            tinyDancer->dance0();
+            break;
+        case '1':
+            tinyDancer->dance1();
+            break;
+        case '2':
+            tinyDancer->dance2();
+            break;
+        case '3':
+            tinyDancer->dance3();
+            break;
+        case '4':
+            allDances();
             break;
         }
     }
 }
 
 void loop()
 {
-    tinyDancer->dance0();
-
-    while (true) {
-        delay(500);
-    }
-}
+    serialControl();
+}