cleanup the way errors are returned for arduino type devices
This commit is contained in:
@@ -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;
|
||||
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user