Auto-generated configs and docs

This commit is contained in:
GitHub build-firmware Action 2020-08-18 17:52:40 +00:00
parent 1840afdd4a
commit 3ebbdb5178
19 changed files with 621 additions and 603 deletions

View File

@ -3,6 +3,6 @@
//
#define SIGNATURE_BOARD all
#define SIGNATURE_DATE 2020.08.14
#define SIGNATURE_HASH 1492793354
#define TS_SIGNATURE "rusEFI 2020.08.14.all.1492793354"
#define SIGNATURE_DATE 2020.08.18
#define SIGNATURE_HASH 2644451975
#define TS_SIGNATURE "rusEFI 2020.08.18.all.2644451975"

View File

@ -3,6 +3,6 @@
//
#define SIGNATURE_BOARD frankenso_na6
#define SIGNATURE_DATE 2020.08.17
#define SIGNATURE_HASH 2420522243
#define TS_SIGNATURE "rusEFI 2020.08.17.frankenso_na6.2420522243"
#define SIGNATURE_DATE 2020.08.18
#define SIGNATURE_HASH 1428367246
#define TS_SIGNATURE "rusEFI 2020.08.18.frankenso_na6.1428367246"

View File

@ -3,6 +3,6 @@
//
#define SIGNATURE_BOARD kin
#define SIGNATURE_DATE 2020.08.14
#define SIGNATURE_HASH 1999535530
#define TS_SIGNATURE "rusEFI 2020.08.14.kin.1999535530"
#define SIGNATURE_DATE 2020.08.18
#define SIGNATURE_HASH 2991286055
#define TS_SIGNATURE "rusEFI 2020.08.18.kin.2991286055"

View File

@ -3,6 +3,6 @@
//
#define SIGNATURE_BOARD mre_f4
#define SIGNATURE_DATE 2020.08.14
#define SIGNATURE_HASH 2740235601
#define TS_SIGNATURE "rusEFI 2020.08.14.mre_f4.2740235601"
#define SIGNATURE_DATE 2020.08.18
#define SIGNATURE_HASH 1714534364
#define TS_SIGNATURE "rusEFI 2020.08.18.mre_f4.1714534364"

View File

@ -3,6 +3,6 @@
//
#define SIGNATURE_BOARD mre_f7
#define SIGNATURE_DATE 2020.08.14
#define SIGNATURE_HASH 2740235601
#define TS_SIGNATURE "rusEFI 2020.08.14.mre_f7.2740235601"
#define SIGNATURE_DATE 2020.08.18
#define SIGNATURE_HASH 1714534364
#define TS_SIGNATURE "rusEFI 2020.08.18.mre_f7.1714534364"

View File

@ -3,6 +3,6 @@
//
#define SIGNATURE_BOARD prometheus_405
#define SIGNATURE_DATE 2020.08.14
#define SIGNATURE_HASH 1326217652
#define TS_SIGNATURE "rusEFI 2020.08.14.prometheus_405.1326217652"
#define SIGNATURE_DATE 2020.08.18
#define SIGNATURE_HASH 2322162489
#define TS_SIGNATURE "rusEFI 2020.08.18.prometheus_405.2322162489"

View File

@ -3,6 +3,6 @@
//
#define SIGNATURE_BOARD prometheus_469
#define SIGNATURE_DATE 2020.08.14
#define SIGNATURE_HASH 1326217652
#define TS_SIGNATURE "rusEFI 2020.08.14.prometheus_469.1326217652"
#define SIGNATURE_DATE 2020.08.18
#define SIGNATURE_HASH 2322162489
#define TS_SIGNATURE "rusEFI 2020.08.18.prometheus_469.2322162489"

View File

@ -3,6 +3,6 @@
//
#define SIGNATURE_BOARD proteus_f4
#define SIGNATURE_DATE 2020.08.17
#define SIGNATURE_HASH 3109807697
#define TS_SIGNATURE "rusEFI 2020.08.17.proteus_f4.3109807697"
#define SIGNATURE_DATE 2020.08.18
#define SIGNATURE_HASH 2084502748
#define TS_SIGNATURE "rusEFI 2020.08.18.proteus_f4.2084502748"

View File

@ -3,6 +3,6 @@
//
#define SIGNATURE_BOARD proteus_f7
#define SIGNATURE_DATE 2020.08.17
#define SIGNATURE_HASH 3109807697
#define TS_SIGNATURE "rusEFI 2020.08.17.proteus_f7.3109807697"
#define SIGNATURE_DATE 2020.08.18
#define SIGNATURE_HASH 2084502748
#define TS_SIGNATURE "rusEFI 2020.08.18.proteus_f7.2084502748"

View File

@ -33,12 +33,12 @@ enable2ndByteCanID = false
[MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
signature = "rusEFI 2020.08.14.all.1492793354"
signature = "rusEFI 2020.08.18.all.2644451975"
[TunerStudio]
queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI 2020.08.14.all.1492793354" ; signature is expected to be 7 or more characters.
signature = "rusEFI 2020.08.18.all.2644451975" ; signature is expected to be 7 or more characters.
[Constants]
; new packet serial format with CRC
@ -76,7 +76,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Aug 14 20:51:11 UTC 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Aug 18 17:52:06 UTC 2020
pageSize = 20000
page = 1
@ -1848,8 +1848,8 @@ page = 1
curve = dwellCorrection, "Dwell time RPM based"
columnLabel = "RPM", "Dwell"
xAxis = 0, 8000, 10
yAxis = 0, 30, 10
xAxis = 0, 8000, 9
yAxis = 0, 8, 9
xBins = sparkDwellRpmBins, RPMValue
yBins = sparkDwellValues
gauge = RPMGauge
@ -1870,13 +1870,12 @@ page = 1
yBins = map_samplingWindow
gauge = MAPGauge
curve = injectorsDeadTime, "Injector Dead Time by VBatt"
curve = injectorsDeadTime, "Injector dead time"
columnLabel = "Voltage", "Dead Time"
xAxis = 8, 21, 10
yAxis = -3, 3, 10
xAxis = 8, 16, 9
yAxis = 0, 2, 5
xBins = injector_battLagCorrBins, VBatt
yBins = injector_battLagCorr
gauge = VBattGauge
curve = mafDecodingCurve, "MAF sensor"
columnLabel = "Voltage", "kg/hour"
@ -1888,7 +1887,7 @@ page = 1
curve = iatFuelCorrCurve, "Intake air temperature fuel Multiplier"
columnLabel = "Coolant", "Multiplier"
xAxis = -40, 120, 10
xAxis = -40, 120, 9
yAxis = 0, 2, 11
xBins = iatFuelCorrBins, intake
yBins = iatFuelCorr
@ -1896,15 +1895,15 @@ page = 1
curve = cltTimingCorrCurve, "Warmup timing correction"
columnLabel = "Coolant", "Extra"
xAxis = -40, 120, 10
yAxis = 0, 50, 10
xAxis = -40, 120, 9
yAxis = 0, 20, 9
xBins = cltTimingBins, coolant
yBins = cltTimingExtra
gauge = CLTGauge
curve = cltFuelCorrCurve, "Warmup fuel manual Multiplier"
columnLabel = "Coolant", "Multiplier"
xAxis = -40, 100, 10
xAxis = -40, 120, 9
yAxis = 0, 3, 10
xBins = cltFuelCorrBins, coolant
yBins = cltFuelCorr
@ -1912,7 +1911,7 @@ page = 1
curve = crankingCltCurve, "Cranking Coolant Temperature Multiplier"
columnLabel = "Coolant", "Multiplier"
xAxis = -40, 100, 10
xAxis = -40, 120, 9
yAxis = 0, 3, 10
xBins = crankingFuelBins, coolant
yBins = crankingFuelCoef
@ -1928,7 +1927,7 @@ page = 1
curve = crankingTpsCurve, "Cranking TPS Multiplier"
columnLabel = "TPS", "Multiplier"
xAxis = 0, 100, 10
xAxis = 0, 100, 11
yAxis = 0, 3, 10
xBins = crankingTpsBins, TPSValue
yBins = crankingTpsCoef
@ -1936,8 +1935,8 @@ page = 1
curve = crankingDurationCurve, "Cranking Duration Multiplier"
columnLabel = "Engine Cycle", "Multiplier"
xAxis = 0, 1000, 10
yAxis = 0, 3, 10
xAxis = 0, 50, 11
yAxis = 0, 5, 6
xBins = crankingCycleBins
yBins = crankingCycleCoef
@ -1952,7 +1951,7 @@ page = 1
curve = iacCoastingCurve, "Coasting IAC Position for Auto-Idle"
columnLabel = "Coolant", "Multiplier"
xAxis = -40, 120, 10
xAxis = -40, 120, 9
yAxis = 0, 100, 10
xBins = iacCoastingBins, coolant
yBins = iacCoasting
@ -1960,7 +1959,7 @@ page = 1
curve = cltCrankingCurve, "Cranking Idle Air multiplier"
columnLabel = "Coolant", "Multiplier"
xAxis = -40, 120, 10
xAxis = -40, 120, 9
yAxis = 0, 3, 10
xBins = cltCrankingCorrBins, coolant
yBins = cltCrankingCorr
@ -1968,7 +1967,7 @@ page = 1
curve = cltIdleRPMCurve, "Idle Target RPM"
columnLabel = "Coolant", "RPM"
xAxis = -40, 120, 10
xAxis = -40, 120, 9
yAxis = 0, 8000, 10
xBins = cltIdleRpmBins, coolant
yBins = cltIdleRpm, RPMValue
@ -2517,30 +2516,30 @@ menuDialog = main
menu = "Fuel"
# basic
subMenu = injectionSettings, "Injection settings"
subMenu = injectionDeadTime, "Injector dead time", 0, {isInjectionEnabled == 1}
subMenu = injectorConfig, "Injection configuration", 0, {isInjectionEnabled == 1}
subMenu = injectionSettings, "Injection hardware"
subMenu = std_separator
# Targets & closed loop
# Air mass model
subMenu = veTableDialog, "VE", 0, {isInjectionEnabled == 1}
subMenu = tChargeSettings, "Charge temperature estimation", 0, {isInjectionEnabled == 1}
subMenu = baroCorrTbl, "Barometric pressure correction", 0, {isInjectionEnabled == 1 && fuelAlgorithm == LM_SPEED_DENSITY}
subMenu = std_separator
# Fuel model
subMenu = afrTableTbl, "Target AFR", 0, {isInjectionEnabled == 1}
subMenu = cltFuelCorrCurve, "CLT multiplier", 0, {isInjectionEnabled == 1}
subMenu = iatFuelCorrCurve, "IAT multiplier", 0, {isInjectionEnabled == 1}
subMenu = fuelClosedLoopDialog, "Closed loop fuel correction", 0, {isInjectionEnabled == 1}
subMenu = coastingFuelCutControl, "Deceleration fuel cutoff (DFCO)", 0, {isInjectionEnabled == 1}
subMenu = std_separator
# Fuel table/VE
subMenu = veTableDialog, "VE", 0, {isInjectionEnabled == 1}
# Injector model
subMenu = injPhaseTableTbl, "Injection phase", 0, {isInjectionEnabled == 1}
subMenu = std_separator
# Corrections
subMenu = cltFuelCorrCurve, "CLT multiplier", 0, {isInjectionEnabled == 1}
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 = AccelEnrich, "Acceleration enrichment", 0, {isInjectionEnabled == 1}
subMenu = tpsTpsAccelTbl, "TPS/TPS acceleration extra fuel", 0, {isInjectionEnabled == 1}
subMenu = mapAccelTaper, "Engine load AE taper", 0, {isInjectionEnabled == 1}
@ -2747,10 +2746,6 @@ cmd_test_inj9 = "Z\x00\x13\x00\x09"
cmd_test_inj10 = "Z\x00\x13\x00\x0a"
cmd_test_inj11 = "Z\x00\x13\x00\x0b"
cmd_test_inj12 = "Z\x00\x13\x00\x0c"
cmd_test_inj13 = "Z\x00\x13\x00\x0d"
cmd_test_inj14 = "Z\x00\x13\x00\x0e"
cmd_test_inj15 = "Z\x00\x13\x00\x0f"
cmd_test_inj16 = "Z\x00\x13\x00\x10"
cmd_test_fuel_pump = "Z\x00\x14\x00\x01"
cmd_calibrate_tps_1_closed = "Z\x00\x14\x00\x02"
@ -2845,8 +2840,6 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
field = "#Batch injection with individual wiring"
field = "Two wire batch emulation", twoWireBatchInjection, {isInjectionEnabled == 1 && injectionMode == 2}
field = "Use TPS instead of Load for VE table", useTPSBasedVeTable, {isInjectionEnabled == 1 && fuelAlgorithm == LM_SPEED_DENSITY}
field = "#Enabled for TPS-Based 'VE Autotune Mode' in Project Settings"
field = "Use TPS instead of Load for VE table", useTPSBasedVeTable, {0}
dialog = ignitionOutputs, "Ignition Outputs"
field = "Ignition Pin Mode", ignitionPinMode, {isIgnitionEnabled == 1}
@ -2944,10 +2937,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
field = "Injector Flow", injector_flow, {isInjectionEnabled == 1}
dialog = injectorOutputSettings, "Injector Outputs", yAxis
field = "!ECU reboot needed to apply these settings"
field = "injection Pin Mode", injectionPinMode, {isInjectionEnabled == 1}
field = "With batched injection without 'Two wire batch emulation'"
field = " fill only first count / 2 values"
field = "Use only first half of pins for batch mode"
field = "Injection Pin 1", injectionPins1, {isInjectionEnabled == 1}
field = "Injection Pin 2", injectionPins2, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 1}
field = "Injection Pin 3", injectionPins3, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 2}
@ -2959,19 +2949,41 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
field = "Injection Pin 9 ", injectionPins9, {isInjectionEnabled == 1 && cylindersCount > 8}
field = "Injection Pin 10 ", injectionPins10, {isInjectionEnabled == 1 && cylindersCount > 9}
field = "Injection Pin 11 ", injectionPins11, {isInjectionEnabled == 1 && cylindersCount > 10}
field = "Injection Pin 12 ", injectionPins12, {isInjectionEnabled == 1 && cylindersCount > 11}
dialog = injectionBasic, ""
field = "Injection Pin 12 ", injectionPins12, {isInjectionEnabled == 1 && cylindersCount > 11}
field = ""
field = "injection Pin Mode", injectionPinMode, {isInjectionEnabled == 1}
dialog = testInjectors, "Injector Test"
commandButton = "Injector #1", cmd_test_inj1
commandButton = "Injector #2", cmd_test_inj2
commandButton = "Injector #3", cmd_test_inj3
commandButton = "Injector #4", cmd_test_inj4
commandButton = "Injector #5", cmd_test_inj5
commandButton = "Injector #6", cmd_test_inj6
commandButton = "Injector #7", cmd_test_inj7
commandButton = "Injector #8", cmd_test_inj8
commandButton = "Injector #9", cmd_test_inj9
commandButton = "Injector #10", cmd_test_inj10
commandButton = "Injector #11", cmd_test_inj11
commandButton = "Injector #12", cmd_test_inj12
dialog = injectionSettingsEast, "", yAxis
panel = testInjectors
field = ""
dialog = injectionSettingsWest, "", yAxis
panel = injectorOutputSettings
field = ""
dialog = injectionSettings, "", xAxis
panel = injectionSettingsWest
panel = injectionSettingsEast
dialog = injectorConfig, "", yAxis
topicHelp = "fuelHelp"
panel = baseInjection
panel = injChars
dialog = injectionSettings, "", xAxis
panel = injectionBasic
panel = injectorOutputSettings
dialog = injectionDeadTime, "", yAxis
panel = injectorsDeadTime, East
panel = injectorsDeadTime
dialog = ignitionCylExtra, "Ignition Cylinder Extra Timing"
field = "Extra cyl #1", timing_offset_cylinder1
@ -4212,17 +4224,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
commandButton = "Spark #6", cmd_test_spk6
commandButton = "Spark #7", cmd_test_spk7
commandButton = "Spark #8", cmd_test_spk8
dialog = testInjectors, "Fuel"
commandButton = "Injector #1", cmd_test_inj1
commandButton = "Injector #2", cmd_test_inj2
commandButton = "Injector #3", cmd_test_inj3
commandButton = "Injector #4", cmd_test_inj4
commandButton = "Injector #5", cmd_test_inj5
commandButton = "Injector #6", cmd_test_inj6
commandButton = "Injector #7", cmd_test_inj7
commandButton = "Injector #8", cmd_test_inj8
dialog = testMisc, "Misc"
; commandButton = "Come To Pit", cmd_call_from_pit
commandButton = "Fuel Pump", cmd_test_fuel_pump

