From 9cdf0a5d53e27c3e5f2951c0bd19189b762b8d20 Mon Sep 17 00:00:00 2001 From: GitHub git update Action Date: Tue, 3 Dec 2024 00:31:17 +0000 Subject: [PATCH] Custom Auto-generated Configs [no ci] --- .../console/binary/generated/data_logs.ini | 1 + .../binary/generated/fancy_content.ini | 1 + .../binary/generated/output_channels.ini | 1 + ...e_configuration_generated_structures_XYZ.h | 25 +++++++-- .../generated/rusefi_generated_XYZ.h | 6 +-- .../controllers/generated/signature_XYZ.h | 4 +- .../nitrous_control_state_generated.h | 54 +++++++++---------- .../tunerstudio/generated/rusefi_XYZ.ini | 23 +++++--- .../tunerstudio/generated/signature_XYZ.txt | 2 +- 9 files changed, 72 insertions(+), 45 deletions(-) diff --git a/generated/console/binary/generated/data_logs.ini b/generated/console/binary/generated/data_logs.ini index 78419f4..d62c444 100644 --- a/generated/console/binary/generated/data_logs.ini +++ b/generated/console/binary/generated/data_logs.ini @@ -531,6 +531,7 @@ entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" +entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", 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 f377a84..c198492 100644 --- a/generated/console/binary/generated/fancy_content.ini +++ b/generated/console/binary/generated/fancy_content.ini @@ -179,6 +179,7 @@ indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" + indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied 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 5a4520d..13f5169 100644 --- a/generated/console/binary/generated/output_channels.ini +++ b/generated/console/binary/generated/output_channels.ini @@ -595,6 +595,7 @@ isTpsConditionSatisfied = bits, U32, 1128, [1:1] isCltConditionSatisfied = bits, U32, 1128, [2:2] isMapConditionSatisfied = bits, U32, 1128, [3:3] isAfrConditionSatisfied = bits, U32, 1128, [4:4] +isNitrousRpmConditionSatisfied = bits, U32, 1128, [5:5] ; 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 f492651..f6b0e71 100644 --- a/generated/controllers/generated/engine_configuration_generated_structures_XYZ.h +++ b/generated/controllers/generated/engine_configuration_generated_structures_XYZ.h @@ -4877,16 +4877,31 @@ struct engine_configuration_s { */ scaled_channel nitrousMaximumAfr; /** + * need 4 byte alignment * units: units * offset 3953 */ - uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; + uint8_t alignmentFill_at_3953[1]; /** - * need 4 byte alignment - * units: units - * offset 4039 + * units: rpm + * offset 3954 */ - uint8_t alignmentFill_at_4039[1]; + uint16_t nitrousActivationRpm; + /** + * units: rpm + * offset 3956 + */ + uint16_t nitrousDeactivationRpm; + /** + * units: rpm + * offset 3958 + */ + uint16_t nitrousDeactivationRpmWindow; + /** + * units: units + * offset 3960 + */ + uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; }; static_assert(sizeof(engine_configuration_s) == 4040); diff --git a/generated/controllers/generated/rusefi_generated_XYZ.h b/generated/controllers/generated/rusefi_generated_XYZ.h index 9284d28..02e20c4 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 86 +#define END_OF_CALIBRATION_PADDING 80 #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 1269189969 +#define SIGNATURE_HASH 511064995 #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.12.02.XYZ.1269189969" +#define TS_SIGNATURE "rusEFI main.2024.12.03.XYZ.511064995" #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 1b45fe6..a55e219 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 1269189969 -#define TS_SIGNATURE "rusEFI main.2024.12.02.XYZ.1269189969" +#define SIGNATURE_HASH 511064995 +#define TS_SIGNATURE "rusEFI main.2024.12.03.XYZ.511064995" diff --git a/generated/live_data_generated/nitrous_control_state_generated.h b/generated/live_data_generated/nitrous_control_state_generated.h index 9d77b75..27ed97f 100644 --- a/generated/live_data_generated/nitrous_control_state_generated.h +++ b/generated/live_data_generated/nitrous_control_state_generated.h @@ -22,85 +22,85 @@ struct nitrous_control_state_s { bool isAfrConditionSatisfied : 1 {}; /** offset 0 bit 5 */ - bool unusedBit_5_5 : 1 {}; + bool isNitrousRpmConditionSatisfied : 1 {}; /** offset 0 bit 6 */ - bool unusedBit_5_6 : 1 {}; + bool unusedBit_6_6 : 1 {}; /** offset 0 bit 7 */ - bool unusedBit_5_7 : 1 {}; + bool unusedBit_6_7 : 1 {}; /** offset 0 bit 8 */ - bool unusedBit_5_8 : 1 {}; + bool unusedBit_6_8 : 1 {}; /** offset 0 bit 9 */ - bool unusedBit_5_9 : 1 {}; + bool unusedBit_6_9 : 1 {}; /** offset 0 bit 10 */ - bool unusedBit_5_10 : 1 {}; + bool unusedBit_6_10 : 1 {}; /** offset 0 bit 11 */ - bool unusedBit_5_11 : 1 {}; + bool unusedBit_6_11 : 1 {}; /** offset 0 bit 12 */ - bool unusedBit_5_12 : 1 {}; + bool unusedBit_6_12 : 1 {}; /** offset 0 bit 13 */ - bool unusedBit_5_13 : 1 {}; + bool unusedBit_6_13 : 1 {}; /** offset 0 bit 14 */ - bool unusedBit_5_14 : 1 {}; + bool unusedBit_6_14 : 1 {}; /** offset 0 bit 15 */ - bool unusedBit_5_15 : 1 {}; + bool unusedBit_6_15 : 1 {}; /** offset 0 bit 16 */ - bool unusedBit_5_16 : 1 {}; + bool unusedBit_6_16 : 1 {}; /** offset 0 bit 17 */ - bool unusedBit_5_17 : 1 {}; + bool unusedBit_6_17 : 1 {}; /** offset 0 bit 18 */ - bool unusedBit_5_18 : 1 {}; + bool unusedBit_6_18 : 1 {}; /** offset 0 bit 19 */ - bool unusedBit_5_19 : 1 {}; + bool unusedBit_6_19 : 1 {}; /** offset 0 bit 20 */ - bool unusedBit_5_20 : 1 {}; + bool unusedBit_6_20 : 1 {}; /** offset 0 bit 21 */ - bool unusedBit_5_21 : 1 {}; + bool unusedBit_6_21 : 1 {}; /** offset 0 bit 22 */ - bool unusedBit_5_22 : 1 {}; + bool unusedBit_6_22 : 1 {}; /** offset 0 bit 23 */ - bool unusedBit_5_23 : 1 {}; + bool unusedBit_6_23 : 1 {}; /** offset 0 bit 24 */ - bool unusedBit_5_24 : 1 {}; + bool unusedBit_6_24 : 1 {}; /** offset 0 bit 25 */ - bool unusedBit_5_25 : 1 {}; + bool unusedBit_6_25 : 1 {}; /** offset 0 bit 26 */ - bool unusedBit_5_26 : 1 {}; + bool unusedBit_6_26 : 1 {}; /** offset 0 bit 27 */ - bool unusedBit_5_27 : 1 {}; + bool unusedBit_6_27 : 1 {}; /** offset 0 bit 28 */ - bool unusedBit_5_28 : 1 {}; + bool unusedBit_6_28 : 1 {}; /** offset 0 bit 29 */ - bool unusedBit_5_29 : 1 {}; + bool unusedBit_6_29 : 1 {}; /** offset 0 bit 30 */ - bool unusedBit_5_30 : 1 {}; + bool unusedBit_6_30 : 1 {}; /** offset 0 bit 31 */ - bool unusedBit_5_31 : 1 {}; + bool unusedBit_6_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 41bd484..2a661e5 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.12.02.XYZ.1269189969" + signature = "rusEFI main.2024.12.03.XYZ.511064995" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI main.2024.12.02.XYZ.1269189969" ; signature is expected to be 7 or more characters. + signature= "rusEFI main.2024.12.03.XYZ.511064995" ; 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 @@ -1436,7 +1436,10 @@ 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 nitrousMaximumAfr = scalar, U08, 3952, "afr", 0.1, 0, 10, 20, 1 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3953, [86], "units", 1, 0, 0, 1, 0 +nitrousActivationRpm = scalar, U16, 3954, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpm = scalar, U16, 3956, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpmWindow = scalar, U16, 3958, "rpm", 1, 0, 0, 20000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3960, [80], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4040, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, U16, 4184, [6], "count", 1, 0, 0, 64000, 0 postCrankingCLTBins = array, S16, 4196, [6], "C", 1, 0, -100, 250, 0 @@ -3231,6 +3234,7 @@ isTpsConditionSatisfied = bits, U32, 1128, [1:1] isCltConditionSatisfied = bits, U32, 1128, [2:2] isMapConditionSatisfied = bits, U32, 1128, [3:3] isAfrConditionSatisfied = bits, U32, 1128, [4:4] +isNitrousRpmConditionSatisfied = bits, U32, 1128, [5:5] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5815,6 +5819,7 @@ entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" +entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6795,6 +6800,7 @@ indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" + indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9816,10 +9822,13 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} dialog = NitrousControlSettings, "Settings" - field = "Minimum TPS", nitrousMinimumTps - field = "Minimum CLT", nitrousMinimumClt - field = "Maximum MAP", nitrousMaximumMap - field = "Maximum AFR", nitrousMaximumAfr + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + field = "Maximum AFR", nitrousMaximumAfr + field = "Activation RPM", nitrousActivationRpm + field = "Dectivation RPM", nitrousDeactivationRpm + field = "Dectivation RPM Window", nitrousDeactivationRpmWindow 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 9bd21f3..59ed49a 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.12.02.XYZ.@@SIGNATURE_HASH@@" +#define TS_SIGNATURE "rusEFI main.2024.12.03.XYZ.@@SIGNATURE_HASH@@"