tweaks

FOME-Tech · Aug 29, 2024 · 65809b1 · 65809b1
1 parent 14c7013
commit 65809b1
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/firmware/controllers/modules/map_averaging/map_averaging.cpp b/firmware/controllers/modules/map_averaging/map_averaging.cpp
@@ -214,10 +214,6 @@ void MapAveragingModule::onEnginePhase(float rpm,
 
 	ScopePerf perf(PE::MapAveragingTriggerCallback);
 
-	if (engineConfiguration->mapMinBufferLength != mapMinBufferLength) {
-		applyMapMinBufferLength();
-	}
-
 	int samplingCount = engineConfiguration->measureMapOnlyInOneCylinder ? 1 : engineConfiguration->cylindersCount;
 
 	for (int i = 0; i < samplingCount; i++) {
@@ -240,6 +236,12 @@ void MapAveragingModule::onEnginePhase(float rpm,
 #endif
 }
 
+void MapAveragingModule::onConfigurationChange(engine_configuration_s const * previousConfig) {
+	if (!previousConfig || engineConfiguration->mapMinBufferLength != previousConfig->mapMinBufferLength) {
+		applyMapMinBufferLength();
+	}
+}
+
 void initMapAveraging() {
 	applyMapMinBufferLength();
 }

diff --git a/firmware/controllers/modules/map_averaging/map_averaging.h b/firmware/controllers/modules/map_averaging/map_averaging.h
@@ -51,6 +51,8 @@ MapAverager& getMapAvg(size_t idx);
 class MapAveragingModule : public EngineModule {
 public:
 #if EFI_MAP_AVERAGING
+	void onConfigurationChange(engine_configuration_s const * previousConfig);
+
 	void onFastCallback() override;
 	void onEnginePhase(float rpm,
 						efitick_t edgeTimestamp,

diff --git a/simulator/simulator/rusEfiFunctionalTest.cpp b/simulator/simulator/rusEfiFunctionalTest.cpp
@@ -20,7 +20,6 @@
 #include "sensor_chart.h"
 #include "bench_test.h"
 #include "tunerstudio.h"
-#include "map_averaging.h"
 #include "mmc_card.h"
 #include "memstreams.h"
 #include <chprintf.h>

diff --git a/unit_tests/engine_test_helper.cpp b/unit_tests/engine_test_helper.cpp
@@ -104,6 +104,7 @@ EngineTestHelper::EngineTestHelper(engine_type_e engineType, configuration_callb
 	initDataStructures();
 
 	resetConfigurationExt(configurationCallback, engineType);
+	engineConfiguration->isMapAveragingEnabled = false;
 
 	validateConfig();