View File

@ -33,12 +33,12 @@ enable2ndByteCanID = false
[MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
signature = "rusEFI 2020.08.17.frankenso_na6.2420522243"
signature = "rusEFI 2020.08.18.frankenso_na6.1428367246"
[TunerStudio]
queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI 2020.08.17.frankenso_na6.2420522243" ; signature is expected to be 7 or more characters.
signature = "rusEFI 2020.08.18.frankenso_na6.1428367246" ; signature is expected to be 7 or more characters.
[Constants]
; new packet serial format with CRC
@ -76,7 +76,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 17 23:52:53 UTC 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Aug 18 17:52:10 UTC 2020
pageSize = 20000
page = 1
@ -1848,8 +1848,8 @@ page = 1
curve = dwellCorrection, "Dwell time RPM based"
columnLabel = "RPM", "Dwell"
xAxis = 0, 8000, 10
yAxis = 0, 30, 10
xAxis = 0, 8000, 9
yAxis = 0, 8, 9
xBins = sparkDwellRpmBins, RPMValue
yBins = sparkDwellValues
gauge = RPMGauge
@ -1870,13 +1870,12 @@ page = 1
yBins = map_samplingWindow
gauge = MAPGauge
curve = injectorsDeadTime, "Injector Dead Time by VBatt"
curve = injectorsDeadTime, "Injector dead time"
columnLabel = "Voltage", "Dead Time"
xAxis = 8, 21, 10
yAxis = -3, 3, 10
xAxis = 8, 16, 9
yAxis = 0, 2, 5
xBins = injector_battLagCorrBins, VBatt
yBins = injector_battLagCorr
gauge = VBattGauge
curve = mafDecodingCurve, "MAF sensor"
columnLabel = "Voltage", "kg/hour"
@ -1888,7 +1887,7 @@ page = 1
curve = iatFuelCorrCurve, "Intake air temperature fuel Multiplier"
columnLabel = "Coolant", "Multiplier"
xAxis = -40, 120, 10
xAxis = -40, 120, 9
yAxis = 0, 2, 11
xBins = iatFuelCorrBins, intake
yBins = iatFuelCorr
@ -1896,15 +1895,15 @@ page = 1
curve = cltTimingCorrCurve, "Warmup timing correction"
columnLabel = "Coolant", "Extra"
xAxis = -40, 120, 10
yAxis = 0, 50, 10
xAxis = -40, 120, 9
yAxis = 0, 20, 9
xBins = cltTimingBins, coolant
yBins = cltTimingExtra
gauge = CLTGauge
curve = cltFuelCorrCurve, "Warmup fuel manual Multiplier"
columnLabel = "Coolant", "Multiplier"
xAxis = -40, 100, 10
xAxis = -40, 120, 9
yAxis = 0, 3, 10
xBins = cltFuelCorrBins, coolant
yBins = cltFuelCorr
@ -1912,7 +1911,7 @@ page = 1
curve = crankingCltCurve, "Cranking Coolant Temperature Multiplier"
columnLabel = "Coolant", "Multiplier"
xAxis = -40, 100, 10
xAxis = -40, 120, 9
yAxis = 0, 3, 10
xBins = crankingFuelBins, coolant
yBins = crankingFuelCoef
@ -1928,7 +1927,7 @@ page = 1
curve = crankingTpsCurve, "Cranking TPS Multiplier"
columnLabel = "TPS", "Multiplier"
xAxis = 0, 100, 10
xAxis = 0, 100, 11
yAxis = 0, 3, 10
xBins = crankingTpsBins, TPSValue
yBins = crankingTpsCoef
@ -1936,8 +1935,8 @@ page = 1
curve = crankingDurationCurve, "Cranking Duration Multiplier"
columnLabel = "Engine Cycle", "Multiplier"
xAxis = 0, 1000, 10
yAxis = 0, 3, 10
xAxis = 0, 50, 11
yAxis = 0, 5, 6
xBins = crankingCycleBins
yBins = crankingCycleCoef
@ -1952,7 +1951,7 @@ page = 1
curve = iacCoastingCurve, "Coasting IAC Position for Auto-Idle"
columnLabel = "Coolant", "Multiplier"
xAxis = -40, 120, 10
xAxis = -40, 120, 9
yAxis = 0, 100, 10
xBins = iacCoastingBins, coolant
yBins = iacCoasting
@ -1960,7 +1959,7 @@ page = 1
curve = cltCrankingCurve, "Cranking Idle Air multiplier"
columnLabel = "Coolant", "Multiplier"
xAxis = -40, 120, 10
xAxis = -40, 120, 9
yAxis = 0, 3, 10
xBins = cltCrankingCorrBins, coolant
yBins = cltCrankingCorr
@ -1968,7 +1967,7 @@ page = 1
curve = cltIdleRPMCurve, "Idle Target RPM"
columnLabel = "Coolant", "RPM"
xAxis = -40, 120, 10
xAxis = -40, 120, 9
yAxis = 0, 8000, 10
xBins = cltIdleRpmBins, coolant
yBins = cltIdleRpm, RPMValue
@ -2517,30 +2516,30 @@ menuDialog = main
menu = "Fuel"
# basic
subMenu = injectionSettings, "Injection settings"
subMenu = injectionDeadTime, "Injector dead time", 0, {isInjectionEnabled == 1}
subMenu = injectorConfig, "Injection configuration", 0, {isInjectionEnabled == 1}
subMenu = injectionSettings, "Injection hardware"
subMenu = std_separator
# Targets & closed loop
# Air mass model
subMenu = veTableDialog, "VE", 0, {isInjectionEnabled == 1}
subMenu = tChargeSettings, "Charge temperature estimation", 0, {isInjectionEnabled == 1}
subMenu = baroCorrTbl, "Barometric pressure correction", 0, {isInjectionEnabled == 1 && fuelAlgorithm == LM_SPEED_DENSITY}
subMenu = std_separator
# Fuel model
subMenu = afrTableTbl, "Target AFR", 0, {isInjectionEnabled == 1}
subMenu = cltFuelCorrCurve, "CLT multiplier", 0, {isInjectionEnabled == 1}
subMenu = iatFuelCorrCurve, "IAT multiplier", 0, {isInjectionEnabled == 1}
subMenu = fuelClosedLoopDialog, "Closed loop fuel correction", 0, {isInjectionEnabled == 1}
subMenu = coastingFuelCutControl, "Deceleration fuel cutoff (DFCO)", 0, {isInjectionEnabled == 1}
subMenu = std_separator
# Fuel table/VE
subMenu = veTableDialog, "VE", 0, {isInjectionEnabled == 1}
# Injector model
subMenu = injPhaseTableTbl, "Injection phase", 0, {isInjectionEnabled == 1}
subMenu = std_separator
# Corrections
subMenu = cltFuelCorrCurve, "CLT multiplier", 0, {isInjectionEnabled == 1}
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 = AccelEnrich, "Acceleration enrichment", 0, {isInjectionEnabled == 1}
subMenu = tpsTpsAccelTbl, "TPS/TPS acceleration extra fuel", 0, {isInjectionEnabled == 1}
subMenu = mapAccelTaper, "Engine load AE taper", 0, {isInjectionEnabled == 1}
@ -2747,10 +2746,6 @@ cmd_test_inj9 = "Z\x00\x13\x00\x09"
cmd_test_inj10 = "Z\x00\x13\x00\x0a"
cmd_test_inj11 = "Z\x00\x13\x00\x0b"
cmd_test_inj12 = "Z\x00\x13\x00\x0c"
cmd_test_inj13 = "Z\x00\x13\x00\x0d"
cmd_test_inj14 = "Z\x00\x13\x00\x0e"
cmd_test_inj15 = "Z\x00\x13\x00\x0f"
cmd_test_inj16 = "Z\x00\x13\x00\x10"
cmd_test_fuel_pump = "Z\x00\x14\x00\x01"
cmd_calibrate_tps_1_closed = "Z\x00\x14\x00\x02"
@ -2845,8 +2840,6 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
field = "#Batch injection with individual wiring"
field = "Two wire batch emulation", twoWireBatchInjection, {isInjectionEnabled == 1 && injectionMode == 2}
field = "Use TPS instead of Load for VE table", useTPSBasedVeTable, {isInjectionEnabled == 1 && fuelAlgorithm == LM_SPEED_DENSITY}
field = "#Enabled for TPS-Based 'VE Autotune Mode' in Project Settings"
field = "Use TPS instead of Load for VE table", useTPSBasedVeTable, {0}
dialog = ignitionOutputs, "Ignition Outputs"
field = "Ignition Pin Mode", ignitionPinMode, {isIgnitionEnabled == 1}
@ -2944,10 +2937,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
field = "Injector Flow", injector_flow, {isInjectionEnabled == 1}
dialog = injectorOutputSettings, "Injector Outputs", yAxis
field = "!ECU reboot needed to apply these settings"
field = "injection Pin Mode", injectionPinMode, {isInjectionEnabled == 1}
field = "With batched injection without 'Two wire batch emulation'"
field = " fill only first count / 2 values"
field = "Use only first half of pins for batch mode"
field = "Injection Pin 1", injectionPins1, {isInjectionEnabled == 1}
field = "Injection Pin 2", injectionPins2, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 1}
field = "Injection Pin 3", injectionPins3, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 2}
@ -2959,19 +2949,41 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
field = "Injection Pin 9 ", injectionPins9, {isInjectionEnabled == 1 && cylindersCount > 8}
field = "Injection Pin 10 ", injectionPins10, {isInjectionEnabled == 1 && cylindersCount > 9}
field = "Injection Pin 11 ", injectionPins11, {isInjectionEnabled == 1 && cylindersCount > 10}
field = "Injection Pin 12 ", injectionPins12, {isInjectionEnabled == 1 && cylindersCount > 11}
dialog = injectionBasic, ""
field = "Injection Pin 12 ", injectionPins12, {isInjectionEnabled == 1 && cylindersCount > 11}
field = ""
field = "injection Pin Mode", injectionPinMode, {isInjectionEnabled == 1}
dialog = testInjectors, "Injector Test"
commandButton = "Injector #1", cmd_test_inj1
commandButton = "Injector #2", cmd_test_inj2
commandButton = "Injector #3", cmd_test_inj3
commandButton = "Injector #4", cmd_test_inj4
commandButton = "Injector #5", cmd_test_inj5
commandButton = "Injector #6", cmd_test_inj6
commandButton = "Injector #7", cmd_test_inj7
commandButton = "Injector #8", cmd_test_inj8
commandButton = "Injector #9", cmd_test_inj9
commandButton = "Injector #10", cmd_test_inj10
commandButton = "Injector #11", cmd_test_inj11
commandButton = "Injector #12", cmd_test_inj12
dialog = injectionSettingsEast, "", yAxis
panel = testInjectors
field = ""
dialog = injectionSettingsWest, "", yAxis
panel = injectorOutputSettings
field = ""
dialog = injectionSettings, "", xAxis
panel = injectionSettingsWest
panel = injectionSettingsEast
dialog = injectorConfig, "", yAxis
topicHelp = "fuelHelp"
panel = baseInjection
panel = injChars
dialog = injectionSettings, "", xAxis
panel = injectionBasic
panel = injectorOutputSettings
dialog = injectionDeadTime, "", yAxis
panel = injectorsDeadTime, East
panel = injectorsDeadTime
dialog = ignitionCylExtra, "Ignition Cylinder Extra Timing"
field = "Extra cyl #1", timing_offset_cylinder1
@ -4212,17 +4224,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
commandButton = "Spark #6", cmd_test_spk6
commandButton = "Spark #7", cmd_test_spk7
commandButton = "Spark #8", cmd_test_spk8
dialog = testInjectors, "Fuel"
commandButton = "Injector #1", cmd_test_inj1
commandButton = "Injector #2", cmd_test_inj2
commandButton = "Injector #3", cmd_test_inj3
commandButton = "Injector #4", cmd_test_inj4
commandButton = "Injector #5", cmd_test_inj5
commandButton = "Injector #6", cmd_test_inj6
commandButton = "Injector #7", cmd_test_inj7
commandButton = "Injector #8", cmd_test_inj8
dialog = testMisc, "Misc"
; commandButton = "Come To Pit", cmd_call_from_pit
commandButton = "Fuel Pump", cmd_test_fuel_pump

