Arduino board autodetect feature

* Implemented the board autodetect feature using usb vid & pid

Author: Marco-GG

MLC/GUI/Autogenerated/autogenerated.py

@@ -76,6 +76,9 @@ def setupUi(self, BoardConfigurationWindow):
         self.showPinout = QtWidgets.QPushButton(self.frame_10)
         self.showPinout.setObjectName("showPinout")
         self.horizontalLayout_9.addWidget(self.showPinout)
+        self.autoDetect = QtWidgets.QPushButton(self.frame_10)
+        self.autoDetect.setObjectName("autoDetect")
+        self.horizontalLayout_9.addWidget(self.autoDetect)
         self.verticalLayout_7.addWidget(self.frame_10)
         self.groupBox_11 = QtWidgets.QGroupBox(self.boardTypeSelectorFrame)
         self.groupBox_11.setObjectName("groupBox_11")
@@ -575,6 +578,7 @@ def setupUi(self, BoardConfigurationWindow):
         self.removeAnalogPin.clicked.connect(BoardConfigurationWindow.on_analog_pin_remove)
         self.analog_resolution_spin.valueChanged['int'].connect(BoardConfigurationWindow.on_analog_resolution_change)
         self.permissions_button.clicked.connect(BoardConfigurationWindow.on_permission_button_clicked)
+        self.autoDetect.clicked.connect(BoardConfigurationWindow.on_autodetect_clicked)
         # QtCore.QMetaObject.connectSlotsByName(BoardConfigurationWindow)
         BoardConfigurationWindow.setTabOrder(self.arduinoBoard, self.showPinout)
         BoardConfigurationWindow.setTabOrder(self.showPinout, self.serial_radio)
@@ -612,6 +616,7 @@ def retranslateUi(self, BoardConfigurationWindow):
         self.arduinoBoard.setItemText(1, _translate("BoardConfigurationWindow", "Arduino Uno"))
         self.arduinoBoard.setItemText(2, _translate("BoardConfigurationWindow", "Arduino Mega"))
         self.showPinout.setText(_translate("BoardConfigurationWindow", "Show board Pinout"))
+        self.autoDetect.setText(_translate("BoardConfigurationWindow", "Autodetect"))
         self.groupBox_11.setTitle(_translate("BoardConfigurationWindow", "Connection Type"))
         self.serial_radio.setText(_translate("BoardConfigurationWindow", "Serial"))
         self.ethernet_radio.setText(_translate("BoardConfigurationWindow", "Ethernet"))

MLC/GUI/Autogenerated/mlc_qtcreator/board_config_design.ui

@@ -183,6 +183,13 @@
                   </property>
                  </widget>
                 </item>
+                <item>
+                 <widget class="QPushButton" name="autoDetect">
+                  <property name="text">
+                   <string>Autodetect</string>
+                  </property>
+                 </widget>
+                </item>
                </layout>
               </widget>
              </item>
@@ -1493,15 +1500,31 @@
    <slot>on_permission_button_clicked()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>934</x>
-     <y>116</y>
+     <x>989</x>
+     <y>143</y>
     </hint>
     <hint type="destinationlabel">
      <x>511</x>
      <y>337</y>
     </hint>
    </hints>
   </connection>
+  <connection>
+   <sender>autoDetect</sender>
+   <signal>clicked()</signal>
+   <receiver>BoardConfigurationWindow</receiver>
+   <slot>on_autodetect_clicked()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>918</x>
+     <y>61</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>1018</x>
+     <y>76</y>
+    </hint>
+   </hints>
+  </connection>
  </connections>
  <slots>
   <slot>on_digital_pin_insert()</slot>
@@ -1514,6 +1537,7 @@
   <slot>on_connection_type_toggle()</slot>
   <slot>on_analog_resolution_change()</slot>
   <slot>on_permission_button_clicked()</slot>
+  <slot>on_autodetect_clicked()</slot>
  </slots>
  <buttongroups>
   <buttongroup name="connection_type_group"/>

MLC/GUI/Experiment/ArduinoConfigManager/ArduinoBoardManager.py

@@ -19,18 +19,15 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>
 
-from ArduinoBoardDialog import ArduinoBoardDialog
 from ArduinoBench import ArduinoBench
 
-from MLC.GUI.Autogenerated.autogenerated import Ui_BoardConfigurationWindow
 from MLC.GUI.Experiment.ArduinoConfigManager.BoardConfigurationWindow import BoardConfigurationWindow
 from MLC.arduino import boards
 from MLC.arduino.connection.serialconnection import SerialConnection, SerialConnectionConfig
 from MLC.arduino.protocol import ProtocolConfig, init_interface
 from MLC.arduino.connection.base import ConnectionException, ConnectionTimeoutException
 
 from PyQt5.QtWidgets import QMessageBox
