From ae87580a9994a885b62bf9c72bf9e71afff3829f Mon Sep 17 00:00:00 2001 From: GitHub git update Action Date: Wed, 4 Dec 2024 00:20:19 +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 + .../generated/rusefi_generated_mega100.h | 4 +- .../controllers/generated/signature_mega100.h | 4 +- .../nitrous_control_state_generated.h | 52 +++++++++---------- .../tunerstudio/generated/rusefi_mega100.ini | 9 ++-- .../generated/signature_mega100.txt | 2 +- 8 files changed, 40 insertions(+), 34 deletions(-) diff --git a/generated/console/binary/generated/data_logs.ini b/generated/console/binary/generated/data_logs.ini index d62c444..ff64598 100644 --- a/generated/console/binary/generated/data_logs.ini +++ b/generated/console/binary/generated/data_logs.ini @@ -532,6 +532,7 @@ entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" +entry = isNitrousConditionSatisfied, "isNitrousConditionSatisfied", 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 c198492..4eda4f5 100644 --- a/generated/console/binary/generated/fancy_content.ini +++ b/generated/console/binary/generated/fancy_content.ini @@ -180,6 +180,7 @@ indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" + indicator = {isNitrousConditionSatisfied}, "isNitrousConditionSatisfied No", "isNitrousConditionSatisfied 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 13f5169..299fe40 100644 --- a/generated/console/binary/generated/output_channels.ini +++ b/generated/console/binary/generated/output_channels.ini @@ -596,6 +596,7 @@ isCltConditionSatisfied = bits, U32, 1128, [2:2] isMapConditionSatisfied = bits, U32, 1128, [3:3] isAfrConditionSatisfied = bits, U32, 1128, [4:4] isNitrousRpmConditionSatisfied = bits, U32, 1128, [5:5] +isNitrousConditionSatisfied = bits, U32, 1128, [6:6] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] diff --git a/generated/controllers/generated/rusefi_generated_mega100.h b/generated/controllers/generated/rusefi_generated_mega100.h index fdcd2c9..1418c02 100644 --- a/generated/controllers/generated/rusefi_generated_mega100.h +++ b/generated/controllers/generated/rusefi_generated_mega100.h @@ -1326,7 +1326,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges true #define show_vvt_output_pin true -#define SIGNATURE_HASH 2976868489 +#define SIGNATURE_HASH 2123609929 #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" @@ -1787,7 +1787,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.03.mega100.2976868489" +#define TS_SIGNATURE "rusEFI main.2024.12.04.mega100.2123609929" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/generated/controllers/generated/signature_mega100.h b/generated/controllers/generated/signature_mega100.h index 9c22a39..fa3a7df 100644 --- a/generated/controllers/generated/signature_mega100.h +++ b/generated/controllers/generated/signature_mega100.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 2976868489 -#define TS_SIGNATURE "rusEFI main.2024.12.03.mega100.2976868489" +#define SIGNATURE_HASH 2123609929 +#define TS_SIGNATURE "rusEFI main.2024.12.04.mega100.2123609929" diff --git a/generated/live_data_generated/nitrous_control_state_generated.h b/generated/live_data_generated/nitrous_control_state_generated.h index 27ed97f..10124cb 100644 --- a/generated/live_data_generated/nitrous_control_state_generated.h +++ b/generated/live_data_generated/nitrous_control_state_generated.h @@ -25,82 +25,82 @@ struct nitrous_control_state_s { bool isNitrousRpmConditionSatisfied : 1 {}; /** offset 0 bit 6 */ - bool unusedBit_6_6 : 1 {}; + bool isNitrousConditionSatisfied : 1 {}; /** offset 0 bit 7 */ - bool unusedBit_6_7 : 1 {}; + bool unusedBit_7_7 : 1 {}; /** offset 0 bit 8 */ - bool unusedBit_6_8 : 1 {}; + bool unusedBit_7_8 : 1 {}; /** offset 0 bit 9 */ - bool unusedBit_6_9 : 1 {}; + bool unusedBit_7_9 : 1 {}; /** offset 0 bit 10 */ - bool unusedBit_6_10 : 1 {}; + bool unusedBit_7_10 : 1 {}; /** offset 0 bit 11 */ - bool unusedBit_6_11 : 1 {}; + bool unusedBit_7_11 : 1 {}; /** offset 0 bit 12 */ - bool unusedBit_6_12 : 1 {}; + bool unusedBit_7_12 : 1 {}; /** offset 0 bit 13 */ - bool unusedBit_6_13 : 1 {}; + bool unusedBit_7_13 : 1 {}; /** offset 0 bit 14 */ - bool unusedBit_6_14 : 1 {}; + bool unusedBit_7_14 : 1 {}; /** offset 0 bit 15 */ - bool unusedBit_6_15 : 1 {}; + bool unusedBit_7_15 : 1 {}; /** offset 0 bit 16 */ - bool unusedBit_6_16 : 1 {}; + bool unusedBit_7_16 : 1 {}; /** offset 0 bit 17 */ - bool unusedBit_6_17 : 1 {}; + bool unusedBit_7_17 : 1 {}; /** offset 0 bit 18 */ - bool unusedBit_6_18 : 1 {}; + bool unusedBit_7_18 : 1 {}; /** offset 0 bit 19 */ - bool unusedBit_6_19 : 1 {}; + bool unusedBit_7_19 : 1 {}; /** offset 0 bit 20 */ - bool unusedBit_6_20 : 1 {}; + bool unusedBit_7_20 : 1 {}; /** offset 0 bit 21 */ - bool unusedBit_6_21 : 1 {}; + bool unusedBit_7_21 : 1 {}; /** offset 0 bit 22 */ - bool unusedBit_6_22 : 1 {}; + bool unusedBit_7_22 : 1 {}; /** offset 0 bit 23 */ - bool unusedBit_6_23 : 1 {}; + bool unusedBit_7_23 : 1 {}; /** offset 0 bit 24 */ - bool unusedBit_6_24 : 1 {}; + bool unusedBit_7_24 : 1 {}; /** offset 0 bit 25 */ - bool unusedBit_6_25 : 1 {}; + bool unusedBit_7_25 : 1 {}; /** offset 0 bit 26 */ - bool unusedBit_6_26 : 1 {}; + bool unusedBit_7_26 : 1 {}; /** offset 0 bit 27 */ - bool unusedBit_6_27 : 1 {}; + bool unusedBit_7_27 : 1 {}; /** offset 0 bit 28 */ - bool unusedBit_6_28 : 1 {}; + bool unusedBit_7_28 : 1 {}; /** offset 0 bit 29 */ - bool unusedBit_6_29 : 1 {}; + bool unusedBit_7_29 : 1 {}; /** offset 0 bit 30 */ - bool unusedBit_6_30 : 1 {}; + bool unusedBit_7_30 : 1 {}; /** offset 0 bit 31 */ - bool unusedBit_6_31 : 1 {}; + bool unusedBit_7_31 : 1 {}; }; static_assert(sizeof(nitrous_control_state_s) == 4); diff --git a/generated/tunerstudio/generated/rusefi_mega100.ini b/generated/tunerstudio/generated/rusefi_mega100.ini index cad882a..cdf6a93 100644 --- a/generated/tunerstudio/generated/rusefi_mega100.ini +++ b/generated/tunerstudio/generated/rusefi_mega100.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI main.2024.12.03.mega100.2976868489" + signature = "rusEFI main.2024.12.04.mega100.2123609929" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI main.2024.12.03.mega100.2976868489" ; signature is expected to be 7 or more characters. + signature= "rusEFI main.2024.12.04.mega100.2123609929" ; 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 @@ -3235,6 +3235,7 @@ isCltConditionSatisfied = bits, U32, 1128, [2:2] isMapConditionSatisfied = bits, U32, 1128, [3:3] isAfrConditionSatisfied = bits, U32, 1128, [4:4] isNitrousRpmConditionSatisfied = bits, U32, 1128, [5:5] +isNitrousConditionSatisfied = bits, U32, 1128, [6:6] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5825,6 +5826,7 @@ entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" +entry = isNitrousConditionSatisfied, "isNitrousConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6834,6 +6836,7 @@ indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" + indicator = {isNitrousConditionSatisfied}, "isNitrousConditionSatisfied No", "isNitrousConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -10138,7 +10141,7 @@ dialog = tcuControls, "Transmission Settings" dialog = hpfpPumpDialog, "HPFP Pump Configuration" field = "Valve Pin", hpfpValvePin, {hpfpCamLobes != 0} field = "Valve Pin Mode", hpfpValvePinMode, {hpfpCamLobes != 0} - commandButton = "HPFP Valve", cmd_test_hpfp_valve + commandButton = "Bench Test HPFP Valve", cmd_test_hpfp_valve field = "Valve peak current", mc33_hpfp_i_peak, {hpfpCamLobes != 0} field = "Valve hold current", mc33_hpfp_i_hold, {hpfpCamLobes != 0} field = "Valve hold off time", mc33_hpfp_i_hold_off, {hpfpCamLobes != 0} diff --git a/generated/tunerstudio/generated/signature_mega100.txt b/generated/tunerstudio/generated/signature_mega100.txt index c35200b..7fd3f82 100644 --- a/generated/tunerstudio/generated/signature_mega100.txt +++ b/generated/tunerstudio/generated/signature_mega100.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.03.mega100.@@SIGNATURE_HASH@@" +#define TS_SIGNATURE "rusEFI main.2024.12.04.mega100.@@SIGNATURE_HASH@@"