.gitmodules

@@ -1,4 +1,3 @@
 [submodule "src/monocoque/simulatorapi/simapi"]
 	path = src/monocoque/simulatorapi/simapi
 	url = https://github.com/spacefreak18/simapi
-	# url = git@github.com:spacefreak18/simapi # ssh is better but Microsoft requires an account

CMakeLists.txt

@@ -33,24 +33,16 @@ FIND_LIBRARY(LIBUSB_LIBRARY NAMES usb-1.0
 set(HIDAPI_WITH_LIBUSB TRUE) # surely will be used only on Linux
 set(BUILD_SHARED_LIBS TRUE) # HIDAPI as static library on all platforms
 
-add_executable(monocoque src/monocoque/monocoque.c)
-if(USE_PULSEAUDIO)
-    message("Using pulseaudio backend...")
-    add_compile_definitions(USE_PULSEAUDIO=true)
-    target_link_libraries(monocoque m ${LIBUSB_LIBRARY} hidapi-libusb pulse serialport xml2 argtable2 config gameloop helper devices slog simulatorapi)
-else()
-    message("Using portaudio backend...")
-    target_link_libraries(monocoque m ${LIBUSB_LIBRARY} hidapi-libusb portaudio serialport xml2 argtable2 config gameloop helper devices slog simulatorapi)
-endif()
-
-target_include_directories(monocoque PUBLIC config ${LIBUSB_INCLUDE_DIR} ${LIBXML_INCLUDE_DIR})
-
 add_subdirectory(src/monocoque/gameloop)
 add_subdirectory(src/monocoque/simulatorapi)
 add_subdirectory(src/monocoque/helper)
 add_subdirectory(src/monocoque/devices)
 add_subdirectory(src/monocoque/slog)
 
+add_executable(monocoque src/monocoque/monocoque.c)
+target_include_directories(monocoque PUBLIC config ${LIBUSB_INCLUDE_DIR} ${LIBXML_INCLUDE_DIR})
+target_link_libraries(monocoque m ${LIBUSB_LIBRARY} hidapi-libusb portaudio serialport xml2 argtable2 config gameloop helper devices slog simulatorapi)
+
 add_executable(listusb tests/testlibusb.c)
 target_include_directories(listusb PUBLIC ${LIBUSB_INCLUDE_DIR})
 target_link_libraries(listusb ${LIBUSB_LIBRARY} portaudio)

README.md

@@ -16,20 +16,18 @@ Cross Platform device manager for driving and flight simulators, for use with co
 - Includes utility to configure revburner tachometer
 - Can send data to any serial device. So far only tested with arduino. Includes sample arduino sketch for sim lights.
 - The support for haptic bass shakers is limited and needs the most work. So far the engine rev is a simple sine wave, which I find convincing. The gear shift event works but not convincing enough for me.
-- Choice of Portaudio or Pulseaudio backend.
 
 ## Dependencies
 - libserialport - arduino serial devices
 - hidapi - usb hid devices
 - libusb - used by hidapi
 - portaudio - sound devices (haptic bass shakers)
-- pulseaudio - sound devices (haptic bass shakers)
 - libenet - UDP support (not yet implemented)
 - libxml2
 - argtable2
 - libconfig
 - [slog](https://github.com/kala13x/slog) (static)
-- [wine-linux-shm-adapter](https://github.com/spacefreak18/simshmbridge) - for sims that need shared memory mapping like AC.
+- [wine-linux-shm-adapter](https://github.com/spacefreak18/wine-linux-shm-adapter)
 - [simapi](https://github.com/spacefreak18/simapi)
 
 ## Building
@@ -38,23 +36,14 @@ This code depends on the shared memory data headers in the simapi [repo](https:/
 git submodule sync --recursive
 git submodule update --init --recursive
 ```
-
 Then to compile simply:
 ```
 mkdir build; cd build
 cmake ..
 make
 ```
-
-to use the pulseaudio backend use this cmake command
-```
-cmake -DUSE_PULSEAUDIO=YES ..
-```
-
 ## Testing
 
-### Setting up Your Arduino Device
-
 ### Static Analysis
 ```
     mkdir build; cd build
@@ -71,6 +60,7 @@ cmake -DUSE_PULSEAUDIO=YES ..
 ## ToDo
  - windows port
  - more memory testing
+ - handling null mallocs
  - move config code around
  - cleanup tests which are basically just copies of the example from their respective projects
  - much, much more

conf/monocoque.config

@@ -6,23 +6,10 @@ devices = ( {   device      = "USB";
                 granularity = 4;
                 config      = "/home/paul/.config/monocoque/revburner1.xml"; },
             {   device      = "Sound";
-                type         = "Engine";
+                type        = "Shaker"
-                devid        = "alsa_output.usb-Generic_USB2.0_Device_20170726905959-00.analog-stereo";
+                devid       = "98FD:83AC";
-                pan          = 1;
+                config      = "shaker1.config"; },
-                volume       = 90;
-                frequency    = 27; },
-            {   device       = "Sound";
-                type         = "Gear"
-                devid        = "alsa_output.usb-Generic_USB2.0_Device_20170726905959-00.analog-stereo";
-                pan          = 1;
-                duration     = .25;
-                volume       = 100;
-                frequency    = 27; },
             {   device      = "Serial";
                 type        = "ShiftLights";
                 config      = "None";
-                devpath     = "/dev/ttyACM0"; } ),
+                devpath     = "/dev/ttyACM0"; } );
-            {   device      = "Serial";
-                type        = "SimWind";
-                config      = "None";
-                devpath     = "/dev/ttyACM1"; } );

src/arduino/shift_lights/shift_lights.ino

@@ -1,7 +1,7 @@
 #include <FastLED.h>
-#include "simdata.h"
+#include "../../monocoque/simulatorapi/simdata.h"
 
-#define SIMDATA_SIZE sizeof(SimData)
+#define BYTE_SIZE sizeof(SimData)
 
 #define LED_PIN     7
 #define NUM_LEDS    6
@@ -39,12 +39,12 @@ void setup()
 void loop()
 {
     int l = 0;
-    char buff[SIMDATA_SIZE];
+    char buff[BYTE_SIZE];
 
-    if (Serial.available() >= SIMDATA_SIZE)
+    if (Serial.available() >= BYTE_SIZE)
     {
-        Serial.readBytes(buff, SIMDATA_SIZE);
+        Serial.readBytes(buff, BYTE_SIZE);
-        memcpy(&sd, &buff, SIMDATA_SIZE);
+        memcpy(&sd, &buff, BYTE_SIZE);
         rpm = sd.rpms;
         maxrpm = sd.maxrpm;
 

src/arduino/shift_lights/shift_lights.ino.orig

@@ -0,0 +1,93 @@
+#include <FastLED.h>
+#include "../../monocoque/simulatorapi/simdata.h"
+
+#define BYTE_SIZE sizeof(SimData)
+
+#define LED_PIN     7
+#define NUM_LEDS    6
+
+CRGB leds[NUM_LEDS];
+SimData sd;
+int maxrpm = 0;
+int rpm = 0;
+int numlights = NUM_LEDS;
+int pin = LED_PIN;
+int lights[6];
+
+
+void setup() {
+
+  Serial.begin(9600);
+  FastLED.addLeds<WS2812, LED_PIN, GRB>(leds, NUM_LEDS);
+  FastLED.setMaxPowerInVoltsAndMilliamps(5, 500);
+  FastLED.setBrightness(40);
+  for (int i = 0; i < numlights; i++)
+  {
+    leds[i] = CRGB ( 0, 0, 0);
+    lights[i] = 0;
+  }
+  FastLED.clear();
+
+  sd.rpms = 0;
+  sd.maxrpm = 6500;
+  sd.altitude = 10;
+  sd.pulses = 40000;
+  sd.velocity = 10;
+}
+
+void loop() {
+
+  int l = 0;
+  char buff[BYTE_SIZE];
+
+  if (Serial.available() >= BYTE_SIZE) {
+    Serial.readBytes(buff, BYTE_SIZE);
+    memcpy(&sd, &buff, BYTE_SIZE);
+    rpm = sd.rpms;
+    maxrpm = sd.maxrpm;
+
+  }
+
+
+  while (l < numlights)
+  {
+    lights[l] = 0;
+    l++;
+  }
+  l = -1; 
+  int rpmlights = 0;
+  while (rpm > rpmlights)
+  {
+    if (l>=0)
+    {
+      lights[l] = 1;
+    }
+    l++;
+    rpmlights = rpmlights + (((maxrpm-250)/numlights));
+  }
+
+  l = 0;
+  FastLED.clear();
+  while (l < numlights)
+  {
+
+    if (l >= numlights / 2)
+    {
+      leds[l] = CRGB ( 0, 0, 255);
+    }
+    if (l < numlights / 2)
+    {
+      leds[l] = CRGB ( 0, 255, 0);
+    }
+    if (l == numlights - 1)
+    {
+      leds[l] = CRGB ( 255, 0, 0);
+    }
+    if (lights[l] <= 0)
+    {
+      leds[l] = CRGB ( 0, 0, 0);
+    }
+    FastLED.show();
+    l++;
+  }
+}

src/arduino/shiftlights/simdata.h

@@ -1 +0,0 @@
-../../monocoque/simulatorapi/simapi/simapi/simdata.h

src/arduino/simwind/simdata.h

@@ -1 +0,0 @@
-../../monocoque/simulatorapi/simapi/simapi/simdata.h

src/arduino/simwind/simwind.ino

@@ -1,51 +0,0 @@
-#include <Adafruit_MotorShield.h>
-#include "simdata.h"
-
-#define BYTE_SIZE sizeof(SimData)
-#define KPHTOMPH .621317
-
-
-Adafruit_MotorShield AFMS = Adafruit_MotorShield();
-
-Adafruit_DCMotor *myMotor1 = AFMS.getMotor(1);
-Adafruit_DCMotor *myMotor2 = AFMS.getMotor(3);
-
-SimData sd;
-int velocity = 0;
-
-void setup() {
-    Serial.begin(9600);
-    if (!AFMS.begin()) {
-        Serial.println("Could not find Motor Shield. Check wiring.");
-        while (1);
-    }
-    sd.rpms = 0;
-    sd.maxrpm = 6500;
-    sd.altitude = 10;
-    sd.pulses = 40000;
-    sd.velocity = 10;
-
-    myMotor1->setSpeed(0);
-    myMotor1->run(FORWARD);
-
-    myMotor2->setSpeed(0);
-    myMotor2->run(FORWARD);
-}
-
-void loop() {
-    char buff[BYTE_SIZE];
-
-    if (Serial.available() >= BYTE_SIZE)
-    {
-        Serial.readBytes(buff, BYTE_SIZE);
-        memcpy(&sd, &buff, BYTE_SIZE);
-        velocity = sd.velocity;
-    }
-    int v = ceil(velocity * KPHTOMPH);
-    if (v >= 255)
-    {
-      v = 255;
-    }
-    myMotor1->setSpeed(v);
-    myMotor2->setSpeed(v);
-}

src/monocoque/devices/CMakeLists.txt

@@ -9,13 +9,10 @@ set(devices_source_files
   serialdevice.c
   tachdevice.h
   tachdevice.c
-  sound.h
-  sound.c
   usb/revburner.h
   usb/revburner.c
   sound/usb_generic_shaker.h
   sound/usb_generic_shaker.c
-  sound/usb_generic_shaker_pulse.c
   serial/arduino.h
   serial/arduino.c
 )

src/monocoque/devices/serial/arduino.c

@@ -1,10 +1,9 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <stdlib.h>
-#include <string.h>
 
 #include "arduino.h"
-#include "../../slog/slog.h"
+#include "../slog/slog.h"
 
 #define arduino_timeout 2000
 
@@ -19,12 +18,11 @@ int arduino_update(SerialDevice* serialdevice, SimData* simdata)
     return result;
 }
 
-int arduino_init(SerialDevice* serialdevice, const char* portdev)
+int arduino_init(SerialDevice* serialdevice)
 {
     slogi("initializing arduino serial device...");
     int error = 0;
-    char* port_name = strdup(portdev);
+    char* port_name = "/dev/ttyACM0";
-
     slogd("Looking for port %s.\n", port_name);
     error = check(sp_get_port_by_name(port_name, &serialdevice->port));
     if (error != 0)
@@ -42,7 +40,6 @@ int arduino_init(SerialDevice* serialdevice, const char* portdev)
     check(sp_set_stopbits(serialdevice->port, 1));
     check(sp_set_flowcontrol(serialdevice->port, SP_FLOWCONTROL_NONE));
 
-    free(port_name);
     slogd("Successfully setup arduino serial device...");
     return 0;
 }

src/monocoque/devices/serial/arduino.h

@@ -1,11 +1,10 @@
 #ifndef _ARDUINO_H
 #define _ARDUINO_H
 
-#include "../simdevice.h"
 #include "../serialdevice.h"
 
 int arduino_update(SerialDevice* serialdevice, SimData* simdata);
-int arduino_init(SerialDevice* serialdevice, const char* portdev);
+int arduino_init(SerialDevice* serialdevice);
 int arduino_free(SerialDevice* serialdevice);
 int check(enum sp_return result);
 

src/monocoque/devices/serialdevice.c

@@ -2,34 +2,26 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <math.h>
 
-#include "simdevice.h"
 #include "serialdevice.h"
 #include "serial/arduino.h"
 #include "../helper/parameters.h"
-#include "../simulatorapi/simapi/simapi/simdata.h"
+#include "../simulatorapi/simdata.h"
 #include "../slog/slog.h"
 
-int serialdev_update(SimDevice* this, SimData* simdata)
+int serialdev_update(SerialDevice* serialdevice, SimData* simdata)
 {
-    SerialDevice* serialdevice = (void *) this->derived;
-
     arduino_update(serialdevice, simdata);
     return 0;
 }
 
-int serialdev_free(SimDevice* this)
+int serialdev_free(SerialDevice* serialdevice)
 {
-    SerialDevice* serialdevice = (void *) this->derived;
-
     arduino_free(serialdevice);
-
-    free(serialdevice);
     return 0;
 }
 
-int serialdev_init(SerialDevice* serialdevice, const char* portdev)
+int serialdev_init(SerialDevice* serialdevice)
 {
     slogi("initializing serial device...");
     int error = 0;
@@ -37,29 +29,7 @@ int serialdev_init(SerialDevice* serialdevice, const char* portdev)
     serialdevice->type = SERIALDEV_UNKNOWN;
     serialdevice->type = SERIALDEV_ARDUINO;
 
-    error = arduino_init(serialdevice, portdev);
+    error = arduino_init(serialdevice);
 
     return error;
 }
-
-static const vtable serial_simdevice_vtable = { &serialdev_update, &serialdev_free };
-
-SerialDevice* new_serial_device(DeviceSettings* ds) {
-
-    SerialDevice* this = (SerialDevice*) malloc(sizeof(SerialDevice));
-
-    this->m.update = &update;
-    this->m.free = &simdevfree;
-    this->m.derived = this;
-    this->m.vtable = &serial_simdevice_vtable;
-
-    int error = serialdev_init(this, ds->serialdevsettings.portdev);
-
-    if (error != 0)
-    {
-        free(this);
-        return NULL;
-    }
-
-    return this;
-}

src/monocoque/devices/serialdevice.h

@@ -2,6 +2,26 @@
 #define _SERIALDEVICE_H
 
 #include <libserialport.h>
+#include "../helper/parameters.h"
+#include "../simulatorapi/simdata.h"
 
+typedef enum
+{
+    SERIALDEV_UNKNOWN       = 0,
+    SERIALDEV_ARDUINO       = 1
+}
+SerialType;
+
+typedef struct
+{
+    int id;
+    SerialType type;
+    struct sp_port* port;
+}
+SerialDevice;
+
+int serialdev_update(SerialDevice* serialdevice, SimData* simdata);
+int serialdev_init(SerialDevice* serialdevice);
+int serialdev_free(SerialDevice* serialdevice);
 
 #endif

src/monocoque/devices/simdevice.c

@@ -1,108 +1,85 @@
 #include <stdio.h>
-#include <stdlib.h>
 
 #include "simdevice.h"
 #include "../helper/parameters.h"
 #include "../helper/confighelper.h"
-#include "../simulatorapi/simapi/simapi/simdata.h"
+#include "../simulatorapi/simdata.h"
 #include "../slog/slog.h"
 
-
+int devupdate(SimDevice* simdevice, SimData* simdata)
-int update(SimDevice* this, SimData* simdata)
 {
-    ((vtable*)this->vtable)->update(this, simdata);
+    if (simdevice->initialized==false)
+    {
+        return 0;
     }
-
+    switch ( simdevice->type )
-int simdevfree(SimDevice* this)
     {
-    ((vtable*)this->vtable)->free(this);
+        case SIMDEV_USB :
+            usbdev_update(&simdevice->d.usbdevice, simdata);
+            break;
+        case SIMDEV_SOUND :
+            sounddev_update(&simdevice->d.sounddevice, simdata);
+            break;
+        case SIMDEV_SERIAL :
+            serialdev_update(&simdevice->d.serialdevice, simdata);
+            break;
     }
-
-int devupdate(SimDevice* this, SimData* simdata)
-{
-
     return 0;
 }
 
-int devfree(SimDevice* simdevices, int numdevices)
+int devfree(SimDevice* simdevice)
 {
 
-    slogi("freeing %i simdevices...", numdevices);
+    if (simdevice->initialized==false)
-    int devices = 0;
-
-    int freed = 0;
-    for (int j = 0; j < 1; j++)
     {
-        SimDevice simdev = simdevices[j]; 
+        slogw("Attempt to free an uninitialized device");
-        if (simdev.initialized == true)
+        return MONOCOQUE_ERROR_INVALID_DEV;
-        {
-            simdev.free(&simdev);
     }
+    switch ( simdevice->type )
+    {
+        case SIMDEV_USB :
+            usbdev_free(&simdevice->d.usbdevice);
+            break;
+        case SIMDEV_SOUND :
+            sounddev_free(&simdevice->d.sounddevice);
+            break;
+        case SIMDEV_SERIAL :
+            serialdev_free(&simdevice->d.serialdevice);
+            break;
     }
-
-    //free(simdevices);
-
     return 0;
 }
 
-int devinit(SimDevice* simdevices, int numdevices, DeviceSettings* ds)
+int devinit(SimDevice* simdevice, DeviceSettings* ds)
 {
-    slogi("initializing simdevices...");
+    slogi("initializing simdevice...");
-    int devices = 0;
+    simdevice->initialized = false;
+    int err = 0;
 
-    for (int j = 0; j < numdevices; j++)
+    switch ( ds->dev_type )
     {
-        simdevices[j].initialized = false;
+        case SIMDEV_USB :
+            simdevice->type = SIMDEV_USB;
+            simdevice->d.usbdevice.type = USBDEV_UNKNOWN;
+            err = usbdev_init(&simdevice->d.usbdevice, ds);
+            break;
+        case SIMDEV_SOUND :
+            simdevice->type = SIMDEV_SOUND;
+            err = sounddev_init(&simdevice->d.sounddevice);
+            break;
+        case SIMDEV_SERIAL :
+            simdevice->type = SIMDEV_SERIAL;
+            err = serialdev_init(&simdevice->d.serialdevice);
+            break;
+        default :
+            sloge("Unknown device type");
+            err = MONOCOQUE_ERROR_UNKNOWN_DEV;
+            break;
+    }
 
-        if (ds[j].dev_type == SIMDEV_USB) {
+    if (err==0)
-            USBDevice* sim = new_usb_device(&ds[j]);
-            if (sim != NULL)
     {
-                simdevices[j] = sim->m;
+        simdevice->initialized = true;
-                simdevices[j].initialized = true;
-                simdevices[j].type = SIMDEV_USB;
-                devices++;
     }
-            else
+    return err;
-            {
-                slogw("Could not initialize USB Device");
-            }
-        }
-
-        if (ds[j].dev_type == SIMDEV_SOUND) {
-
-            SoundDevice* sim = new_sound_device(&ds[j]);
-            if (sim != NULL)
-            {
-
-                simdevices[j] = sim->m;
-                simdevices[j].initialized = true;
-                simdevices[j].type = SIMDEV_SOUND;
-                devices++;
-            }
-            else
-            {
-                slogw("Could not initialize Sound Device");
-            }
-        }
-
-        if (ds[j].dev_type == SIMDEV_SERIAL) {
-
-            SerialDevice* sim = new_serial_device(&ds[j]);
-            if (sim != NULL)
-            {
-                simdevices[j] = sim->m;
-                simdevices[j].initialized = true;
-                simdevices[j].type = SIMDEV_SERIAL;
-                devices++;
-
-            }
-            else
-            {
-                slogw("Could not initialize Serial Device");
-            }
-        }
-    }
-
-    return devices;
 }

src/monocoque/devices/simdevice.h

@@ -7,109 +7,28 @@
 #include "sounddevice.h"
 #include "serialdevice.h"
 #include "../helper/confighelper.h"
-#include "../simulatorapi/simapi/simapi/simdata.h"
+#include "../simulatorapi/simdata.h"
 
 
-typedef struct SimDevice SimDevice;
+typedef struct
-
-struct SimDevice
 {
-    const void* vtable;
-    int (*update)(SimDevice*, SimData*);
-    int (*free)(SimDevice*);
-    void* derived;
     int id;
     bool initialized;
     DeviceType type;
 
-};
-
-typedef struct {
-    int (*update)(SimDevice*, SimData*);
-    int (*free)(SimDevice*);
-} vtable;
-
-/********* Serial Devices *****/
-typedef enum
-{
-    SERIALDEV_UNKNOWN       = 0,
-    SERIALDEV_ARDUINO       = 1
-}
-SerialType;
-
-typedef struct
-{
-    SimDevice m;
-    int id;
-    SerialType type;
-    struct sp_port* port;
-}
-SerialDevice;
-
-int serialdev_update(SimDevice* this, SimData* simdata);
-int serialdev_free(SimDevice* this);
-
-SerialDevice* new_serial_device(DeviceSettings* ds);
-
-/********* USB HID Devices *****/
-typedef enum
-{
-    USBDEV_UNKNOWN       = 0,
-    USBDEV_TACHOMETER    = 1
-}
-USBType;
-
-typedef struct
-{
-    SimDevice m;
-    int id;
-    USBType type;
     union
     {
-        TachDevice tachdevice;
+        USBDevice usbdevice;
-    } u;
+        SoundDevice sounddevice;
+        SerialDevice serialdevice;
+    } d;
 }
-USBDevice;
+SimDevice;
-
-int usbdev_update(SimDevice* this, SimData* simdata);
-int usbdev_free(SimDevice* this);
-
-USBDevice* new_usb_device(DeviceSettings* ds);
-
-
-/********* Sound Devices *****/
-typedef struct
-{
-    SimDevice m;
-    int id;
-    SoundType type;
-    VibrationEffectType effecttype;
-    SoundData sounddata;
-#ifdef USE_PULSEAUDIO
-    pa_stream *stream;
-#else
-    PaStreamParameters outputParameters;
-    PaStream* stream;
-#endif
-}
-SoundDevice;
-
-int sounddev_engine_update(SimDevice* this, SimData* simdata);
-int sounddev_gearshift_update(SimDevice* this, SimData* simdata);
-int sounddev_free(SimDevice* this);
-
-SoundDevice* new_sound_device(DeviceSettings* ds);
-
-/***** Generic Methods *********/
-
-int update(SimDevice* simdevice, SimData* simdata);
 
 int devupdate(SimDevice* simdevice, SimData* simdata);
 
-int devinit(SimDevice* simdevices, int numdevices, DeviceSettings* ds);
+int devinit(SimDevice* simdevice, DeviceSettings* ds);
 
-int devfree(SimDevice* simdevices, int numdevices);
+int devfree(SimDevice* simdevice);
-
-int simdevfree(SimDevice* this);
 
 #endif

src/monocoque/devices/sound.c

@@ -1,79 +0,0 @@
-#include "sound.h"
-
-#include "../slog/slog.h"
-
-#ifdef USE_PULSEAUDIO
-
-pa_threaded_mainloop* mainloop;
-pa_context* context;
-
-void context_state_cb(pa_context* context, void* mainloop) {
-    pa_threaded_mainloop_signal(mainloop, 0);
-}
-
-int setupsound()
-{
-
-
-
-    pa_mainloop_api *mainloop_api;
-
-    slogi("connecting pulseaudio...");
-    // Get a mainloop and its context
-    mainloop = pa_threaded_mainloop_new();
-    assert(mainloop);
-    mainloop_api = pa_threaded_mainloop_get_api(mainloop);
-    context = pa_context_new(mainloop_api, "Monocoque");
-    assert(context);
-
-    pa_context_set_state_callback(context, &context_state_cb, mainloop);
-
-    // Lock the mainloop so that it does not run and crash before the context is ready
-    pa_threaded_mainloop_lock(mainloop);
-
-    // Start the mainloop
-    assert(pa_threaded_mainloop_start(mainloop) == 0);
-    assert(pa_context_connect(context, NULL, PA_CONTEXT_NOAUTOSPAWN, NULL) == 0);
-
-    // Wait for the context to be ready
-    for(;;) {
-        pa_context_state_t context_state = pa_context_get_state(context);
-        assert(PA_CONTEXT_IS_GOOD(context_state));
-        if (context_state == PA_CONTEXT_READY) break;
-        pa_threaded_mainloop_wait(mainloop);
-    }
-
-    slogi("successfully connected pulseaudio...");
-    return 1;
-}
-
-
-int freesound()
-{
-    if (context)
-        pa_context_unref(context);
-
-    if (mainloop) {
-        pa_signal_done();
-        pa_threaded_mainloop_free(mainloop);
-    }
-
-}
-
-#else
-
-int setupsound()
-{
-
-
-
-    slogi("connecting portaudio...");
-}
-
-
-int freesound()
-{
-
-}
-
-#endif

src/monocoque/devices/sound.h

@@ -1,13 +0,0 @@
-#ifndef _SOUND_H
-#define _SOUND_H
-
-#include <pulse/pulseaudio.h>
-
-extern pa_threaded_mainloop* mainloop;
-extern pa_context* context;
-
-
-int setupsound();
-int freesound();
-
-#endif

src/monocoque/devices/sound/usb_generic_shaker.c

@@ -1,5 +1,3 @@
-#ifndef USE_PULSEAUDIO
-
 #include <stdio.h>
 #include <string.h>
 #include <math.h>
@@ -12,82 +10,65 @@
 
 #define SAMPLE_RATE   (48000)
 
-#define DURATION 4.0
-#define AMPLITUDE .5
-
 #ifndef M_PI
 #define M_PI  (3.14159265)
 #endif
 
 
-int patestCallbackEngineRPM(const void*                     inputBuffer,
+
+int patestCallback(const void*                     inputBuffer,
                    void*                           outputBuffer,
                    unsigned long                   framesPerBuffer,
                    const PaStreamCallbackTimeInfo* timeInfo,
                    PaStreamCallbackFlags           statusFlags,
                    void*                           userData)
 {
-    SoundData* data = (SoundData*)userData;
+    PATestData* data = (PATestData*)userData;
     float* out = (float*)outputBuffer;
     memset(out, 0, framesPerBuffer * 2 * sizeof(float));
     unsigned int i;
     unsigned int n;
-    //n = data->n;
+    n = data->n;
     (void) inputBuffer; /* Prevent unused argument warning. */
 
     for( i=0; i<framesPerBuffer; i++,n++ )
     {
-        static double t = 0.0;
+        float v = 0;
-        double sample = AMPLITUDE * 32767.0 * sin(2.0 * M_PI * data->curr_frequency * t);
+        v = data->amp * sin (2 * M_PI * ((float) n) / (float) SAMPLE_RATE);
 
-        t += 1.0 / SAMPLE_RATE;
+        if ( data->gear_sound_data > 0 )
-        if (t >= DURATION) {
+        {
-            t = 0.0;
+            if (n>=1764)
+            {
+                n=0;
+            }
+        }
+        else
+        {
+            if (n>=data->table_size)
+            {
+                n=0;
             }
-        *out++ = sample;
-        *out++ = sample;
         }
 
+
+        if ( data->gear_sound_data > 0 )
+        {
+            // right channel only?
+            // i have my butt hooked up to right channel... make this configurable?
+            *out++ = v;
+        }
+        else
+        {
+            *out++ = v;
+            *out++ = v;
+        }
+    }
+
+    data->n=n;
     return 0;
 }
 
-
-int patestCallbackGearShift(const void*                     inputBuffer,
-                   void*                           outputBuffer,
-                   unsigned long                   framesPerBuffer,
-                   const PaStreamCallbackTimeInfo* timeInfo,
-                   PaStreamCallbackFlags           statusFlags,
-                   void*                           userData)
-{
-    SoundData* data = (SoundData*)userData;
-    float* out = (float*)outputBuffer;
-    memset(out, 0, framesPerBuffer * 2 * sizeof(float));
-    unsigned int i;
-    unsigned int n;
-    //n = data->n;
-    (void) inputBuffer; /* Prevent unused argument warning. */
-
-    for( i=0; i<framesPerBuffer; i++,n++ )
-    {
-        static double t = 0.0;
-        double sample = 0;
-        if (data->frequency>0)
-        {
-            sample = AMPLITUDE * 32767.0 * sin(2.0 * M_PI * data->curr_frequency * data->curr_duration);
-        }
-
-
-        data->curr_duration += 1.0 / SAMPLE_RATE;
-        if (data->curr_duration >= data->duration) {
-            data->curr_duration = 0.0;
-            data->curr_frequency = 0;
-        }
-
-        *out++ = sample;
-        *out++ = sample;
-    }
-}
-
 int usb_generic_shaker_free(SoundDevice* sounddevice)
 {
     int err = 0;
@@ -116,28 +97,14 @@ int usb_generic_shaker_init(SoundDevice* sounddevice)
     sounddevice->outputParameters.suggestedLatency = Pa_GetDeviceInfo( sounddevice->outputParameters.device )->defaultLowOutputLatency;
     sounddevice->outputParameters.hostApiSpecificStreamInfo = NULL;
 
-    if (sounddevice->effecttype == SOUNDEFFECT_GEARSHIFT)
-    {
     err = Pa_OpenStream( &sounddevice->stream,
                          NULL,              /* No input. */
                          &sounddevice->outputParameters, /* As above. */
                          SAMPLE_RATE,
                          440,               /* Frames per buffer. */
                          paClipOff,         /* No out of range samples expected. */
-                             patestCallbackGearShift,
+                         patestCallback,
                          &sounddevice->sounddata );
-    }
-    else
-    {
-        err = Pa_OpenStream( &sounddevice->stream,
-                             NULL,              /* No input. */
-                             &sounddevice->outputParameters, /* As above. */
-                             SAMPLE_RATE,
-                             440,               /* Frames per buffer. */
-                             paClipOff,         /* No out of range samples expected. */
-                             patestCallbackEngineRPM,
-                             &sounddevice->sounddata );
-    }
     if( err != paNoError )
     {
         goto error;
@@ -154,7 +121,8 @@ int usb_generic_shaker_init(SoundDevice* sounddevice)
 
 error:
     Pa_Terminate();
+    //fprintf( stderr, "An error occured while using the portaudio stream\n" );
+    //fprintf( stderr, "Error number: %d\n", err );
+    //fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) );
     return err;
 }
-
-#endif

src/monocoque/devices/sound/usb_generic_shaker.h

@@ -1,13 +1,9 @@
 #ifndef _USB_GENERIC_SHAKER_H
 #define _USB_GENERIC_SHAKER_H
 
-#include "../simdevice.h"
+#include "../sounddevice.h"
 
-#ifdef USE_PULSEAUDIO
-int usb_generic_shaker_init(SoundDevice* sounddevice, pa_threaded_mainloop* mainloop, pa_context* context, const char* devname, int volume, int pan, const char* streamname);
-#else
 int usb_generic_shaker_init(SoundDevice* sounddevice);
-#endif
 int usb_generic_shaker_free(SoundDevice* sounddevice);
 
 #endif

src/monocoque/devices/sound/usb_generic_shaker_pulse.c

@@ -1,163 +0,0 @@
-#ifdef USE_PULSEAUDIO
-
-#include <stdio.h>
-#include <string.h>
-#include <math.h>
-#include <unistd.h>
-
-
-
-#include "usb_generic_shaker.h"
-#include "../sounddevice.h"
-
-#define FORMAT PA_SAMPLE_S16LE
-#define SAMPLE_RATE   (48000)
-#define AMPLITUDE .5
-#define DURATION 4.0
-
-#ifndef M_PI
-#define M_PI  (3.14159265)
-#endif
-
-
-void gear_sound_stream(pa_stream *s, size_t length, void *userdata) {
-
-    SoundData* data = (SoundData*)userdata;
-    size_t num_samples = length / sizeof(int16_t);
-    int16_t buffer[num_samples];
-
-
-    for (size_t i = 0; i < num_samples; i++) {
-        static double t = 0.0;
-        double sample = 0;
-        if (data->frequency>0)
-        {
-            sample = AMPLITUDE * 32767.0 * sin(2.0 * M_PI * data->curr_frequency * data->curr_duration);
-        }
-
-
-        buffer[i] = (int16_t)sample;
-
-        data->curr_duration += 1.0 / SAMPLE_RATE;
-        if (data->curr_duration >= data->duration) {
-            data->curr_duration = 0.0;
-            data->curr_frequency = 0;
-        }
-    }
-    pa_stream_write(s, buffer, length, NULL, 0LL, PA_SEEK_RELATIVE);
-}
-
-void engine_sound_stream(pa_stream *s, size_t length, void *userdata) {
-
-    SoundData* data = (SoundData*)userdata;
-    size_t num_samples = length / sizeof(int16_t);
-    int16_t buffer[num_samples];
-
-    for (size_t i = 0; i < num_samples; i++) {
-        static double t = 0.0;
-        double sample = AMPLITUDE * 32767.0 * sin(2.0 * M_PI * data->curr_frequency * t);
-
-
-        buffer[i] = (int16_t)sample;
-
-        t += 1.0 / SAMPLE_RATE;
-        if (t >= DURATION) {
-            t = 0.0;
-        }
-    }
-    pa_stream_write(s, buffer, length, NULL, 0LL, PA_SEEK_RELATIVE);
-}
-
-void stream_success_cb(pa_stream *stream, int success, void *userdata) {
-    return;
-}
-
-void stream_state_cb(pa_stream *s, void *mainloop) {
-    pa_threaded_mainloop_signal(mainloop, 0);
-}
-
-int usb_generic_shaker_free(SoundDevice* sounddevice)
-{
-    int err = 0;
-    //err = Pa_CloseStream( sounddevice->stream );
-    //if( err != paNoError )
-    //{
-    //    err = Pa_Terminate();
-    //}
-    if (sounddevice->stream)
-    {
-        pa_stream_unref(sounddevice->stream);
-        pa_xfree(sounddevice->stream);
-    }
-    return err;
-}
-
-int usb_generic_shaker_init(SoundDevice* sounddevice, pa_threaded_mainloop* mainloop, pa_context* context, const char* devname, int volume, int pan, const char* streamname)
-{
-    pa_stream *stream;
-
-    // Create a playback stream
-    pa_sample_spec sample_specifications;
-    sample_specifications.format = FORMAT;
-    sample_specifications.rate = SAMPLE_RATE;
-    sample_specifications.channels = 2;
-
-
-    pa_channel_map channel_map;
-    pa_channel_map_init_stereo(&channel_map);
-    pa_channel_map_parse(&channel_map, "front-left,front-right");
-
-
-    stream = pa_stream_new(context, streamname, &sample_specifications, &channel_map);
-    pa_stream_set_state_callback(stream, stream_state_cb, mainloop);
-
-
-    if (sounddevice->effecttype == SOUNDEFFECT_GEARSHIFT)
-    {
-        pa_stream_set_write_callback(stream, gear_sound_stream, &sounddevice->sounddata);
-    }
-    else
-    {
-        pa_stream_set_write_callback(stream, engine_sound_stream, &sounddevice->sounddata);
-    }
-
-    // recommended settings, i.e. server uses sensible values
-    pa_buffer_attr buffer_attr;
-    buffer_attr.maxlength = (uint32_t) 32767;
-    buffer_attr.tlength = (uint32_t) -1;
-    buffer_attr.prebuf = (uint32_t) -1;
-    buffer_attr.minreq = (uint32_t) -1;
-
-    pa_cvolume cv;
-    uint16_t pvolume =  ceil(((double) volume/100.0d)*65535);
-    // Settings copied as per the chromium browser source
-
-    pa_stream_flags_t stream_flags;
-    stream_flags = PA_STREAM_INTERPOLATE_TIMING | PA_STREAM_NOT_MONOTONIC | PA_STREAM_AUTO_TIMING_UPDATE | PA_STREAM_ADJUST_LATENCY | PA_STREAM_START_CORKED;
-
-    // Connect stream to the default audio output sink
-    pa_cvolume_set(&cv, sample_specifications.channels, pvolume);
-
-    pa_cvolume_set_balance(&cv, &channel_map, pan);
-
-    assert(pa_stream_connect_playback(stream, devname, &buffer_attr, stream_flags, &cv, NULL) == 0);
-
-    // Wait for the stream to be ready
-    for(;;) {
-        pa_stream_state_t stream_state = pa_stream_get_state(stream);
-        assert(PA_STREAM_IS_GOOD(stream_state));
-        if (stream_state == PA_STREAM_READY) break;
-        pa_threaded_mainloop_wait(mainloop);
-    }
-
-
-    //pa_threaded_mainloop_unlock(mainloop);
-
-    // Uncork the stream so it will start playing
-    pa_stream_cork(stream, 0, stream_success_cb, mainloop);
-
-    sounddevice->stream = stream;
-    return 0;
-}
-
-#endif

src/monocoque/devices/sounddevice.c

@@ -1,142 +1,38 @@
 #include <stdio.h>
-#include <stdlib.h>
-#include <time.h>
 
-#include <stdio.h>
-#include <unistd.h>
-
-#include "sound.h"
-#include "simdevice.h"
 #include "sounddevice.h"
 #include "sound/usb_generic_shaker.h"
-#include "../simulatorapi/simapi/simapi/simdata.h"
+#include "../simulatorapi/simdata.h"
 #include "../helper/parameters.h"
 #include "../slog/slog.h"
 
+int sounddev_update(SoundDevice* sounddevice, SimData* simdata)
+{
+    sounddevice->sounddata.table_size = 44100/(simdata->rpms/60);
 
-int gear_sound_set(SoundDevice* sounddevice, SimData* simdata)
+    sounddevice->sounddata.gear_sound_data = 0;
+    if (sounddevice->sounddata.last_gear != simdata->gear)
     {
-    if (sounddevice->sounddata.last_gear != simdata->gear && simdata->gear > 1)
+        sounddevice->sounddata.gear_sound_data = sounddevice->sounddata.amp;
-    {
-        //sounddevice->sounddata.gear_sound_data = 3.14;
-        sounddevice->sounddata.curr_frequency = sounddevice->sounddata.frequency;
-        sounddevice->sounddata.curr_duration = 0;
     }
     sounddevice->sounddata.last_gear = simdata->gear;
-
-    slogt("set gear frequency to %i", sounddevice->sounddata.frequency);
 }
 
-// we could make a vtable for these different effects too
+int sounddev_free(SoundDevice* sounddevice)
-int sounddev_engine_update(SimDevice* this, SimData* simdata)
 {
-    SoundDevice* sounddevice = (void *) this->derived;
+    return usb_generic_shaker_free(sounddevice);
-
-    sounddevice->sounddata.curr_frequency = simdata->rpms/60;
-    //sounddevice->sounddata.table_size = 48000/(sounddevice->sounddata.frequency);
-
-    slogt("set engine frequency to %i", sounddevice->sounddata.frequency);
 }
 
-int sounddev_gearshift_update(SimDevice* this, SimData* simdata)
+int sounddev_init(SoundDevice* sounddevice)
-{
-    SoundDevice* sounddevice = (void *) this->derived;
-
-    gear_sound_set(sounddevice, simdata);
-}
-
-int sounddev_free(SimDevice* this)
-{
-    SoundDevice* sounddevice = (void *) this->derived;
-
-    usb_generic_shaker_free(sounddevice);
-
-    free(sounddevice);
-
-    return 0;
-}
-
-int sounddev_init(SoundDevice* sounddevice, const char* devname, int volume, int frequency, int pan, double duration)
 {
     slogi("initializing standalone sound device...");
 
-
+    sounddevice->sounddata.pitch = 1;
-    slogi("volume is: %i", volume);
+    sounddevice->sounddata.pitch = 261.626;
-    slogi("frequency is: %i", frequency);
+    sounddevice->sounddata.amp = 32;
-    slogi("pan is: %i", pan);
+    sounddevice->sounddata.left_phase = sounddevice->sounddata.right_phase = 0;
-    slogi("duration is: %f", duration);
+    sounddevice->sounddata.table_size = 44100/(100/60);
-
-
-    sounddevice->sounddata.frequency = frequency;
-    //sounddevice->sounddata.pitch = 1;
-    //sounddevice->sounddata.pitch = 261.626;
-    //sounddevice->sounddata.amp = 32;
-    //sounddevice->sounddata.left_phase = sounddevice->sounddata.right_phase = 0;
-    //sounddevice->sounddata.table_size = 48000/(100/60);
-    sounddevice->sounddata.curr_frequency = 100/60;
-
-
-
-    const char* streamname= "Engine";
-    switch (sounddevice->effecttype) {
-        case (SOUNDEFFECT_GEARSHIFT):
-
     sounddevice->sounddata.last_gear = 0;
-            //sounddevice->sounddata.pitch = 500;
-            //sounddevice->sounddata.amp = 128;
-            //sounddevice->sounddata.left_phase = sounddevice->sounddata.right_phase = 0;
-            //sounddevice->sounddata.table_size = 48000/(1);
-            sounddevice->sounddata.duration = duration;
-            sounddevice->sounddata.curr_duration = duration;
-            streamname = "Gear";
-            break;
-    }
 
-#ifdef USE_PULSEAUDIO
-
-
-    //pa_threaded_mainloop* mainloop;
-    //pa_context* context;
-    usb_generic_shaker_init(sounddevice, mainloop, context, devname, volume, pan, streamname);
-#else
     usb_generic_shaker_init(sounddevice);
-#endif
 }
-
-static const vtable engine_sound_simdevice_vtable = { &sounddev_engine_update, &sounddev_free };
-static const vtable gear_sound_simdevice_vtable = { &sounddev_gearshift_update, &sounddev_free };
-
-SoundDevice* new_sound_device(DeviceSettings* ds) {
-
-    SoundDevice* this = (SoundDevice*) malloc(sizeof(SoundDevice));
-
-    this->m.update = &update;
-    this->m.free = &simdevfree;
-    this->m.derived = this;
-
-    slogt("Attempting to configure sound device with subtype: %i", ds->dev_subtype);
-    switch (ds->dev_subtype) {
-        case (SIMDEVTYPE_ENGINESOUND):
-            this->effecttype = SOUNDEFFECT_ENGINERPM;
-            this->m.vtable = &engine_sound_simdevice_vtable;
-            slogi("Initializing sound device for engine vibrations.");
-            break;
-        case (SIMDEVTYPE_GEARSOUND):
-            this->effecttype = SOUNDEFFECT_GEARSHIFT;
-            this->m.vtable = &gear_sound_simdevice_vtable;
-            slogi("Initializing sound device for gear shift vibrations.");
-            break;
-    }
-
-    slogt("Attempting to use device %s", ds->sounddevsettings.dev);
-
-    int error = sounddev_init(this, ds->sounddevsettings.dev, ds->sounddevsettings.volume, ds->sounddevsettings.frequency, ds->sounddevsettings.pan, ds->sounddevsettings.duration);
-    if (error != 0)
-    {
-        free(this);
-        return NULL;
-    }
-
-    return this;
-}
-

src/monocoque/devices/sounddevice.h

@@ -1,11 +1,10 @@
 #ifndef _SOUNDDEVICE_H
 #define _SOUNDDEVICE_H
 
-#ifdef USE_PULSEAUDIO
-#include <pulse/pulseaudio.h>
-#else
 #include "portaudio.h"
-#endif
+
+#include "../simulatorapi/simdata.h"
+#include "../helper/parameters.h"
 
 typedef enum
 {
@@ -14,23 +13,33 @@ typedef enum
 }
 SoundType;
 
-typedef enum
-{
-    SOUNDEFFECT_ENGINERPM   = 0,
-    SOUNDEFFECT_GEARSHIFT   = 1
-}
-VibrationEffectType;
-
 #define MAX_TABLE_SIZE   (6000)
 typedef struct
 {
+    float sine[MAX_TABLE_SIZE];
+    float pitch;
     int last_gear;
-    int volume;
+    int left_phase;
-    int frequency;
+    int right_phase;
-    double duration;
+    int n;
-    int curr_frequency;
+    int table_size;
-    double curr_duration;
+    int amp;
+    int gear_sound_data;
 }
-SoundData;
+PATestData;
+
+typedef struct
+{
+    int id;
+    SoundType type;
+    PATestData sounddata;
+    PaStreamParameters outputParameters;
+    PaStream* stream;
+}
+SoundDevice;
+
+int sounddev_update(SoundDevice* sounddevice, SimData* simdata);
+int sounddev_init(SoundDevice* sounddevice);
+int sounddev_free(SoundDevice* sounddevice);
 
 #endif

src/monocoque/devices/tachdevice.c

@@ -5,7 +5,7 @@
 #include "tachdevice.h"
 #include "revburner.h"
 #include "../../helper/confighelper.h"
-#include "../../simulatorapi/simapi/simapi/simdata.h"
+#include "../../simulatorapi/simdata.h"
 #include "../../slog/slog.h"
 
 int tachdev_update(TachDevice* tachdevice, SimData* simdata)

src/monocoque/devices/tachdevice.h

@@ -3,7 +3,7 @@
 
 #include <hidapi/hidapi.h>
 #include "../helper/confighelper.h"
-#include "../simulatorapi/simapi/simapi/simdata.h"
+#include "../simulatorapi/simdata.h"
 
 //typedef int (*tachdev_update)(int revs);
 

src/monocoque/devices/usbdevice.c

@@ -1,18 +1,14 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stdlib.h>
 
 #include "usbdevice.h"
-#include "simdevice.h"
 #include "../helper/parameters.h"
-#include "../simulatorapi/simapi/simapi/simdata.h"
+#include "../simulatorapi/simdata.h"
 #include "../slog/slog.h"
 
-int usbdev_update(SimDevice* this, SimData* simdata)
+int usbdev_update(USBDevice* usbdevice, SimData* simdata)
 {
-    USBDevice* usbdevice = (void *) this->derived;
-
     switch ( usbdevice->type )
     {
         case USBDEV_UNKNOWN :
@@ -24,10 +20,8 @@ int usbdev_update(SimDevice* this, SimData* simdata)
     return 0;
 }
 
-int usbdev_free(SimDevice* this)
+int usbdev_free(USBDevice* usbdevice)
 {
-    USBDevice* usbdevice = (void *) this->derived;
-
     switch ( usbdevice->type )
     {
         case USBDEV_UNKNOWN :
@@ -36,8 +30,6 @@ int usbdev_free(SimDevice* this)
             break;
     }
 
-    free(usbdevice);
-
     return 0;
 }
 
@@ -45,8 +37,6 @@ int usbdev_init(USBDevice* usbdevice, DeviceSettings* ds)
 {
     slogi("initializing usb device...");
     int error = 0;
-
-    usbdevice->type = USBDEV_TACHOMETER;
     switch ( usbdevice->type )
     {
         case USBDEV_UNKNOWN :
@@ -57,24 +47,3 @@ int usbdev_init(USBDevice* usbdevice, DeviceSettings* ds)
 
     return error;
 }
-
-static const vtable usb_simdevice_vtable = { &usbdev_update, &usbdev_free };
-
-USBDevice* new_usb_device(DeviceSettings* ds) {
-
-    USBDevice* this = (USBDevice*) malloc(sizeof(USBDevice));
-
-    this->m.update = &update;
-    this->m.free = &simdevfree;
-    this->m.derived = this;
-    this->m.vtable = &usb_simdevice_vtable;
-
-    int error = usbdev_init(this, ds);
-
-    if (error != 0)
-    {
-        free(this);
-        return NULL;
-    }
-    return this;
-}

src/monocoque/devices/usbdevice.h

@@ -2,5 +2,29 @@
 #define _USBDEVICE_H
 
 #include "tachdevice.h"
+#include "../helper/confighelper.h"
+#include "../simulatorapi/simdata.h"
+
+typedef enum
+{
+    USBDEV_UNKNOWN       = 0,
+    USBDEV_TACHOMETER    = 1
+}
+USBType;
+
+typedef struct
+{
+    int id;
+    USBType type;
+    union
+    {
+        TachDevice tachdevice;
+    } u;
+}
+USBDevice;
+
+int usbdev_update(USBDevice* usbdevice, SimData* simdata);
+int usbdev_init(USBDevice* usbdevice, DeviceSettings* ds);
+int usbdev_free(USBDevice* usbdevice);
 
 #endif

src/monocoque/gameloop/gameloop.c

@@ -1,4 +1,3 @@
-#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -11,12 +10,11 @@
 #include "../helper/parameters.h"
 #include "../helper/confighelper.h"
 #include "../devices/simdevice.h"
-#include "../simulatorapi/simapi/simapi/simdata.h"
+#include "../simulatorapi/simdata.h"
-#include "../simulatorapi/simapi/simapi/simmapper.h"
+#include "../simulatorapi/simmapper.h"
 #include "../slog/slog.h"
 
-#define DEFAULT_UPDATE_RATE      240.0
+#define DEFAULT_UPDATE_RATE      120.0
-#define SIM_CHECK_RATE           1.0
 
 int showstats(SimData* simdata)
 {
@@ -167,72 +165,20 @@ int showstats(SimData* simdata)
     fflush(stdout);
 }
 
-
+int looper(SimDevice* devices[], int numdevices, Simulator simulator)
-int clilooper(SimDevice* devices, int numdevices, Parameters* p, SimData* simdata, SimMap* simmap)
 {
 
     slogi("preparing game loop with %i devices...", numdevices);
-
-
-    slogi("sending initial data to devices");
-    simdata->velocity = 16;
-    simdata->rpms = 100;
-    for (int x = 0; x < numdevices; x++)
-    {
-        devices[x].update(&devices[x], simdata);
-    }
-    sleep(3);
-
-
-    struct pollfd mypoll = { STDIN_FILENO, POLLIN|POLLPRI };
-    double update_rate = DEFAULT_UPDATE_RATE;
-    char ch;
-    int t=0;
-    int s=0;
-    bool go = true;
-    while (go == true && simdata->simstatus > 1)
-    {
-        simdatamap(simdata, simmap, p->sim);
-        showstats(simdata);
-        t++;
-        s++;
-        if(simdata->rpms<100)
-        {
-            simdata->rpms=100;
-        }
-        for (int x = 0; x < numdevices; x++)
-        {
-            devices[x].update(&devices[x], simdata);
-        }
-
-    	if( poll(&mypoll, 1, 1000.0/update_rate) )
-    	{
-    	    scanf("%c", &ch);
-    	    if(ch == 'q')
-    	    {
-    	        go = false;
-    	    }
-    	}
-    }
-
-    simdata->velocity = 0;
-    simdata->rpms = 100;
-    for (int x = 0; x < numdevices; x++)
-    {
-        devices[x].update(&devices[x], simdata);
-    }
-
-    fprintf(stdout, "\n");
-
-    return 0;
-}
-
-int looper(SimDevice* devices, int numdevices, Parameters* p)
-{
-
     SimData* simdata = malloc(sizeof(SimData));
     SimMap* simmap = malloc(sizeof(SimMap));
 
+    int error = siminit(simdata, simmap, simulator);
+
+    if (error != MONOCOQUE_ERROR_NONE)
+    {
+        return error;
+    }
+
     struct termios newsettings, canonicalmode;
     tcgetattr(0, &canonicalmode);
     newsettings = canonicalmode;
@@ -243,33 +189,37 @@ int looper(SimDevice* devices, int numdevices, Parameters* p)
     char ch;
     struct pollfd mypoll = { STDIN_FILENO, POLLIN|POLLPRI };
 
-    fprintf(stdout, "Searching for sim data... Press q to quit...\n");
+    double update_rate = DEFAULT_UPDATE_RATE;
-
+    int t=0;
-    p->simon = false;
-    double update_rate = SIM_CHECK_RATE;
     int go = true;
     while (go == true)
     {
-
+        simdatamap(simdata, simmap, simulator);
-
+        showstats(simdata);
-
+        t++;
-
+        if(simdata->rpms<250)
-        if (p->simon == false)
         {
-            getSim(simdata, simmap, &p->simon, &p->sim);
+            simdata->rpms=250;
+        }
+        for (int x = 0; x < numdevices; x++)
+        {
+            if (devices[x]->type == SIMDEV_SERIAL)
+            {
+                if(t>=update_rate)
+                {
+                    devupdate(devices[x], simdata);
+                }
+            }
+            else
+            {
+                devupdate(devices[x], simdata);
             }
 
-        if (p->simon == true)
-        {
-            clilooper(devices, numdevices, p, simdata, simmap);
         }
-        if (p->simon == true)
+        if(t>=update_rate)
         {
-            p->simon = false;
+            t=0;
-            fprintf(stdout, "Searching for sim data... Press q again to quit...\n");
-            sleep(2);
         }
-
         if( poll(&mypoll, 1, 1000.0/update_rate) )
         {
             scanf("%c", &ch);
@@ -279,7 +229,6 @@ int looper(SimDevice* devices, int numdevices, Parameters* p)
             }
         }
     }
-
     fprintf(stdout, "\n");
     fflush(stdout);
     tcsetattr(0, TCSANOW, &canonicalmode);
@@ -289,144 +238,3 @@ int looper(SimDevice* devices, int numdevices, Parameters* p)
 
     return 0;
 }
-
-int tester(SimDevice* devices, int numdevices)
-{
-
-    slogi("preparing test with %i devices...", numdevices);
-    SimData* simdata = malloc(sizeof(SimData));
-
-    struct termios newsettings, canonicalmode;
-    tcgetattr(0, &canonicalmode);
-    newsettings = canonicalmode;
-    newsettings.c_lflag &= (~ICANON & ~ECHO);
-    newsettings.c_cc[VMIN] = 1;
-    newsettings.c_cc[VTIME] = 0;
-    tcsetattr(0, TCSANOW, &newsettings);
-
-    fprintf(stdout, "\n");
-    simdata->gear = 0;
-    simdata->velocity = 16;
-    simdata->rpms = 100;
-    simdata->maxrpm = 8000;
-    sleep(3);
-
-    fprintf(stdout, "Setting rpms to 1000\n");
-    simdata->rpms = 1000;
-    for (int x = 0; x < numdevices; x++)
-    {
-        devices[x].update(&devices[x], simdata);
-    }
-    sleep(3);
-
-    fprintf(stdout, "Shifting into first gear\n");
-    simdata->gear = 2;
-    for (int x = 0; x < numdevices; x++)
-    {
-        devices[x].update(&devices[x], simdata);
-    }
-    for (int x = 0; x < numdevices; x++)
-    {
-        devices[x].update(&devices[x], simdata);
-    }
-    sleep(3);
-
-    fprintf(stdout, "Setting speed to 100\n");
-    simdata->velocity = 100;
-    for (int x = 0; x < numdevices; x++)
-    {
-        devices[x].update(&devices[x], simdata);
-    }
-    sleep(3);
-
-    fprintf(stdout, "Shifting into second gear\n");
-    simdata->gear = 3;
-    for (int x = 0; x < numdevices; x++)
-    {
-        devices[x].update(&devices[x], simdata);
-    }
-    for (int x = 0; x < numdevices; x++)
-    {
-        devices[x].update(&devices[x], simdata);
-    }
-    sleep(3);
-
-    fprintf(stdout, "Setting speed to 200\n");
-    simdata->velocity = 200;
-    for (int x = 0; x < numdevices; x++)
-    {
-        devices[x].update(&devices[x], simdata);
-    }
-    sleep(3);
-
-    fprintf(stdout, "Shifting into third gear\n");
-    simdata->gear = 4;
-    for (int x = 0; x < numdevices; x++)
-    {
-        devices[x].update(&devices[x], simdata);
-    }
-    for (int x = 0; x < numdevices; x++)
-    {
-        devices[x].update(&devices[x], simdata);
-    }
-    sleep(3);
-
-    fprintf(stdout, "Setting rpms to 2000\n");
-    simdata->rpms = 2000;
-    for (int x = 0; x < numdevices; x++)
-    {
-        devices[x].update(&devices[x], simdata);
-    }
-    sleep(3);
-
-    fprintf(stdout, "Setting rpms to 4000\n");
-    simdata->rpms = 4000;
-    for (int x = 0; x < numdevices; x++)
-    {
-        devices[x].update(&devices[x], simdata);
-    }
-    sleep(3);
-
-    fprintf(stdout, "Shifting into fourth gear\n");
-    simdata->gear = 5;
-    for (int x = 0; x < numdevices; x++)
-    {
-        devices[x].update(&devices[x], simdata);
-    }
-    for (int x = 0; x < numdevices; x++)
-    {
-        devices[x].update(&devices[x], simdata);
-    }
-    sleep(3);
-
-    fprintf(stdout, "Setting speed to 300\n");
-    simdata->velocity = 300;
-    for (int x = 0; x < numdevices; x++)
-    {
-        devices[x].update(&devices[x], simdata);
-    }
-    sleep(3);
-
-    fprintf(stdout, "Setting rpms to 8000\n");
-    simdata->rpms = 8000;
-    for (int x = 0; x < numdevices; x++)
-    {
-        devices[x].update(&devices[x], simdata);
-    }
-    sleep(3);
-
-    simdata->velocity = 0;
-    simdata->rpms = 100;
-    for (int x = 0; x < numdevices; x++)
-    {
-        devices[x].update(&devices[x], simdata);
-    }
-    sleep(1);
-
-    fflush(stdout);
-    tcsetattr(0, TCSANOW, &canonicalmode);
-
-    free(simdata);
-
-    return 0;
-}

src/monocoque/gameloop/gameloop.h

@@ -1,5 +1,4 @@
 #include "../devices/simdevice.h"
 #include "../helper/parameters.h"
 
-int tester(SimDevice* devices, int numdevices);
+int looper (SimDevice* devices[], int numdevices, Simulator simulator);
-int looper(SimDevice* devices, int numdevices, Parameters* p);

src/monocoque/gameloop/tachconfig.c

@@ -15,7 +15,7 @@
 #include <libxml/tree.h>
 
 #include "../devices/simdevice.h"
-#include "../simulatorapi/simapi/simapi/simdata.h"
+#include "../simulatorapi/simdata.h"
 #include "../slog/slog.h"
 
 #define DEFAULT_UPDATE_RATE      30.0
@@ -183,7 +183,7 @@ int config_tachometer(int max_revs, int granularity, const char* save_file, SimD
     WriteXmlFromArrays(nodes, rpm_array, values_array, max_revs, save_file);
     sleep(2);
     simdata->pulses = 0;
-    simdevice->update(simdevice, simdata);
+    devupdate(simdevice, simdata);
     fflush(stdout);
 
     return 0;

src/monocoque/gameloop/tachconfig.h

@@ -2,7 +2,7 @@
 #define _TACHCONFIG_H
 
 #include "../devices/simdevice.h"
-#include "../simulatorapi/simapi/simapi/simdata.h"
+#include "../simulatorapi/simdata.h"
 
 int config_tachometer(int max_revs, int granularity, const char* save_file, SimDevice* simdevice, SimData* simdata);
 

src/monocoque/helper/confighelper.c

@@ -2,7 +2,6 @@
 #include <stdbool.h>
 #include <string.h>
 #include <stdint.h>
-#include <ctype.h>
 
 #include <libxml/parser.h>
 #include <libxml/xmlreader.h>
@@ -11,38 +10,25 @@
 #include "confighelper.h"
 
 #include "../slog/slog.h"
-#include "parameters.h"
-
-#include <pulse/pulseaudio.h>
-
-int strcicmp(char const *a, char const *b)
-{
-    for (;; a++, b++) {
-        int d = tolower((unsigned char)*a) - tolower((unsigned char)*b);
-        if (d != 0 || !*a)
-            return d;
-    }
-}
-
 
 int strtogame(const char* game, MonocoqueSettings* ms)
 {
     slogd("Checking for %s in list of supported simulators.", game);
-    if (strcicmp(game, "ac") == 0)
+    if (strcmp(game, "ac") == 0)
     {
         slogd("Setting simulator to Assetto Corsa");
         ms->sim_name = SIMULATOR_ASSETTO_CORSA;
     }
-    else if (strcicmp(game, "rf2") == 0)
+    else if (strcmp(game, "rf2") == 0)
     {
         slogd("Setting simulator to RFactor 2");
         ms->sim_name = SIMULATOR_RFACTOR2;
     }
     else
-        if (strcicmp(game, "test") == 0)
+        if (strcmp(game, "test") == 0)
         {
             slogd("Setting simulator to Test Data");
-            ms->sim_name = SIMULATOR_SIMAPI_TEST;
+            ms->sim_name = SIMULATOR_MONOCOQUE_TEST;
         }
         else
         {
@@ -52,78 +38,54 @@ int strtogame(const char* game, MonocoqueSettings* ms)
     return MONOCOQUE_ERROR_NONE;
 }
 
-int strtodevsubtype(const char* device_subtype, DeviceSettings* ds, int simdev)
+int strtodev(const char* device_type, DeviceSettings* ds)
 {
     ds->is_valid = false;
-    ds->dev_subtype = SIMDEVTYPE_UNKNOWN;
+    if (strcmp(device_type, "USB") == 0)
-
-    switch (simdev) {
-        case SIMDEV_USB:
-            if (strcicmp(device_subtype, "Tachometer") == 0)
     {
-                ds->dev_subtype = SIMDEVTYPE_TACHOMETER;
+        ds->dev_type = SIMDEV_USB;
-                break;
     }
-        case SIMDEV_SERIAL:
+    else
-            if (strcicmp(device_subtype, "ShiftLights") == 0)
+        if (strcmp(device_type, "Sound") == 0)
         {
-                ds->dev_subtype = SIMDEVTYPE_SHIFTLIGHTS;
+            ds->dev_type = SIMDEV_SOUND;
-                break;
         }
-            if (strcicmp(device_subtype, "SimWind") == 0)
+        else
+            if (strcmp(device_type, "Serial") == 0)
             {
-                ds->dev_subtype = SIMDEVTYPE_SIMWIND;
+                ds->dev_type = SIMDEV_SERIAL;
-                break;
             }
-        case SIMDEV_SOUND:
+            else
-            if (strcicmp(device_subtype, "Engine") == 0)
             {
-                ds->dev_subtype = SIMDEVTYPE_ENGINESOUND;
-                break;
-            }
-            if (strcicmp(device_subtype, "Gear") == 0)
-            {
-                ds->dev_subtype = SIMDEVTYPE_GEARSOUND;
-                break;
-            }
-            if (strcicmp(device_subtype, "ABS") == 0)
-            {
-                ds->dev_subtype = SIMDEVTYPE_ABSBRAKES;
-                break;
-            }
-        default:
                 ds->is_valid = false;
-            slogw("%s does not appear to be a valid device sub type, but attempting to continue with other devices", device_subtype);
+                slogi("%s does not appear to be a valid device type, but attempting to continue with other devices", device_type);
                 return MONOCOQUE_ERROR_INVALID_DEV;
             }
     ds->is_valid = true;
     return MONOCOQUE_ERROR_NONE;
 }
 
-int strtodev(const char* device_type, const char* device_subtype, DeviceSettings* ds)
+int strtodevtype(const char* device_subtype, DeviceSettings* ds)
 {
     ds->is_valid = false;
-    if (strcicmp(device_type, "USB") == 0)
+    if (strcmp(device_subtype, "Tachometer") == 0)
     {
-        ds->dev_type = SIMDEV_USB;
+        ds->dev_subtype = SIMDEVTYPE_TACHOMETER;
-        strtodevsubtype(device_subtype, ds, SIMDEV_USB);
     }
     else
-        if (strcicmp(device_type, "Sound") == 0)
+        if (strcmp(device_subtype, "ShiftLights") == 0)
         {
-            ds->dev_type = SIMDEV_SOUND;
+            ds->dev_subtype = SIMDEVTYPE_SHIFTLIGHTS;
-            strtodevsubtype(device_subtype, ds, SIMDEV_SOUND);
         }
         else
-            if (strcicmp(device_type, "Serial") == 0)
+            if (strcmp(device_subtype, "Shaker") == 0)
             {
-                ds->dev_type = SIMDEV_SERIAL;
+                ds->dev_subtype = SIMDEVTYPE_SHAKER;
-                strtodevsubtype(device_subtype, ds, SIMDEV_SERIAL);
             }
             else
             {
                 ds->is_valid = false;
-                slogi("%s does not appear to be a valid device type, but attempting to continue with other devices", device_type);
+                slogi("%s does not appear to be a valid device sub type, but attempting to continue with other devices", device_subtype);
                 return MONOCOQUE_ERROR_INVALID_DEV;
             }
     ds->is_valid = true;
@@ -169,7 +131,7 @@ int loadtachconfig(const char* config_file, DeviceSettings* ds)
                 {
                     slogt("Xml Element name %s", cursubsubnode->name);
                 }
-                if (strcicmp(cursubsubnode->name, "SettingsItem") == 0)
+                if (strcmp(cursubsubnode->name, "SettingsItem") == 0)
                 {
                     arraysize++;
                 }
@@ -191,13 +153,13 @@ int loadtachconfig(const char* config_file, DeviceSettings* ds)
                 {
                     for (cursubsubsubnode = cursubsubnode->children; cursubsubsubnode; cursubsubsubnode = cursubsubsubnode->next)
                     {
-                        if (strcicmp(cursubsubsubnode->name, "Value") == 0)
+                        if (strcmp(cursubsubsubnode->name, "Value") == 0)
                         {
                             xmlChar* a = xmlNodeGetContent(cursubsubsubnode);
                             rpms_array[i] = strtol((char*) a, &buf, 10);
                             xmlFree(a);
                         }
-                        if (strcicmp(cursubsubsubnode->name, "TimeValue") == 0)
+                        if (strcmp(cursubsubsubnode->name, "TimeValue") == 0)
                         {
                             xmlChar* a = xmlNodeGetContent(cursubsubsubnode);
                             pulses_array[i] = strtol((char*) a, &buf, 10);
@@ -235,16 +197,20 @@ int loadconfig(const char* config_file, DeviceSettings* ds)
 int devsetup(const char* device_type, const char* device_subtype, const char* config_file, MonocoqueSettings* ms, DeviceSettings* ds, config_setting_t* device_settings)
 {
     int error = MONOCOQUE_ERROR_NONE;
-    //slogt("Called device setup with %s %s %s", device_type, device_subtype, config_file);
+    slogi("Called device setup with %s %s %s", device_type, device_subtype, config_file);
     ds->dev_type = SIMDEV_UNKNOWN;
-
+    ds->dev_subtype = SIMDEVTYPE_UNKNOWN;
-    error = strtodev(device_type, device_subtype, ds);
+    error = strtodev(device_type, ds);
     if (error != MONOCOQUE_ERROR_NONE)
     {
         return error;
     }
-
+    error = strtodevtype(device_subtype, ds);
-    if (ms->program_action == A_PLAY || ms->program_action == A_TEST)
+    if (error != MONOCOQUE_ERROR_NONE)
+    {
+        return error;
+    }
+    if (ms->program_action == A_PLAY)
     {
         error = loadconfig(config_file, ds);
     }
@@ -253,41 +219,6 @@ int devsetup(const char* device_type, const char* device_subtype, const char* co
         return error;
     }
 
-    if (ds->dev_type == SIMDEV_SOUND)
-    {
-        slogi("reading configured sound device settings");
-        ds->sounddevsettings.frequency = -1;
-        ds->sounddevsettings.volume = -1;
-        ds->sounddevsettings.lowbound_frequency = -1;
-        ds->sounddevsettings.upperbound_frequency = -1;
-        ds->sounddevsettings.pan = 0;
-        ds->sounddevsettings.duration = 2.0;
-        if (ds->dev_subtype == SIMDEVTYPE_GEARSOUND)
-        {
-            ds->sounddevsettings.duration = .125;
-        }
-        if (device_settings != NULL)
-        {
-
-            config_setting_lookup_int(device_settings, "volume", &ds->sounddevsettings.volume);
-            config_setting_lookup_int(device_settings, "frequency", &ds->sounddevsettings.frequency);
-            config_setting_lookup_int(device_settings, "pan", &ds->sounddevsettings.pan);
-            config_setting_lookup_float(device_settings, "duration", &ds->sounddevsettings.duration);
-
-            const char* temp;
-            int found = 0;
-            found = config_setting_lookup_string(device_settings, "devid", &temp);
-            if (found == 0)
-            {
-                ds->sounddevsettings.dev = NULL;
-            }
-            else
-            {
-                ds->sounddevsettings.dev = strdup(temp);
-            }
-        }
-    }
-
     if (ds->dev_subtype == SIMDEVTYPE_TACHOMETER)
     {
         if (device_settings != NULL)
@@ -301,43 +232,11 @@ int devsetup(const char* device_type, const char* device_subtype, const char* co
             slogi("Tachometer granularity set to %i", ds->tachsettings.granularity);
         }
         ds->tachsettings.use_pulses = true;
-        if (ms->program_action == A_PLAY || ms->program_action == A_TEST)
+        if (ms->program_action == A_PLAY)
         {
             ds->tachsettings.use_pulses = false;
         }
     }
 
-
-    if (ds->dev_subtype == SIMDEVTYPE_SIMWIND || ds->dev_subtype == SIMDEVTYPE_SHIFTLIGHTS)
-    {
-        if (device_settings != NULL)
-        {
-            const char* temp;
-            config_setting_lookup_string(device_settings, "devpath", &temp);
-            ds->serialdevsettings.portdev = strdup(temp);
-        }
-    }
-
     return error;
 }
-
-int settingsfree(DeviceSettings ds)
-{
-
-    if (ds.dev_subtype == SIMDEVTYPE_SIMWIND || ds.dev_subtype == SIMDEVTYPE_SHIFTLIGHTS)
-    {
-        if (ds.serialdevsettings.portdev != NULL)
-        {
-            free(ds.serialdevsettings.portdev);
-        }
-
-    }
-    if (ds.dev_type == SIMDEV_SOUND)
-    {
-        if (ds.sounddevsettings.dev != NULL)
-        {
-            free(ds.sounddevsettings.dev);
-        }
-    }
-    return 0;
-}

src/monocoque/helper/confighelper.h

@@ -21,14 +21,19 @@ typedef enum
 {
     SIMDEVTYPE_UNKNOWN           = 0,
     SIMDEVTYPE_TACHOMETER        = 1,
-    SIMDEVTYPE_SHIFTLIGHTS       = 2,
+    SIMDEVTYPE_SHAKER            = 2,
-    SIMDEVTYPE_SIMWIND           = 3,
+    SIMDEVTYPE_SHIFTLIGHTS       = 3
-    SIMDEVTYPE_ENGINESOUND       = 4,
-    SIMDEVTYPE_GEARSOUND         = 5,
-    SIMDEVTYPE_ABSBRAKES         = 6
 }
 DeviceSubType;
 
+typedef enum
+{
+    SIMULATOR_MONOCOQUE_TEST    = 0,
+    SIMULATOR_ASSETTO_CORSA     = 1,
+    SIMULATOR_RFACTOR           = 2,
+    SIMULATOR_RFACTOR2          = 3
+}
+Simulator;
 
 typedef enum
 {
@@ -69,32 +74,12 @@ typedef struct
 }
 TachometerSettings;
 
-typedef struct
-{
-    char* portdev;
-}
-SerialDeviceSettings;
-
-typedef struct
-{
-    int frequency;
-    int volume;
-    int lowbound_frequency;
-    int upperbound_frequency;
-    int pan;
-    double duration;
-    char* dev;
-}
-SoundDeviceSettings;
-
 typedef struct
 {
     bool is_valid;
     DeviceType dev_type;
     DeviceSubType dev_subtype;
     TachometerSettings tachsettings;
-    SerialDeviceSettings serialdevsettings;
-    SoundDeviceSettings sounddevsettings;
 }
 DeviceSettings;
 
@@ -102,6 +87,4 @@ int strtogame(const char* game, MonocoqueSettings* ms);
 
 int devsetup(const char* device_type, const char* device_subtype, const char* config_files, MonocoqueSettings* ms, DeviceSettings* ds, config_setting_t* device_settings);
 
-int settingsfree(DeviceSettings ds);
-
 #endif

src/monocoque/helper/parameters.c

@@ -23,7 +23,6 @@ ConfigError getParameters(int argc, char** argv, Parameters* p)
 
     struct arg_lit* arg_verbosity1   = arg_litn("v","verbose", 0, 2, "increase logging verbosity");
     struct arg_lit* arg_verbosity2   = arg_litn("v","verbose", 0, 2, "increase logging verbosity");
-    struct arg_lit* arg_verbosity3   = arg_litn("v","verbose", 0, 2, "increase logging verbosity");
 
     struct arg_rex* cmd1             = arg_rex1(NULL, NULL, "play", NULL, REG_ICASE, NULL);
     struct arg_str* arg_sim          = arg_strn("s", "sim", "<gamename>", 0, 1, NULL);
@@ -44,13 +43,6 @@ ConfigError getParameters(int argc, char** argv, Parameters* p)
     void* argtable2[]                = {cmd2a,cmd2b,arg_max_revs,arg_granularity,arg_save,arg_verbosity2,help2,vers2,end2};
     int nerrors2;
 
-    struct arg_rex* cmd3             = arg_rex1(NULL, NULL, "test", NULL, REG_ICASE, NULL);
-    struct arg_lit* help3            = arg_litn(NULL,"help", 0, 1, "print this help and exit");
-    struct arg_lit* vers3            = arg_litn(NULL,"version", 0, 1, "print version information and exit");
-    struct arg_end* end3             = arg_end(20);
-    void* argtable3[]                = {cmd3,arg_verbosity3,help3,vers3,end3};
-    int nerrors3;
-
     struct arg_lit*  help0           = arg_lit0(NULL,"help",     "print this help and exit");
     struct arg_lit*  version0        = arg_lit0(NULL,"version",  "print version information and exit");
     struct arg_end*  end0            = arg_end(20);
@@ -78,7 +70,6 @@ ConfigError getParameters(int argc, char** argv, Parameters* p)
     nerrors0 = arg_parse(argc,argv,argtable0);
     nerrors1 = arg_parse(argc,argv,argtable1);
     nerrors2 = arg_parse(argc,argv,argtable2);
-    nerrors3 = arg_parse(argc,argv,argtable3);
 
     if (nerrors1==0)
     {
@@ -101,12 +92,6 @@ ConfigError getParameters(int argc, char** argv, Parameters* p)
             p->verbosity_count = arg_verbosity2->count;
             exitcode = E_SUCCESS_AND_DO;
         }
-        else if (nerrors3==0)
-        {
-            p->program_action = A_TEST;
-            p->verbosity_count = arg_verbosity3->count;
-            exitcode = E_SUCCESS_AND_DO;
-        }
         else
         {
             if (cmd1->count > 0)
@@ -126,13 +111,12 @@ ConfigError getParameters(int argc, char** argv, Parameters* p)
                 {
                     if (help->count==0 && vers->count==0)
                     {
-                        printf("%s: missing <play|config|test> command.\n",progname);
+                        printf("%s: missing <play|config> command.\n",progname);
                         printf("Usage 1: %s ", progname);
                         arg_print_syntax(stdout,argtable1,"\n");
                         printf("Usage 2: %s ", progname);
                         arg_print_syntax(stdout,argtable2,"\n");
-                        printf("Usage 3: %s ", progname);
+
-                        arg_print_syntax(stdout,argtable3,"\n");
                     }
                 }
             exitcode = E_SUCCESS_AND_EXIT;
@@ -147,8 +131,6 @@ ConfigError getParameters(int argc, char** argv, Parameters* p)
         arg_print_syntax(stdout,argtable1,"\n");
         printf("Usage 2: %s ", progname);
         arg_print_syntax(stdout,argtable2,"\n");
-        printf("Usage 3: %s ", progname);
-        arg_print_syntax(stdout,argtable3,"\n");
         printf("\nReport bugs on the github github.com/spacefreak18/monocoque.\n");
         exitcode = E_SUCCESS_AND_EXIT;
         goto cleanup;
@@ -166,7 +148,6 @@ cleanup:
     arg_freetable(argtable0,sizeof(argtable0)/sizeof(argtable0[0]));
     arg_freetable(argtable1,sizeof(argtable1)/sizeof(argtable1[0]));
     arg_freetable(argtable2,sizeof(argtable2)/sizeof(argtable2[0]));
-    arg_freetable(argtable3,sizeof(argtable3)/sizeof(argtable3[0]));
     return exitcode;
 
 }

src/monocoque/helper/parameters.h

@@ -1,9 +1,6 @@
 #ifndef _PARAMETERS_H
 #define _PARAMETERS_H
 
-#include <stdbool.h>
-#include "../simulatorapi/simapi/simapi/simapi.h"
-
 typedef struct
 {
     int   program_action;
@@ -12,18 +9,14 @@ typedef struct
     int max_revs;
     int granularity;
     int verbosity_count;
-
-    Simulator sim;
-    bool simon;
 }
 Parameters;
 
 typedef enum
 {
     A_PLAY          = 0,
-    A_TEST          = 1,
+    A_CONFIG_TACH   = 1,
-    A_CONFIG_TACH   = 2,
+    A_CONFIG_SHAKER = 2
-    A_CONFIG_SHAKER = 3
 }
 ProgramAction;
 

src/monocoque/monocoque.c

@@ -7,14 +7,12 @@
 #include "gameloop/gameloop.h"
 #include "gameloop/tachconfig.h"
 #include "devices/simdevice.h"
-#include "devices/sound.h"
 #include "helper/parameters.h"
 #include "helper/dirhelper.h"
 #include "helper/confighelper.h"
-#include "simulatorapi/simapi/simapi/simdata.h"
+#include "simulatorapi/simdata.h"
 #include "slog/slog.h"
 
-
 int create_dir(char* dir)
 {
     struct stat st = {0};
@@ -115,47 +113,44 @@ int main(int argc, char** argv)
         SimDevice* tachdev = malloc(sizeof(SimDevice));
         SimData* sdata = malloc(sizeof(SimData));
         DeviceSettings* ds = malloc(sizeof(DeviceSettings));
-
         error = devsetup("USB", "Tachometer", "None", ms, ds, NULL);
-
+        error = devinit(tachdev, ds);
-        if (error != MONOCOQUE_ERROR_NONE)
-        {
-            sloge("Could not proceed with tachometer configuration due to error: %i", error);
-        }
-        else
-        {
-            error = devinit(tachdev, 1, ds);
-        }
-
-        if (error != MONOCOQUE_ERROR_NONE)
-        {
-            sloge("Could not proceed with tachometer configuration due to error: %i", error);
-        }
-        else
-        {
         slogi("configuring tachometer with max revs: %i, granularity: %i, saving to %s", p->max_revs, p->granularity, p->save_file);
+
+        if (error != MONOCOQUE_ERROR_NONE)
+        {
+            sloge("Could not proceed with tachometer configuration due to error: %i", error);
+        }
+        else
+        {
             config_tachometer(p->max_revs, p->granularity, p->save_file, tachdev, sdata);
         }
-        devfree(tachdev, 1);
+        devfree(tachdev);
-        //free(tachdev);
+        free(tachdev);
         free(sdata);
         free(ds);
     }
     else
     {
-
+        slogi("running monocoque in gameloop mode..");
         int error = 0;
 
+        error = strtogame(p->sim_string, ms);
+        if (error != MONOCOQUE_ERROR_NONE)
+        {
+            goto cleanup_final;
+        }
+
         int configureddevices = config_setting_length(config_devices);
         int numdevices = 0;
-        DeviceSettings ds[configureddevices];
+        DeviceSettings* ds[configureddevices];
         slogi("found %i devices in configuration", configureddevices);
         int i = 0;
-        error = MONOCOQUE_ERROR_NONE;
         while (i<configureddevices)
         {
-            DeviceSettings settings;
+            error = MONOCOQUE_ERROR_NONE;
-
+            DeviceSettings* settings = malloc(sizeof(DeviceSettings));
+            ds[i] = settings;
             config_setting_t* config_device = config_setting_get_elem(config_devices, i);
             const char* device_type;
             const char* device_subtype;
@@ -164,18 +159,14 @@ int main(int argc, char** argv)
             config_setting_lookup_string(config_device, "type", &device_subtype);
             config_setting_lookup_string(config_device, "config", &device_config_file);
 
-            //slogt("device type: %s", device_type);
-            //slogt("device sub type: %s", device_subtype);
-            //slogt("device config file: %s", device_config_file);
             if (error == MONOCOQUE_ERROR_NONE)
             {
-                error = devsetup(device_type, device_subtype, device_config_file, ms, &settings, config_device);
+                error = devsetup(device_type, device_subtype, device_config_file, ms, ds[i], config_device);
             }
             if (error == MONOCOQUE_ERROR_NONE)
             {
                 numdevices++;
             }
-            ds[i] = settings;
 
             i++;
 
@@ -184,24 +175,20 @@ int main(int argc, char** argv)
         i = 0;
         int j = 0;
         error = MONOCOQUE_ERROR_NONE;
-
+        SimDevice* devices[numdevices];
-        setupsound();
+        while (i<configureddevices)
-        SimDevice* devices = malloc(numdevices * sizeof(SimDevice));
-        int initdevices = devinit(devices, configureddevices, ds);
-
-        if (p->program_action == A_PLAY)
         {
-            slogi("running monocoque in gameloop mode..");
+            if (ds[i]->is_valid == true)
-            //error = strtogame(p->sim_string, ms);
+            {
-            //if (error != MONOCOQUE_ERROR_NONE)
+                SimDevice* device = malloc(sizeof(SimDevice));
-            //{
+                devinit(device, ds[i]);
-            //    goto cleanup_final;
+                devices[j] = device;
-            //}
+                j++;
-#ifdef USE_PULSEAUDIO
+            }
-            pa_threaded_mainloop_unlock(mainloop);
+            i++;
-#endif
+        }
 
-            error = looper(devices, initdevices, p);
+        error = looper(devices, numdevices, ms->sim_name);
         if (error == MONOCOQUE_ERROR_NONE)
         {
             slogi("Game loop exited succesfully with error code: %i", error);
@@ -210,35 +197,25 @@ int main(int argc, char** argv)
         {
             sloge("Game loop exited with error code: %i", error);
         }
-        }
-        else
-        {
-            slogi("running monocoque in test mode...");
-
-#ifdef USE_PULSEAUDIO
-            pa_threaded_mainloop_unlock(mainloop);
-#endif
-
-            error = tester(devices, initdevices);
-            if (error == MONOCOQUE_ERROR_NONE)
-            {
-                slogi("Test exited succesfully with error code: %i", error);
-            }
-            else
-            {
-                sloge("Test exited with error code: %i", error);
-            }
-        }
-
-
-        devfree(devices, initdevices);
 
         i = 0;
-        // improve the api around the config helper
+        while (i<configureddevices)
-        // i don't like that i stack allocated but hid a malloc inside
-        for( i = 0; i < configureddevices; i++)
         {
-            settingsfree(ds[i]);
+            if(ds[i]->dev_subtype == SIMDEV_USB)
+            {
+                free(ds[i]->tachsettings.pulses_array);
+                free(ds[i]->tachsettings.rpms_array);
+            }
+            free(ds[i]);
+            i++;
+        }
+
+        i = 0;
+        while (i<numdevices)
+        {
+            devfree(devices[i]);
+            free(devices[i]);
+            i++;
         }
     }
 

src/monocoque/simulatorapi/CMakeLists.txt

@@ -1,15 +1,10 @@
 set(simulatorapi_source_files
-  simapi/simapi/simmapper.c
+  simmapper.c
-  simapi/simapi/simmapper.h
+  simmapper.h
-  simapi/simapi/simdata.h
+  simdata.h
-  simapi/simapi/test.h
+  test.h
-  simapi/include/acdata.h
+  simapi/acdata.h
-  simapi/include/rf2data.h
+  ac.h
-  simapi/simmap/basicmap.h
-  simapi/simmap/mapacdata.c
-  simapi/simmap/mapacdata.h
-  simapi/simapi/ac.h
-  simapi/simapi/rf2.h
 )
 
 add_library(simulatorapi STATIC ${simulatorapi_source_files})

src/monocoque/simulatorapi/ac.h

@@ -0,0 +1,21 @@
+#ifndef _AC_H
+#define _AC_H
+
+#include <stdbool.h>
+#include "simapi/acdata.h"
+
+#define AC_PHYSICS_FILE "acpmf_physics"
+#define AC_STATIC_FILE "acpmf_static"
+
+typedef struct
+{
+    bool has_physics;
+    bool has_static;
+    void* physics_map_addr;
+    void* static_map_addr;
+    struct SPageFilePhysics ac_physics;
+    struct SPageFileStatic ac_static;
+}
+ACMap;
+
+#endif

src/monocoque/simulatorapi/rf2.h

@@ -0,0 +1,21 @@
+#ifndef _RF2_H
+#define _RF2_H
+
+#include <stdbool.h>
+#include "simapi/rf2data.h"
+
+#define RF2_TELEMETRY_FILE "rFactor2SMMP_Telemetry"
+#define RF2_SCORING_FILE "rFactor2SMMP_Scoring"
+
+typedef struct
+{
+    bool has_telemetry;
+    bool has_scoring;
+    void* telemetry_map_addr;
+    void* scoring_map_addr;
+    struct rF2Telemetry rf2_telemetry;
+    //struct rF2Scoring rf2_scoring;
+}
+RF2Map;
+
+#endif

src/monocoque/simulatorapi/simapi

@@ -1 +1 @@
-Subproject commit c77e96339caf1eb79479d89ce342161ad83ca70e
+Subproject commit 04fd2ca8ed590f562ad6423d9cf9f076daa28b95

src/monocoque/simulatorapi/simdata.h

@@ -0,0 +1,17 @@
+#ifndef _SIMDATA_H
+#define _SIMDATA_H
+
+#include <stdint.h>
+
+typedef struct
+{
+    uint32_t velocity;
+    uint32_t rpms;
+    uint32_t gear;
+    uint32_t pulses;
+    uint32_t maxrpm;
+    uint32_t altitude;
+}
+SimData;
+
+#endif

src/monocoque/simulatorapi/simmapper.c

@@ -0,0 +1,136 @@
+#include <stdio.h>
+#include <sys/mman.h>
+#include <fcntl.h>
+#include <string.h>
+#include <stdlib.h>
+#include <stddef.h>
+#include <math.h>
+
+#include "simmapper.h"
+#include "simdata.h"
+#include "test.h"
+#include "ac.h"
+#include "rf2.h"
+#include "../helper/confighelper.h"
+#include "../slog/slog.h"
+
+#include "simapi/acdata.h"
+#include "simapi/rf2data.h"
+
+
+int simdatamap(SimData* simdata, SimMap* simmap, Simulator simulator)
+{
+    char* a;
+    char* b;
+    switch ( simulator )
+    {
+        case SIMULATOR_MONOCOQUE_TEST :
+            memcpy(simdata, simmap->addr, sizeof(SimData));
+            break;
+        case SIMULATOR_ASSETTO_CORSA :
+            a = simmap->d.ac.physics_map_addr;
+            if (simmap->d.ac.has_static == true )
+            {
+                b = simmap->d.ac.static_map_addr;
+                simdata->maxrpm = *(uint32_t*) (char*) (b + offsetof(struct SPageFileStatic, maxRpm));
+            }
+            simdata->rpms = *(uint32_t*) (char*) (a + offsetof(struct SPageFilePhysics, rpms));
+            simdata->gear = *(uint32_t*) (char*) (a + offsetof(struct SPageFilePhysics, gear));
+            simdata->velocity = ceil( *(float*) (char*) (a + offsetof(struct SPageFilePhysics, speedKmh)));
+            simdata->altitude = 1;
+            break;
+        case SIMULATOR_RFACTOR2 :
+           
+            a = simmap->d.rf2.telemetry_map_addr;
+            
+            simdata->velocity = ceil(3.6 * ( *(double*) (char*) (a + offsetof(struct rF2Telemetry, mVehicles[0].mLocalVel.z))));
+            simdata->rpms = ceil( *(double*) (char*) (a + offsetof(struct rF2Telemetry, mVehicles[0].mEngineRPM)));
+            simdata->maxrpm = ceil( *(double*) (char*) (a + offsetof(struct rF2Telemetry, mVehicles[0].mEngineMaxRPM)));
+            simdata->gear = *(uint32_t*) (char*) (a + offsetof(struct rF2Telemetry, mVehicles[0].mGear));
+            break;
+    }
+}
+
+
+int siminit(SimData* simdata, SimMap* simmap, Simulator simulator)
+{
+    slogi("searching for simulator data...");
+    int error = MONOCOQUE_ERROR_NONE;
+
+    void* a;
+    switch ( simulator )
+    {
+        case SIMULATOR_MONOCOQUE_TEST :
+            simmap->fd = shm_open(TEST_MEM_FILE_LOCATION, O_RDONLY, S_IRUSR | S_IWUSR);
+            if (simmap->fd == -1)
+            {
+                return 10;
+            }
+
+            simmap->addr = mmap(NULL, sizeof(SimData), PROT_READ, MAP_SHARED, simmap->fd, 0);
+            if (simmap->addr == MAP_FAILED)
+            {
+                return 30;
+            }
+            slogi("found data for monocoque test...");
+            break;
+        case SIMULATOR_ASSETTO_CORSA :
+
+            simmap->d.ac.has_physics=false;
+            simmap->d.ac.has_static=false;
+            simmap->fd = shm_open(AC_PHYSICS_FILE, O_RDONLY, S_IRUSR | S_IWUSR);
+            if (simmap->fd == -1)
+            {
+                slogd("could not open Assetto Corsa physics engine");
+                return MONOCOQUE_ERROR_NODATA;
+            }
+            simmap->d.ac.physics_map_addr = mmap(NULL, sizeof(simmap->d.ac.ac_physics), PROT_READ, MAP_SHARED, simmap->fd, 0);
+            if (simmap->d.ac.physics_map_addr == MAP_FAILED)
+            {
+                slogd("could not retrieve Assetto Corsa physics data");
+                return 30;
+            }
+            simmap->d.ac.has_physics=true;
+
+            simmap->fd = shm_open(AC_STATIC_FILE, O_RDONLY, S_IRUSR | S_IWUSR);
+            if (simmap->fd == -1)
+            {
+                slogd("could not open Assetto Corsa static data");
+                return 10;
+            }
+            simmap->d.ac.static_map_addr = mmap(NULL, sizeof(simmap->d.ac.ac_static), PROT_READ, MAP_SHARED, simmap->fd, 0);
+            if (simmap->d.ac.static_map_addr == MAP_FAILED)
+            {
+                slogd("could not retrieve Assetto Corsa static data");
+                return 30;
+            }
+            simmap->d.ac.has_static=true;
+
+            slogi("found data for Assetto Corsa...");
+            break;
+        
+        case SIMULATOR_RFACTOR2 :
+
+            simmap->d.rf2.has_telemetry=false;
+            simmap->d.rf2.has_scoring=false;
+            simmap->fd = shm_open(RF2_TELEMETRY_FILE, O_RDONLY, S_IRUSR | S_IWUSR);
+            if (simmap->fd == -1)
+            {
+                slogd("could not open RFactor2 Telemetry engine");
+                return MONOCOQUE_ERROR_NODATA;
+            }
+            simmap->d.rf2.telemetry_map_addr = mmap(NULL, sizeof(simmap->d.rf2.rf2_telemetry), PROT_READ, MAP_SHARED, simmap->fd, 0);
+            if (simmap->d.rf2.telemetry_map_addr == MAP_FAILED)
+            {
+                slogd("could not retrieve RFactor2 telemetry data");
+                return 30;
+            }
+            simmap->d.rf2.has_telemetry=true;
+
+
+            slogi("found data for RFactor2...");
+            break;
+    }
+
+    return error;
+}

src/monocoque/simulatorapi/simmapper.h

@@ -0,0 +1,28 @@
+#ifndef _SIMMAPPER_H
+#define _SIMMAPPER_H
+
+#include "ac.h"
+#include "rf2.h"
+
+#include "simdata.h"
+#include "../helper/confighelper.h"
+
+#include "simapi/acdata.h"
+#include "simapi/rf2data.h"
+
+typedef struct
+{
+    void* addr;
+    int fd;
+    union
+    {
+        ACMap ac;
+        RF2Map rf2;
+    } d;
+}
+SimMap;
+
+int siminit(SimData* simdata, SimMap* simmap, Simulator simulator);
+int simdatamap(SimData* simdata, SimMap* simmap, Simulator simulator);
+
+#endif

src/monocoque/simulatorapi/test.h

@@ -0,0 +1,6 @@
+#ifndef _TEST_H
+#define _TEST_H
+
+#define TEST_MEM_FILE_LOCATION "/monocoque_test"
+
+#endif

tests/getmem.c

@@ -5,8 +5,8 @@
 #include <unistd.h>
 #include <string.h>
 
-#include "../src/monocoque/simulatorapi/simapi/simapi/simdata.h"
+#include "../src/monocoque/simulatorapi/simdata.h"
-#include "../src/monocoque/simulatorapi/simapi/simapi/test.h"
+#include "../src/monocoque/simulatorapi/test.h"
 
 int main(int argc, char* argv[])
 {

tests/setmem.c

@@ -6,8 +6,8 @@
 #include <string.h>
 #include <termios.h>
 
-#include "../src/monocoque/simulatorapi/simapi/simapi/simdata.h"
+#include "../src/monocoque/simulatorapi/simdata.h"
-#include "../src/monocoque/simulatorapi/simapi/simapi/test.h"
+#include "../src/monocoque/simulatorapi/test.h"
 
 #define DATA "Hello, World! From PID %d"
 

tests/setsimdata.c

@@ -5,8 +5,8 @@
 #include <unistd.h>
 #include <string.h>
 
-#include "../src/monocoque/simulatorapi/simapi/simapi/simdata.h"
+#include "../src/monocoque/simulatorapi/simdata.h"
-#include "../src/monocoque/simulatorapi/simapi/simapi/test.h"
+#include "../src/monocoque/simulatorapi/test.h"
 
 #define DATA "Hello, World! From PID %d"
 

tests/simlighttest.c

@@ -2,7 +2,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <libserialport.h>
-#include "../src/monocoque/simulatorapi/simapi/simapi/simdata.h"
+#include "../src/monocoque/simulatorapi/simdata.h"
 
 /* Helper function for error handling. */
 int check(enum sp_return result);

udev/69-monocoque.rules

@@ -1,5 +1 @@
 SUBSYSTEMS=="usb",ATTRS{product}=="Rev Burner",GROUP="input",TAG+="uaccess"
-
-
-SUBSYSTEM=="tty", ATTRS{idVendor}=="2341", ATTRS{idProduct}=="0043", ATTRS{serial}=="75033303335351A080F0", SYMLINK+="simdev0", GROUP="input", TAG+="uaccess"
-SUBSYSTEM=="tty", ATTRS{idVendor}=="2341", ATTRS{idProduct}=="0043", ATTRS{serial}=="242303138313514131F1", SYMLINK+="simdev1", GROUP="input", TAG+="uaccess"