initialize knock controller / max retard table on reset

FOME-Tech · May 4, 2024 · dbe240b · dbe240b
1 parent ae01649
commit dbe240b
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/firmware/controllers/engine_controller.cpp b/firmware/controllers/engine_controller.cpp
@@ -490,6 +490,8 @@ void commonInitEngineController() {
 
 	initTachometer();
 	initSpeedometer();
+
+	initKnockCtrl();
 }
 
 // Returns false if there's an obvious problem with the loaded configuration

diff --git a/firmware/controllers/engine_cycle/knock_controller.cpp b/firmware/controllers/engine_cycle/knock_controller.cpp
@@ -8,10 +8,14 @@
 #include "pch.h"
 #include "knock_logic.h"
 
+void KnockController::init(engine_configuration_s const * const previousConfig) {
+	m_maxRetardTable.init(config->maxKnockRetardTable, config->maxKnockRetardLoadBins, config->maxKnockRetardRpmBins);
+}
+
 void KnockController::onConfigurationChange(engine_configuration_s const * previousConfig) {
 	KnockControllerBase::onConfigurationChange(previousConfig);
 
-	m_maxRetardTable.init(config->maxKnockRetardTable, config->maxKnockRetardLoadBins, config->maxKnockRetardRpmBins);
+	init(previousConfig);
 }
 
 int getCylinderKnockBank(uint8_t cylinderNumber) {
@@ -161,3 +165,7 @@ void Engine::onSparkFireKnockSense(uint8_t cylinderNumber, efitick_t nowNt) {
 	UNUSED(nowNt);
 #endif
 }
+
+void initKnockCtrl() {
+	engine->module<KnockController>().unmock().init(engineConfiguration);
+}
diff --git a/firmware/controllers/engine_cycle/knock_logic.h b/firmware/controllers/engine_cycle/knock_logic.h
@@ -41,6 +41,7 @@ class KnockController : public KnockControllerBase {
 	KnockController()
 	{
 	}
+	void init(engine_configuration_s const * const previousConfig);
 
 	void onConfigurationChange(engine_configuration_s const * /*previousConfig*/) override;
 
@@ -50,3 +51,5 @@ class KnockController : public KnockControllerBase {
 private:
 	Map3D<6, 6, uint8_t, uint8_t, uint8_t> m_maxRetardTable;
 };
+
+void initKnockCtrl();