Refactored Parsing

  #2 is complete/done.

  We now use notevil's c parser instead of our own (mess).

  The python code senders should work fine still... (But is untested,
currently)

InfraTrans/InfraTrans.ino

@@ -1,17 +1,36 @@
 #include <IRremote.h>
 
-const int LOG_LEVEL = 0; // Just a general setting so we can control Serial output
 const int led = LED_BUILTIN; // On board LED, Pin 13
 const int RECV_PIN = 7; // IR Receiver
-String input = "";
-bool done = false;
+//String input = "";
+long code = 0;
+int count = 0;
+bool repeat = false;
+int parse_item = 0;
+const int CODE_DELAY = 40;
+
+void reset_code() {
+  code = 0;
+  count = 0;
+  repeat = false;
+  parse_item = 0;
+}
+
+const char hexadecimal[] = "0123456789ABCDEF";
+
+int hextoi(char hexch) {
+  char *pos = strchr(hexadecimal, toupper(hexch));
+  if (pos == NULL) {
+    printf("WARN: Invalid hex digit [%c/%d]\n", hexch, hexch);
+    return 0;
+  }
+  return (pos - hexadecimal);
+}
+
 IRsend sendr; // Make Send Object, DANGER a fixed pin number is always used! (3)
 //IRrecv recvr(RECV_PIN); // Make Recever Object
