rusefi
/
rusefi-full
mirror of https://github.com/rusefi/rusefi-full.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

TS project usability

This commit is contained in:
rusefi 2017-06-19 11:19:12 +03:00
parent 292b2a076f
commit ea28b7815c
2 changed files with 93 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
firmware/tunerstudio/rusefi.ini
View File

@ -5,6 +5,20 @@ enable2ndByteCanID = false
#unset tuneByMAF #unset tuneByMAF
[SettingGroups]
; the referenceName will over-ride previous, so if you are creating a
; settingGroup with a reference name of lambdaSensor, it will replace the
; setting group defined in the settingGroups.xml of the TunerStudio config
; folder. If is is an undefined referenceName, it will be added.
; keyword = referenceName, DisplayName
settingGroup = fAlgorithmSetting, "Fuel Logic / Tables"
settingOption = FA_PLAIN_MAF, "Plain MAF"
settingOption = FA_TPS, "AlphaN/TPS"
settingOption = DEFAULT, "Speed Density" ; DEFAULT will be over looked and this will fall into the #else block of the statement.
[TunerStudio] [TunerStudio]
queryCommand = "S" queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar. versionInfo = "V" ; firmwave version for title bar.
@ -45,7 +59,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code ; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START ; CONFIG_DEFINITION_START
; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Tue Jun 13 10:18:38 EDT 2017 ; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon Jun 19 11:17:25 MSK 2017
pageSize = 16376 pageSize = 16376
page = 1 page = 1
@ -816,6 +830,10 @@ page = 1
; CONFIG_DEFINITION_END ; CONFIG_DEFINITION_END
[SettingContextHelp]
fuelAlgorithm = "See also http://rusefi.com/fuel"
[Tuning] [Tuning]
spotDepth = 2 ; 0 = no indicators, 1 = Z only, 2 = XYZ indicators. spotDepth = 2 ; 0 = no indicators, 1 = Z only, 2 = XYZ indicators.
cursorDepth = 2 ; Same as spot depth. cursorDepth = 2 ; Same as spot depth.
@ -882,8 +900,8 @@ fileVersion = { 20161225 }
#else #else
intake = scalar, F32, 8, "°F", {9/5}, 17.77777 intake = scalar, F32, 8, "°F", {9/5}, 17.77777
#endif #endif
TPS = scalar, F32, 12, "%", 1, 0 TPSValue = scalar, F32, 12, "%", 1, 0
MAF = scalar, F32, 16, "V", 1, 0 MAFValue = scalar, F32, 16, "V", 1, 0
AFRactual = scalar, F32, 20, "AFR", 1, 0.0 AFRactual = scalar, F32, 20, "AFR", 1, 0.0
engineLoad = scalar, F32, 24, "%", 1, 0.0 ; Blend of MAP and TPS, depends on algorithm engineLoad = scalar, F32, 24, "%", 1, 0.0 ; Blend of MAP and TPS, depends on algorithm
VBatt = scalar, F32, 28, "V", 1, 0.0 VBatt = scalar, F32, 28, "V", 1, 0.0
@ -1038,9 +1056,9 @@ fileVersion = { 20161225 }
columnLabel = "Voltage", "kg/hour" columnLabel = "Voltage", "kg/hour"
xAxis = -1, 6, 10 xAxis = -1, 6, 10
yAxis = -30, 1300, 10 yAxis = -30, 1300, 10
xBins = mafDecodingBins, MAF xBins = mafDecodingBins, MAFValue
yBins = mafDecoding yBins = mafDecoding
gauge = mafGaugeVolts gauge = MAFGauge
curve = iatFuelCorrCurve, "Intake air temperature fuel Multiplier" curve = iatFuelCorrCurve, "Intake air temperature fuel Multiplier"
columnLabel = "Coolant", "Multiplier" columnLabel = "Coolant", "Multiplier"
@ -1078,9 +1096,9 @@ fileVersion = { 20161225 }
columnLabel = "TPS", "Multiplier" columnLabel = "TPS", "Multiplier"
xAxis = -40, 120, 10 xAxis = -40, 120, 10
yAxis = 0, 5, 10 yAxis = 0, 5, 10
xBins = crankingTpsBins, TPS xBins = crankingTpsBins, TPSValue
yBins = crankingTpsCoef yBins = crankingTpsCoef
gauge = throttleGauge gauge = TPSGauge
curve = crankingDurationCurve, "Cranking Duration Multiplier" curve = crankingDurationCurve, "Cranking Duration Multiplier"
columnLabel = "Engine Cycle", "Multiplier" columnLabel = "Engine Cycle", "Multiplier"
@ -1111,15 +1129,21 @@ fileVersion = { 20161225 }
table = fuelTableTbl, fuelTableMap, "Fuel Table", 1 table = fuelTableTbl, fuelTableMap, "Fuel Table", 1
; constant, variable ; constant, variable
xBins = fuelRpmBins, rpm xBins = fuelRpmBins, rpm
#if FA_PLAIN_MAF
yBins = fuelLoadBins, MAFValue
#elif FA_TPS
yBins = fuelLoadBins, TPSValue
#else
yBins = fuelLoadBins, engineLoad yBins = fuelLoadBins, engineLoad
#endif
zBins = fuelTable zBins = fuelTable
; gridHeight = 2.0 ; gridHeight = 2.0
gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees.
upDownLabel = "(RICHER)", "(LEANER)" upDownLabel = "(RICHER)", "(LEANER)"
table = tpsTpsAccelTbl, tpsTpsAccelMap, "TPS/TPS Acceleration Extra Fuel", 1 table = tpsTpsAccelTbl, tpsTpsAccelMap, "TPS/TPS Acceleration Extra Fuel", 1
xBins = tpsTpsAccelFromRpmBins, TPS xBins = tpsTpsAccelFromRpmBins, TPSValue
yBins = tpsTpsAccelToRpmBins, TPS yBins = tpsTpsAccelToRpmBins, TPSValue
zBins = tpsTpsAccelTable zBins = tpsTpsAccelTable
@ -1155,7 +1179,14 @@ fileVersion = { 20161225 }
table = ignitionTableTbl, ignitionTableMap, "Ignition Table", 1 table = ignitionTableTbl, ignitionTableMap, "Ignition Table", 1
; constant, variable ; constant, variable
xBins = ignitionRpmBins, rpm xBins = ignitionRpmBins, rpm
#if FA_PLAIN_MAF
yBins = ignitionLoadBins, MAFValue
#elif FA_TPS
yBins = ignitionLoadBins, TPSValue
#else
yBins = ignitionLoadBins, engineLoad yBins = ignitionLoadBins, engineLoad
#endif
zBins = ignitionTable zBins = ignitionTable
; gridHeight = 2.0 ; gridHeight = 2.0
gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees.
@ -1219,9 +1250,9 @@ fileVersion = { 20161225 }
#endif #endif
throttleGauge = TPS, "Throttle Position", "%", 0, 100, 0, 0, 100, 100, 2, 2 TPSGauge = TPSValue, "Throttle Position", "%", 0, 100, 0, 0, 100, 100, 2, 2
afr1Gauge = AFRactual, "Air:Fuel Ratio 1", "", 10, 19.4, 12, 13, 15, 16, 2, 2 afr1Gauge = AFRactual, "Air:Fuel Ratio 1", "", 10, 19.4, 12, 13, 15, 16, 2, 2
mafGaugeVolts = MAF, "Mass Air Flow", "v", 0, 5, 0, 1, 3, 4, 1, 1 MAFGauge = MAFValue, "Mass Air Flow", "v", 0, 5, 0, 1, 3, 4, 1, 1
VBattGauge = VBatt, "Battery Voltage", "V", 8, 21, 9, 10, 17, 19, 1, 1 VBattGauge = VBatt, "Battery Voltage", "V", 8, 21, 9, 10, 17, 19, 1, 1
tpsADCGauge = tpsADC, "tps ADC", "ADC", 0, 1024, 0, 0, 0, 0, 0, 0 tpsADCGauge = tpsADC, "tps ADC", "ADC", 0, 1024, 0, 0, 0, 0, 0, 0
atmPresCGauge = baroPressure, "Baro", "kPa", 0, 1024, 0, 0, 0, 0, 0, 0 atmPresCGauge = baroPressure, "Baro", "kPa", 0, 1024, 0, 0, 0, 0, 0, 0
@ -1296,8 +1327,8 @@ fileVersion = { 20161225 }
; currently a minimum of 6 gauges must be on the dash, this appears to be an old not needed limitation. next release 1 will work. ; currently a minimum of 6 gauges must be on the dash, this appears to be an old not needed limitation. next release 1 will work.
gauge1 = tachometer gauge1 = tachometer
gauge2 = CLTGauge gauge2 = CLTGauge
gauge3 = throttleGauge gauge3 = TPSGauge
gauge4 = mafGaugeVolts gauge4 = MAFGauge
gauge5 = afr1Gauge gauge5 = afr1Gauge
gauge6 = VBattGauge gauge6 = VBattGauge
gauge7 = dwellGauge gauge7 = dwellGauge
@ -1343,8 +1374,8 @@ fileVersion = { 20161225 }
entry = firmwareVersion, "firmware", int, "%d" entry = firmwareVersion, "firmware", int, "%d"
entry = coolant, "CLT", float, "%.2f" entry = coolant, "CLT", float, "%.2f"
entry = intake, "IAT", float, "%.2f" entry = intake, "IAT", float, "%.2f"
entry = TPS, "TPS", float, "%.2f" entry = TPSValue, "TPS", float, "%.2f"
entry = MAF, "MAF", float, "%.2f" entry = MAFValue, "MAF", float, "%.2f"
entry = MAPValue, "MAP", float, "%.1f" entry = MAPValue, "MAP", float, "%.1f"
entry = AFRactual, "Air/Fuel Ratio", float, "%.2f" entry = AFRactual, "Air/Fuel Ratio", float, "%.2f"
entry = VBatt, "VBatt", float, "%.2f" entry = VBatt, "VBatt", float, "%.2f"

