cleanup the way errors are returned for arduino type devices

This commit is contained in:
Paul Dino Jones
2026-05-29 14:28:24 -04:00
parent 3c81f749b8
commit 2b787cba00
2 changed files with 5 additions and 20 deletions
+5 -4
View File
@@ -128,16 +128,17 @@ int GetNumberOfLeds(SerialDevice* serialdevice, int* numlights)
int arduino_init(SerialDevice* serialdevice, const char* portdev) int arduino_init(SerialDevice* serialdevice, const char* portdev)
{ {
serialdevice->id = monocoque_serial_open(serialdevice, portdev); int id = monocoque_serial_open(serialdevice, portdev);
return serialdevice->id; if (id < 0) return id;
serialdevice->id = id;
return 0;
} }
int arduino_custom_init(SerialDevice* serialdevice, const char* portdev, const char* luafile, bool uselights) 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; int numlights = 0;
-16
View File
@@ -261,10 +261,6 @@ int serialdev_init(SerialDevice* serialdevice, DeviceSettings* ds, SimInfo* simi
{ {
free(serialdevice->m.device_specific_config_file); free(serialdevice->m.device_specific_config_file);
} }
if(error > 0)
{
error = 0;
}
break; break;
case ARDUINODEV__CUSTOM: case ARDUINODEV__CUSTOM:
serialdevice->m.device_specific_config_file = strdup(ds->specific_config_file); 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); free(serialdevice->m.device_specific_config_file);
} }
if(error > 0)
{
error = 0;
}
break; break;
case ARDUINODEV__SIMLED: case ARDUINODEV__SIMLED:
error = arduino_custom_init(serialdevice, ds->serialdevsettings.portdev, NULL, false); error = arduino_custom_init(serialdevice, ds->serialdevsettings.portdev, NULL, false);
if(error > 0)
{
error = 0;
}
break; break;
default: default:
error = arduino_init(serialdevice, ds->serialdevsettings.portdev); error = arduino_init(serialdevice, ds->serialdevsettings.portdev);
if(error > 0)
{
error = 0;
}
break; break;
} }