Fix in arduino protocol

Removed a bug that was reporting a connection timeout when there wasn't one.

Author: Marco-GG

MLC/GUI/Experiment/ArduinoConfigManager/ArduinoBoardManager.py

@@ -43,8 +43,6 @@ def start_connection(self):
                                                           stopbits=self.STOP_BITS[current_setup["stopbits"]],
                                                           bytesize=self.BYTE_SIZE[current_setup["bytesize"]])
 
-        print self.__connection_config._asdict()
-
         return SerialConnection(**self.__connection_config._asdict())
 
     def start(self):

MLC/arduino/Firmware/GenericArduinoController.cpp

@@ -53,7 +53,7 @@ GenericArduinoController::GenericArduinoController(Stream &stream): stream_(stre
   executor[SET_REPORT_MODE_CMD]   = &GenericArduinoController::set_report_mode;
   executor[ACTUATE_CMD]           = &GenericArduinoController::actuate;
   executor[RESET_PINS]            = &GenericArduinoController::reset;
-  executor[VERSION_RESPONSE]      = &GenericArduinoController::protocol_version;
+  executor[PROTOCOL_VERSION]      = &GenericArduinoController::protocol_version;
 }
 
 void GenericArduinoController::handle_commands()
@@ -86,7 +86,7 @@ void GenericArduinoController::handle_commands()
 
 void GenericArduinoController::add_handler(uint8_t handler_id, int (*handler)(GenericArduinoController* this_, const char*))
 {
-    executor[handler_id] = this_;
+    executor[handler_id] = handler;
 }
 
 // NULL operation
@@ -103,7 +103,7 @@ int GenericArduinoController::protocol_version(GenericArduinoController* this_,
   char response[] = { char(VERSION_RESPONSE), char(0x03)};
   this_->stream_.write(response, 2);
   this_->stream_.write(VERSION, 3);
-  return 5;
+  return 2;
 }
 
 /**

MLC/arduino/connection/serialconnection.py

@@ -39,7 +39,7 @@ def recv(self, length):
         """
         recv = self._connection.read(length)
 
-        if recv != length:
+        if len(recv) != length:
             raise serial.SerialTimeoutException
         else:
             return recv

MLC/arduino/protocol.py

@@ -196,7 +196,7 @@ def actuate(self, data):
                     pos = pos + 2
                 pos = pos + 1
 
-                if self._report_mode == REPORT_MODE.AVERAGE:
+                if self._report_mode == REPORT_MODES.AVERAGE:
                     results["A%d" % (pin)] = [
                         sum(results["A%d" % (pin)]) / (self._read_count + 1)]
             else:
@@ -206,7 +206,7 @@ def actuate(self, data):
                             bool(ord(data[pos + 1 + i / 8]) & (0x01 << (i % 8))))
                     pos = pos + 1 + self._read_count / 8 + 1
 
-                    if self._report_mode == "AVERAGE":
+                    if self._report_mode == REPORT_MODES.AVERAGE:
                         results["D%d" % (pin)] = [
                             (sum(results["D%d" % (pin)]) * 2) > (self._read_count + 1)]
 

tests/pocs/test_connection.py

@@ -1,6 +1,6 @@
 #from MLC.arduino.connection import MockConnection
 from MLC.arduino.connection import SerialConnection
-from MLC.arduino.protocol import ArduinoInterface
+from MLC.arduino.protocol import ArduinoInterface, REPORT_MODES
 from MLC.arduino import boards
 import sys
 import time
@@ -10,7 +10,7 @@ def actuate(terminal):
     arduinoDue = ArduinoInterface(connection, boards.Due)
 
     arduinoDue.reset()
-    arduinoDue.set_report_mode("BULK", read_count=5, read_delay=100)    
+    arduinoDue.set_report_mode(REPORT_MODES.BULK, read_count=5, read_delay=100)    
     arduinoDue.add_output(40)
     arduinoDue.add_input(64)
     arduinoDue.add_input(63)