rusefi
/
rusefi-full
mirror of https://github.com/rusefi/rusefi-full.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

lua hook for timing add (#3260) 

* load script

* test

* needs more rams

* embiggen stack

* init system lua from lua thread

* de-embiggen stack

* infra

* hook

* system needs a little more

* semicolon

Co-authored-by: Matthew Kennedy <makenne@microsoft.com>
This commit is contained in:
Matthew Kennedy 2021-09-23 20:50:47 -07:00 committed by GitHub
parent 759582948a
commit 0978722225
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/controllers/algo/engine2.cpp
View File

@ -163,7 +163,7 @@ void EngineState::periodicFastCallback(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
injectionOffset = getInjectionOffset(rpm, fuelLoad PASS_ENGINE_PARAMETER_SUFFIX); injectionOffset = getInjectionOffset(rpm, fuelLoad PASS_ENGINE_PARAMETER_SUFFIX);
float ignitionLoad = getIgnitionLoad(PASS_ENGINE_PARAMETER_SIGNATURE); float ignitionLoad = getIgnitionLoad(PASS_ENGINE_PARAMETER_SIGNATURE);
timingAdvance = getAdvance(rpm, ignitionLoad PASS_ENGINE_PARAMETER_SUFFIX); timingAdvance = getAdvance(rpm, ignitionLoad PASS_ENGINE_PARAMETER_SUFFIX) + luaAdjustments.ignitionTimingAdd;
// TODO: calculate me from a table! // TODO: calculate me from a table!
trailingSparkAngle = CONFIG(trailingSparkAngle); trailingSparkAngle = CONFIG(trailingSparkAngle);

6
firmware/controllers/algo/engine_state.h
View File

@ -13,6 +13,10 @@
#include "pid.h" #include "pid.h"
#include "engine_state_generated.h" #include "engine_state_generated.h"
struct LuaAdjustments {
float ignitionTimingAdd = 0;
};
class EngineState : public engine_state2_s { class EngineState : public engine_state2_s {
public: public:
EngineState(); EngineState();
@ -86,4 +90,6 @@ public:
float targetLambda = 0.0f; float targetLambda = 0.0f;
float stoichiometricRatio = 0.0f; float stoichiometricRatio = 0.0f;
LuaAdjustments luaAdjustments;
}; };

3
firmware/controllers/lua/lua.cpp
View File

@ -344,6 +344,9 @@ void LuaThread::ThreadTask() {
while (!chThdShouldTerminateX()) { while (!chThdShouldTerminateX()) {
bool wasOk = runOneLua(myAlloc<0>, config->luaScript); bool wasOk = runOneLua(myAlloc<0>, config->luaScript);
// Reset any lua adjustments the script made
ENGINE(engineState).luaAdjustments = {};
if (!wasOk) { if (!wasOk) {
// Something went wrong executing the script, spin // Something went wrong executing the script, spin
// until reset invoked (maybe the user fixed the script) // until reset invoked (maybe the user fixed the script)

8
firmware/controllers/lua/lua_hooks.cpp
View File

@ -307,6 +307,12 @@ static int lua_stopEngine(lua_State*) {
return 0; return 0;
} }
static int lua_setTimingAdd(lua_State* l) {
ENGINE(engineState).luaAdjustments.ignitionTimingAdd = luaL_checknumber(l, 1);
return 0;
}
#endif // EFI_UNIT_TEST #endif // EFI_UNIT_TEST
void configureRusefiLuaHooks(lua_State* l) { void configureRusefiLuaHooks(lua_State* l) {
@ -338,5 +344,7 @@ void configureRusefiLuaHooks(lua_State* l) {
lua_register(l, "setAirmass", lua_setAirmass); lua_register(l, "setAirmass", lua_setAirmass);
lua_register(l, "stopEngine", lua_stopEngine); lua_register(l, "stopEngine", lua_stopEngine);
lua_register(l, "setTimingAdd", lua_setTimingAdd);
#endif #endif
} }