diff --git a/generated/console/binary/generated/data_logs.ini b/generated/console/binary/generated/data_logs.ini index 8394b57..49291cd 100644 --- a/generated/console/binary/generated/data_logs.ini +++ b/generated/console/binary/generated/data_logs.ini @@ -527,13 +527,6 @@ entry = isTimeConditionSatisfied, "isTimeConditionSatisfied", int, "%d" entry = isRpmConditionSatisfied, "isRpmConditionSatisfied", int, "%d" entry = isAppConditionSatisfied, "isAppConditionSatisfied", int, "%d" entry = isFlatShiftConditionSatisfied, "isFlatShiftConditionSatisfied", int, "%d" -entry = isArmed, "isArmed", int, "%d" -entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" -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" @@ -576,6 +569,13 @@ entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = acCompressorState, "AC compressor on", int, "%d" entry = acPressureTooLow, "AC pressure too low", int, "%d" entry = acPressureTooHigh, "AC pressure too high", int, "%d" +entry = isArmed, "isArmed", int, "%d" +entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" +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 = cranking0, "cranking0", int, "%d" entry = notRunning0, "notRunning0", int, "%d" entry = disabledWhileEngineStopped0, "disabledWhileEngineStopped0", int, "%d" diff --git a/generated/console/binary/generated/fancy_content.ini b/generated/console/binary/generated/fancy_content.ini index 81d1eac..b33dbc0 100644 --- a/generated/console/binary/generated/fancy_content.ini +++ b/generated/console/binary/generated/fancy_content.ini @@ -175,18 +175,6 @@ indicatorPanel = shift_torque_reduction_stateIndicatorPanel, 2 dialog = shift_torque_reduction_stateDialog, "shift_torque_reduction_state" panel = shift_torque_reduction_stateIndicatorPanel -indicatorPanel = nitrous_control_stateIndicatorPanel, 2 - indicator = {isArmed}, "isArmed No", "isArmed Yes" - indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" - indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" - 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 - indicatorPanel = antilag_system_stateIndicatorPanel, 2 indicator = {isAntilagCondition}, "isAntilagCondition No", "isAntilagCondition Yes" indicator = {ALSMinRPMCondition}, "ALSMinRPMCondition No", "ALSMinRPMCondition Yes" @@ -248,6 +236,18 @@ dialog = ac_controlDialog, "ac_control" liveGraph = ac_control_1_Graph, "Graph", South graphLine = acButtonState +indicatorPanel = nitrous_control_stateIndicatorPanel, 2 + indicator = {isArmed}, "isArmed No", "isArmed Yes" + indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" + indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" + 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 + indicatorPanel = fan_control0IndicatorPanel, 2 indicator = {cranking0}, "cranking No", "cranking Yes" indicator = {notRunning0}, "notRunning No", "notRunning Yes" diff --git a/generated/console/binary/generated/fancy_menu.ini b/generated/console/binary/generated/fancy_menu.ini index 2119423..ea40e02 100644 --- a/generated/console/binary/generated/fancy_menu.ini +++ b/generated/console/binary/generated/fancy_menu.ini @@ -7,10 +7,10 @@ subMenu = injector_modelDialog, "injector_model" subMenu = launch_control_stateDialog, "launch_control_state" subMenu = shift_torque_reduction_stateDialog, "shift_torque_reduction_state" - subMenu = nitrous_control_stateDialog, "nitrous_control_state" subMenu = antilag_system_stateDialog, "antilag_system_state" subMenu = boost_controlDialog, "boost_control" subMenu = ac_controlDialog, "ac_control" + subMenu = nitrous_control_stateDialog, "nitrous_control_state" subMenu = fan_control0Dialog, "fan_control0" subMenu = fan_control1Dialog, "fan_control1" subMenu = fuel_pump_controlDialog, "fuel_pump_control" diff --git a/generated/console/binary/generated/live_data_fragments.h b/generated/console/binary/generated/live_data_fragments.h index 0b9e8fb..635a32e 100644 --- a/generated/console/binary/generated/live_data_fragments.h +++ b/generated/console/binary/generated/live_data_fragments.h @@ -9,10 +9,10 @@ decl_frag{}, decl_frag{}, decl_frag{}, decl_frag{}, -decl_frag{}, decl_frag{}, decl_frag{}, decl_frag{}, +decl_frag{}, decl_frag{}, // fan1 decl_frag{}, // fan2 decl_frag{}, diff --git a/generated/console/binary/generated/live_data_ids.h b/generated/console/binary/generated/live_data_ids.h index 9954c23..b5b4cbb 100644 --- a/generated/console/binary/generated/live_data_ids.h +++ b/generated/console/binary/generated/live_data_ids.h @@ -13,10 +13,10 @@ LDS_high_pressure_fuel_pump, LDS_injector_model, LDS_launch_control_state, LDS_shift_torque_reduction_state, -LDS_nitrous_control_state, LDS_antilag_system_state, LDS_boost_control, LDS_ac_control, +LDS_nitrous_control_state, LDS_fan_control0, LDS_fan_control1, LDS_fuel_pump_control, @@ -51,10 +51,10 @@ LDS_lambda_monitor, #define INJECTOR_MODEL_BASE_ADDRESS 1108 #define LAUNCH_CONTROL_STATE_BASE_ADDRESS 1120 #define SHIFT_TORQUE_REDUCTION_STATE_BASE_ADDRESS 1128 -#define NITROUS_CONTROL_STATE_BASE_ADDRESS 1132 -#define ANTILAG_SYSTEM_STATE_BASE_ADDRESS 1136 -#define BOOST_CONTROL_BASE_ADDRESS 1148 -#define AC_CONTROL_BASE_ADDRESS 1172 +#define ANTILAG_SYSTEM_STATE_BASE_ADDRESS 1132 +#define BOOST_CONTROL_BASE_ADDRESS 1144 +#define AC_CONTROL_BASE_ADDRESS 1168 +#define NITROUS_CONTROL_STATE_BASE_ADDRESS 1176 #define FAN_CONTROL_BASE_ADDRESS 1180 #define FUEL_PUMP_CONTROL_BASE_ADDRESS 1196 #define MAIN_RELAY_BASE_ADDRESS 1200 diff --git a/generated/console/binary/generated/output_channels.ini b/generated/console/binary/generated/output_channels.ini index 1e9a2c9..93263e9 100644 --- a/generated/console/binary/generated/output_channels.ini +++ b/generated/console/binary/generated/output_channels.ini @@ -591,58 +591,58 @@ isRpmConditionSatisfied = bits, U32, 1128, [3:3] isAppConditionSatisfied = bits, U32, 1128, [4:4] isFlatShiftConditionSatisfied = bits, U32, 1128, [5:5] ; total TS size = 1132 -isArmed = bits, U32, 1132, [0:0] -isTpsConditionSatisfied = bits, U32, 1132, [1:1] -isCltConditionSatisfied = bits, U32, 1132, [2:2] -isMapConditionSatisfied = bits, U32, 1132, [3:3] -isAfrConditionSatisfied = bits, U32, 1132, [4:4] -isNitrousRpmConditionSatisfied = bits, U32, 1132, [5:5] -isNitrousConditionSatisfied = bits, U32, 1132, [6:6] -; total TS size = 1136 -isAntilagCondition = bits, U32, 1136, [0:0] -ALSMinRPMCondition = bits, U32, 1136, [1:1] -ALSMaxRPMCondition = bits, U32, 1136, [2:2] -ALSMinCLTCondition = bits, U32, 1136, [3:3] -ALSMaxCLTCondition = bits, U32, 1136, [4:4] -ALSMaxThrottleIntentCondition = bits, U32, 1136, [5:5] -isALSSwitchActivated = bits, U32, 1136, [6:6] -ALSActivatePinState = bits, U32, 1136, [7:7] -ALSSwitchCondition = bits, U32, 1136, [8:8] -ALSTimerCondition = bits, U32, 1136, [9:9] -fuelALSCorrection = scalar, F32, 1140, "", 1, 0 -timingALSCorrection = scalar, S16, 1144, "deg", 0.01, 0 -timingALSSkip = scalar, S16, 1146, "deg", 0.01, 0 -; total TS size = 1148 -isTpsInvalid = bits, U32, 1148, [0:0] -m_shouldResetPid = bits, U32, 1148, [1:1] -isBelowClosedLoopThreshold = bits, U32, 1148, [2:2] -isNotClosedLoop = bits, U32, 1148, [3:3] -isZeroRpm = bits, U32, 1148, [4:4] -hasInitBoost = bits, U32, 1148, [5:5] -rpmTooLow = bits, U32, 1148, [6:6] -tpsTooLow = bits, U32, 1148, [7:7] -mapTooLow = bits, U32, 1148, [8:8] -isPlantValid = bits, U32, 1148, [9:9] -isBoostControlled = bits, U32, 1148, [10:10] -luaTargetAdd = scalar, S16, 1152, "v", 0.5,0 -boostOutput = scalar, S16, 1154, "percent", 0.01,0 -luaTargetMult = scalar, F32, 1156, "v", 1,0 -openLoopPart = scalar, F32, 1160, "v", 1,0 -luaOpenLoopAdd = scalar, F32, 1164, "v", 1,0 -boostControllerClosedLoopPart = scalar, S08, 1168, "%", 0.5,0 -boostControlTarget = scalar, S16, 1170, "kPa", 0.03333333333333333,0 -; total TS size = 1172 -acButtonState = scalar, S08, 1172, "", 1, 0 -m_acEnabled = bits, U32, 1176, [0:0] -engineTooSlow = bits, U32, 1176, [1:1] -engineTooFast = bits, U32, 1176, [2:2] -noClt = bits, U32, 1176, [3:3] -engineTooHot = bits, U32, 1176, [4:4] -tpsTooHigh = bits, U32, 1176, [5:5] -isDisabledByLua = bits, U32, 1176, [6:6] -acCompressorState = bits, U32, 1176, [7:7] -acPressureTooLow = bits, U32, 1176, [8:8] -acPressureTooHigh = bits, U32, 1176, [9:9] +isAntilagCondition = bits, U32, 1132, [0:0] +ALSMinRPMCondition = bits, U32, 1132, [1:1] +ALSMaxRPMCondition = bits, U32, 1132, [2:2] +ALSMinCLTCondition = bits, U32, 1132, [3:3] +ALSMaxCLTCondition = bits, U32, 1132, [4:4] +ALSMaxThrottleIntentCondition = bits, U32, 1132, [5:5] +isALSSwitchActivated = bits, U32, 1132, [6:6] +ALSActivatePinState = bits, U32, 1132, [7:7] +ALSSwitchCondition = bits, U32, 1132, [8:8] +ALSTimerCondition = bits, U32, 1132, [9:9] +fuelALSCorrection = scalar, F32, 1136, "", 1, 0 +timingALSCorrection = scalar, S16, 1140, "deg", 0.01, 0 +timingALSSkip = scalar, S16, 1142, "deg", 0.01, 0 +; total TS size = 1144 +isTpsInvalid = bits, U32, 1144, [0:0] +m_shouldResetPid = bits, U32, 1144, [1:1] +isBelowClosedLoopThreshold = bits, U32, 1144, [2:2] +isNotClosedLoop = bits, U32, 1144, [3:3] +isZeroRpm = bits, U32, 1144, [4:4] +hasInitBoost = bits, U32, 1144, [5:5] +rpmTooLow = bits, U32, 1144, [6:6] +tpsTooLow = bits, U32, 1144, [7:7] +mapTooLow = bits, U32, 1144, [8:8] +isPlantValid = bits, U32, 1144, [9:9] +isBoostControlled = bits, U32, 1144, [10:10] +luaTargetAdd = scalar, S16, 1148, "v", 0.5,0 +boostOutput = scalar, S16, 1150, "percent", 0.01,0 +luaTargetMult = scalar, F32, 1152, "v", 1,0 +openLoopPart = scalar, F32, 1156, "v", 1,0 +luaOpenLoopAdd = scalar, F32, 1160, "v", 1,0 +boostControllerClosedLoopPart = scalar, S08, 1164, "%", 0.5,0 +boostControlTarget = scalar, S16, 1166, "kPa", 0.03333333333333333,0 +; total TS size = 1168 +acButtonState = scalar, S08, 1168, "", 1, 0 +m_acEnabled = bits, U32, 1172, [0:0] +engineTooSlow = bits, U32, 1172, [1:1] +engineTooFast = bits, U32, 1172, [2:2] +noClt = bits, U32, 1172, [3:3] +engineTooHot = bits, U32, 1172, [4:4] +tpsTooHigh = bits, U32, 1172, [5:5] +isDisabledByLua = bits, U32, 1172, [6:6] +acCompressorState = bits, U32, 1172, [7:7] +acPressureTooLow = bits, U32, 1172, [8:8] +acPressureTooHigh = bits, U32, 1172, [9:9] +; total TS size = 1176 +isArmed = bits, U32, 1176, [0:0] +isTpsConditionSatisfied = bits, U32, 1176, [1:1] +isCltConditionSatisfied = bits, U32, 1176, [2:2] +isMapConditionSatisfied = bits, U32, 1176, [3:3] +isAfrConditionSatisfied = bits, U32, 1176, [4:4] +isNitrousRpmConditionSatisfied = bits, U32, 1176, [5:5] +isNitrousConditionSatisfied = bits, U32, 1176, [6:6] ; total TS size = 1180 cranking0 = bits, U32, 1180, [0:0] notRunning0 = bits, U32, 1180, [1:1] diff --git a/generated/controllers/generated/engine_configuration_generated_structures_hellen-f4-community.h b/generated/controllers/generated/engine_configuration_generated_structures_hellen-f4-community.h index d599aa6..fdb0c46 100644 --- a/generated/controllers/generated/engine_configuration_generated_structures_hellen-f4-community.h +++ b/generated/controllers/generated/engine_configuration_generated_structures_hellen-f4-community.h @@ -4910,9 +4910,17 @@ struct engine_configuration_s { */ scaled_channel dfcoRetardRampInTime; /** - * units: units * offset 3962 */ + output_pin_e nitrousRelayPin; + /** + * offset 3964 + */ + pin_output_mode_e nitrousRelayPinMode; + /** + * units: units + * offset 3965 + */ uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; /** * need 4 byte alignment diff --git a/generated/controllers/generated/rusefi_generated_hellen-f4-community.h b/generated/controllers/generated/rusefi_generated_hellen-f4-community.h index f9064ef..30c482e 100644 --- a/generated/controllers/generated/rusefi_generated_hellen-f4-community.h +++ b/generated/controllers/generated/rusefi_generated_hellen-f4-community.h @@ -352,7 +352,7 @@ #define ego_sensor_e_ES_Innovate_MTX_L 1 #define ego_sensor_e_ES_PLX 4 #define EGT_CHANNEL_COUNT 8 -#define END_OF_CALIBRATION_PADDING 76 +#define END_OF_CALIBRATION_PADDING 73 #define engine_configuration_s_size 4040 #define engine_load_mode_e_auto_enum 0="LM_SPEED_DENSITY",2="LM_ALPHA_N",3="LM_LUA",100="LM_MOCK",1="LM_REAL_MAF" #define engine_load_mode_e_enum "Speed Density", "MAF Air Charge", "Alpha-N", "Lua" @@ -1330,7 +1330,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 1119801647 +#define SIGNATURE_HASH 2958351303 #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" @@ -1791,7 +1791,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.05.hellen-f4-community.1119801647" +#define TS_SIGNATURE "rusEFI main.2024.12.06.hellen-f4-community.2958351303" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/generated/controllers/generated/signature_hellen-f4-community.h b/generated/controllers/generated/signature_hellen-f4-community.h index d58a2c1..4d192e4 100644 --- a/generated/controllers/generated/signature_hellen-f4-community.h +++ b/generated/controllers/generated/signature_hellen-f4-community.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 1119801647 -#define TS_SIGNATURE "rusEFI main.2024.12.05.hellen-f4-community.1119801647" +#define SIGNATURE_HASH 2958351303 +#define TS_SIGNATURE "rusEFI main.2024.12.06.hellen-f4-community.2958351303" diff --git a/generated/tunerstudio/generated/rusefi_hellen-f4-community.ini b/generated/tunerstudio/generated/rusefi_hellen-f4-community.ini index 32791fc..89c0075 100644 --- a/generated/tunerstudio/generated/rusefi_hellen-f4-community.ini +++ b/generated/tunerstudio/generated/rusefi_hellen-f4-community.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI main.2024.12.05.hellen-f4-community.1119801647" + signature = "rusEFI main.2024.12.06.hellen-f4-community.2958351303" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI main.2024.12.05.hellen-f4-community.1119801647" ; signature is expected to be 7 or more characters. + signature= "rusEFI main.2024.12.06.hellen-f4-community.2958351303" ; 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 @@ -1441,7 +1441,9 @@ nitrousDeactivationRpm = scalar, U16, 3956, "rpm", 1, 0, 0, 20000, 0 nitrousDeactivationRpmWindow = scalar, U16, 3958, "rpm", 1, 0, 0, 20000, 0 dfcoRetardDeg = scalar, U08, 3960, "deg", 1, 0, 0, 30, 0 dfcoRetardRampInTime = scalar, U08, 3961, "s", 0.1, 0, 0, 1, 1 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3962, [76], "units", 1, 0, 0, 1, 0 +nitrousRelayPin = bits, U16, 3962, [0:8], $output_pin_e_list +nitrousRelayPinMode = bits, U08, 3964, [0:1], "default", "default inverted", "open collector", "open collector inverted" +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3965, [73], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4040, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, U16, 4184, [6], "count", 1, 0, 0, 64000, 0 postCrankingCLTBins = array, S16, 4196, [6], "C", 1, 0, -100, 250, 0 @@ -3234,58 +3236,58 @@ isRpmConditionSatisfied = bits, U32, 1128, [3:3] isAppConditionSatisfied = bits, U32, 1128, [4:4] isFlatShiftConditionSatisfied = bits, U32, 1128, [5:5] ; total TS size = 1132 -isArmed = bits, U32, 1132, [0:0] -isTpsConditionSatisfied = bits, U32, 1132, [1:1] -isCltConditionSatisfied = bits, U32, 1132, [2:2] -isMapConditionSatisfied = bits, U32, 1132, [3:3] -isAfrConditionSatisfied = bits, U32, 1132, [4:4] -isNitrousRpmConditionSatisfied = bits, U32, 1132, [5:5] -isNitrousConditionSatisfied = bits, U32, 1132, [6:6] -; total TS size = 1136 -isAntilagCondition = bits, U32, 1136, [0:0] -ALSMinRPMCondition = bits, U32, 1136, [1:1] -ALSMaxRPMCondition = bits, U32, 1136, [2:2] -ALSMinCLTCondition = bits, U32, 1136, [3:3] -ALSMaxCLTCondition = bits, U32, 1136, [4:4] -ALSMaxThrottleIntentCondition = bits, U32, 1136, [5:5] -isALSSwitchActivated = bits, U32, 1136, [6:6] -ALSActivatePinState = bits, U32, 1136, [7:7] -ALSSwitchCondition = bits, U32, 1136, [8:8] -ALSTimerCondition = bits, U32, 1136, [9:9] -fuelALSCorrection = scalar, F32, 1140, "", 1, 0 -timingALSCorrection = scalar, S16, 1144, "deg", 0.01, 0 -timingALSSkip = scalar, S16, 1146, "deg", 0.01, 0 -; total TS size = 1148 -isTpsInvalid = bits, U32, 1148, [0:0] -m_shouldResetPid = bits, U32, 1148, [1:1] -isBelowClosedLoopThreshold = bits, U32, 1148, [2:2] -isNotClosedLoop = bits, U32, 1148, [3:3] -isZeroRpm = bits, U32, 1148, [4:4] -hasInitBoost = bits, U32, 1148, [5:5] -rpmTooLow = bits, U32, 1148, [6:6] -tpsTooLow = bits, U32, 1148, [7:7] -mapTooLow = bits, U32, 1148, [8:8] -isPlantValid = bits, U32, 1148, [9:9] -isBoostControlled = bits, U32, 1148, [10:10] -luaTargetAdd = scalar, S16, 1152, "v", 0.5,0 -boostOutput = scalar, S16, 1154, "percent", 0.01,0 -luaTargetMult = scalar, F32, 1156, "v", 1,0 -openLoopPart = scalar, F32, 1160, "v", 1,0 -luaOpenLoopAdd = scalar, F32, 1164, "v", 1,0 -boostControllerClosedLoopPart = scalar, S08, 1168, "%", 0.5,0 -boostControlTarget = scalar, S16, 1170, "kPa", 0.03333333333333333,0 -; total TS size = 1172 -acButtonState = scalar, S08, 1172, "", 1, 0 -m_acEnabled = bits, U32, 1176, [0:0] -engineTooSlow = bits, U32, 1176, [1:1] -engineTooFast = bits, U32, 1176, [2:2] -noClt = bits, U32, 1176, [3:3] -engineTooHot = bits, U32, 1176, [4:4] -tpsTooHigh = bits, U32, 1176, [5:5] -isDisabledByLua = bits, U32, 1176, [6:6] -acCompressorState = bits, U32, 1176, [7:7] -acPressureTooLow = bits, U32, 1176, [8:8] -acPressureTooHigh = bits, U32, 1176, [9:9] +isAntilagCondition = bits, U32, 1132, [0:0] +ALSMinRPMCondition = bits, U32, 1132, [1:1] +ALSMaxRPMCondition = bits, U32, 1132, [2:2] +ALSMinCLTCondition = bits, U32, 1132, [3:3] +ALSMaxCLTCondition = bits, U32, 1132, [4:4] +ALSMaxThrottleIntentCondition = bits, U32, 1132, [5:5] +isALSSwitchActivated = bits, U32, 1132, [6:6] +ALSActivatePinState = bits, U32, 1132, [7:7] +ALSSwitchCondition = bits, U32, 1132, [8:8] +ALSTimerCondition = bits, U32, 1132, [9:9] +fuelALSCorrection = scalar, F32, 1136, "", 1, 0 +timingALSCorrection = scalar, S16, 1140, "deg", 0.01, 0 +timingALSSkip = scalar, S16, 1142, "deg", 0.01, 0 +; total TS size = 1144 +isTpsInvalid = bits, U32, 1144, [0:0] +m_shouldResetPid = bits, U32, 1144, [1:1] +isBelowClosedLoopThreshold = bits, U32, 1144, [2:2] +isNotClosedLoop = bits, U32, 1144, [3:3] +isZeroRpm = bits, U32, 1144, [4:4] +hasInitBoost = bits, U32, 1144, [5:5] +rpmTooLow = bits, U32, 1144, [6:6] +tpsTooLow = bits, U32, 1144, [7:7] +mapTooLow = bits, U32, 1144, [8:8] +isPlantValid = bits, U32, 1144, [9:9] +isBoostControlled = bits, U32, 1144, [10:10] +luaTargetAdd = scalar, S16, 1148, "v", 0.5,0 +boostOutput = scalar, S16, 1150, "percent", 0.01,0 +luaTargetMult = scalar, F32, 1152, "v", 1,0 +openLoopPart = scalar, F32, 1156, "v", 1,0 +luaOpenLoopAdd = scalar, F32, 1160, "v", 1,0 +boostControllerClosedLoopPart = scalar, S08, 1164, "%", 0.5,0 +boostControlTarget = scalar, S16, 1166, "kPa", 0.03333333333333333,0 +; total TS size = 1168 +acButtonState = scalar, S08, 1168, "", 1, 0 +m_acEnabled = bits, U32, 1172, [0:0] +engineTooSlow = bits, U32, 1172, [1:1] +engineTooFast = bits, U32, 1172, [2:2] +noClt = bits, U32, 1172, [3:3] +engineTooHot = bits, U32, 1172, [4:4] +tpsTooHigh = bits, U32, 1172, [5:5] +isDisabledByLua = bits, U32, 1172, [6:6] +acCompressorState = bits, U32, 1172, [7:7] +acPressureTooLow = bits, U32, 1172, [8:8] +acPressureTooHigh = bits, U32, 1172, [9:9] +; total TS size = 1176 +isArmed = bits, U32, 1176, [0:0] +isTpsConditionSatisfied = bits, U32, 1176, [1:1] +isCltConditionSatisfied = bits, U32, 1176, [2:2] +isMapConditionSatisfied = bits, U32, 1176, [3:3] +isAfrConditionSatisfied = bits, U32, 1176, [4:4] +isNitrousRpmConditionSatisfied = bits, U32, 1176, [5:5] +isNitrousConditionSatisfied = bits, U32, 1176, [6:6] ; total TS size = 1180 cranking0 = bits, U32, 1180, [0:0] notRunning0 = bits, U32, 1180, [1:1] @@ -5814,13 +5816,6 @@ entry = isTimeConditionSatisfied, "isTimeConditionSatisfied", int, "%d" entry = isRpmConditionSatisfied, "isRpmConditionSatisfied", int, "%d" entry = isAppConditionSatisfied, "isAppConditionSatisfied", int, "%d" entry = isFlatShiftConditionSatisfied, "isFlatShiftConditionSatisfied", int, "%d" -entry = isArmed, "isArmed", int, "%d" -entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" -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" @@ -5863,6 +5858,13 @@ entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = acCompressorState, "AC compressor on", int, "%d" entry = acPressureTooLow, "AC pressure too low", int, "%d" entry = acPressureTooHigh, "AC pressure too high", int, "%d" +entry = isArmed, "isArmed", int, "%d" +entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" +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 = cranking0, "cranking0", int, "%d" entry = notRunning0, "notRunning0", int, "%d" entry = disabledWhileEngineStopped0, "disabledWhileEngineStopped0", int, "%d" @@ -6473,10 +6475,10 @@ menuDialog = main subMenu = injector_modelDialog, "injector_model" subMenu = launch_control_stateDialog, "launch_control_state" subMenu = shift_torque_reduction_stateDialog, "shift_torque_reduction_state" - subMenu = nitrous_control_stateDialog, "nitrous_control_state" subMenu = antilag_system_stateDialog, "antilag_system_state" subMenu = boost_controlDialog, "boost_control" subMenu = ac_controlDialog, "ac_control" + subMenu = nitrous_control_stateDialog, "nitrous_control_state" subMenu = fan_control0Dialog, "fan_control0" subMenu = fan_control1Dialog, "fan_control1" subMenu = fuel_pump_controlDialog, "fuel_pump_control" @@ -6792,18 +6794,6 @@ indicatorPanel = shift_torque_reduction_stateIndicatorPanel, 2 dialog = shift_torque_reduction_stateDialog, "shift_torque_reduction_state" panel = shift_torque_reduction_stateIndicatorPanel -indicatorPanel = nitrous_control_stateIndicatorPanel, 2 - indicator = {isArmed}, "isArmed No", "isArmed Yes" - indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" - indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" - 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 - indicatorPanel = antilag_system_stateIndicatorPanel, 2 indicator = {isAntilagCondition}, "isAntilagCondition No", "isAntilagCondition Yes" indicator = {ALSMinRPMCondition}, "ALSMinRPMCondition No", "ALSMinRPMCondition Yes" @@ -6865,6 +6855,18 @@ dialog = ac_controlDialog, "ac_control" liveGraph = ac_control_1_Graph, "Graph", South graphLine = acButtonState +indicatorPanel = nitrous_control_stateIndicatorPanel, 2 + indicator = {isArmed}, "isArmed No", "isArmed Yes" + indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" + indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" + 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 + indicatorPanel = fan_control0IndicatorPanel, 2 indicator = {cranking0}, "cranking No", "cranking Yes" indicator = {notRunning0}, "notRunning No", "notRunning Yes" @@ -9816,6 +9818,8 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} dialog = NitrousControlSettings, "Settings" + field = "Nitrous Relay", nitrousRelayPin + field = "Nitrous Relay Mode", nitrousRelayPinMode field = "Minimum TPS", nitrousMinimumTps field = "Minimum CLT", nitrousMinimumClt field = "Maximum MAP", nitrousMaximumMap diff --git a/generated/tunerstudio/generated/signature_hellen-f4-community.txt b/generated/tunerstudio/generated/signature_hellen-f4-community.txt index 9a118d4..b1d002d 100644 --- a/generated/tunerstudio/generated/signature_hellen-f4-community.txt +++ b/generated/tunerstudio/generated/signature_hellen-f4-community.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.05.hellen-f4-community.@@SIGNATURE_HASH@@" +#define TS_SIGNATURE "rusEFI main.2024.12.06.hellen-f4-community.@@SIGNATURE_HASH@@"