diff --git a/firmware/config/engines/dodge_neon.cpp b/firmware/config/engines/dodge_neon.cpp index b92663db21..d33633c9f7 100644 --- a/firmware/config/engines/dodge_neon.cpp +++ b/firmware/config/engines/dodge_neon.cpp @@ -499,12 +499,10 @@ void setDodgeNeonNGCEngineConfiguration(DECLARE_ENGINE_PARAMETER_F) { engineConfiguration->tpsAccelLength = 12; engineConfiguration->tpsAccelEnrichmentThreshold = 10; - engineConfiguration->tpsAccelEnrichmentMultiplier = 0.15; engineConfiguration->suckedOffCoef = 0.05; engineConfiguration->addedToWallCoef = 0.40; - engineConfiguration->tpsAccelEnrichmentMultiplier = 0; engineConfiguration->suckedOffCoef = 0; engineConfiguration->addedToWallCoef = 0; diff --git a/firmware/config/engines/ford_festiva.cpp b/firmware/config/engines/ford_festiva.cpp index 7bf6f05fc2..fb83cb58bf 100644 --- a/firmware/config/engines/ford_festiva.cpp +++ b/firmware/config/engines/ford_festiva.cpp @@ -281,7 +281,6 @@ void setFordEscortGt(DECLARE_ENGINE_PARAMETER_F) { engineConfiguration->tpsAccelEnrichmentThreshold = 40; - engineConfiguration->tpsAccelEnrichmentMultiplier = 0.0; engineConfiguration->engineLoadAccelEnrichmentThreshold = 5.0; engineConfiguration->engineLoadAccelEnrichmentMultiplier = 1; diff --git a/firmware/config/engines/mazda_626.cpp b/firmware/config/engines/mazda_626.cpp index 8a1970c5d8..f5e4d840e2 100644 --- a/firmware/config/engines/mazda_626.cpp +++ b/firmware/config/engines/mazda_626.cpp @@ -92,7 +92,6 @@ void setMazda626EngineConfiguration(DECLARE_ENGINE_PARAMETER_F) { engineConfiguration->tpsAccelLength = 12; engineConfiguration->tpsAccelEnrichmentThreshold = 10; - engineConfiguration->tpsAccelEnrichmentMultiplier = 0.06; // todo engineConfiguration->afr.hwChannel = EFI_ADC_3; diff --git a/firmware/controllers/algo/accel_enrichment.cpp b/firmware/controllers/algo/accel_enrichment.cpp index e950f4b3e9..fc1383d048 100644 --- a/firmware/controllers/algo/accel_enrichment.cpp +++ b/firmware/controllers/algo/accel_enrichment.cpp @@ -202,7 +202,7 @@ static void accelInfo() { scheduleMsg(logger, "EL decel th=%f/mult=%f", engineConfiguration->engineLoadDecelEnleanmentThreshold, engineConfiguration->engineLoadDecelEnleanmentMultiplier); // scheduleMsg(logger, "TPS accel length=%d", tpsInstance.cb.getSize()); - scheduleMsg(logger, "TPS accel th=%f/mult=%f", engineConfiguration->tpsAccelEnrichmentThreshold, engineConfiguration->tpsAccelEnrichmentMultiplier); + scheduleMsg(logger, "TPS accel th=%f/mult=%f", engineConfiguration->tpsAccelEnrichmentThreshold, -1); scheduleMsg(logger, "added to wall=%f/sucked=%f", engineConfiguration->addedToWallCoef, engineConfiguration->suckedOffCoef); } @@ -222,11 +222,6 @@ static void setTpsAccelThr(float value) { accelInfo(); } -static void setTpsAccelMult(float value) { - engineConfiguration->tpsAccelEnrichmentMultiplier = value; - accelInfo(); -} - static void setTpsDecelThr(float value) { engineConfiguration->tpsDecelEnleanmentThreshold = value; accelInfo(); @@ -280,7 +275,7 @@ void initAccelEnrichment(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_S) { #if ! EFI_UNIT_TEST || defined(__DOXYGEN__) addConsoleActionI("set_tps_accel_len", setTpsAccelLen); addConsoleActionF("set_tps_accel_threshold", setTpsAccelThr); - addConsoleActionF("set_tps_accel_multiplier", setTpsAccelMult); + //addConsoleActionF("set_tps_accel_multiplier", setTpsAccelMult); addConsoleActionF("set_tps_decel_threshold", setTpsDecelThr); addConsoleActionF("set_tps_decel_multiplier", setTpsDecelMult); diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index 52ce9f77d7..af2d63d4f5 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -782,7 +782,6 @@ void setDefaultConfiguration(DECLARE_ENGINE_PARAMETER_F) { engineConfiguration->tpsAccelLength = 12; engineConfiguration->tpsAccelEnrichmentThreshold = 40; // TPS % change, per engine cycle - engineConfiguration->tpsAccelEnrichmentMultiplier = 0.05; } void resetConfigurationExt(Logging * logger, engine_type_e engineType DECLARE_ENGINE_PARAMETER_S) { diff --git a/firmware/controllers/algo/engine_configuration_generated_structures.h b/firmware/controllers/algo/engine_configuration_generated_structures.h index 023b4c23e2..47b25d31b0 100644 --- a/firmware/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Aug 28 15:53:30 EDT 2016 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Sep 11 20:11:57 EDT 2016 // begin #ifndef ENGINE_CONFIGURATION_GENERATED_H_ #define ENGINE_CONFIGURATION_GENERATED_H_ @@ -1532,7 +1532,7 @@ typedef struct { /** * offset 2192 */ - float tpsAccelEnrichmentMultiplier; + float unused213; /** * offset 2196 */ @@ -1930,4 +1930,4 @@ typedef struct { #endif // end -// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Aug 28 15:53:30 EDT 2016 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Sep 11 20:11:57 EDT 2016 diff --git a/firmware/controllers/algo/rusefi_generated.h b/firmware/controllers/algo/rusefi_generated.h index 9a135a4076..7afcd909c6 100644 --- a/firmware/controllers/algo/rusefi_generated.h +++ b/firmware/controllers/algo/rusefi_generated.h @@ -781,8 +781,8 @@ #define tpsAccelLength_offset 2184 #define tpsAccelLength_offset_hex 888 #define tpsAccelEnrichmentThreshold_offset 2188 -#define tpsAccelEnrichmentMultiplier_offset 2192 -#define tpsAccelEnrichmentMultiplier_offset_hex 890 +#define unused213_offset 2192 +#define unused213_offset_hex 890 #define engineLoadAccelLength_offset 2196 #define engineLoadAccelLength_offset_hex 894 #define engineLoadDecelEnleanmentThreshold_offset 2200 diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 0496108657..e5f265cba2 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -685,7 +685,7 @@ baro_corr_table_t baroCorrTable; int tpsAccelLength;;"cycles", 1, 0, 1, 200, 0 float tpsAccelEnrichmentThreshold;;"roc", 1, 0, 0, 200, 3 - float tpsAccelEnrichmentMultiplier;;"coeff", 1, 0, 0, 200, 3 + float unused213;;"coeff", 1, 0, 0, 200, 3 int engineLoadAccelLength;;"cycles", 1, 0, 1, 200, 0 diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index 51e01cb5e2..47a1fe7a37 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.ini @@ -42,7 +42,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Thu Sep 08 15:38:36 EDT 2016 +; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Sep 11 20:11:57 EDT 2016 pageSize = 16376 page = 1 @@ -541,7 +541,7 @@ page = 1 alternatorControl_offset = scalar, F32, 2180, "value", 1, 0, 0, 1000, 3 tpsAccelLength = scalar, S32, 2184, "cycles", 1, 0, 1, 200, 0 tpsAccelEnrichmentThreshold = scalar, F32, 2188, "roc", 1, 0, 0, 200, 3 - tpsAccelEnrichmentMultiplier = scalar, F32, 2192, "coeff", 1, 0, 0, 200, 3 + unused213 = scalar, F32, 2192, "coeff", 1, 0, 0, 200, 3 engineLoadAccelLength = scalar, S32, 2196, "cycles", 1, 0, 1, 200, 0 engineLoadDecelEnleanmentThreshold = scalar, F32, 2200, "roc", 1, 0, 0, 200, 3 engineLoadDecelEnleanmentMultiplier = scalar, F32, 2204, "coeff", 1, 0, 0, 200, 3 @@ -1320,11 +1320,12 @@ fileVersion = { 20160702 } subMenu = fuelTableTbl, "Fuel Table", 0, {fuelAlgorithm != 3} subMenu = veTableTbl, "VE Table", 0, {fuelAlgorithm == 3} subMenu = afrTableTbl, "Targe AFR Table", 0, {fuelAlgorithm == 3} - subMenu = AccelEnrich, "Accel/Decel Enrichment/Enleanment" subMenu = iatFuelCorrCurve, "Intake air temperature fuel Multiplier" subMenu = injPhaseTableTbl, "Injection Phase" - subMenu = tpsTpsAccelTbl, "TPS/TPS acceleration Multiplier" subMenu = mapAccelTaper, "Engine Load Acceleration Enrichment Taper" + subMenu = std_separator + subMenu = AccelEnrich, "Accel/Decel Enrichment/Enleanment" + subMenu = tpsTpsAccelTbl, "TPS/TPS acceleration Multiplier" subMenu = std_separator subMenu = ignitionTableTbl, "Ignition Table" subMenu = ignitionIatCorrTableTbl, "Ignition Intake Air Temp correction" @@ -1873,24 +1874,23 @@ cmd_test_idle_valve = "w\x00\x17\x00\x01" field = "enable Cylinder Cleanup", isCylinderCleanupEnabled - dialog = EngineLoadAccel, "Engine Load" + dialog = EngineLoadAccelPanel, "Engine Load" field = "Length", engineLoadAccelLength field = "Accel Threshold", engineLoadAccelEnrichmentThreshold field = "Accel Multiplier", engineLoadAccelEnrichmentMultiplier field = "Decel Threshold", engineLoadDecelEnleanmentThreshold field = "Decel Multiplier", engineLoadDecelEnleanmentMultiplier - dialog = TpsAccel, "TPS" + dialog = TpsAccelPanel, "TPS" field = "Length", tpsAccelLength field = "Accel Threshold", tpsAccelEnrichmentThreshold - field = "Accel Multiplier", tpsAccelEnrichmentMultiplier field = "Decel Threshold", tpsDecelEnleanmentThreshold - field = "Decel Multiplier", tpsDecelEnleanmentMultiplier +; field = "Decel Multiplier", tpsDecelEnleanmentMultiplier ; Tuning->AccelEnrichment dialog = AccelEnrich, "Accel/Decel Enrichment" - panel = EngineLoadAccel - panel = TpsAccel + panel = EngineLoadAccelPanel + panel = TpsAccelPanel field = "sucked off wall coefficient", suckedOffCoef field = "added to wall coef", addedToWallCoef diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index 47a4e1e394..17fef18973 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -540,7 +540,6 @@ page = 1 alternatorControl_offset = scalar, F32, 2180, "value", 1, 0, 0, 1000, 3 tpsAccelLength = scalar, S32, 2184, "cycles", 1, 0, 1, 200, 0 tpsAccelEnrichmentThreshold = scalar, F32, 2188, "roc", 1, 0, 0, 200, 3 - tpsAccelEnrichmentMultiplier = scalar, F32, 2192, "coeff", 1, 0, 0, 200, 3 engineLoadAccelLength = scalar, S32, 2196, "cycles", 1, 0, 1, 200, 0 engineLoadDecelEnleanmentThreshold = scalar, F32, 2200, "roc", 1, 0, 0, 200, 3 engineLoadDecelEnleanmentMultiplier = scalar, F32, 2204, "coeff", 1, 0, 0, 200, 3 @@ -1302,11 +1301,12 @@ fileVersion = { 20160702 } subMenu = fuelTableTbl, "Fuel Table", 0, {fuelAlgorithm != 3} subMenu = veTableTbl, "VE Table", 0, {fuelAlgorithm == 3} subMenu = afrTableTbl, "Targe AFR Table", 0, {fuelAlgorithm == 3} - subMenu = AccelEnrich, "Accel/Decel Enrichment/Enleanment" subMenu = iatFuelCorrCurve, "Intake air temperature fuel Multiplier" subMenu = injPhaseTableTbl, "Injection Phase" - subMenu = tpsTpsAccelTbl, "TPS/TPS acceleration Multiplier" subMenu = mapAccelTaper, "Engine Load Acceleration Enrichment Taper" + subMenu = std_separator + subMenu = AccelEnrich, "Accel/Decel Enrichment/Enleanment" + subMenu = tpsTpsAccelTbl, "TPS/TPS acceleration Multiplier" subMenu = std_separator subMenu = ignitionTableTbl, "Ignition Table" subMenu = ignitionIatCorrTableTbl, "Ignition Intake Air Temp correction" @@ -1855,24 +1855,23 @@ cmd_test_idle_valve = "w\x00\x17\x00\x01" field = "enable Cylinder Cleanup", isCylinderCleanupEnabled - dialog = EngineLoadAccel, "Engine Load" + dialog = EngineLoadAccelPanel, "Engine Load" field = "Length", engineLoadAccelLength field = "Accel Threshold", engineLoadAccelEnrichmentThreshold field = "Accel Multiplier", engineLoadAccelEnrichmentMultiplier field = "Decel Threshold", engineLoadDecelEnleanmentThreshold field = "Decel Multiplier", engineLoadDecelEnleanmentMultiplier - dialog = TpsAccel, "TPS" + dialog = TpsAccelPanel, "TPS" field = "Length", tpsAccelLength field = "Accel Threshold", tpsAccelEnrichmentThreshold - field = "Accel Multiplier", tpsAccelEnrichmentMultiplier field = "Decel Threshold", tpsDecelEnleanmentThreshold - field = "Decel Multiplier", tpsDecelEnleanmentMultiplier +; field = "Decel Multiplier", tpsDecelEnleanmentMultiplier ; Tuning->AccelEnrichment dialog = AccelEnrich, "Accel/Decel Enrichment" - panel = EngineLoadAccel - panel = TpsAccel + panel = EngineLoadAccelPanel + panel = TpsAccelPanel field = "sucked off wall coefficient", suckedOffCoef field = "added to wall coef", addedToWallCoef diff --git a/java_console/models/src/com/rusefi/config/Fields.java b/java_console/models/src/com/rusefi/config/Fields.java index c078360785..adb5ad1b0a 100644 --- a/java_console/models/src/com/rusefi/config/Fields.java +++ b/java_console/models/src/com/rusefi/config/Fields.java @@ -1,6 +1,6 @@ package com.rusefi.config; -// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Aug 28 15:53:30 EDT 2016 +// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Sep 11 20:11:57 EDT 2016 public class Fields { public static final int LE_COMMAND_LENGTH = 200; public static final int FSIO_ADC_COUNT = 4; @@ -785,8 +785,8 @@ public class Fields { public static final int tpsAccelLength_offset = 2184; public static final int tpsAccelLength_offset_hex = 888; public static final int tpsAccelEnrichmentThreshold_offset = 2188; - public static final int tpsAccelEnrichmentMultiplier_offset = 2192; - public static final int tpsAccelEnrichmentMultiplier_offset_hex = 890; + public static final int unused213_offset = 2192; + public static final int unused213_offset_hex = 890; public static final int engineLoadAccelLength_offset = 2196; public static final int engineLoadAccelLength_offset_hex = 894; public static final int engineLoadDecelEnleanmentThreshold_offset = 2200; @@ -1446,7 +1446,7 @@ public class Fields { public static final Field ALTERNATORCONTROL_OFFSET = Field.create("ALTERNATORCONTROL_OFFSET", 2180, FieldType.FLOAT); public static final Field TPSACCELLENGTH = Field.create("TPSACCELLENGTH", 2184, FieldType.INT); public static final Field TPSACCELENRICHMENTTHRESHOLD = Field.create("TPSACCELENRICHMENTTHRESHOLD", 2188, FieldType.FLOAT); - public static final Field TPSACCELENRICHMENTMULTIPLIER = Field.create("TPSACCELENRICHMENTMULTIPLIER", 2192, FieldType.FLOAT); + public static final Field UNUSED213 = Field.create("UNUSED213", 2192, FieldType.FLOAT); public static final Field ENGINELOADACCELLENGTH = Field.create("ENGINELOADACCELLENGTH", 2196, FieldType.INT); public static final Field ENGINELOADDECELENLEANMENTTHRESHOLD = Field.create("ENGINELOADDECELENLEANMENTTHRESHOLD", 2200, FieldType.FLOAT); public static final Field ENGINELOADDECELENLEANMENTMULTIPLIER = Field.create("ENGINELOADDECELENLEANMENTMULTIPLIER", 2204, FieldType.FLOAT);