View File

@ -33,12 +33,12 @@ enable2ndByteCanID = false
[MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
signature = "rusEFI 2020.08.14.kin.1999535530"
signature = "rusEFI 2020.08.18.kin.2991286055"
[TunerStudio]
queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI 2020.08.14.kin.1999535530" ; signature is expected to be 7 or more characters.
signature = "rusEFI 2020.08.18.kin.2991286055" ; signature is expected to be 7 or more characters.
[Constants]
; new packet serial format with CRC
@ -76,7 +76,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Fri Aug 14 20:51:22 UTC 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Tue Aug 18 17:52:24 UTC 2020
pageSize = 20000
page = 1
@ -1848,8 +1848,8 @@ page = 1
curve = dwellCorrection, "Dwell time RPM based"
columnLabel = "RPM", "Dwell"
xAxis = 0, 8000, 10
yAxis = 0, 30, 10
xAxis = 0, 8000, 9
yAxis = 0, 8, 9
xBins = sparkDwellRpmBins, RPMValue
yBins = sparkDwellValues
gauge = RPMGauge
@ -1870,13 +1870,12 @@ page = 1
yBins = map_samplingWindow
gauge = MAPGauge
curve = injectorsDeadTime, "Injector Dead Time by VBatt"
curve = injectorsDeadTime, "Injector dead time"
columnLabel = "Voltage", "Dead Time"
xAxis = 8, 21, 10
yAxis = -3, 3, 10
xAxis = 8, 16, 9
yAxis = 0, 2, 5
xBins = injector_battLagCorrBins, VBatt
yBins = injector_battLagCorr
gauge = VBattGauge
curve = mafDecodingCurve, "MAF sensor"
columnLabel = "Voltage", "kg/hour"
@ -1888,7 +1887,7 @@ page = 1
curve = iatFuelCorrCurve, "Intake air temperature fuel Multiplier"
columnLabel = "Coolant", "Multiplier"
xAxis = -40, 120, 10
xAxis = -40, 120, 9
yAxis = 0, 2, 11
xBins = iatFuelCorrBins, intake
yBins = iatFuelCorr
@ -1896,15 +1895,15 @@ page = 1
curve = cltTimingCorrCurve, "Warmup timing correction"
columnLabel = "Coolant", "Extra"
xAxis = -40, 120, 10
yAxis = 0, 50, 10
xAxis = -40, 120, 9
yAxis = 0, 20, 9
xBins = cltTimingBins, coolant
yBins = cltTimingExtra
gauge = CLTGauge
curve = cltFuelCorrCurve, "Warmup fuel manual Multiplier"
columnLabel = "Coolant", "Multiplier"
xAxis = -40, 100, 10
xAxis = -40, 120, 9
yAxis = 0, 3, 10
xBins = cltFuelCorrBins, coolant
yBins = cltFuelCorr
@ -1912,7 +1911,7 @@ page = 1
curve = crankingCltCurve, "Cranking Coolant Temperature Multiplier"
columnLabel = "Coolant", "Multiplier"
xAxis = -40, 100, 10
xAxis = -40, 120, 9
yAxis = 0, 3, 10
xBins = crankingFuelBins, coolant
yBins = crankingFuelCoef
@ -1928,7 +1927,7 @@ page = 1
curve = crankingTpsCurve, "Cranking TPS Multiplier"
columnLabel = "TPS", "Multiplier"
xAxis = 0, 100, 10
xAxis = 0, 100, 11
yAxis = 0, 3, 10
xBins = crankingTpsBins, TPSValue
yBins = crankingTpsCoef
@ -1936,8 +1935,8 @@ page = 1
curve = crankingDurationCurve, "Cranking Duration Multiplier"
columnLabel = "Engine Cycle", "Multiplier"
xAxis = 0, 1000, 10
yAxis = 0, 3, 10
xAxis = 0, 50, 11
yAxis = 0, 5, 6
xBins = crankingCycleBins
yBins = crankingCycleCoef
@ -1952,7 +1951,7 @@ page = 1
curve = iacCoastingCurve, "Coasting IAC Position for Auto-Idle"
columnLabel = "Coolant", "Multiplier"
xAxis = -40, 120, 10
xAxis = -40, 120, 9
yAxis = 0, 100, 10
xBins = iacCoastingBins, coolant
yBins = iacCoasting
@ -1960,7 +1959,7 @@ page = 1
curve = cltCrankingCurve, "Cranking Idle Air multiplier"
columnLabel = "Coolant", "Multiplier"
xAxis = -40, 120, 10
xAxis = -40, 120, 9
yAxis = 0, 3, 10
xBins = cltCrankingCorrBins, coolant
yBins = cltCrankingCorr
@ -1968,7 +1967,7 @@ page = 1
curve = cltIdleRPMCurve, "Idle Target RPM"
columnLabel = "Coolant", "RPM"
xAxis = -40, 120, 10
xAxis = -40, 120, 9
yAxis = 0, 8000, 10
xBins = cltIdleRpmBins, coolant
yBins = cltIdleRpm, RPMValue
@ -2517,30 +2516,30 @@ menuDialog = main
menu = "Fuel"
# basic
subMenu = injectionSettings, "Injection settings"
subMenu = injectionDeadTime, "Injector dead time", 0, {isInjectionEnabled == 1}
subMenu = injectorConfig, "Injection configuration", 0, {isInjectionEnabled == 1}
subMenu = injectionSettings, "Injection hardware"
subMenu = std_separator
# Targets & closed loop
# Air mass model
subMenu = veTableDialog, "VE", 0, {isInjectionEnabled == 1}
subMenu = tChargeSettings, "Charge temperature estimation", 0, {isInjectionEnabled == 1}
subMenu = baroCorrTbl, "Barometric pressure correction", 0, {isInjectionEnabled == 1 && fuelAlgorithm == LM_SPEED_DENSITY}
subMenu = std_separator
# Fuel model
subMenu = afrTableTbl, "Target AFR", 0, {isInjectionEnabled == 1}
subMenu = cltFuelCorrCurve, "CLT multiplier", 0, {isInjectionEnabled == 1}
subMenu = iatFuelCorrCurve, "IAT multiplier", 0, {isInjectionEnabled == 1}
subMenu = fuelClosedLoopDialog, "Closed loop fuel correction", 0, {isInjectionEnabled == 1}
subMenu = coastingFuelCutControl, "Deceleration fuel cutoff (DFCO)", 0, {isInjectionEnabled == 1}
subMenu = std_separator
# Fuel table/VE
subMenu = veTableDialog, "VE", 0, {isInjectionEnabled == 1}
# Injector model
subMenu = injPhaseTableTbl, "Injection phase", 0, {isInjectionEnabled == 1}
subMenu = std_separator
# Corrections
subMenu = cltFuelCorrCurve, "CLT multiplier", 0, {isInjectionEnabled == 1}
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 = AccelEnrich, "Acceleration enrichment", 0, {isInjectionEnabled == 1}
subMenu = tpsTpsAccelTbl, "TPS/TPS acceleration extra fuel", 0, {isInjectionEnabled == 1}
subMenu = mapAccelTaper, "Engine load AE taper", 0, {isInjectionEnabled == 1}
@ -2747,10 +2746,6 @@ cmd_test_inj9 = "Z\x00\x13\x00\x09"
cmd_test_inj10 = "Z\x00\x13\x00\x0a"
cmd_test_inj11 = "Z\x00\x13\x00\x0b"
cmd_test_inj12 = "Z\x00\x13\x00\x0c"
cmd_test_inj13 = "Z\x00\x13\x00\x0d"
cmd_test_inj14 = "Z\x00\x13\x00\x0e"
cmd_test_inj15 = "Z\x00\x13\x00\x0f"
cmd_test_inj16 = "Z\x00\x13\x00\x10"
cmd_test_fuel_pump = "Z\x00\x14\x00\x01"
cmd_calibrate_tps_1_closed = "Z\x00\x14\x00\x02"
@ -2845,8 +2840,6 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
field = "#Batch injection with individual wiring"
field = "Two wire batch emulation", twoWireBatchInjection, {isInjectionEnabled == 1 && injectionMode == 2}
field = "Use TPS instead of Load for VE table", useTPSBasedVeTable, {isInjectionEnabled == 1 && fuelAlgorithm == LM_SPEED_DENSITY}
field = "#Enabled for TPS-Based 'VE Autotune Mode' in Project Settings"
field = "Use TPS instead of Load for VE table", useTPSBasedVeTable, {0}
dialog = ignitionOutputs, "Ignition Outputs"
field = "Ignition Pin Mode", ignitionPinMode, {isIgnitionEnabled == 1}
@ -2945,10 +2938,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
field = "Injector Flow", injector_flow, {isInjectionEnabled == 1}
dialog = injectorOutputSettings, "Injector Outputs", yAxis
field = "!ECU reboot needed to apply these settings"
field = "injection Pin Mode", injectionPinMode, {isInjectionEnabled == 1}
field = "With batched injection without 'Two wire batch emulation'"
field = " fill only first count / 2 values"
field = "Use only first half of pins for batch mode"
field = "Injection Pin 1", injectionPins1, {isInjectionEnabled == 1}
field = "Injection Pin 2", injectionPins2, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 1}
field = "Injection Pin 3", injectionPins3, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 2}
@ -2960,19 +2950,41 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
field = "Injection Pin 9 ", injectionPins9, {isInjectionEnabled == 1 && cylindersCount > 8}
field = "Injection Pin 10 ", injectionPins10, {isInjectionEnabled == 1 && cylindersCount > 9}
field = "Injection Pin 11 ", injectionPins11, {isInjectionEnabled == 1 && cylindersCount > 10}
field = "Injection Pin 12 ", injectionPins12, {isInjectionEnabled == 1 && cylindersCount > 11}
dialog = injectionBasic, ""
field = "Injection Pin 12 ", injectionPins12, {isInjectionEnabled == 1 && cylindersCount > 11}
field = ""
field = "injection Pin Mode", injectionPinMode, {isInjectionEnabled == 1}
dialog = testInjectors, "Injector Test"
commandButton = "Injector #1", cmd_test_inj1
commandButton = "Injector #2", cmd_test_inj2
commandButton = "Injector #3", cmd_test_inj3
commandButton = "Injector #4", cmd_test_inj4
commandButton = "Injector #5", cmd_test_inj5
commandButton = "Injector #6", cmd_test_inj6
commandButton = "Injector #7", cmd_test_inj7
commandButton = "Injector #8", cmd_test_inj8
commandButton = "Injector #9", cmd_test_inj9
commandButton = "Injector #10", cmd_test_inj10
commandButton = "Injector #11", cmd_test_inj11
commandButton = "Injector #12", cmd_test_inj12
dialog = injectionSettingsEast, "", yAxis
panel = testInjectors
field = ""
dialog = injectionSettingsWest, "", yAxis
panel = injectorOutputSettings
field = ""
dialog = injectionSettings, "", xAxis
panel = injectionSettingsWest
panel = injectionSettingsEast
dialog = injectorConfig, "", yAxis
topicHelp = "fuelHelp"
panel = baseInjection
panel = injChars
dialog = injectionSettings, "", xAxis
panel = injectionBasic
panel = injectorOutputSettings
dialog = injectionDeadTime, "", yAxis
panel = injectorsDeadTime, East
panel = injectorsDeadTime
dialog = ignitionCylExtra, "Ignition Cylinder Extra Timing"
field = "Extra cyl #1", timing_offset_cylinder1
@ -4213,17 +4225,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
commandButton = "Spark #6", cmd_test_spk6
commandButton = "Spark #7", cmd_test_spk7
commandButton = "Spark #8", cmd_test_spk8
dialog = testInjectors, "Fuel"
commandButton = "Injector #1", cmd_test_inj1
commandButton = "Injector #2", cmd_test_inj2
commandButton = "Injector #3", cmd_test_inj3
commandButton = "Injector #4", cmd_test_inj4
commandButton = "Injector #5", cmd_test_inj5
commandButton = "Injector #6", cmd_test_inj6
commandButton = "Injector #7", cmd_test_inj7
commandButton = "Injector #8", cmd_test_inj8
dialog = testMisc, "Misc"
; commandButton = "Come To Pit", cmd_call_from_pit
commandButton = "Fuel Pump", cmd_test_fuel_pump

View File

