Bugfixed errors in pins setup

* Fixed error that crashed the windows if a pin was added-removed-added
* Fixed remove analog pin control (it was disconnected)
* Fixed bug that crased the app if a bench test was started using invalid connection parameters
* Renamed all slots of the boardwindow to the on_<<operation>> standard
* Removed from BoardWindow the pin management

Author: Marco-GG

MLC/GUI/Autogenerated/mlc_qtcreator/board_config_design.ui

@@ -1200,11 +1200,11 @@
    <sender>testInterface</sender>
    <signal>clicked()</signal>
    <receiver>BoardConfigurationWindow</receiver>
-   <slot>checkConnection()</slot>
+   <slot>on_check_connection()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>438</x>
-     <y>281</y>
+     <x>530</x>
+     <y>301</y>
     </hint>
     <hint type="destinationlabel">
      <x>391</x>
@@ -1216,11 +1216,11 @@
    <sender>showPinout</sender>
    <signal>clicked()</signal>
    <receiver>BoardConfigurationWindow</receiver>
-   <slot>showPinout()</slot>
+   <slot>on_pinout_show()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>140</x>
-     <y>99</y>
+     <x>652</x>
+     <y>51</y>
     </hint>
     <hint type="destinationlabel">
      <x>391</x>
@@ -1280,7 +1280,7 @@
    <sender>addAnalogPin</sender>
    <signal>clicked()</signal>
    <receiver>BoardConfigurationWindow</receiver>
-   <slot>insertAnalogPin()</slot>
+   <slot>on_analog_pin_insert()</slot>
    <hints>
     <hint type="sourcelabel">
      <x>641</x>
@@ -1296,7 +1296,7 @@
    <sender>addDigitalPin</sender>
    <signal>clicked()</signal>
    <receiver>BoardConfigurationWindow</receiver>
-   <slot>insertDigitalPin()</slot>
+   <slot>on_digital_pin_insert()</slot>
    <hints>
     <hint type="sourcelabel">
      <x>148</x>
@@ -1312,7 +1312,7 @@
    <sender>removeDigitalPin</sender>
    <signal>clicked()</signal>
    <receiver>BoardConfigurationWindow</receiver>
-   <slot>removeDigitalPin()</slot>
+   <slot>on_digital_pin_remove()</slot>
    <hints>
     <hint type="sourcelabel">
      <x>382</x>
@@ -1328,7 +1328,7 @@
    <sender>removeAnalogPin</sender>
    <signal>clicked()</signal>
    <receiver>BoardConfigurationWindow</receiver>
-   <slot>removeDigitalPin()</slot>
+   <slot>on_analog_pin_remove()</slot>
    <hints>
     <hint type="sourcelabel">
      <x>875</x>
@@ -1342,12 +1342,12 @@
   </connection>
  </connections>
  <slots>
-  <slot>insertDigitalPin()</slot>
-  <slot>insertAnalogPin()</slot>
-  <slot>checkConnection()</slot>
-  <slot>showPinout()</slot>
-  <slot>removeDigitalPin()</slot>
-  <slot>removeAnalogPin()</slot>
+  <slot>on_digital_pin_insert()</slot>
+  <slot>on_analog_pin_insert()</slot>
+  <slot>on_check_connection()</slot>
+  <slot>on_pinout_show()</slot>
+  <slot>on_digital_pin_remove()</slot>
+  <slot>on_analog_pin_remove()</slot>
   <slot>on_bench_test_click()</slot>
   <slot>on_connection_type_toggle()</slot>
  </slots>

MLC/GUI/Experiment/ArduinoConfigManager/ArduinoBoardManager.py

@@ -52,6 +52,7 @@ def start(self):
     def insert_digital_pin(self, pin_index, pin, type_idx):
         if pin_index < 0:
             return
+
         current = self.__main_window.get_current_board()["DIGITAL_PINS"] if type_idx != 2 else \
             self.__main_window.get_current_board()["PWM_PINS"]
         target_pin = self.__setup.digital_input_pins if type_idx == 0 else \
@@ -63,8 +64,7 @@ def insert_digital_pin(self, pin_index, pin, type_idx):
             self.__main_window.addDigitalPin(pin_index, type_idx)
         else:
             self.show_error(
-                "Error", "Assign error", "Could not set pin %d with the selected type" % (
-                    pin),
+                "Error", "Assign error", "Could not set pin %s with the selected type" % (pin),
                  QMessageBox.Critical, QMessageBox.Ok)
 
     # Mover a la vista
