Added Incomming String Parcing and Updated Variable Names

Author: himalayanelixir

arduino_controller/arduino_controller.ino

@@ -10,23 +10,22 @@
 // function declarations
 void RecvWithStartEndMarkers();
 void ProcessData();
-void ShowNewData();
+void CheckSwitch();
+void PopulateArray();
 
 // variables for communication
-const byte numChars = 32;
-char receivedChars[numChars];
-bool newData = false;
+const byte num_chars = 32;
+char received_chars[num_chars];
+bool new_data = false;
 
 // initialize motors
-Servo myServo[NUMBER_MOTORS];
+Servo my_servo[NUMBER_MOTORS];
 // create a array of ports with the order: motor, counter, reset
 int ports[NUMBER_MOTORS][3] = {{2, 3, 4}, {5, 6, 7}};
 
-// string array of motor directions
-String motor_direction[NUMBER_MOTORS] = {""};
+// integer array that contains the direction and number of rotations a motor needs to go
+int motor_commands[NUMBER_MOTORS][2] = {0};
 
-// array of how many rotations a motor has to go
-byte motor_rotation_number[NUMBER_MOTORS] = {0};
 // array of new switch values
 byte motor_sensor_counter1[NUMBER_MOTORS] = {0};
 
@@ -53,7 +52,7 @@ void setup()
     int x = ports[i][0];
     Serial.print(x);
     Serial.print(" ");
-    myServo[i].attach(x);
+    my_servo[i].attach(x);
   }
 
   // initialize all counter ports
@@ -89,12 +88,12 @@ void loop()
   RecvWithStartEndMarkers();
 
   // if there is new data process it
-  if (newData == true)
+  if (new_data == true)
   {
-    newData = false;
+    new_data = false;
     Serial.println("<");
     Serial.print("Arduino: ");
-    Serial.println(receivedChars);
+    Serial.println(received_chars);
     ProcessData();
   }
 }

arduino_controller/arduino_controller_functions.ino

@@ -9,38 +9,9 @@
 
 void ProcessData() {
 
-  /*   // variables
-  String recievedString = "";
-  String motor_rotation_string = "";
-  String motor_rotation_string2 = "";
-
-  recievedString = receivedChars;
-
-  // logic
-  motor_direction = getValue(recievedString, ',', 0);
-  motor_rotation_string = getValue(recievedString, ',', 1);
-  motor_rotation_number = motor_rotation_string.toInt();
-
-  //
-  if (motor_direction == "Up") {
-    myservo1.write(100);
-  }
-  else if (motor_direction == "Down") {
-    myservo1.write(80);
-  }
-
-  else if (motor_direction == "None") {
-    myservo1.write(90);
-  }
-  else if (motor_direction == "Reset") {
-    Reset1();
-  }
-  else
-  {
-    // Sends Error Message
-    Invalid();
-  }
-
+  PopulateArray();
+  
+  /*   
   // Print First Number
   Serial.println("---------");
   Serial.print("Motor 1: ");
@@ -79,7 +50,60 @@ void ProcessData() {
 //////////////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////////
 
-void checkswitch(int switchPort) {
+void PopulateArray() {
+
+  // 
+  String recieved_string = "";
+  recieved_string = received_chars;
+
+  for (int i = 0; i < NUMBER_MOTORS; i++)
+  {
+    int search1 = (i * 2);
+    int search2 = ((i * 2 ) + 1);
+    
+    String value1 = getValue(recieved_string, ',', search1);
+    String value2  = getValue(recieved_string, ',', search2);
+    
+    if (value1 == "Up") {
+      motor_commands[i][1] = 0;
+    }
+    else if (value1 == "Down") {
+      motor_commands[i][1] = 1;
+    }
+
+    else if (value1 == "None") {
+      motor_commands[i][1] = 2;
+    }
+    else if (value1 == "Reset") {
+      motor_commands[i][1] = 3;
+    }
+    else
+    {
+      // Sends Error Message
+      Invalid();
+    }
+
+    motor_commands[i][2] = value2.toInt();
+  }
+
+  // print array
+  for (int i = 0; i < NUMBER_MOTORS; i++)
+  {
+    Serial.print("Motor Number: ");
+    Serial.print(i);
+    Serial.print(" - ");
+    Serial.print(motor_commands[i][1]);
+    Serial.print(" - ");
+    Serial.println(motor_commands[i][2]);
+  }
+
+
+}
+
+//////////////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////////////
+
+void CheckSwitch(int switchPort) {
   // /* Step 1: Update the integrator based on the input signal.  Note that the
   //   integrator follows the input, decreasing or increasing towards the limits
   //   as determined by the input state (0 or 1). */

arduino_controller/communications.ino

@@ -16,27 +16,27 @@ void RecvWithStartEndMarkers()
     char endMarker = '>';
     char rc;
 
-    while (Serial.available() > 0 && newData == false)
+    while (Serial.available() > 0 && new_data == false)
     {
         rc = Serial.read();
 
         if (recvInProgress == true)
         {
             if (rc != endMarker)
             {
-                receivedChars[ndx] = rc;
+                received_chars[ndx] = rc;
                 ndx++;
-                if (ndx >= numChars)
+                if (ndx >= num_chars)
                 {
-                    ndx = numChars - 1;
+                    ndx = num_chars - 1;
                 }
             }
             else
             {
-                receivedChars[ndx] = '\0'; // terminate the string
+                received_chars[ndx] = '\0'; // terminate the string
                 recvInProgress = false;
                 ndx = 0;
-                newData = true;
+                new_data = true;
             }
         }