From 4e0d3fdcbb1952f463f2a4bad5c7b4f090893bb5 Mon Sep 17 00:00:00 2001 From: GitHub git update Action Date: Tue, 17 Dec 2024 00:19:47 +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 +- .../engine_state_generated.h | 48 +++++++++---------- .../tunerstudio/generated/rusefi_mega100.ini | 9 ++-- .../generated/signature_mega100.txt | 2 +- 8 files changed, 38 insertions(+), 32 deletions(-) diff --git a/generated/console/binary/generated/data_logs.ini b/generated/console/binary/generated/data_logs.ini index 65f1653..a92626b 100644 --- a/generated/console/binary/generated/data_logs.ini +++ b/generated/console/binary/generated/data_logs.ini @@ -618,6 +618,7 @@ entry = lua_luaIgnCut, "lua_luaIgnCut", int, "%d" entry = lua_luaFuelCut, "lua_luaFuelCut", int, "%d" entry = lua_clutchDownState, "lua_clutchDownState", int, "%d" entry = lua_disableDecelerationFuelCutOff, "lua_disableDecelerationFuelCutOff", int, "%d" +entry = lua_torqueReductionState, "lua_torqueReductionState", int, "%d" entry = sd_tCharge, "Air: Charge temperature estimate", float, "%.3f" entry = sd_tChargeK, "Air: Charge temperature estimate K", float, "%.3f" entry = crankingFuel_coolantTemperatureCoefficient, "Fuel: cranking CLT mult", float, "%.3f" diff --git a/generated/console/binary/generated/fancy_content.ini b/generated/console/binary/generated/fancy_content.ini index fe665b4..547dc01 100644 --- a/generated/console/binary/generated/fancy_content.ini +++ b/generated/console/binary/generated/fancy_content.ini @@ -306,6 +306,7 @@ indicatorPanel = engine_stateIndicatorPanel, 2 indicator = {lua_luaFuelCut}, "luaFuelCut No", "luaFuelCut Yes" indicator = {lua_clutchDownState}, "clutchDownState No", "clutchDownState Yes" indicator = {lua_disableDecelerationFuelCutOff}, "disableDecelerationFuelCutOff No", "disableDecelerationFuelCutOff Yes" + indicator = {lua_torqueReductionState}, "torqueReductionState No", "torqueReductionState Yes" indicator = {startStopPhysicalState}, "startStopPhysicalState No", "startStopPhysicalState Yes" indicator = {acrActive}, "acrActive No", "acrActive Yes" indicator = {acrEngineMovedRecently}, "acrEngineMovedRecently No", "acrEngineMovedRecently Yes" diff --git a/generated/console/binary/generated/output_channels.ini b/generated/console/binary/generated/output_channels.ini index 217a498..b640d98 100644 --- a/generated/console/binary/generated/output_channels.ini +++ b/generated/console/binary/generated/output_channels.ini @@ -690,6 +690,7 @@ lua_luaIgnCut = bits, U32, 1220, [4:4] lua_luaFuelCut = bits, U32, 1220, [5:5] lua_clutchDownState = bits, U32, 1220, [6:6] lua_disableDecelerationFuelCutOff = bits, U32, 1220, [7:7] +lua_torqueReductionState = bits, U32, 1220, [8:8] sd_tCharge = scalar, S16, 1224, "deg C", 0.01, 0 sd_tChargeK = scalar, F32, 1228, "", 1, 0 crankingFuel_coolantTemperatureCoefficient = scalar, F32, 1232, "", 1, 0 diff --git a/generated/controllers/generated/rusefi_generated_mega100.h b/generated/controllers/generated/rusefi_generated_mega100.h index 4e8ee26..6c53709 100644 --- a/generated/controllers/generated/rusefi_generated_mega100.h +++ b/generated/controllers/generated/rusefi_generated_mega100.h @@ -1331,7 +1331,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges true #define show_vvt_output_pin true -#define SIGNATURE_HASH 933052303 +#define SIGNATURE_HASH 1579667585 #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" @@ -1793,7 +1793,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.16.mega100.933052303" +#define TS_SIGNATURE "rusEFI main.2024.12.17.mega100.1579667585" #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 2342d43..e7d7cbc 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 933052303 -#define TS_SIGNATURE "rusEFI main.2024.12.16.mega100.933052303" +#define SIGNATURE_HASH 1579667585 +#define TS_SIGNATURE "rusEFI main.2024.12.17.mega100.1579667585" diff --git a/generated/live_data_generated/engine_state_generated.h b/generated/live_data_generated/engine_state_generated.h index e63ba24..242c723 100644 --- a/generated/live_data_generated/engine_state_generated.h +++ b/generated/live_data_generated/engine_state_generated.h @@ -42,76 +42,76 @@ struct LuaAdjustments { bool disableDecelerationFuelCutOff : 1 {}; /** offset 8 bit 8 */ - bool unusedBit_10_8 : 1 {}; + bool torqueReductionState : 1 {}; /** offset 8 bit 9 */ - bool unusedBit_10_9 : 1 {}; + bool unusedBit_11_9 : 1 {}; /** offset 8 bit 10 */ - bool unusedBit_10_10 : 1 {}; + bool unusedBit_11_10 : 1 {}; /** offset 8 bit 11 */ - bool unusedBit_10_11 : 1 {}; + bool unusedBit_11_11 : 1 {}; /** offset 8 bit 12 */ - bool unusedBit_10_12 : 1 {}; + bool unusedBit_11_12 : 1 {}; /** offset 8 bit 13 */ - bool unusedBit_10_13 : 1 {}; + bool unusedBit_11_13 : 1 {}; /** offset 8 bit 14 */ - bool unusedBit_10_14 : 1 {}; + bool unusedBit_11_14 : 1 {}; /** offset 8 bit 15 */ - bool unusedBit_10_15 : 1 {}; + bool unusedBit_11_15 : 1 {}; /** offset 8 bit 16 */ - bool unusedBit_10_16 : 1 {}; + bool unusedBit_11_16 : 1 {}; /** offset 8 bit 17 */ - bool unusedBit_10_17 : 1 {}; + bool unusedBit_11_17 : 1 {}; /** offset 8 bit 18 */ - bool unusedBit_10_18 : 1 {}; + bool unusedBit_11_18 : 1 {}; /** offset 8 bit 19 */ - bool unusedBit_10_19 : 1 {}; + bool unusedBit_11_19 : 1 {}; /** offset 8 bit 20 */ - bool unusedBit_10_20 : 1 {}; + bool unusedBit_11_20 : 1 {}; /** offset 8 bit 21 */ - bool unusedBit_10_21 : 1 {}; + bool unusedBit_11_21 : 1 {}; /** offset 8 bit 22 */ - bool unusedBit_10_22 : 1 {}; + bool unusedBit_11_22 : 1 {}; /** offset 8 bit 23 */ - bool unusedBit_10_23 : 1 {}; + bool unusedBit_11_23 : 1 {}; /** offset 8 bit 24 */ - bool unusedBit_10_24 : 1 {}; + bool unusedBit_11_24 : 1 {}; /** offset 8 bit 25 */ - bool unusedBit_10_25 : 1 {}; + bool unusedBit_11_25 : 1 {}; /** offset 8 bit 26 */ - bool unusedBit_10_26 : 1 {}; + bool unusedBit_11_26 : 1 {}; /** offset 8 bit 27 */ - bool unusedBit_10_27 : 1 {}; + bool unusedBit_11_27 : 1 {}; /** offset 8 bit 28 */ - bool unusedBit_10_28 : 1 {}; + bool unusedBit_11_28 : 1 {}; /** offset 8 bit 29 */ - bool unusedBit_10_29 : 1 {}; + bool unusedBit_11_29 : 1 {}; /** offset 8 bit 30 */ - bool unusedBit_10_30 : 1 {}; + bool unusedBit_11_30 : 1 {}; /** offset 8 bit 31 */ - bool unusedBit_10_31 : 1 {}; + bool unusedBit_11_31 : 1 {}; }; static_assert(sizeof(LuaAdjustments) == 12); diff --git a/generated/tunerstudio/generated/rusefi_mega100.ini b/generated/tunerstudio/generated/rusefi_mega100.ini index f3671c9..a5f8a39 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.16.mega100.933052303" + signature = "rusEFI main.2024.12.17.mega100.1579667585" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI main.2024.12.16.mega100.933052303" ; signature is expected to be 7 or more characters. + signature= "rusEFI main.2024.12.17.mega100.1579667585" ; 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 @@ -3354,6 +3354,7 @@ lua_luaIgnCut = bits, U32, 1220, [4:4] lua_luaFuelCut = bits, U32, 1220, [5:5] lua_clutchDownState = bits, U32, 1220, [6:6] lua_disableDecelerationFuelCutOff = bits, U32, 1220, [7:7] +lua_torqueReductionState = bits, U32, 1220, [8:8] sd_tCharge = scalar, S16, 1224, "deg C", 0.01, 0 sd_tChargeK = scalar, F32, 1228, "", 1, 0 crankingFuel_coolantTemperatureCoefficient = scalar, F32, 1232, "", 1, 0 @@ -5958,6 +5959,7 @@ entry = lua_luaIgnCut, "lua_luaIgnCut", int, "%d" entry = lua_luaFuelCut, "lua_luaFuelCut", int, "%d" entry = lua_clutchDownState, "lua_clutchDownState", int, "%d" entry = lua_disableDecelerationFuelCutOff, "lua_disableDecelerationFuelCutOff", int, "%d" +entry = lua_torqueReductionState, "lua_torqueReductionState", int, "%d" entry = sd_tCharge, "Air: Charge temperature estimate", float, "%.3f" entry = sd_tChargeK, "Air: Charge temperature estimate K", float, "%.3f" entry = crankingFuel_coolantTemperatureCoefficient, "Fuel: cranking CLT mult", float, "%.3f" @@ -7011,6 +7013,7 @@ indicatorPanel = engine_stateIndicatorPanel, 2 indicator = {lua_luaFuelCut}, "luaFuelCut No", "luaFuelCut Yes" indicator = {lua_clutchDownState}, "clutchDownState No", "clutchDownState Yes" indicator = {lua_disableDecelerationFuelCutOff}, "disableDecelerationFuelCutOff No", "disableDecelerationFuelCutOff Yes" + indicator = {lua_torqueReductionState}, "torqueReductionState No", "torqueReductionState Yes" indicator = {startStopPhysicalState}, "startStopPhysicalState No", "startStopPhysicalState Yes" indicator = {acrActive}, "acrActive No", "acrActive Yes" indicator = {acrEngineMovedRecently}, "acrEngineMovedRecently No", "acrEngineMovedRecently Yes" @@ -9912,7 +9915,7 @@ dialog = tcuControls, "Transmission Settings" dialog = ShiftTorqueReductionSettingsDialog, "", yAxis field = "Enable Shift Torque Reduction", torqueReductionEnabled panel = TorqueReductionActivationModeDialog, {torqueReductionEnabled == 1} - panel = TorqueReductionSettings, {torqueReductionEnabled == 1 && ((torqueReductionActivationMode == 0 && torqueReductionTriggerPin != 0) || (torqueReductionActivationMode == 1 && launchActivatePin != 0))} + panel = TorqueReductionSettings, {torqueReductionEnabled == 1 && ((torqueReductionActivationMode == 0) || (torqueReductionActivationMode == 1 && launchActivatePin != 0))} dialog = ShiftTorqueReductionDialog, "", border panel = ShiftTorqueReductionSettingsDialog, West diff --git a/generated/tunerstudio/generated/signature_mega100.txt b/generated/tunerstudio/generated/signature_mega100.txt index 931954f..250961b 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.16.mega100.@@SIGNATURE_HASH@@" +#define TS_SIGNATURE "rusEFI main.2024.12.17.mega100.@@SIGNATURE_HASH@@"