diff --git a/generated/controllers/generated/engine_configuration_generated_structures_XXX.h b/generated/controllers/generated/engine_configuration_generated_structures_XXX.h index 30c02d5..c2f3602 100644 --- a/generated/controllers/generated/engine_configuration_generated_structures_XXX.h +++ b/generated/controllers/generated/engine_configuration_generated_structures_XXX.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 Fri Mar 15 17:16:30 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sun Mar 17 15:44:59 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -2190,11 +2190,11 @@ struct engine_configuration_s { */ int launchSpeedThreshold; /** - * Range from Launch RPM for Timing Retard to activate + * Starting Launch RPM window to activate (subtracts from Launch RPM) * units: RPM * offset 1048 */ - int launchTimingRpmRange; + int launchRpmWindow; /** * Spark Skip Transition Target * units: % @@ -2208,11 +2208,9 @@ struct engine_configuration_s { */ int launchBoostDuty; /** - * Range from Launch RPM to activate Hard Cut - * units: RPM * offset 1060 */ - int hardCutRpmRange; + int unusedIntPadding; /** * offset 1064 */ @@ -2868,8 +2866,9 @@ struct engine_configuration_s { offset 1576 bit 14 */ bool is_enabled_spi_6 : 1 {}; /** + * AEM X-Series EGT gauge kit or rusEFI EGT sensor from Wideband controller offset 1576 bit 15 */ - bool unusedBit_503_15 : 1 {}; + bool enableAemXSeriesEgt : 1 {}; /** offset 1576 bit 16 */ bool unusedBit_503_16 : 1 {}; @@ -5634,4 +5633,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22428); // end -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Fri Mar 15 17:16:30 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sun Mar 17 15:44:59 UTC 2024 diff --git a/generated/controllers/generated/rusefi_generated_XXX.h b/generated/controllers/generated/rusefi_generated_XXX.h index 9e40f8e..8b5c774 100644 --- a/generated/controllers/generated/rusefi_generated_XXX.h +++ b/generated/controllers/generated/rusefi_generated_XXX.h @@ -1188,7 +1188,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 3310179952 +#define SIGNATURE_HASH 935259484 #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" @@ -1557,7 +1557,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 default.2024.03.16.XXX.3310179952" +#define TS_SIGNATURE "rusEFI default.2024.03.17.XXX.935259484" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/generated/controllers/generated/signature_XXX.h b/generated/controllers/generated/signature_XXX.h index a984569..d2b576d 100644 --- a/generated/controllers/generated/signature_XXX.h +++ b/generated/controllers/generated/signature_XXX.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 3310179952 -#define TS_SIGNATURE "rusEFI default.2024.03.16.XXX.3310179952" +#define SIGNATURE_HASH 935259484 +#define TS_SIGNATURE "rusEFI default.2024.03.17.XXX.935259484" diff --git a/generated/tunerstudio/generated/rusefi_XXX.ini b/generated/tunerstudio/generated/rusefi_XXX.ini index 83c589e..d893a27 100644 --- a/generated/tunerstudio/generated/rusefi_XXX.ini +++ b/generated/tunerstudio/generated/rusefi_XXX.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI default.2024.03.16.XXX.3310179952" + signature = "rusEFI default.2024.03.17.XXX.935259484" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI default.2024.03.16.XXX.3310179952" ; signature is expected to be 7 or more characters. + signature= "rusEFI default.2024.03.17.XXX.935259484" ; 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 @@ -99,7 +99,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 Mar 16 17:15:12 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sun Mar 17 15:44:59 UTC 2024 pageSize = 22428 page = 1 @@ -532,10 +532,10 @@ boostPwmFrequency = scalar, S32, 1036, "Hz", 1, 0, 0, 3000, 0 launchActivationMode = bits, S08, 1040, [0:1], "Launch Button", "Clutch Down Switch", "Speed Based", "Brake Pedal" antiLagActivationMode = bits, S08, 1041, [0:0], "Switch Input", "Always Active" launchSpeedThreshold = scalar, S32, 1044, "Kph", 1, 0, 0, 300, 0 -launchTimingRpmRange = scalar, S32, 1048, "RPM", 1, 0, 0, 8000, 0 +launchRpmWindow = scalar, S32, 1048, "RPM", 1, 0, 0, 8000, 0 launchSparkSkipPercent = scalar, S32, 1052, "%", 1, 0, 0, 100, 0 launchBoostDuty = scalar, S32, 1056, "%", 1, 0, 0, 100, 0 -hardCutRpmRange = scalar, S32, 1060, "RPM", 1, 0, 0, 3000, 0 +unusedIntPadding = scalar, S32, 1060, "", 1, 0, 0, 100, 0 turbochargerFilter = scalar, F32, 1064, "", 1, 0, 0, 100, 0 launchTpsThreshold = scalar, S32, 1068, "", 1, 0, 0, 20000, 0 launchActivateDelay = scalar, F32, 1072, "", 1, 0, 0, 20000, 0 @@ -754,6 +754,7 @@ useAuxSpeedForSlipRatio = bits, U32, 1576, [11:11], "false", "true" useVssAsSecondWheelSpeed = bits, U32, 1576, [12:12], "false", "true" is_enabled_spi_5 = bits, U32, 1576, [13:13], "false", "true" is_enabled_spi_6 = bits, U32, 1576, [14:14], "false", "true" +enableAemXSeriesEgt = bits, U32, 1576, [15:15], "false", "true" afterCrankingIACtaperDuration = scalar, S16, 1580, "cycles", 1, 0, 0, 5000, 0 iacByTpsTaper = scalar, S16, 1582, "percent", 1, 0, 0, 500, 0 auxSerialTxPin = bits, U16, 1584, [0:7], $gpio_list @@ -1874,10 +1875,9 @@ injectorStagingRpmBins = array, U16, 22414, [6], "RPM", 1, 0, 0, 18000, 0 boostPid_minValue = "Output Min Duty Cycle" boostPid_maxValue = "Output Max Duty Cycle" launchSpeedThreshold = "Launch disabled above this speed if setting is above zero" - launchTimingRpmRange = "Range from Launch RPM for Timing Retard to activate" + launchRpmWindow = "Starting Launch RPM window to activate (subtracts from Launch RPM)" launchSparkSkipPercent = "Spark Skip Transition Target" launchBoostDuty = "Duty Cycle for the Boost Solenoid" - hardCutRpmRange = "Range from Launch RPM to activate Hard Cut" stft_maxIdleRegionRpm = "Below this RPM, the idle region is active, idle+300 would be a good value" stft_maxOverrunLoad = "Below this engine load, the overrun region is active" stft_minPowerLoad = "Above this engine load, the power region is active" @@ -2006,6 +2006,7 @@ injectorStagingRpmBins = array, U16, 22414, [6], "RPM", 1, 0, 0, 18000, 0 targetVBatt = "This is the target battery voltage the alternator PID control will attempt to maintain" mc33810DisableRecoveryMode = "See Over/Undervoltage Shutdown/Retry bit in documentation" useVssAsSecondWheelSpeed = "VSS and auxSpeed1 or auxSpeed1 with auxSpeed2?" + enableAemXSeriesEgt = "AEM X-Series EGT gauge kit or rusEFI EGT sensor from Wideband controller" afterCrankingIACtaperDuration = "This is the duration in cycles that the IAC will take to reach its normal idle position, it can be used to hold the idle higher for a few seconds after cranking to improve startup.\Should be 100 once tune is better" iacByTpsTaper = "IAC Value added when coasting and transitioning into idle." auxSerialTxPin = "Auxiliary sensor serial, not to be confused with secondary calibration serial" @@ -3379,6 +3380,7 @@ lambdaTimeSinceGood = scalar, U16, 1460, "sec", 0.01, 0 requiresPowerCycle = startStopButtonMode requiresPowerCycle = enableAemXSeries + requiresPowerCycle = enableAemXSeriesEgt requiresPowerCycle = etb_use_two_wires requiresPowerCycle = etbSplit @@ -7724,15 +7726,18 @@ dialog = lambda_monitorDialog, "lambda_monitor" ; Engine->EGT inputs dialog = egtInputs, "EGT inputs" - field = "SPI", max31855spiDevice - field = "CS #1", max31855_cs1 - field = "CS #2", max31855_cs2 - field = "CS #3", max31855_cs3 - field = "CS #4", max31855_cs4 - field = "CS #5", max31855_cs5 - field = "CS #6", max31855_cs6 - field = "CS #7", max31855_cs7 - field = "CS #8", max31855_cs8 + field = "CAN support only EGT1 and EGT2" + field = "CAN EGT (AEM X series of RusEFI)" enableAemXSeriesEgt, { canReadEnabled } + field = "If both CAN and SPI EGT sensors are used, please leave two first for CAN" + field = "MAX31855/MAX31856 SPI", max31855spiDevice + field = "CS for EGT1", max31855_cs1 + field = "CS for EGT2", max31855_cs2 + field = "CS for EGT3", max31855_cs3 + field = "CS for EGT4", max31855_cs4 + field = "CS for EGT5", max31855_cs5 + field = "CS for EGT6", max31855_cs6 + field = "CS for EGT7", max31855_cs7 + field = "CS for EGT8", max31855_cs8 ; Engine->idle Settings dialog = idleSolenoid, "Solenoid" @@ -8898,8 +8903,7 @@ dialog = tcuControls, "Transmission Settings" field = "Speed Threshold", launchSpeedThreshold, {launchControlEnabled == 1} field = "" field = "Launch RPM", launchRpm, {launchControlEnabled == 1} - field = "Ignition Retard Adder", launchTimingRpmRange, {launchControlEnabled == 1 && enableLaunchRetard == 1} - field = "Hard Cut RPM Adder", hardCutRpmRange, {launchControlEnabled == 1} + field = "Launch Control Window", launchRpmWindow, {launchControlEnabled == 1} field = "TPS Threshold", launchTpsThreshold, {launchControlEnabled == 1} field = "Ignition Retard enable", enableLaunchRetard, {launchControlEnabled == 1} field = "Ignition Retard", launchTimingRetard, {launchControlEnabled == 1 && enableLaunchRetard == 1}