@ -33,12 +33,12 @@ enable2ndByteCanID = false
[MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
signature = "rusEFI 2020.08.14.mre_f4.2740235601"
signature = "rusEFI 2020.08.18.mre_f4.1714534364"
[TunerStudio]
queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI 2020.08.14.mre_f4.2740235601" ; signature is expected to be 7 or more characters.
signature = "rusEFI 2020.08.18.mre_f4.1714534364" ; signature is expected to be 7 or more characters.
[Constants]
; new packet serial format with CRC
@ -76,7 +76,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Aug 14 20:51:14 UTC 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Aug 18 17:52:09 UTC 2020
pageSize = 20000
page = 1
@ -1848,8 +1848,8 @@ page = 1
curve = dwellCorrection, "Dwell time RPM based"
columnLabel = "RPM", "Dwell"
xAxis = 0, 8000, 10
yAxis = 0, 30, 10
xAxis = 0, 8000, 9
yAxis = 0, 8, 9
xBins = sparkDwellRpmBins, RPMValue
yBins = sparkDwellValues
gauge = RPMGauge
@ -1870,13 +1870,12 @@ page = 1
yBins = map_samplingWindow
gauge = MAPGauge
curve = injectorsDeadTime, "Injector Dead Time by VBatt"
curve = injectorsDeadTime, "Injector dead time"
columnLabel = "Voltage", "Dead Time"
xAxis = 8, 21, 10
yAxis = -3, 3, 10
xAxis = 8, 16, 9
yAxis = 0, 2, 5
xBins = injector_battLagCorrBins, VBatt
yBins = injector_battLagCorr
gauge = VBattGauge
curve = mafDecodingCurve, "MAF sensor"
columnLabel = "Voltage", "kg/hour"
@ -1888,7 +1887,7 @@ page = 1
curve = iatFuelCorrCurve, "Intake air temperature fuel Multiplier"
columnLabel = "Coolant", "Multiplier"
xAxis = -40, 120, 10
xAxis = -40, 120, 9
yAxis = 0, 2, 11
xBins = iatFuelCorrBins, intake
yBins = iatFuelCorr
@ -1896,15 +1895,15 @@ page = 1
curve = cltTimingCorrCurve, "Warmup timing correction"
columnLabel = "Coolant", "Extra"
xAxis = -40, 120, 10
yAxis = 0, 50, 10
xAxis = -40, 120, 9
yAxis = 0, 20, 9
xBins = cltTimingBins, coolant
yBins = cltTimingExtra
gauge = CLTGauge
curve = cltFuelCorrCurve, "Warmup fuel manual Multiplier"
columnLabel = "Coolant", "Multiplier"
xAxis = -40, 100, 10
xAxis = -40, 120, 9
yAxis = 0, 3, 10
xBins = cltFuelCorrBins, coolant
yBins = cltFuelCorr
@ -1912,7 +1911,7 @@ page = 1
curve = crankingCltCurve, "Cranking Coolant Temperature Multiplier"
columnLabel = "Coolant", "Multiplier"
xAxis = -40, 100, 10
xAxis = -40, 120, 9
yAxis = 0, 3, 10
xBins = crankingFuelBins, coolant
yBins = crankingFuelCoef
@ -1928,7 +1927,7 @@ page = 1
curve = crankingTpsCurve, "Cranking TPS Multiplier"
columnLabel = "TPS", "Multiplier"
xAxis = 0, 100, 10
xAxis = 0, 100, 11
yAxis = 0, 3, 10
xBins = crankingTpsBins, TPSValue
yBins = crankingTpsCoef
@ -1936,8 +1935,8 @@ page = 1
curve = crankingDurationCurve, "Cranking Duration Multiplier"
columnLabel = "Engine Cycle", "Multiplier"
xAxis = 0, 1000, 10
yAxis = 0, 3, 10
xAxis = 0, 50, 11
yAxis = 0, 5, 6
xBins = crankingCycleBins
yBins = crankingCycleCoef
@ -1952,7 +1951,7 @@ page = 1
curve = iacCoastingCurve, "Coasting IAC Position for Auto-Idle"
columnLabel = "Coolant", "Multiplier"
xAxis = -40, 120, 10
xAxis = -40, 120, 9
yAxis = 0, 100, 10
xBins = iacCoastingBins, coolant
yBins = iacCoasting
@ -1960,7 +1959,7 @@ page = 1
curve = cltCrankingCurve, "Cranking Idle Air multiplier"
columnLabel = "Coolant", "Multiplier"
xAxis = -40, 120, 10
xAxis = -40, 120, 9
yAxis = 0, 3, 10
xBins = cltCrankingCorrBins, coolant
yBins = cltCrankingCorr
@ -1968,7 +1967,7 @@ page = 1
curve = cltIdleRPMCurve, "Idle Target RPM"
columnLabel = "Coolant", "RPM"
xAxis = -40, 120, 10
xAxis = -40, 120, 9
yAxis = 0, 8000, 10
xBins = cltIdleRpmBins, coolant
yBins = cltIdleRpm, RPMValue
@ -2517,30 +2516,30 @@ menuDialog = main
menu = "Fuel"
# basic
subMenu = injectionSettings, "Injection settings"
subMenu = injectionDeadTime, "Injector dead time", 0, {isInjectionEnabled == 1}
subMenu = injectorConfig, "Injection configuration", 0, {isInjectionEnabled == 1}
subMenu = injectionSettings, "Injection hardware"
subMenu = std_separator
# Targets & closed loop
# Air mass model
subMenu = veTableDialog, "VE", 0, {isInjectionEnabled == 1}
subMenu = tChargeSettings, "Charge temperature estimation", 0, {isInjectionEnabled == 1}
subMenu = baroCorrTbl, "Barometric pressure correction", 0, {isInjectionEnabled == 1 && fuelAlgorithm == LM_SPEED_DENSITY}
subMenu = std_separator
# Fuel model
subMenu = afrTableTbl, "Target AFR", 0, {isInjectionEnabled == 1}
subMenu = cltFuelCorrCurve, "CLT multiplier", 0, {isInjectionEnabled == 1}
subMenu = iatFuelCorrCurve, "IAT multiplier", 0, {isInjectionEnabled == 1}
subMenu = fuelClosedLoopDialog, "Closed loop fuel correction", 0, {isInjectionEnabled == 1}
subMenu = coastingFuelCutControl, "Deceleration fuel cutoff (DFCO)", 0, {isInjectionEnabled == 1}
subMenu = std_separator
# Fuel table/VE
subMenu = veTableDialog, "VE", 0, {isInjectionEnabled == 1}
# Injector model
subMenu = injPhaseTableTbl, "Injection phase", 0, {isInjectionEnabled == 1}
subMenu = std_separator
# Corrections
subMenu = cltFuelCorrCurve, "CLT multiplier", 0, {isInjectionEnabled == 1}
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 = AccelEnrich, "Acceleration enrichment", 0, {isInjectionEnabled == 1}
subMenu = tpsTpsAccelTbl, "TPS/TPS acceleration extra fuel", 0, {isInjectionEnabled == 1}
subMenu = mapAccelTaper, "Engine load AE taper", 0, {isInjectionEnabled == 1}
@ -2742,10 +2741,6 @@ cmd_test_inj9 = "Z\x00\x13\x00\x09"
cmd_test_inj10 = "Z\x00\x13\x00\x0a"
cmd_test_inj11 = "Z\x00\x13\x00\x0b"
cmd_test_inj12 = "Z\x00\x13\x00\x0c"
cmd_test_inj13 = "Z\x00\x13\x00\x0d"
cmd_test_inj14 = "Z\x00\x13\x00\x0e"
cmd_test_inj15 = "Z\x00\x13\x00\x0f"
cmd_test_inj16 = "Z\x00\x13\x00\x10"
cmd_test_fuel_pump = "Z\x00\x14\x00\x01"
cmd_calibrate_tps_1_closed = "Z\x00\x14\x00\x02"
@ -2840,8 +2835,6 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
field = "#Batch injection with individual wiring"
field = "Two wire batch emulation", twoWireBatchInjection, {isInjectionEnabled == 1 && injectionMode == 2}
field = "Use TPS instead of Load for VE table", useTPSBasedVeTable, {isInjectionEnabled == 1 && fuelAlgorithm == LM_SPEED_DENSITY}
field = "#Enabled for TPS-Based 'VE Autotune Mode' in Project Settings"
field = "Use TPS instead of Load for VE table", useTPSBasedVeTable, {0}
dialog = ignitionOutputs, "Ignition Outputs"
field = "Ignition Pin Mode", ignitionPinMode, {isIgnitionEnabled == 1}
@ -2939,10 +2932,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
field = "Injector Flow", injector_flow, {isInjectionEnabled == 1}
dialog = injectorOutputSettings, "Injector Outputs", yAxis
field = "!ECU reboot needed to apply these settings"
field = "injection Pin Mode", injectionPinMode, {isInjectionEnabled == 1}
field = "With batched injection without 'Two wire batch emulation'"
field = " fill only first count / 2 values"
field = "Use only first half of pins for batch mode"
field = "Injection Pin 1", injectionPins1, {isInjectionEnabled == 1}
field = "Injection Pin 2", injectionPins2, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 1}
field = "Injection Pin 3", injectionPins3, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 2}
@ -2954,19 +2944,41 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
field = "Injection Pin 9 ", injectionPins9, {isInjectionEnabled == 1 && cylindersCount > 8}
field = "Injection Pin 10 ", injectionPins10, {isInjectionEnabled == 1 && cylindersCount > 9}
field = "Injection Pin 11 ", injectionPins11, {isInjectionEnabled == 1 && cylindersCount > 10}
field = "Injection Pin 12 ", injectionPins12, {isInjectionEnabled == 1 && cylindersCount > 11}
dialog = injectionBasic, ""
field = "Injection Pin 12 ", injectionPins12, {isInjectionEnabled == 1 && cylindersCount > 11}
field = ""
field = "injection Pin Mode", injectionPinMode, {isInjectionEnabled == 1}
dialog = testInjectors, "Injector Test"
commandButton = "Injector #1", cmd_test_inj1
commandButton = "Injector #2", cmd_test_inj2
commandButton = "Injector #3", cmd_test_inj3
commandButton = "Injector #4", cmd_test_inj4
commandButton = "Injector #5", cmd_test_inj5
commandButton = "Injector #6", cmd_test_inj6
commandButton = "Injector #7", cmd_test_inj7
commandButton = "Injector #8", cmd_test_inj8
commandButton = "Injector #9", cmd_test_inj9
commandButton = "Injector #10", cmd_test_inj10
commandButton = "Injector #11", cmd_test_inj11
commandButton = "Injector #12", cmd_test_inj12
dialog = injectionSettingsEast, "", yAxis
panel = testInjectors
field = ""
dialog = injectionSettingsWest, "", yAxis
panel = injectorOutputSettings
field = ""
dialog = injectionSettings, "", xAxis
panel = injectionSettingsWest
panel = injectionSettingsEast
dialog = injectorConfig, "", yAxis
topicHelp = "fuelHelp"
panel = baseInjection
panel = injChars
dialog = injectionSettings, "", xAxis
panel = injectionBasic
panel = injectorOutputSettings
dialog = injectionDeadTime, "", yAxis
panel = injectorsDeadTime, East
panel = injectorsDeadTime
dialog = ignitionCylExtra, "Ignition Cylinder Extra Timing"
field = "Extra cyl #1", timing_offset_cylinder1
@ -4186,17 +4198,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
commandButton = "Spark #6", cmd_test_spk6
commandButton = "Spark #7", cmd_test_spk7
commandButton = "Spark #8", cmd_test_spk8
dialog = testInjectors, "Fuel"
commandButton = "Injector #1", cmd_test_inj1
commandButton = "Injector #2", cmd_test_inj2
commandButton = "Injector #3", cmd_test_inj3
commandButton = "Injector #4", cmd_test_inj4
commandButton = "Injector #5", cmd_test_inj5
commandButton = "Injector #6", cmd_test_inj6
commandButton = "Injector #7", cmd_test_inj7
commandButton = "Injector #8", cmd_test_inj8
dialog = testMisc, "Misc"
; commandButton = "Come To Pit", cmd_call_from_pit
commandButton = "Fuel Pump", cmd_test_fuel_pump

View File

