diff --git a/generated/controllers/generated/rusefi_generated_XYZ.h b/generated/controllers/generated/rusefi_generated_XYZ.h index b869876..7c887b8 100644 --- a/generated/controllers/generated/rusefi_generated_XYZ.h +++ b/generated/controllers/generated/rusefi_generated_XYZ.h @@ -1291,7 +1291,7 @@ #define show_Proteus_presets false #define show_test_presets false #define show_vvt_output_pin true -#define SIGNATURE_HASH 201681849 +#define SIGNATURE_HASH 1658534658 #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" @@ -1593,6 +1593,7 @@ #define ts_show_air_conditioning true #define ts_show_alternator true #define ts_show_analog_divider true +#define ts_show_aux_connections true #define ts_show_aux_sensors true #define ts_show_auxserial_pins true #define ts_show_bank2_cam1 true @@ -1609,6 +1610,7 @@ #define ts_show_clutch_up_pin true #define ts_show_communityCommsLedPid false #define ts_show_compression_ratio false +#define ts_show_compressor_sensor true #define ts_show_cylinder_10 true #define ts_show_cylinder_11 true #define ts_show_cylinder_12 true @@ -1635,9 +1637,11 @@ #define ts_show_forced_induction true #define ts_show_ford_toyota_tps_pps true #define ts_show_fuel_level_sensor true +#define ts_show_fuel_pressure_sensor true #define ts_show_fuel_pump true #define ts_show_fuel_relay_pin true #define ts_show_fuel_strategy true +#define ts_show_fuel_temp_sensor true #define ts_show_full_pinout true #define ts_show_gdi false #define ts_show_globalTriggerAngleOffset true @@ -1662,6 +1666,8 @@ #define ts_show_multispark true #define ts_show_number_of_cylinders true #define ts_show_odd_fire true +#define ts_show_oil_pressure_sensor true +#define ts_show_oil_temp_sensor true #define ts_show_onboard_accelerometer false #define ts_show_output_diag false #define ts_show_popular_vehicles true @@ -1710,9 +1716,10 @@ #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true #define ts_show_vvt_output_pin true +#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.07.27.XYZ.201681849" +#define TS_SIGNATURE "rusEFI main.2024.07.28.XYZ.1658534658" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' @@ -1764,6 +1771,7 @@ #define vr_threshold_s_size 16 #define VSS_FILTER_MAX 200 #define VSS_FILTER_MIN 3 +#define VVT1_TARGET_NAME "VVT intake target" #define vvt_mode_e_auto_enum 0="VVT_INACTIVE",8="VVT_BARRA_3_PLUS_1",5="VVT_BOSCH_QUICK_START",23="VVT_DEV",19="VVT_FORD_COYOTE",7="VVT_FORD_ST170",21="VVT_HONDA_CBR_600",16="VVT_HONDA_K_EXHAUST",10="VVT_HONDA_K_INTAKE",13="VVT_MAP_V_TWIN",22="VVT_MAZDA_L",15="VVT_MAZDA_SKYACTIV",3="VVT_MIATA_NB",12="VVT_MITSUBISHI_3A92",18="VVT_MITSUBISHI_4G63",4="VVT_MITSUBISHI_4G69",17="VVT_MITSUBISHI_4G9x",20="VVT_MITSUBISHI_6G72",14="VVT_MITSUBISHI_6G75",11="VVT_NISSAN_MR",9="VVT_NISSAN_VQ",1="VVT_SINGLE_TOOTH",2="VVT_TOYOTA_3_TOOTH",6="VVT_TOYOTA_4_1" #define vvt_mode_e_enum "Inactive", "Single Tooth", "Toyota 3 Tooth", "Miata NB2", "Mitsu 4G69", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K Intake", "Nissan MR18", "Mitsu 3A92", "VTwin by MAP", "Mitsu 6G75", "Mazda Skyactiv", "Honda K Exhaust", "Mitsubishi 4G92/93/94", "Mitsubishi 4G63", "Ford Coyote", "Mitsu 6G72", "Honda 600", "Mazda L", "Dev", "vvt24", "vvt25", "vvt26" #define vvt_mode_e_VVT_BARRA_3_PLUS_1 8 diff --git a/generated/controllers/generated/signature_XYZ.h b/generated/controllers/generated/signature_XYZ.h index f97140e..9300d2a 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 201681849 -#define TS_SIGNATURE "rusEFI main.2024.07.27.XYZ.201681849" +#define SIGNATURE_HASH 1658534658 +#define TS_SIGNATURE "rusEFI main.2024.07.28.XYZ.1658534658" diff --git a/generated/tunerstudio/generated/rusefi_XYZ.ini b/generated/tunerstudio/generated/rusefi_XYZ.ini index 555b500..ec1c13f 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.07.27.XYZ.201681849" + signature = "rusEFI main.2024.07.28.XYZ.1658534658" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI main.2024.07.27.XYZ.201681849" ; signature is expected to be 7 or more characters. + signature= "rusEFI main.2024.07.28.XYZ.1658534658" ; 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 @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sat Jul 27 16:42:11 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sun Jul 28 16:41:25 UTC 2024 pageSize = 22884 page = 1 @@ -2523,7 +2523,7 @@ boardSpecificCalibration1 = scalar, S32, 22880, "", 1, 0, 0, 100, 0 filter = VBatt, "VBatt", VBatt < , 12, , true filter = minTps, "Minimum TPS", TPSValue, < , 1, , true - + filter = std_Custom ; ; in order to add new TunerStudio data point you need to change one of *.txt files mentioned in LiveData.yaml @@ -6005,10 +6005,10 @@ menuDialog = main menu = "&Base &Engine" subMenu = engineChars, "Base engine" - subMenu = limitsAndFallback, "Limits and fallbacks" + subMenu = limitsAndFallback, "Limits and fallbacks", {1}, { uiMode == 0 || uiMode == 1 } subMenu = triggerConfiguration, "Trigger" - subMenu = trigger_advanced, "Advanced Trigger" - subMenu = triggerConfiguration_gap, "Trigger Gap Override" + subMenu = trigger_advanced, "Advanced Trigger", { 1 }, { uiMode == 0 || uiMode == 1 } + subMenu = triggerConfiguration_gap, "Trigger Gap Override", {1}, { uiMode == 0 || uiMode == 1 } subMenu = std_separator subMenu = energySystems, "Battery and alternator" subMenu = std_separator @@ -6060,8 +6060,8 @@ menuDialog = main groupChildMenu = veBlend4Table, "VE blend table 4", 0, { isInjectionEnabled && veBlends4_blendParameter != 0 } subMenu = tChargeSettings, "Charge temperature estimation", 0, {isInjectionEnabled == 1} - subMenu = baroCorrTbl, "Barometric pressure correction", 0, {isInjectionEnabled == 1 && fuelAlgorithm == 0} - subMenu = mapEstimateTableTbl, "MAP estimate table", 0, {isInjectionEnabled == 1 && fuelAlgorithm == 0} + subMenu = baroCorrTbl, "Barometric pressure correction", {isInjectionEnabled == 1 && fuelAlgorithm == 0}, { uiMode == 0 || uiMode == 1 } + subMenu = mapEstimateTableTbl, "MAP estimate table", {isInjectionEnabled == 1 && fuelAlgorithm == 0}, { uiMode == 0 || uiMode == 1 } subMenu = std_separator @@ -6169,8 +6169,8 @@ menuDialog = main subMenu = boostOpenLoopGearAdderDialog, "Boost control open loop gear adder", { isBoostControlEnabled } subMenu = boostPidDialog, "Boost control PID", { isBoostControlEnabled && boostType == 1 } subMenu = boostTargetDialog, "Boost control target", { isBoostControlEnabled && boostType == 1 } - subMenu = cltBoostCorrCurve, "CLT boost multiplier" - subMenu = iatBoostCorrCurve, "IAT boost multiplier" + subMenu = cltBoostCorrCurve, "CLT boost multiplier", { isBoostControlEnabled }, { uiMode == 0 || uiMode == 1 } + subMenu = iatBoostCorrCurve, "IAT boost multiplier", { isBoostControlEnabled }, { uiMode == 0 || uiMode == 1 } groupMenu = "Boost blend tables" groupChildMenu = boostOpenBlend1Cfg, "Open loop 1 bias", { isBoostControlEnabled } @@ -6185,19 +6185,19 @@ menuDialog = main subMenu = boostEtbPid, "ETB-style Wastegate Actuator", { etbFunctions1 == 4 || etbFunctions2 == 4 } subMenu = std_separator - subMenu = gppwm1, "General Purpose PWM 1" - subMenu = gppwm2, "General Purpose PWM 2" - subMenu = gppwm3, "General Purpose PWM 3" - subMenu = gppwm4, "General Purpose PWM 4" + subMenu = gppwm1, "General Purpose PWM 1", { 1 }, { uiMode == 0 || uiMode == 1 } + subMenu = gppwm2, "General Purpose PWM 2", { 1 }, { uiMode == 0 || uiMode == 1 } + subMenu = gppwm3, "General Purpose PWM 3", { 1 }, { uiMode == 0 || uiMode == 1 } + subMenu = gppwm4, "General Purpose PWM 4", { 1 }, { uiMode == 0 || uiMode == 1 } subMenu = std_separator - subMenu = etbDialog, "Electronic throttle body" - subMenu = etbTpsBiasCurve, "ETB bias curve (feed forward)" + subMenu = etbDialog, "Electronic throttle body", { 1 }, { uiMode == 0 || uiMode == 1 } + subMenu = etbTpsBiasCurve, "ETB bias curve (feed forward)", { 1 }, { uiMode == 0 || uiMode == 1 } subMenu = pedalToTpsTbl, "ETB pedal target" subMenu = throttle2TrimTbl, "ETB #2 Trim", { tps2_1AdcChannel != 0 } subMenu = std_separator - subMenu = vvtPidDialog, "VVT outputs and PID", { vvtMode1 != 0 } + subMenu = vvtPidDialog, "VVT outputs and PID", { vvtMode1 != 0 }, { uiMode == 0 || uiMode == 1 } subMenu = vvtTable1Tbl, "VVT intake target", { vvtMode1 != 0 && vvtPins1 != 0 } subMenu = vvtTable2Tbl, "VVT exhaust target", { vvtMode2 != 0 && vvtPins2 != 0 } @@ -6222,28 +6222,28 @@ menuDialog = main groupChildMenu = scriptCurve6Settings, "Script Curve #6" - menu = "&Sensors" + menu = "&Sensors", { 1 }, { uiMode == 0 || uiMode == 1 } # Base analog input settings - subMenu = otherSensorInputs, "Misc sensors" - subMenu = analogInputSettings, "Analog input settings" + subMenu = otherSensorInputs, "Misc sensors", { 1 }, { uiMode == 0 || uiMode == 1 } + subMenu = analogInputSettings, "Analog input settings", { 1 }, { uiMode == 0 || uiMode == 1 } subMenu = std_separator # Thermistors - subMenu = cltSensor, "CLT sensor" - subMenu = iatSensor, "IAT sensor" - subMenu = auxTempSensor1Sensor, "AuxTemp1 sensor" - subMenu = auxTempSensor2Sensor, "AuxTemp2 sensor" + subMenu = cltSensor, "CLT sensor", { 1 }, { uiMode == 0 || uiMode == 1 } + subMenu = iatSensor, "IAT sensor", { 1 }, { uiMode == 0 || uiMode == 1 } + subMenu = auxTempSensor1Sensor, "AuxTemp1 sensor", { 1 }, { uiMode == 0 || uiMode == 1 } + subMenu = auxTempSensor2Sensor, "AuxTemp2 sensor", { 1 }, { uiMode == 0 || uiMode == 1 } subMenu = std_separator # TPS/pedal - subMenu = tpsSensor, "TPS" - subMenu = pedalSensor, "Accelerator pedal" + subMenu = tpsSensor, "TPS", { 1 }, { uiMode == 0 || uiMode == 1 } + subMenu = pedalSensor, "Accelerator pedal", { 1 }, { uiMode == 0 || uiMode == 1 } subMenu = std_separator # MAP/Baro - subMenu = mapSettings, "MAP sensor" - subMenu = mapCurves, "MAP sampling" - subMenu = baroSettings, "Baro sensor" + subMenu = mapSettings, "MAP sensor", { 1 }, { uiMode == 0 || uiMode == 1 } + subMenu = mapCurves, "MAP sampling", { 1 }, { uiMode == 0 || uiMode == 1 } + subMenu = baroSettings, "Baro sensor", { 1 }, { uiMode == 0 || uiMode == 1 } subMenu = std_separator # MAF @@ -6252,7 +6252,7 @@ menuDialog = main subMenu = std_separator # O2 sensor(s) - subMenu = egoSettings, "O2 sensor" + subMenu = egoSettings, "O2 sensor", { 1 }, { uiMode == 0 || uiMode == 1 } subMenu = widebandConfig, "rusEFI Wideband Controller", 0, { canReadEnabled && canWriteEnabled } subMenu = std_separator @@ -6263,7 +6263,7 @@ menuDialog = main subMenu = fuelPressureSensor, "Fuel pressure" subMenu = fuelTempSensor, "Fuel temp sensor" subMenu = fuelLevelDialog, "Fuel level sensor" - subMenu = ambientTempSensor, "Ambient temp sensor" + subMenu = ambientTempSensor, "Ambient temp sensor", { 1 }, { uiMode == 0 || uiMode == 1 } subMenu = compressorDischargeTemperature, "Compressor discharge temp" subMenu = egtInputs, "EGT" subMenu = wastegateIdlePos, "Wastegate and idle position sensors" @@ -6325,12 +6325,12 @@ menuDialog = main subMenu = harleyAcr, "HD" subMenu = antiLagDialog, "Anti-Lag ALS" subMenu = rotaryDialog, "Rotary" - subMenu = throttleEffectiveArea, "Throttle effective area" + subMenu = throttleEffectiveArea, "Throttle effective area", { 1 }, { uiMode == 0 || uiMode == 1 } menu = "Help" subMenu = helpGeneral, "rusEFI Info" - menu = "&View" + menu = "&View", { 1 }, { uiMode == 0 || uiMode == 1 } subMenu = fuel_computerDialog, "fuel_computer" subMenu = ignition_stateDialog, "ignition_state" subMenu = knock_controllerDialog, "knock_controller" @@ -9012,7 +9012,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" topicHelp = "baseHelp" field = "Layout", uiMode panel = baseEngineConfig - panel = engineMetadata + panel = engineMetadata, {1}, { uiMode == 0 || uiMode == 1 } panel = fuelStrategyPanel dialog = crankingFuel, "Fuel"