-decode_results results; // Make Results Object to store received codes
-//String result_0 = "";
-//String result_1 = "";
-//String result_2 = "";
-String result_code[] = {"", "", ""};
+//decode_results results; // Make Results Object to store received codes
+//String result_code[] = {"", "", ""};
 
 void setup() {
   // Initalize on board LED
@@ -19,8 +38,8 @@ void setup() {
   digitalWrite(led, LOW);
   
   // Initalize input routine
-  input.reserve(60); // Max input of chars, to merge into string
-  done = false;
+  //input.reserve(60); // Max input of chars, to merge into string
+  reset_code();
 
   // Initalize IR connections
   //recvr.enableIRIn();
@@ -29,7 +48,7 @@ void setup() {
   // Initalize Output routine
   Serial.begin(9600); // Serial COM's Port
   while(!Serial) { delay(10); } // Wait for conection
-  Serial.println("Connected!");
+  Serial.println("Ready!");
   digitalWrite(led, LOW);
 }
 
@@ -38,143 +57,86 @@ void sendCode(long code, int bit_len, bool repeat) {
   if(repeat) {
     for(int x = 0; x <= 3; x++) {
       sendr.sendNEC(code, bit_len);
-      delay(40);
+      delay(CODE_DELAY);
     }
   } else {
     // Else send the code then repeat a blank 2 times
     sendr.sendNEC(code, bit_len);
-    delay(40);
+    delay(CODE_DELAY);
     for(int x = 0; x <= 2; x++) {
       sendr.sendNEC(0xFFFFFFFF, 32);
-      delay(40);
+      delay(CODE_DELAY);
     }
   }
 }
 
-void parse_by_comma(String data) {
-  //result_0 = "";
-  //result_1 = "";
-  //result_2 = "";
-  //String result[] = {"", "", ""};
-  result_code[0] = "";
-  result_code[1] = "";
-  result_code[2] = "";
-  int at = 0;
-  for(char c : data) {
-    //Serial.println(c);
-    if(at == 0) {
-      if(c != ',') {
-        //result_0 += String(c);
-        result_code[0] += String(c);
-      } else {
-        at += 1;
-        if (LOG_LEVEL >= 2) {
-          Serial.print("> ");
-          //Serial.println(result_0);
-          Serial.println(result_code[0]);
-        }
-      }
-    } else if(at == 1) {
-      if(c != ',') {
-        //result_1 += String(c);
-        result_code[1] += String(c);
-      } else {
-        at += 1;
-        if (LOG_LEVEL >= 2) {
-          Serial.print("> ");
-          //Serial.println(result_1);
-          Serial.println(result_code[1]);
-        }
-      }
-    } else if(at == 2) {
-      //result_2 += String(c);
-      result_code[2] += String(c);
-      if (LOG_LEVEL >= 2) {
-        Serial.print("> ");
-        //Serial.println(result_2);
-        Serial.println(result_code[2]);
-      }
-      break;
-    }
-  }
-  //return result;
-}
-
-void parse_order() {
-  long code;
-  int bit_size;
-  bool repeat;
-  //if(result_2.toInt() == 1) {
-  if(result_code[2].toInt() == 1) {
-    repeat = true;
-  } else {
-    repeat = false;
-  }
-  // Converting a string into a long
-  // https://stackoverflow.com/questions/29547115/how-to-convert-string-to-hex-value-in-c/29547549#29547549
-  //code = strtol(result_0.c_str(), NULL, 16);
-  code = strtol(result_code[0].c_str(), NULL, 16);
-  //bit_size = result_1.toInt();
-  bit_size = result_code[1].toInt();
-  if (LOG_LEVEL >= 1) {
-    Serial.println(code);
-    Serial.println(bit_size);
-    Serial.println(repeat);
-    
-    Serial.print(result_code[0]);
-    Serial.print(",");
-    Serial.print(result_code[1]);
-    Serial.print(",");;
-    Serial.println(result_code[2]);
-  }
-  //if (result_0 != "" and result_1 != "" and result_2 != "") {
-  if (result_code[0] != "" and result_code[1] != "" and result_code[2] != "") {
-    sendCode(code, bit_size, repeat);
-    Serial.println("Sent!");
-  } else {
-    Serial.println("Failed to parse give command.");
-  }
-}
-
-void action(String act){
-  // Given String execute action
-  if(act == "r") { // If it's r, let's repeat the last code we sent out
-    parse_order();
-  } else { // If it's not any other command then let's assume it's a new code
-    parse_by_comma(act);
-    parse_order();
-  }
-  
-  /*if(act == "tv p"){
-    sendCode(0x57E3E817, 32, true);
-    for(int x = 0; x <= 3; x++) {
-      sendr.sendNEC(0x57E3E817, 32);
-      delay(40);
-    }
-    Serial.println("tv power");
-  } else if(act == "m p"){
-    sendCode(0x807F02FD, 32, false);
-    Serial.println("movie power");
-  }*/
-}
-
 void loop() {
+  //reset_code();
   // Are we sending/receiving data?
-  if(Serial.available() > 0) {
+  while(Serial.available()) {
     char in = (char)Serial.read();
-    if (LOG_LEVEL >= 3) {
+#ifdef DEBUG_OUT
       Serial.print(": ");
       Serial.println(in);
+#endif
+    if (in == ',') {
+      parse_item++;
+      if (parse_item > 2) {
+        Serial.println("Error: Too many items!");
+        while (Serial.read() != '\n') {
+          
+        }
+        reset_code();
+        break;
+      }
     }
     if (in == '\n') {
-      done = true;
-    } else {
-      input += in;
+      if (parse_item == 2) {
+        Serial.print("Received: ");
+        Serial.print(code, HEX);
+        Serial.print(", ");
+        Serial.print(count);
+        Serial.print(", ");
+        Serial.println(repeat);
+        Serial.println("Sending...");
+        sendCode(code, count, repeat);
+        Serial.println("Ok");
+      } else {
+        Serial.print("Error: Missing items, I saw ");
+        Serial.println(parse_item + 1);
+        break;
+      }
+      reset_code();
+      continue;
+    }
+    switch (parse_item) {
+      case 0:
+#ifdef DEBUG_OUT
+          Serial.print("Before: ");
+          Serial.print(code, HEX);
+          Serial.print(" ");
+          Serial.print(in);
+          Serial.println(hextoi(in));
+#endif
+        code = code << 4;
+#ifdef DEBUG_OUT
+          Serial.print("After: ");
+          Serial.println(code, HEX);
+#endif
+        code += hextoi(in);
+#ifdef DEBUG_OUT
+          Serial.print("After: ");
+          Serial.println(code, HEX);
+#endif
+        break;
+      case 1:
+        count *= 10;
+        count += hextoi(in);
+        break;
+      case 2:
+        repeat *= 10;
+        repeat += hextoi(in);
+        break;
     }
-  }
-  if(done){
-    action(input); // Execute command / handle command
-    input = "";
-    done = false;
   }
 }