Added Singleton reference for the Arduino interface

The ArduinoInterface now can be access using a global reference.

This commit has a big bug with Arduino Board Manager windows close (it refuse to close).

Author: Marco-GG

MLC/GUI/Experiment/ArduinoConfigManager/ArduinoBoardManager.py

@@ -17,7 +17,7 @@
 
 class ArduinoBoardManager:
 
-    def __init__(self, protocol_config, serial_config, parent_win=None):
+    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(
@@ -30,6 +30,8 @@ def __init__(self, protocol_config, serial_config, parent_win=None):
             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

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,12 @@ 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)
+        super(BoardConfigurationWindow, self).closeEvent(event)
+
     def update(self):
         aux_idx = 0
         self.ui.digitalPins.clear()

MLC/GUI/Experiment/ExperimentWindow.py

@@ -40,6 +40,7 @@
 
 class ExperimentWindow(QMainWindow):
     experiment_finished = pyqtSignal([bool])
+
     MAX_GENERATIONS = 30
 
     def __init__(self, mlc_local,
@@ -285,29 +286,9 @@ def on_board_config_button_clicked(self):
         logger.debug('[EXPERIMENT {0}] [BOARD_CONFIG_BUTTON] - Executing on_board_config_button_clicked function')
         #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
+        board_config_window = ArduinoBoardManager(protocol_config=self._board_config, serial_config=self._serial_conn, 
+                                                  close_handler=self.on_board_config_button_clicked, parent_win=self)
+        board_config_window.start()
 
     def _config_table_edited(self, left, right):
         config_table = self._autogenerated_object.config_table
@@ -580,3 +561,34 @@ def _update_experiment(self, cancelled):
         self._update_individuals_per_generation_list()
         self._update_experiment_info()
         self._update_individuals_figure()
+
+    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:
+            self._board_config = self._board_config._replace(connection = SerialConnection(**self._serial_conn._asdict()))
+            #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)"
+                             .format(preev_path),
+                             QMessageBox.Yes | No, QMessageBox.Yes)
+            if selection == QMessageBox.Yes:
+                #self.on_board_config_button_clicked()
+                print "FUCK"
+            else:
+                #FIXME: If the pin setups aren't empty then the protocol init will fail
+                self._board_config = self._board_config._replace(connection = BaseConnection())
+

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