Merge branch 'arduino_manager'

Author: Ezetowers

MLC/GUI/Experiment/ArduinoConfigManager/ArduinoBoardManager.py

@@ -17,31 +17,37 @@
 
 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, close_handler, 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]
         self.STOP_BITS = [
             serial.STOPBITS_ONE, serial.STOPBITS_ONE_POINT_FIVE, serial.STOPBITS_TWO]
         self.BYTE_SIZE = [
             serial.EIGHTBITS, serial.FIVEBITS, serial.SIXBITS, serial.SEVENBITS]
+        #FIXME the connection with the handler shold be made by a method of the window
+        self.__main_window.on_close_signal.connect(close_handler)
+
+    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 +172,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

@@ -8,11 +8,15 @@
 from MLC.GUI.Autogenerated.autogenerated import Ui_BoardConfigurationWindow
 from MLC.GUI.Experiment.ArduinoConfigManager.ArduinoBoardDialog import ArduinoBoardDialog
 from MLC.GUI.Experiment.ArduinoConfigManager.ArduinoConnectionDialog import ArduinoConnectionDialog
+from PyQt5.QtCore import pyqtSignal
 
 from MLC.GUI.Experiment.ArduinoConfigManager.Common import create_local_full_path
 
 
 class BoardConfigurationWindow(QMainWindow):
+    # * The setup (all the things configured)
+    # * The serial connection setup
+    on_close_signal = pyqtSignal([list, list])
 
     def __init__(self, controller, boards, setup, parent=None):
         super(BoardConfigurationWindow, self).__init__(parent)
@@ -35,6 +39,13 @@ def __init__(self, controller, boards, setup, parent=None):
         self.update()
         self.ui.arduinoBoard.currentIndexChanged.connect(self.index_change)
 
+    def closeEvent(self, event):
+        board_setup = [self.__controller.get_protocol_config()]
+        connection_cfg = [self.__controller.get_connection_config()]
+        self.on_close_signal.emit(board_setup, connection_cfg)
+        event.accept()
+        #super(BoardConfigurationWindow, self).closeEvent(event)
+
     def update(self):
         aux_idx = 0
         self.ui.digitalPins.clear()
@@ -62,10 +73,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

@@ -34,11 +34,16 @@
 from PyQt5.QtWidgets import QMessageBox
 from PyQt5.QtWidgets import QInputDialog
 
+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()
 
 
 class ExperimentWindow(QMainWindow):
     experiment_finished = pyqtSignal([bool])
+
     MAX_GENERATIONS = 30
 
     def __init__(self, mlc_local,
@@ -102,6 +107,11 @@ def __init__(self, mlc_local,
                                                              autogenerated_object=self._autogenerated_object,
                                                              mlc_local=self._mlc_local)
 
+        # 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()
@@ -382,7 +392,9 @@ def on_board_config_button_clicked(self):
         logger.debug('[EXPERIMENT {0}] [BOARD_CONFIG_BUTTON] - '
                      'Executing on_board_config_button_clicked function'
                      .format(self._experiment_name))
-        board_config_window = ArduinoBoardManager(parent_win=self)
+        valid_connection = False
+        board_config_window = ArduinoBoardManager(protocol_config=self._board_config, serial_config=self._serial_conn,
+                                                  close_handler=self._store_board_configuration, parent_win=self)
         board_config_window.start()
 
     def on_edit_config_button_clicked(self):
@@ -723,3 +735,31 @@ def _update_experiment(self, cancelled):
         self._update_experiment_info()
         self._update_individuals_figure()
         self._update_scatter_chart()
+
+    def _store_board_configuration(self, board_config, serial_conn):
+        # Pass the parameter as a list to mock PyQt fixed data types
+        logger.debug('[EXPERIMENT {0}] [BOARD_CONFIG] - '
+                     'Board has been configured'
+                     .format(self._experiment_name))
+
+        self._board_config = board_config[0]
+        self._serial_conn = serial_conn[0]
+
+        # Init the arduino singleton
+        try:
+            ArduinoInterfaceSingleton.get_instance(protocol_setup=self._board_config,
+                                                   conn_setup=self._serial_conn)
+        except Exception, err:
+            logger.debug('[EXPERIMENT {0}] [BOARD_CONFIG] - '
+                         'Serial port could not be initialized. Error Msg: {1}'
+                         .format(self._experiment_name, err))
+            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)",
+                                             QMessageBox.Yes | QMessageBox.No,
+                                             QMessageBox.Yes)
+            if selection == QMessageBox.Yes:
+                self.on_board_config_button_clicked()
+            else:
+                self._board_config = self._board_config._replace(connection=BaseConnection())

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

MLC/arduino/protocol.py

@@ -20,6 +20,21 @@
 PIN_MODES = collections.namedtuple(
     'PIN_MODES', ['INPUT', 'OUTPUT'], verbose=False)(INPUT=0, OUTPUT=1)
 
+class ArduinoInterfaceSingleton():
+    _instance = None
+
+    def get_instance(cls, protocol_config=None, conn_setup=None):
+        from MLC.arduino.connection.serialconnection import SerialConnection
+        if protocol_setup and conn_setup:
+            serial_conn = SerialConnection(**conn_setup)
+            protocol_config._replace(connection, serial_conn)
+            ArduinoInterfaceSingleton._instance = BuildSerial(protocol_config)
+ 
+        if ArduinoInterfaceSingleton._instance is None:
+            raise Exception("ArduinoInterface was not configured.")
+
+        return ArduinoInterfaceSingleton._instance
+
 
 class ArduinoInterface:
     # 0=input 1=output -- wiring_constants.h