@ -33,12 +33,12 @@ enable2ndByteCanID = false
[MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
signature = "rusEFI 2020.08.14.mre_f7.2740235601"
signature = "rusEFI 2020.08.18.mre_f7.1714534364"
[TunerStudio]
queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI 2020.08.14.mre_f7.2740235601" ; signature is expected to be 7 or more characters.
signature = "rusEFI 2020.08.18.mre_f7.1714534364" ; signature is expected to be 7 or more characters.
[Constants]
; new packet serial format with CRC
@ -76,7 +76,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Aug 14 20:51:13 UTC 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Aug 18 17:52:08 UTC 2020
pageSize = 20000
page = 1
@ -1848,8 +1848,8 @@ page = 1
curve = dwellCorrection, "Dwell time RPM based"
columnLabel = "RPM", "Dwell"
xAxis = 0, 8000, 10
yAxis = 0, 30, 10
xAxis = 0, 8000, 9
yAxis = 0, 8, 9
xBins = sparkDwellRpmBins, RPMValue
yBins = sparkDwellValues
gauge = RPMGauge
@ -1870,13 +1870,12 @@ page = 1
yBins = map_samplingWindow
gauge = MAPGauge
curve = injectorsDeadTime, "Injector Dead Time by VBatt"
curve = injectorsDeadTime, "Injector dead time"
columnLabel = "Voltage", "Dead Time"
xAxis = 8, 21, 10
yAxis = -3, 3, 10
xAxis = 8, 16, 9
yAxis = 0, 2, 5
xBins = injector_battLagCorrBins, VBatt
yBins = injector_battLagCorr
gauge = VBattGauge
curve = mafDecodingCurve, "MAF sensor"
columnLabel = "Voltage", "kg/hour"
@ -1888,7 +1887,7 @@ page = 1
curve = iatFuelCorrCurve, "Intake air temperature fuel Multiplier"
columnLabel = "Coolant", "Multiplier"
xAxis = -40, 120, 10
xAxis = -40, 120, 9
yAxis = 0, 2, 11
xBins = iatFuelCorrBins, intake
yBins = iatFuelCorr
@ -1896,15 +1895,15 @@ page = 1
curve = cltTimingCorrCurve, "Warmup timing correction"
columnLabel = "Coolant", "Extra"
xAxis = -40, 120, 10
yAxis = 0, 50, 10
xAxis = -40, 120, 9
yAxis = 0, 20, 9
xBins = cltTimingBins, coolant
yBins = cltTimingExtra
gauge = CLTGauge
curve = cltFuelCorrCurve, "Warmup fuel manual Multiplier"
columnLabel = "Coolant", "Multiplier"
xAxis = -40, 100, 10
xAxis = -40, 120, 9
yAxis = 0, 3, 10
xBins = cltFuelCorrBins, coolant
yBins = cltFuelCorr
@ -1912,7 +1911,7 @@ page = 1
curve = crankingCltCurve, "Cranking Coolant Temperature Multiplier"
columnLabel = "Coolant", "Multiplier"
xAxis = -40, 100, 10
xAxis = -40, 120, 9
yAxis = 0, 3, 10
xBins = crankingFuelBins, coolant
yBins = crankingFuelCoef
@ -1928,7 +1927,7 @@ page = 1
curve = crankingTpsCurve, "Cranking TPS Multiplier"
columnLabel = "TPS", "Multiplier"
xAxis = 0, 100, 10
xAxis = 0, 100, 11
yAxis = 0, 3, 10
xBins = crankingTpsBins, TPSValue
yBins = crankingTpsCoef
@ -1936,8 +1935,8 @@ page = 1
curve = crankingDurationCurve, "Cranking Duration Multiplier"
columnLabel = "Engine Cycle", "Multiplier"
xAxis = 0, 1000, 10
yAxis = 0, 3, 10
xAxis = 0, 50, 11
yAxis = 0, 5, 6
xBins = crankingCycleBins
yBins = crankingCycleCoef
@ -1952,7 +1951,7 @@ page = 1
curve = iacCoastingCurve, "Coasting IAC Position for Auto-Idle"
columnLabel = "Coolant", "Multiplier"
xAxis = -40, 120, 10
xAxis = -40, 120, 9
yAxis = 0, 100, 10
xBins = iacCoastingBins, coolant
yBins = iacCoasting
@ -1960,7 +1959,7 @@ page = 1
curve = cltCrankingCurve, "Cranking Idle Air multiplier"
columnLabel = "Coolant", "Multiplier"
xAxis = -40, 120, 10
xAxis = -40, 120, 9
yAxis = 0, 3, 10
xBins = cltCrankingCorrBins, coolant
yBins = cltCrankingCorr
@ -1968,7 +1967,7 @@ page = 1
curve = cltIdleRPMCurve, "Idle Target RPM"
columnLabel = "Coolant", "RPM"
xAxis = -40, 120, 10
xAxis = -40, 120, 9
yAxis = 0, 8000, 10
xBins = cltIdleRpmBins, coolant
yBins = cltIdleRpm, RPMValue
@ -2517,30 +2516,30 @@ menuDialog = main
menu = "Fuel"
# basic
subMenu = injectionSettings, "Injection settings"
subMenu = injectionDeadTime, "Injector dead time", 0, {isInjectionEnabled == 1}
subMenu = injectorConfig, "Injection configuration", 0, {isInjectionEnabled == 1}
subMenu = injectionSettings, "Injection hardware"
subMenu = std_separator
# Targets & closed loop
# Air mass model
subMenu = veTableDialog, "VE", 0, {isInjectionEnabled == 1}
subMenu = tChargeSettings, "Charge temperature estimation", 0, {isInjectionEnabled == 1}
subMenu = baroCorrTbl, "Barometric pressure correction", 0, {isInjectionEnabled == 1 && fuelAlgorithm == LM_SPEED_DENSITY}
subMenu = std_separator
# Fuel model
subMenu = afrTableTbl, "Target AFR", 0, {isInjectionEnabled == 1}
subMenu = cltFuelCorrCurve, "CLT multiplier", 0, {isInjectionEnabled == 1}
subMenu = iatFuelCorrCurve, "IAT multiplier", 0, {isInjectionEnabled == 1}
subMenu = fuelClosedLoopDialog, "Closed loop fuel correction", 0, {isInjectionEnabled == 1}
subMenu = coastingFuelCutControl, "Deceleration fuel cutoff (DFCO)", 0, {isInjectionEnabled == 1}
subMenu = std_separator
# Fuel table/VE
subMenu = veTableDialog, "VE", 0, {isInjectionEnabled == 1}
# Injector model
subMenu = injPhaseTableTbl, "Injection phase", 0, {isInjectionEnabled == 1}
subMenu = std_separator
# Corrections
subMenu = cltFuelCorrCurve, "CLT multiplier", 0, {isInjectionEnabled == 1}
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 = AccelEnrich, "Acceleration enrichment", 0, {isInjectionEnabled == 1}
subMenu = tpsTpsAccelTbl, "TPS/TPS acceleration extra fuel", 0, {isInjectionEnabled == 1}
subMenu = mapAccelTaper, "Engine load AE taper", 0, {isInjectionEnabled == 1}
@ -2742,10 +2741,6 @@ cmd_test_inj9 = "Z\x00\x13\x00\x09"
cmd_test_inj10 = "Z\x00\x13\x00\x0a"
cmd_test_inj11 = "Z\x00\x13\x00\x0b"
cmd_test_inj12 = "Z\x00\x13\x00\x0c"
cmd_test_inj13 = "Z\x00\x13\x00\x0d"
cmd_test_inj14 = "Z\x00\x13\x00\x0e"
cmd_test_inj15 = "Z\x00\x13\x00\x0f"
cmd_test_inj16 = "Z\x00\x13\x00\x10"
cmd_test_fuel_pump = "Z\x00\x14\x00\x01"
cmd_calibrate_tps_1_closed = "Z\x00\x14\x00\x02"
@ -2840,8 +2835,6 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
field = "#Batch injection with individual wiring"
field = "Two wire batch emulation", twoWireBatchInjection, {isInjectionEnabled == 1 && injectionMode == 2}
field = "Use TPS instead of Load for VE table", useTPSBasedVeTable, {isInjectionEnabled == 1 && fuelAlgorithm == LM_SPEED_DENSITY}
field = "#Enabled for TPS-Based 'VE Autotune Mode' in Project Settings"
field = "Use TPS instead of Load for VE table", useTPSBasedVeTable, {0}
dialog = ignitionOutputs, "Ignition Outputs"
field = "Ignition Pin Mode", ignitionPinMode, {isIgnitionEnabled == 1}
@ -2939,10 +2932,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
field = "Injector Flow", injector_flow, {isInjectionEnabled == 1}
dialog = injectorOutputSettings, "Injector Outputs", yAxis
field = "!ECU reboot needed to apply these settings"
field = "injection Pin Mode", injectionPinMode, {isInjectionEnabled == 1}
field = "With batched injection without 'Two wire batch emulation'"
field = " fill only first count / 2 values"
field = "Use only first half of pins for batch mode"
field = "Injection Pin 1", injectionPins1, {isInjectionEnabled == 1}
field = "Injection Pin 2", injectionPins2, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 1}
field = "Injection Pin 3", injectionPins3, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 2}
@ -2954,19 +2944,41 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
field = "Injection Pin 9 ", injectionPins9, {isInjectionEnabled == 1 && cylindersCount > 8}
field = "Injection Pin 10 ", injectionPins10, {isInjectionEnabled == 1 && cylindersCount > 9}
field = "Injection Pin 11 ", injectionPins11, {isInjectionEnabled == 1 && cylindersCount > 10}
field = "Injection Pin 12 ", injectionPins12, {isInjectionEnabled == 1 && cylindersCount > 11}
dialog = injectionBasic, ""
field = "Injection Pin 12 ", injectionPins12, {isInjectionEnabled == 1 && cylindersCount > 11}
field = ""
field = "injection Pin Mode", injectionPinMode, {isInjectionEnabled == 1}
dialog = testInjectors, "Injector Test"
commandButton = "Injector #1", cmd_test_inj1
commandButton = "Injector #2", cmd_test_inj2
commandButton = "Injector #3", cmd_test_inj3
commandButton = "Injector #4", cmd_test_inj4
commandButton = "Injector #5", cmd_test_inj5
commandButton = "Injector #6", cmd_test_inj6
commandButton = "Injector #7", cmd_test_inj7
commandButton = "Injector #8", cmd_test_inj8
commandButton = "Injector #9", cmd_test_inj9
commandButton = "Injector #10", cmd_test_inj10
commandButton = "Injector #11", cmd_test_inj11
commandButton = "Injector #12", cmd_test_inj12
dialog = injectionSettingsEast, "", yAxis
panel = testInjectors
field = ""
dialog = injectionSettingsWest, "", yAxis
panel = injectorOutputSettings
field = ""
dialog = injectionSettings, "", xAxis
panel = injectionSettingsWest
panel = injectionSettingsEast
dialog = injectorConfig, "", yAxis
topicHelp = "fuelHelp"
panel = baseInjection
panel = injChars
dialog = injectionSettings, "", xAxis
panel = injectionBasic
panel = injectorOutputSettings
dialog = injectionDeadTime, "", yAxis
panel = injectorsDeadTime, East
panel = injectorsDeadTime
dialog = ignitionCylExtra, "Ignition Cylinder Extra Timing"
field = "Extra cyl #1", timing_offset_cylinder1
@ -4186,17 +4198,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
commandButton = "Spark #6", cmd_test_spk6
commandButton = "Spark #7", cmd_test_spk7
commandButton = "Spark #8", cmd_test_spk8
dialog = testInjectors, "Fuel"
commandButton = "Injector #1", cmd_test_inj1
commandButton = "Injector #2", cmd_test_inj2
commandButton = "Injector #3", cmd_test_inj3
commandButton = "Injector #4", cmd_test_inj4
commandButton = "Injector #5", cmd_test_inj5
commandButton = "Injector #6", cmd_test_inj6
commandButton = "Injector #7", cmd_test_inj7
commandButton = "Injector #8", cmd_test_inj8
dialog = testMisc, "Misc"
; commandButton = "Come To Pit", cmd_call_from_pit
commandButton = "Fuel Pump", cmd_test_fuel_pump

View File

