diff --git a/generated/controllers/generated/engine_configuration_generated_structures_XYZ.h b/generated/controllers/generated/engine_configuration_generated_structures_XYZ.h index 8b85369..7a9dda9 100644 --- a/generated/controllers/generated/engine_configuration_generated_structures_XYZ.h +++ b/generated/controllers/generated/engine_configuration_generated_structures_XYZ.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Thu Jun 06 03:37:22 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sun Jun 09 16:39:48 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -2168,9 +2168,10 @@ struct engine_configuration_s { */ int launchRpmWindow; /** + * units: ms * offset 988 */ - int unusedHere12; + float triggerEventsTimeoutMs; /** * offset 992 */ @@ -4917,26 +4918,21 @@ struct persistent_config_s { * offset 13992 */ float crankingFuelBins[CRANKING_CURVE_SIZE]; - /** - * units: ratio - * offset 14024 - */ - float crankingCycleCoef[CRANKING_CURVE_SIZE]; /** * units: counter - * offset 14056 + * offset 14024 */ float crankingCycleBins[CRANKING_CURVE_SIZE]; /** * units: C - * offset 14088 + * offset 14056 */ int16_t crankingCycleFuelCltBins[CRANKING_CYCLE_CLT_SIZE]; /** * units: mult - * offset 14096 + * offset 14064 */ - float crankingCycleFuelCoef[CRANKING_ENRICH_COUNT][CRANKING_CYCLE_CLT_SIZE]; + float crankingCycleFuelCoef[CRANKING_CYCLE_CLT_SIZE][CRANKING_CURVE_SIZE]; /** * CLT-based idle position multiplier for simple manual idle controller * units: C @@ -5638,4 +5634,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22748); // end -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Thu Jun 06 03:37:22 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sun Jun 09 16:39:48 UTC 2024 diff --git a/generated/controllers/generated/rusefi_generated_XYZ.h b/generated/controllers/generated/rusefi_generated_XYZ.h index 306ef09..2a68bd2 100644 --- a/generated/controllers/generated/rusefi_generated_XYZ.h +++ b/generated/controllers/generated/rusefi_generated_XYZ.h @@ -1272,7 +1272,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 394576763 +#define SIGNATURE_HASH 3936755653 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1662,7 +1662,7 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI main.2024.06.08.XYZ.394576763" +#define TS_SIGNATURE "rusEFI main.2024.06.09.XYZ.3936755653" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/generated/controllers/generated/signature_XYZ.h b/generated/controllers/generated/signature_XYZ.h index 8847344..6076a04 100644 --- a/generated/controllers/generated/signature_XYZ.h +++ b/generated/controllers/generated/signature_XYZ.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 394576763 -#define TS_SIGNATURE "rusEFI main.2024.06.08.XYZ.394576763" +#define SIGNATURE_HASH 3936755653 +#define TS_SIGNATURE "rusEFI main.2024.06.09.XYZ.3936755653" diff --git a/generated/tunerstudio/generated/rusefi_XYZ.ini b/generated/tunerstudio/generated/rusefi_XYZ.ini index 2f23ccf..9a1a782 100644 --- a/generated/tunerstudio/generated/rusefi_XYZ.ini +++ b/generated/tunerstudio/generated/rusefi_XYZ.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI main.2024.06.08.XYZ.394576763" + signature = "rusEFI main.2024.06.09.XYZ.3936755653" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI main.2024.06.08.XYZ.394576763" ; signature is expected to be 7 or more characters. + signature= "rusEFI main.2024.06.09.XYZ.3936755653" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sat Jun 08 16:40:34 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sun Jun 09 16:39:48 UTC 2024 pageSize = 22748 page = 1 @@ -537,7 +537,7 @@ tpsAccelLookback = scalar, U08, 978, "sec", 0.05, 0, 0, 5, 2 noFuelTrimAfterDfcoTime = scalar, U08, 979, "sec", 0.1, 0, 0, 10, 1 launchSpeedThreshold = scalar, S32, 980, "Kph", 1, 0, 0, 300, 0 launchRpmWindow = scalar, S32, 984, "RPM", 1, 0, 0, 8000, 0 -unusedHere12 = scalar, S32, 988, "", 1, 0, 0, 100, 0 +triggerEventsTimeoutMs = scalar, F32, 988, "ms", 1, 0, 0, 3, 3 unusedHere13 = scalar, S32, 992, "", 1, 0, 0, 100, 0 magicNumberAvailableForDevTricks = scalar, F32, 996, "", 1, 0, 0, 100, 0 turbochargerFilter = scalar, F32, 1000, "", 1, 0, 0, 100, 0 @@ -1433,10 +1433,9 @@ iatFuelCorrBins = array, F32, 13832, [16], "C", 1, 0, -100, 250, 2 iatFuelCorr = array, F32, 13896, [16], "ratio", 1, 0, 0, 5, 2 crankingFuelCoef = array, F32, 13960, [8], "ratio", 1, 0, 0, 50, 2 crankingFuelBins = array, F32, 13992, [8], "C", 1, 0, -80, 250, 2 -crankingCycleCoef = array, F32, 14024, [8], "ratio", 1, 0, 0, 5, 2 -crankingCycleBins = array, F32, 14056, [8], "counter", 1, 0, -80, 170, 0 -crankingCycleFuelCltBins = array, S16, 14088, [4], "C", 1, 0, -100, 250, 2 -crankingCycleFuelCoef = array, F32, 14096, [4x6], "mult", 1, 0, 1, 3, 2 +crankingCycleBins = array, F32, 14024, [8], "counter", 1, 0, -80, 170, 0 +crankingCycleFuelCltBins = array, S16, 14056, [4], "C", 1, 0, -100, 250, 2 +crankingCycleFuelCoef = array, F32, 14064, [8x4], "mult", 1, 0, 0, 5, 2 cltIdleCorrBins = array, F32, 14192, [16], "C", 1, 0, -100, 250, 2 cltIdleCorr = array, F32, 14256, [16], "ratio", 1, 0, 0, 10, 2 mafDecoding = array, F32, 14320, [32], "kg/hour", 1, 0, -500, 4000, 2 @@ -3774,14 +3773,6 @@ lambdaTimeSinceGood = scalar, U16, 1744, "sec", 0.01, 0 yBins = crankingTpsCoef gauge = TPSGauge - curve = crankingDurationCurve, "Cranking Cycle Multiplier" - columnLabel = "Engine Cycle", "Multiplier" - xAxis = 0, 50, 11 - yAxis = 0, 5, 6 - xBins = crankingCycleBins - yBins = crankingCycleCoef - - curve = cltIdleCurve, "Warmup Idle multiplier" columnLabel = "Coolant", "Multiplier" xAxis = -40, 120, 10 @@ -5964,7 +5955,6 @@ menuDialog = main subMenu = crankingCltCurve, "Fuel CLT multiplier" subMenu = crankingCltCurveE100, "Fuel CLT multiplier (Flex Fuel E85)", 0, { flexSensorPin != 0 && flexCranking } - subMenu = crankingDurationCurve, "Fuel duration multiplier" subMenu = crankingCycleFuelMultTbl, "Fuel duration multiplier" subMenu = crankingTpsCurve, "Fuel TPS multiplier" subMenu = std_separator @@ -9399,6 +9389,7 @@ dialog = tcuControls, "Transmission Settings" field = brakeMeanEffectivePressureDifferential, brakeMeanEffectivePressureDifferential dialog = parkingLot3, "Experimental 3" + field = triggerEventsTimeoutMs, triggerEventsTimeoutMs field = devBit0, devBit0 field = devBit1, devBit1 field = devBit2, devBit2