diff --git a/firmware/controllers/algo/advance_map.h b/firmware/controllers/algo/advance_map.h index 9894831632..52f0077c47 100644 --- a/firmware/controllers/algo/advance_map.h +++ b/firmware/controllers/algo/advance_map.h @@ -19,6 +19,7 @@ size_t getMultiSparkCount(int rpm); class IgnitionState : public ignition_state_s { public: IgnitionState() { + // todo https://github.com/rusefi/rusefi/issues/4308 luaTimingMult = 1; } floatms_t getSparkDwell(int rpm); diff --git a/firmware/controllers/algo/engine2.cpp b/firmware/controllers/algo/engine2.cpp index 8097577194..561bafe769 100644 --- a/firmware/controllers/algo/engine2.cpp +++ b/firmware/controllers/algo/engine2.cpp @@ -79,6 +79,8 @@ float FuelConsumptionState::getConsumptionGramPerSecond() const { EngineState::EngineState() { timeSinceLastTChargeK = getTimeNowNt(); + // todo: https://github.com/rusefi/rusefi/issues/4308 + lua.fuelMult = 1; } void EngineState::updateSlowSensors() { diff --git a/firmware/controllers/algo/engine_state.h b/firmware/controllers/algo/engine_state.h index ff2ce162ce..fe907853cc 100644 --- a/firmware/controllers/algo/engine_state.h +++ b/firmware/controllers/algo/engine_state.h @@ -13,10 +13,6 @@ #include "efi_pid.h" #include "engine_state_generated.h" -struct LuaAdjustmentsLegacy { - float fuelMult = 1; -}; - class EngineState : public engine_state_s { public: EngineState(); @@ -75,6 +71,4 @@ public: float targetLambda = 0.0f; float stoichiometricRatio = 0.0f; - - LuaAdjustmentsLegacy luaAdjustments; }; diff --git a/firmware/controllers/lua/lua.cpp b/firmware/controllers/lua/lua.cpp index d2c6f5564c..d18404107a 100644 --- a/firmware/controllers/lua/lua.cpp +++ b/firmware/controllers/lua/lua.cpp @@ -310,7 +310,7 @@ void LuaThread::ThreadTask() { bool wasOk = runOneLua(myAlloc, config->luaScript); // Reset any lua adjustments the script made - engine->engineState.luaAdjustments = {}; + // todo https://github.com/rusefi/rusefi/issues/4308 engine->engineState.luaAdjustments = {}; if (!wasOk) { // Something went wrong executing the script, spin diff --git a/firmware/controllers/lua/lua_hooks.cpp b/firmware/controllers/lua/lua_hooks.cpp index 703fffe8b7..3c5d868cce 100644 --- a/firmware/controllers/lua/lua_hooks.cpp +++ b/firmware/controllers/lua/lua_hooks.cpp @@ -534,7 +534,7 @@ void configureRusefiLuaHooks(lua_State* l) { return 0; }); lua_register(l, "setFuelMult", [](lua_State* l) { - engine->engineState.luaAdjustments.fuelMult = luaL_checknumber(l, 1); + engine->engineState.lua.fuelMult = luaL_checknumber(l, 1); return 0; }); #if EFI_PROD_CODE