@ -33,12 +33,12 @@ enable2ndByteCanID = false
[MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
signature = "rusEFI 2020.08.14.prometheus_405.1326217652"
signature = "rusEFI 2020.08.18.prometheus_405.2322162489"
[TunerStudio]
queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI 2020.08.14.prometheus_405.1326217652" ; signature is expected to be 7 or more characters.
signature = "rusEFI 2020.08.18.prometheus_405.2322162489" ; signature is expected to be 7 or more characters.
[Constants]
; new packet serial format with CRC
@ -76,7 +76,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Aug 14 20:51:18 UTC 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Aug 18 17:52:12 UTC 2020
pageSize = 20000
page = 1
@ -1848,8 +1848,8 @@ page = 1
curve = dwellCorrection, "Dwell time RPM based"
columnLabel = "RPM", "Dwell"
xAxis = 0, 8000, 10
yAxis = 0, 30, 10
xAxis = 0, 8000, 9
yAxis = 0, 8, 9
xBins = sparkDwellRpmBins, RPMValue
yBins = sparkDwellValues
gauge = RPMGauge
@ -1870,13 +1870,12 @@ page = 1
yBins = map_samplingWindow
gauge = MAPGauge
curve = injectorsDeadTime, "Injector Dead Time by VBatt"
curve = injectorsDeadTime, "Injector dead time"
columnLabel = "Voltage", "Dead Time"
xAxis = 8, 21, 10
yAxis = -3, 3, 10
xAxis = 8, 16, 9
yAxis = 0, 2, 5
xBins = injector_battLagCorrBins, VBatt
yBins = injector_battLagCorr
gauge = VBattGauge
curve = mafDecodingCurve, "MAF sensor"
columnLabel = "Voltage", "kg/hour"
@ -1888,7 +1887,7 @@ page = 1
curve = iatFuelCorrCurve, "Intake air temperature fuel Multiplier"
columnLabel = "Coolant", "Multiplier"
xAxis = -40, 120, 10
xAxis = -40, 120, 9
yAxis = 0, 2, 11
xBins = iatFuelCorrBins, intake
yBins = iatFuelCorr
@ -1896,15 +1895,15 @@ page = 1
curve = cltTimingCorrCurve, "Warmup timing correction"
columnLabel = "Coolant", "Extra"
xAxis = -40, 120, 10
yAxis = 0, 50, 10
xAxis = -40, 120, 9
yAxis = 0, 20, 9
xBins = cltTimingBins, coolant
yBins = cltTimingExtra
gauge = CLTGauge
curve = cltFuelCorrCurve, "Warmup fuel manual Multiplier"
columnLabel = "Coolant", "Multiplier"
xAxis = -40, 100, 10
xAxis = -40, 120, 9
yAxis = 0, 3, 10
xBins = cltFuelCorrBins, coolant
yBins = cltFuelCorr
@ -1912,7 +1911,7 @@ page = 1
curve = crankingCltCurve, "Cranking Coolant Temperature Multiplier"
columnLabel = "Coolant", "Multiplier"
xAxis = -40, 100, 10
xAxis = -40, 120, 9
yAxis = 0, 3, 10
xBins = crankingFuelBins, coolant
yBins = crankingFuelCoef
@ -1928,7 +1927,7 @@ page = 1
curve = crankingTpsCurve, "Cranking TPS Multiplier"
columnLabel = "TPS", "Multiplier"
xAxis = 0, 100, 10
xAxis = 0, 100, 11
yAxis = 0, 3, 10
xBins = crankingTpsBins, TPSValue
yBins = crankingTpsCoef
@ -1936,8 +1935,8 @@ page = 1
curve = crankingDurationCurve, "Cranking Duration Multiplier"
columnLabel = "Engine Cycle", "Multiplier"
xAxis = 0, 1000, 10
yAxis = 0, 3, 10
xAxis = 0, 50, 11
yAxis = 0, 5, 6
xBins = crankingCycleBins
yBins = crankingCycleCoef
@ -1952,7 +1951,7 @@ page = 1
curve = iacCoastingCurve, "Coasting IAC Position for Auto-Idle"
columnLabel = "Coolant", "Multiplier"
xAxis = -40, 120, 10
xAxis = -40, 120, 9
yAxis = 0, 100, 10
xBins = iacCoastingBins, coolant
yBins = iacCoasting
@ -1960,7 +1959,7 @@ page = 1
curve = cltCrankingCurve, "Cranking Idle Air multiplier"
columnLabel = "Coolant", "Multiplier"
xAxis = -40, 120, 10
xAxis = -40, 120, 9
yAxis = 0, 3, 10
xBins = cltCrankingCorrBins, coolant
yBins = cltCrankingCorr
@ -1968,7 +1967,7 @@ page = 1
curve = cltIdleRPMCurve, "Idle Target RPM"
columnLabel = "Coolant", "RPM"
xAxis = -40, 120, 10
xAxis = -40, 120, 9
yAxis = 0, 8000, 10
xBins = cltIdleRpmBins, coolant
yBins = cltIdleRpm, RPMValue
@ -2517,30 +2516,30 @@ menuDialog = main
menu = "Fuel"
# basic
subMenu = injectionSettings, "Injection settings"
subMenu = injectionDeadTime, "Injector dead time", 0, {isInjectionEnabled == 1}
subMenu = injectorConfig, "Injection configuration", 0, {isInjectionEnabled == 1}
subMenu = injectionSettings, "Injection hardware"
subMenu = std_separator
# Targets & closed loop
# Air mass model
subMenu = veTableDialog, "VE", 0, {isInjectionEnabled == 1}
subMenu = tChargeSettings, "Charge temperature estimation", 0, {isInjectionEnabled == 1}
subMenu = baroCorrTbl, "Barometric pressure correction", 0, {isInjectionEnabled == 1 && fuelAlgorithm == LM_SPEED_DENSITY}
subMenu = std_separator
# Fuel model
subMenu = afrTableTbl, "Target AFR", 0, {isInjectionEnabled == 1}
subMenu = cltFuelCorrCurve, "CLT multiplier", 0, {isInjectionEnabled == 1}
subMenu = iatFuelCorrCurve, "IAT multiplier", 0, {isInjectionEnabled == 1}
subMenu = fuelClosedLoopDialog, "Closed loop fuel correction", 0, {isInjectionEnabled == 1}
subMenu = coastingFuelCutControl, "Deceleration fuel cutoff (DFCO)", 0, {isInjectionEnabled == 1}
subMenu = std_separator
# Fuel table/VE
subMenu = veTableDialog, "VE", 0, {isInjectionEnabled == 1}
# Injector model
subMenu = injPhaseTableTbl, "Injection phase", 0, {isInjectionEnabled == 1}
subMenu = std_separator
# Corrections
subMenu = cltFuelCorrCurve, "CLT multiplier", 0, {isInjectionEnabled == 1}
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 = AccelEnrich, "Acceleration enrichment", 0, {isInjectionEnabled == 1}
subMenu = tpsTpsAccelTbl, "TPS/TPS acceleration extra fuel", 0, {isInjectionEnabled == 1}
subMenu = mapAccelTaper, "Engine load AE taper", 0, {isInjectionEnabled == 1}
@ -2743,10 +2742,6 @@ cmd_test_inj9 = "Z\x00\x13\x00\x09"
cmd_test_inj10 = "Z\x00\x13\x00\x0a"
cmd_test_inj11 = "Z\x00\x13\x00\x0b"
cmd_test_inj12 = "Z\x00\x13\x00\x0c"
cmd_test_inj13 = "Z\x00\x13\x00\x0d"
cmd_test_inj14 = "Z\x00\x13\x00\x0e"
cmd_test_inj15 = "Z\x00\x13\x00\x0f"
cmd_test_inj16 = "Z\x00\x13\x00\x10"
cmd_test_fuel_pump = "Z\x00\x14\x00\x01"
cmd_calibrate_tps_1_closed = "Z\x00\x14\x00\x02"
@ -2841,8 +2836,6 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
field = "#Batch injection with individual wiring"
field = "Two wire batch emulation", twoWireBatchInjection, {isInjectionEnabled == 1 && injectionMode == 2}
field = "Use TPS instead of Load for VE table", useTPSBasedVeTable, {isInjectionEnabled == 1 && fuelAlgorithm == LM_SPEED_DENSITY}
field = "#Enabled for TPS-Based 'VE Autotune Mode' in Project Settings"
field = "Use TPS instead of Load for VE table", useTPSBasedVeTable, {0}
dialog = ignitionOutputs, "Ignition Outputs"
field = "Ignition Pin Mode", ignitionPinMode, {isIgnitionEnabled == 1}
@ -2940,10 +2933,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
field = "Injector Flow", injector_flow, {isInjectionEnabled == 1}
dialog = injectorOutputSettings, "Injector Outputs", yAxis
field = "!ECU reboot needed to apply these settings"
field = "injection Pin Mode", injectionPinMode, {isInjectionEnabled == 1}
field = "With batched injection without 'Two wire batch emulation'"
field = " fill only first count / 2 values"
field = "Use only first half of pins for batch mode"
field = "Injection Pin 1", injectionPins1, {isInjectionEnabled == 1}
field = "Injection Pin 2", injectionPins2, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 1}
field = "Injection Pin 3", injectionPins3, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 2}
@ -2955,19 +2945,41 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
field = "Injection Pin 9 ", injectionPins9, {isInjectionEnabled == 1 && cylindersCount > 8}
field = "Injection Pin 10 ", injectionPins10, {isInjectionEnabled == 1 && cylindersCount > 9}
field = "Injection Pin 11 ", injectionPins11, {isInjectionEnabled == 1 && cylindersCount > 10}
field = "Injection Pin 12 ", injectionPins12, {isInjectionEnabled == 1 && cylindersCount > 11}
dialog = injectionBasic, ""
field = "Injection Pin 12 ", injectionPins12, {isInjectionEnabled == 1 && cylindersCount > 11}
field = ""
field = "injection Pin Mode", injectionPinMode, {isInjectionEnabled == 1}
dialog = testInjectors, "Injector Test"
commandButton = "Injector #1", cmd_test_inj1
commandButton = "Injector #2", cmd_test_inj2
commandButton = "Injector #3", cmd_test_inj3
commandButton = "Injector #4", cmd_test_inj4
commandButton = "Injector #5", cmd_test_inj5
commandButton = "Injector #6", cmd_test_inj6
commandButton = "Injector #7", cmd_test_inj7
commandButton = "Injector #8", cmd_test_inj8
commandButton = "Injector #9", cmd_test_inj9
commandButton = "Injector #10", cmd_test_inj10
commandButton = "Injector #11", cmd_test_inj11
commandButton = "Injector #12", cmd_test_inj12
dialog = injectionSettingsEast, "", yAxis
panel = testInjectors
field = ""
dialog = injectionSettingsWest, "", yAxis
panel = injectorOutputSettings
field = ""
dialog = injectionSettings, "", xAxis
panel = injectionSettingsWest
panel = injectionSettingsEast
dialog = injectorConfig, "", yAxis
topicHelp = "fuelHelp"
panel = baseInjection
panel = injChars
dialog = injectionSettings, "", xAxis
panel = injectionBasic
panel = injectorOutputSettings
dialog = injectionDeadTime, "", yAxis
panel = injectorsDeadTime, East
panel = injectorsDeadTime
dialog = ignitionCylExtra, "Ignition Cylinder Extra Timing"
field = "Extra cyl #1", timing_offset_cylinder1
@ -4208,17 +4220,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
commandButton = "Spark #6", cmd_test_spk6
commandButton = "Spark #7", cmd_test_spk7
commandButton = "Spark #8", cmd_test_spk8
dialog = testInjectors, "Fuel"
commandButton = "Injector #1", cmd_test_inj1
commandButton = "Injector #2", cmd_test_inj2
commandButton = "Injector #3", cmd_test_inj3
commandButton = "Injector #4", cmd_test_inj4
commandButton = "Injector #5", cmd_test_inj5
commandButton = "Injector #6", cmd_test_inj6
commandButton = "Injector #7", cmd_test_inj7
commandButton = "Injector #8", cmd_test_inj8
dialog = testMisc, "Misc"
; commandButton = "Come To Pit", cmd_call_from_pit
commandButton = "Fuel Pump", cmd_test_fuel_pump

View File

@ -33,12 +33,12 @@ enable2ndByteCanID = false
[MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
signature = "rusEFI 2020.08.14.prometheus_469.1326217652"
signature = "rusEFI 2020.08.18.prometheus_469.2322162489"
[TunerStudio]
queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI 2020.08.14.prometheus_469.1326217652" ; signature is expected to be 7 or more characters.
signature = "rusEFI 2020.08.18.prometheus_469.2322162489" ; signature is expected to be 7 or more characters.
[Constants]
; new packet serial format with CRC
@ -76,7 +76,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Aug 14 20:51:17 UTC 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Aug 18 17:52:11 UTC 2020
pageSize = 20000
page = 1
@ -1848,8 +1848,8 @@ page = 1
curve = dwellCorrection, "Dwell time RPM based"
columnLabel = "RPM", "Dwell"
xAxis = 0, 8000, 10
yAxis = 0, 30, 10
xAxis = 0, 8000, 9
yAxis = 0, 8, 9
xBins = sparkDwellRpmBins, RPMValue
yBins = sparkDwellValues
gauge = RPMGauge
@ -1870,13 +1870,12 @@ page = 1
yBins = map_samplingWindow
gauge = MAPGauge
curve = injectorsDeadTime, "Injector Dead Time by VBatt"
curve = injectorsDeadTime, "Injector dead time"
columnLabel = "Voltage", "Dead Time"
xAxis = 8, 21, 10
yAxis = -3, 3, 10
xAxis = 8, 16, 9
yAxis = 0, 2, 5
xBins = injector_battLagCorrBins, VBatt
yBins = injector_battLagCorr
gauge = VBattGauge
curve = mafDecodingCurve, "MAF sensor"
columnLabel = "Voltage", "kg/hour"
@ -1888,7 +1887,7 @@ page = 1
curve = iatFuelCorrCurve, "Intake air temperature fuel Multiplier"
columnLabel = "Coolant", "Multiplier"
xAxis = -40, 120, 10
xAxis = -40, 120, 9
yAxis = 0, 2, 11
xBins = iatFuelCorrBins, intake
yBins = iatFuelCorr
@ -1896,15 +1895,15 @@ page = 1
curve = cltTimingCorrCurve, "Warmup timing correction"
columnLabel = "Coolant", "Extra"
xAxis = -40, 120, 10
yAxis = 0, 50, 10
xAxis = -40, 120, 9
yAxis = 0, 20, 9
xBins = cltTimingBins, coolant
yBins = cltTimingExtra
gauge = CLTGauge
curve = cltFuelCorrCurve, "Warmup fuel manual Multiplier"
columnLabel = "Coolant", "Multiplier"
xAxis = -40, 100, 10
xAxis = -40, 120, 9
yAxis = 0, 3, 10
xBins = cltFuelCorrBins, coolant
yBins = cltFuelCorr
@ -1912,7 +1911,7 @@ page = 1
curve = crankingCltCurve, "Cranking Coolant Temperature Multiplier"
columnLabel = "Coolant", "Multiplier"
xAxis = -40, 100, 10
xAxis = -40, 120, 9
yAxis = 0, 3, 10
xBins = crankingFuelBins, coolant
yBins = crankingFuelCoef
@ -1928,7 +1927,7 @@ page = 1
curve = crankingTpsCurve, "Cranking TPS Multiplier"
columnLabel = "TPS", "Multiplier"
xAxis = 0, 100, 10
xAxis = 0, 100, 11
yAxis = 0, 3, 10
xBins = crankingTpsBins, TPSValue
yBins = crankingTpsCoef
@ -1936,8 +1935,8 @@ page = 1
curve = crankingDurationCurve, "Cranking Duration Multiplier"
columnLabel = "Engine Cycle", "Multiplier"
xAxis = 0, 1000, 10
yAxis = 0, 3, 10
xAxis = 0, 50, 11
yAxis = 0, 5, 6
xBins = crankingCycleBins
yBins = crankingCycleCoef
@ -1952,7 +1951,7 @@ page = 1
curve = iacCoastingCurve, "Coasting IAC Position for Auto-Idle"
columnLabel = "Coolant", "Multiplier"
xAxis = -40, 120, 10
xAxis = -40, 120, 9
yAxis = 0, 100, 10
xBins = iacCoastingBins, coolant
yBins = iacCoasting
@ -1960,7 +1959,7 @@ page = 1
curve = cltCrankingCurve, "Cranking Idle Air multiplier"
columnLabel = "Coolant", "Multiplier"
xAxis = -40, 120, 10
xAxis = -40, 120, 9
yAxis = 0, 3, 10
xBins = cltCrankingCorrBins, coolant
yBins = cltCrankingCorr
@ -1968,7 +1967,7 @@ page = 1
curve = cltIdleRPMCurve, "Idle Target RPM"
columnLabel = "Coolant", "RPM"
xAxis = -40, 120, 10
xAxis = -40, 120, 9
yAxis = 0, 8000, 10
xBins = cltIdleRpmBins, coolant
yBins = cltIdleRpm, RPMValue
@ -2517,30 +2516,30 @@ menuDialog = main
menu = "Fuel"
# basic
subMenu = injectionSettings, "Injection settings"
subMenu = injectionDeadTime, "Injector dead time", 0, {isInjectionEnabled == 1}
subMenu = injectorConfig, "Injection configuration", 0, {isInjectionEnabled == 1}
subMenu = injectionSettings, "Injection hardware"
subMenu = std_separator
# Targets & closed loop
# Air mass model
subMenu = veTableDialog, "VE", 0, {isInjectionEnabled == 1}
subMenu = tChargeSettings, "Charge temperature estimation", 0, {isInjectionEnabled == 1}
subMenu = baroCorrTbl, "Barometric pressure correction", 0, {isInjectionEnabled == 1 && fuelAlgorithm == LM_SPEED_DENSITY}
subMenu = std_separator
# Fuel model
subMenu = afrTableTbl, "Target AFR", 0, {isInjectionEnabled == 1}
subMenu = cltFuelCorrCurve, "CLT multiplier", 0, {isInjectionEnabled == 1}
subMenu = iatFuelCorrCurve, "IAT multiplier", 0, {isInjectionEnabled == 1}
subMenu = fuelClosedLoopDialog, "Closed loop fuel correction", 0, {isInjectionEnabled == 1}
subMenu = coastingFuelCutControl, "Deceleration fuel cutoff (DFCO)", 0, {isInjectionEnabled == 1}
subMenu = std_separator
# Fuel table/VE
subMenu = veTableDialog, "VE", 0, {isInjectionEnabled == 1}
# Injector model
subMenu = injPhaseTableTbl, "Injection phase", 0, {isInjectionEnabled == 1}
subMenu = std_separator
# Corrections
subMenu = cltFuelCorrCurve, "CLT multiplier", 0, {isInjectionEnabled == 1}
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 = AccelEnrich, "Acceleration enrichment", 0, {isInjectionEnabled == 1}
subMenu = tpsTpsAccelTbl, "TPS/TPS acceleration extra fuel", 0, {isInjectionEnabled == 1}
subMenu = mapAccelTaper, "Engine load AE taper", 0, {isInjectionEnabled == 1}
@ -2743,10 +2742,6 @@ cmd_test_inj9 = "Z\x00\x13\x00\x09"
cmd_test_inj10 = "Z\x00\x13\x00\x0a"
cmd_test_inj11 = "Z\x00\x13\x00\x0b"
cmd_test_inj12 = "Z\x00\x13\x00\x0c"
cmd_test_inj13 = "Z\x00\x13\x00\x0d"
cmd_test_inj14 = "Z\x00\x13\x00\x0e"
cmd_test_inj15 = "Z\x00\x13\x00\x0f"
cmd_test_inj16 = "Z\x00\x13\x00\x10"
cmd_test_fuel_pump = "Z\x00\x14\x00\x01"
cmd_calibrate_tps_1_closed = "Z\x00\x14\x00\x02"
@ -2841,8 +2836,6 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
field = "#Batch injection with individual wiring"
field = "Two wire batch emulation", twoWireBatchInjection, {isInjectionEnabled == 1 && injectionMode == 2}
field = "Use TPS instead of Load for VE table", useTPSBasedVeTable, {isInjectionEnabled == 1 && fuelAlgorithm == LM_SPEED_DENSITY}
field = "#Enabled for TPS-Based 'VE Autotune Mode' in Project Settings"
field = "Use TPS instead of Load for VE table", useTPSBasedVeTable, {0}
dialog = ignitionOutputs, "Ignition Outputs"
field = "Ignition Pin Mode", ignitionPinMode, {isIgnitionEnabled == 1}
@ -2940,10 +2933,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
field = "Injector Flow", injector_flow, {isInjectionEnabled == 1}
dialog = injectorOutputSettings, "Injector Outputs", yAxis
field = "!ECU reboot needed to apply these settings"
field = "injection Pin Mode", injectionPinMode, {isInjectionEnabled == 1}
field = "With batched injection without 'Two wire batch emulation'"
field = " fill only first count / 2 values"
field = "Use only first half of pins for batch mode"
field = "Injection Pin 1", injectionPins1, {isInjectionEnabled == 1}
field = "Injection Pin 2", injectionPins2, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 1}
field = "Injection Pin 3", injectionPins3, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 2}
@ -2955,19 +2945,41 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
field = "Injection Pin 9 ", injectionPins9, {isInjectionEnabled == 1 && cylindersCount > 8}
field = "Injection Pin 10 ", injectionPins10, {isInjectionEnabled == 1 && cylindersCount > 9}
field = "Injection Pin 11 ", injectionPins11, {isInjectionEnabled == 1 && cylindersCount > 10}
field = "Injection Pin 12 ", injectionPins12, {isInjectionEnabled == 1 && cylindersCount > 11}
dialog = injectionBasic, ""
field = "Injection Pin 12 ", injectionPins12, {isInjectionEnabled == 1 && cylindersCount > 11}
field = ""
field = "injection Pin Mode", injectionPinMode, {isInjectionEnabled == 1}
dialog = testInjectors, "Injector Test"
commandButton = "Injector #1", cmd_test_inj1
commandButton = "Injector #2", cmd_test_inj2
commandButton = "Injector #3", cmd_test_inj3
commandButton = "Injector #4", cmd_test_inj4
commandButton = "Injector #5", cmd_test_inj5
commandButton = "Injector #6", cmd_test_inj6
commandButton = "Injector #7", cmd_test_inj7
commandButton = "Injector #8", cmd_test_inj8
commandButton = "Injector #9", cmd_test_inj9
commandButton = "Injector #10", cmd_test_inj10
commandButton = "Injector #11", cmd_test_inj11
commandButton = "Injector #12", cmd_test_inj12
dialog = injectionSettingsEast, "", yAxis
panel = testInjectors
field = ""
dialog = injectionSettingsWest, "", yAxis
panel = injectorOutputSettings
field = ""
dialog = injectionSettings, "", xAxis
panel = injectionSettingsWest
panel = injectionSettingsEast
dialog = injectorConfig, "", yAxis
topicHelp = "fuelHelp"
panel = baseInjection
panel = injChars
dialog = injectionSettings, "", xAxis
panel = injectionBasic
panel = injectorOutputSettings
dialog = injectionDeadTime, "", yAxis
panel = injectorsDeadTime, East
panel = injectorsDeadTime
dialog = ignitionCylExtra, "Ignition Cylinder Extra Timing"
field = "Extra cyl #1", timing_offset_cylinder1
@ -4208,17 +4220,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
commandButton = "Spark #6", cmd_test_spk6
commandButton = "Spark #7", cmd_test_spk7
commandButton = "Spark #8", cmd_test_spk8
dialog = testInjectors, "Fuel"
commandButton = "Injector #1", cmd_test_inj1
commandButton = "Injector #2", cmd_test_inj2
commandButton = "Injector #3", cmd_test_inj3
commandButton = "Injector #4", cmd_test_inj4
commandButton = "Injector #5", cmd_test_inj5
commandButton = "Injector #6", cmd_test_inj6
commandButton = "Injector #7", cmd_test_inj7
commandButton = "Injector #8", cmd_test_inj8
dialog = testMisc, "Misc"
; commandButton = "Come To Pit", cmd_call_from_pit
commandButton = "Fuel Pump", cmd_test_fuel_pump

