diff --git a/firmware/config/engines/mazda_miata_vvt.cpp b/firmware/config/engines/mazda_miata_vvt.cpp index fe813ce177..9a7657abf4 100644 --- a/firmware/config/engines/mazda_miata_vvt.cpp +++ b/firmware/config/engines/mazda_miata_vvt.cpp @@ -439,6 +439,27 @@ void setMazdaMiata2003EngineConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) { engineConfiguration->etb.dFactor = 0; engineConfiguration->etb.offset = 0; + engineConfiguration->cranking.baseFuel = 1; + config->crankingFuelCoef[0] = 28; // base cranking fuel adjustment coefficient + config->crankingFuelBins[0] = -20; // temperature in C + config->crankingFuelCoef[1] = 22; + config->crankingFuelBins[1] = -10; + config->crankingFuelCoef[2] = 18; + config->crankingFuelBins[2] = 5; + config->crankingFuelCoef[3] = 15; + config->crankingFuelBins[3] = 30; + + config->crankingFuelCoef[4] = 10; + config->crankingFuelBins[4] = 35; + config->crankingFuelCoef[5] = 10; + config->crankingFuelBins[5] = 50; + config->crankingFuelCoef[6] = 10; + config->crankingFuelBins[6] = 65; + config->crankingFuelCoef[7] = 10; + config->crankingFuelBins[7] = 90; + +// engineConfiguration->crankingIACposition = 65; + } /** diff --git a/firmware/controllers/actuators/idle_thread.cpp b/firmware/controllers/actuators/idle_thread.cpp index 122d9b43e3..168f9d187c 100644 --- a/firmware/controllers/actuators/idle_thread.cpp +++ b/firmware/controllers/actuators/idle_thread.cpp @@ -596,6 +596,11 @@ void startIdleThread(Logging*sharedLogger DECLARE_ENGINE_PARAMETER_SUFFIX) { DISPLAY(DISPLAY_CONFIG(IDLERPMPID_DFACTOR)); DISPLAY(DISPLAY_CONFIG(IDLERPMPID_OFFSET)); + + DISPLAY_TEXT(eol); + DISPLAY_TEXT(ETB_Idle); + DISPLAY_STATE(Engine) + DISPLAY(DISPLAY_FIELD(etbIdleAddition)); /* DISPLAY_ELSE */ DISPLAY_TEXT(Manual_idle_control); /* DISPLAY_ENDIF */ diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 1de9076681..39ef4bb296 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -1088,7 +1088,7 @@ float[CLT_CURVE_SIZE] cltFuelCorr;;"ratio", 1, 0, 0.0, 5.0, 2 float[IAT_CURVE_SIZE] iatFuelCorrBins;;"C", 1, 0, -100.0, 250.0, 2 float[IAT_CURVE_SIZE] iatFuelCorr;;"ratio", 1, 0, 0.0, 5.0, 2 - float[CRANKING_CURVE_SIZE] crankingFuelCoef;;"ratio", 1, 0, 0.1, 5.0, 2 + float[CRANKING_CURVE_SIZE] crankingFuelCoef;;"ratio", 1, 0, 0.1, 50.0, 2 float[CRANKING_CURVE_SIZE] crankingFuelBins;;"C", 1, 0, -80.0, 170.0, 2 float[CRANKING_CURVE_SIZE] crankingCycleCoef;;"ratio", 1, 0, 0.0, 5.0, 2 diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index 2cfb7ed6ea..a3fbbe6745 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.ini @@ -82,7 +82,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Tue Sep 24 18:34:53 EDT 2019 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Wed Sep 25 22:46:02 EDT 2019 pageSize = 20000 page = 1 @@ -922,7 +922,7 @@ page = 1 cltFuelCorr = array, F32, 10336, [16], "ratio", 1, 0, 0.0, 5.0, 2 iatFuelCorrBins = array, F32, 10400, [16], "C", 1, 0, -100.0, 250.0, 2 iatFuelCorr = array, F32, 10464, [16], "ratio", 1, 0, 0.0, 5.0, 2 - crankingFuelCoef = array, F32, 10528, [8], "ratio", 1, 0, 0.1, 5.0, 2 + crankingFuelCoef = array, F32, 10528, [8], "ratio", 1, 0, 0.1, 50.0, 2 crankingFuelBins = array, F32, 10560, [8], "C", 1, 0, -80.0, 170.0, 2 crankingCycleCoef = array, F32, 10592, [8], "ratio", 1, 0, 0.0, 5.0, 2 crankingCycleBins = array, F32, 10624, [8], "counter", 1, 0, -80.0, 170.0, 0 diff --git a/firmware/tunerstudio/rusefi_frankenso.ini b/firmware/tunerstudio/rusefi_frankenso.ini index 23a5ce55bb..2b804d893d 100644 --- a/firmware/tunerstudio/rusefi_frankenso.ini +++ b/firmware/tunerstudio/rusefi_frankenso.ini @@ -82,7 +82,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Tue Sep 24 18:34:58 EDT 2019 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Wed Sep 25 22:46:10 EDT 2019 pageSize = 20000 page = 1 @@ -922,7 +922,7 @@ page = 1 cltFuelCorr = array, F32, 10336, [16], "ratio", 1, 0, 0.0, 5.0, 2 iatFuelCorrBins = array, F32, 10400, [16], "C", 1, 0, -100.0, 250.0, 2 iatFuelCorr = array, F32, 10464, [16], "ratio", 1, 0, 0.0, 5.0, 2 - crankingFuelCoef = array, F32, 10528, [8], "ratio", 1, 0, 0.1, 5.0, 2 + crankingFuelCoef = array, F32, 10528, [8], "ratio", 1, 0, 0.1, 50.0, 2 crankingFuelBins = array, F32, 10560, [8], "C", 1, 0, -80.0, 170.0, 2 crankingCycleCoef = array, F32, 10592, [8], "ratio", 1, 0, 0.0, 5.0, 2 crankingCycleBins = array, F32, 10624, [8], "counter", 1, 0, -80.0, 170.0, 0 diff --git a/firmware/tunerstudio/rusefi_microrusefi.ini b/firmware/tunerstudio/rusefi_microrusefi.ini index c4e93b4947..2da230f934 100644 --- a/firmware/tunerstudio/rusefi_microrusefi.ini +++ b/firmware/tunerstudio/rusefi_microrusefi.ini @@ -82,7 +82,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Tue Sep 24 18:34:55 EDT 2019 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Wed Sep 25 22:46:06 EDT 2019 pageSize = 20000 page = 1 @@ -922,7 +922,7 @@ page = 1 cltFuelCorr = array, F32, 10336, [16], "ratio", 1, 0, 0.0, 5.0, 2 iatFuelCorrBins = array, F32, 10400, [16], "C", 1, 0, -100.0, 250.0, 2 iatFuelCorr = array, F32, 10464, [16], "ratio", 1, 0, 0.0, 5.0, 2 - crankingFuelCoef = array, F32, 10528, [8], "ratio", 1, 0, 0.1, 5.0, 2 + crankingFuelCoef = array, F32, 10528, [8], "ratio", 1, 0, 0.1, 50.0, 2 crankingFuelBins = array, F32, 10560, [8], "C", 1, 0, -80.0, 170.0, 2 crankingCycleCoef = array, F32, 10592, [8], "ratio", 1, 0, 0.0, 5.0, 2 crankingCycleBins = array, F32, 10624, [8], "counter", 1, 0, -80.0, 170.0, 0 diff --git a/firmware/tunerstudio/rusefi_prometheus.ini b/firmware/tunerstudio/rusefi_prometheus.ini index a53fe7b2c7..964d2bd598 100644 --- a/firmware/tunerstudio/rusefi_prometheus.ini +++ b/firmware/tunerstudio/rusefi_prometheus.ini @@ -82,7 +82,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Tue Sep 24 18:35:00 EDT 2019 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Wed Sep 25 22:46:14 EDT 2019 pageSize = 20000 page = 1 @@ -922,7 +922,7 @@ page = 1 cltFuelCorr = array, F32, 10336, [16], "ratio", 1, 0, 0.0, 5.0, 2 iatFuelCorrBins = array, F32, 10400, [16], "C", 1, 0, -100.0, 250.0, 2 iatFuelCorr = array, F32, 10464, [16], "ratio", 1, 0, 0.0, 5.0, 2 - crankingFuelCoef = array, F32, 10528, [8], "ratio", 1, 0, 0.1, 5.0, 2 + crankingFuelCoef = array, F32, 10528, [8], "ratio", 1, 0, 0.1, 50.0, 2 crankingFuelBins = array, F32, 10560, [8], "C", 1, 0, -80.0, 170.0, 2 crankingCycleCoef = array, F32, 10592, [8], "ratio", 1, 0, 0.0, 5.0, 2 crankingCycleBins = array, F32, 10624, [8], "counter", 1, 0, -80.0, 170.0, 0 diff --git a/java_console/models/src/com/rusefi/core/Sensor.java b/java_console/models/src/com/rusefi/core/Sensor.java index 8cf0165b2e..fa6517d7b9 100644 --- a/java_console/models/src/com/rusefi/core/Sensor.java +++ b/java_console/models/src/com/rusefi/core/Sensor.java @@ -99,6 +99,11 @@ public enum Sensor { debugIntField4("debug i4", SensorCategory.DEBUG, FieldType.INT16, 292, BackgroundColor.MUD, 0, 5), debugIntField5("debug i5", SensorCategory.DEBUG, FieldType.INT16, 294, BackgroundColor.MUD, 0, 5), + + etbTarget(GAUGE_NAME_ETB_TARGET, SensorCategory.OTHERS, FieldType.FLOAT, 312, BackgroundColor.MUD), + etb1DutyCycle(GAUGE_NAME_ETB_DUTY, SensorCategory.OTHERS, FieldType.FLOAT, 316, BackgroundColor.MUD), + etb1Error(GAUGE_NAME_ETB_ERROR, SensorCategory.OTHERS, FieldType.FLOAT, 320, BackgroundColor.MUD), + ; private final String name; diff --git a/java_console/ui/src/com/rusefi/Launcher.java b/java_console/ui/src/com/rusefi/Launcher.java index de13b3d1c8..1aac95a856 100644 --- a/java_console/ui/src/com/rusefi/Launcher.java +++ b/java_console/ui/src/com/rusefi/Launcher.java @@ -48,7 +48,7 @@ import static com.rusefi.ui.storage.PersistentConfiguration.getConfig; * @see EngineSnifferPanel */ public class Launcher { - public static final int CONSOLE_VERSION = 20190922; + public static final int CONSOLE_VERSION = 20190925; public static final String INI_FILE_PATH = System.getProperty("ini_file_path", ".."); public static final String INPUT_FILES_PATH = System.getProperty("input_files_path", ".."); public static final String TOOLS_PATH = System.getProperty("tools_path", "."); diff --git a/java_console/ui/src/com/rusefi/ldmp/generated/IdleThreadMeta.java b/java_console/ui/src/com/rusefi/ldmp/generated/IdleThreadMeta.java index 372efc58bd..64e9b87722 100644 --- a/java_console/ui/src/com/rusefi/ldmp/generated/IdleThreadMeta.java +++ b/java_console/ui/src/com/rusefi/ldmp/generated/IdleThreadMeta.java @@ -31,6 +31,9 @@ public class IdleThreadMeta { new ConfigRequest("IDLERPMPID_IFACTOR"), new ConfigRequest("IDLERPMPID_DFACTOR"), new ConfigRequest("IDLERPMPID_OFFSET"), + new TextRequest("eol"), + new TextRequest("ETB_Idle"), + new FieldRequest("Engine", "etbIdleAddition"), }, new Request[]{ new TextRequest("Manual_idle_control"),