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

Detail on how to set up iDrive or equivalent CAN button control #226 

boost lua
This commit is contained in:
rusefillc 2022-07-14 13:03:08 -04:00
parent f7ac901380
commit 39df02fe35
4 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
firmware/controllers/actuators/boost_control.cpp
View File

@ -28,6 +28,12 @@ void BoostController::init(IPwm* pwm, const ValueProvider3D* openLoopMap, const
m_closedLoopTargetMap = closedLoopTargetMap; m_closedLoopTargetMap = closedLoopTargetMap;
m_pid.initPidClass(pidParams); m_pid.initPidClass(pidParams);
resetLua();
}
void BoostController::resetLua() {
luaTargetAdd = 0;
luaTargetMult = 1;
} }
void BoostController::onConfigurationChange(pid_s* previousConfiguration) { void BoostController::onConfigurationChange(pid_s* previousConfiguration) {
@ -60,7 +66,7 @@ expected<float> BoostController::getSetpoint() {
efiAssert(OBD_PCM_Processor_Fault, m_closedLoopTargetMap != nullptr, "boost closed loop target", unexpected); efiAssert(OBD_PCM_Processor_Fault, m_closedLoopTargetMap != nullptr, "boost closed loop target", unexpected);
return m_closedLoopTargetMap->getValue(rpm, tps.Value); return m_closedLoopTargetMap->getValue(rpm, tps.Value) * luaTargetMult + luaTargetAdd;
} }
expected<percent_t> BoostController::getOpenLoop(float target) { expected<percent_t> BoostController::getOpenLoop(float target) {

1
firmware/controllers/actuators/boost_control.h
View File

@ -17,6 +17,7 @@ class BoostController : public boost_control_s, public ClosedLoopController<floa
public: public:
void init(IPwm* pmw, const ValueProvider3D* openLoopMap, const ValueProvider3D* closedLoopTargetMap, pid_s* pidParams); void init(IPwm* pmw, const ValueProvider3D* openLoopMap, const ValueProvider3D* closedLoopTargetMap, pid_s* pidParams);
void update(); void update();
void resetLua();
// Called when the configuration may have changed. Controller will // Called when the configuration may have changed. Controller will
// reset if necessary. // reset if necessary.

3
firmware/controllers/algo/engine.cpp
View File

@ -360,8 +360,7 @@ void Engine::resetLua() {
// todo: https://github.com/rusefi/rusefi/issues/4308 // todo: https://github.com/rusefi/rusefi/issues/4308
engineState.lua = {}; engineState.lua = {};
engineState.lua.fuelMult = 1; engineState.lua.fuelMult = 1;
boostController.luaTargetAdd = 0; boostController.resetLua();
boostController.luaTargetMult = 1;
ignitionState.luaTimingAdd = 0; ignitionState.luaTimingAdd = 0;
ignitionState.luaTimingMult = 1; ignitionState.luaTimingMult = 1;
} }

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

@ -522,7 +522,18 @@ void configureRusefiLuaHooks(lua_State* l) {
return 1; return 1;
}); });
lua_register(l, "setBoostAdd", [](lua_State* l) {
engine->boostController.luaTargetAdd = luaL_checknumber(l, 1);
return 0;
});
lua_register(l, "setBoostMult", [](lua_State* l) {
engine->boostController.luaTargetMult = luaL_checknumber(l, 1);
return 0;
});
lua_register(l, "setTimingAdd", [](lua_State* l) {
engine->ignitionState.luaTimingAdd = luaL_checknumber(l, 1);
return 0;
});
lua_register(l, "setTimingMult", [](lua_State* l) { lua_register(l, "setTimingMult", [](lua_State* l) {
engine->ignitionState.luaTimingMult = luaL_checknumber(l, 1); engine->ignitionState.luaTimingMult = luaL_checknumber(l, 1);
return 0; return 0;
@ -613,11 +624,6 @@ void configureRusefiLuaHooks(lua_State* l) {
return 1; return 1;
}); });
lua_register(l, "setTimingAdd", [](lua_State* l) {
engine->ignitionState.luaTimingAdd = luaL_checknumber(l, 1);
return 0;
});
#if EFI_VEHICLE_SPEED #if EFI_VEHICLE_SPEED
lua_register(l, "getCurrentGear", [](lua_State* l) { lua_register(l, "getCurrentGear", [](lua_State* l) {
lua_pushinteger(l, engine->module<GearDetector>()->getCurrentGear()); lua_pushinteger(l, engine->module<GearDetector>()->getCurrentGear());