From 72821354cce1da556819a29cb34594de26c68cca Mon Sep 17 00:00:00 2001 From: GitHub git update Action Date: Thu, 26 Sep 2024 00:18:29 +0000 Subject: [PATCH] Custom Auto-generated Configs [no ci] --- .../console/binary/generated/data_logs.ini | 6 ++--- .../binary/generated/fancy_content.ini | 6 ++--- .../binary/generated/output_channels.ini | 6 ++--- .../generated/rusefi_generated_mega100.h | 5 +++-- .../controllers/generated/signature_mega100.h | 4 ++-- .../fan_control_generated.h | 10 +++------ .../tunerstudio/generated/rusefi_mega100.ini | 22 +++++++------------ .../generated/signature_mega100.txt | 2 +- 8 files changed, 23 insertions(+), 38 deletions(-) diff --git a/generated/console/binary/generated/data_logs.ini b/generated/console/binary/generated/data_logs.ini index 1c75032..a9b44cc 100644 --- a/generated/console/binary/generated/data_logs.ini +++ b/generated/console/binary/generated/data_logs.ini @@ -547,8 +547,7 @@ entry = enabledForAc0, "enabledForAc0", int, "%d" entry = hot0, "hot0", int, "%d" entry = cold0, "cold0", int, "%d" entry = disabledBySpeed0, "disabledBySpeed0", int, "%d" -entry = tempAlive0, "tempAlive0", int, "%d" -entry = tempCode0, "tempCode0", int, "%d" +entry = radiatorFanStatus0, "radiatorFanStatus0", int, "%d" entry = cranking1, "cranking1", int, "%d" entry = notRunning1, "notRunning1", int, "%d" entry = disabledWhileEngineStopped1, "disabledWhileEngineStopped1", int, "%d" @@ -557,8 +556,7 @@ entry = enabledForAc1, "enabledForAc1", int, "%d" entry = hot1, "hot1", int, "%d" entry = cold1, "cold1", int, "%d" entry = disabledBySpeed1, "disabledBySpeed1", int, "%d" -entry = tempAlive1, "tempAlive1", int, "%d" -entry = tempCode1, "tempCode1", int, "%d" +entry = radiatorFanStatus1, "radiatorFanStatus1", int, "%d" entry = isPrime, "isPrime", int, "%d" entry = engineTurnedRecently, "engineTurnedRecently", int, "%d" entry = isFuelPumpOn, "isFuelPumpOn", int, "%d" diff --git a/generated/console/binary/generated/fancy_content.ini b/generated/console/binary/generated/fancy_content.ini index c850d65..f65e5ef 100644 --- a/generated/console/binary/generated/fancy_content.ini +++ b/generated/console/binary/generated/fancy_content.ini @@ -212,8 +212,7 @@ indicatorPanel = fan_control0IndicatorPanel, 2 dialog = fan_control0Dialog, "fan_control0" panel = fan_control0IndicatorPanel liveGraph = fan_control0_1_Graph, "Graph", South - graphLine = tempAlive0 - graphLine = tempCode0 + graphLine = radiatorFanStatus0 indicatorPanel = fan_control1IndicatorPanel, 2 indicator = {cranking1}, "cranking No", "cranking Yes" @@ -228,8 +227,7 @@ indicatorPanel = fan_control1IndicatorPanel, 2 dialog = fan_control1Dialog, "fan_control1" panel = fan_control1IndicatorPanel liveGraph = fan_control1_1_Graph, "Graph", South - graphLine = tempAlive1 - graphLine = tempCode1 + graphLine = radiatorFanStatus1 indicatorPanel = fuel_pump_controlIndicatorPanel, 2 indicator = {isPrime}, "isPrime No", "isPrime Yes" diff --git a/generated/console/binary/generated/output_channels.ini b/generated/console/binary/generated/output_channels.ini index 5ca3447..7bbe32a 100644 --- a/generated/console/binary/generated/output_channels.ini +++ b/generated/console/binary/generated/output_channels.ini @@ -618,8 +618,7 @@ enabledForAc0 = bits, U32, 1096, [4:4] hot0 = bits, U32, 1096, [5:5] cold0 = bits, U32, 1096, [6:6] disabledBySpeed0 = bits, U32, 1096, [7:7] -tempAlive0 = scalar, U08, 1100, "", 1, 0 -tempCode0 = scalar, U08, 1101, "", 1, 0 +radiatorFanStatus0 = scalar, U08, 1100, "", 1, 0 ; total TS size = 1104 cranking1 = bits, U32, 1104, [0:0] notRunning1 = bits, U32, 1104, [1:1] @@ -629,8 +628,7 @@ enabledForAc1 = bits, U32, 1104, [4:4] hot1 = bits, U32, 1104, [5:5] cold1 = bits, U32, 1104, [6:6] disabledBySpeed1 = bits, U32, 1104, [7:7] -tempAlive1 = scalar, U08, 1108, "", 1, 0 -tempCode1 = scalar, U08, 1109, "", 1, 0 +radiatorFanStatus1 = scalar, U08, 1108, "", 1, 0 ; total TS size = 1112 isPrime = bits, U32, 1112, [0:0] engineTurnedRecently = bits, U32, 1112, [1:1] diff --git a/generated/controllers/generated/rusefi_generated_mega100.h b/generated/controllers/generated/rusefi_generated_mega100.h index e72aa00..e01369a 100644 --- a/generated/controllers/generated/rusefi_generated_mega100.h +++ b/generated/controllers/generated/rusefi_generated_mega100.h @@ -1290,7 +1290,7 @@ #define show_Proteus_presets false #define show_test_presets false #define show_vvt_output_pin true -#define SIGNATURE_HASH 1117566222 +#define SIGNATURE_HASH 3933945201 #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" @@ -1596,6 +1596,7 @@ #define ts_show_air_conditioning true #define ts_show_alternator true #define ts_show_analog_divider true +#define ts_show_analog_ego true #define ts_show_analog_input_settings true #define ts_show_aux_connections true #define ts_show_aux_sensors true @@ -1747,7 +1748,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.25.mega100.1117566222" +#define TS_SIGNATURE "rusEFI main.2024.09.26.mega100.3933945201" #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 cfe5ebc..d5ecd2e 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 1117566222 -#define TS_SIGNATURE "rusEFI main.2024.09.25.mega100.1117566222" +#define SIGNATURE_HASH 3933945201 +#define TS_SIGNATURE "rusEFI main.2024.09.26.mega100.3933945201" diff --git a/generated/live_data_generated/fan_control_generated.h b/generated/live_data_generated/fan_control_generated.h index 90544db..654cc84 100644 --- a/generated/live_data_generated/fan_control_generated.h +++ b/generated/live_data_generated/fan_control_generated.h @@ -104,17 +104,13 @@ struct fan_control_s { /** * offset 4 */ - uint8_t tempAlive = (uint8_t)0; - /** - * offset 5 - */ - uint8_t tempCode = (uint8_t)0; + uint8_t radiatorFanStatus = (uint8_t)0; /** * need 4 byte alignment * units: units - * offset 6 + * offset 5 */ - uint8_t alignmentFill_at_6[2]; + uint8_t alignmentFill_at_5[3]; }; static_assert(sizeof(fan_control_s) == 8); diff --git a/generated/tunerstudio/generated/rusefi_mega100.ini b/generated/tunerstudio/generated/rusefi_mega100.ini index 5ad3289..2ed1d0b 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.09.25.mega100.1117566222" + signature = "rusEFI main.2024.09.26.mega100.3933945201" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI main.2024.09.25.mega100.1117566222" ; signature is expected to be 7 or more characters. + signature= "rusEFI main.2024.09.26.mega100.3933945201" ; 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 @@ -3181,8 +3181,7 @@ enabledForAc0 = bits, U32, 1096, [4:4] hot0 = bits, U32, 1096, [5:5] cold0 = bits, U32, 1096, [6:6] disabledBySpeed0 = bits, U32, 1096, [7:7] -tempAlive0 = scalar, U08, 1100, "", 1, 0 -tempCode0 = scalar, U08, 1101, "", 1, 0 +radiatorFanStatus0 = scalar, U08, 1100, "", 1, 0 ; total TS size = 1104 cranking1 = bits, U32, 1104, [0:0] notRunning1 = bits, U32, 1104, [1:1] @@ -3192,8 +3191,7 @@ enabledForAc1 = bits, U32, 1104, [4:4] hot1 = bits, U32, 1104, [5:5] cold1 = bits, U32, 1104, [6:6] disabledBySpeed1 = bits, U32, 1104, [7:7] -tempAlive1 = scalar, U08, 1108, "", 1, 0 -tempCode1 = scalar, U08, 1109, "", 1, 0 +radiatorFanStatus1 = scalar, U08, 1108, "", 1, 0 ; total TS size = 1112 isPrime = bits, U32, 1112, [0:0] engineTurnedRecently = bits, U32, 1112, [1:1] @@ -5703,8 +5701,7 @@ entry = enabledForAc0, "enabledForAc0", int, "%d" entry = hot0, "hot0", int, "%d" entry = cold0, "cold0", int, "%d" entry = disabledBySpeed0, "disabledBySpeed0", int, "%d" -entry = tempAlive0, "tempAlive0", int, "%d" -entry = tempCode0, "tempCode0", int, "%d" +entry = radiatorFanStatus0, "radiatorFanStatus0", int, "%d" entry = cranking1, "cranking1", int, "%d" entry = notRunning1, "notRunning1", int, "%d" entry = disabledWhileEngineStopped1, "disabledWhileEngineStopped1", int, "%d" @@ -5713,8 +5710,7 @@ entry = enabledForAc1, "enabledForAc1", int, "%d" entry = hot1, "hot1", int, "%d" entry = cold1, "cold1", int, "%d" entry = disabledBySpeed1, "disabledBySpeed1", int, "%d" -entry = tempAlive1, "tempAlive1", int, "%d" -entry = tempCode1, "tempCode1", int, "%d" +entry = radiatorFanStatus1, "radiatorFanStatus1", int, "%d" entry = isPrime, "isPrime", int, "%d" entry = engineTurnedRecently, "engineTurnedRecently", int, "%d" entry = isFuelPumpOn, "isFuelPumpOn", int, "%d" @@ -6703,8 +6699,7 @@ indicatorPanel = fan_control0IndicatorPanel, 2 dialog = fan_control0Dialog, "fan_control0" panel = fan_control0IndicatorPanel liveGraph = fan_control0_1_Graph, "Graph", South - graphLine = tempAlive0 - graphLine = tempCode0 + graphLine = radiatorFanStatus0 indicatorPanel = fan_control1IndicatorPanel, 2 indicator = {cranking1}, "cranking No", "cranking Yes" @@ -6719,8 +6714,7 @@ indicatorPanel = fan_control1IndicatorPanel, 2 dialog = fan_control1Dialog, "fan_control1" panel = fan_control1IndicatorPanel liveGraph = fan_control1_1_Graph, "Graph", South - graphLine = tempAlive1 - graphLine = tempCode1 + graphLine = radiatorFanStatus1 indicatorPanel = fuel_pump_controlIndicatorPanel, 2 indicator = {isPrime}, "isPrime No", "isPrime Yes" diff --git a/generated/tunerstudio/generated/signature_mega100.txt b/generated/tunerstudio/generated/signature_mega100.txt index 2053f74..190d69e 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.09.25.mega100.@@SIGNATURE_HASH@@" +#define TS_SIGNATURE "rusEFI main.2024.09.26.mega100.@@SIGNATURE_HASH@@"