remove "plain MAP" mode (#1398)

* consumers

* enums, input, config

* java

* default config cleanup

firmware/config/engines/GY6_139QMB.cpp

@@ -20,62 +20,12 @@
 
 EXTERN_CONFIG;
 
-static const fuel_table_t default_139qmb_fuel_table = {
-
-{ 6.000000, 6.000000, 6.000000, 6.000000, 6.000000, 6.000000, 6.000000,
-		6.000000, 6.000000, 6.000000, 6.000000, 6.000000, 6.000000, 6.000000,
-		6.000000, 6.000000 }, { 6.000000, 6.000000, 6.000000, 6.000000,
-		6.000000, 6.000000, 6.000000, 6.000000, 6.000000, 6.000000, 6.000000,
-		6.000000, 6.000000, 6.000000, 6.000000, 6.000000 }, { 6.000000,
-		6.000000, 6.000000, 6.000000, 6.000000, 6.000000, 6.000000, 6.000000,
-		6.000000, 6.000000, 6.000000, 6.000000, 6.000000, 6.000000, 6.000000,
-		6.000000 }, { 6.000000, 6.000000, 6.000000, 6.000000, 6.000000,
-		6.000000, 6.000000, 6.000000, 6.000000, 6.000000, 6.000000, 6.000000,
-		6.000000, 6.000000, 6.000000, 6.000000 }, { 6.000000, 6.000000,
-		6.000000, 6.000000, 6.000000, 6.000000, 6.000000, 6.000000, 6.000000,
-		6.000000, 6.000000, 6.000000, 6.000000, 6.000000, 6.000000, 6.000000 },
-		{ 6.000000, 6.000000, 6.000000, 6.000000, 6.000000, 6.000000, 6.000000,
-				6.000000, 6.000000, 6.000000, 6.000000, 6.000000, 6.000000,
-				6.000000, 6.000000, 6.000000 }, { 6.000000, 6.000000, 6.000000,
-				6.000000, 6.000000, 6.000000, 6.000000, 6.000000, 6.000000,
-				6.000000, 6.000000, 6.000000, 6.000000, 6.000000, 6.000000,
-				6.000000 }, { 6.000000, 6.000000, 6.000000, 6.000000, 6.000000,
-				6.000000, 6.000000, 6.000000, 6.000000, 6.000000, 6.000000,
-				6.000000, 6.000000, 6.000000, 6.000000, 6.000000 }, { 6.000000,
-				6.000000, 6.000000, 6.000000, 6.000000, 6.000000, 6.000000,
-				6.000000, 6.000000, 6.000000, 6.000000, 6.000000, 6.000000,
-				6.000000, 6.000000, 6.000000 }, { 6.000000, 6.000000, 6.000000,
-				6.000000, 6.000000, 6.000000, 6.000000, 6.000000, 6.000000,
-				6.000000, 6.000000, 6.000000, 6.000000, 6.000000, 6.000000,
-				6.000000 }, { 6.000000, 6.000000, 6.000000, 6.000000, 6.000000,
-				6.000000, 6.000000, 6.000000, 6.000000, 6.000000, 6.000000,
-				6.000000, 6.000000, 6.000000, 6.000000, 6.000000 }, { 6.000000,
-				6.000000, 6.000000, 6.000000, 6.000000, 6.000000, 6.000000,
-				6.000000, 6.000000, 6.000000, 6.000000, 6.000000, 6.000000,
-				6.000000, 6.000000, 6.000000 }, { 6.000000, 6.000000, 6.000000,
-				6.000000, 6.000000, 6.000000, 6.000000, 6.000000, 6.000000,
-				6.000000, 6.000000, 6.000000, 6.000000, 6.000000, 6.000000,
-				6.000000 }, { 6.000000, 6.000000, 6.000000, 6.000000, 6.000000,
-				6.000000, 6.000000, 6.000000, 6.000000, 6.000000, 6.000000,
-				6.000000, 6.000000, 6.000000, 6.000000, 6.000000 }, { 6.000000,
-				6.000000, 6.000000, 6.000000, 6.000000, 6.000000, 6.000000,
-				6.000000, 6.000000, 6.000000, 6.000000, 6.000000, 6.000000,
-				6.000000, 6.000000, 6.000000 }, { 6.000000, 6.000000, 6.000000,
-				6.000000, 6.000000, 6.000000, 6.000000, 6.000000, 6.000000,
-				6.000000, 6.000000, 6.000000, 6.000000, 6.000000, 6.000000,
-				6.000000 }
-
-};
-
 static void setDefault139qmbMaps(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
 
 	setFuelLoadBin(1.2, 4.4 PASS_CONFIG_PARAMETER_SUFFIX);
 	setFuelRpmBin(1000, 11000 PASS_CONFIG_PARAMETER_SUFFIX);
 	setTimingLoadBin(1.2, 4.4 PASS_CONFIG_PARAMETER_SUFFIX);
 	setTimingRpmBin(1000, 11000 PASS_CONFIG_PARAMETER_SUFFIX);
-
-	copyFuelTable(default_139qmb_fuel_table, config->fuelTable);
-	//copyTimingTable(default_139qmb_timing_table, config->ignitionTable);
 }
 
 void setGy6139qmbDefaultEngineConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
@@ -87,7 +37,6 @@ void setGy6139qmbDefaultEngineConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE)
 	engineConfiguration->cranking.rpm = 1100;
 	setTargetRpmCurve(2000 PASS_CONFIG_PARAMETER_SUFFIX);
 	engineConfiguration->analogInputDividerCoefficient = 1;
