Makeing Code More Dynamic/ Clean Up

Author: himalayanelixir

arduino_control/ModulusSprint3.3 - Backup.zip

@@ -0,0 +1,6 @@
+{
+    "sketch": "ModulusSprint3.3.ino",
+    "board": "arduino:avr:megaADK",
+    "port": "/dev/cu.usbmodem143101",
+    "programmer": "AVRISP mkII"
+}

arduino_control/ModulusSprint3.3/.vscode/arduino.json

@@ -0,0 +1,20 @@
+{
+    "configurations": [
+        {
+            "name": "Mac",
+            "includePath": [
+                "/Users/harlenbains/Library/Arduino15/packages/arduino/tools/**",
+                "/Users/harlenbains/Library/Arduino15/packages/arduino/hardware/avr/1.6.21/**"
+            ],
+            "forcedInclude": [
+                "/Users/harlenbains/Library/Arduino15/packages/arduino/hardware/avr/1.6.21/cores/arduino/Arduino.h"
+            ],
+            "macFrameworkPath": [
+                "/System/Library/Frameworks",
+                "/Library/Frameworks"
+            ],
+            "intelliSenseMode": "clang-x64"
+        }
+    ],
+    "version": 4
+}

arduino_control/ModulusSprint3.3/.vscode/c_cpp_properties.json

@@ -5,6 +5,53 @@
 #define SAMPLE_FREQUENCY  20
 #define MAXIMUM     (DEBOUNCE_TIME * SAMPLE_FREQUENCY)
 
+#define NUMBER_MOTORS 4
+
+// create a array of ports. Each line corresponds to the motor number starting from 0
+// ie 0 is motor 1
+// the order of the ports is motor, counter, reset
+int ports[NUMBER_MOTORS][3] = {{2, 3, 4},{5, 6, 7}};
+// initialize motors
+Servo myServo[NUMBER_MOTORS];
+
+void setup() {
+  Serial.begin(9600);
+  
+  // initialize all motor ports
+  Serial.println("Begining Initialization");
+  Serial.print("Motor Ports: ");
+  for (int i = 0; i < NUMBER_MOTORS; i++) {
+    int x = ports[i][0];\
+    Serial.print(x);
+    Serial.print(" ");
+    pinMode(x, OUTPUT);
+  }
+
+  // initialize all counter ports
+  Serial.println("");
+  Serial.print("Counter Ports: ");
+  for (int i = 0; i < NUMBER_MOTORS; i++) {
+    int x = ports[i][1];
+    Serial.print(x);
+    Serial.print(" ");
+    pinMode(x, INPUT_PULLUP);
+  }
+
+  // initialize all reset ports
+  Serial.println("");
+  Serial.print("Reset Ports: ");
+  for (int i = 0; i < NUMBER_MOTORS; i++) {
+    int x = ports[i][2];
+    Serial.print(x);
+    Serial.print(" ");
+    pinMode(x, INPUT_PULLUP);
+  }
+  Serial.println("");
+  Serial.println("<");
+  Serial.println("Arduino is ready");
+  Serial.println(">");
+}
+
 // function declarations
 void RecvWithStartEndMarkers();
 void ProcessData();
@@ -26,194 +73,145 @@ String motor_direction = "";
 byte motor_rotation_number = 0;
 byte motor_sensor_counter1 = 0;
 byte motor_sensor_counter2 = 0;
-// 
-// variables for motor 2
-Servo myservo2;
-byte motor_port2 = 9;
-byte motor_counter_port2 = 8;
-byte motor_reset_port2 = 7;
-// motor info
-String motor_direction2 = "";
-byte motor_rotation_number2 = 0;
-byte motor_sensor_counter12 = 0;
-byte motor_sensor_counter22 = 0;
 //
+
 byte input;       /* 0 or 1 depending on the input signal */
 int integrator;  /* Will range from 0 to the specified MAXIMUM */
 byte output;      /* Cleaned-up version of the input signal */
 
