From a0d64ea0ad9721c0b97252f1dc8ed1c54a582ffc Mon Sep 17 00:00:00 2001 From: Matthew Kennedy Date: Tue, 26 Sep 2023 17:49:33 -0700 Subject: [PATCH] use onConfigurationChange instead of version holder --- firmware/controllers/actuators/vvt.cpp | 8 +++++--- firmware/controllers/actuators/vvt.h | 1 + firmware/controllers/algo/engine.h | 1 - 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/firmware/controllers/actuators/vvt.cpp b/firmware/controllers/actuators/vvt.cpp index a0ec4f4332..51a6338e1f 100644 --- a/firmware/controllers/actuators/vvt.cpp +++ b/firmware/controllers/actuators/vvt.cpp @@ -38,11 +38,13 @@ void VvtController::onFastCallback() { return; } - if (engine->auxParametersVersion.isOld(engine->getGlobalConfigurationVersion())) { + update(); +} + +void VvtController::onConfigurationChange(engine_configuration_s const * previousConfig) { + if (!m_pid.isSame(&previousConfig->auxPid[index])) { m_pid.reset(); } - - update(); } expected VvtController::observePlant() const { diff --git a/firmware/controllers/actuators/vvt.h b/firmware/controllers/actuators/vvt.h index 3ec6143c53..def4349c90 100644 --- a/firmware/controllers/actuators/vvt.h +++ b/firmware/controllers/actuators/vvt.h @@ -27,6 +27,7 @@ public: // EngineModule implementation void onFastCallback() override; + void onConfigurationChange(engine_configuration_s const * previousConfig) override; // ClosedLoopController implementation expected observePlant() const override; diff --git a/firmware/controllers/algo/engine.h b/firmware/controllers/algo/engine.h index d3ece2a56b..2d191dbdb2 100644 --- a/firmware/controllers/algo/engine.h +++ b/firmware/controllers/algo/engine.h @@ -209,7 +209,6 @@ public: void setConfig(); LocalVersionHolder versionForConfigurationListeners; - LocalVersionHolder auxParametersVersion; AuxActor auxValves[AUX_DIGITAL_VALVE_COUNT][2];