diff --git a/generated/controllers/generated/rusefi_generated_XYZ.h b/generated/controllers/generated/rusefi_generated_XYZ.h index 8c2408c..0521c06 100644 --- a/generated/controllers/generated/rusefi_generated_XYZ.h +++ b/generated/controllers/generated/rusefi_generated_XYZ.h @@ -1333,7 +1333,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 3168824557 +#define SIGNATURE_HASH 2103848931 #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" @@ -1392,11 +1392,12 @@ #define TOOTH_PACKET_SIZE 2 #define TOP_DEAD_CENTER_MESSAGE "r" #define TORQUE_CURVE_SIZE 6 -#define torqueReductionActivationMode_e_auto_enum 0="TORQUE_REDUCTION_BUTTON",1="LAUNCH_BUTTON",2="TORQUE_REDUCTION_CLUTCH_DOWN_SWITCH" -#define torqueReductionActivationMode_e_enum "Torque Reduction Button", "Launch Button", "Clutch Down Switch" +#define torqueReductionActivationMode_e_auto_enum 0="TORQUE_REDUCTION_BUTTON",1="LAUNCH_BUTTON",2="TORQUE_REDUCTION_CLUTCH_DOWN_SWITCH",3="TORQUE_REDUCTION_CLUTCH_UP_SWITCH" +#define torqueReductionActivationMode_e_enum "Torque Reduction Button", "Launch Button", "Clutch Down Switch", "Clutch Up Switch" #define torqueReductionActivationMode_e_LAUNCH_BUTTON 1 #define torqueReductionActivationMode_e_TORQUE_REDUCTION_BUTTON 0 #define torqueReductionActivationMode_e_TORQUE_REDUCTION_CLUTCH_DOWN_SWITCH 2 +#define torqueReductionActivationMode_e_TORQUE_REDUCTION_CLUTCH_UP_SWITCH 3 #define TOTAL_CONFIG_SIZE 23936 #define TPS_2_BYTE_PACKING_MULT 100 #define TPS_PPS_TOO_HIGH_THRESHOLD 110 @@ -1737,6 +1738,7 @@ #define ts_show_main_relay true #define ts_show_main_relay_microRusEFI_message false #define ts_show_mc33810 false +#define ts_show_mc33810_cs false #define ts_show_multispark true #define ts_show_number_of_cylinders true #define ts_show_odd_fire true @@ -1796,7 +1798,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.18.XYZ.3168824557" +#define TS_SIGNATURE "rusEFI main.2024.12.19.XYZ.2103848931" #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 b1db11a..44cf1c3 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 3168824557 -#define TS_SIGNATURE "rusEFI main.2024.12.18.XYZ.3168824557" +#define SIGNATURE_HASH 2103848931 +#define TS_SIGNATURE "rusEFI main.2024.12.19.XYZ.2103848931" diff --git a/generated/tunerstudio/generated/rusefi_XYZ.ini b/generated/tunerstudio/generated/rusefi_XYZ.ini index 7160ec4..162d871 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.18.XYZ.3168824557" + signature = "rusEFI main.2024.12.19.XYZ.2103848931" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI main.2024.12.18.XYZ.3168824557" ; signature is expected to be 7 or more characters. + signature= "rusEFI main.2024.12.19.XYZ.2103848931" ; 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 @@ -1006,7 +1006,7 @@ idleTimingPid_minValue = scalar, S16, 2384, "", 1, 0, -30000, 30000, 0 idleTimingPid_maxValue = scalar, S16, 2386, "", 1, 0, -30000, 30000, 0 idleTimingSoftEntryTime = scalar, F32, 2388, "", 1, 0, 0, 100, 1 torqueReductionTriggerPinMode = bits, U08, 2392, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" -torqueReductionActivationMode = bits, S08, 2393, [0:1], "Torque Reduction Button", "Launch Button", "Clutch Down Switch", "INVALID" +torqueReductionActivationMode = bits, S08, 2393, [0:1], "Torque Reduction Button", "Launch Button", "Clutch Down Switch", "Clutch Up Switch" tpsAccelFractionPeriod = scalar, S16, 2394, "cycles", 1, 0, 0, 500, 0 tpsAccelFractionDivisor = scalar, F32, 2396, "coef", 1, 0, 1, 100, 2 tle8888spiDevice = bits, U08, 2400, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4", "SPI5", "SPI6", "INVALID" @@ -4548,7 +4548,7 @@ curve = rangeMatrix, "Range Switch Input Matrix" zBins = targetAfrBlends1_table gridOrient = 250, 0, 340 - table = targetAfrBlend1Table, targetAfrBlend1Map, "Target AFR blend 2", 1 + table = targetAfrBlend2Table, targetAfrBlend2Map, "Target AFR blend 2", 1 xyLabels = "RPM", "TPS" xBins = targetAfrBlends2_rpmBins, RPMValue yBins = targetAfrBlends2_loadBins, TPSValue @@ -8167,8 +8167,6 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "trigger stimulator output #2", triggerSimulatorPins2 field = camSimulatorPin, camSimulatorPin field = "tle6240_cs", tle6240_cs - field = "mc33810_cs", mc33810_cs1 - field = "mc33810_csPinMode", mc33810_csPinMode field = "tle6240 SPI", tle6240spiDevice dialog = allPins1_2 @@ -9848,23 +9846,27 @@ dialog = tcuControls, "Transmission Settings" dialog = TorqueReductionButtonDialog, "Torque Reduction Button" field = "Torque Reduction Button", torqueReductionTriggerPin field = "Torque Reduction Inverted", torqueReductionTriggerPinInverted, {torqueReductionTriggerPin != 0} - field = "Torque Reduction Mode", torqueReductionTriggerPinMode, {torqueReductionTriggerPin != 0} dialog = LaunchButtonDialog, "Launch Button" field = "Launch Button", launchActivatePin field = "Launch Button Inverted", launchActivateInverted, {launchActivatePin != 0} - field = "Launch Button Mode", launchActivatePinMode, {launchActivatePin != 0} dialog = ClutchDownDialog, "Clutch Down" field = "Clutch Down", clutchDownPin field = "Clutch Down Inverted", clutchDownPinInverted, {clutchDownPin != 0} field = "Clutch Down Mode", clutchDownPinMode, {clutchDownPin != 0} + dialog = ClutchUpDialog, "Clutch Up" + field = "Clutch Up", clutchUpPin + field = "Clutch Up Inverted", clutchUpPinInverted, {clutchUpPin != 0} + field = "Clutch Up Mode", clutchUpPinMode, {clutchUpPin != 0} + dialog = TorqueReductionActivationModeDialog, "Activation", yAxis field = "Activation Mode", torqueReductionActivationMode panel = TorqueReductionButtonDialog, {torqueReductionActivationMode == 0} panel = LaunchButtonDialog, {torqueReductionActivationMode == 1} panel = ClutchDownDialog, {torqueReductionActivationMode == 2} + panel = ClutchUpDialog, {torqueReductionActivationMode == 3} dialog = TorqueReductionSettings, "Settings" field = "Limit Torque Reduction Time", limitTorqueReductionTime @@ -9877,7 +9879,7 @@ dialog = tcuControls, "Transmission Settings" dialog = ShiftTorqueReductionSettingsDialog, "", yAxis field = "Enable Shift Torque Reduction", torqueReductionEnabled panel = TorqueReductionActivationModeDialog, {torqueReductionEnabled == 1} - panel = TorqueReductionSettings, {torqueReductionEnabled == 1 && ((torqueReductionActivationMode == 0) || (torqueReductionActivationMode == 1 && launchActivatePin != 0) || (torqueReductionActivationMode == 2))} + panel = TorqueReductionSettings, {torqueReductionEnabled == 1 && ((torqueReductionActivationMode == 0) || (torqueReductionActivationMode == 1 && launchActivatePin != 0) || (torqueReductionActivationMode == 2) || (torqueReductionActivationMode == 3))} dialog = ShiftTorqueReductionDialog, "", border panel = ShiftTorqueReductionSettingsDialog, West @@ -9993,8 +9995,6 @@ dialog = tcuControls, "Transmission Settings" dialog = mc33810Dialog, "MC33810 IGN/INJ driver" field = "SPI settings" - field = "mc33810_cs", mc33810_cs1 - field = "mc33810_csPinMode", mc33810_csPinMode field = "Chip configuration" field = "Nominal coil charge current (3..10.75)", mc33810Nomi field = "Maximum coil charge current (6..21)", mc33810Maxi diff --git a/generated/tunerstudio/generated/signature_XYZ.txt b/generated/tunerstudio/generated/signature_XYZ.txt index 693b61b..b8d7d6f 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.18.XYZ.@@SIGNATURE_HASH@@" +#define TS_SIGNATURE "rusEFI main.2024.12.19.XYZ.@@SIGNATURE_HASH@@"