Merge pull request #356 from tinymovr/firmware/fix_can_setup

Fix can initialization/setup
tinymovr · Jun 6, 2024 · bf4bb02 · bf4bb02
2 parents 6f41966 + 78b0684
commit bf4bb02
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/firmware/src/main.c b/firmware/src/main.c
@@ -34,14 +34,14 @@ int main(void)
 {
   	__disable_irq();
     system_init();
-    UART_Init();
-	ADC_init();
-    CAN_init();
+    UART_Init(); // Keep UART init before config load for now
     if (!nvm_load_config())
     {
         sensors_init_with_defaults();
         observers_init_with_defaults();
     }
+    ADC_init();
+    CAN_init();
     timers_init();
     Watchdog_init();
     __enable_irq();

diff --git a/studio/Python/tinymovr/bus_manager.py b/studio/Python/tinymovr/bus_manager.py
@@ -49,7 +49,6 @@ def recv(self, timeout):
             self.attempt_reconnect()
         except AttributeError:
             self.attempt_reconnect()
-        return None
 
     def shutdown(self):
         try:

diff --git a/studio/Python/tinymovr/gui/worker.py b/studio/Python/tinymovr/gui/worker.py
@@ -20,6 +20,7 @@
 import can
 from PySide6 import QtCore
 from PySide6.QtCore import QObject
+from tinymovr.channel import ResponseError
 from tinymovr.gui import TimedGetter, get_dynamic_attrs
 from tinymovr.bus_router import init_router, destroy_router
 from tinymovr.device_discovery import DeviceDiscovery
@@ -140,8 +141,11 @@ def _update(self):
 
     def _device_appeared(self, device, node_id):
         self.mutx.lock()
-        display_name = "{}{}".format(device.name, node_id)
-        self.logger.info("Found {} (uid {})".format(display_name, device.uid))
+        try:
+            display_name = "{}{}".format(device.name, node_id)
+            self.logger.info("Found {} (uid {})".format(display_name, device.uid))
+        except ResponseError as e:
+            self.handleErrorSignal.emit(e)
         self.devices_by_name[display_name] = device
         self.names_by_id[node_id] = display_name
         device.name = display_name