Added boad configuration persistence between Experiment window and ArduinoBoard window

* The ArduinoBoard displays configurations received as parameter
* Fixed bugs that were affecting the previously configured ports display

Author: Marco-GG

MLC/GUI/Experiment/ArduinoConfigManager/ArduinoBoardManager.py

@@ -17,15 +17,12 @@
 
 class ArduinoBoardManager:
 
-    def __init__(self, parent_win=None):
-        # self.__setup = BoardSetup()
-        #FIXME ProtcolConfig y SerialConnectionConfig must be parameters!
-        self.__setup = ProtocolConfig(None)
-        self.__connection_config = SerialConnectionConfig('/dev/ttyACM0')
+    def __init__(self, protocol_config, serial_config, parent_win=None):
+        self.__setup = protocol_config
+        self.__connection_config = serial_config
         self.__main_window = BoardConfigurationWindow(
             self, boards.types, self.__setup, parent=parent_win)
         self.__connectino_status = None
-        # self.__sch = EventScheduler()
         self.__sch = QTimer()
         self.PARITY_BITS = [serial.PARITY_NONE, serial.PARITY_EVEN,
                             serial.PARITY_EVEN, serial.PARITY_MARK, serial.PARITY_SPACE]
@@ -34,14 +31,21 @@ def __init__(self, parent_win=None):
         self.BYTE_SIZE = [
             serial.EIGHTBITS, serial.FIVEBITS, serial.SIXBITS, serial.SEVENBITS]
 
+    def get_protocol_config(self):
+        return self.__setup
+
+    def get_connection_config(self):
+        current_setup = self.__main_window.checkout_connection_config()
+        config = SerialConnectionConfig(port=current_setup["port"],
+                                        baudrate=current_setup["baudrate"],
+                                        parity=self.PARITY_BITS[current_setup["parity"]],
+                                        stopbits=self.STOP_BITS[current_setup["stopbits"]],
+                                        bytesize=self.BYTE_SIZE[current_setup["bytesize"]])
+        return config
+
     def start_connection(self):
         # TODO Este metodo debe estar enlazado a la opcion de conexion serie
-        current_setup = self.__main_window.checkout_connection_config()
-        self.__connection_config = SerialConnectionConfig(port=current_setup["port"],
-                                                          baudrate=current_setup["baudrate"],
-                                                          parity=self.PARITY_BITS[current_setup["parity"]],
-                                                          stopbits=self.STOP_BITS[current_setup["stopbits"]],
-                                                          bytesize=self.BYTE_SIZE[current_setup["bytesize"]])
+        self.__connection_config = self.get_connection_config()
 
         return SerialConnection(**self.__connection_config._asdict())
 
@@ -166,17 +170,6 @@ def start_bench(self):
         bench.stop()
 
 
-class BoardSetup:
-
-    def __init__(self):
-        self.digital_input_pins = []
-        self.digital_output_pins = []
-        self.analog_input_pins = []
-        self.analog_output_pins = []
-        self.pwm_pins = []
-        self.thread = None
-
-
 class EventScheduler:
 
     def __init__(self):

MLC/GUI/Experiment/ArduinoConfigManager/BoardConfigurationWindow.py

@@ -62,10 +62,19 @@ def update(self):
             self.ui.analogPinList.removeRow(i)
 
         for pin in self.__setup.digital_input_pins:
-            self.insertPin(pin, "Pin " + str(pin),  0, self.ui.digitalPinsList)
+            self.insertPin(pin, "Pin " + str(pin),  self.ui.analogPinType.itemText(0), self.ui.digitalPinsList)
 
         for pin in self.__setup.digital_output_pins:
-            self.insertPin(pin, "Pin A" + str(pin - digital_pin_count), 0, self.ui.digitalPinsList)
+            self.insertPin(pin, "Pin " + str(pin), self.ui.analogPinType.itemText(1), self.ui.digitalPinsList)
+
+        for pin in self.__setup.analog_input_pins:
+            self.insertPin(pin, "Pin A" + str(pin - digital_pin_count),  self.ui.analogPinType.itemText(0), self.ui.analogPinList)
+
+        for pin in self.__setup.analog_output_pins:
+            self.insertPin(pin, "Pin A" + str(pin - digital_pin_count), self.ui.analogPinType.itemText(1), self.ui.analogPinList)
+
+        for pin in self.__setup.pwm_pins:
+            self.insertPin(pin, "Pin " + str(pin),  self.ui.digitalPinType.itemText(2), self.ui.digitalPinsList)
 
     def setup_board(self, index, board_name, image_name):
         _translate = QtCore.QCoreApplication.translate