@@ -77,8 +77,15 @@ def show_error(self, title, text, info, icon, buttons):
         msg.setStandardButtons(buttons)
         return msg.exec_()
 
-    def remove_digital_pin(self, pin_index):
-        return
+    def remove_digital_pin(self, pin):
+        if pin in self.__setup.digital_input_pins:
+            self.__setup.digital_input_pins.remove(pin)
+  
+        if pin in self.__setup.digital_output_pins:
+            self.__setup.digital_output_pins.remove(int(pin))
+
+        if pin in self.__setup.pwm_pins:
+            self.__setup.pwm_pins.remove(int(pin))
 
     def insert_analog_pin(self, pin_index, pin, type_idx):
         if pin_index < 0:
@@ -91,10 +98,14 @@ def insert_analog_pin(self, pin_index, pin, type_idx):
             self.__main_window.addAnalogPin(pin_index, type_idx)
         else:
             self.show_error(
-                "Error", "Assign error", "Could not set pin %d with the selected type" % (pin))
+                "Error", "Assign error", "Could not set pin %d with the selected type" % (pin), QMessageBox.Critical, QMessageBox.Ok)
 
-    def remove_analog_pin(self, pin_index):
-        return
+    def remove_analog_pin(self, pin):
+        if pin in self.__setup.analog_input_pins:
+            self.__setup.analog_input_pins.remove(pin)
+
+        if pin in self.__setup.analog_output_pins: 
+            self.__setup.analog_output_pins.remove(pin)
 
     def check_connection(self):
         self.__connection_status = self.__main_window.create_connection_dialog(
@@ -139,7 +150,13 @@ def board_changed(self, new_idx, old_idx):
             self.__main_window.set_board(old_idx)
 
     def start_bench(self):
-        self.__setup = self.__setup._replace(connection=self.start_connection(), **self.__main_window.checkout_board_setup())
+        try:
+            self.__setup = self.__setup._replace(connection=self.start_connection(), **self.__main_window.checkout_board_setup())
+        except serial.SerialException:
+            self.show_error(
+                "Error", "Connection failure", "Could not start connection to board", QMessageBox.Critical, QMessageBox.Ok)
+            return
+            
         bench = ArduinoBench()
         stats = ArduinoStatsDialog(bench)
         stats.connect_to_reset(bench)

MLC/GUI/Experiment/ArduinoConfigManager/BoardConfigurationWindow.py

@@ -38,32 +38,34 @@ def __init__(self, controller, boards, setup, parent=None):
     def update(self):
         aux_idx = 0
         self.ui.digitalPins.clear()
-        digital_pin_count = len(
-            self.__boards[self.ui.arduinoBoard.currentIndex()]["DIGITAL_PINS"])
+        digital_pin_count = len(self.__boards[self.ui.arduinoBoard.currentIndex()]["DIGITAL_PINS"])
+
+        # Adds the not configured digital pins
         for i in self.__boards[self.ui.arduinoBoard.currentIndex()]["DIGITAL_PINS"]:
             if i not in self.__setup.digital_input_pins and i not in self.__setup.digital_output_pins and i not in self.__setup.pwm_pins:
                 self.setup_pin(self.ui.digitalPins, 0, "Pin " + str(i), i)
             aux_idx += 1
 
         aux_idx = 0
         self.ui.analogPins.clear()
+        # Adds the not configured digital pins
         for i in self.__boards[self.ui.arduinoBoard.currentIndex()]["ANALOG_PINS"]:
             if i not in self.__setup.analog_input_pins and i not in self.__setup.analog_output_pins:
-                self.setup_pin(
-                    self.ui.analogPins, 0, "Pin A" + str(i - digital_pin_count), i)
+                self.setup_pin(self.ui.analogPins, 0, "Pin A" + str(i - digital_pin_count), i)
             aux_idx += 1
-
+        
+        # Clear the list (QTableWidget.clearContent doesn't remove the rows!)
         for i in xrange(self.ui.digitalPinsList.rowCount(), -1, -1):
             self.ui.digitalPinsList.removeRow(i)
 
         for i in xrange(self.ui.analogPinList.rowCount(), -1, -1):
             self.ui.analogPinList.removeRow(i)
 
         for pin in self.__setup.digital_input_pins:
-            self.insertPin(pin, 0, self.ui.digitalPinsList)
+            self.insertPin(pin, "Pin " + str(pin),  0, self.ui.digitalPinsList)
 
         for pin in self.__setup.digital_output_pins:
-            self.insertPin(pin, 0, self.ui.digitalPinsList)
+            self.insertPin(pin, "Pin A" + str(pin - digital_pin_count), 0, self.ui.digitalPinsList)
 
     def setup_board(self, index, board_name, image_name):
         _translate = QtCore.QCoreApplication.translate
@@ -78,7 +80,7 @@ def setup_pin(self, combo, index, pin_name, pin_value):
         item_name = _translate("BoardConfigurationWindow", pin_name)
         combo.insertItem(index, item_name, variant)
 
-    def showPinout(self):
+    def on_pinout_show(self):
         index = self.ui.arduinoBoard.currentIndex()
         path = self.ui.arduinoBoard.itemData(index)
         dialog = ArduinoBoardDialog(path)
@@ -100,7 +102,7 @@ def checkout_board_setup(self):
                        "read_count": self.ui.read_count_spin.value()}
         return board_setup
 
