From ec6cb073ee9b0d5049c56cd351abfef35fcc9cd8 Mon Sep 17 00:00:00 2001 From: Paul Dino Jones Date: Thu, 19 Sep 2024 21:22:00 -0400 Subject: [PATCH] Fixed overlook device settings in config processing --- src/monocoque/devices/serialdevice.c | 3 +-- src/monocoque/helper/confighelper.c | 2 +- tests/a.out | Bin 0 -> 15432 bytes tests/producer | Bin 0 -> 15968 bytes tests/sharedmemoryunlink.c | 20 ++++++++++++++++++++ 5 files changed, 22 insertions(+), 3 deletions(-) create mode 100755 tests/a.out create mode 100755 tests/producer create mode 100644 tests/sharedmemoryunlink.c diff --git a/src/monocoque/devices/serialdevice.c b/src/monocoque/devices/serialdevice.c index d2aaa10..5d943c0 100644 --- a/src/monocoque/devices/serialdevice.c +++ b/src/monocoque/devices/serialdevice.c @@ -133,14 +133,13 @@ int serialdev_free(SimDevice* this) int serialdev_init(SerialDevice* serialdevice, DeviceSettings* ds) { - slogi("initializing serial device..."); + slogi("initializing serial device on port %s...", ds->serialdevsettings.portdev); int error = 0; serialdevice->motorsposition = ds->serialdevsettings.motorsposition; serialdevice->baudrate = ds->serialdevsettings.baud; - error = arduino_init(serialdevice, ds->serialdevsettings.portdev); switch (serialdevice->type) { case SERIALDEV_WHEEL: diff --git a/src/monocoque/helper/confighelper.c b/src/monocoque/helper/confighelper.c index 22122dd..06faa29 100644 --- a/src/monocoque/helper/confighelper.c +++ b/src/monocoque/helper/confighelper.c @@ -551,7 +551,7 @@ int devsetup(const char* device_type, const char* device_subtype, const char* co } } - if (ds->dev_subtype == SIMDEVTYPE_SIMWIND || ds->dev_subtype == SIMDEVTYPE_SHIFTLIGHTS || ds->dev_subtype == SIMDEVTYPE_SERIALHAPTIC) + if (ds->dev_type == SIMDEV_SERIAL) { if (device_settings != NULL) { diff --git a/tests/a.out b/tests/a.out new file mode 100755 index 0000000000000000000000000000000000000000..209cdd7c1d4be77d1f0f2e3d18bd572c9ba2442c GIT binary patch literal 15432 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 AvH$=8 literal 0 HcmV?d00001 diff --git a/tests/sharedmemoryunlink.c b/tests/sharedmemoryunlink.c new file mode 100644 index 0000000..71441b6 --- /dev/null +++ b/tests/sharedmemoryunlink.c @@ -0,0 +1,20 @@ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +void display(char* prog, char* bytes, int n); + +int main(void) +{ + const char* name = "acpmf_physics"; // file name + + shm_unlink(name); +} +