From 2b787cba00c7e44d3908d11a51295fd4d8578b3b Mon Sep 17 00:00:00 2001 From: Paul Dino Jones Date: Fri, 29 May 2026 14:28:24 -0400 Subject: [PATCH] cleanup the way errors are returned for arduino type devices --- src/monocoque/devices/serial/arduino.c | 9 +++++---- src/monocoque/devices/serialdevice.c | 16 ---------------- 2 files changed, 5 insertions(+), 20 deletions(-) diff --git a/src/monocoque/devices/serial/arduino.c b/src/monocoque/devices/serial/arduino.c index 7e842f3..8527366 100644 --- a/src/monocoque/devices/serial/arduino.c +++ b/src/monocoque/devices/serial/arduino.c @@ -128,16 +128,17 @@ int GetNumberOfLeds(SerialDevice* serialdevice, int* numlights) int arduino_init(SerialDevice* serialdevice, const char* portdev) { - serialdevice->id = monocoque_serial_open(serialdevice, portdev); - return serialdevice->id; + int id = monocoque_serial_open(serialdevice, portdev); + if (id < 0) return id; + serialdevice->id = id; + return 0; } int arduino_custom_init(SerialDevice* serialdevice, const char* portdev, const char* luafile, bool uselights) { - serialdevice->id = monocoque_serial_open(serialdevice, portdev); - + arduino_init(serialdevice, portdev); int numlights = 0; diff --git a/src/monocoque/devices/serialdevice.c b/src/monocoque/devices/serialdevice.c index fcb8b7c..a80a574 100644 --- a/src/monocoque/devices/serialdevice.c +++ b/src/monocoque/devices/serialdevice.c @@ -261,10 +261,6 @@ int serialdev_init(SerialDevice* serialdevice, DeviceSettings* ds, SimInfo* simi { free(serialdevice->m.device_specific_config_file); } - if(error > 0) - { - error = 0; - } break; case ARDUINODEV__CUSTOM: serialdevice->m.device_specific_config_file = strdup(ds->specific_config_file); @@ -273,24 +269,12 @@ int serialdev_init(SerialDevice* serialdevice, DeviceSettings* ds, SimInfo* simi { free(serialdevice->m.device_specific_config_file); } - if(error > 0) - { - error = 0; - } break; case ARDUINODEV__SIMLED: error = arduino_custom_init(serialdevice, ds->serialdevsettings.portdev, NULL, false); - if(error > 0) - { - error = 0; - } break; default: error = arduino_init(serialdevice, ds->serialdevsettings.portdev); - if(error > 0) - { - error = 0; - } break; }