59
firmware/tunerstudio/rusefi.input
View File

@ -5,6 +5,20 @@ enable2ndByteCanID = false
#unset tuneByMAF #unset tuneByMAF
[SettingGroups]
; the referenceName will over-ride previous, so if you are creating a
; settingGroup with a reference name of lambdaSensor, it will replace the
; setting group defined in the settingGroups.xml of the TunerStudio config
; folder. If is is an undefined referenceName, it will be added.
; keyword = referenceName, DisplayName
settingGroup = fAlgorithmSetting, "Fuel Logic / Tables"
settingOption = FA_PLAIN_MAF, "Plain MAF"
settingOption = FA_TPS, "AlphaN/TPS"
settingOption = DEFAULT, "Speed Density" ; DEFAULT will be over looked and this will fall into the #else block of the statement.
[TunerStudio] [TunerStudio]
queryCommand = "S" queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar. versionInfo = "V" ; firmwave version for title bar.
@ -51,6 +65,10 @@ enable2ndByteCanID = false
; CONFIG_DEFINITION_END ; CONFIG_DEFINITION_END
[SettingContextHelp]
fuelAlgorithm = "See also http://rusefi.com/fuel"
[Tuning] [Tuning]
spotDepth = 2 ; 0 = no indicators, 1 = Z only, 2 = XYZ indicators. spotDepth = 2 ; 0 = no indicators, 1 = Z only, 2 = XYZ indicators.
cursorDepth = 2 ; Same as spot depth. cursorDepth = 2 ; Same as spot depth.
@ -117,8 +135,8 @@ fileVersion = { 20161225 }
#else #else
intake = scalar, F32, 8, "°F", {9/5}, 17.77777 intake = scalar, F32, 8, "°F", {9/5}, 17.77777
#endif #endif
TPS = scalar, F32, 12, "%", 1, 0 TPSValue = scalar, F32, 12, "%", 1, 0
MAF = scalar, F32, 16, "V", 1, 0 MAFValue = scalar, F32, 16, "V", 1, 0
AFRactual = scalar, F32, 20, "AFR", 1, 0.0 AFRactual = scalar, F32, 20, "AFR", 1, 0.0
engineLoad = scalar, F32, 24, "%", 1, 0.0 ; Blend of MAP and TPS, depends on algorithm engineLoad = scalar, F32, 24, "%", 1, 0.0 ; Blend of MAP and TPS, depends on algorithm
VBatt = scalar, F32, 28, "V", 1, 0.0 VBatt = scalar, F32, 28, "V", 1, 0.0
@ -273,9 +291,9 @@ fileVersion = { 20161225 }
columnLabel = "Voltage", "kg/hour" columnLabel = "Voltage", "kg/hour"
xAxis = -1, 6, 10 xAxis = -1, 6, 10
yAxis = -30, 1300, 10 yAxis = -30, 1300, 10
xBins = mafDecodingBins, MAF xBins = mafDecodingBins, MAFValue
yBins = mafDecoding yBins = mafDecoding
gauge = mafGaugeVolts gauge = MAFGauge
curve = iatFuelCorrCurve, "Intake air temperature fuel Multiplier" curve = iatFuelCorrCurve, "Intake air temperature fuel Multiplier"
columnLabel = "Coolant", "Multiplier" columnLabel = "Coolant", "Multiplier"
@ -313,9 +331,9 @@ fileVersion = { 20161225 }
columnLabel = "TPS", "Multiplier" columnLabel = "TPS", "Multiplier"
xAxis = -40, 120, 10 xAxis = -40, 120, 10
yAxis = 0, 5, 10 yAxis = 0, 5, 10
xBins = crankingTpsBins, TPS xBins = crankingTpsBins, TPSValue
yBins = crankingTpsCoef yBins = crankingTpsCoef
gauge = throttleGauge gauge = TPSGauge
curve = crankingDurationCurve, "Cranking Duration Multiplier" curve = crankingDurationCurve, "Cranking Duration Multiplier"
columnLabel = "Engine Cycle", "Multiplier" columnLabel = "Engine Cycle", "Multiplier"
@ -346,15 +364,21 @@ fileVersion = { 20161225 }
table = fuelTableTbl, fuelTableMap, "Fuel Table", 1 table = fuelTableTbl, fuelTableMap, "Fuel Table", 1
; constant, variable ; constant, variable
xBins = fuelRpmBins, rpm xBins = fuelRpmBins, rpm
#if FA_PLAIN_MAF
yBins = fuelLoadBins, MAFValue
#elif FA_TPS
yBins = fuelLoadBins, TPSValue
#else
yBins = fuelLoadBins, engineLoad yBins = fuelLoadBins, engineLoad
#endif
zBins = fuelTable zBins = fuelTable
; gridHeight = 2.0 ; gridHeight = 2.0
gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees.
upDownLabel = "(RICHER)", "(LEANER)" upDownLabel = "(RICHER)", "(LEANER)"
table = tpsTpsAccelTbl, tpsTpsAccelMap, "TPS/TPS Acceleration Extra Fuel", 1 table = tpsTpsAccelTbl, tpsTpsAccelMap, "TPS/TPS Acceleration Extra Fuel", 1
xBins = tpsTpsAccelFromRpmBins, TPS xBins = tpsTpsAccelFromRpmBins, TPSValue
yBins = tpsTpsAccelToRpmBins, TPS yBins = tpsTpsAccelToRpmBins, TPSValue
zBins = tpsTpsAccelTable zBins = tpsTpsAccelTable
@ -390,7 +414,14 @@ fileVersion = { 20161225 }
table = ignitionTableTbl, ignitionTableMap, "Ignition Table", 1 table = ignitionTableTbl, ignitionTableMap, "Ignition Table", 1
; constant, variable ; constant, variable
xBins = ignitionRpmBins, rpm xBins = ignitionRpmBins, rpm
#if FA_PLAIN_MAF
yBins = ignitionLoadBins, MAFValue
#elif FA_TPS
yBins = ignitionLoadBins, TPSValue
#else
yBins = ignitionLoadBins, engineLoad yBins = ignitionLoadBins, engineLoad
#endif
zBins = ignitionTable zBins = ignitionTable
; gridHeight = 2.0 ; gridHeight = 2.0
gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees.
@ -454,9 +485,9 @@ fileVersion = { 20161225 }
#endif #endif
throttleGauge = TPS, "Throttle Position", "%", 0, 100, 0, 0, 100, 100, 2, 2 TPSGauge = TPSValue, "Throttle Position", "%", 0, 100, 0, 0, 100, 100, 2, 2
afr1Gauge = AFRactual, "Air:Fuel Ratio 1", "", 10, 19.4, 12, 13, 15, 16, 2, 2 afr1Gauge = AFRactual, "Air:Fuel Ratio 1", "", 10, 19.4, 12, 13, 15, 16, 2, 2
mafGaugeVolts = MAF, "Mass Air Flow", "v", 0, 5, 0, 1, 3, 4, 1, 1 MAFGauge = MAFValue, "Mass Air Flow", "v", 0, 5, 0, 1, 3, 4, 1, 1
VBattGauge = VBatt, "Battery Voltage", "V", 8, 21, 9, 10, 17, 19, 1, 1 VBattGauge = VBatt, "Battery Voltage", "V", 8, 21, 9, 10, 17, 19, 1, 1
tpsADCGauge = tpsADC, "tps ADC", "ADC", 0, 1024, 0, 0, 0, 0, 0, 0 tpsADCGauge = tpsADC, "tps ADC", "ADC", 0, 1024, 0, 0, 0, 0, 0, 0
atmPresCGauge = baroPressure, "Baro", "kPa", 0, 1024, 0, 0, 0, 0, 0, 0 atmPresCGauge = baroPressure, "Baro", "kPa", 0, 1024, 0, 0, 0, 0, 0, 0
@ -531,8 +562,8 @@ fileVersion = { 20161225 }
; currently a minimum of 6 gauges must be on the dash, this appears to be an old not needed limitation. next release 1 will work. ; currently a minimum of 6 gauges must be on the dash, this appears to be an old not needed limitation. next release 1 will work.
gauge1 = tachometer gauge1 = tachometer
gauge2 = CLTGauge gauge2 = CLTGauge
gauge3 = throttleGauge gauge3 = TPSGauge
gauge4 = mafGaugeVolts gauge4 = MAFGauge
gauge5 = afr1Gauge gauge5 = afr1Gauge
gauge6 = VBattGauge gauge6 = VBattGauge
gauge7 = dwellGauge gauge7 = dwellGauge
@ -578,8 +609,8 @@ fileVersion = { 20161225 }
entry = firmwareVersion, @@GAUGE_NAME_VERSION@@, int, "%d" entry = firmwareVersion, @@GAUGE_NAME_VERSION@@, int, "%d"
entry = coolant, "CLT", float, "%.2f" entry = coolant, "CLT", float, "%.2f"
entry = intake, "IAT", float, "%.2f" entry = intake, "IAT", float, "%.2f"
entry = TPS, "TPS", float, "%.2f" entry = TPSValue, "TPS", float, "%.2f"
entry = MAF, "MAF", float, "%.2f" entry = MAFValue, "MAF", float, "%.2f"
entry = MAPValue, "MAP", float, "%.1f" entry = MAPValue, "MAP", float, "%.1f"
entry = AFRactual, @@GAUGE_NAME_AFR@@, float, "%.2f" entry = AFRactual, @@GAUGE_NAME_AFR@@, float, "%.2f"
entry = VBatt, @@GAUGE_NAME_VBAT@@, float, "%.2f" entry = VBatt, @@GAUGE_NAME_VBAT@@, float, "%.2f"