rusefi
/
custom-board-bundle-sample-fork-of-rusefi
mirror of https://github.com/rusefi/custom-board-bundle-sample-fork-of-rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

idle_min through FSIO not working as intended #1553

This commit is contained in:
rusefi 2020-07-04 22:01:12 -04:00
parent 2a8b556ddd
commit bd39351055
3 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
firmware/controllers/actuators/idle_thread.cpp
View File

@ -57,6 +57,10 @@ static Logging *logger;
EXTERN_ENGINE; EXTERN_ENGINE;
#if EFI_UNIT_TEST
Engine *unitTestEngine;
#endif
static bool prettyClose = false; static bool prettyClose = false;
static bool shouldResetPid = false; static bool shouldResetPid = false;
@ -74,7 +78,12 @@ PidCic idlePid;
class PidWithOverrides : public Pid { class PidWithOverrides : public Pid {
public: public:
float getOffset() const override { float getOffset() const override {
#if EFI_FSIO && ! EFI_UNIT_TEST #if EFI_UNIT_TEST
Engine *engine = unitTestEngine;
EXPAND_Engine;
#endif
#if EFI_FSIO
if (engineConfiguration->useFSIO12ForIdleOffset) { if (engineConfiguration->useFSIO12ForIdleOffset) {
return ENGINE(fsioState.fsioIdleOffset); return ENGINE(fsioState.fsioIdleOffset);
} }
@ -83,7 +92,11 @@ public:
} }
float getMinValue() const override { float getMinValue() const override {
#if EFI_FSIO && ! EFI_UNIT_TEST #if EFI_UNIT_TEST
Engine *engine = unitTestEngine;
EXPAND_Engine;
#endif
#if EFI_FSIO
if (engineConfiguration->useFSIO13ForIdleMinValue) { if (engineConfiguration->useFSIO13ForIdleMinValue) {
return ENGINE(fsioState.fsioIdleMinValue); return ENGINE(fsioState.fsioIdleMinValue);
} }
@ -95,6 +108,11 @@ public:
PidWithOverrides idlePid; PidWithOverrides idlePid;
#endif /* EFI_IDLE_PID_CIC */ #endif /* EFI_IDLE_PID_CIC */
float getIdlePidOffset() {
return idlePid.getOffset();
}
// todo: extract interface for idle valve hardware, with solenoid and stepper implementations? // todo: extract interface for idle valve hardware, with solenoid and stepper implementations?
static SimplePwm idleSolenoidOpen("idle open"); static SimplePwm idleSolenoidOpen("idle open");
static SimplePwm idleSolenoidClose("idle close"); static SimplePwm idleSolenoidClose("idle close");

2
firmware/controllers/actuators/idle_thread.h
View File

@ -36,4 +36,4 @@ void stopIdleHardware(DECLARE_ENGINE_PARAMETER_SIGNATURE);
void initIdleHardware(DECLARE_ENGINE_PARAMETER_SIGNATURE); void initIdleHardware(DECLARE_ENGINE_PARAMETER_SIGNATURE);
bool isIdleHardwareRestartNeeded(); bool isIdleHardwareRestartNeeded();
void onConfigurationChangeIdleCallback(engine_configuration_s *previousConfiguration); void onConfigurationChangeIdleCallback(engine_configuration_s *previousConfiguration);
float getIdlePidOffset();

8
unit_tests/tests/test_idle_controller.cpp
View File

@ -19,9 +19,13 @@
extern IdleController idleControllerInstance; extern IdleController idleControllerInstance;
extern int timeNowUs; extern int timeNowUs;
extern Engine *unitTestEngine;
TEST(idle, fsioPidParameters) { TEST(idle, fsioPidParameters) {
WITH_ENGINE_TEST_HELPER(MIATA_NA6_MAP); WITH_ENGINE_TEST_HELPER(MIATA_NA6_MAP);
unitTestEngine = engine;
engineConfiguration->idleRpmPid.offset = 40; engineConfiguration->idleRpmPid.offset = 40;
engineConfiguration->idleRpmPid2.offset = 50; engineConfiguration->idleRpmPid2.offset = 50;
@ -39,14 +43,14 @@ TEST(idle, fsioPidParameters) {
ASSERT_EQ(1, getAcToggle(PASS_ENGINE_PARAMETER_SIGNATURE)); ASSERT_EQ(1, getAcToggle(PASS_ENGINE_PARAMETER_SIGNATURE));
eth.engine.periodicSlowCallback(PASS_ENGINE_PARAMETER_SIGNATURE); eth.engine.periodicSlowCallback(PASS_ENGINE_PARAMETER_SIGNATURE);
ASSERT_EQ(40, ENGINE(fsioState.fsioIdleOffset)); ASSERT_EQ(40, getIdlePidOffset());
ASSERT_EQ(30, ENGINE(fsioState.fsioIdleMinValue)); ASSERT_EQ(30, ENGINE(fsioState.fsioIdleMinValue));
setMockVoltage(engineConfiguration->acSwitchAdc, 5 PASS_ENGINE_PARAMETER_SUFFIX); setMockVoltage(engineConfiguration->acSwitchAdc, 5 PASS_ENGINE_PARAMETER_SUFFIX);
ASSERT_EQ(0, getAcToggle(PASS_ENGINE_PARAMETER_SIGNATURE)); ASSERT_EQ(0, getAcToggle(PASS_ENGINE_PARAMETER_SIGNATURE));
eth.engine.periodicSlowCallback(PASS_ENGINE_PARAMETER_SIGNATURE); eth.engine.periodicSlowCallback(PASS_ENGINE_PARAMETER_SIGNATURE);
ASSERT_EQ(50, ENGINE(fsioState.fsioIdleOffset)); ASSERT_EQ(50, getIdlePidOffset());
ASSERT_EQ(60, ENGINE(fsioState.fsioIdleMinValue)); ASSERT_EQ(60, ENGINE(fsioState.fsioIdleMinValue));