diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index 92520f8415..4205837ddc 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -395,7 +395,7 @@ fileVersion = { 20171101 } yBins = injector_battLagCorr gauge = VBattGauge - curve = mafDecodingCurve, "MAF Sensor Settings" + curve = mafDecodingCurve, "MAF sensor" columnLabel = "Voltage", "kg/hour" xAxis = -1, 6, 10 yAxis = -30, 1300, 10 @@ -1065,8 +1065,8 @@ menuDialog = main subMenu = std_separator subMenu = fanSetting, "Fan Settings" subMenu = malfunction, "MIL Settings" - subMenu = etbDialog, "Electronic Thtottle Body (beta version)" - subMenu = etbTpsBiasCurve, "Electronic Thtottle Body Bias Curve" + subMenu = etbDialog, "Electronic Throttle Body (beta version)" + subMenu = etbTpsBiasCurve, "Electronic Throttle Body Bias Curve" subMenu = std_separator subMenu = std_realtime, "&Realtime Display", 0 @@ -1079,7 +1079,6 @@ menuDialog = main subMenu = afrTableTbl, "Target AFR Table", 0, {fuelAlgorithm == LM_SPEED_DENSITY} subMenu = injPhaseTableTbl, "Injection Phase Table" subMenu = std_separator - subMenu = warmupFuelDialog, "Warmup fuel closed-loop" subMenu = cltFuelCorrCurve, "Warmup fuel manual Multiplier", 0, {useWarmupPidAfr == 0} subMenu = warmupTargetAfrCurve, "Warmup fuel auto correction AFR target", 0, {useWarmupPidAfr == 1} subMenu = iatFuelCorrCurve, "Intake air temperature fuel Multiplier" @@ -1148,21 +1147,21 @@ menuDialog = main menuDialog = main menu = "&Sensors" - subMenu = cltSensor, "CLT Sensor Settings" - subMenu = iatSensor, "IAT Sensor Settings" - subMenu = auxTempSensor1Sensor, "AuxTemp1 Sensor Settings" - subMenu = auxTempSensor2Sensor, "AuxTemp2 Sensor Settings" + subMenu = cltSensor, "CLT sensor" + subMenu = iatSensor, "IAT sensor" + subMenu = auxTempSensor1Sensor, "AuxTemp1 sensor" + subMenu = auxTempSensor2Sensor, "AuxTemp2 sensor" subMenu = std_separator - subMenu = mapSettings, "MAP Sensor Settings" - subMenu = mafDecodingCurve, "MAF Sensor Settings" + subMenu = mapSettings, "MAP sensor" + subMenu = mafDecodingCurve, "MAF sensor" subMenu = std_separator - subMenu = egoSettings, "EGO Sensor Settings" + subMenu = egoSettings, "EGO sensor" subMenu = narrowToWideOxygenCurve, "Narrow to Wideband approximation" subMenu = cj125Function, "CJ125 Settings (wbo decoder)" subMenu = std_separator subMenu = hipFunction, "HIP9011 Settings (knock sensor) (alpha version)" - subMenu = speedSensor, "Vehicle Speed Sensor Settings" - subMenu = oilPressureSensor, "Oil Pressure Sensor Settings" + subMenu = speedSensor, "Vehicle Speed sensor" + subMenu = oilPressureSensor, "Oil Pressure sensor" menuDialog = main menu = "&Controller" @@ -1174,6 +1173,7 @@ menuDialog = main subMenu = std_separator subMenu = deviceOutputSettings, "Actuator Outputs" subMenu = std_separator + subMenu = lcdScreen, "LCD" subMenu = joystickPanel, "Joystick" subMenu = ecuStimulator, "ECU stimulator" subMenu = spiFunction, "SPI Settings" @@ -1184,6 +1184,7 @@ menuDialog = main subMenu = engineTypeDialog, "Popular vehicles" subMenu = allPins1, "Full pinout 1/2" subMenu = allPins2, "Full pinout 2/2" + subMenu = parkingLot, "Experimental/Broken" [ControllerCommands] ; commandName = command1, command2, commandn... @@ -1358,9 +1359,6 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" ; field = "Engine Preset", engineType field = "Number of Cylinders", cylindersCount field = "Engine Displacement", displacement - field = "!https://rusefi.com/s/debugmode" - field = "Debug mode", debugMode - field = "" field = "Firing Order", firingOrder ; Engine->Trigger configuration @@ -1396,9 +1394,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" ; Engine->Injection Settings dialog = injChars, "Injector Settings", yAxis field = "Injector Flow", injector_flow - field = "!phase offset is usually not needed" - field = "phase offset", extraInjectionOffset - + dialog = injectorOutputSettings, "Injector Outputs", yAxis field = "!ECU reboot needed to apply these settings" field = "injection Pin Mode", injectionPinMode, {isInjectionEnabled == 1} @@ -1448,7 +1444,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" ; Sensors->AUX1 Thermistor Sensor Setting dialog = auxTempSensor1Sensor, "aux1 Thermistor Settings" - field = "#Here is three pairs of thermistor temperature and his resistance." + field = "#Here is three pairs of thermistor temperature and resistance." field = "#Typical temperatures is -40°C, 0°C and 100°C" field = "" field = "Lowest temperature", auxTempSensor1_tempC_1 @@ -1462,7 +1458,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" ; Sensors->AUX2 Thermistor Sensor Setting dialog = auxTempSensor2Sensor, "aux2 Thermistor Settings" - field = "#Here is three pairs of thermistor temperature and his resistance." + field = "#Here is three pairs of thermistor temperature and resistance." field = "#Typical temperatures is -40°C, 0°C and 100°C" field = "" field = "Lowest temperature", auxTempSensor2_tempC_1 @@ -1702,9 +1698,9 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" panel = allPins2_1_and_2 -; Sensors->CLT Sensor Settings - dialog = clt_thermistor, "CLT Sensor Settings" - field = "#Here is three pairs of thermistor temperature and his resistance." +; Sensors->CLT sensor + dialog = clt_thermistor, "CLT sensor" + field = "#Here is three pairs of thermistor temperature and resistance." field = "#Typical temperatures is -40°C, 0°C and 100°C" field = "" field = "Lowest temperature", clt_tempC_1 @@ -1722,9 +1718,9 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" panel = clt_thermistor gauge = CLTGauge -; Sensors->IAT Sensor Settings - dialog = iat_thermistor, "IAT Sensor Settings" - field = "#Here is three pairs of thermistor temperature and his resistance." +; Sensors->IAT sensor + dialog = iat_thermistor, "IAT sensor" + field = "#Here is three pairs of thermistor temperature and resistance." field = "#Typical temperatures is -40°C, 0°C and 100°C" field = "" field = "Lowest temperature", iat_tempC_1 @@ -1742,8 +1738,8 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" panel = iat_thermistor gauge = IATGauge -; Sensors->Oil Pressure Sensor Settings - dialog = oilp_settings, "Oil Pressure Sensor Settings" +; Sensors->Oil pressure sensor + dialog = oilp_settings, "Oil pressure sensor" field = "low voltage", oilPressure_v1 field = "low pressure", oilPressure_value1 field = "high voltage", oilPressure_v2 @@ -1753,8 +1749,8 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" panel = oilp_settings gauge = OilPressGauge -; Sensors->MAP Sensor Settings - dialog = mapSensorVDlg, "Voltage Sensor Settings", yAxis +; Sensors->MAP sensor + dialog = mapSensorVDlg, "MAP sensor", yAxis field = "MAP type", map_sensor_type, {hasFrequencyReportingMapSensor == 0} field = "MAP value low point", map_sensor_lowValue, { map_sensor_type == 0 && hasFrequencyReportingMapSensor == 0} field = "MAP voltage low point", mapLowValueVoltage, { map_sensor_type == 0 && hasFrequencyReportingMapSensor == 0} @@ -1766,7 +1762,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = baroSensor_highValue, baroSensor_highValue field = baroSensor_type, baroSensor_type - dialog = mapSensorFDlg, "Frequency Sensor Settings", yAxis + dialog = mapSensorFDlg, "MAP frequency sensor", yAxis field = "0 kPa freq", mapFrequency0Kpa, {hasFrequencyReportingMapSensor == 1} field = "100 kpa freq", mapFrequency100Kpa, {hasFrequencyReportingMapSensor == 1} @@ -1789,8 +1785,8 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" panel = mapCurves panel = mapSwitchAndSettings -; Sensors->EGO Sensor Settings - dialog = egoSettings_sensor, "EGO Sensor Settings" +; Sensors->EGO sensor + dialog = egoSettings_sensor, "EGO sensor" field = "Type", afr_type ; todo: only use these values for custom! field = "low voltage", afr_v1 @@ -1857,7 +1853,6 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" dialog = idleSettings, "", yAxis - field = "Debug mode", debugMode field = "Idle IAC control mode", idleMode field = "use ETB for idle", useETBforIdleControl field = "Use separate Ignition Table for idle", useSeparateAdvanceForIdle @@ -2043,7 +2038,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" panel = alternator ; Sensors->Vehicle Speed Sensor Setting - dialog = speedSensor, "Speed Sensor Settings", xAxis + dialog = speedSensor, "Speed sensor", xAxis field = "revolution to speed mult", vehicleSpeedCoef gauge = VSSGauge @@ -2109,16 +2104,12 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "D6 pin", HD44780_db6 field = "D7 pin", HD44780_db7 - dialog = connectRight, "", yAxis + dialog = connection, "", yAxis panel = tsPort panel = canBus panel = sdCard panel = gpsReceiver field = "stm32 voltage", adcVcc - - dialog = connection, "", border - panel = lcdScreen, East - panel = connectRight, West dialog = joystickPanel, "Joystick" field = "joustick center button", joystickCenterPin @@ -2135,35 +2126,38 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = " Threshold", engineSnifferRpmThreshold dialog = generalSettings, "General" - field = "https://rusefi.com/s/support" - field = "RPM Hard Limit", rpmHardLimit - field = "Boost Cut Pressure", boostCutPressure - field = "" field = "!https://rusefi.com/s/fuel" - field = "Fuel Algorithm", fuelAlgorithm + field = "Fuel strategy", fuelAlgorithm field = "" - field = "#System hack's" - field = "Global fuel correction", globalFuelCorrection - field = "Ignition Math Logic @", ignMathCalculateAtIndex - field = "MAP Averaging Logic @", mapAveragingSchedulingAtIndex field = "comm status light", communicationLedPin field = "running status light", runningLedPin + dialog = debugging, "Debug" + field = "!https://rusefi.com/s/debugmode" + field = "Debug mode", debugMode + + + dialog = limits, "Limits" + field = "RPM hard limit", rpmHardLimit + field = "Boost cut pressure", boostCutPressure + ; Engine->Base Engine Settings dialog = engineChars, "Base Engine Settings" topicHelp = "baseHelp" panel = baseEngineConfig panel = generalSettings + panel = limits + panel = debugging dialog = crankingFuel, "Fuel" - field = "Injection Mode", crankingInjectionMode + field = "Injection mode", crankingInjectionMode field = "!Value '1' is currently recommended" - field = "Base Fuel Pulse Width", cranking_baseFuel + field = "Base fuel pulse width", cranking_baseFuel dialog = crankingIAC, "IAC" field = "Cranking IAC position", crankingIACposition field = "After cranking IAC taper duration", afterCrankingIACtaperDuration - field = "Override Idle Air Multiplier for Cranking", overrideCrankingIacSetting + field = "Override IAC multiplier for cranking", overrideCrankingIacSetting dialog = crankingIgnition, "Ignition" field = "Advance", crankingTimingAngle, {useSeparateAdvanceForCranking == 0} @@ -2173,10 +2167,9 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Fixed Cranking Dwell", ignitionDwellForCrankingMs, {useConstantDwellDuringCranking == 1} field = "Cranking Dwell Angle", crankingChargeAngle, {useConstantDwellDuringCranking == 0} - dialog = postCrankingEnrichment, "Post-cranking short-time fuel enrichment (NOT IMPLEMENTED #331)" - field = "Target temperature", postCrankingTargetClt + dialog = postCrankingEnrichment, "Post-cranking short-time fuel enrichment (NOT IMPLEMENTED #331)" field = "Post-Cranking factor", postCrankingFactor - field = "Duraction", postCrankingDurationSec + field = "Duration", postCrankingDurationSec dialog = primingFuelPulsePanel, "Priming fuel pulse" field = "Duration at -40C degrees", startOfCrankingPrimingPulse @@ -2186,23 +2179,22 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" ; Cranking->Cranking Settings dialog = crankingDialog, "Cranking Settings" field = "Cranking RPM limit", cranking_rpm - panel = crankingIgnition - panel = crankingIAC - panel = crankingFuel - panel = primingFuelPulsePanel - panel = postCrankingEnrichment - field = "enable Cylinder Cleanup", isCylinderCleanupEnabled - field = "Startup fuel pump prime", startUpFuelPumpDuration + field = "Fuel pump prime duration", startUpFuelPumpDuration + field = "Enable cylinder cleanup", isCylinderCleanupEnabled field = "" field = "Enable faster engine spin-up", isFasterEngineSpinUpEnabled - - + panel = primingFuelPulsePanel + panel = crankingFuel + panel = crankingIgnition + panel = crankingIAC + panel = postCrankingEnrichment + dialog = EngineLoadAccelPanel, "Engine Load (alpha version)" field = "Length", engineLoadAccelLength - field = "Accel Threshold", engineLoadAccelEnrichmentThreshold - field = "Accel Multiplier", engineLoadAccelEnrichmentMultiplier - field = "Decel Threshold", engineLoadDecelEnleanmentThreshold - field = "Decel Multiplier", engineLoadDecelEnleanmentMultiplier + field = "Accel threshold", engineLoadAccelEnrichmentThreshold + field = "Accel multiplier", engineLoadAccelEnrichmentMultiplier + field = "Decel threshold", engineLoadDecelEnleanmentThreshold + field = "Decel multiplier", engineLoadDecelEnleanmentMultiplier dialog = TpsAccelPanel, "TPS" field = "Set 'Debug Mode' to see detailed 'TPS acceleration enrichment' diagnostics" @@ -2221,7 +2213,6 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" ; Tuning->AccelEnrichment dialog = AccelEnrich, "Accel/Decel Enrichment" - field = "Debug mode", debugMode panel = TpsAccelPanel panel = WallWettingAccelPanel panel = EngineLoadAccelPanel @@ -2405,7 +2396,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" commandButton = "Pedal Up", cmd_calibrate_pedal_up commandButton = "Pedal Down", cmd_calibrate_pedal_down - dialog = etbDialog, "Electronic Thtottle Body (beta)", border + dialog = etbDialog, "Electronic Throttle Body (beta)", border topicHelp = "etbHelp" panel = etbDialogLeft, West panel = etbDialogRight, East @@ -2499,6 +2490,17 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "TPS Deactivation Threshold", coastingFuelCutTps, {coastingFuelCutEnabled == 1} field = "CLT Activation Threshold", coastingFuelCutClt, {coastingFuelCutEnabled == 1} field = "MAP Deactivation Threshold", coastingFuelCutMap, {coastingFuelCutEnabled == 1} + + dialog = parkingLot, "Experimental/Broken" + field = "#System hacks" + field = "Global fuel correction", globalFuelCorrection + field = "Ignition Math Logic @", ignMathCalculateAtIndex + field = "MAP Averaging Logic @", mapAveragingSchedulingAtIndex + + field = "Target temperature", postCrankingTargetClt + + panel = warmupFuelDialog + [Tools] ;addTool = toolName, PanelName addTool = veTableGenerator, "VE Table Generator", veTableTbl