FOME-Tech
/
fome-fw
mirror of https://github.com/FOME-Tech/fome-fw.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

TS cleanup pass #2 (#823) 

* rearrange fuel/ign/cranking/idle

* fix base, sensors, and controller

* fix degree symbols

* fix degree symbols again

* spelling
This commit is contained in:
Matthew Kennedy 2019-06-04 15:53:09 -07:00 committed by rusefi
parent 9892dad000
commit b2acc9203b
1 changed files with 137 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

236
firmware/tunerstudio/rusefi.input
View File

@ -1058,79 +1058,93 @@ gaugeCategory = Fuel Data
menuDialog = main
menu = "&Base &Engine"
subMenu = engineChars, "Base Engine Settings"
subMenu = triggerConfiguration, "Trigger Configuration"
subMenu = engineChars, "Base engine"
subMenu = triggerConfiguration, "Trigger"
subMenu = std_separator
subMenu = energySystems, "Battery and Alternator Settings"
subMenu = energySystems, "Battery and alternator"
subMenu = std_separator
subMenu = fanSetting, "Fan Settings"
subMenu = malfunction, "MIL Settings"
subMenu = etbDialog, "Electronic Throttle Body (beta version)" @@if_ts_show_etb
subMenu = etbTpsBiasCurve, "Electronic Throttle Body Bias Curve" @@if_ts_show_etb
subMenu = std_separator
subMenu = std_realtime, "&Realtime Display", 0
menu = "Injection"
# Digital outputs
subMenu = mainRelay, "Main relay"
subMenu = fuelPump, "Fuel pump"
subMenu = fanSetting, "Fan"
subMenu = tachSettings, "Tachometer"
subMenu = malfunction, "Check engine light"
subMenu = statusLeds, "Status LEDs"
menu = "Fuel"
# basic
subMenu = injectionSettings, "Injection Settings"
subMenu = injectionDeadTime, "Injector Dead Time"
subMenu = injectionDeadTime, "Injector Dead Time", 0, {isInjectionEnabled == 1}
subMenu = std_separator
subMenu = fuelTableDialog, "Fuel Table", 0, {fuelAlgorithm != LM_SPEED_DENSITY}
subMenu = veTableDialog, "VE Table", 0, {fuelAlgorithm == LM_SPEED_DENSITY}
subMenu = afrTableTbl, "Target AFR Table", 0, {fuelAlgorithm == LM_SPEED_DENSITY}
subMenu = injPhaseTableTbl, "Injection Phase Table"
# Targets & closed loop
subMenu = afrTableTbl, "Target AFR", 0, {isInjectionEnabled == 1 && fuelAlgorithm == LM_SPEED_DENSITY}
subMenu = fuelClosedLoopDialog, "Closed loop correction", 0, {isInjectionEnabled == 1}
subMenu = coastingFuelCutControl, "Deceleration fuel cutoff (DFCO)", 0, {isInjectionEnabled == 1}
subMenu = std_separator
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"
# Fuel table/VE
subMenu = fuelTableDialog, "Alpha-N fuel table", 0, {isInjectionEnabled == 1 && fuelAlgorithm != LM_SPEED_DENSITY}
subMenu = veTableDialog, "VE", 0, {isInjectionEnabled == 1 && fuelAlgorithm == LM_SPEED_DENSITY}
subMenu = injPhaseTableTbl, "Injection phase", 0, {isInjectionEnabled == 1}
subMenu = std_separator
subMenu = fuelClosedLoopDialog, "Fuel short-term closed-loop correction"
# Corrections
subMenu = cltFuelCorrCurve, "CLT multiplier", 0, {isInjectionEnabled == 1 && useWarmupPidAfr == 0}
subMenu = iatFuelCorrCurve, "IAT multiplier", 0, {isInjectionEnabled == 1}
subMenu = baroCorrTbl, "Baro multiplier", 0, {isInjectionEnabled == 1 && fuelAlgorithm == LM_SPEED_DENSITY}
subMenu = tChargeSettings, "tCharge Settings", 0, {isInjectionEnabled == 1}
subMenu = std_separator
# Accel enrichment
subMenu = AccelEnrich, "Accel/Decel Enrichment/Enleanment", 0, {isInjectionEnabled == 1}
subMenu = tpsTpsAccelTbl, "TPS/TPS acceleration extra fuel", 0, {isInjectionEnabled == 1}
subMenu = mapAccelTaper, "Engine load AE taper", 0, {isInjectionEnabled == 1}
menu = "Ignition"
subMenu = ignitionSettings, "Ignition Settings"
subMenu = dwellSettings, "Dwell time"
subMenu = ignitionCylExtra, "Ignition Cylinder Extra"
subMenu = std_separator
subMenu = dwellSettings, "Dwell", 0, {isIgnitionEnabled == 1}
subMenu = ignitionCylExtra, "Ignition cylinder trim", 0, {isIgnitionEnabled == 1}
subMenu = std_separator
subMenu = ignitionTableTbl, "Ignition Advance Table", 0, {useTPSAdvanceTable == 0}
subMenu = ignitionTpsTableTbl, "Ignition Advance TPS-based Table", 0, {useTPSAdvanceTable == 1}
subMenu = ignitionTableTbl, "Ignition advance", 0, {isIgnitionEnabled == 1 && useTPSAdvanceTable == 0}
subMenu = ignitionTpsTableTbl, "Ignition advance (TPS)", 0, {isIgnitionEnabled == 1 && useTPSAdvanceTable == 1}
subMenu = std_separator
subMenu = cltTimingCorrCurve, "Warmup timing correction"
subMenu = ignitionIatCorrTableTbl, "Ignition IAT correction Table"
# corrections
subMenu = cltTimingCorrCurve, "CLT correction", 0, {isIgnitionEnabled == 1}
subMenu = ignitionIatCorrTableTbl, "IAT correction", 0, {isIgnitionEnabled == 1}
menu = "&Cranking"
subMenu = crankingDialog, "Cranking Settings"
subMenu = crankingDialog, "Cranking Settings"
subMenu = std_separator
subMenu = crankingCltCurve, "Cranking Coolant Temp Fuel Multiplier"
subMenu = crankingDurationCurve, "Cranking Fuel Duration Multiplier"
subMenu = crankingAdvanceCurve, "Cranking Ignition Advance", 0, {useSeparateAdvanceForCranking == 1}
subMenu = crankingTpsCurve, "Cranking TPS Multiplier"
subMenu = crankingCltCurve, "Fuel CLT multiplier"
subMenu = crankingDurationCurve, "Fuel duration multiplier"
subMenu = crankingTpsCurve, "Fuel TPS multiplier"
subMenu = std_separator
subMenu = cltCrankingCurve, "Cranking IAC multiplier", 0, {overrideCrankingIacSetting == 1}
subMenu = crankingAdvanceCurve, "Ignition advance", 0, {useSeparateAdvanceForCranking == 1}
subMenu = std_separator
subMenu = cltCrankingCurve, "IAC multiplier", 0, {overrideCrankingIacSetting == 1}
menu = "&Idle"
subMenu = idleSettings, "Idle Settings"
subMenu = idlehw, "Idle Hardware"
subMenu = std_separator
subMenu = cltIdleRPMCurve, "Idle Target RPM", 0, {idleMode == 0}
subMenu = idleVeCurve, "Idle VE", 0, {useSeparateVeForIdle == 1}
subMenu = idleAdvanceCurve, "Idle Ignition Advance", 0, {useSeparateAdvanceForIdle == 1}
subMenu = cltIdleRPMCurve, "Target RPM", 0, {idleMode == 0}
subMenu = idleVeCurve, "VE", 0, {useSeparateVeForIdle == 1}
subMenu = idleAdvanceCurve, "Ignition advance", 0, {useSeparateAdvanceForIdle == 1}
subMenu = std_separator
subMenu = idleTimingPidCorrDialog, "Closed-loop Idle timing correction"
subMenu = cltIdleCurve, "Warmup Idle multiplier"
subMenu = idleTimingPidCorrDialog, "Closed-loop idle timing"
subMenu = cltIdleCurve, "CLT multiplier"
subMenu = iacCoastingCurve, "Coasting IAC Position for Auto-Idle", 0, {useIacTableForCoasting == 1}
menu = "&Tuning"
subMenu = AccelEnrich, "Accel/Decel Enrichment/Enleanment"
subMenu = tpsTpsAccelTbl, "TPS/TPS Acceleration Extra Fuel Table"
subMenu = mapAccelTaper, "Engine Load Acceleration Enrichment Taper"
subMenu = std_separator
subMenu = baroCorrTbl, "Baro Correction Table", 0, {fuelAlgorithm == LM_SPEED_DENSITY}
subMenu = std_separator
subMenu = tChargeSettings, "tCharge Settings"
subMenu = std_separator
subMenu = smLaunchControl, "Launch Control"
subMenu = std_separator
subMenu = coastingFuelCutControl, "Coasting Fuel Cutoff Settings"
menuDialog = main
menu = "&FSIO"
subMenu = fsioInputsDialog, "FSIO inputs"
subMenu = auxPidDialog, "Aux PID"
@ -1145,46 +1159,65 @@ menuDialog = main
subMenu = fsioCurve3, "FSIO Curve #3"
subMenu = fsioCurve4, "FSIO Curve #4"
menuDialog = main
menu = "&Sensors"
# Base analog input settings
subMenu = sensorInputs, "Sensor Inputs"
subMenu = analogInputSettings, "Analog Input Settings"
subMenu = std_separator
# Thermistors
subMenu = cltSensor, "CLT sensor"
subMenu = iatSensor, "IAT sensor"
subMenu = auxTempSensor1Sensor, "AuxTemp1 sensor"
subMenu = auxTempSensor2Sensor, "AuxTemp2 sensor"
subMenu = std_separator
# MAP/MAF
subMenu = mapSettings, "MAP sensor"
subMenu = mafDecodingCurve, "MAF sensor"
subMenu = std_separator
# O2 sensor(s)
subMenu = egoSettings, "EGO sensor"
subMenu = narrowToWideOxygenCurve, "Narrow to Wideband approximation"
subMenu = cj125Function, "CJ125 Settings (wbo decoder)" @@if_ts_show_cj125
subMenu = std_separator
subMenu = hipFunction, "HIP9011 Settings (knock sensor) (alpha version)" @@if_ts_show_hip9011
subMenu = speedSensor, "Vehicle Speed sensor"
subMenu = oilPressureSensor, "Oil Pressure sensor"
# Misc sensors
subMenu = speedSensor, "Vehicle speed sensor"
subMenu = oilPressureSensor, "Oil pressure"
subMenu = egtInputs, "EGT"
menuDialog = main
menu = "&Controller"
subMenu = sensorInputs, "Sensor Inputs"
subMenu = analogInputSettings, "Analog Input Settings"
subMenu = egtInputs, "EGT Inputs"
subMenu = tachSettings, "Tachometer output"
subMenu = idlehw, "Idle Valve Hardware"
subMenu = std_separator
subMenu = deviceOutputSettings, "Actuator Outputs"
subMenu = std_separator
subMenu = ecuStimulator, "ECU stimulator"
subMenu = ioTest, "Bench test"
subMenu = engineTypeDialog, "Popular vehicles"
subMenu = std_separator
subMenu = lcdScreen, "LCD"
subMenu = joystickPanel, "Joystick"
subMenu = ecuStimulator, "ECU stimulator"
subMenu = spiFunction, "SPI Settings"
subMenu = monitoringSettings, "rusEfi Console Settings"
subMenu = std_separator
subMenu = connection, "Connection"
subMenu = ioTest, "Bench Test & Commands"
subMenu = engineTypeDialog, "Popular vehicles"
subMenu = spiFunction, "SPI"
subMenu = monitoringSettings, "rusEfi console"
subMenu = std_separator
subMenu = connection, "Connection"
subMenu = allPins1, "Full pinout 1/2"
subMenu = allPins2, "Full pinout 2/2"
subMenu = std_separator
# EXPERIMENTAL FEATURES
subMenu = parkingLot, "Experimental/Broken"
subMenu = warmupTargetAfrCurve, "Warmup fuel auto correction AFR target"
subMenu = smLaunchControl, "Launch Control"
subMenu = std_separator
subMenu = hipFunction, "HIP9011 Settings (knock sensor) (alpha version)" @@if_ts_show_hip9011
subMenu = std_separator
subMenu = etbDialog, "Electronic Throttle Body (beta version)" @@if_ts_show_etb
subMenu = etbTpsBiasCurve, "Electronic Throttle Body Bias Curve" @@if_ts_show_etb
[ControllerCommands]
; commandName = command1, command2, commandn...
@ -1383,8 +1416,6 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00"
field = "NB2 from temp", nb2ratioFrom
field = "NB2 to temp", nb2ratioTo
field = "nbVvtIndex", nbVvtIndex
field = "Trigger error LED", triggerErrorPin
field = "Trigger error LED mode", triggerErrorPinMode
field = "print sync details to console", isPrintTriggerSynchDetails
field = "Enable noise filtering", useNoiselessTriggerDecoder, {trigger_type == 8}
dialog = triggerConfiguration
@ -1393,7 +1424,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 = "Injector Flow", injector_flow, {isInjectionEnabled == 1}
dialog = injectorOutputSettings, "Injector Outputs", yAxis
field = "!ECU reboot needed to apply these settings"
@ -1884,25 +1915,31 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00"
; Engine->Fan Settings
dialog = fanSetting, "Fan Settings"
field = "Fan On Temperature", fanOnTemperature
field = "Fan Off Temperature", fanOffTemperature
field = "Pin", fanPin
field = "Pin mode", fanPinMode
field = "On temperature", fanOnTemperature
field = "Off temperature", fanOffTemperature
dialog = fuelPump, "Fuel Pump"
field = "Pin", fuelPumpPin
field = "Pin mode", fuelPumpPinMode
field = "Prime duration", startUpFuelPumpDuration
; Controller->Actuator Outputs
dialog = deviceOutputSettings, "Actuator Outputs"
field = "!ECU reboot needed to apply these settings"
field = "Fan Pin Mode", fanPinMode
field = "Fan Pin", fanPin
field = "Main Relay Mode", mainRelayPinMode
field = "Main Relay Pin", mainRelayPin
field = "Fuel Pump Pin Mode", fuelPumpPinMode
field = "Fuel Pump Pin", fuelPumpPin
field = "Check Engine Pin Mode", malfunctionIndicatorPinMode
field = "Check Engine Pin", malfunctionIndicatorPin
field = "TLE8888 Chip Select", tle8888_cs
field = "TLE8888 SPI", tle8888spiDevice
dialog = mainRelay, "Main relay output"
field = "Pin", mainRelayPin
field = "Pin mode", mainRelayPinMode
dialog = statusLeds, "Status LEDs"
field = "Running status LED", runningLedPin
field = "TS communication status LED", communicationLedPin
field = "Trigger error LED", triggerErrorPin
field = "Fatal Error Led", fatalErrorPin
; Engine->MIL Settings
dialog = malfunction, "Check Engine Settings"
field = "Pin", malfunctionIndicatorPin
field = "Pin mode", malfunctionIndicatorPinMode
field = "Warning Period", warningPeriod
; Engine->hip9011 Settings
@ -2060,11 +2097,11 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00"
dialog = tachSettings, "Tachometer output"
field = "!See also dizzySparkOutputPin"
field = "pin", tachOutputPin
field = "pin mode", tachOutputPinMode
field = "rise at trigger index", tachPulseTriggerIndex
field = "pulse duration is duty cycle", tachPulseDurationAsDutyCycle
field = "pulse duration", tachPulseDuractionMs
field = "Pin", tachOutputPin
field = "Pin mode", tachOutputPinMode
field = "Rise at trigger index", tachPulseTriggerIndex
field = "Pulse duration is duty cycle", tachPulseDurationAsDutyCycle
field = "Pulse duration", tachPulseDuractionMs
; Board->Connection
@ -2104,12 +2141,17 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00"
field = "D6 pin", HD44780_db6
field = "D7 pin", HD44780_db7
dialog = tle8888, "TLE8888", yAxis
field = "TLE8888 Chip Select", tle8888_cs
field = "TLE8888 SPI", tle8888spiDevice
dialog = connection, "", yAxis
field = "STM32 vRef voltage", adcVcc
panel = tsPort
panel = canBus
panel = sdCard
panel = gpsReceiver
field = "stm32 voltage", adcVcc
panel = tle8888
dialog = joystickPanel, "Joystick"
field = "joustick center button", joystickCenterPin
@ -2128,9 +2170,6 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00"
dialog = generalSettings, "General"
field = "!https://rusefi.com/s/fuel"
field = "Fuel strategy", fuelAlgorithm
field = ""
field = "comm status light", communicationLedPin
field = "running status light", runningLedPin
dialog = debugging, "Debug"
field = "!https://rusefi.com/s/debugmode"
@ -2179,7 +2218,6 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00"
; Cranking->Cranking Settings
dialog = crankingDialog, "Cranking Settings"
field = "Cranking RPM limit", cranking_rpm
field = "Fuel pump prime duration", startUpFuelPumpDuration
field = "Enable cylinder cleanup", isCylinderCleanupEnabled
field = ""
field = "Enable faster engine spin-up", isFasterEngineSpinUpEnabled