Update new sorting/recv mechanism

crawler_software/arduino/crawler_slave/crawler_slave.ino

@@ -10,27 +10,20 @@
 // This servo is used to wipe and clean the camera lens
 Servo windowWiperServo;
 
-// This is a variable capable of storing up to 4 items
+// Variables populated over i2c from master
-char instruction[32] = "";
+int id;
-
+int val;
-// Values for the id, and raw value of an instruction
-char * id;
-char * raw_value;
 
 void setup() {
   // Attach the wiper servo to pin 9
   windowWiperServo.attach(9);
 
-  // This is only useful for debugging
-  //Serial.begin(9600);
-
   // This is the address the pi will speak to us at
-  Wire.begin(0x4);
+  Wire.begin(0x8);
   
   // Call receiveEvent when data received                
   Wire.onReceive(receiveEvent);
   
-  //Serial.println("Finished Setup.");  
 }
 
 // Just loop to keep the running code alive, and wait for events to happen.
@@ -40,27 +33,14 @@ void loop() {
 
 // This method runs when we receive a message
 void receiveEvent(int n) {
-
+  while (Wire.available()) { // loop through all but the last
-  for (int i = 0; i < n; i++) {
+    id  = Wire.read(); // ID of the servo/device to access
-    instruction[i] = Wire.read();
+    val = Wire.read(); // Value to assign
-    instruction[i + 1] = '\0'; //add null after ea. char
   }
 
-  //RPi first byte is cmd byte so shift everything to the left 1 pos so temp contains our string
+  switch(id) {
-  for (int i = 0; i < n; ++i)
+    case 1:
-    instruction[i] = instruction[i + 1];
+      windowWiperServo.write(val);
-
+      break;
-  id = strtok (instruction, "-");
-  raw_value = strtok (NULL, "-");
-
-  int value = atoi(raw_value);
-
-  //Serial.println(id);
-  //Serial.println(value);
-
-  // Switch statements dont work on char *
-  if (strcmp(id,"WIPE") == 0) // if id, and WIPE cancel out
-  {
-    windowWiperServo.write(value);
   }
 }