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

Move haptic effect data into it's own structure.

This commit is contained in:
Paul Dino Jones 2024-07-03 19:18:39 +00:00
parent ea100ca2cf
commit 1bde76e3c7
8 changed files with 44 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/monocoque/devices/hapticeffect.h
View File

@ -9,6 +9,10 @@ typedef struct
{ {
double threshold; double threshold;
VibrationEffectType effecttype; VibrationEffectType effecttype;
MonocoqueTyreIdentifier tyre;
int useconfig;
int* configcheck;
char* tyrediameterconfig;
} }
HapticEffect; HapticEffect;

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

@ -60,7 +60,7 @@ int arduino_haptic_update(SimDevice* this, SimData* simdata)
SerialDevice* serialdevice = (void *) this->derived; SerialDevice* serialdevice = (void *) this->derived;
int result = 1; int result = 1;
int play = slipeffect(simdata, serialdevice->hapticeffect.effecttype, this->tyre, serialdevice->hapticeffect.threshold, this->useconfig, this->configcheck, this->tyrediameterconfig); int play = slipeffect(simdata, this->hapticeffect.effecttype, this->hapticeffect.tyre, this->hapticeffect.threshold, this->hapticeffect.useconfig, this->hapticeffect.configcheck, this->hapticeffect.tyrediameterconfig);
slogt("Updating arduino haptic device"); slogt("Updating arduino haptic device");
@ -97,7 +97,7 @@ static const vtable arduino_shiftlights_vtable = { &arduino_shiftlights_update,
static const vtable arduino_simwind_vtable = { &arduino_simwind_update, &serialdev_free }; static const vtable arduino_simwind_vtable = { &arduino_simwind_update, &serialdev_free };
static const vtable arduino_haptic_vtable = { &arduino_haptic_update, &serialdev_free }; static const vtable arduino_haptic_vtable = { &arduino_haptic_update, &serialdev_free };
SerialDevice* new_serial_device(DeviceSettings* ds) { SerialDevice* new_serial_device(DeviceSettings* ds, MonocoqueSettings* ms) {
SerialDevice* this = (SerialDevice*) malloc(sizeof(SerialDevice)); SerialDevice* this = (SerialDevice*) malloc(sizeof(SerialDevice));
@ -127,8 +127,12 @@ SerialDevice* new_serial_device(DeviceSettings* ds) {
if(this->devicetype == ARDUINODEV__HAPTIC) if(this->devicetype == ARDUINODEV__HAPTIC)
{ {
this->hapticeffect.threshold = ds->threshold; this->m.hapticeffect.threshold = ds->threshold;
this->hapticeffect.effecttype = ds->effect_type; this->m.hapticeffect.effecttype = ds->effect_type;
this->m.hapticeffect.tyre = ds->tyre;
this->m.hapticeffect.useconfig = ms->useconfig;
this->m.hapticeffect.configcheck = &ms->configcheck;
this->m.hapticeffect.tyrediameterconfig = ms->tyre_diameter_config;
} }
int error = serialdev_init(this, ds->serialdevsettings.portdev); int error = serialdev_init(this, ds->serialdevsettings.portdev);

14
src/monocoque/devices/simdevice.c
View File

@ -34,16 +34,12 @@ int devinit(SimDevice* simdevices, int numdevices, DeviceSettings* ds, Monocoque
simdevices[j].initialized = false; simdevices[j].initialized = false;
if (ds[j].dev_type == SIMDEV_USB) { if (ds[j].dev_type == SIMDEV_USB) {
USBDevice* sim = new_usb_device(&ds[j]); USBDevice* sim = new_usb_device(&ds[j], ms);
if (sim != NULL) if (sim != NULL)
{ {
simdevices[j] = sim->m; simdevices[j] = sim->m;
simdevices[j].initialized = true; simdevices[j].initialized = true;
simdevices[j].type = SIMDEV_USB; simdevices[j].type = SIMDEV_USB;
simdevices[j].tyre = ds[j].tyre;
simdevices[j].useconfig = ms->useconfig;
simdevices[j].configcheck = &ms->configcheck;
simdevices[j].tyrediameterconfig = ms->tyre_diameter_config;
devices++; devices++;
} }
else else
@ -54,17 +50,13 @@ int devinit(SimDevice* simdevices, int numdevices, DeviceSettings* ds, Monocoque
if (ds[j].dev_type == SIMDEV_SOUND) { if (ds[j].dev_type == SIMDEV_SOUND) {
SoundDevice* sim = new_sound_device(&ds[j]); SoundDevice* sim = new_sound_device(&ds[j], ms);
if (sim != NULL) if (sim != NULL)
{ {
simdevices[j] = sim->m; simdevices[j] = sim->m;
simdevices[j].initialized = true; simdevices[j].initialized = true;
simdevices[j].type = SIMDEV_SOUND; simdevices[j].type = SIMDEV_SOUND;
simdevices[j].tyre = ds[j].tyre;
simdevices[j].useconfig = ms->useconfig;
simdevices[j].configcheck = &ms->configcheck;
simdevices[j].tyrediameterconfig = ms->tyre_diameter_config;
devices++; devices++;
} }
else else
@ -75,7 +67,7 @@ int devinit(SimDevice* simdevices, int numdevices, DeviceSettings* ds, Monocoque
if (ds[j].dev_type == SIMDEV_SERIAL) { if (ds[j].dev_type == SIMDEV_SERIAL) {
SerialDevice* sim = new_serial_device(&ds[j]); SerialDevice* sim = new_serial_device(&ds[j], ms);
if (sim != NULL) if (sim != NULL)
{ {
simdevices[j] = sim->m; simdevices[j] = sim->m;

15
src/monocoque/devices/simdevice.h
View File

@ -24,11 +24,7 @@ struct SimDevice
int id; int id;
bool initialized; bool initialized;
DeviceType type; DeviceType type;
// possibly move these to a haptic effect struct HapticEffect hapticeffect;
MonocoqueTyreIdentifier tyre;
int useconfig;
int* configcheck;
char* tyrediameterconfig;
}; };
typedef struct { typedef struct {
@ -51,7 +47,6 @@ typedef struct
SerialType type; SerialType type;
struct sp_port* port; struct sp_port* port;
SerialDeviceType devicetype; SerialDeviceType devicetype;
HapticEffect hapticeffect;
union union
{ {
SimWindData simwinddata; SimWindData simwinddata;
@ -65,7 +60,7 @@ int arduino_simwind_update(SimDevice* this, SimData* simdata);
int arduino_haptic_update(SimDevice* this, SimData* simdata); int arduino_haptic_update(SimDevice* this, SimData* simdata);
int serialdev_free(SimDevice* this); int serialdev_free(SimDevice* this);
SerialDevice* new_serial_device(DeviceSettings* ds); SerialDevice* new_serial_device(DeviceSettings* ds, MonocoqueSettings* ms);
/********* USB HID Devices *****/ /********* USB HID Devices *****/
typedef enum typedef enum
@ -92,7 +87,7 @@ USBDevice;
int usbdev_update(SimDevice* this, SimData* simdata); int usbdev_update(SimDevice* this, SimData* simdata);
int usbdev_free(SimDevice* this); int usbdev_free(SimDevice* this);
USBDevice* new_usb_device(DeviceSettings* ds); USBDevice* new_usb_device(DeviceSettings* ds, MonocoqueSettings* ms);
/********* Sound Devices *****/ /********* Sound Devices *****/
@ -102,8 +97,6 @@ typedef struct
int id; int id;
SoundType type; SoundType type;
int configcheck; int configcheck;
VibrationEffectType effecttype;
double slipthreshold;
SoundData sounddata; SoundData sounddata;
#ifdef USE_PULSEAUDIO #ifdef USE_PULSEAUDIO
pa_stream *stream; pa_stream *stream;
@ -119,7 +112,7 @@ int sounddev_gearshift_update(SimDevice* this, SimData* simdata);
int sounddev_tyreslip_update(SimDevice* this, SimData* simdata); int sounddev_tyreslip_update(SimDevice* this, SimData* simdata);
int sounddev_free(SimDevice* this); int sounddev_free(SimDevice* this);
SoundDevice* new_sound_device(DeviceSettings* ds); SoundDevice* new_sound_device(DeviceSettings* ds, MonocoqueSettings* ms);
/***** Generic Methods *********/ /***** Generic Methods *********/

2
src/monocoque/devices/sound/usb_generic_shaker.c
View File

@ -116,7 +116,7 @@ int usb_generic_shaker_init(SoundDevice* sounddevice)
sounddevice->outputParameters.suggestedLatency = Pa_GetDeviceInfo( sounddevice->outputParameters.device )->defaultLowOutputLatency; sounddevice->outputParameters.suggestedLatency = Pa_GetDeviceInfo( sounddevice->outputParameters.device )->defaultLowOutputLatency;
sounddevice->outputParameters.hostApiSpecificStreamInfo = NULL; sounddevice->outputParameters.hostApiSpecificStreamInfo = NULL;
if (sounddevice->effecttype == EFFECT_GEARSHIFT) if (sounddevice->m.hapticeffect.effecttype == EFFECT_GEARSHIFT)
{ {
err = Pa_OpenStream( &sounddevice->stream, err = Pa_OpenStream( &sounddevice->stream,
NULL, /* No input. */ NULL, /* No input. */

2
src/monocoque/devices/sound/usb_generic_shaker_pulse.c
View File

@ -112,7 +112,7 @@ int usb_generic_shaker_init(SoundDevice* sounddevice, pa_threaded_mainloop* main
pa_stream_set_state_callback(stream, stream_state_cb, mainloop); pa_stream_set_state_callback(stream, stream_state_cb, mainloop);
if (sounddevice->effecttype == EFFECT_GEARSHIFT) if (sounddevice->m.hapticeffect.effecttype == EFFECT_GEARSHIFT)
{ {
pa_stream_set_write_callback(stream, gear_sound_stream, &sounddevice->sounddata); pa_stream_set_write_callback(stream, gear_sound_stream, &sounddevice->sounddata);
} }

23
src/monocoque/devices/sounddevice.c
View File

@ -42,7 +42,7 @@ int sounddev_tyreslip_update(SimDevice* this, SimData* simdata)
{ {
SoundDevice* sounddevice = (void *) this->derived; SoundDevice* sounddevice = (void *) this->derived;
int play = slipeffect(simdata, sounddevice->effecttype, this->tyre, sounddevice->slipthreshold, this->useconfig, this->configcheck, this->tyrediameterconfig); int play = slipeffect(simdata, this->hapticeffect.effecttype, this->hapticeffect.tyre, this->hapticeffect.threshold, this->hapticeffect.useconfig, this->hapticeffect.configcheck, this->hapticeffect.tyrediameterconfig);
if (play > 0) if (play > 0)
{ {
@ -60,7 +60,7 @@ int sounddev_tyrelock_update(SimDevice* this, SimData* simdata)
{ {
SoundDevice* sounddevice = (void *) this->derived; SoundDevice* sounddevice = (void *) this->derived;
int play = slipeffect(simdata, sounddevice->effecttype, this->tyre, sounddevice->slipthreshold, this->useconfig, this->configcheck, this->tyrediameterconfig); int play = slipeffect(simdata, this->hapticeffect.effecttype, this->hapticeffect.tyre, this->hapticeffect.threshold, this->hapticeffect.useconfig, this->hapticeffect.configcheck, this->hapticeffect.tyrediameterconfig);
if (play > 0) if (play > 0)
{ {
@ -131,7 +131,7 @@ int sounddev_init(SoundDevice* sounddevice, const char* devname, int volume, int
const char* streamname= "Engine"; const char* streamname= "Engine";
switch (sounddevice->effecttype) { switch (sounddevice->m.hapticeffect.effecttype) {
case (EFFECT_GEARSHIFT): case (EFFECT_GEARSHIFT):
sounddevice->sounddata.last_gear = 0; sounddevice->sounddata.last_gear = 0;
@ -146,13 +146,11 @@ int sounddev_init(SoundDevice* sounddevice, const char* devname, int volume, int
case (EFFECT_TYRESLIP): case (EFFECT_TYRESLIP):
sounddevice->sounddata.duration = duration; sounddevice->sounddata.duration = duration;
sounddevice->sounddata.curr_duration = duration; sounddevice->sounddata.curr_duration = duration;
sounddevice->slipthreshold = threshold;
streamname = "TyreSlip"; streamname = "TyreSlip";
break; break;
case (EFFECT_TYRELOCK): case (EFFECT_TYRELOCK):
sounddevice->sounddata.duration = duration; sounddevice->sounddata.duration = duration;
sounddevice->sounddata.curr_duration = duration; sounddevice->sounddata.curr_duration = duration;
sounddevice->slipthreshold = threshold;
streamname = "TyreLock"; streamname = "TyreLock";
break; break;
case (EFFECT_ABSBRAKES): case (EFFECT_ABSBRAKES):
@ -179,7 +177,7 @@ static const vtable tyreslip_sound_simdevice_vtable = { &sounddev_tyreslip_updat
static const vtable tyrelock_sound_simdevice_vtable = { &sounddev_tyrelock_update, &sounddev_free }; static const vtable tyrelock_sound_simdevice_vtable = { &sounddev_tyrelock_update, &sounddev_free };
static const vtable absbrakes_sound_simdevice_vtable = { &sounddev_absbrakes_update, &sounddev_free }; static const vtable absbrakes_sound_simdevice_vtable = { &sounddev_absbrakes_update, &sounddev_free };
SoundDevice* new_sound_device(DeviceSettings* ds) { SoundDevice* new_sound_device(DeviceSettings* ds, MonocoqueSettings* ms) {
SoundDevice* this = (SoundDevice*) malloc(sizeof(SoundDevice)); SoundDevice* this = (SoundDevice*) malloc(sizeof(SoundDevice));
@ -190,27 +188,30 @@ SoundDevice* new_sound_device(DeviceSettings* ds) {
slogt("Attempting to configure sound device with subtype: %i", ds->effect_type); slogt("Attempting to configure sound device with subtype: %i", ds->effect_type);
switch (ds->effect_type) { switch (ds->effect_type) {
case (EFFECT_ENGINERPM): case (EFFECT_ENGINERPM):
this->effecttype = EFFECT_ENGINERPM; this->m.hapticeffect.effecttype = EFFECT_ENGINERPM;
this->m.vtable = &engine_sound_simdevice_vtable; this->m.vtable = &engine_sound_simdevice_vtable;
slogi("Initializing sound device for engine vibrations."); slogi("Initializing sound device for engine vibrations.");
break; break;
case (EFFECT_GEARSHIFT): case (EFFECT_GEARSHIFT):
this->effecttype = EFFECT_GEARSHIFT; this->m.hapticeffect.effecttype = EFFECT_GEARSHIFT;
this->m.vtable = &gear_sound_simdevice_vtable; this->m.vtable = &gear_sound_simdevice_vtable;
slogi("Initializing sound device for gear shift vibrations."); slogi("Initializing sound device for gear shift vibrations.");
break; break;
case (EFFECT_TYRESLIP): case (EFFECT_TYRESLIP):
this->effecttype = EFFECT_TYRESLIP; this->m.hapticeffect.effecttype = EFFECT_TYRESLIP;
this->m.hapticeffect.threshold = ds->threshold;
this->m.vtable = &tyreslip_sound_simdevice_vtable; this->m.vtable = &tyreslip_sound_simdevice_vtable;
slogi("Initializing sound device for tyre slip vibrations."); slogi("Initializing sound device for tyre slip vibrations.");
break; break;
case (EFFECT_TYRELOCK): case (EFFECT_TYRELOCK):
this->effecttype = EFFECT_TYRELOCK; this->m.hapticeffect.effecttype = EFFECT_TYRELOCK;
this->m.hapticeffect.threshold = ds->threshold;
this->m.vtable = &tyrelock_sound_simdevice_vtable; this->m.vtable = &tyrelock_sound_simdevice_vtable;
slogi("Initializing sound device for tyre slip vibrations."); slogi("Initializing sound device for tyre slip vibrations.");
break; break;
case (EFFECT_ABSBRAKES): case (EFFECT_ABSBRAKES):
this->effecttype = EFFECT_ABSBRAKES; this->m.hapticeffect.effecttype = EFFECT_ABSBRAKES;
this->m.hapticeffect.threshold = ds->threshold;
this->m.vtable = &absbrakes_sound_simdevice_vtable; this->m.vtable = &absbrakes_sound_simdevice_vtable;
slogi("Initializing sound device for abs vibrations."); slogi("Initializing sound device for abs vibrations.");
break; break;

13
src/monocoque/devices/usbdevice.c
View File

@ -20,7 +20,7 @@ int usbdev_update(SimDevice* this, SimData* simdata)
tachdev_update(&usbdevice->u.tachdevice, simdata); tachdev_update(&usbdevice->u.tachdevice, simdata);
break; break;
case USBDEV_GENERICHAPTIC : case USBDEV_GENERICHAPTIC :
usbhapticdev_update(&usbdevice->u.hapticdevice, simdata, this->tyre, this->useconfig, this->configcheck, this->tyrediameterconfig); usbhapticdev_update(&usbdevice->u.hapticdevice, simdata, this->hapticeffect.tyre, this->hapticeffect.useconfig, this->hapticeffect.configcheck, this->hapticeffect.tyrediameterconfig);
break; break;
} }
@ -70,7 +70,7 @@ int usbdev_init(USBDevice* usbdevice, DeviceSettings* ds)
static const vtable usb_simdevice_vtable = { &usbdev_update, &usbdev_free }; static const vtable usb_simdevice_vtable = { &usbdev_update, &usbdev_free };
USBDevice* new_usb_device(DeviceSettings* ds) { USBDevice* new_usb_device(DeviceSettings* ds, MonocoqueSettings* ms) {
USBDevice* this = (USBDevice*) malloc(sizeof(USBDevice)); USBDevice* this = (USBDevice*) malloc(sizeof(USBDevice));
@ -79,9 +79,18 @@ USBDevice* new_usb_device(DeviceSettings* ds) {
this->m.derived = this; this->m.derived = this;
this->m.vtable = &usb_simdevice_vtable; this->m.vtable = &usb_simdevice_vtable;
this->type = USBDEV_TACHOMETER; this->type = USBDEV_TACHOMETER;
if (ds->dev_subtype == SIMDEVTYPE_USBHAPTIC) if (ds->dev_subtype == SIMDEVTYPE_USBHAPTIC)
{ {
this->m.hapticeffect.threshold = ds->threshold;
this->m.hapticeffect.effecttype = ds->effect_type;
this->m.hapticeffect.tyre = ds->tyre;
this->m.hapticeffect.useconfig = ms->useconfig;
this->m.hapticeffect.configcheck = &ms->configcheck;
this->m.hapticeffect.tyrediameterconfig = ms->tyre_diameter_config;
this->type = USBDEV_GENERICHAPTIC; this->type = USBDEV_GENERICHAPTIC;
} }