diff --git a/generated/console/binary/generated/data_logs.ini b/generated/console/binary/generated/data_logs.ini index 494eab1..a5f3dbb 100644 --- a/generated/console/binary/generated/data_logs.ini +++ b/generated/console/binary/generated/data_logs.ini @@ -499,6 +499,10 @@ entry = speedCondition, "speedCondition", int, "%d" entry = tpsCondition, "tpsCondition", int, "%d" entry = isTorqueReductionTriggerPinValid, "isTorqueReductionTriggerPinValid", int, "%d" entry = torqueReductionTriggerPinState, "torqueReductionTriggerPinState", int, "%d" +entry = isTimeConditionSatisfied, "isTimeConditionSatisfied", int, "%d" +entry = isRpmConditionSatisfied, "isRpmConditionSatisfied", int, "%d" +entry = isAppConditionSatisfied, "isAppConditionSatisfied", int, "%d" +entry = isFlatShiftConditionSatisfied, "isFlatShiftConditionSatisfied", 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 6672a5c..ea278e6 100644 --- a/generated/console/binary/generated/fancy_content.ini +++ b/generated/console/binary/generated/fancy_content.ini @@ -141,6 +141,10 @@ dialog = launch_control_stateDialog, "launch_control_state" indicatorPanel = shift_torque_reduction_stateIndicatorPanel, 2 indicator = {isTorqueReductionTriggerPinValid}, "isTorqueReductionTriggerPinValid No", "isTorqueReductionTriggerPinValid Yes" indicator = {torqueReductionTriggerPinState}, "torqueReductionTriggerPinState No", "torqueReductionTriggerPinState Yes" + indicator = {isTimeConditionSatisfied}, "isTimeConditionSatisfied No", "isTimeConditionSatisfied Yes" + indicator = {isRpmConditionSatisfied}, "isRpmConditionSatisfied No", "isRpmConditionSatisfied Yes" + indicator = {isAppConditionSatisfied}, "isAppConditionSatisfied No", "isAppConditionSatisfied Yes" + indicator = {isFlatShiftConditionSatisfied}, "isFlatShiftConditionSatisfied No", "isFlatShiftConditionSatisfied Yes" dialog = shift_torque_reduction_stateDialog, "shift_torque_reduction_state" panel = shift_torque_reduction_stateIndicatorPanel diff --git a/generated/console/binary/generated/output_channels.ini b/generated/console/binary/generated/output_channels.ini index c982734..ab88522 100644 --- a/generated/console/binary/generated/output_channels.ini +++ b/generated/console/binary/generated/output_channels.ini @@ -567,6 +567,10 @@ tpsCondition = bits, U32, 1048, [11:11] ; total TS size = 1052 isTorqueReductionTriggerPinValid = bits, U32, 1052, [0:0] torqueReductionTriggerPinState = bits, U32, 1052, [1:1] +isTimeConditionSatisfied = bits, U32, 1052, [2:2] +isRpmConditionSatisfied = bits, U32, 1052, [3:3] +isAppConditionSatisfied = bits, U32, 1052, [4:4] +isFlatShiftConditionSatisfied = bits, U32, 1052, [5:5] ; total TS size = 1056 isAntilagCondition = bits, U32, 1056, [0:0] ALSMinRPMCondition = bits, U32, 1056, [1:1] diff --git a/generated/controllers/generated/rusefi_generated_mega100.h b/generated/controllers/generated/rusefi_generated_mega100.h index 4f70fb5..27c6c96 100644 --- a/generated/controllers/generated/rusefi_generated_mega100.h +++ b/generated/controllers/generated/rusefi_generated_mega100.h @@ -1291,7 +1291,7 @@ #define show_Proteus_presets false #define show_test_presets false #define show_vvt_output_pin true -#define SIGNATURE_HASH 322650839 +#define SIGNATURE_HASH 1207437600 #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" @@ -1753,7 +1753,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.10.04.mega100.322650839" +#define TS_SIGNATURE "rusEFI main.2024.10.05.mega100.1207437600" #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 0fd9adf..9274169 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 322650839 -#define TS_SIGNATURE "rusEFI main.2024.10.04.mega100.322650839" +#define SIGNATURE_HASH 1207437600 +#define TS_SIGNATURE "rusEFI main.2024.10.05.mega100.1207437600" diff --git a/generated/live_data_generated/shift_torque_reduction_state_generated.h b/generated/live_data_generated/shift_torque_reduction_state_generated.h index 0077dc7..cd5e774 100644 --- a/generated/live_data_generated/shift_torque_reduction_state_generated.h +++ b/generated/live_data_generated/shift_torque_reduction_state_generated.h @@ -13,94 +13,94 @@ struct shift_torque_reduction_state_s { bool torqueReductionTriggerPinState : 1 {}; /** offset 0 bit 2 */ - bool unusedBit_2_2 : 1 {}; + bool isTimeConditionSatisfied : 1 {}; /** offset 0 bit 3 */ - bool unusedBit_2_3 : 1 {}; + bool isRpmConditionSatisfied : 1 {}; /** offset 0 bit 4 */ - bool unusedBit_2_4 : 1 {}; + bool isAppConditionSatisfied : 1 {}; /** offset 0 bit 5 */ - bool unusedBit_2_5 : 1 {}; + bool isFlatShiftConditionSatisfied : 1 {}; /** offset 0 bit 6 */ - bool unusedBit_2_6 : 1 {}; + bool unusedBit_6_6 : 1 {}; /** offset 0 bit 7 */ - bool unusedBit_2_7 : 1 {}; + bool unusedBit_6_7 : 1 {}; /** offset 0 bit 8 */ - bool unusedBit_2_8 : 1 {}; + bool unusedBit_6_8 : 1 {}; /** offset 0 bit 9 */ - bool unusedBit_2_9 : 1 {}; + bool unusedBit_6_9 : 1 {}; /** offset 0 bit 10 */ - bool unusedBit_2_10 : 1 {}; + bool unusedBit_6_10 : 1 {}; /** offset 0 bit 11 */ - bool unusedBit_2_11 : 1 {}; + bool unusedBit_6_11 : 1 {}; /** offset 0 bit 12 */ - bool unusedBit_2_12 : 1 {}; + bool unusedBit_6_12 : 1 {}; /** offset 0 bit 13 */ - bool unusedBit_2_13 : 1 {}; + bool unusedBit_6_13 : 1 {}; /** offset 0 bit 14 */ - bool unusedBit_2_14 : 1 {}; + bool unusedBit_6_14 : 1 {}; /** offset 0 bit 15 */ - bool unusedBit_2_15 : 1 {}; + bool unusedBit_6_15 : 1 {}; /** offset 0 bit 16 */ - bool unusedBit_2_16 : 1 {}; + bool unusedBit_6_16 : 1 {}; /** offset 0 bit 17 */ - bool unusedBit_2_17 : 1 {}; + bool unusedBit_6_17 : 1 {}; /** offset 0 bit 18 */ - bool unusedBit_2_18 : 1 {}; + bool unusedBit_6_18 : 1 {}; /** offset 0 bit 19 */ - bool unusedBit_2_19 : 1 {}; + bool unusedBit_6_19 : 1 {}; /** offset 0 bit 20 */ - bool unusedBit_2_20 : 1 {}; + bool unusedBit_6_20 : 1 {}; /** offset 0 bit 21 */ - bool unusedBit_2_21 : 1 {}; + bool unusedBit_6_21 : 1 {}; /** offset 0 bit 22 */ - bool unusedBit_2_22 : 1 {}; + bool unusedBit_6_22 : 1 {}; /** offset 0 bit 23 */ - bool unusedBit_2_23 : 1 {}; + bool unusedBit_6_23 : 1 {}; /** offset 0 bit 24 */ - bool unusedBit_2_24 : 1 {}; + bool unusedBit_6_24 : 1 {}; /** offset 0 bit 25 */ - bool unusedBit_2_25 : 1 {}; + bool unusedBit_6_25 : 1 {}; /** offset 0 bit 26 */ - bool unusedBit_2_26 : 1 {}; + bool unusedBit_6_26 : 1 {}; /** offset 0 bit 27 */ - bool unusedBit_2_27 : 1 {}; + bool unusedBit_6_27 : 1 {}; /** offset 0 bit 28 */ - bool unusedBit_2_28 : 1 {}; + bool unusedBit_6_28 : 1 {}; /** offset 0 bit 29 */ - bool unusedBit_2_29 : 1 {}; + bool unusedBit_6_29 : 1 {}; /** offset 0 bit 30 */ - bool unusedBit_2_30 : 1 {}; + bool unusedBit_6_30 : 1 {}; /** offset 0 bit 31 */ - bool unusedBit_2_31 : 1 {}; + bool unusedBit_6_31 : 1 {}; }; static_assert(sizeof(shift_torque_reduction_state_s) == 4); diff --git a/generated/tunerstudio/generated/rusefi_mega100.ini b/generated/tunerstudio/generated/rusefi_mega100.ini index 369a1a9..2acc0b1 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.10.04.mega100.322650839" + signature = "rusEFI main.2024.10.05.mega100.1207437600" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI main.2024.10.04.mega100.322650839" ; signature is expected to be 7 or more characters. + signature= "rusEFI main.2024.10.05.mega100.1207437600" ; 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 @@ -3139,6 +3139,10 @@ tpsCondition = bits, U32, 1048, [11:11] ; total TS size = 1052 isTorqueReductionTriggerPinValid = bits, U32, 1052, [0:0] torqueReductionTriggerPinState = bits, U32, 1052, [1:1] +isTimeConditionSatisfied = bits, U32, 1052, [2:2] +isRpmConditionSatisfied = bits, U32, 1052, [3:3] +isAppConditionSatisfied = bits, U32, 1052, [4:4] +isFlatShiftConditionSatisfied = bits, U32, 1052, [5:5] ; total TS size = 1056 isAntilagCondition = bits, U32, 1056, [0:0] ALSMinRPMCondition = bits, U32, 1056, [1:1] @@ -5665,6 +5669,10 @@ entry = speedCondition, "speedCondition", int, "%d" entry = tpsCondition, "tpsCondition", int, "%d" entry = isTorqueReductionTriggerPinValid, "isTorqueReductionTriggerPinValid", int, "%d" entry = torqueReductionTriggerPinState, "torqueReductionTriggerPinState", int, "%d" +entry = isTimeConditionSatisfied, "isTimeConditionSatisfied", int, "%d" +entry = isRpmConditionSatisfied, "isRpmConditionSatisfied", int, "%d" +entry = isAppConditionSatisfied, "isAppConditionSatisfied", int, "%d" +entry = isFlatShiftConditionSatisfied, "isFlatShiftConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6418,7 +6426,7 @@ cmd_write_config = "Z\x00\x14\x00\x0a" cmd_etb_autotune = "Z\x00\x14\x00\x0C" cmd_enable_self_stim = "Z\x00\x14\x00\x0D" cmd_etb_auto_calibrate = "Z\x00\x14\x00\x0E" -cmd_disable_self_stim = "Z\x00\x14\x00\x0F" +cmd_disable_self_stim = "Z\x00\x14\x00\x0e" cmd_etb_autotune_stop = "Z\x00\x14\x00\x10" cmd_etb_auto_calibrate_2 = "Z\x00\x14\x00\x11" cmd_wideband_firmare_update = "Z\x00\x14\x00\x12" @@ -6644,6 +6652,10 @@ dialog = launch_control_stateDialog, "launch_control_state" indicatorPanel = shift_torque_reduction_stateIndicatorPanel, 2 indicator = {isTorqueReductionTriggerPinValid}, "isTorqueReductionTriggerPinValid No", "isTorqueReductionTriggerPinValid Yes" indicator = {torqueReductionTriggerPinState}, "torqueReductionTriggerPinState No", "torqueReductionTriggerPinState Yes" + indicator = {isTimeConditionSatisfied}, "isTimeConditionSatisfied No", "isTimeConditionSatisfied Yes" + indicator = {isRpmConditionSatisfied}, "isRpmConditionSatisfied No", "isRpmConditionSatisfied Yes" + indicator = {isAppConditionSatisfied}, "isAppConditionSatisfied No", "isAppConditionSatisfied Yes" + indicator = {isFlatShiftConditionSatisfied}, "isFlatShiftConditionSatisfied No", "isFlatShiftConditionSatisfied Yes" dialog = shift_torque_reduction_stateDialog, "shift_torque_reduction_state" panel = shift_torque_reduction_stateIndicatorPanel @@ -9430,6 +9442,7 @@ dialog = tcuControls, "Transmission Settings" dialog = etbAutotune, "PID Autotune" field = "First step: calibrate TPS and hit 'Burn'" + field = "should first OPEN, then CLOSE" commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, { (etbFunctions1 == 1 || etbFunctions2 == 1) && tps1_1AdcChannel != 0 && calibrationMode == 0} commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, { (etbFunctions1 == 2 || etbFunctions2 == 2) && tps2_1AdcChannel != 0 && calibrationMode == 0} field = "Second step" diff --git a/generated/tunerstudio/generated/signature_mega100.txt b/generated/tunerstudio/generated/signature_mega100.txt index 33f4570..2cd3649 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.10.04.mega100.@@SIGNATURE_HASH@@" +#define TS_SIGNATURE "rusEFI main.2024.10.05.mega100.@@SIGNATURE_HASH@@"