View File

@ -33,12 +33,12 @@ enable2ndByteCanID = false
[MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
signature = "rusEFI 2020.08.17.proteus_f4.3109807697"
signature = "rusEFI 2020.08.18.proteus_f4.2084502748"
[TunerStudio]
queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI 2020.08.17.proteus_f4.3109807697" ; signature is expected to be 7 or more characters.
signature = "rusEFI 2020.08.18.proteus_f4.2084502748" ; signature is expected to be 7 or more characters.
[Constants]
; new packet serial format with CRC
@ -76,7 +76,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 17 23:52:58 UTC 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Aug 18 17:52:15 UTC 2020
pageSize = 20000
page = 1
@ -1848,8 +1848,8 @@ page = 1
curve = dwellCorrection, "Dwell time RPM based"
columnLabel = "RPM", "Dwell"
xAxis = 0, 8000, 10
yAxis = 0, 30, 10
xAxis = 0, 8000, 9
yAxis = 0, 8, 9
xBins = sparkDwellRpmBins, RPMValue
yBins = sparkDwellValues
gauge = RPMGauge
@ -1870,13 +1870,12 @@ page = 1
yBins = map_samplingWindow
gauge = MAPGauge
curve = injectorsDeadTime, "Injector Dead Time by VBatt"
curve = injectorsDeadTime, "Injector dead time"
columnLabel = "Voltage", "Dead Time"
xAxis = 8, 21, 10
yAxis = -3, 3, 10
xAxis = 8, 16, 9
yAxis = 0, 2, 5
xBins = injector_battLagCorrBins, VBatt
yBins = injector_battLagCorr
gauge = VBattGauge
curve = mafDecodingCurve, "MAF sensor"
columnLabel = "Voltage", "kg/hour"
@ -1888,7 +1887,7 @@ page = 1
curve = iatFuelCorrCurve, "Intake air temperature fuel Multiplier"
columnLabel = "Coolant", "Multiplier"
xAxis = -40, 120, 10
xAxis = -40, 120, 9
yAxis = 0, 2, 11
xBins = iatFuelCorrBins, intake
yBins = iatFuelCorr
@ -1896,15 +1895,15 @@ page = 1
curve = cltTimingCorrCurve, "Warmup timing correction"
columnLabel = "Coolant", "Extra"
xAxis = -40, 120, 10
yAxis = 0, 50, 10
xAxis = -40, 120, 9
yAxis = 0, 20, 9
xBins = cltTimingBins, coolant
yBins = cltTimingExtra
gauge = CLTGauge
curve = cltFuelCorrCurve, "Warmup fuel manual Multiplier"
columnLabel = "Coolant", "Multiplier"
xAxis = -40, 100, 10
xAxis = -40, 120, 9
yAxis = 0, 3, 10
xBins = cltFuelCorrBins, coolant
yBins = cltFuelCorr
@ -1912,7 +1911,7 @@ page = 1
curve = crankingCltCurve, "Cranking Coolant Temperature Multiplier"
columnLabel = "Coolant", "Multiplier"
xAxis = -40, 100, 10
xAxis = -40, 120, 9
yAxis = 0, 3, 10
xBins = crankingFuelBins, coolant
yBins = crankingFuelCoef
@ -1928,7 +1927,7 @@ page = 1
curve = crankingTpsCurve, "Cranking TPS Multiplier"
columnLabel = "TPS", "Multiplier"
xAxis = 0, 100, 10
xAxis = 0, 100, 11
yAxis = 0, 3, 10
xBins = crankingTpsBins, TPSValue
yBins = crankingTpsCoef
@ -1936,8 +1935,8 @@ page = 1
curve = crankingDurationCurve, "Cranking Duration Multiplier"
columnLabel = "Engine Cycle", "Multiplier"
xAxis = 0, 1000, 10
yAxis = 0, 3, 10
xAxis = 0, 50, 11
yAxis = 0, 5, 6
xBins = crankingCycleBins
yBins = crankingCycleCoef
@ -1952,7 +1951,7 @@ page = 1
curve = iacCoastingCurve, "Coasting IAC Position for Auto-Idle"
columnLabel = "Coolant", "Multiplier"
xAxis = -40, 120, 10
xAxis = -40, 120, 9
yAxis = 0, 100, 10
xBins = iacCoastingBins, coolant
yBins = iacCoasting
@ -1960,7 +1959,7 @@ page = 1
curve = cltCrankingCurve, "Cranking Idle Air multiplier"
columnLabel = "Coolant", "Multiplier"
xAxis = -40, 120, 10
xAxis = -40, 120, 9
yAxis = 0, 3, 10
xBins = cltCrankingCorrBins, coolant
yBins = cltCrankingCorr
@ -1968,7 +1967,7 @@ page = 1
curve = cltIdleRPMCurve, "Idle Target RPM"
columnLabel = "Coolant", "RPM"
xAxis = -40, 120, 10
xAxis = -40, 120, 9
yAxis = 0, 8000, 10
xBins = cltIdleRpmBins, coolant
yBins = cltIdleRpm, RPMValue
@ -2517,30 +2516,30 @@ menuDialog = main
menu = "Fuel"
# basic
subMenu = injectionSettings, "Injection settings"
subMenu = injectionDeadTime, "Injector dead time", 0, {isInjectionEnabled == 1}
subMenu = injectorConfig, "Injection configuration", 0, {isInjectionEnabled == 1}
subMenu = injectionSettings, "Injection hardware"
subMenu = std_separator
# Targets & closed loop
# Air mass model
subMenu = veTableDialog, "VE", 0, {isInjectionEnabled == 1}
subMenu = tChargeSettings, "Charge temperature estimation", 0, {isInjectionEnabled == 1}
subMenu = baroCorrTbl, "Barometric pressure correction", 0, {isInjectionEnabled == 1 && fuelAlgorithm == LM_SPEED_DENSITY}
subMenu = std_separator
# Fuel model
subMenu = afrTableTbl, "Target AFR", 0, {isInjectionEnabled == 1}
subMenu = cltFuelCorrCurve, "CLT multiplier", 0, {isInjectionEnabled == 1}
subMenu = iatFuelCorrCurve, "IAT multiplier", 0, {isInjectionEnabled == 1}
subMenu = fuelClosedLoopDialog, "Closed loop fuel correction", 0, {isInjectionEnabled == 1}
subMenu = coastingFuelCutControl, "Deceleration fuel cutoff (DFCO)", 0, {isInjectionEnabled == 1}
subMenu = std_separator
# Fuel table/VE
subMenu = veTableDialog, "VE", 0, {isInjectionEnabled == 1}
# Injector model
subMenu = injPhaseTableTbl, "Injection phase", 0, {isInjectionEnabled == 1}
subMenu = std_separator
# Corrections
subMenu = cltFuelCorrCurve, "CLT multiplier", 0, {isInjectionEnabled == 1}
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 = AccelEnrich, "Acceleration enrichment", 0, {isInjectionEnabled == 1}
subMenu = tpsTpsAccelTbl, "TPS/TPS acceleration extra fuel", 0, {isInjectionEnabled == 1}
subMenu = mapAccelTaper, "Engine load AE taper", 0, {isInjectionEnabled == 1}
@ -2737,10 +2736,6 @@ cmd_test_inj9 = "Z\x00\x13\x00\x09"
cmd_test_inj10 = "Z\x00\x13\x00\x0a"
cmd_test_inj11 = "Z\x00\x13\x00\x0b"
cmd_test_inj12 = "Z\x00\x13\x00\x0c"
cmd_test_inj13 = "Z\x00\x13\x00\x0d"
cmd_test_inj14 = "Z\x00\x13\x00\x0e"
cmd_test_inj15 = "Z\x00\x13\x00\x0f"
cmd_test_inj16 = "Z\x00\x13\x00\x10"
cmd_test_fuel_pump = "Z\x00\x14\x00\x01"
cmd_calibrate_tps_1_closed = "Z\x00\x14\x00\x02"
@ -2835,8 +2830,6 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
field = "#Batch injection with individual wiring"
field = "Two wire batch emulation", twoWireBatchInjection, {isInjectionEnabled == 1 && injectionMode == 2}
field = "Use TPS instead of Load for VE table", useTPSBasedVeTable, {isInjectionEnabled == 1 && fuelAlgorithm == LM_SPEED_DENSITY}
field = "#Enabled for TPS-Based 'VE Autotune Mode' in Project Settings"
field = "Use TPS instead of Load for VE table", useTPSBasedVeTable, {0}
dialog = ignitionOutputs, "Ignition Outputs"
field = "Ignition Pin Mode", ignitionPinMode, {isIgnitionEnabled == 1}
@ -2934,10 +2927,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
field = "Injector Flow", injector_flow, {isInjectionEnabled == 1}
dialog = injectorOutputSettings, "Injector Outputs", yAxis
field = "!ECU reboot needed to apply these settings"
field = "injection Pin Mode", injectionPinMode, {isInjectionEnabled == 1}
field = "With batched injection without 'Two wire batch emulation'"
field = " fill only first count / 2 values"
field = "Use only first half of pins for batch mode"
field = "Injection Pin 1", injectionPins1, {isInjectionEnabled == 1}
field = "Injection Pin 2", injectionPins2, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 1}
field = "Injection Pin 3", injectionPins3, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 2}
@ -2949,19 +2939,41 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
field = "Injection Pin 9 ", injectionPins9, {isInjectionEnabled == 1 && cylindersCount > 8}
field = "Injection Pin 10 ", injectionPins10, {isInjectionEnabled == 1 && cylindersCount > 9}
field = "Injection Pin 11 ", injectionPins11, {isInjectionEnabled == 1 && cylindersCount > 10}
field = "Injection Pin 12 ", injectionPins12, {isInjectionEnabled == 1 && cylindersCount > 11}
dialog = injectionBasic, ""
field = "Injection Pin 12 ", injectionPins12, {isInjectionEnabled == 1 && cylindersCount > 11}
field = ""
field = "injection Pin Mode", injectionPinMode, {isInjectionEnabled == 1}
dialog = testInjectors, "Injector Test"
commandButton = "Injector #1", cmd_test_inj1
commandButton = "Injector #2", cmd_test_inj2
commandButton = "Injector #3", cmd_test_inj3
commandButton = "Injector #4", cmd_test_inj4
commandButton = "Injector #5", cmd_test_inj5
commandButton = "Injector #6", cmd_test_inj6
commandButton = "Injector #7", cmd_test_inj7
commandButton = "Injector #8", cmd_test_inj8
commandButton = "Injector #9", cmd_test_inj9
commandButton = "Injector #10", cmd_test_inj10
commandButton = "Injector #11", cmd_test_inj11
commandButton = "Injector #12", cmd_test_inj12
dialog = injectionSettingsEast, "", yAxis
panel = testInjectors
field = ""
dialog = injectionSettingsWest, "", yAxis
panel = injectorOutputSettings
field = ""
dialog = injectionSettings, "", xAxis
panel = injectionSettingsWest
panel = injectionSettingsEast
dialog = injectorConfig, "", yAxis
topicHelp = "fuelHelp"
panel = baseInjection
panel = injChars
dialog = injectionSettings, "", xAxis
panel = injectionBasic
panel = injectorOutputSettings
dialog = injectionDeadTime, "", yAxis
panel = injectorsDeadTime, East
panel = injectorsDeadTime
dialog = ignitionCylExtra, "Ignition Cylinder Extra Timing"
field = "Extra cyl #1", timing_offset_cylinder1
@ -4176,17 +4188,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
commandButton = "Spark #6", cmd_test_spk6
commandButton = "Spark #7", cmd_test_spk7
commandButton = "Spark #8", cmd_test_spk8
dialog = testInjectors, "Fuel"
commandButton = "Injector #1", cmd_test_inj1
commandButton = "Injector #2", cmd_test_inj2
commandButton = "Injector #3", cmd_test_inj3
commandButton = "Injector #4", cmd_test_inj4
commandButton = "Injector #5", cmd_test_inj5
commandButton = "Injector #6", cmd_test_inj6
commandButton = "Injector #7", cmd_test_inj7
commandButton = "Injector #8", cmd_test_inj8
dialog = testMisc, "Misc"
; commandButton = "Come To Pit", cmd_call_from_pit
commandButton = "Fuel Pump", cmd_test_fuel_pump

