move DFCO configs to the right spot, changelog

FOME-Tech · Sep 13, 2024 · 5aca8e6 · 5aca8e6
1 parent 16e6529
commit 5aca8e6
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/firmware/CHANGELOG.md b/firmware/CHANGELOG.md
@@ -44,6 +44,7 @@ or
  - Dropdown selector for popular gearbox ratios (#358, thank you @alrijleh and @nmschulte!)
  - Add two more aux linear sensors #476
  - Support wasted spark on odd cylinder count and odd-fire engines. Improves startup and allows running without a cam sensor!
+ - Add an option for the DFCO MAP threshold to use a table dependent upon RPM #485 (thank you @alrijleh!)
 
 ### Fixed
  - Improve performance with Lua CAN reception of a high volume of frames

diff --git a/firmware/controllers/algo/defaults/default_fuel.cpp b/firmware/controllers/algo/defaults/default_fuel.cpp
@@ -109,9 +109,9 @@ static void setDefaultFuelCutParameters() {
 	engineConfiguration->coastingFuelCutTps = 2;
 	engineConfiguration->coastingFuelCutMap = 30;
 	engineConfiguration->coastingFuelCutClt = 60;
-	engineConfiguration->useTableForDfcoMap = 0;
-	copyArray(engineConfiguration->dfcoMapRpmValuesBins, { 1500, 2000, 3500, 5000 });
-	copyArray(engineConfiguration->dfcoMapRpmValues, { 30, 25, 20, 18 });
+
+	copyArray(config->dfcoMapRpmValuesBins, { 1500, 2000, 3500, 5000 });
+	copyArray(config->dfcoMapRpmValues, { 30, 25, 20, 18 });
 }
 
 static void setDefaultStftSettings() {

diff --git a/firmware/controllers/algo/fuel/dfco.cpp b/firmware/controllers/algo/fuel/dfco.cpp
@@ -28,7 +28,7 @@ bool DfcoController::getState() const {
 	float vss = Sensor::getOrZero(SensorType::VehicleSpeed);
 
 	float mapThreshold = engineConfiguration->useTableForDfcoMap ?
-		interpolate2d(rpm, engineConfiguration->dfcoMapRpmValuesBins, engineConfiguration->dfcoMapRpmValues) :
+		interpolate2d(rpm, config->dfcoMapRpmValuesBins, config->dfcoMapRpmValues) :
 		engineConfiguration->coastingFuelCutMap;
 
 	bool mapActivate = map.value_or(0) < mapThreshold;

diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt
@@ -715,7 +715,8 @@ bit is_enabled_spi_2
 	bit pauseEtbControl;Disable the electronic throttle motor and DC idle motor for testing.\nThis mode is for testing ETB/DC idle position sensors, etc without actually driving the throttle.
 	bit alignEngineSnifferAtTDC
 	bit enableAemXSeries;AEM X-Series or rusEFI Wideband
-! 'enableAemXSeries' is the 32nd bit here, you would need another bit region if more bits are desired
+	bit useTableForDfcoMap,"Table","Fixed";Fixed: MAP threshold cut fuel when conditions are met\nTable: Use a curve to vary the MAP threshold based on engine RPM
+
 
 	brain_input_pin_e[LOGIC_ANALYZER_CHANNEL_COUNT iterate] logicAnalyzerPins;
 
@@ -1248,11 +1249,7 @@ tChargeMode_e tChargeMode;
 	int16_t coastingFuelCutClt;Fuel cutoff is disabled when the engine is cold.;"C", 1, 0, -100, 100, 0
 
 	int16_t pidExtraForLowRpm;Increases PID reaction for RPM<target by adding extra percent to PID-error;"%", 1, 0, 0, 100, 0
-	bit useTableForDfcoMap,"Table","Fixed";Fixed: MAP threshold cut fuel when conditions are met\nTable: Use a curve to vary the MAP threshold based on engine RPM
-	uint8_t[DFCO_RPM_MAP_TABLE] autoscale dfcoMapRpmValuesBins;;"RPM", 100, 0, 0, 17500, 0
-	uint8_t[DFCO_RPM_MAP_TABLE] autoscale dfcoMapRpmValues;DFCO will activate when operating below this curve. Used to allow a higher threshold at low RPM where less vaccuum is generated;"MAP", 1, 0, 0, 50, 0
 	int16_t coastingFuelCutMap;MAP value above which fuel injection is re-enabled.;"kPa", 1, 0, 0, 250, 0
-
 
 	linear_sensor_s highPressureFuel;
 	linear_sensor_s lowPressureFuel;
@@ -1732,6 +1729,9 @@ uint8_t[DWELL_CURVE_SIZE] autoscale dwellVoltageCorrValues;;"multiplier", 0.02,
 uint8_t[8] autoscale minimumOilPressureBins;;"RPM", 100, 0, 0, 25000, 0
 uint8_t[8] autoscale minimumOilPressureValues;;"kPa", 10, 0, 0, 1000, 0
 
+uint8_t[DFCO_RPM_MAP_TABLE] autoscale dfcoMapRpmValuesBins;;"RPM", 100, 0, 0, 17500, 0
+uint8_t[DFCO_RPM_MAP_TABLE] autoscale dfcoMapRpmValues;DFCO will activate when operating below this curve. Used to allow a higher threshold at low RPM where less vaccuum is generated;"MAP", 1, 0, 0, 50, 0
+
 end_struct
 
 ! Pedal Position Sensor