From 2446fc9af23ee0cd26a45b5a27a229d6df928dbd Mon Sep 17 00:00:00 2001
From: Paul Dino Jones <paul@spacefreak18.xyz>
Date: Tue, 17 Sep 2024 10:17:40 -0400
Subject: [PATCH] Moved baud rate to serial device struct and fixed log message

---
 src/monocoque/devices/serial/arduino.c | 6 +++---
 src/monocoque/devices/serial/arduino.h | 2 +-
 src/monocoque/devices/serialdevice.c   | 4 +++-
 src/monocoque/devices/simdevice.h      | 1 +
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/monocoque/devices/serial/arduino.c b/src/monocoque/devices/serial/arduino.c
index c9db551..1efc585 100644
--- a/src/monocoque/devices/serial/arduino.c
+++ b/src/monocoque/devices/serial/arduino.c
@@ -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;
@@ -58,8 +58,8 @@ int arduino_init(SerialDevice* serialdevice, const char* portdev, int baud)
     slogd("Opening port.\n");
     check(sp_open(serialdevice->port, SP_MODE_READ_WRITE));
 
-    slogd("Setting port to 9600 8N1, no flow control.\n");
-    check(sp_set_baudrate(serialdevice->port, baud));
+    slogd("Setting port to %i 8N1, no flow control", serialdevice->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));
diff --git a/src/monocoque/devices/serial/arduino.h b/src/monocoque/devices/serial/arduino.h
index 259ff55..a348988 100644
--- a/src/monocoque/devices/serial/arduino.h
+++ b/src/monocoque/devices/serial/arduino.h
@@ -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);
 
diff --git a/src/monocoque/devices/serialdevice.c b/src/monocoque/devices/serialdevice.c
index 8f15c84..66d8b38 100644
--- a/src/monocoque/devices/serialdevice.c
+++ b/src/monocoque/devices/serialdevice.c
@@ -138,7 +138,9 @@ int serialdev_init(SerialDevice* serialdevice, const char* portdev, int motorspo
 
     serialdevice->motorsposition = motorsposition;
 
-    error = arduino_init(serialdevice, portdev, baud);
+    serialdevice->baud = baud;
+
+    error = arduino_init(serialdevice, portdev);
 
     return error;
 }
diff --git a/src/monocoque/devices/simdevice.h b/src/monocoque/devices/simdevice.h
index 154186d..94957ef 100644
--- a/src/monocoque/devices/simdevice.h
+++ b/src/monocoque/devices/simdevice.h
@@ -47,6 +47,7 @@ typedef struct
     int id;
     SerialType type;
     struct sp_port* port;
+    int baud;
     SerialDeviceType devicetype;
     // move these two they only apply to the haptic device
     int motorsposition;