-byte input2;       /* 0 or 1 depending on the input signal */
-int integrator2;  /* Will range from 0 to the specified MAXIMUM */
-byte output2;      /* Cleaned-up version of the input signal */
-
 //////////////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////////
 
 void ProcessData() {
-  
+
   // variables
   String recievedString = "";
   String motor_rotation_string = "";
   String motor_rotation_string2 = "";
-  // logic
+
   recievedString = receivedChars;
-  motor_direction = getValue(recievedString, ',', 0);  
+
+  // logic
+  motor_direction = getValue(recievedString, ',', 0);
   motor_rotation_string = getValue(recievedString, ',', 1);
   motor_rotation_number = motor_rotation_string.toInt();
 
-//
-  motor_direction2 = getValue(recievedString, ',', 2);  
-  motor_rotation_string2 = getValue(recievedString, ',', 3);
-  motor_rotation_number2 = motor_rotation_string2.toInt();
-//
-
+  //
   if (motor_direction == "Up") {
     myservo1.write(100);
   }
   else if (motor_direction == "Down") {
-   myservo1.write(80);
+    myservo1.write(80);
   }
 
-  else if (motor_direction == "None"){
+  else if (motor_direction == "None") {
     myservo1.write(90);
   }
-  else if (motor_direction == "Reset"){
+  else if (motor_direction == "Reset") {
     Reset1();
   }
   else
   {
-      // TODO: make this exit the program
-      Serial.println("<");  
-      Serial.print("Arduino: ");
-      Serial.println("Invalid Input!");
+    // Sends Error Message
+    Invalid();
   }
-  
-  while(true) {
-    
+
+  // Print First Number
+  Serial.println("---------");
+  Serial.print("Motor 1: ");
+  Serial.println(motor_rotation_number);
+
+  while (true) {
+
     motor_sensor_counter2 = motor_sensor_counter1;
     checkswitch(motor_counter_port);
     motor_sensor_counter1 = output;
     delay(10);
-    
-    if(motor_rotation_number == 0) {
+
+    if (motor_rotation_number == 0) {
       myservo1.write(90);
       break;
     }
-    
-    if(digitalRead(motor_reset_port) == 0){
+
+    if (digitalRead(motor_reset_port) == 0) {
       myservo1.write(90);
       break;
     }
-    
-    if(motor_sensor_counter1 == 1 && motor_sensor_counter2 == 0) {
+
+    if (motor_sensor_counter1 == 1 && motor_sensor_counter2 == 0) {
       motor_rotation_number--;
-    }
-  }
 
-  if (motor_direction2 == "Up") {
-    myservo2.write(100);
-  }
-  else if (motor_direction2 == "Down") {
-   myservo2.write(80);
-  }
-  else if (motor_direction2 == "None"){
-    myservo2.write(90);
-  }
-  else if (motor_direction2 == "Reset"){
-    Reset2();
-  }
-  else
-  {
-      // TODO: make this exit the program
-      Serial.println("<");  
-      Serial.print("Arduino: ");
-      Serial.println("Invalid Input!");
-  }
-  
-  while(true) {
-    
-    motor_sensor_counter22 = motor_sensor_counter12;
-    checkswitch2(motor_counter_port2);
-    motor_sensor_counter12 = output2;
-    delay(10);
-    
-    if(motor_rotation_number2 == 0) {
-      myservo2.write(90);
-      break;
-    }
-    
-    if(digitalRead(motor_reset_port2) == 0){
-      myservo2.write(90);
-      break;
-    }
-    
-    if(motor_sensor_counter12 == 1 && motor_sensor_counter22 == 0) {
-      motor_rotation_number2--;
+      // Print Number Every Time It Changes
+      Serial.print("Motor 1: ");
+      Serial.println(motor_rotation_number);
     }
   }
-  
+
+  // Send Finished Signal
+  Finished();
+
 }
 
 //////////////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////////
 
 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 
+  /* 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). */
-    input = digitalRead(switchPort);
+  input = digitalRead(switchPort);
 
-    if (input == 0)
-        {
-        if (integrator > 0)
-        integrator--;
-        }
-    else if (integrator < MAXIMUM)
-        integrator++;
+  if (input == 0)
+  {
+    if (integrator > 0)
+      integrator--;
+  }
+  else if (integrator < MAXIMUM)
+    integrator++;
 
-    /* Step 2: Update the output state based on the integrator.  Note that the
+  /* Step 2: Update the output state based on the integrator.  Note that the
     output will only change states if the integrator has reached a limit, either
     0 or MAXIMUM. */
 
-    if (integrator == 0)
-        output = 0;
-    else if (integrator >= MAXIMUM)
-        {
-        output = 1;
-        integrator = MAXIMUM;  /* defensive code if integrator got corrupted */
-        }
+  if (integrator == 0)
+    output = 0;
+  else if (integrator >= MAXIMUM)
+  {
+    output = 1;
+    integrator = MAXIMUM;  /* defensive code if integrator got corrupted */
+  }
 
-    /********************************************************* End of debounce.c */
+  /********************************************************* End of debounce.c */
 }
 
 //////////////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////////
 
-void checkswitch2(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). */
-    input2 = digitalRead(switchPort);
-
-    if (input2 == 0)
-        {
-        if (integrator2 > 0)
-        integrator2--;
-        }
-    else if (integrator2 < MAXIMUM)
-        integrator2++;
-
-    /* Step 2: Update the output state based on the integrator.  Note that the
-    output will only change states if the integrator has reached a limit, either
-    0 or MAXIMUM. */
-
-    if (integrator2 == 0)
-        output2 = 0;
-    else if (integrator2 >= MAXIMUM)
-        {
-        output2 = 1;
-        integrator2 = MAXIMUM;  /* defensive code if integrator got corrupted */
-        }
-
-    /********************************************************* End of debounce.c */
-}
+//void checkswitch2(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). */
+//    input2 = digitalRead(switchPort);
+//
+//    if (input2 == 0)
+//        {
+//        if (integrator2 > 0)
+//        integrator2--;
+//        }
+//    else if (integrator2 < MAXIMUM)
+//        integrator2++;
+//
+//    /* Step 2: Update the output state based on the integrator.  Note that the
+//    output will only change states if the integrator has reached a limit, either
+//    0 or MAXIMUM. */
+//
+//    if (integrator2 == 0)
+//        output2 = 0;
+//    else if (integrator2 >= MAXIMUM)
+//        {
+//        output2 = 1;
+//        integrator2 = MAXIMUM;  /* defensive code if integrator got corrupted */
+//        }
+//
+//    /********************************************************* End of debounce.c */
+//}