diff --git a/generated/console/binary/generated/data_logs.ini b/generated/console/binary/generated/data_logs.ini index 628e997..78419f4 100644 --- a/generated/console/binary/generated/data_logs.ini +++ b/generated/console/binary/generated/data_logs.ini @@ -530,6 +530,7 @@ entry = isArmed, "isArmed", int, "%d" entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" +entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" diff --git a/generated/console/binary/generated/fancy_content.ini b/generated/console/binary/generated/fancy_content.ini index fca814e..f377a84 100644 --- a/generated/console/binary/generated/fancy_content.ini +++ b/generated/console/binary/generated/fancy_content.ini @@ -178,6 +178,7 @@ indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" + indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel diff --git a/generated/console/binary/generated/output_channels.ini b/generated/console/binary/generated/output_channels.ini index fd41560..5a4520d 100644 --- a/generated/console/binary/generated/output_channels.ini +++ b/generated/console/binary/generated/output_channels.ini @@ -594,6 +594,7 @@ isArmed = bits, U32, 1128, [0:0] isTpsConditionSatisfied = bits, U32, 1128, [1:1] isCltConditionSatisfied = bits, U32, 1128, [2:2] isMapConditionSatisfied = bits, U32, 1128, [3:3] +isAfrConditionSatisfied = bits, U32, 1128, [4:4] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] diff --git a/generated/controllers/generated/engine_configuration_generated_structures_XYZ.h b/generated/controllers/generated/engine_configuration_generated_structures_XYZ.h index 45f361d..95cbcec 100644 --- a/generated/controllers/generated/engine_configuration_generated_structures_XYZ.h +++ b/generated/controllers/generated/engine_configuration_generated_structures_XYZ.h @@ -4872,9 +4872,14 @@ struct engine_configuration_s { */ int16_t nitrousMaximumMap; /** - * units: units + * units: afr * offset 3952 */ + scaled_channel nitrousMaximumAfr; + /** + * units: units + * offset 3953 + */ uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; /** * need 4 byte alignment diff --git a/generated/controllers/generated/rusefi_generated_XYZ.h b/generated/controllers/generated/rusefi_generated_XYZ.h index cca024e..f9162a8 100644 --- a/generated/controllers/generated/rusefi_generated_XYZ.h +++ b/generated/controllers/generated/rusefi_generated_XYZ.h @@ -350,7 +350,7 @@ #define ego_sensor_e_ES_Innovate_MTX_L 1 #define ego_sensor_e_ES_PLX 4 #define EGT_CHANNEL_COUNT 8 -#define END_OF_CALIBRATION_PADDING 87 +#define END_OF_CALIBRATION_PADDING 86 #define engine_configuration_s_size 4040 #define engine_load_mode_e_auto_enum 0="LM_SPEED_DENSITY",2="LM_ALPHA_N",3="LM_LUA",100="LM_MOCK",1="LM_REAL_MAF" #define engine_load_mode_e_enum "Speed Density", "MAF Air Charge", "Alpha-N", "Lua" @@ -1328,7 +1328,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 2173553649 +#define SIGNATURE_HASH 1531636254 #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" @@ -1789,7 +1789,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.11.30.XYZ.2173553649" +#define TS_SIGNATURE "rusEFI main.2024.12.01.XYZ.1531636254" #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 d22b4ae..49b9bfa 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 2173553649 -#define TS_SIGNATURE "rusEFI main.2024.11.30.XYZ.2173553649" +#define SIGNATURE_HASH 1531636254 +#define TS_SIGNATURE "rusEFI main.2024.12.01.XYZ.1531636254" diff --git a/generated/live_data_generated/nitrous_control_state_generated.h b/generated/live_data_generated/nitrous_control_state_generated.h index 5152aab..9d77b75 100644 --- a/generated/live_data_generated/nitrous_control_state_generated.h +++ b/generated/live_data_generated/nitrous_control_state_generated.h @@ -19,88 +19,88 @@ struct nitrous_control_state_s { bool isMapConditionSatisfied : 1 {}; /** offset 0 bit 4 */ - bool unusedBit_4_4 : 1 {}; + bool isAfrConditionSatisfied : 1 {}; /** offset 0 bit 5 */ - bool unusedBit_4_5 : 1 {}; + bool unusedBit_5_5 : 1 {}; /** offset 0 bit 6 */ - bool unusedBit_4_6 : 1 {}; + bool unusedBit_5_6 : 1 {}; /** offset 0 bit 7 */ - bool unusedBit_4_7 : 1 {}; + bool unusedBit_5_7 : 1 {}; /** offset 0 bit 8 */ - bool unusedBit_4_8 : 1 {}; + bool unusedBit_5_8 : 1 {}; /** offset 0 bit 9 */ - bool unusedBit_4_9 : 1 {}; + bool unusedBit_5_9 : 1 {}; /** offset 0 bit 10 */ - bool unusedBit_4_10 : 1 {}; + bool unusedBit_5_10 : 1 {}; /** offset 0 bit 11 */ - bool unusedBit_4_11 : 1 {}; + bool unusedBit_5_11 : 1 {}; /** offset 0 bit 12 */ - bool unusedBit_4_12 : 1 {}; + bool unusedBit_5_12 : 1 {}; /** offset 0 bit 13 */ - bool unusedBit_4_13 : 1 {}; + bool unusedBit_5_13 : 1 {}; /** offset 0 bit 14 */ - bool unusedBit_4_14 : 1 {}; + bool unusedBit_5_14 : 1 {}; /** offset 0 bit 15 */ - bool unusedBit_4_15 : 1 {}; + bool unusedBit_5_15 : 1 {}; /** offset 0 bit 16 */ - bool unusedBit_4_16 : 1 {}; + bool unusedBit_5_16 : 1 {}; /** offset 0 bit 17 */ - bool unusedBit_4_17 : 1 {}; + bool unusedBit_5_17 : 1 {}; /** offset 0 bit 18 */ - bool unusedBit_4_18 : 1 {}; + bool unusedBit_5_18 : 1 {}; /** offset 0 bit 19 */ - bool unusedBit_4_19 : 1 {}; + bool unusedBit_5_19 : 1 {}; /** offset 0 bit 20 */ - bool unusedBit_4_20 : 1 {}; + bool unusedBit_5_20 : 1 {}; /** offset 0 bit 21 */ - bool unusedBit_4_21 : 1 {}; + bool unusedBit_5_21 : 1 {}; /** offset 0 bit 22 */ - bool unusedBit_4_22 : 1 {}; + bool unusedBit_5_22 : 1 {}; /** offset 0 bit 23 */ - bool unusedBit_4_23 : 1 {}; + bool unusedBit_5_23 : 1 {}; /** offset 0 bit 24 */ - bool unusedBit_4_24 : 1 {}; + bool unusedBit_5_24 : 1 {}; /** offset 0 bit 25 */ - bool unusedBit_4_25 : 1 {}; + bool unusedBit_5_25 : 1 {}; /** offset 0 bit 26 */ - bool unusedBit_4_26 : 1 {}; + bool unusedBit_5_26 : 1 {}; /** offset 0 bit 27 */ - bool unusedBit_4_27 : 1 {}; + bool unusedBit_5_27 : 1 {}; /** offset 0 bit 28 */ - bool unusedBit_4_28 : 1 {}; + bool unusedBit_5_28 : 1 {}; /** offset 0 bit 29 */ - bool unusedBit_4_29 : 1 {}; + bool unusedBit_5_29 : 1 {}; /** offset 0 bit 30 */ - bool unusedBit_4_30 : 1 {}; + bool unusedBit_5_30 : 1 {}; /** offset 0 bit 31 */ - bool unusedBit_4_31 : 1 {}; + bool unusedBit_5_31 : 1 {}; }; static_assert(sizeof(nitrous_control_state_s) == 4); diff --git a/generated/tunerstudio/generated/rusefi_XYZ.ini b/generated/tunerstudio/generated/rusefi_XYZ.ini index 550c4d5..286cd4c 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.11.30.XYZ.2173553649" + signature = "rusEFI main.2024.12.01.XYZ.1531636254" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI main.2024.11.30.XYZ.2173553649" ; signature is expected to be 7 or more characters. + signature= "rusEFI main.2024.12.01.XYZ.1531636254" ; 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 @@ -1435,7 +1435,8 @@ nitrousLuaGaugeArmingValue = scalar, F32, 3940, "", 1, 0, -30000, 30000, 3 nitrousMinimumTps = scalar, S32, 3944, "", 1, 0, 0, 20000, 0 nitrousMinimumClt = scalar, U08, 3948, "deg C", 1, 0, 0, 250, 0 nitrousMaximumMap = scalar, S16, 3950, "kPa", 1, 0, 0, 1000, 0 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3952, [87], "units", 1, 0, 0, 1, 0 +nitrousMaximumAfr = scalar, U08, 3952, "afr", 0.1, 0, 10, 20, 1 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3953, [86], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4040, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, F32, 4184, [6], "count", 1, 0, 0, 1000, 0 postCrankingCLTBins = array, S16, 4208, [6], "C", 1, 0, -100, 250, 0 @@ -3229,6 +3230,7 @@ isArmed = bits, U32, 1128, [0:0] isTpsConditionSatisfied = bits, U32, 1128, [1:1] isCltConditionSatisfied = bits, U32, 1128, [2:2] isMapConditionSatisfied = bits, U32, 1128, [3:3] +isAfrConditionSatisfied = bits, U32, 1128, [4:4] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5812,6 +5814,7 @@ entry = isArmed, "isArmed", int, "%d" entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" +entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6791,6 +6794,7 @@ indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" + indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9815,6 +9819,7 @@ dialog = tcuControls, "Transmission Settings" field = "Minimum TPS", nitrousMinimumTps field = "Minimum CLT", nitrousMinimumClt field = "Maximum MAP", nitrousMaximumMap + field = "Maximum AFR", nitrousMaximumAfr dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled diff --git a/generated/tunerstudio/generated/signature_XYZ.txt b/generated/tunerstudio/generated/signature_XYZ.txt index 9b4e8a7..5680d72 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.11.30.XYZ.@@SIGNATURE_HASH@@" +#define TS_SIGNATURE "rusEFI main.2024.12.01.XYZ.@@SIGNATURE_HASH@@"