-from PyQt5.QtCore import QTimer
 
 import serial
 import threading
@@ -161,7 +158,7 @@ def board_changed(self, new_idx, old_idx):
                 "Warning", "Configuration reset", "Changing the board will reset all I/O pins configuration! Continue?",
                 QMessageBox.Critical, QMessageBox.Yes | QMessageBox.No)
 
-        if (ret == QMessageBox.Yes):
+        if ret == QMessageBox.Yes:
             del self.__setup.digital_input_pins[:]
             del self.__setup.digital_output_pins[:]
             del self.__setup.analog_input_pins[:]
@@ -171,15 +168,19 @@ def board_changed(self, new_idx, old_idx):
                                                  analog_resolution=boards.types[new_idx]["ANALOG_DEFAULT_RESOLUTION"])
             self.__main_window.set_board(new_idx)
             self.__main_window.update(self.__setup)
+            return new_idx
         else:
             self.__main_window.set_board(old_idx)
+            return old_idx
 
     def start_bench(self):
         try:
-            self.__setup = self.__setup._replace(connection=self.start_connection(), **self.__main_window.checkout_board_setup())
+            self.__setup = self.__setup._replace(connection=self.start_connection(),
+                                                 **self.__main_window.checkout_board_setup())
         except SerialConnectionException:
             self.show_error(
-                "Error", "Connection failure", "Could not start connection to board", QMessageBox.Critical, QMessageBox.Ok)
+                "Error", "Connection failure", "Could not start connection to board",
+                QMessageBox.Critical, QMessageBox.Ok)
             return
 
         bench = ArduinoBench()
@@ -190,6 +191,14 @@ def start_bench(self):
         stats.exec_()
         bench.stop()
 
+    def autodetect_board(self):
+        board_id = boards.detect_board()
+
+        if board_id and board_id != self.__main_window.current_board_idx():
+            self.board_changed(board_id, self.__main_window.current_board_idx())
+
+        return board_id
+
     def update_analog_resolution(self, value):
         self.__setup = self.__setup._replace(analog_resolution=value)
 

MLC/GUI/Experiment/ArduinoConfigManager/BoardConfigurationWindow.py

@@ -226,7 +226,10 @@ def insertPin(self, pin, pinText, pinType, pinsList):
         pinsList.verticalHeader().setVisible(False)
 
     def index_change(self, new_idx):
-        self.__controller.board_changed(new_idx, self.__board_idx)
+        self.__board_idx = self.__controller.board_changed(new_idx, self.__board_idx)
+
+    def current_board_idx(self):
+        return self.__board_idx
 
     def set_board(self, idx):
         self.ui.arduinoBoard.blockSignals(True)
@@ -237,7 +240,8 @@ def on_bench_test_click(self):
         self.__controller.start_bench()
 
     def on_connection_type_toggle(self):
-        print "Type toggled!"
+        #TBD
+        pass
 
     def on_permission_button_clicked(self):
         response = QInputDialog.getText(self,
@@ -260,6 +264,14 @@ def on_permission_button_clicked(self):
                                      "Check the password inserted to be correct"
                                      .format(interface_name))
 
+    def on_autodetect_clicked(self):
+        idx = self.__controller.autodetect_board()
+        if idx is None:
+            QMessageBox.information(self, "No device detected", "Couldn't find a supported Arduino board. "
+                                                                "Please, check your connections.")
+        else:
+            self.__board_idx = idx
+
     def _update_interfaces(self):
         # Search for all the files which starts with tty and end with ACM in the /dev directory
         # FIXME: This is not portable. I don't know where the Arduino is mounted in

MLC/arduino/boards.py

@@ -19,6 +19,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>
 
+import usb.core
+import usb.util
 
 Due = {"NAME": "Arduino Due",
        "SHORT_NAME": "due",
@@ -49,3 +51,14 @@
             "ANALOG_DEFAULT_RESOLUTION": 10}
 
 types = [Due, Uno, Mega, Leonardo]
+boards_ids = [(0x2341, 0x0043, 1),
+              (0x2341, 0x0042, 2),
+              (0x2341, 0x8036, 3),
+              (0x2341, 0x003e, 0),
+              (0x03EB, 0x6124, 0)]
+
+def detect_board():
+    for id in boards_ids:
+        usbdevs = usb.core.find(find_all=True, idVendor=id[0], idProduct=id[1])
+        for dev in usbdevs:
+            return id[2]