Fix lua cmake dependency. Use specified frequency as base frequency for engine effects

This commit is contained in:
Paul Dino Jones
2025-03-11 12:01:24 -04:00
parent 84f336f40c
commit 11bd2f71ef
4 changed files with 12 additions and 10 deletions
+3 -3
View File
@@ -1,9 +1,9 @@
#ifndef _ARDUINOLEDLUA_H
#define _ARDUINOLEDLUA_H
#include "lua5.4/lua.h"
#include "lua5.4/lauxlib.h"
#include "lua5.4/lualib.h"
#include "lua.h"
#include "lauxlib.h"
#include "lualib.h"
#include "../../simulatorapi/simapi/simapi/simdata.h"
+1 -1
View File
@@ -3,7 +3,7 @@
#include <stdbool.h>
#include "lua5.4/lua.h"
#include "lua.h"
#include "usbdevice.h"
#include "sounddevice.h"
+3 -4
View File
@@ -24,7 +24,7 @@ int gear_sound_set(SoundDevice* sounddevice, SimData* simdata)
}
sounddevice->sounddata.last_gear = simdata->gear;
slogt("set gear frequency to %i", sounddevice->sounddata.frequency);
slogt("set gear frequency to %i", sounddevice->sounddata.curr_frequency);
}
// we could make a vtable for these different effects too
@@ -32,10 +32,10 @@ int sounddev_engine_update(SimDevice* this, SimData* simdata)
{
SoundDevice* sounddevice = (void *) this->derived;
sounddevice->sounddata.curr_frequency = simdata->rpms/60;
sounddevice->sounddata.curr_frequency = simdata->rpms/60 + sounddevice->sounddata.frequency;
//sounddevice->sounddata.table_size = 48000/(sounddevice->sounddata.frequency);
slogt("set engine frequency to %i", sounddevice->sounddata.frequency);
slogt("set engine frequency to %i", sounddevice->sounddata.curr_frequency);
}
double modulate(SoundDevice* sounddevice, double raw_effect, SoundEffectModulationType modulation)
@@ -278,4 +278,3 @@ SoundDevice* new_sound_device(DeviceSettings* ds, MonocoqueSettings* ms) {
return this;
}