MLC/GUI/Experiment/ArduinoConfigManager/test.py

@@ -3,6 +3,9 @@
 from ArduinoBoardDialog import ArduinoBoardDialog
 from MLC.GUI.Autogenerated.autogenerated import Ui_BoardConfigurationWindow
 from MLC.GUI.Experiment.ArduinoConfigManager.BoardConfigurationWindow import BoardConfigurationWindow
+from MLC.arduino.protocol import ProtocolConfig
+from MLC.arduino.connection.serialconnection import SerialConnectionConfig
+
 
 from ArduinoBoardManager import ArduinoBoardManager
 
@@ -18,10 +21,16 @@ def showPinout():
 if __name__ == '__main__':
     app = QApplication(sys.argv)
     # window = BoardConfigurationWindow()
-    manager = ArduinoBoardManager()
+    protocol_cfg = ProtocolConfig(None)
+    connection_cfg = SerialConnectionConfig('/dev/ttyACM0')
+    manager = ArduinoBoardManager(protocol_cfg, connection_cfg)
     # ui = Ui_BoardConfigurationFrame()
     # ui.setupUi(window)
     # ui.showPinout.clicked.connect(showPinout)
 
     manager.start()
-    sys.exit(app.exec_())
+    app.exec_()
+
+    manager = ArduinoBoardManager(protocol_cfg, connection_cfg)
+    manager.start()
+    app.exec_()

MLC/GUI/Experiment/ExperimentWindow.py

@@ -31,6 +31,10 @@
 from MLC.GUI.Experiment.ArduinoConfigManager.ArduinoBoardManager import ArduinoBoardManager
 Config
 
+from MLC.arduino.protocol import ProtocolConfig
+from MLC.arduino.connection.serialconnection import SerialConnectionConfig, SerialConnection
+from MLC.arduino.connection.base import BaseConnection
+
 logger = get_gui_logger()
 
 
@@ -77,6 +81,11 @@ def __init__(self, mlc_local,
         self._chart_conf = ChartConfiguration(self._autogenerated_object)
         self._chart_conf.init()
 
+        # Arduino board configurations
+        # FIXME Board configuration must come from the experiment DB
+        self._board_config = ProtocolConfig(None)
+        self._serial_conn = SerialConnectionConfig('/dev/ttyACM0')
+
     def closeEvent(self, event):
         logger.debug('[EXPERIMENT {0}] [CLOSE_DIALOG] - Executing overriden closeEvent function'.format(self._experiment_name))
         self._ask_if_experiment_config_must_be_saved()
@@ -274,8 +283,31 @@ def on_genealogy_button_clicked(self):
 
     def on_board_config_button_clicked(self):
         logger.debug('[EXPERIMENT {0}] [BOARD_CONFIG_BUTTON] - Executing on_board_config_button_clicked function')
-        board_config_window = ArduinoBoardManager(parent_win=self)
-        board_config_window.start()
+        #FIXME Connection config name should not be related with "serial" 
+        valid_connection = False
+        while not valid_connection:
+            board_config_window = ArduinoBoardManager(protocol_config=self._board_config, serial_config=self._serial_conn, parent_win=self)
+            board_config_window.start()
+            # The namedtuples are immutables, so we must replace to reference in order to keep the changes in the configuration
+            self._board_config = board_config_window.get_protocol_config()
+            self._serial_conn = board_config_window.get_connection_config()
+            print self._serial_conn
+
+            try:
+                self._board_config = self._board_config._replace(connection = SerialConnection(**self._serial_conn._asdict()))
+                valid_connection = True
+            except:
+                selection = QMessageBox.critical(self, "Connection failure",
+                                 "The current connection setup failed during initialization. Do you want to change this configuration? \
+                                 (Choosing \"no\" means that the board will not be usable in the experiment)"
+                                 .format(preev_path),
+                                 QMessageBox.Yes | No, QMessageBox.Yes)
+                if selection == QMessageBox.Yes:
+                    pass 
+                else:
+                    #FIXME: If the pin setups aren't empty then the protocol init will fail
+                    self._board_config = self._board_config._replace(connection = BaseConnection())
+                    valid_connection = True
 
     def _config_table_edited(self, left, right):
         config_table = self._autogenerated_object.config_table

MLC/arduino/connection/base.py

@@ -7,8 +7,8 @@ class BaseConnection:
     '''
     def send(self,data):
        """ Sends data to arduino device """
-       raise Exception("Implement me!")
+       raise NotImplementedError
 
     def recv(self, length):
        """ Receive data from the arduino device """
-       raise Exception("Implement me!") 
+       raise NotImplementedError