-    def checkConnection(self):
+    def on_check_connection(self):
         self.__controller.check_connection()
 
     def create_connection_dialog(self):
@@ -110,65 +112,48 @@ def create_connection_dialog(self):
     def get_current_board(self):
         return self.__boards[self.ui.arduinoBoard.currentIndex()]
 
-    def insertDigitalPin(self):
+    def on_digital_pin_insert(self):
         idx = self.ui.digitalPins.currentIndex()
         self.__controller.insert_digital_pin(
             idx, self.ui.digitalPins.itemData(idx), self.ui.digitalPinType.currentIndex())
         # self.insertPin(self.ui.digitalPins, self.ui.digitalPinType,
         # self.ui.digitalPinsList)
 
-    def insertAnalogPin(self):
+    def on_analog_pin_insert(self):
         idx = self.ui.analogPins.currentIndex()
         self.__controller.insert_analog_pin(
             idx, self.ui.analogPins.itemData(idx), self.ui.analogPinType.currentIndex())
         # self.insertPin(self.ui.analogPins, self.ui.analogPinType,
         # self.ui.analogPinList)
 
-    def addDigitalPin(self, pin, pinType):
-        self.insertPin(pin, self.ui.digitalPins.itemText(pin),
+    def addDigitalPin(self, pin_idx, pinType):
+        self.insertPin(pin_idx, self.ui.digitalPins.itemText(pin_idx),
                        self.ui.digitalPinType.itemText(pinType), self.ui.digitalPinsList)
-        self.ui.digitalPins.removeItem(pin)
+        self.ui.digitalPins.removeItem(pin_idx)
 
-    def addAnalogPin(self, pin, pinType):
-        self.insertPin(pin, self.ui.analogPins.itemText(pin),
+    def addAnalogPin(self, pin_idx, pinType):
+        self.insertPin(pin_idx, self.ui.analogPins.itemText(pin_idx),
                        self.ui.analogPinType.itemText(pinType), self.ui.analogPinList)
-        self.ui.analogPins.removeItem(pin)
+        self.ui.analogPins.removeItem(pin_idx)
 
-    def removeDigitalPin(self):
-        # FIXME: Llevar al controller la logica de eliminacion
+    def on_digital_pin_remove(self):
+        # FIXME: The view pin removal should be made by the controller
         row = self.ui.digitalPinsList.currentRow()
         if row >= 0:
-            pin = self.ui.digitalPinsList.item(row, 0).text()[4:]
+            pin = int(self.ui.digitalPinsList.item(row, 0).text()[4:])
+            self.__controller.remove_digital_pin(int(pin))
             self.ui.digitalPinsList.removeRow(row)
-            try:
-                self.__setup.digital_input_pins.remove(int(pin))
-            except:
-                pass
-            try:
-                self.__setup.digital_output_pins.remove(int(pin))
-            except:
-                pass
-            try:
-                self.__setup.pwm_pins.remove(int(pin))
-            except:
-                pass
             self.setup_pin(self.ui.digitalPins, 0, "Pin " + str(pin), pin)
 
-    def removeAnalogPin(self):
-        # FIXME: Llevar al controller la logica de eliminacion
+    def on_analog_pin_remove(self):
+        # FIXME: The view pin removal should be made by the controller
         row = self.ui.analogPinList.currentRow()
         if row >= 0:
-            pin = self.ui.analogPinList.item(row, 0).text()[4:]
+            digital_pin_count = len(self.__boards[self.ui.arduinoBoard.currentIndex()]["DIGITAL_PINS"])
+            pin = int(self.ui.analogPinList.item(row, 0).text()[5:]) + digital_pin_count
+            self.__controller.remove_analog_pin(int(pin))
             self.ui.analogPinList.removeRow(row)
-            try:
-                self.__setup.analog_input_pins.remove(int(pin))
-            except:
-                pass
-            try:
-                self.__setup.analog_output_pins.remove(int(pin))
-            except:
-                pass
-            self.setup_pin(self.ui.analogPins, 0, "Pin " + str(pin), pin)
+            self.setup_pin(self.ui.analogPins, 0, "Pin A" + str(pin - digital_pin_count), int(pin))
 
         return
 

MLC/GUI/Experiment/ArduinoConfigManager/test.py

@@ -0,0 +1,27 @@
+import sys
+from PyQt5.QtWidgets import QApplication, QMainWindow, QDialog
+from ArduinoBoardDialog import ArduinoBoardDialog
+from MLC.GUI.Autogenerated.autogenerated import Ui_BoardConfigurationWindow
+from MLC.GUI.Experiment.ArduinoConfigManager.BoardConfigurationWindow import BoardConfigurationWindow
+
+from ArduinoBoardManager import ArduinoBoardManager
+
+
+def showPinout():
+    dialog = ArduinoBoardDialog("images/uno.jpg")
+    dialog.exec_()
+#   window = QDialog()
+#   ui = Ui_BoardPinout()
+#   ui.setupUi(window)
+#   window.exec_()
+
+if __name__ == '__main__':
+    app = QApplication(sys.argv)
+    # window = BoardConfigurationWindow()
+    manager = ArduinoBoardManager()
+    # ui = Ui_BoardConfigurationFrame()
+    # ui.setupUi(window)
+    # ui.showPinout.clicked.connect(showPinout)
+
+    manager.start()
+    sys.exit(app.exec_())

MLC/GUI/Experiment/ArduinoConfigManager/test2.py

@@ -27,33 +27,33 @@ def emit(self):
 
 
 class Worker(Thread):
-   def __init__(self, bench):
-      Thread.__init__(self)
-      self.__run = True
-      self.__bench = bench
 
-   def run(self):
-      while(self.__run):
-         time.sleep(1)
-         self.__bench.evaluate()
-         #self.__signal.emit()
+    def __init__(self, bench):
+        Thread.__init__(self)
+        self.__run = True
+        self.__bench = bench
 
-   def stop(self):
-      self.__run = False
+    def run(self):
+        while(self.__run):
+            time.sleep(1)
+            self.__bench.evaluate()
+            # self.__signal.emit()
 
-   def get_bench(self):
-      return self.__bench
-   
+    def stop(self):
+        self.__run = False
+
+    def get_bench(self):
+        return self.__bench
 
-if __name__ == '__main__':
-   app = QApplication(sys.argv)
-   bench = MockArduinoBench()
-   stats = ArduinoStatsDialog(bench)
-   bench.add_observer(stats)
-   stats.connect_to_reset(bench)
-   #worker = Worker(bench)
-   #worker.start()
-   bench.start()
-   stats.exec_()
-   bench.stop()
 
+if __name__ == '__main__':
+    app = QApplication(sys.argv)
+    bench = MockArduinoBench()
+    stats = ArduinoStatsDialog(bench)
+    bench.add_observer(stats)
+    stats.connect_to_reset(bench)
+    # worker = Worker(bench)
+    # worker.start()
+    bench.start()
+    stats.exec_()
+    bench.stop()

tests/pocs/performance_test.py

@@ -16,7 +16,7 @@ def actuate(terminal):
     arduinoDue = ArduinoInterface(connection, boards.Due)
 
     arduinoDue.reset() #Just in case
-    arduinoDue.set_report_mode(protocol.PIN_MODES.AVERAGE, read_count=5, read_delay=0)
+    arduinoDue.set_report_mode(protocol.REPORT_MODES.AVERAGE, read_count=50, read_delay=0)
 
     arduinoDue.add_output(40)
     arduinoDue.add_output(66)