-	engineConfiguration->fuelAlgorithm = LM_MAP;
 	engineConfiguration->globalTriggerAngleOffset = 45;
 	engineConfiguration->sensorChartMode = SC_MAP;
 	engineConfiguration->specs.displacement = 0.072; // 72cc

firmware/controllers/algo/advance_map.cpp

@@ -368,8 +368,7 @@ float getInitialAdvance(int rpm, float map, float advanceMax) {
  * this method builds a good-enough base timing advance map bases on a number of heuristics
  */
 void buildTimingMap(float advanceMax DECLARE_CONFIG_PARAMETER_SUFFIX) {
-	if (engineConfiguration->fuelAlgorithm != LM_SPEED_DENSITY &&
+	if (engineConfiguration->fuelAlgorithm != LM_SPEED_DENSITY) {
-			engineConfiguration->fuelAlgorithm != LM_MAP) {
 		warning(CUSTOM_WRONG_ALGORITHM, "wrong algorithm for MAP-based timing");
 		return;
 	}

firmware/controllers/algo/auto_generated_enums.cpp

@@ -660,8 +660,6 @@ case Force_4_bytes_size_engine_load_mode:
   return "Force_4_bytes_size_engine_load_mode";
 case LM_ALPHA_N:
   return "LM_ALPHA_N";
-case LM_MAP:
-  return "LM_MAP";
 case LM_PLAIN_MAF:
   return "LM_PLAIN_MAF";
 case LM_REAL_MAF:

firmware/controllers/algo/rusefi_enums.h

@@ -405,10 +405,6 @@ typedef enum {
 	 * Throttle Position Sensor value is used as engine load. http://en.wikipedia.org/wiki/Throttle_position_sensor
 	 */
 	LM_ALPHA_N = 1,
-	/**
-	 * raw Manifold Absolute Pressure sensor value is used as engine load http://en.wikipedia.org/wiki/MAP_sensor
-	 */
-	LM_MAP = 2,
 	/**
 	 * Speed Density algorithm - Engine Load is a function of MAP, VE and target AFR
 	 * http://articles.sae.org/8539/

firmware/controllers/math/engine_math.cpp

@@ -65,9 +65,6 @@ float getEngineLoadT(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
 		}
 		return getMafVoltage(PASS_ENGINE_PARAMETER_SIGNATURE);
 	case LM_SPEED_DENSITY:
-		// SD engine load is used for timing lookup but not for fuel calculation,
-		// so fall thru to the MAP case.
-	case LM_MAP:
 		return getMap(PASS_ENGINE_PARAMETER_SIGNATURE);
 	case LM_ALPHA_N:
 		return Sensor::get(SensorType::Tps1).value_or(0);

firmware/integration/rusefi_config.txt

@@ -447,7 +447,7 @@ int sensorSnifferRpmThreshold;+Disable sensor sniffer above this rpm;"RPM",
 	int rpmHardLimit;set rpm_hard_limit X;"rpm",    1,      0,       0, 20000.0,        2
 
 
-#define engine_load_mode_e_enum "MAF", "Alpha-N/TPS", "MAP", "SPEED DENSITY", "MAF Air Charge" 
+#define engine_load_mode_e_enum "MAF", "Alpha-N/TPS", "INVALID", "SPEED DENSITY", "MAF Air Charge" 
 
 
 custom engine_load_mode_e 4 bits, U32, @OFFSET@, [0:7], @@engine_load_mode_e_enum@@

firmware/tunerstudio/rusefi.input

@@ -366,7 +366,6 @@ fileVersion = { @@TS_FILE_VERSION@@ }
 ; todo: generate this section programatically
 	LM_PLAIN_MAF = {0},
 	LM_ALPHA_N = {1},
-	LM_MAP = {2},
 	LM_SPEED_DENSITY = {3},
 	LM_REAL_MAF = {4}
 

java_console/ui/src/com/rusefi/ui/FormulasPane.java

@@ -94,7 +94,6 @@ public class FormulasPane {
     enum engine_load_mode_e {
         LM_PLAIN_MAF("Plain MAF"),
         LM_ALPHA_N("Alpha-N/TPS"),
-        LM_MAP("Plain MAP"),
         LM_SPEED_DENSITY("Speed Density/MAP"),
         LM_REAL_MAF("MAF");