paul
/
monocoque
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a couple things i missed in the merge

This commit is contained in:
Paul Dino Jones 2024-09-19 18:59:46 -04:00
parent c0755aef54
commit 128d02e71a
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/monocoque/devices/serial/arduino.c
View File

@ -42,7 +42,7 @@ int arduino_update(SerialDevice* serialdevice, void* data, size_t size)
// return result;
//}
int arduino_init(SerialDevice* serialdevice, const char* portdev, int baud)
int arduino_init(SerialDevice* serialdevice, const char* portdev)
{
slogi("initializing arduino serial device...");
int error = 0;
@ -59,7 +59,7 @@ int arduino_init(SerialDevice* serialdevice, const char* portdev, int baud)
check(sp_open(serialdevice->port, SP_MODE_READ_WRITE));
slogd("Setting port to %i 8N1, no flow control", serialdevice->baud);
check(sp_set_baudrate(serialdevice->port, baud));
check(sp_set_baudrate(serialdevice->port, serialdevice->baud));
check(sp_set_bits(serialdevice->port, 8));
check(sp_set_parity(serialdevice->port, SP_PARITY_NONE));
check(sp_set_stopbits(serialdevice->port, 1));

2
src/monocoque/devices/serial/arduino.h
View File

@ -6,7 +6,7 @@
int arduino_update(SerialDevice* serialdevice, void* data, size_t size);
int arduino_init(SerialDevice* serialdevice, const char* portdev, int baud);
int arduino_init(SerialDevice* serialdevice, const char* portdev);
int arduino_free(SerialDevice* serialdevice);
int check(enum sp_return result);

6
src/monocoque/devices/serialdevice.c
View File

@ -140,9 +140,7 @@ int serialdev_init(SerialDevice* serialdevice, DeviceSettings* ds)
serialdevice->motorsposition = ds->serialdevsettings.motorsposition;
serialdevice->baudrate = ds->serialdevsettings.baud;
serialdevice->baud = baud;
error = arduino_init(serialdevice, portdev);
error = arduino_init(serialdevice, ds->serialdevsettings.portdev);
switch (serialdevice->type)
{
case SERIALDEV_WHEEL:
@ -153,7 +151,7 @@ int serialdev_init(SerialDevice* serialdevice, DeviceSettings* ds)
break;
default:
error = arduino_init(serialdevice, ds->serialdevsettings.portdev, ds->serialdevsettings.baud);
error = arduino_init(serialdevice, ds->serialdevsettings.portdev );
}