View File

@ -33,12 +33,12 @@ enable2ndByteCanID = false
[MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
signature = "rusEFI 2020.08.17.proteus_f7.3109807697"
signature = "rusEFI 2020.08.18.proteus_f7.2084502748"
[TunerStudio]
queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI 2020.08.17.proteus_f7.3109807697" ; signature is expected to be 7 or more characters.
signature = "rusEFI 2020.08.18.proteus_f7.2084502748" ; signature is expected to be 7 or more characters.
[Constants]
; new packet serial format with CRC
@ -76,7 +76,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 17 23:52:57 UTC 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Aug 18 17:52:14 UTC 2020
pageSize = 20000
page = 1
@ -1848,8 +1848,8 @@ page = 1
curve = dwellCorrection, "Dwell time RPM based"
columnLabel = "RPM", "Dwell"
xAxis = 0, 8000, 10
yAxis = 0, 30, 10
xAxis = 0, 8000, 9
yAxis = 0, 8, 9
xBins = sparkDwellRpmBins, RPMValue
yBins = sparkDwellValues
gauge = RPMGauge
@ -1870,13 +1870,12 @@ page = 1
yBins = map_samplingWindow
gauge = MAPGauge
curve = injectorsDeadTime, "Injector Dead Time by VBatt"
curve = injectorsDeadTime, "Injector dead time"
columnLabel = "Voltage", "Dead Time"
xAxis = 8, 21, 10
yAxis = -3, 3, 10
xAxis = 8, 16, 9
yAxis = 0, 2, 5
xBins = injector_battLagCorrBins, VBatt
yBins = injector_battLagCorr
gauge = VBattGauge
curve = mafDecodingCurve, "MAF sensor"
columnLabel = "Voltage", "kg/hour"
@ -1888,7 +1887,7 @@ page = 1
curve = iatFuelCorrCurve, "Intake air temperature fuel Multiplier"
columnLabel = "Coolant", "Multiplier"
xAxis = -40, 120, 10
xAxis = -40, 120, 9
yAxis = 0, 2, 11
xBins = iatFuelCorrBins, intake
yBins = iatFuelCorr
@ -1896,15 +1895,15 @@ page = 1
curve = cltTimingCorrCurve, "Warmup timing correction"
columnLabel = "Coolant", "Extra"
xAxis = -40, 120, 10
yAxis = 0, 50, 10
xAxis = -40, 120, 9
yAxis = 0, 20, 9
xBins = cltTimingBins, coolant
yBins = cltTimingExtra
gauge = CLTGauge
curve = cltFuelCorrCurve, "Warmup fuel manual Multiplier"
columnLabel = "Coolant", "Multiplier"
xAxis = -40, 100, 10
xAxis = -40, 120, 9
yAxis = 0, 3, 10
xBins = cltFuelCorrBins, coolant
yBins = cltFuelCorr
@ -1912,7 +1911,7 @@ page = 1
curve = crankingCltCurve, "Cranking Coolant Temperature Multiplier"
columnLabel = "Coolant", "Multiplier"
xAxis = -40, 100, 10
xAxis = -40, 120, 9
yAxis = 0, 3, 10
xBins = crankingFuelBins, coolant
yBins = crankingFuelCoef
@ -1928,7 +1927,7 @@ page = 1
curve = crankingTpsCurve, "Cranking TPS Multiplier"
columnLabel = "TPS", "Multiplier"
xAxis = 0, 100, 10
xAxis = 0, 100, 11
yAxis = 0, 3, 10
xBins = crankingTpsBins, TPSValue
yBins = crankingTpsCoef
@ -1936,8 +1935,8 @@ page = 1
curve = crankingDurationCurve, "Cranking Duration Multiplier"
columnLabel = "Engine Cycle", "Multiplier"
xAxis = 0, 1000, 10
yAxis = 0, 3, 10
xAxis = 0, 50, 11
yAxis = 0, 5, 6
xBins = crankingCycleBins
yBins = crankingCycleCoef
@ -1952,7 +1951,7 @@ page = 1
curve = iacCoastingCurve, "Coasting IAC Position for Auto-Idle"
columnLabel = "Coolant", "Multiplier"
xAxis = -40, 120, 10
xAxis = -40, 120, 9
yAxis = 0, 100, 10
xBins = iacCoastingBins, coolant
yBins = iacCoasting
@ -1960,7 +1959,7 @@ page = 1
curve = cltCrankingCurve, "Cranking Idle Air multiplier"
columnLabel = "Coolant", "Multiplier"
xAxis = -40, 120, 10
xAxis = -40, 120, 9
yAxis = 0, 3, 10
xBins = cltCrankingCorrBins, coolant
yBins = cltCrankingCorr
@ -1968,7 +1967,7 @@ page = 1
curve = cltIdleRPMCurve, "Idle Target RPM"
columnLabel = "Coolant", "RPM"
xAxis = -40, 120, 10
xAxis = -40, 120, 9
yAxis = 0, 8000, 10
xBins = cltIdleRpmBins, coolant
yBins = cltIdleRpm, RPMValue
@ -2517,30 +2516,30 @@ menuDialog = main
menu = "Fuel"
# basic
subMenu = injectionSettings, "Injection settings"
subMenu = injectionDeadTime, "Injector dead time", 0, {isInjectionEnabled == 1}
subMenu = injectorConfig, "Injection configuration", 0, {isInjectionEnabled == 1}
subMenu = injectionSettings, "Injection hardware"
subMenu = std_separator
# Targets & closed loop
# Air mass model
subMenu = veTableDialog, "VE", 0, {isInjectionEnabled == 1}
subMenu = tChargeSettings, "Charge temperature estimation", 0, {isInjectionEnabled == 1}
subMenu = baroCorrTbl, "Barometric pressure correction", 0, {isInjectionEnabled == 1 && fuelAlgorithm == LM_SPEED_DENSITY}
subMenu = std_separator
# Fuel model
subMenu = afrTableTbl, "Target AFR", 0, {isInjectionEnabled == 1}
subMenu = cltFuelCorrCurve, "CLT multiplier", 0, {isInjectionEnabled == 1}
subMenu = iatFuelCorrCurve, "IAT multiplier", 0, {isInjectionEnabled == 1}
subMenu = fuelClosedLoopDialog, "Closed loop fuel correction", 0, {isInjectionEnabled == 1}
subMenu = coastingFuelCutControl, "Deceleration fuel cutoff (DFCO)", 0, {isInjectionEnabled == 1}
subMenu = std_separator
# Fuel table/VE
subMenu = veTableDialog, "VE", 0, {isInjectionEnabled == 1}
# Injector model
subMenu = injPhaseTableTbl, "Injection phase", 0, {isInjectionEnabled == 1}
subMenu = std_separator
# Corrections
subMenu = cltFuelCorrCurve, "CLT multiplier", 0, {isInjectionEnabled == 1}
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 = AccelEnrich, "Acceleration enrichment", 0, {isInjectionEnabled == 1}
subMenu = tpsTpsAccelTbl, "TPS/TPS acceleration extra fuel", 0, {isInjectionEnabled == 1}
subMenu = mapAccelTaper, "Engine load AE taper", 0, {isInjectionEnabled == 1}
@ -2737,10 +2736,6 @@ cmd_test_inj9 = "Z\x00\x13\x00\x09"
cmd_test_inj10 = "Z\x00\x13\x00\x0a"
cmd_test_inj11 = "Z\x00\x13\x00\x0b"
cmd_test_inj12 = "Z\x00\x13\x00\x0c"
cmd_test_inj13 = "Z\x00\x13\x00\x0d"
cmd_test_inj14 = "Z\x00\x13\x00\x0e"
cmd_test_inj15 = "Z\x00\x13\x00\x0f"
cmd_test_inj16 = "Z\x00\x13\x00\x10"
cmd_test_fuel_pump = "Z\x00\x14\x00\x01"
cmd_calibrate_tps_1_closed = "Z\x00\x14\x00\x02"
@ -2835,8 +2830,6 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
field = "#Batch injection with individual wiring"
field = "Two wire batch emulation", twoWireBatchInjection, {isInjectionEnabled == 1 && injectionMode == 2}
field = "Use TPS instead of Load for VE table", useTPSBasedVeTable, {isInjectionEnabled == 1 && fuelAlgorithm == LM_SPEED_DENSITY}
field = "#Enabled for TPS-Based 'VE Autotune Mode' in Project Settings"
field = "Use TPS instead of Load for VE table", useTPSBasedVeTable, {0}
dialog = ignitionOutputs, "Ignition Outputs"
field = "Ignition Pin Mode", ignitionPinMode, {isIgnitionEnabled == 1}
@ -2934,10 +2927,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
field = "Injector Flow", injector_flow, {isInjectionEnabled == 1}
dialog = injectorOutputSettings, "Injector Outputs", yAxis
field = "!ECU reboot needed to apply these settings"
field = "injection Pin Mode", injectionPinMode, {isInjectionEnabled == 1}
field = "With batched injection without 'Two wire batch emulation'"
field = " fill only first count / 2 values"
field = "Use only first half of pins for batch mode"
field = "Injection Pin 1", injectionPins1, {isInjectionEnabled == 1}
field = "Injection Pin 2", injectionPins2, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 1}
field = "Injection Pin 3", injectionPins3, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 2}
@ -2949,19 +2939,41 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
field = "Injection Pin 9 ", injectionPins9, {isInjectionEnabled == 1 && cylindersCount > 8}
field = "Injection Pin 10 ", injectionPins10, {isInjectionEnabled == 1 && cylindersCount > 9}
field = "Injection Pin 11 ", injectionPins11, {isInjectionEnabled == 1 && cylindersCount > 10}
field = "Injection Pin 12 ", injectionPins12, {isInjectionEnabled == 1 && cylindersCount > 11}
dialog = injectionBasic, ""
field = "Injection Pin 12 ", injectionPins12, {isInjectionEnabled == 1 && cylindersCount > 11}
field = ""
field = "injection Pin Mode", injectionPinMode, {isInjectionEnabled == 1}
dialog = testInjectors, "Injector Test"
commandButton = "Injector #1", cmd_test_inj1
commandButton = "Injector #2", cmd_test_inj2
commandButton = "Injector #3", cmd_test_inj3
commandButton = "Injector #4", cmd_test_inj4
commandButton = "Injector #5", cmd_test_inj5
commandButton = "Injector #6", cmd_test_inj6
commandButton = "Injector #7", cmd_test_inj7
commandButton = "Injector #8", cmd_test_inj8
commandButton = "Injector #9", cmd_test_inj9
commandButton = "Injector #10", cmd_test_inj10
commandButton = "Injector #11", cmd_test_inj11
commandButton = "Injector #12", cmd_test_inj12
dialog = injectionSettingsEast, "", yAxis
panel = testInjectors
field = ""
dialog = injectionSettingsWest, "", yAxis
panel = injectorOutputSettings
field = ""
dialog = injectionSettings, "", xAxis
panel = injectionSettingsWest
panel = injectionSettingsEast
dialog = injectorConfig, "", yAxis
topicHelp = "fuelHelp"
panel = baseInjection
panel = injChars
dialog = injectionSettings, "", xAxis
panel = injectionBasic
panel = injectorOutputSettings
dialog = injectionDeadTime, "", yAxis
panel = injectorsDeadTime, East
panel = injectorsDeadTime
dialog = ignitionCylExtra, "Ignition Cylinder Extra Timing"
field = "Extra cyl #1", timing_offset_cylinder1
@ -4176,17 +4188,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
commandButton = "Spark #6", cmd_test_spk6
commandButton = "Spark #7", cmd_test_spk7
commandButton = "Spark #8", cmd_test_spk8
dialog = testInjectors, "Fuel"
commandButton = "Injector #1", cmd_test_inj1
commandButton = "Injector #2", cmd_test_inj2
commandButton = "Injector #3", cmd_test_inj3
commandButton = "Injector #4", cmd_test_inj4
commandButton = "Injector #5", cmd_test_inj5
commandButton = "Injector #6", cmd_test_inj6
commandButton = "Injector #7", cmd_test_inj7
commandButton = "Injector #8", cmd_test_inj8
dialog = testMisc, "Misc"
; commandButton = "Come To Pit", cmd_call_from_pit
commandButton = "Fuel Pump", cmd_test_fuel_pump