diff --git a/generated/controllers/generated/engine_configuration_generated_structures_XYZ.h b/generated/controllers/generated/engine_configuration_generated_structures_XYZ.h index 05bbc148..d8cbdb50 100644 --- a/generated/controllers/generated/engine_configuration_generated_structures_XYZ.h +++ b/generated/controllers/generated/engine_configuration_generated_structures_XYZ.h @@ -2534,7 +2534,8 @@ struct engine_configuration_s { offset 1316 bit 23 */ bool useCltBasedRpmLimit : 1 {}; /** - * If enabled, don't wait for engine start to heat O2 sensors. WARNING: this will reduce the life of your sensor, as condensation in the exhaust from a cold start can crack the sensing element. + * If enabled, don't wait for engine start to heat O2 sensors. + * WARNING: this will reduce the life of your sensor, as condensation in the exhaust from a cold start can crack the sensing element. offset 1316 bit 24 */ bool forceO2Heating : 1 {}; /** diff --git a/generated/controllers/generated/rusefi_generated_XYZ.h b/generated/controllers/generated/rusefi_generated_XYZ.h index 0a658975..7c8406c2 100644 --- a/generated/controllers/generated/rusefi_generated_XYZ.h +++ b/generated/controllers/generated/rusefi_generated_XYZ.h @@ -1292,7 +1292,7 @@ #define show_Proteus_presets false #define show_test_presets false #define show_vvt_output_pin true -#define SIGNATURE_HASH 1266360603 +#define SIGNATURE_HASH 50302499 #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" @@ -1749,7 +1749,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI main.2024.09.24.XYZ.1266360603" +#define TS_SIGNATURE "rusEFI main.2024.09.25.XYZ.50302499" #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 6794d529..2fb45fc2 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 1266360603 -#define TS_SIGNATURE "rusEFI main.2024.09.24.XYZ.1266360603" +#define SIGNATURE_HASH 50302499 +#define TS_SIGNATURE "rusEFI main.2024.09.25.XYZ.50302499" diff --git a/generated/tunerstudio/generated/rusefi_XYZ.ini b/generated/tunerstudio/generated/rusefi_XYZ.ini index a68232b5..1f2c2246 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.09.24.XYZ.1266360603" + signature = "rusEFI main.2024.09.25.XYZ.50302499" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI main.2024.09.24.XYZ.1266360603" ; signature is expected to be 7 or more characters. + signature= "rusEFI main.2024.09.25.XYZ.50302499" ; 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 @@ -2027,7 +2027,7 @@ boardSpecificCalibration1 = scalar, S32, 22968, "", 1, 0, 0, 100, 0 launchSmoothRetard = "Interpolates the Ignition Retard from 0 to 100% within the RPM Range" isPhaseSyncRequiredForIgnition = "Some engines are OK running semi-random sequential while other engine require phase synchronization" useCltBasedRpmLimit = "If enabled, use a curve for RPM limit (based on coolant temperature) instead of a constant value." - forceO2Heating = "If enabled, don't wait for engine start to heat O2 sensors. WARNING: this will reduce the life of your sensor, as condensation in the exhaust from a cold start can crack the sensing element." + forceO2Heating = "If enabled, don't wait for engine start to heat O2 sensors.\nWARNING: this will reduce the life of your sensor, as condensation in the exhaust from a cold start can crack the sensing element." invertVvtControlIntake = "If increased VVT duty cycle increases the indicated VVT angle, set this to 'advance'. If it decreases, set this to 'retard'. Most intake cams use 'advance', and most exhaust cams use 'retard'." invertVvtControlExhaust = "If increased VVT duty cycle increases the indicated VVT angle, set this to 'advance'. If it decreases, set this to 'retard'. Most intake cams use 'advance', and most exhaust cams use 'retard'." sdTriggerLog = "'Trigger' mode will write a high speed log of trigger events (warning: uses lots of space!). 'Normal' mode will write a standard MLG of sensors, engine function, etc. similar to the one captured in TunerStudio." @@ -3549,7 +3549,7 @@ unusedAtTheExtraEnd92 = scalar, U08, 1851, "", 1, 0 egoCorrectionForVeAnalyze = { 100 + fuelPidCorrection1 } - wbo0_hasFault = { enableAemXSeries && (faultCode0 >= 3) } + wbo0_hasFault = { enableAemXSeries && ((faultCode0 >= 3) && (faultCode0 != 7)) } [PcVariables] fuelUnits = bits, U08, [0:2], "kPa", "MAF", "%TPS", "Lua" @@ -8358,15 +8358,49 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = egoSettings_IO2, "O2 Sensor 2 I/O" field = "Input channel", afr_hwChannel2 + indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 } + indicator = { faultCode0 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + + indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 } + indicator = { faultCode1 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + + indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode0 != 7 } + indicator = { faultCode0 == 0 || faultCode0 == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { faultCode0 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { faultCode0 == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { faultCode0 == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { faultCode0 == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { faultCode0 == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { faultCode0 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + + indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode1 != 7 } + indicator = { faultCode1 == 0 || faultCode1 == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { faultCode1 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { faultCode1 == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { faultCode1 == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { faultCode1 == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { faultCode1 == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { faultCode1 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + + dialog = uegoCanStatus, "CAN UEGO 1, 2 Status", border + panel = uegoCan0Indicators, West + panel = uegoCan1Indicators, East + + dialog = uegoCanStatusExt, "CAN UEGO 1, 2 Extended Status", border + panel = uegoCan0IndicatorsExt, West + panel = uegoCan1IndicatorsExt, East + dialog = uegoCan, "CAN UEGO/wideband O2" field = "Support for AEM or RusEFI CAN UEGO" field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } field = "Wideband CAN bus", widebandOnSecondBus - field = flipWboChannels, flipWboChannels + field = "Swap channels 1 and 2", flipWboChannels, flipWboChannels field = "Force O2 sensor heating", forceO2Heating dialog = egoSettings, "", yAxis panel = uegoCan + panel = uegoCanStatus, { enableAemXSeries == 1 } + panel = uegoCanStatusExt, { enableAemXSeries == 1 } panel = egoSettings_IO1 panel = egoSettings_IO2, {afr_hwChannel != 0 && enableAemXSeries == 0} panel = egoSettings_sensor, {afr_hwChannel != 0 && enableAemXSeries == 0} diff --git a/generated/tunerstudio/generated/signature_XYZ.txt b/generated/tunerstudio/generated/signature_XYZ.txt index 4b7d8209..65f2c60f 100644 --- a/generated/tunerstudio/generated/signature_XYZ.txt +++ b/generated/tunerstudio/generated/signature_XYZ.txt @@ -1,4 +1,4 @@ ! Generated by gen_signature.sh ! SIGNATURE_HASH is a built-in variable generated by config_definition-all.jar ! gen_signature.sh Using env variable branch [main] -#define TS_SIGNATURE "rusEFI main.2024.09.24.XYZ.@@SIGNATURE_HASH@@" +#define TS_SIGNATURE "rusEFI main.2024.09.25.XYZ.@@SIGNATURE_HASH@@"