Auto-generated configs and docs

This commit is contained in:
GitHub build-firmware Action 2020-11-05 20:37:03 +00:00
parent eb2882857f
commit 061ca7f137
33 changed files with 499 additions and 80 deletions

View File

@ -1,4 +1,4 @@
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Thu Nov 05 13:06:18 UTC 2020 // this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Thu Nov 05 20:36:45 UTC 2020
// by class com.rusefi.output.CHeaderConsumer // by class com.rusefi.output.CHeaderConsumer
// begin // begin
#pragma once #pragma once
@ -3755,4 +3755,4 @@ struct persistent_config_s {
typedef struct persistent_config_s persistent_config_s; typedef struct persistent_config_s persistent_config_s;
// end // end
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Thu Nov 05 13:06:18 UTC 2020 // this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Thu Nov 05 20:36:45 UTC 2020

View File

@ -1209,7 +1209,7 @@
#define showSdCardWarning_offset 76 #define showSdCardWarning_offset 76
#define SIGNATURE_BOARD hellen_cypress #define SIGNATURE_BOARD hellen_cypress
#define SIGNATURE_DATE 2020.11.05 #define SIGNATURE_DATE 2020.11.05
#define SIGNATURE_HASH 4000937014 #define SIGNATURE_HASH 1635159012
#define silentTriggerError_offset 1464 #define silentTriggerError_offset 1464
#define slowAdcAlpha_offset 2088 #define slowAdcAlpha_offset 2088
#define sparkDwellRpmBins_offset 332 #define sparkDwellRpmBins_offset 332
@ -1527,7 +1527,7 @@
#define ts_show_spi true #define ts_show_spi true
#define ts_show_trigger_comparator false #define ts_show_trigger_comparator false
#define ts_show_tunerstudio_port true #define ts_show_tunerstudio_port true
#define TS_SIGNATURE "rusEFI 2020.11.05.hellen_cypress.4000937014" #define TS_SIGNATURE "rusEFI 2020.11.05.hellen_cypress.1635159012"
#define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND 'W'
#define TS_SINGLE_WRITE_COMMAND_char W #define TS_SINGLE_WRITE_COMMAND_char W
#define TS_TEST_COMMAND 't' // 0x74 #define TS_TEST_COMMAND 't' // 0x74

View File

@ -1,4 +1,4 @@
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Thu Nov 05 13:06:16 UTC 2020 // this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Thu Nov 05 20:36:43 UTC 2020
// by class com.rusefi.output.CHeaderConsumer // by class com.rusefi.output.CHeaderConsumer
// begin // begin
#pragma once #pragma once
@ -3755,4 +3755,4 @@ struct persistent_config_s {
typedef struct persistent_config_s persistent_config_s; typedef struct persistent_config_s persistent_config_s;
// end // end
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Thu Nov 05 13:06:16 UTC 2020 // this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Thu Nov 05 20:36:43 UTC 2020

View File

@ -1209,7 +1209,7 @@
#define showSdCardWarning_offset 76 #define showSdCardWarning_offset 76
#define SIGNATURE_BOARD kin #define SIGNATURE_BOARD kin
#define SIGNATURE_DATE 2020.11.05 #define SIGNATURE_DATE 2020.11.05
#define SIGNATURE_HASH 3211087564 #define SIGNATURE_HASH 812298526
#define silentTriggerError_offset 1464 #define silentTriggerError_offset 1464
#define slowAdcAlpha_offset 2088 #define slowAdcAlpha_offset 2088
#define sparkDwellRpmBins_offset 332 #define sparkDwellRpmBins_offset 332
@ -1527,7 +1527,7 @@
#define ts_show_spi true #define ts_show_spi true
#define ts_show_trigger_comparator true #define ts_show_trigger_comparator true
#define ts_show_tunerstudio_port true #define ts_show_tunerstudio_port true
#define TS_SIGNATURE "rusEFI 2020.11.05.kin.3211087564" #define TS_SIGNATURE "rusEFI 2020.11.05.kin.812298526"
#define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND 'W'
#define TS_SINGLE_WRITE_COMMAND_char W #define TS_SINGLE_WRITE_COMMAND_char W
#define TS_TEST_COMMAND 't' // 0x74 #define TS_TEST_COMMAND 't' // 0x74

View File

@ -1,4 +1,4 @@
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 05 13:05:57 UTC 2020 // this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 05 20:36:25 UTC 2020
// by class com.rusefi.output.CHeaderConsumer // by class com.rusefi.output.CHeaderConsumer
// begin // begin
#pragma once #pragma once
@ -3755,4 +3755,4 @@ struct persistent_config_s {
typedef struct persistent_config_s persistent_config_s; typedef struct persistent_config_s persistent_config_s;
// end // end
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 05 13:05:57 UTC 2020 // this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 05 20:36:25 UTC 2020

View File

@ -1,4 +1,4 @@
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 05 13:05:57 UTC 2020 // this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 05 20:36:25 UTC 2020
// by class com.rusefi.output.FileFsioSettingsConsumer // by class com.rusefi.output.FileFsioSettingsConsumer
FSIO_SETTING_FANONTEMPERATURE = 1000, FSIO_SETTING_FANONTEMPERATURE = 1000,

View File

@ -1,4 +1,4 @@
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 05 13:05:57 UTC 2020 // this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 05 20:36:25 UTC 2020
// by class com.rusefi.output.FileFsioSettingsConsumer // by class com.rusefi.output.FileFsioSettingsConsumer
case FSIO_SETTING_FANONTEMPERATURE: case FSIO_SETTING_FANONTEMPERATURE:

View File

@ -1,4 +1,4 @@
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 05 13:05:57 UTC 2020 // this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 05 20:36:25 UTC 2020
// by class com.rusefi.output.FileFsioSettingsConsumer // by class com.rusefi.output.FileFsioSettingsConsumer
static LENameOrdinalPair lefanOnTemperature(FSIO_SETTING_FANONTEMPERATURE, "cfg_fanOnTemperature"); static LENameOrdinalPair lefanOnTemperature(FSIO_SETTING_FANONTEMPERATURE, "cfg_fanOnTemperature");

View File

@ -1,4 +1,4 @@
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 05 13:05:57 UTC 2020 // this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 05 20:36:25 UTC 2020
// by class com.rusefi.output.FileFsioSettingsConsumer // by class com.rusefi.output.FileFsioSettingsConsumer
case FSIO_SETTING_FANONTEMPERATURE: case FSIO_SETTING_FANONTEMPERATURE:

View File

@ -1209,7 +1209,7 @@
#define showSdCardWarning_offset 76 #define showSdCardWarning_offset 76
#define SIGNATURE_BOARD all #define SIGNATURE_BOARD all
#define SIGNATURE_DATE 2020.11.05 #define SIGNATURE_DATE 2020.11.05
#define SIGNATURE_HASH 663278325 #define SIGNATURE_HASH 2827431207
#define silentTriggerError_offset 1464 #define silentTriggerError_offset 1464
#define slowAdcAlpha_offset 2088 #define slowAdcAlpha_offset 2088
#define sparkDwellRpmBins_offset 332 #define sparkDwellRpmBins_offset 332
@ -1527,7 +1527,7 @@
#define ts_show_spi true #define ts_show_spi true
#define ts_show_trigger_comparator false #define ts_show_trigger_comparator false
#define ts_show_tunerstudio_port true #define ts_show_tunerstudio_port true
#define TS_SIGNATURE "rusEFI 2020.11.05.all.663278325" #define TS_SIGNATURE "rusEFI 2020.11.05.all.2827431207"
#define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND 'W'
#define TS_SINGLE_WRITE_COMMAND_char W #define TS_SINGLE_WRITE_COMMAND_char W
#define TS_TEST_COMMAND 't' // 0x74 #define TS_TEST_COMMAND 't' // 0x74

View File

@ -4,5 +4,5 @@
#define SIGNATURE_BOARD all #define SIGNATURE_BOARD all
#define SIGNATURE_DATE 2020.11.05 #define SIGNATURE_DATE 2020.11.05
#define SIGNATURE_HASH 663278325 #define SIGNATURE_HASH 2827431207
#define TS_SIGNATURE "rusEFI 2020.11.05.all.663278325" #define TS_SIGNATURE "rusEFI 2020.11.05.all.2827431207"

View File

@ -4,5 +4,5 @@
#define SIGNATURE_BOARD frankenso_na6 #define SIGNATURE_BOARD frankenso_na6
#define SIGNATURE_DATE 2020.11.05 #define SIGNATURE_DATE 2020.11.05
#define SIGNATURE_HASH 2985845518 #define SIGNATURE_HASH 1056414940
#define TS_SIGNATURE "rusEFI 2020.11.05.frankenso_na6.2985845518" #define TS_SIGNATURE "rusEFI 2020.11.05.frankenso_na6.1056414940"

View File

@ -4,5 +4,5 @@
#define SIGNATURE_BOARD hellen_cypress #define SIGNATURE_BOARD hellen_cypress
#define SIGNATURE_DATE 2020.11.05 #define SIGNATURE_DATE 2020.11.05
#define SIGNATURE_HASH 4000937014 #define SIGNATURE_HASH 1635159012
#define TS_SIGNATURE "rusEFI 2020.11.05.hellen_cypress.4000937014" #define TS_SIGNATURE "rusEFI 2020.11.05.hellen_cypress.1635159012"

View File

@ -4,5 +4,5 @@
#define SIGNATURE_BOARD kin #define SIGNATURE_BOARD kin
#define SIGNATURE_DATE 2020.11.05 #define SIGNATURE_DATE 2020.11.05
#define SIGNATURE_HASH 3211087564 #define SIGNATURE_HASH 812298526
#define TS_SIGNATURE "rusEFI 2020.11.05.kin.3211087564" #define TS_SIGNATURE "rusEFI 2020.11.05.kin.812298526"

View File

@ -4,5 +4,5 @@
#define SIGNATURE_BOARD mre_f4 #define SIGNATURE_BOARD mre_f4
#define SIGNATURE_DATE 2020.11.05 #define SIGNATURE_DATE 2020.11.05
#define SIGNATURE_HASH 1336113819 #define SIGNATURE_HASH 3232531785
#define TS_SIGNATURE "rusEFI 2020.11.05.mre_f4.1336113819" #define TS_SIGNATURE "rusEFI 2020.11.05.mre_f4.3232531785"

View File

@ -4,5 +4,5 @@
#define SIGNATURE_BOARD mre_f7 #define SIGNATURE_BOARD mre_f7
#define SIGNATURE_DATE 2020.11.05 #define SIGNATURE_DATE 2020.11.05
#define SIGNATURE_HASH 1336113819 #define SIGNATURE_HASH 3232531785
#define TS_SIGNATURE "rusEFI 2020.11.05.mre_f7.1336113819" #define TS_SIGNATURE "rusEFI 2020.11.05.mre_f7.3232531785"

View File

@ -4,5 +4,5 @@
#define SIGNATURE_BOARD prometheus_405 #define SIGNATURE_BOARD prometheus_405
#define SIGNATURE_DATE 2020.11.05 #define SIGNATURE_DATE 2020.11.05
#define SIGNATURE_HASH 1699796132 #define SIGNATURE_HASH 3932105590
#define TS_SIGNATURE "rusEFI 2020.11.05.prometheus_405.1699796132" #define TS_SIGNATURE "rusEFI 2020.11.05.prometheus_405.3932105590"

View File

@ -4,5 +4,5 @@
#define SIGNATURE_BOARD prometheus_469 #define SIGNATURE_BOARD prometheus_469
#define SIGNATURE_DATE 2020.11.05 #define SIGNATURE_DATE 2020.11.05
#define SIGNATURE_HASH 1699796132 #define SIGNATURE_HASH 3932105590
#define TS_SIGNATURE "rusEFI 2020.11.05.prometheus_469.1699796132" #define TS_SIGNATURE "rusEFI 2020.11.05.prometheus_469.3932105590"

View File

@ -4,5 +4,5 @@
#define SIGNATURE_BOARD proteus_f4 #define SIGNATURE_BOARD proteus_f4
#define SIGNATURE_DATE 2020.11.05 #define SIGNATURE_DATE 2020.11.05
#define SIGNATURE_HASH 3995244587 #define SIGNATURE_HASH 1630365689
#define TS_SIGNATURE "rusEFI 2020.11.05.proteus_f4.3995244587" #define TS_SIGNATURE "rusEFI 2020.11.05.proteus_f4.1630365689"

View File

@ -4,5 +4,5 @@
#define SIGNATURE_BOARD proteus_f7 #define SIGNATURE_BOARD proteus_f7
#define SIGNATURE_DATE 2020.11.05 #define SIGNATURE_DATE 2020.11.05
#define SIGNATURE_HASH 3995244587 #define SIGNATURE_HASH 1630365689
#define TS_SIGNATURE "rusEFI 2020.11.05.proteus_f7.3995244587" #define TS_SIGNATURE "rusEFI 2020.11.05.proteus_f7.1630365689"

View File

@ -33,12 +33,12 @@ enable2ndByteCanID = false
[MegaTune] [MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
signature = "rusEFI 2020.11.05.all.663278325" signature = "rusEFI 2020.11.05.all.2827431207"
[TunerStudio] [TunerStudio]
queryCommand = "S" queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar. versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI 2020.11.05.all.663278325" ; signature is expected to be 7 or more characters. signature = "rusEFI 2020.11.05.all.2827431207" ; signature is expected to be 7 or more characters.
[Constants] [Constants]
; new packet serial format with CRC ; new packet serial format with CRC
@ -74,7 +74,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 rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 05 13:05:57 UTC 2020 ; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 05 20:36:25 UTC 2020
pageSize = 20000 pageSize = 20000
page = 1 page = 1
@ -1235,7 +1235,11 @@ page = 1
veTable = array, F32, 17440, [16x16],"%", 1.0, 0, 0, 999.0, 2 veTable = array, F32, 17440, [16x16],"%", 1.0, 0, 0, 999.0, 2
veLoadBins = array, F32, 18464, [16], "kPa", 1.0, 0.0, 0, 400.0, 2 veLoadBins = array, F32, 18464, [16], "kPa", 1.0, 0.0, 0, 400.0, 2
veRpmBins = array, F32, 18528, [16], "RPM", 1.0, 0.0, 0, 18000.0, 2 veRpmBins = array, F32, 18528, [16], "RPM", 1.0, 0.0, 0, 18000.0, 2
#if LAMBDA
lambdaTable = array, U08, 18592, [16x16],"deg", 0.006802721088435374, 0, 0.6, 1.5, 2 lambdaTable = array, U08, 18592, [16x16],"deg", 0.006802721088435374, 0, 0.6, 1.5, 2
#else
lambdaTable = array, U08, 18592, [16x16],"deg", 0.1, 0, 0, 25.0, 1
#endif
lambdaLoadBins = array, F32, 18848, [16], "", 1.0, 0.0, 0, 500.0, 2 lambdaLoadBins = array, F32, 18848, [16], "", 1.0, 0.0, 0, 500.0, 2
lambdaRpmBins = array, F32, 18912, [16], "RPM", 1.0, 0.0, 0, 18000.0, 2 lambdaRpmBins = array, F32, 18912, [16], "RPM", 1.0, 0.0, 0, 18000.0, 2
tpsTpsAccelTable = array, F32, 18976, [8x8],"value", 1.0, 0, 0.0, 30000.0, 2 tpsTpsAccelTable = array, F32, 18976, [8x8],"value", 1.0, 0, 0.0, 30000.0, 2
@ -1457,7 +1461,11 @@ page = 1
pageButtons = "&EGO" pageButtons = "&EGO"
gauge1 = RPMGauge gauge1 = RPMGauge
#if LAMBDA
gauge2 = lambda1Gauge gauge2 = lambda1Gauge
#else
gauge2 = afr1Gauge
#endif
gauge3 = MAPGauge gauge3 = MAPGauge
gauge4 = veValueGauge gauge4 = veValueGauge
@ -1502,8 +1510,13 @@ page = 1
[VeAnalyze] [VeAnalyze]
; tableName, lambdaTargetTableName, lambdaChannel, egoCorrectionChannel, activeCondition ; tableName, lambdaTargetTableName, lambdaChannel, egoCorrectionChannel, activeCondition
#if LAMBDA
veAnalyzeMap = veTableTbl, lambdaTableTbl, lambdaValue, egoCorrection, { 1 } veAnalyzeMap = veTableTbl, lambdaTableTbl, lambdaValue, egoCorrection, { 1 }
lambdaTargetTables = lambdaTableTbl, afrTSCustom lambdaTargetTables = lambdaTableTbl, afrTSCustom
#else
veAnalyzeMap = veTableTbl, afrTableTbl, AFRValue, egoCorrection, { 1 }
lambdaTargetTables = afrTableTbl, afrTSCustom
#endif
; filter = Name, "DisplayName", outputChannel, operator, defaultVal, userAdjustable ; filter = Name, "DisplayName", outputChannel, operator, defaultVal, userAdjustable
filter = minRPMFilter, "Minimum RPM", RPMValue, < , 500, , true filter = minRPMFilter, "Minimum RPM", RPMValue, < , 500, , true
@ -1898,7 +1911,11 @@ page = 1
yAxis = 0, 28, 10 yAxis = 0, 28, 10
xBins = narrowToWideOxygenBins xBins = narrowToWideOxygenBins
yBins = narrowToWideOxygen yBins = narrowToWideOxygen
#if LAMBDA
gauge = lambda1Gauge gauge = lambda1Gauge
#else
gauge = afr1Gauge
#endif
curve = fsioCurve1, "FSIO Curve #1" curve = fsioCurve1, "FSIO Curve #1"
columnLabel = "X", "Y" columnLabel = "X", "Y"
@ -2076,7 +2093,11 @@ page = 1
yAxis = 0, 250, 10 yAxis = 0, 250, 10
xBins = idleVeBins, RPMValue xBins = idleVeBins, RPMValue
yBins = idleVe yBins = idleVe
#if LAMBDA
gauge = lambda1Gauge gauge = lambda1Gauge
#else
gauge = afr1Gauge
#endif
curve = crankingAdvanceCurve, "Cranking Advance Angle" curve = crankingAdvanceCurve, "Cranking Advance Angle"
columnLabel = "RPM", "degrees" columnLabel = "RPM", "degrees"
@ -2205,7 +2226,11 @@ page = 1
upDownLabel = "(Later)", "(Sooner)" upDownLabel = "(Later)", "(Sooner)"
#if LAMBDA
table = lambdaTableTbl, lambdaTableMap, "Target Lambda Table", 1 table = lambdaTableTbl, lambdaTableMap, "Target Lambda Table", 1
#else
table = afrTableTbl, afrTableMap, "Target AFR Table", 1
#endif
; constant, variable ; constant, variable
xBins = lambdaRpmBins, RPMValue xBins = lambdaRpmBins, RPMValue
yBins = lambdaLoadBins, afrTableYAxis yBins = lambdaLoadBins, afrTableYAxis
@ -2399,9 +2424,13 @@ gaugeCategory = Knock
[WueAnalyze] [WueAnalyze]
; wueCurveName, afrTempCompensationCurve, lambdaTargetTableName, lambdaChannel, coolantTempChannel, egoCorrectionChannel, wueChannel, activeCondition ; wueCurveName, afrTempCompensationCurve, lambdaTargetTableName, lambdaChannel, coolantTempChannel, egoCorrectionChannel, wueChannel, activeCondition
#if LAMBDA
wueAnalyzeMap = wueAnalyzer_warmup_curve, wueAfrTargetOffsetCurve, lambdaTableTbl, lambdaValue, coolant, cltCorrection, egoCorrection wueAnalyzeMap = wueAnalyzer_warmup_curve, wueAfrTargetOffsetCurve, lambdaTableTbl, lambdaValue, coolant, cltCorrection, egoCorrection
lambdaTargetTables = lambdaTableTbl, afrTSCustom lambdaTargetTables = lambdaTableTbl, afrTSCustom
#else
wueAnalyzeMap = wueAnalyzer_warmup_curve, wueAfrTargetOffsetCurve, afrTableTbl, AFRValue, coolant, cltCorrection, egoCorrection
lambdaTargetTables = afrTableTbl, afrTSCustom
#endif
wuePercentOffset = 0 ; for working with 0 based enrichment set to 100 wuePercentOffset = 0 ; for working with 0 based enrichment set to 100
option = disableLiveUpdates option = disableLiveUpdates
@ -2432,7 +2461,11 @@ gaugeCategory = Knock
gauge2 = CLTGauge gauge2 = CLTGauge
gauge3 = TPSGauge gauge3 = TPSGauge
gauge4 = MAPGauge gauge4 = MAPGauge
#if LAMBDA
gauge5 = lambda1Gauge gauge5 = lambda1Gauge
#else
gauge5 = afr1Gauge
#endif
gauge6 = VBattGauge gauge6 = VBattGauge
gauge7 = dwellGauge gauge7 = dwellGauge
gauge8 = ignadvGauge gauge8 = ignadvGauge
@ -2659,7 +2692,11 @@ menuDialog = main
subMenu = std_separator subMenu = std_separator
# Fuel model # Fuel model
#if LAMBDA
subMenu = lambdaTableTbl, "Target lambda", 0, {isInjectionEnabled == 1} subMenu = lambdaTableTbl, "Target lambda", 0, {isInjectionEnabled == 1}
#else
subMenu = afrTableTbl, "Target AFR", 0, {isInjectionEnabled == 1}
#endif
subMenu = cltFuelCorrCurve, "CLT multiplier", 0, {isInjectionEnabled == 1} subMenu = cltFuelCorrCurve, "CLT multiplier", 0, {isInjectionEnabled == 1}
subMenu = iatFuelCorrCurve, "IAT multiplier", 0, {isInjectionEnabled == 1} subMenu = iatFuelCorrCurve, "IAT multiplier", 0, {isInjectionEnabled == 1}
subMenu = fuelClosedLoopDialog, "Closed loop fuel correction", 0, {isInjectionEnabled == 1} subMenu = fuelClosedLoopDialog, "Closed loop fuel correction", 0, {isInjectionEnabled == 1}
@ -4736,3 +4773,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
[Tools] [Tools]
;addTool = toolName, PanelName ;addTool = toolName, PanelName
addTool = veTableGenerator, "VE Table Generator", veTableTbl addTool = veTableGenerator, "VE Table Generator", veTableTbl
#if LAMBDA
#else
addTool = afrTableGenerator, "AFR Table Generator", afrTableTbl
#endif

View File

@ -33,12 +33,12 @@ enable2ndByteCanID = false
[MegaTune] [MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
signature = "rusEFI 2020.11.05.frankenso_na6.2985845518" signature = "rusEFI 2020.11.05.frankenso_na6.1056414940"
[TunerStudio] [TunerStudio]
queryCommand = "S" queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar. versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI 2020.11.05.frankenso_na6.2985845518" ; signature is expected to be 7 or more characters. signature = "rusEFI 2020.11.05.frankenso_na6.1056414940" ; signature is expected to be 7 or more characters.
[Constants] [Constants]
; new packet serial format with CRC ; new packet serial format with CRC
@ -74,7 +74,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 rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 05 13:06:09 UTC 2020 ; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 05 20:36:36 UTC 2020
pageSize = 20000 pageSize = 20000
page = 1 page = 1
@ -1235,7 +1235,11 @@ page = 1
veTable = array, F32, 17440, [16x16],"%", 1.0, 0, 0, 999.0, 2 veTable = array, F32, 17440, [16x16],"%", 1.0, 0, 0, 999.0, 2
veLoadBins = array, F32, 18464, [16], "kPa", 1.0, 0.0, 0, 400.0, 2 veLoadBins = array, F32, 18464, [16], "kPa", 1.0, 0.0, 0, 400.0, 2
veRpmBins = array, F32, 18528, [16], "RPM", 1.0, 0.0, 0, 18000.0, 2 veRpmBins = array, F32, 18528, [16], "RPM", 1.0, 0.0, 0, 18000.0, 2
#if LAMBDA
lambdaTable = array, U08, 18592, [16x16],"deg", 0.006802721088435374, 0, 0.6, 1.5, 2 lambdaTable = array, U08, 18592, [16x16],"deg", 0.006802721088435374, 0, 0.6, 1.5, 2
#else
lambdaTable = array, U08, 18592, [16x16],"deg", 0.1, 0, 0, 25.0, 1
#endif
lambdaLoadBins = array, F32, 18848, [16], "", 1.0, 0.0, 0, 500.0, 2 lambdaLoadBins = array, F32, 18848, [16], "", 1.0, 0.0, 0, 500.0, 2
lambdaRpmBins = array, F32, 18912, [16], "RPM", 1.0, 0.0, 0, 18000.0, 2 lambdaRpmBins = array, F32, 18912, [16], "RPM", 1.0, 0.0, 0, 18000.0, 2
tpsTpsAccelTable = array, F32, 18976, [8x8],"value", 1.0, 0, 0.0, 30000.0, 2 tpsTpsAccelTable = array, F32, 18976, [8x8],"value", 1.0, 0, 0.0, 30000.0, 2
@ -1457,7 +1461,11 @@ page = 1
pageButtons = "&EGO" pageButtons = "&EGO"
gauge1 = RPMGauge gauge1 = RPMGauge
#if LAMBDA
gauge2 = lambda1Gauge gauge2 = lambda1Gauge
#else
gauge2 = afr1Gauge
#endif
gauge3 = MAPGauge gauge3 = MAPGauge
gauge4 = veValueGauge gauge4 = veValueGauge
@ -1502,8 +1510,13 @@ page = 1
[VeAnalyze] [VeAnalyze]
; tableName, lambdaTargetTableName, lambdaChannel, egoCorrectionChannel, activeCondition ; tableName, lambdaTargetTableName, lambdaChannel, egoCorrectionChannel, activeCondition
#if LAMBDA
veAnalyzeMap = veTableTbl, lambdaTableTbl, lambdaValue, egoCorrection, { 1 } veAnalyzeMap = veTableTbl, lambdaTableTbl, lambdaValue, egoCorrection, { 1 }
lambdaTargetTables = lambdaTableTbl, afrTSCustom lambdaTargetTables = lambdaTableTbl, afrTSCustom
#else
veAnalyzeMap = veTableTbl, afrTableTbl, AFRValue, egoCorrection, { 1 }
lambdaTargetTables = afrTableTbl, afrTSCustom
#endif
; filter = Name, "DisplayName", outputChannel, operator, defaultVal, userAdjustable ; filter = Name, "DisplayName", outputChannel, operator, defaultVal, userAdjustable
filter = minRPMFilter, "Minimum RPM", RPMValue, < , 500, , true filter = minRPMFilter, "Minimum RPM", RPMValue, < , 500, , true
@ -1898,7 +1911,11 @@ page = 1
yAxis = 0, 28, 10 yAxis = 0, 28, 10
xBins = narrowToWideOxygenBins xBins = narrowToWideOxygenBins
yBins = narrowToWideOxygen yBins = narrowToWideOxygen
#if LAMBDA
gauge = lambda1Gauge gauge = lambda1Gauge
#else
gauge = afr1Gauge
#endif
curve = fsioCurve1, "FSIO Curve #1" curve = fsioCurve1, "FSIO Curve #1"
columnLabel = "X", "Y" columnLabel = "X", "Y"
@ -2076,7 +2093,11 @@ page = 1
yAxis = 0, 250, 10 yAxis = 0, 250, 10
xBins = idleVeBins, RPMValue xBins = idleVeBins, RPMValue
yBins = idleVe yBins = idleVe
#if LAMBDA
gauge = lambda1Gauge gauge = lambda1Gauge
#else
gauge = afr1Gauge
#endif
curve = crankingAdvanceCurve, "Cranking Advance Angle" curve = crankingAdvanceCurve, "Cranking Advance Angle"
columnLabel = "RPM", "degrees" columnLabel = "RPM", "degrees"
@ -2205,7 +2226,11 @@ page = 1
upDownLabel = "(Later)", "(Sooner)" upDownLabel = "(Later)", "(Sooner)"
#if LAMBDA
table = lambdaTableTbl, lambdaTableMap, "Target Lambda Table", 1 table = lambdaTableTbl, lambdaTableMap, "Target Lambda Table", 1
#else
table = afrTableTbl, afrTableMap, "Target AFR Table", 1
#endif
; constant, variable ; constant, variable
xBins = lambdaRpmBins, RPMValue xBins = lambdaRpmBins, RPMValue
yBins = lambdaLoadBins, afrTableYAxis yBins = lambdaLoadBins, afrTableYAxis
@ -2399,9 +2424,13 @@ gaugeCategory = Knock
[WueAnalyze] [WueAnalyze]
; wueCurveName, afrTempCompensationCurve, lambdaTargetTableName, lambdaChannel, coolantTempChannel, egoCorrectionChannel, wueChannel, activeCondition ; wueCurveName, afrTempCompensationCurve, lambdaTargetTableName, lambdaChannel, coolantTempChannel, egoCorrectionChannel, wueChannel, activeCondition
#if LAMBDA
wueAnalyzeMap = wueAnalyzer_warmup_curve, wueAfrTargetOffsetCurve, lambdaTableTbl, lambdaValue, coolant, cltCorrection, egoCorrection wueAnalyzeMap = wueAnalyzer_warmup_curve, wueAfrTargetOffsetCurve, lambdaTableTbl, lambdaValue, coolant, cltCorrection, egoCorrection
lambdaTargetTables = lambdaTableTbl, afrTSCustom lambdaTargetTables = lambdaTableTbl, afrTSCustom
#else
wueAnalyzeMap = wueAnalyzer_warmup_curve, wueAfrTargetOffsetCurve, afrTableTbl, AFRValue, coolant, cltCorrection, egoCorrection
lambdaTargetTables = afrTableTbl, afrTSCustom
#endif
wuePercentOffset = 0 ; for working with 0 based enrichment set to 100 wuePercentOffset = 0 ; for working with 0 based enrichment set to 100
option = disableLiveUpdates option = disableLiveUpdates
@ -2432,7 +2461,11 @@ gaugeCategory = Knock
gauge2 = CLTGauge gauge2 = CLTGauge
gauge3 = TPSGauge gauge3 = TPSGauge
gauge4 = MAPGauge gauge4 = MAPGauge
#if LAMBDA
gauge5 = lambda1Gauge gauge5 = lambda1Gauge
#else
gauge5 = afr1Gauge
#endif
gauge6 = VBattGauge gauge6 = VBattGauge
gauge7 = dwellGauge gauge7 = dwellGauge
gauge8 = ignadvGauge gauge8 = ignadvGauge
@ -2659,7 +2692,11 @@ menuDialog = main
subMenu = std_separator subMenu = std_separator
# Fuel model # Fuel model
#if LAMBDA
subMenu = lambdaTableTbl, "Target lambda", 0, {isInjectionEnabled == 1} subMenu = lambdaTableTbl, "Target lambda", 0, {isInjectionEnabled == 1}
#else
subMenu = afrTableTbl, "Target AFR", 0, {isInjectionEnabled == 1}
#endif
subMenu = cltFuelCorrCurve, "CLT multiplier", 0, {isInjectionEnabled == 1} subMenu = cltFuelCorrCurve, "CLT multiplier", 0, {isInjectionEnabled == 1}
subMenu = iatFuelCorrCurve, "IAT multiplier", 0, {isInjectionEnabled == 1} subMenu = iatFuelCorrCurve, "IAT multiplier", 0, {isInjectionEnabled == 1}
subMenu = fuelClosedLoopDialog, "Closed loop fuel correction", 0, {isInjectionEnabled == 1} subMenu = fuelClosedLoopDialog, "Closed loop fuel correction", 0, {isInjectionEnabled == 1}
@ -4729,3 +4766,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
[Tools] [Tools]
;addTool = toolName, PanelName ;addTool = toolName, PanelName
addTool = veTableGenerator, "VE Table Generator", veTableTbl addTool = veTableGenerator, "VE Table Generator", veTableTbl
#if LAMBDA
#else
addTool = afrTableGenerator, "AFR Table Generator", afrTableTbl
#endif

View File

@ -33,12 +33,12 @@ enable2ndByteCanID = false
[MegaTune] [MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
signature = "rusEFI 2020.11.05.hellen_cypress.4000937014" signature = "rusEFI 2020.11.05.hellen_cypress.1635159012"
[TunerStudio] [TunerStudio]
queryCommand = "S" queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar. versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI 2020.11.05.hellen_cypress.4000937014" ; signature is expected to be 7 or more characters. signature = "rusEFI 2020.11.05.hellen_cypress.1635159012" ; signature is expected to be 7 or more characters.
[Constants] [Constants]
; new packet serial format with CRC ; new packet serial format with CRC
@ -74,7 +74,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 rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Thu Nov 05 13:06:18 UTC 2020 ; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Thu Nov 05 20:36:45 UTC 2020
pageSize = 20000 pageSize = 20000
page = 1 page = 1
@ -1235,7 +1235,11 @@ page = 1
veTable = array, F32, 17440, [16x16],"%", 1.0, 0, 0, 999.0, 2 veTable = array, F32, 17440, [16x16],"%", 1.0, 0, 0, 999.0, 2
veLoadBins = array, F32, 18464, [16], "kPa", 1.0, 0.0, 0, 400.0, 2 veLoadBins = array, F32, 18464, [16], "kPa", 1.0, 0.0, 0, 400.0, 2
veRpmBins = array, F32, 18528, [16], "RPM", 1.0, 0.0, 0, 18000.0, 2 veRpmBins = array, F32, 18528, [16], "RPM", 1.0, 0.0, 0, 18000.0, 2
#if LAMBDA
lambdaTable = array, U08, 18592, [16x16],"deg", 0.006802721088435374, 0, 0.6, 1.5, 2 lambdaTable = array, U08, 18592, [16x16],"deg", 0.006802721088435374, 0, 0.6, 1.5, 2
#else
lambdaTable = array, U08, 18592, [16x16],"deg", 0.1, 0, 0, 25.0, 1
#endif
lambdaLoadBins = array, F32, 18848, [16], "", 1.0, 0.0, 0, 500.0, 2 lambdaLoadBins = array, F32, 18848, [16], "", 1.0, 0.0, 0, 500.0, 2
lambdaRpmBins = array, F32, 18912, [16], "RPM", 1.0, 0.0, 0, 18000.0, 2 lambdaRpmBins = array, F32, 18912, [16], "RPM", 1.0, 0.0, 0, 18000.0, 2
tpsTpsAccelTable = array, F32, 18976, [8x8],"value", 1.0, 0, 0.0, 30000.0, 2 tpsTpsAccelTable = array, F32, 18976, [8x8],"value", 1.0, 0, 0.0, 30000.0, 2
@ -1457,7 +1461,11 @@ page = 1
pageButtons = "&EGO" pageButtons = "&EGO"
gauge1 = RPMGauge gauge1 = RPMGauge
#if LAMBDA
gauge2 = lambda1Gauge gauge2 = lambda1Gauge
#else
gauge2 = afr1Gauge
#endif
gauge3 = MAPGauge gauge3 = MAPGauge
gauge4 = veValueGauge gauge4 = veValueGauge
@ -1502,8 +1510,13 @@ page = 1
[VeAnalyze] [VeAnalyze]
; tableName, lambdaTargetTableName, lambdaChannel, egoCorrectionChannel, activeCondition ; tableName, lambdaTargetTableName, lambdaChannel, egoCorrectionChannel, activeCondition
#if LAMBDA
veAnalyzeMap = veTableTbl, lambdaTableTbl, lambdaValue, egoCorrection, { 1 } veAnalyzeMap = veTableTbl, lambdaTableTbl, lambdaValue, egoCorrection, { 1 }
lambdaTargetTables = lambdaTableTbl, afrTSCustom lambdaTargetTables = lambdaTableTbl, afrTSCustom
#else
veAnalyzeMap = veTableTbl, afrTableTbl, AFRValue, egoCorrection, { 1 }
lambdaTargetTables = afrTableTbl, afrTSCustom
#endif
; filter = Name, "DisplayName", outputChannel, operator, defaultVal, userAdjustable ; filter = Name, "DisplayName", outputChannel, operator, defaultVal, userAdjustable
filter = minRPMFilter, "Minimum RPM", RPMValue, < , 500, , true filter = minRPMFilter, "Minimum RPM", RPMValue, < , 500, , true
@ -1898,7 +1911,11 @@ page = 1
yAxis = 0, 28, 10 yAxis = 0, 28, 10
xBins = narrowToWideOxygenBins xBins = narrowToWideOxygenBins
yBins = narrowToWideOxygen yBins = narrowToWideOxygen
#if LAMBDA
gauge = lambda1Gauge gauge = lambda1Gauge
#else
gauge = afr1Gauge
#endif
curve = fsioCurve1, "FSIO Curve #1" curve = fsioCurve1, "FSIO Curve #1"
columnLabel = "X", "Y" columnLabel = "X", "Y"
@ -2076,7 +2093,11 @@ page = 1
yAxis = 0, 250, 10 yAxis = 0, 250, 10
xBins = idleVeBins, RPMValue xBins = idleVeBins, RPMValue
yBins = idleVe yBins = idleVe
#if LAMBDA
gauge = lambda1Gauge gauge = lambda1Gauge
#else
gauge = afr1Gauge
#endif
curve = crankingAdvanceCurve, "Cranking Advance Angle" curve = crankingAdvanceCurve, "Cranking Advance Angle"
columnLabel = "RPM", "degrees" columnLabel = "RPM", "degrees"
@ -2205,7 +2226,11 @@ page = 1
upDownLabel = "(Later)", "(Sooner)" upDownLabel = "(Later)", "(Sooner)"
#if LAMBDA
table = lambdaTableTbl, lambdaTableMap, "Target Lambda Table", 1 table = lambdaTableTbl, lambdaTableMap, "Target Lambda Table", 1
#else
table = afrTableTbl, afrTableMap, "Target AFR Table", 1
#endif
; constant, variable ; constant, variable
xBins = lambdaRpmBins, RPMValue xBins = lambdaRpmBins, RPMValue
yBins = lambdaLoadBins, afrTableYAxis yBins = lambdaLoadBins, afrTableYAxis
@ -2399,9 +2424,13 @@ gaugeCategory = Knock
[WueAnalyze] [WueAnalyze]
; wueCurveName, afrTempCompensationCurve, lambdaTargetTableName, lambdaChannel, coolantTempChannel, egoCorrectionChannel, wueChannel, activeCondition ; wueCurveName, afrTempCompensationCurve, lambdaTargetTableName, lambdaChannel, coolantTempChannel, egoCorrectionChannel, wueChannel, activeCondition
#if LAMBDA
wueAnalyzeMap = wueAnalyzer_warmup_curve, wueAfrTargetOffsetCurve, lambdaTableTbl, lambdaValue, coolant, cltCorrection, egoCorrection wueAnalyzeMap = wueAnalyzer_warmup_curve, wueAfrTargetOffsetCurve, lambdaTableTbl, lambdaValue, coolant, cltCorrection, egoCorrection
lambdaTargetTables = lambdaTableTbl, afrTSCustom lambdaTargetTables = lambdaTableTbl, afrTSCustom
#else
wueAnalyzeMap = wueAnalyzer_warmup_curve, wueAfrTargetOffsetCurve, afrTableTbl, AFRValue, coolant, cltCorrection, egoCorrection
lambdaTargetTables = afrTableTbl, afrTSCustom
#endif
wuePercentOffset = 0 ; for working with 0 based enrichment set to 100 wuePercentOffset = 0 ; for working with 0 based enrichment set to 100
option = disableLiveUpdates option = disableLiveUpdates
@ -2432,7 +2461,11 @@ gaugeCategory = Knock
gauge2 = CLTGauge gauge2 = CLTGauge
gauge3 = TPSGauge gauge3 = TPSGauge
gauge4 = MAPGauge gauge4 = MAPGauge
#if LAMBDA
gauge5 = lambda1Gauge gauge5 = lambda1Gauge
#else
gauge5 = afr1Gauge
#endif
gauge6 = VBattGauge gauge6 = VBattGauge
gauge7 = dwellGauge gauge7 = dwellGauge
gauge8 = ignadvGauge gauge8 = ignadvGauge
@ -2659,7 +2692,11 @@ menuDialog = main
subMenu = std_separator subMenu = std_separator
# Fuel model # Fuel model
#if LAMBDA
subMenu = lambdaTableTbl, "Target lambda", 0, {isInjectionEnabled == 1} subMenu = lambdaTableTbl, "Target lambda", 0, {isInjectionEnabled == 1}
#else
subMenu = afrTableTbl, "Target AFR", 0, {isInjectionEnabled == 1}
#endif
subMenu = cltFuelCorrCurve, "CLT multiplier", 0, {isInjectionEnabled == 1} subMenu = cltFuelCorrCurve, "CLT multiplier", 0, {isInjectionEnabled == 1}
subMenu = iatFuelCorrCurve, "IAT multiplier", 0, {isInjectionEnabled == 1} subMenu = iatFuelCorrCurve, "IAT multiplier", 0, {isInjectionEnabled == 1}
subMenu = fuelClosedLoopDialog, "Closed loop fuel correction", 0, {isInjectionEnabled == 1} subMenu = fuelClosedLoopDialog, "Closed loop fuel correction", 0, {isInjectionEnabled == 1}
@ -4736,3 +4773,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
[Tools] [Tools]
;addTool = toolName, PanelName ;addTool = toolName, PanelName
addTool = veTableGenerator, "VE Table Generator", veTableTbl addTool = veTableGenerator, "VE Table Generator", veTableTbl
#if LAMBDA
#else
addTool = afrTableGenerator, "AFR Table Generator", afrTableTbl
#endif

View File

@ -33,12 +33,12 @@ enable2ndByteCanID = false
[MegaTune] [MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
signature = "rusEFI 2020.11.05.kin.3211087564" signature = "rusEFI 2020.11.05.kin.812298526"
[TunerStudio] [TunerStudio]
queryCommand = "S" queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar. versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI 2020.11.05.kin.3211087564" ; signature is expected to be 7 or more characters. signature = "rusEFI 2020.11.05.kin.812298526" ; signature is expected to be 7 or more characters.
[Constants] [Constants]
; new packet serial format with CRC ; new packet serial format with CRC
@ -74,7 +74,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 rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Thu Nov 05 13:06:16 UTC 2020 ; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Thu Nov 05 20:36:43 UTC 2020
pageSize = 20000 pageSize = 20000
page = 1 page = 1
@ -1235,7 +1235,11 @@ page = 1
veTable = array, F32, 17440, [16x16],"%", 1.0, 0, 0, 999.0, 2 veTable = array, F32, 17440, [16x16],"%", 1.0, 0, 0, 999.0, 2
veLoadBins = array, F32, 18464, [16], "kPa", 1.0, 0.0, 0, 400.0, 2 veLoadBins = array, F32, 18464, [16], "kPa", 1.0, 0.0, 0, 400.0, 2
veRpmBins = array, F32, 18528, [16], "RPM", 1.0, 0.0, 0, 18000.0, 2 veRpmBins = array, F32, 18528, [16], "RPM", 1.0, 0.0, 0, 18000.0, 2
#if LAMBDA
lambdaTable = array, U08, 18592, [16x16],"deg", 0.006802721088435374, 0, 0.6, 1.5, 2 lambdaTable = array, U08, 18592, [16x16],"deg", 0.006802721088435374, 0, 0.6, 1.5, 2
#else
lambdaTable = array, U08, 18592, [16x16],"deg", 0.1, 0, 0, 25.0, 1
#endif
lambdaLoadBins = array, F32, 18848, [16], "", 1.0, 0.0, 0, 500.0, 2 lambdaLoadBins = array, F32, 18848, [16], "", 1.0, 0.0, 0, 500.0, 2
lambdaRpmBins = array, F32, 18912, [16], "RPM", 1.0, 0.0, 0, 18000.0, 2 lambdaRpmBins = array, F32, 18912, [16], "RPM", 1.0, 0.0, 0, 18000.0, 2
tpsTpsAccelTable = array, F32, 18976, [8x8],"value", 1.0, 0, 0.0, 30000.0, 2 tpsTpsAccelTable = array, F32, 18976, [8x8],"value", 1.0, 0, 0.0, 30000.0, 2
@ -1457,7 +1461,11 @@ page = 1
pageButtons = "&EGO" pageButtons = "&EGO"
gauge1 = RPMGauge gauge1 = RPMGauge
#if LAMBDA
gauge2 = lambda1Gauge gauge2 = lambda1Gauge
#else
gauge2 = afr1Gauge
#endif
gauge3 = MAPGauge gauge3 = MAPGauge
gauge4 = veValueGauge gauge4 = veValueGauge
@ -1502,8 +1510,13 @@ page = 1
[VeAnalyze] [VeAnalyze]
; tableName, lambdaTargetTableName, lambdaChannel, egoCorrectionChannel, activeCondition ; tableName, lambdaTargetTableName, lambdaChannel, egoCorrectionChannel, activeCondition
#if LAMBDA
veAnalyzeMap = veTableTbl, lambdaTableTbl, lambdaValue, egoCorrection, { 1 } veAnalyzeMap = veTableTbl, lambdaTableTbl, lambdaValue, egoCorrection, { 1 }
lambdaTargetTables = lambdaTableTbl, afrTSCustom lambdaTargetTables = lambdaTableTbl, afrTSCustom
#else
veAnalyzeMap = veTableTbl, afrTableTbl, AFRValue, egoCorrection, { 1 }
lambdaTargetTables = afrTableTbl, afrTSCustom
#endif
; filter = Name, "DisplayName", outputChannel, operator, defaultVal, userAdjustable ; filter = Name, "DisplayName", outputChannel, operator, defaultVal, userAdjustable
filter = minRPMFilter, "Minimum RPM", RPMValue, < , 500, , true filter = minRPMFilter, "Minimum RPM", RPMValue, < , 500, , true
@ -1898,7 +1911,11 @@ page = 1
yAxis = 0, 28, 10 yAxis = 0, 28, 10
xBins = narrowToWideOxygenBins xBins = narrowToWideOxygenBins
yBins = narrowToWideOxygen yBins = narrowToWideOxygen
#if LAMBDA
gauge = lambda1Gauge gauge = lambda1Gauge
#else
gauge = afr1Gauge
#endif
curve = fsioCurve1, "FSIO Curve #1" curve = fsioCurve1, "FSIO Curve #1"
columnLabel = "X", "Y" columnLabel = "X", "Y"
@ -2076,7 +2093,11 @@ page = 1
yAxis = 0, 250, 10 yAxis = 0, 250, 10
xBins = idleVeBins, RPMValue xBins = idleVeBins, RPMValue
yBins = idleVe yBins = idleVe
#if LAMBDA
gauge = lambda1Gauge gauge = lambda1Gauge
#else
gauge = afr1Gauge
#endif
curve = crankingAdvanceCurve, "Cranking Advance Angle" curve = crankingAdvanceCurve, "Cranking Advance Angle"
columnLabel = "RPM", "degrees" columnLabel = "RPM", "degrees"
@ -2205,7 +2226,11 @@ page = 1
upDownLabel = "(Later)", "(Sooner)" upDownLabel = "(Later)", "(Sooner)"
#if LAMBDA
table = lambdaTableTbl, lambdaTableMap, "Target Lambda Table", 1 table = lambdaTableTbl, lambdaTableMap, "Target Lambda Table", 1
#else
table = afrTableTbl, afrTableMap, "Target AFR Table", 1
#endif
; constant, variable ; constant, variable
xBins = lambdaRpmBins, RPMValue xBins = lambdaRpmBins, RPMValue
yBins = lambdaLoadBins, afrTableYAxis yBins = lambdaLoadBins, afrTableYAxis
@ -2399,9 +2424,13 @@ gaugeCategory = Knock
[WueAnalyze] [WueAnalyze]
; wueCurveName, afrTempCompensationCurve, lambdaTargetTableName, lambdaChannel, coolantTempChannel, egoCorrectionChannel, wueChannel, activeCondition ; wueCurveName, afrTempCompensationCurve, lambdaTargetTableName, lambdaChannel, coolantTempChannel, egoCorrectionChannel, wueChannel, activeCondition
#if LAMBDA
wueAnalyzeMap = wueAnalyzer_warmup_curve, wueAfrTargetOffsetCurve, lambdaTableTbl, lambdaValue, coolant, cltCorrection, egoCorrection wueAnalyzeMap = wueAnalyzer_warmup_curve, wueAfrTargetOffsetCurve, lambdaTableTbl, lambdaValue, coolant, cltCorrection, egoCorrection
lambdaTargetTables = lambdaTableTbl, afrTSCustom lambdaTargetTables = lambdaTableTbl, afrTSCustom
#else
wueAnalyzeMap = wueAnalyzer_warmup_curve, wueAfrTargetOffsetCurve, afrTableTbl, AFRValue, coolant, cltCorrection, egoCorrection
lambdaTargetTables = afrTableTbl, afrTSCustom
#endif
wuePercentOffset = 0 ; for working with 0 based enrichment set to 100 wuePercentOffset = 0 ; for working with 0 based enrichment set to 100
option = disableLiveUpdates option = disableLiveUpdates
@ -2432,7 +2461,11 @@ gaugeCategory = Knock
gauge2 = CLTGauge gauge2 = CLTGauge
gauge3 = TPSGauge gauge3 = TPSGauge
gauge4 = MAPGauge gauge4 = MAPGauge
#if LAMBDA
gauge5 = lambda1Gauge gauge5 = lambda1Gauge
#else
gauge5 = afr1Gauge
#endif
gauge6 = VBattGauge gauge6 = VBattGauge
gauge7 = dwellGauge gauge7 = dwellGauge
gauge8 = ignadvGauge gauge8 = ignadvGauge
@ -2659,7 +2692,11 @@ menuDialog = main
subMenu = std_separator subMenu = std_separator
# Fuel model # Fuel model
#if LAMBDA
subMenu = lambdaTableTbl, "Target lambda", 0, {isInjectionEnabled == 1} subMenu = lambdaTableTbl, "Target lambda", 0, {isInjectionEnabled == 1}
#else
subMenu = afrTableTbl, "Target AFR", 0, {isInjectionEnabled == 1}
#endif
subMenu = cltFuelCorrCurve, "CLT multiplier", 0, {isInjectionEnabled == 1} subMenu = cltFuelCorrCurve, "CLT multiplier", 0, {isInjectionEnabled == 1}
subMenu = iatFuelCorrCurve, "IAT multiplier", 0, {isInjectionEnabled == 1} subMenu = iatFuelCorrCurve, "IAT multiplier", 0, {isInjectionEnabled == 1}
subMenu = fuelClosedLoopDialog, "Closed loop fuel correction", 0, {isInjectionEnabled == 1} subMenu = fuelClosedLoopDialog, "Closed loop fuel correction", 0, {isInjectionEnabled == 1}
@ -4737,3 +4774,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
[Tools] [Tools]
;addTool = toolName, PanelName ;addTool = toolName, PanelName
addTool = veTableGenerator, "VE Table Generator", veTableTbl addTool = veTableGenerator, "VE Table Generator", veTableTbl
#if LAMBDA
#else
addTool = afrTableGenerator, "AFR Table Generator", afrTableTbl
#endif

View File

@ -33,12 +33,12 @@ enable2ndByteCanID = false
[MegaTune] [MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
signature = "rusEFI 2020.11.05.mre_f4.1336113819" signature = "rusEFI 2020.11.05.mre_f4.3232531785"
[TunerStudio] [TunerStudio]
queryCommand = "S" queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar. versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI 2020.11.05.mre_f4.1336113819" ; signature is expected to be 7 or more characters. signature = "rusEFI 2020.11.05.mre_f4.3232531785" ; signature is expected to be 7 or more characters.
[Constants] [Constants]
; new packet serial format with CRC ; new packet serial format with CRC
@ -74,7 +74,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 rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 05 13:06:05 UTC 2020 ; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 05 20:36:35 UTC 2020
pageSize = 20000 pageSize = 20000
page = 1 page = 1
@ -1235,7 +1235,11 @@ page = 1
veTable = array, F32, 17440, [16x16],"%", 1.0, 0, 0, 999.0, 2 veTable = array, F32, 17440, [16x16],"%", 1.0, 0, 0, 999.0, 2
veLoadBins = array, F32, 18464, [16], "kPa", 1.0, 0.0, 0, 400.0, 2 veLoadBins = array, F32, 18464, [16], "kPa", 1.0, 0.0, 0, 400.0, 2
veRpmBins = array, F32, 18528, [16], "RPM", 1.0, 0.0, 0, 18000.0, 2 veRpmBins = array, F32, 18528, [16], "RPM", 1.0, 0.0, 0, 18000.0, 2
#if LAMBDA
lambdaTable = array, U08, 18592, [16x16],"deg", 0.006802721088435374, 0, 0.6, 1.5, 2 lambdaTable = array, U08, 18592, [16x16],"deg", 0.006802721088435374, 0, 0.6, 1.5, 2
#else
lambdaTable = array, U08, 18592, [16x16],"deg", 0.1, 0, 0, 25.0, 1
#endif
lambdaLoadBins = array, F32, 18848, [16], "", 1.0, 0.0, 0, 500.0, 2 lambdaLoadBins = array, F32, 18848, [16], "", 1.0, 0.0, 0, 500.0, 2
lambdaRpmBins = array, F32, 18912, [16], "RPM", 1.0, 0.0, 0, 18000.0, 2 lambdaRpmBins = array, F32, 18912, [16], "RPM", 1.0, 0.0, 0, 18000.0, 2
tpsTpsAccelTable = array, F32, 18976, [8x8],"value", 1.0, 0, 0.0, 30000.0, 2 tpsTpsAccelTable = array, F32, 18976, [8x8],"value", 1.0, 0, 0.0, 30000.0, 2
@ -1457,7 +1461,11 @@ page = 1
pageButtons = "&EGO" pageButtons = "&EGO"
gauge1 = RPMGauge gauge1 = RPMGauge
#if LAMBDA
gauge2 = lambda1Gauge gauge2 = lambda1Gauge
#else
gauge2 = afr1Gauge
#endif
gauge3 = MAPGauge gauge3 = MAPGauge
gauge4 = veValueGauge gauge4 = veValueGauge
@ -1502,8 +1510,13 @@ page = 1
[VeAnalyze] [VeAnalyze]
; tableName, lambdaTargetTableName, lambdaChannel, egoCorrectionChannel, activeCondition ; tableName, lambdaTargetTableName, lambdaChannel, egoCorrectionChannel, activeCondition
#if LAMBDA
veAnalyzeMap = veTableTbl, lambdaTableTbl, lambdaValue, egoCorrection, { 1 } veAnalyzeMap = veTableTbl, lambdaTableTbl, lambdaValue, egoCorrection, { 1 }
lambdaTargetTables = lambdaTableTbl, afrTSCustom lambdaTargetTables = lambdaTableTbl, afrTSCustom
#else
veAnalyzeMap = veTableTbl, afrTableTbl, AFRValue, egoCorrection, { 1 }
lambdaTargetTables = afrTableTbl, afrTSCustom
#endif
; filter = Name, "DisplayName", outputChannel, operator, defaultVal, userAdjustable ; filter = Name, "DisplayName", outputChannel, operator, defaultVal, userAdjustable
filter = minRPMFilter, "Minimum RPM", RPMValue, < , 500, , true filter = minRPMFilter, "Minimum RPM", RPMValue, < , 500, , true
@ -1898,7 +1911,11 @@ page = 1
yAxis = 0, 28, 10 yAxis = 0, 28, 10
xBins = narrowToWideOxygenBins xBins = narrowToWideOxygenBins
yBins = narrowToWideOxygen yBins = narrowToWideOxygen
#if LAMBDA
gauge = lambda1Gauge gauge = lambda1Gauge
#else
gauge = afr1Gauge
#endif
curve = fsioCurve1, "FSIO Curve #1" curve = fsioCurve1, "FSIO Curve #1"
columnLabel = "X", "Y" columnLabel = "X", "Y"
@ -2076,7 +2093,11 @@ page = 1
yAxis = 0, 250, 10 yAxis = 0, 250, 10
xBins = idleVeBins, RPMValue xBins = idleVeBins, RPMValue
yBins = idleVe yBins = idleVe
#if LAMBDA
gauge = lambda1Gauge gauge = lambda1Gauge
#else
gauge = afr1Gauge
#endif
curve = crankingAdvanceCurve, "Cranking Advance Angle" curve = crankingAdvanceCurve, "Cranking Advance Angle"
columnLabel = "RPM", "degrees" columnLabel = "RPM", "degrees"
@ -2205,7 +2226,11 @@ page = 1
upDownLabel = "(Later)", "(Sooner)" upDownLabel = "(Later)", "(Sooner)"
#if LAMBDA
table = lambdaTableTbl, lambdaTableMap, "Target Lambda Table", 1 table = lambdaTableTbl, lambdaTableMap, "Target Lambda Table", 1
#else
table = afrTableTbl, afrTableMap, "Target AFR Table", 1
#endif
; constant, variable ; constant, variable
xBins = lambdaRpmBins, RPMValue xBins = lambdaRpmBins, RPMValue
yBins = lambdaLoadBins, afrTableYAxis yBins = lambdaLoadBins, afrTableYAxis
@ -2399,9 +2424,13 @@ gaugeCategory = Knock
[WueAnalyze] [WueAnalyze]
; wueCurveName, afrTempCompensationCurve, lambdaTargetTableName, lambdaChannel, coolantTempChannel, egoCorrectionChannel, wueChannel, activeCondition ; wueCurveName, afrTempCompensationCurve, lambdaTargetTableName, lambdaChannel, coolantTempChannel, egoCorrectionChannel, wueChannel, activeCondition
#if LAMBDA
wueAnalyzeMap = wueAnalyzer_warmup_curve, wueAfrTargetOffsetCurve, lambdaTableTbl, lambdaValue, coolant, cltCorrection, egoCorrection wueAnalyzeMap = wueAnalyzer_warmup_curve, wueAfrTargetOffsetCurve, lambdaTableTbl, lambdaValue, coolant, cltCorrection, egoCorrection
lambdaTargetTables = lambdaTableTbl, afrTSCustom lambdaTargetTables = lambdaTableTbl, afrTSCustom
#else
wueAnalyzeMap = wueAnalyzer_warmup_curve, wueAfrTargetOffsetCurve, afrTableTbl, AFRValue, coolant, cltCorrection, egoCorrection
lambdaTargetTables = afrTableTbl, afrTSCustom
#endif
wuePercentOffset = 0 ; for working with 0 based enrichment set to 100 wuePercentOffset = 0 ; for working with 0 based enrichment set to 100
option = disableLiveUpdates option = disableLiveUpdates
@ -2432,7 +2461,11 @@ gaugeCategory = Knock
gauge2 = CLTGauge gauge2 = CLTGauge
gauge3 = TPSGauge gauge3 = TPSGauge
gauge4 = MAPGauge gauge4 = MAPGauge
#if LAMBDA
gauge5 = lambda1Gauge gauge5 = lambda1Gauge
#else
gauge5 = afr1Gauge
#endif
gauge6 = VBattGauge gauge6 = VBattGauge
gauge7 = dwellGauge gauge7 = dwellGauge
gauge8 = ignadvGauge gauge8 = ignadvGauge
@ -2659,7 +2692,11 @@ menuDialog = main
subMenu = std_separator subMenu = std_separator
# Fuel model # Fuel model
#if LAMBDA
subMenu = lambdaTableTbl, "Target lambda", 0, {isInjectionEnabled == 1} subMenu = lambdaTableTbl, "Target lambda", 0, {isInjectionEnabled == 1}
#else
subMenu = afrTableTbl, "Target AFR", 0, {isInjectionEnabled == 1}
#endif
subMenu = cltFuelCorrCurve, "CLT multiplier", 0, {isInjectionEnabled == 1} subMenu = cltFuelCorrCurve, "CLT multiplier", 0, {isInjectionEnabled == 1}
subMenu = iatFuelCorrCurve, "IAT multiplier", 0, {isInjectionEnabled == 1} subMenu = iatFuelCorrCurve, "IAT multiplier", 0, {isInjectionEnabled == 1}
subMenu = fuelClosedLoopDialog, "Closed loop fuel correction", 0, {isInjectionEnabled == 1} subMenu = fuelClosedLoopDialog, "Closed loop fuel correction", 0, {isInjectionEnabled == 1}
@ -4704,3 +4741,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
[Tools] [Tools]
;addTool = toolName, PanelName ;addTool = toolName, PanelName
addTool = veTableGenerator, "VE Table Generator", veTableTbl addTool = veTableGenerator, "VE Table Generator", veTableTbl
#if LAMBDA
#else
addTool = afrTableGenerator, "AFR Table Generator", afrTableTbl
#endif

View File

@ -33,12 +33,12 @@ enable2ndByteCanID = false
[MegaTune] [MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
signature = "rusEFI 2020.11.05.mre_f7.1336113819" signature = "rusEFI 2020.11.05.mre_f7.3232531785"
[TunerStudio] [TunerStudio]
queryCommand = "S" queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar. versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI 2020.11.05.mre_f7.1336113819" ; signature is expected to be 7 or more characters. signature = "rusEFI 2020.11.05.mre_f7.3232531785" ; signature is expected to be 7 or more characters.
[Constants] [Constants]
; new packet serial format with CRC ; new packet serial format with CRC
@ -74,7 +74,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 rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 05 13:05:59 UTC 2020 ; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 05 20:36:33 UTC 2020
pageSize = 20000 pageSize = 20000
page = 1 page = 1
@ -1235,7 +1235,11 @@ page = 1
veTable = array, F32, 17440, [16x16],"%", 1.0, 0, 0, 999.0, 2 veTable = array, F32, 17440, [16x16],"%", 1.0, 0, 0, 999.0, 2
veLoadBins = array, F32, 18464, [16], "kPa", 1.0, 0.0, 0, 400.0, 2 veLoadBins = array, F32, 18464, [16], "kPa", 1.0, 0.0, 0, 400.0, 2
veRpmBins = array, F32, 18528, [16], "RPM", 1.0, 0.0, 0, 18000.0, 2 veRpmBins = array, F32, 18528, [16], "RPM", 1.0, 0.0, 0, 18000.0, 2
#if LAMBDA
lambdaTable = array, U08, 18592, [16x16],"deg", 0.006802721088435374, 0, 0.6, 1.5, 2 lambdaTable = array, U08, 18592, [16x16],"deg", 0.006802721088435374, 0, 0.6, 1.5, 2
#else
lambdaTable = array, U08, 18592, [16x16],"deg", 0.1, 0, 0, 25.0, 1
#endif
lambdaLoadBins = array, F32, 18848, [16], "", 1.0, 0.0, 0, 500.0, 2 lambdaLoadBins = array, F32, 18848, [16], "", 1.0, 0.0, 0, 500.0, 2
lambdaRpmBins = array, F32, 18912, [16], "RPM", 1.0, 0.0, 0, 18000.0, 2 lambdaRpmBins = array, F32, 18912, [16], "RPM", 1.0, 0.0, 0, 18000.0, 2
tpsTpsAccelTable = array, F32, 18976, [8x8],"value", 1.0, 0, 0.0, 30000.0, 2 tpsTpsAccelTable = array, F32, 18976, [8x8],"value", 1.0, 0, 0.0, 30000.0, 2
@ -1457,7 +1461,11 @@ page = 1
pageButtons = "&EGO" pageButtons = "&EGO"
gauge1 = RPMGauge gauge1 = RPMGauge
#if LAMBDA
gauge2 = lambda1Gauge gauge2 = lambda1Gauge
#else
gauge2 = afr1Gauge
#endif
gauge3 = MAPGauge gauge3 = MAPGauge
gauge4 = veValueGauge gauge4 = veValueGauge
@ -1502,8 +1510,13 @@ page = 1
[VeAnalyze] [VeAnalyze]
; tableName, lambdaTargetTableName, lambdaChannel, egoCorrectionChannel, activeCondition ; tableName, lambdaTargetTableName, lambdaChannel, egoCorrectionChannel, activeCondition
#if LAMBDA
veAnalyzeMap = veTableTbl, lambdaTableTbl, lambdaValue, egoCorrection, { 1 } veAnalyzeMap = veTableTbl, lambdaTableTbl, lambdaValue, egoCorrection, { 1 }
lambdaTargetTables = lambdaTableTbl, afrTSCustom lambdaTargetTables = lambdaTableTbl, afrTSCustom
#else
veAnalyzeMap = veTableTbl, afrTableTbl, AFRValue, egoCorrection, { 1 }
lambdaTargetTables = afrTableTbl, afrTSCustom
#endif
; filter = Name, "DisplayName", outputChannel, operator, defaultVal, userAdjustable ; filter = Name, "DisplayName", outputChannel, operator, defaultVal, userAdjustable
filter = minRPMFilter, "Minimum RPM", RPMValue, < , 500, , true filter = minRPMFilter, "Minimum RPM", RPMValue, < , 500, , true
@ -1898,7 +1911,11 @@ page = 1
yAxis = 0, 28, 10 yAxis = 0, 28, 10
xBins = narrowToWideOxygenBins xBins = narrowToWideOxygenBins
yBins = narrowToWideOxygen yBins = narrowToWideOxygen
#if LAMBDA
gauge = lambda1Gauge gauge = lambda1Gauge
#else
gauge = afr1Gauge
#endif
curve = fsioCurve1, "FSIO Curve #1" curve = fsioCurve1, "FSIO Curve #1"
columnLabel = "X", "Y" columnLabel = "X", "Y"
@ -2076,7 +2093,11 @@ page = 1
yAxis = 0, 250, 10 yAxis = 0, 250, 10
xBins = idleVeBins, RPMValue xBins = idleVeBins, RPMValue
yBins = idleVe yBins = idleVe
#if LAMBDA
gauge = lambda1Gauge gauge = lambda1Gauge
#else
gauge = afr1Gauge
#endif
curve = crankingAdvanceCurve, "Cranking Advance Angle" curve = crankingAdvanceCurve, "Cranking Advance Angle"
columnLabel = "RPM", "degrees" columnLabel = "RPM", "degrees"
@ -2205,7 +2226,11 @@ page = 1
upDownLabel = "(Later)", "(Sooner)" upDownLabel = "(Later)", "(Sooner)"
#if LAMBDA
table = lambdaTableTbl, lambdaTableMap, "Target Lambda Table", 1 table = lambdaTableTbl, lambdaTableMap, "Target Lambda Table", 1
#else
table = afrTableTbl, afrTableMap, "Target AFR Table", 1
#endif
; constant, variable ; constant, variable
xBins = lambdaRpmBins, RPMValue xBins = lambdaRpmBins, RPMValue
yBins = lambdaLoadBins, afrTableYAxis yBins = lambdaLoadBins, afrTableYAxis
@ -2399,9 +2424,13 @@ gaugeCategory = Knock
[WueAnalyze] [WueAnalyze]
; wueCurveName, afrTempCompensationCurve, lambdaTargetTableName, lambdaChannel, coolantTempChannel, egoCorrectionChannel, wueChannel, activeCondition ; wueCurveName, afrTempCompensationCurve, lambdaTargetTableName, lambdaChannel, coolantTempChannel, egoCorrectionChannel, wueChannel, activeCondition
#if LAMBDA
wueAnalyzeMap = wueAnalyzer_warmup_curve, wueAfrTargetOffsetCurve, lambdaTableTbl, lambdaValue, coolant, cltCorrection, egoCorrection wueAnalyzeMap = wueAnalyzer_warmup_curve, wueAfrTargetOffsetCurve, lambdaTableTbl, lambdaValue, coolant, cltCorrection, egoCorrection
lambdaTargetTables = lambdaTableTbl, afrTSCustom lambdaTargetTables = lambdaTableTbl, afrTSCustom
#else
wueAnalyzeMap = wueAnalyzer_warmup_curve, wueAfrTargetOffsetCurve, afrTableTbl, AFRValue, coolant, cltCorrection, egoCorrection
lambdaTargetTables = afrTableTbl, afrTSCustom
#endif
wuePercentOffset = 0 ; for working with 0 based enrichment set to 100 wuePercentOffset = 0 ; for working with 0 based enrichment set to 100
option = disableLiveUpdates option = disableLiveUpdates
@ -2432,7 +2461,11 @@ gaugeCategory = Knock
gauge2 = CLTGauge gauge2 = CLTGauge
gauge3 = TPSGauge gauge3 = TPSGauge
gauge4 = MAPGauge gauge4 = MAPGauge
#if LAMBDA
gauge5 = lambda1Gauge gauge5 = lambda1Gauge
#else
gauge5 = afr1Gauge
#endif
gauge6 = VBattGauge gauge6 = VBattGauge
gauge7 = dwellGauge gauge7 = dwellGauge
gauge8 = ignadvGauge gauge8 = ignadvGauge
@ -2659,7 +2692,11 @@ menuDialog = main
subMenu = std_separator subMenu = std_separator
# Fuel model # Fuel model
#if LAMBDA
subMenu = lambdaTableTbl, "Target lambda", 0, {isInjectionEnabled == 1} subMenu = lambdaTableTbl, "Target lambda", 0, {isInjectionEnabled == 1}
#else
subMenu = afrTableTbl, "Target AFR", 0, {isInjectionEnabled == 1}
#endif
subMenu = cltFuelCorrCurve, "CLT multiplier", 0, {isInjectionEnabled == 1} subMenu = cltFuelCorrCurve, "CLT multiplier", 0, {isInjectionEnabled == 1}
subMenu = iatFuelCorrCurve, "IAT multiplier", 0, {isInjectionEnabled == 1} subMenu = iatFuelCorrCurve, "IAT multiplier", 0, {isInjectionEnabled == 1}
subMenu = fuelClosedLoopDialog, "Closed loop fuel correction", 0, {isInjectionEnabled == 1} subMenu = fuelClosedLoopDialog, "Closed loop fuel correction", 0, {isInjectionEnabled == 1}
@ -4704,3 +4741,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
[Tools] [Tools]
;addTool = toolName, PanelName ;addTool = toolName, PanelName
addTool = veTableGenerator, "VE Table Generator", veTableTbl addTool = veTableGenerator, "VE Table Generator", veTableTbl
#if LAMBDA
#else
addTool = afrTableGenerator, "AFR Table Generator", afrTableTbl
#endif

View File

@ -33,12 +33,12 @@ enable2ndByteCanID = false
[MegaTune] [MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
signature = "rusEFI 2020.11.05.prometheus_405.1699796132" signature = "rusEFI 2020.11.05.prometheus_405.3932105590"
[TunerStudio] [TunerStudio]
queryCommand = "S" queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar. versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI 2020.11.05.prometheus_405.1699796132" ; signature is expected to be 7 or more characters. signature = "rusEFI 2020.11.05.prometheus_405.3932105590" ; signature is expected to be 7 or more characters.
[Constants] [Constants]
; new packet serial format with CRC ; new packet serial format with CRC
@ -74,7 +74,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 rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 05 13:06:12 UTC 2020 ; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 05 20:36:39 UTC 2020
pageSize = 20000 pageSize = 20000
page = 1 page = 1
@ -1235,7 +1235,11 @@ page = 1
veTable = array, F32, 17440, [16x16],"%", 1.0, 0, 0, 999.0, 2 veTable = array, F32, 17440, [16x16],"%", 1.0, 0, 0, 999.0, 2
veLoadBins = array, F32, 18464, [16], "kPa", 1.0, 0.0, 0, 400.0, 2 veLoadBins = array, F32, 18464, [16], "kPa", 1.0, 0.0, 0, 400.0, 2
veRpmBins = array, F32, 18528, [16], "RPM", 1.0, 0.0, 0, 18000.0, 2 veRpmBins = array, F32, 18528, [16], "RPM", 1.0, 0.0, 0, 18000.0, 2
#if LAMBDA
lambdaTable = array, U08, 18592, [16x16],"deg", 0.006802721088435374, 0, 0.6, 1.5, 2 lambdaTable = array, U08, 18592, [16x16],"deg", 0.006802721088435374, 0, 0.6, 1.5, 2
#else
lambdaTable = array, U08, 18592, [16x16],"deg", 0.1, 0, 0, 25.0, 1
#endif
lambdaLoadBins = array, F32, 18848, [16], "", 1.0, 0.0, 0, 500.0, 2 lambdaLoadBins = array, F32, 18848, [16], "", 1.0, 0.0, 0, 500.0, 2
lambdaRpmBins = array, F32, 18912, [16], "RPM", 1.0, 0.0, 0, 18000.0, 2 lambdaRpmBins = array, F32, 18912, [16], "RPM", 1.0, 0.0, 0, 18000.0, 2
tpsTpsAccelTable = array, F32, 18976, [8x8],"value", 1.0, 0, 0.0, 30000.0, 2 tpsTpsAccelTable = array, F32, 18976, [8x8],"value", 1.0, 0, 0.0, 30000.0, 2
@ -1457,7 +1461,11 @@ page = 1
pageButtons = "&EGO" pageButtons = "&EGO"
gauge1 = RPMGauge gauge1 = RPMGauge
#if LAMBDA
gauge2 = lambda1Gauge gauge2 = lambda1Gauge
#else
gauge2 = afr1Gauge
#endif
gauge3 = MAPGauge gauge3 = MAPGauge
gauge4 = veValueGauge gauge4 = veValueGauge
@ -1502,8 +1510,13 @@ page = 1
[VeAnalyze] [VeAnalyze]
; tableName, lambdaTargetTableName, lambdaChannel, egoCorrectionChannel, activeCondition ; tableName, lambdaTargetTableName, lambdaChannel, egoCorrectionChannel, activeCondition
#if LAMBDA
veAnalyzeMap = veTableTbl, lambdaTableTbl, lambdaValue, egoCorrection, { 1 } veAnalyzeMap = veTableTbl, lambdaTableTbl, lambdaValue, egoCorrection, { 1 }
lambdaTargetTables = lambdaTableTbl, afrTSCustom lambdaTargetTables = lambdaTableTbl, afrTSCustom
#else
veAnalyzeMap = veTableTbl, afrTableTbl, AFRValue, egoCorrection, { 1 }
lambdaTargetTables = afrTableTbl, afrTSCustom
#endif
; filter = Name, "DisplayName", outputChannel, operator, defaultVal, userAdjustable ; filter = Name, "DisplayName", outputChannel, operator, defaultVal, userAdjustable
filter = minRPMFilter, "Minimum RPM", RPMValue, < , 500, , true filter = minRPMFilter, "Minimum RPM", RPMValue, < , 500, , true
@ -1898,7 +1911,11 @@ page = 1
yAxis = 0, 28, 10 yAxis = 0, 28, 10
xBins = narrowToWideOxygenBins xBins = narrowToWideOxygenBins
yBins = narrowToWideOxygen yBins = narrowToWideOxygen
#if LAMBDA
gauge = lambda1Gauge gauge = lambda1Gauge
#else
gauge = afr1Gauge
#endif
curve = fsioCurve1, "FSIO Curve #1" curve = fsioCurve1, "FSIO Curve #1"
columnLabel = "X", "Y" columnLabel = "X", "Y"
@ -2076,7 +2093,11 @@ page = 1
yAxis = 0, 250, 10 yAxis = 0, 250, 10
xBins = idleVeBins, RPMValue xBins = idleVeBins, RPMValue
yBins = idleVe yBins = idleVe
#if LAMBDA
gauge = lambda1Gauge gauge = lambda1Gauge
#else
gauge = afr1Gauge
#endif
curve = crankingAdvanceCurve, "Cranking Advance Angle" curve = crankingAdvanceCurve, "Cranking Advance Angle"
columnLabel = "RPM", "degrees" columnLabel = "RPM", "degrees"
@ -2205,7 +2226,11 @@ page = 1
upDownLabel = "(Later)", "(Sooner)" upDownLabel = "(Later)", "(Sooner)"
#if LAMBDA
table = lambdaTableTbl, lambdaTableMap, "Target Lambda Table", 1 table = lambdaTableTbl, lambdaTableMap, "Target Lambda Table", 1
#else
table = afrTableTbl, afrTableMap, "Target AFR Table", 1
#endif
; constant, variable ; constant, variable
xBins = lambdaRpmBins, RPMValue xBins = lambdaRpmBins, RPMValue
yBins = lambdaLoadBins, afrTableYAxis yBins = lambdaLoadBins, afrTableYAxis
@ -2399,9 +2424,13 @@ gaugeCategory = Knock
[WueAnalyze] [WueAnalyze]
; wueCurveName, afrTempCompensationCurve, lambdaTargetTableName, lambdaChannel, coolantTempChannel, egoCorrectionChannel, wueChannel, activeCondition ; wueCurveName, afrTempCompensationCurve, lambdaTargetTableName, lambdaChannel, coolantTempChannel, egoCorrectionChannel, wueChannel, activeCondition
#if LAMBDA
wueAnalyzeMap = wueAnalyzer_warmup_curve, wueAfrTargetOffsetCurve, lambdaTableTbl, lambdaValue, coolant, cltCorrection, egoCorrection wueAnalyzeMap = wueAnalyzer_warmup_curve, wueAfrTargetOffsetCurve, lambdaTableTbl, lambdaValue, coolant, cltCorrection, egoCorrection
lambdaTargetTables = lambdaTableTbl, afrTSCustom lambdaTargetTables = lambdaTableTbl, afrTSCustom
#else
wueAnalyzeMap = wueAnalyzer_warmup_curve, wueAfrTargetOffsetCurve, afrTableTbl, AFRValue, coolant, cltCorrection, egoCorrection
lambdaTargetTables = afrTableTbl, afrTSCustom
#endif
wuePercentOffset = 0 ; for working with 0 based enrichment set to 100 wuePercentOffset = 0 ; for working with 0 based enrichment set to 100
option = disableLiveUpdates option = disableLiveUpdates
@ -2432,7 +2461,11 @@ gaugeCategory = Knock
gauge2 = CLTGauge gauge2 = CLTGauge
gauge3 = TPSGauge gauge3 = TPSGauge
gauge4 = MAPGauge gauge4 = MAPGauge
#if LAMBDA
gauge5 = lambda1Gauge gauge5 = lambda1Gauge
#else
gauge5 = afr1Gauge
#endif
gauge6 = VBattGauge gauge6 = VBattGauge
gauge7 = dwellGauge gauge7 = dwellGauge
gauge8 = ignadvGauge gauge8 = ignadvGauge
@ -2659,7 +2692,11 @@ menuDialog = main
subMenu = std_separator subMenu = std_separator
# Fuel model # Fuel model
#if LAMBDA
subMenu = lambdaTableTbl, "Target lambda", 0, {isInjectionEnabled == 1} subMenu = lambdaTableTbl, "Target lambda", 0, {isInjectionEnabled == 1}
#else
subMenu = afrTableTbl, "Target AFR", 0, {isInjectionEnabled == 1}
#endif
subMenu = cltFuelCorrCurve, "CLT multiplier", 0, {isInjectionEnabled == 1} subMenu = cltFuelCorrCurve, "CLT multiplier", 0, {isInjectionEnabled == 1}
subMenu = iatFuelCorrCurve, "IAT multiplier", 0, {isInjectionEnabled == 1} subMenu = iatFuelCorrCurve, "IAT multiplier", 0, {isInjectionEnabled == 1}
subMenu = fuelClosedLoopDialog, "Closed loop fuel correction", 0, {isInjectionEnabled == 1} subMenu = fuelClosedLoopDialog, "Closed loop fuel correction", 0, {isInjectionEnabled == 1}
@ -4732,3 +4769,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
[Tools] [Tools]
;addTool = toolName, PanelName ;addTool = toolName, PanelName
addTool = veTableGenerator, "VE Table Generator", veTableTbl addTool = veTableGenerator, "VE Table Generator", veTableTbl
#if LAMBDA
#else
addTool = afrTableGenerator, "AFR Table Generator", afrTableTbl
#endif

View File

@ -33,12 +33,12 @@ enable2ndByteCanID = false
[MegaTune] [MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
signature = "rusEFI 2020.11.05.prometheus_469.1699796132" signature = "rusEFI 2020.11.05.prometheus_469.3932105590"
[TunerStudio] [TunerStudio]
queryCommand = "S" queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar. versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI 2020.11.05.prometheus_469.1699796132" ; signature is expected to be 7 or more characters. signature = "rusEFI 2020.11.05.prometheus_469.3932105590" ; signature is expected to be 7 or more characters.
[Constants] [Constants]
; new packet serial format with CRC ; new packet serial format with CRC
@ -74,7 +74,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 rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 05 13:06:10 UTC 2020 ; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 05 20:36:38 UTC 2020
pageSize = 20000 pageSize = 20000
page = 1 page = 1
@ -1235,7 +1235,11 @@ page = 1
veTable = array, F32, 17440, [16x16],"%", 1.0, 0, 0, 999.0, 2 veTable = array, F32, 17440, [16x16],"%", 1.0, 0, 0, 999.0, 2
veLoadBins = array, F32, 18464, [16], "kPa", 1.0, 0.0, 0, 400.0, 2 veLoadBins = array, F32, 18464, [16], "kPa", 1.0, 0.0, 0, 400.0, 2
veRpmBins = array, F32, 18528, [16], "RPM", 1.0, 0.0, 0, 18000.0, 2 veRpmBins = array, F32, 18528, [16], "RPM", 1.0, 0.0, 0, 18000.0, 2
#if LAMBDA
lambdaTable = array, U08, 18592, [16x16],"deg", 0.006802721088435374, 0, 0.6, 1.5, 2 lambdaTable = array, U08, 18592, [16x16],"deg", 0.006802721088435374, 0, 0.6, 1.5, 2
#else
lambdaTable = array, U08, 18592, [16x16],"deg", 0.1, 0, 0, 25.0, 1
#endif
lambdaLoadBins = array, F32, 18848, [16], "", 1.0, 0.0, 0, 500.0, 2 lambdaLoadBins = array, F32, 18848, [16], "", 1.0, 0.0, 0, 500.0, 2
lambdaRpmBins = array, F32, 18912, [16], "RPM", 1.0, 0.0, 0, 18000.0, 2 lambdaRpmBins = array, F32, 18912, [16], "RPM", 1.0, 0.0, 0, 18000.0, 2
tpsTpsAccelTable = array, F32, 18976, [8x8],"value", 1.0, 0, 0.0, 30000.0, 2 tpsTpsAccelTable = array, F32, 18976, [8x8],"value", 1.0, 0, 0.0, 30000.0, 2
@ -1457,7 +1461,11 @@ page = 1
pageButtons = "&EGO" pageButtons = "&EGO"
gauge1 = RPMGauge gauge1 = RPMGauge
#if LAMBDA
gauge2 = lambda1Gauge gauge2 = lambda1Gauge
#else
gauge2 = afr1Gauge
#endif
gauge3 = MAPGauge gauge3 = MAPGauge
gauge4 = veValueGauge gauge4 = veValueGauge
@ -1502,8 +1510,13 @@ page = 1
[VeAnalyze] [VeAnalyze]
; tableName, lambdaTargetTableName, lambdaChannel, egoCorrectionChannel, activeCondition ; tableName, lambdaTargetTableName, lambdaChannel, egoCorrectionChannel, activeCondition
#if LAMBDA
veAnalyzeMap = veTableTbl, lambdaTableTbl, lambdaValue, egoCorrection, { 1 } veAnalyzeMap = veTableTbl, lambdaTableTbl, lambdaValue, egoCorrection, { 1 }
lambdaTargetTables = lambdaTableTbl, afrTSCustom lambdaTargetTables = lambdaTableTbl, afrTSCustom
#else
veAnalyzeMap = veTableTbl, afrTableTbl, AFRValue, egoCorrection, { 1 }
lambdaTargetTables = afrTableTbl, afrTSCustom
#endif
; filter = Name, "DisplayName", outputChannel, operator, defaultVal, userAdjustable ; filter = Name, "DisplayName", outputChannel, operator, defaultVal, userAdjustable
filter = minRPMFilter, "Minimum RPM", RPMValue, < , 500, , true filter = minRPMFilter, "Minimum RPM", RPMValue, < , 500, , true
@ -1898,7 +1911,11 @@ page = 1
yAxis = 0, 28, 10 yAxis = 0, 28, 10
xBins = narrowToWideOxygenBins xBins = narrowToWideOxygenBins
yBins = narrowToWideOxygen yBins = narrowToWideOxygen
#if LAMBDA
gauge = lambda1Gauge gauge = lambda1Gauge
#else
gauge = afr1Gauge
#endif
curve = fsioCurve1, "FSIO Curve #1" curve = fsioCurve1, "FSIO Curve #1"
columnLabel = "X", "Y" columnLabel = "X", "Y"
@ -2076,7 +2093,11 @@ page = 1
yAxis = 0, 250, 10 yAxis = 0, 250, 10
xBins = idleVeBins, RPMValue xBins = idleVeBins, RPMValue
yBins = idleVe yBins = idleVe
#if LAMBDA
gauge = lambda1Gauge gauge = lambda1Gauge
#else
gauge = afr1Gauge
#endif
curve = crankingAdvanceCurve, "Cranking Advance Angle" curve = crankingAdvanceCurve, "Cranking Advance Angle"
columnLabel = "RPM", "degrees" columnLabel = "RPM", "degrees"
@ -2205,7 +2226,11 @@ page = 1
upDownLabel = "(Later)", "(Sooner)" upDownLabel = "(Later)", "(Sooner)"
#if LAMBDA
table = lambdaTableTbl, lambdaTableMap, "Target Lambda Table", 1 table = lambdaTableTbl, lambdaTableMap, "Target Lambda Table", 1
#else
table = afrTableTbl, afrTableMap, "Target AFR Table", 1
#endif
; constant, variable ; constant, variable
xBins = lambdaRpmBins, RPMValue xBins = lambdaRpmBins, RPMValue
yBins = lambdaLoadBins, afrTableYAxis yBins = lambdaLoadBins, afrTableYAxis
@ -2399,9 +2424,13 @@ gaugeCategory = Knock
[WueAnalyze] [WueAnalyze]
; wueCurveName, afrTempCompensationCurve, lambdaTargetTableName, lambdaChannel, coolantTempChannel, egoCorrectionChannel, wueChannel, activeCondition ; wueCurveName, afrTempCompensationCurve, lambdaTargetTableName, lambdaChannel, coolantTempChannel, egoCorrectionChannel, wueChannel, activeCondition
#if LAMBDA
wueAnalyzeMap = wueAnalyzer_warmup_curve, wueAfrTargetOffsetCurve, lambdaTableTbl, lambdaValue, coolant, cltCorrection, egoCorrection wueAnalyzeMap = wueAnalyzer_warmup_curve, wueAfrTargetOffsetCurve, lambdaTableTbl, lambdaValue, coolant, cltCorrection, egoCorrection
lambdaTargetTables = lambdaTableTbl, afrTSCustom lambdaTargetTables = lambdaTableTbl, afrTSCustom
#else
wueAnalyzeMap = wueAnalyzer_warmup_curve, wueAfrTargetOffsetCurve, afrTableTbl, AFRValue, coolant, cltCorrection, egoCorrection
lambdaTargetTables = afrTableTbl, afrTSCustom
#endif
wuePercentOffset = 0 ; for working with 0 based enrichment set to 100 wuePercentOffset = 0 ; for working with 0 based enrichment set to 100
option = disableLiveUpdates option = disableLiveUpdates
@ -2432,7 +2461,11 @@ gaugeCategory = Knock
gauge2 = CLTGauge gauge2 = CLTGauge
gauge3 = TPSGauge gauge3 = TPSGauge
gauge4 = MAPGauge gauge4 = MAPGauge
#if LAMBDA
gauge5 = lambda1Gauge gauge5 = lambda1Gauge
#else
gauge5 = afr1Gauge
#endif
gauge6 = VBattGauge gauge6 = VBattGauge
gauge7 = dwellGauge gauge7 = dwellGauge
gauge8 = ignadvGauge gauge8 = ignadvGauge
@ -2659,7 +2692,11 @@ menuDialog = main
subMenu = std_separator subMenu = std_separator
# Fuel model # Fuel model
#if LAMBDA
subMenu = lambdaTableTbl, "Target lambda", 0, {isInjectionEnabled == 1} subMenu = lambdaTableTbl, "Target lambda", 0, {isInjectionEnabled == 1}
#else
subMenu = afrTableTbl, "Target AFR", 0, {isInjectionEnabled == 1}
#endif
subMenu = cltFuelCorrCurve, "CLT multiplier", 0, {isInjectionEnabled == 1} subMenu = cltFuelCorrCurve, "CLT multiplier", 0, {isInjectionEnabled == 1}
subMenu = iatFuelCorrCurve, "IAT multiplier", 0, {isInjectionEnabled == 1} subMenu = iatFuelCorrCurve, "IAT multiplier", 0, {isInjectionEnabled == 1}
subMenu = fuelClosedLoopDialog, "Closed loop fuel correction", 0, {isInjectionEnabled == 1} subMenu = fuelClosedLoopDialog, "Closed loop fuel correction", 0, {isInjectionEnabled == 1}
@ -4732,3 +4769,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
[Tools] [Tools]
;addTool = toolName, PanelName ;addTool = toolName, PanelName
addTool = veTableGenerator, "VE Table Generator", veTableTbl addTool = veTableGenerator, "VE Table Generator", veTableTbl
#if LAMBDA
#else
addTool = afrTableGenerator, "AFR Table Generator", afrTableTbl
#endif

View File

@ -33,12 +33,12 @@ enable2ndByteCanID = false
[MegaTune] [MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
signature = "rusEFI 2020.11.05.proteus_f4.3995244587" signature = "rusEFI 2020.11.05.proteus_f4.1630365689"
[TunerStudio] [TunerStudio]
queryCommand = "S" queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar. versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI 2020.11.05.proteus_f4.3995244587" ; signature is expected to be 7 or more characters. signature = "rusEFI 2020.11.05.proteus_f4.1630365689" ; signature is expected to be 7 or more characters.
[Constants] [Constants]
; new packet serial format with CRC ; new packet serial format with CRC
@ -74,7 +74,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 rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 05 13:06:15 UTC 2020 ; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 05 20:36:42 UTC 2020
pageSize = 20000 pageSize = 20000
page = 1 page = 1
@ -1235,7 +1235,11 @@ page = 1
veTable = array, F32, 17440, [16x16],"%", 1.0, 0, 0, 999.0, 2 veTable = array, F32, 17440, [16x16],"%", 1.0, 0, 0, 999.0, 2
veLoadBins = array, F32, 18464, [16], "kPa", 1.0, 0.0, 0, 400.0, 2 veLoadBins = array, F32, 18464, [16], "kPa", 1.0, 0.0, 0, 400.0, 2
veRpmBins = array, F32, 18528, [16], "RPM", 1.0, 0.0, 0, 18000.0, 2 veRpmBins = array, F32, 18528, [16], "RPM", 1.0, 0.0, 0, 18000.0, 2
#if LAMBDA
lambdaTable = array, U08, 18592, [16x16],"deg", 0.006802721088435374, 0, 0.6, 1.5, 2 lambdaTable = array, U08, 18592, [16x16],"deg", 0.006802721088435374, 0, 0.6, 1.5, 2
#else
lambdaTable = array, U08, 18592, [16x16],"deg", 0.1, 0, 0, 25.0, 1
#endif
lambdaLoadBins = array, F32, 18848, [16], "", 1.0, 0.0, 0, 500.0, 2 lambdaLoadBins = array, F32, 18848, [16], "", 1.0, 0.0, 0, 500.0, 2
lambdaRpmBins = array, F32, 18912, [16], "RPM", 1.0, 0.0, 0, 18000.0, 2 lambdaRpmBins = array, F32, 18912, [16], "RPM", 1.0, 0.0, 0, 18000.0, 2
tpsTpsAccelTable = array, F32, 18976, [8x8],"value", 1.0, 0, 0.0, 30000.0, 2 tpsTpsAccelTable = array, F32, 18976, [8x8],"value", 1.0, 0, 0.0, 30000.0, 2
@ -1457,7 +1461,11 @@ page = 1
pageButtons = "&EGO" pageButtons = "&EGO"
gauge1 = RPMGauge gauge1 = RPMGauge
#if LAMBDA
gauge2 = lambda1Gauge gauge2 = lambda1Gauge
#else
gauge2 = afr1Gauge
#endif
gauge3 = MAPGauge gauge3 = MAPGauge
gauge4 = veValueGauge gauge4 = veValueGauge
@ -1502,8 +1510,13 @@ page = 1
[VeAnalyze] [VeAnalyze]
; tableName, lambdaTargetTableName, lambdaChannel, egoCorrectionChannel, activeCondition ; tableName, lambdaTargetTableName, lambdaChannel, egoCorrectionChannel, activeCondition
#if LAMBDA
veAnalyzeMap = veTableTbl, lambdaTableTbl, lambdaValue, egoCorrection, { 1 } veAnalyzeMap = veTableTbl, lambdaTableTbl, lambdaValue, egoCorrection, { 1 }
lambdaTargetTables = lambdaTableTbl, afrTSCustom lambdaTargetTables = lambdaTableTbl, afrTSCustom
#else
veAnalyzeMap = veTableTbl, afrTableTbl, AFRValue, egoCorrection, { 1 }
lambdaTargetTables = afrTableTbl, afrTSCustom
#endif
; filter = Name, "DisplayName", outputChannel, operator, defaultVal, userAdjustable ; filter = Name, "DisplayName", outputChannel, operator, defaultVal, userAdjustable
filter = minRPMFilter, "Minimum RPM", RPMValue, < , 500, , true filter = minRPMFilter, "Minimum RPM", RPMValue, < , 500, , true
@ -1898,7 +1911,11 @@ page = 1
yAxis = 0, 28, 10 yAxis = 0, 28, 10
xBins = narrowToWideOxygenBins xBins = narrowToWideOxygenBins
yBins = narrowToWideOxygen yBins = narrowToWideOxygen
#if LAMBDA
gauge = lambda1Gauge gauge = lambda1Gauge
#else
gauge = afr1Gauge
#endif
curve = fsioCurve1, "FSIO Curve #1" curve = fsioCurve1, "FSIO Curve #1"
columnLabel = "X", "Y" columnLabel = "X", "Y"
@ -2076,7 +2093,11 @@ page = 1
yAxis = 0, 250, 10 yAxis = 0, 250, 10
xBins = idleVeBins, RPMValue xBins = idleVeBins, RPMValue
yBins = idleVe yBins = idleVe
#if LAMBDA
gauge = lambda1Gauge gauge = lambda1Gauge
#else
gauge = afr1Gauge
#endif
curve = crankingAdvanceCurve, "Cranking Advance Angle" curve = crankingAdvanceCurve, "Cranking Advance Angle"
columnLabel = "RPM", "degrees" columnLabel = "RPM", "degrees"
@ -2205,7 +2226,11 @@ page = 1
upDownLabel = "(Later)", "(Sooner)" upDownLabel = "(Later)", "(Sooner)"
#if LAMBDA
table = lambdaTableTbl, lambdaTableMap, "Target Lambda Table", 1 table = lambdaTableTbl, lambdaTableMap, "Target Lambda Table", 1
#else
table = afrTableTbl, afrTableMap, "Target AFR Table", 1
#endif
; constant, variable ; constant, variable
xBins = lambdaRpmBins, RPMValue xBins = lambdaRpmBins, RPMValue
yBins = lambdaLoadBins, afrTableYAxis yBins = lambdaLoadBins, afrTableYAxis
@ -2399,9 +2424,13 @@ gaugeCategory = Knock
[WueAnalyze] [WueAnalyze]
; wueCurveName, afrTempCompensationCurve, lambdaTargetTableName, lambdaChannel, coolantTempChannel, egoCorrectionChannel, wueChannel, activeCondition ; wueCurveName, afrTempCompensationCurve, lambdaTargetTableName, lambdaChannel, coolantTempChannel, egoCorrectionChannel, wueChannel, activeCondition
#if LAMBDA
wueAnalyzeMap = wueAnalyzer_warmup_curve, wueAfrTargetOffsetCurve, lambdaTableTbl, lambdaValue, coolant, cltCorrection, egoCorrection wueAnalyzeMap = wueAnalyzer_warmup_curve, wueAfrTargetOffsetCurve, lambdaTableTbl, lambdaValue, coolant, cltCorrection, egoCorrection
lambdaTargetTables = lambdaTableTbl, afrTSCustom lambdaTargetTables = lambdaTableTbl, afrTSCustom
#else
wueAnalyzeMap = wueAnalyzer_warmup_curve, wueAfrTargetOffsetCurve, afrTableTbl, AFRValue, coolant, cltCorrection, egoCorrection
lambdaTargetTables = afrTableTbl, afrTSCustom
#endif
wuePercentOffset = 0 ; for working with 0 based enrichment set to 100 wuePercentOffset = 0 ; for working with 0 based enrichment set to 100
option = disableLiveUpdates option = disableLiveUpdates
@ -2432,7 +2461,11 @@ gaugeCategory = Knock
gauge2 = CLTGauge gauge2 = CLTGauge
gauge3 = TPSGauge gauge3 = TPSGauge
gauge4 = MAPGauge gauge4 = MAPGauge
#if LAMBDA
gauge5 = lambda1Gauge gauge5 = lambda1Gauge
#else
gauge5 = afr1Gauge
#endif
gauge6 = VBattGauge gauge6 = VBattGauge
gauge7 = dwellGauge gauge7 = dwellGauge
gauge8 = ignadvGauge gauge8 = ignadvGauge
@ -2659,7 +2692,11 @@ menuDialog = main
subMenu = std_separator subMenu = std_separator
# Fuel model # Fuel model
#if LAMBDA
subMenu = lambdaTableTbl, "Target lambda", 0, {isInjectionEnabled == 1} subMenu = lambdaTableTbl, "Target lambda", 0, {isInjectionEnabled == 1}
#else
subMenu = afrTableTbl, "Target AFR", 0, {isInjectionEnabled == 1}
#endif
subMenu = cltFuelCorrCurve, "CLT multiplier", 0, {isInjectionEnabled == 1} subMenu = cltFuelCorrCurve, "CLT multiplier", 0, {isInjectionEnabled == 1}
subMenu = iatFuelCorrCurve, "IAT multiplier", 0, {isInjectionEnabled == 1} subMenu = iatFuelCorrCurve, "IAT multiplier", 0, {isInjectionEnabled == 1}
subMenu = fuelClosedLoopDialog, "Closed loop fuel correction", 0, {isInjectionEnabled == 1} subMenu = fuelClosedLoopDialog, "Closed loop fuel correction", 0, {isInjectionEnabled == 1}
@ -4693,3 +4730,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
[Tools] [Tools]
;addTool = toolName, PanelName ;addTool = toolName, PanelName
addTool = veTableGenerator, "VE Table Generator", veTableTbl addTool = veTableGenerator, "VE Table Generator", veTableTbl
#if LAMBDA
#else
addTool = afrTableGenerator, "AFR Table Generator", afrTableTbl
#endif

View File

@ -33,12 +33,12 @@ enable2ndByteCanID = false
[MegaTune] [MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
signature = "rusEFI 2020.11.05.proteus_f7.3995244587" signature = "rusEFI 2020.11.05.proteus_f7.1630365689"
[TunerStudio] [TunerStudio]
queryCommand = "S" queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar. versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI 2020.11.05.proteus_f7.3995244587" ; signature is expected to be 7 or more characters. signature = "rusEFI 2020.11.05.proteus_f7.1630365689" ; signature is expected to be 7 or more characters.
[Constants] [Constants]
; new packet serial format with CRC ; new packet serial format with CRC
@ -74,7 +74,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 rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 05 13:06:13 UTC 2020 ; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 05 20:36:41 UTC 2020
pageSize = 20000 pageSize = 20000
page = 1 page = 1
@ -1235,7 +1235,11 @@ page = 1
veTable = array, F32, 17440, [16x16],"%", 1.0, 0, 0, 999.0, 2 veTable = array, F32, 17440, [16x16],"%", 1.0, 0, 0, 999.0, 2
veLoadBins = array, F32, 18464, [16], "kPa", 1.0, 0.0, 0, 400.0, 2 veLoadBins = array, F32, 18464, [16], "kPa", 1.0, 0.0, 0, 400.0, 2
veRpmBins = array, F32, 18528, [16], "RPM", 1.0, 0.0, 0, 18000.0, 2 veRpmBins = array, F32, 18528, [16], "RPM", 1.0, 0.0, 0, 18000.0, 2
#if LAMBDA
lambdaTable = array, U08, 18592, [16x16],"deg", 0.006802721088435374, 0, 0.6, 1.5, 2 lambdaTable = array, U08, 18592, [16x16],"deg", 0.006802721088435374, 0, 0.6, 1.5, 2
#else
lambdaTable = array, U08, 18592, [16x16],"deg", 0.1, 0, 0, 25.0, 1
#endif
lambdaLoadBins = array, F32, 18848, [16], "", 1.0, 0.0, 0, 500.0, 2 lambdaLoadBins = array, F32, 18848, [16], "", 1.0, 0.0, 0, 500.0, 2
lambdaRpmBins = array, F32, 18912, [16], "RPM", 1.0, 0.0, 0, 18000.0, 2 lambdaRpmBins = array, F32, 18912, [16], "RPM", 1.0, 0.0, 0, 18000.0, 2
tpsTpsAccelTable = array, F32, 18976, [8x8],"value", 1.0, 0, 0.0, 30000.0, 2 tpsTpsAccelTable = array, F32, 18976, [8x8],"value", 1.0, 0, 0.0, 30000.0, 2
@ -1457,7 +1461,11 @@ page = 1
pageButtons = "&EGO" pageButtons = "&EGO"
gauge1 = RPMGauge gauge1 = RPMGauge
#if LAMBDA
gauge2 = lambda1Gauge gauge2 = lambda1Gauge
#else
gauge2 = afr1Gauge
#endif
gauge3 = MAPGauge gauge3 = MAPGauge
gauge4 = veValueGauge gauge4 = veValueGauge
@ -1502,8 +1510,13 @@ page = 1
[VeAnalyze] [VeAnalyze]
; tableName, lambdaTargetTableName, lambdaChannel, egoCorrectionChannel, activeCondition ; tableName, lambdaTargetTableName, lambdaChannel, egoCorrectionChannel, activeCondition
#if LAMBDA
veAnalyzeMap = veTableTbl, lambdaTableTbl, lambdaValue, egoCorrection, { 1 } veAnalyzeMap = veTableTbl, lambdaTableTbl, lambdaValue, egoCorrection, { 1 }
lambdaTargetTables = lambdaTableTbl, afrTSCustom lambdaTargetTables = lambdaTableTbl, afrTSCustom
#else
veAnalyzeMap = veTableTbl, afrTableTbl, AFRValue, egoCorrection, { 1 }
lambdaTargetTables = afrTableTbl, afrTSCustom
#endif
; filter = Name, "DisplayName", outputChannel, operator, defaultVal, userAdjustable ; filter = Name, "DisplayName", outputChannel, operator, defaultVal, userAdjustable
filter = minRPMFilter, "Minimum RPM", RPMValue, < , 500, , true filter = minRPMFilter, "Minimum RPM", RPMValue, < , 500, , true
@ -1898,7 +1911,11 @@ page = 1
yAxis = 0, 28, 10 yAxis = 0, 28, 10
xBins = narrowToWideOxygenBins xBins = narrowToWideOxygenBins
yBins = narrowToWideOxygen yBins = narrowToWideOxygen
#if LAMBDA
gauge = lambda1Gauge gauge = lambda1Gauge
#else
gauge = afr1Gauge
#endif
curve = fsioCurve1, "FSIO Curve #1" curve = fsioCurve1, "FSIO Curve #1"
columnLabel = "X", "Y" columnLabel = "X", "Y"
@ -2076,7 +2093,11 @@ page = 1
yAxis = 0, 250, 10 yAxis = 0, 250, 10
xBins = idleVeBins, RPMValue xBins = idleVeBins, RPMValue
yBins = idleVe yBins = idleVe
#if LAMBDA
gauge = lambda1Gauge gauge = lambda1Gauge
#else
gauge = afr1Gauge
#endif
curve = crankingAdvanceCurve, "Cranking Advance Angle" curve = crankingAdvanceCurve, "Cranking Advance Angle"
columnLabel = "RPM", "degrees" columnLabel = "RPM", "degrees"
@ -2205,7 +2226,11 @@ page = 1
upDownLabel = "(Later)", "(Sooner)" upDownLabel = "(Later)", "(Sooner)"
#if LAMBDA
table = lambdaTableTbl, lambdaTableMap, "Target Lambda Table", 1 table = lambdaTableTbl, lambdaTableMap, "Target Lambda Table", 1
#else
table = afrTableTbl, afrTableMap, "Target AFR Table", 1
#endif
; constant, variable ; constant, variable
xBins = lambdaRpmBins, RPMValue xBins = lambdaRpmBins, RPMValue
yBins = lambdaLoadBins, afrTableYAxis yBins = lambdaLoadBins, afrTableYAxis
@ -2399,9 +2424,13 @@ gaugeCategory = Knock
[WueAnalyze] [WueAnalyze]
; wueCurveName, afrTempCompensationCurve, lambdaTargetTableName, lambdaChannel, coolantTempChannel, egoCorrectionChannel, wueChannel, activeCondition ; wueCurveName, afrTempCompensationCurve, lambdaTargetTableName, lambdaChannel, coolantTempChannel, egoCorrectionChannel, wueChannel, activeCondition
#if LAMBDA
wueAnalyzeMap = wueAnalyzer_warmup_curve, wueAfrTargetOffsetCurve, lambdaTableTbl, lambdaValue, coolant, cltCorrection, egoCorrection wueAnalyzeMap = wueAnalyzer_warmup_curve, wueAfrTargetOffsetCurve, lambdaTableTbl, lambdaValue, coolant, cltCorrection, egoCorrection
lambdaTargetTables = lambdaTableTbl, afrTSCustom lambdaTargetTables = lambdaTableTbl, afrTSCustom
#else
wueAnalyzeMap = wueAnalyzer_warmup_curve, wueAfrTargetOffsetCurve, afrTableTbl, AFRValue, coolant, cltCorrection, egoCorrection
lambdaTargetTables = afrTableTbl, afrTSCustom
#endif
wuePercentOffset = 0 ; for working with 0 based enrichment set to 100 wuePercentOffset = 0 ; for working with 0 based enrichment set to 100
option = disableLiveUpdates option = disableLiveUpdates
@ -2432,7 +2461,11 @@ gaugeCategory = Knock
gauge2 = CLTGauge gauge2 = CLTGauge
gauge3 = TPSGauge gauge3 = TPSGauge
gauge4 = MAPGauge gauge4 = MAPGauge
#if LAMBDA
gauge5 = lambda1Gauge gauge5 = lambda1Gauge
#else
gauge5 = afr1Gauge
#endif
gauge6 = VBattGauge gauge6 = VBattGauge
gauge7 = dwellGauge gauge7 = dwellGauge
gauge8 = ignadvGauge gauge8 = ignadvGauge
@ -2659,7 +2692,11 @@ menuDialog = main
subMenu = std_separator subMenu = std_separator
# Fuel model # Fuel model
#if LAMBDA
subMenu = lambdaTableTbl, "Target lambda", 0, {isInjectionEnabled == 1} subMenu = lambdaTableTbl, "Target lambda", 0, {isInjectionEnabled == 1}
#else
subMenu = afrTableTbl, "Target AFR", 0, {isInjectionEnabled == 1}
#endif
subMenu = cltFuelCorrCurve, "CLT multiplier", 0, {isInjectionEnabled == 1} subMenu = cltFuelCorrCurve, "CLT multiplier", 0, {isInjectionEnabled == 1}
subMenu = iatFuelCorrCurve, "IAT multiplier", 0, {isInjectionEnabled == 1} subMenu = iatFuelCorrCurve, "IAT multiplier", 0, {isInjectionEnabled == 1}
subMenu = fuelClosedLoopDialog, "Closed loop fuel correction", 0, {isInjectionEnabled == 1} subMenu = fuelClosedLoopDialog, "Closed loop fuel correction", 0, {isInjectionEnabled == 1}
@ -4693,3 +4730,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
[Tools] [Tools]
;addTool = toolName, PanelName ;addTool = toolName, PanelName
addTool = veTableGenerator, "VE Table Generator", veTableTbl addTool = veTableGenerator, "VE Table Generator", veTableTbl
#if LAMBDA
#else
addTool = afrTableGenerator, "AFR Table Generator", afrTableTbl
#endif

View File

@ -1,6 +1,6 @@
package com.rusefi.config.generated; package com.rusefi.config.generated;
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 05 13:05:57 UTC 2020 // this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 05 20:36:25 UTC 2020
// by class com.rusefi.output.FileJavaFieldsConsumer // by class com.rusefi.output.FileJavaFieldsConsumer
import com.rusefi.config.*; import com.rusefi.config.*;
@ -1164,7 +1164,6 @@ public class Fields {
public static final int servoOutputPins8_offset = 3147; public static final int servoOutputPins8_offset = 3147;
public static final int showHumanReadableWarning_offset = 976; public static final int showHumanReadableWarning_offset = 976;
public static final int showSdCardWarning_offset = 76; public static final int showSdCardWarning_offset = 76;
public static final int SIGNATURE_HASH = 663278325;
public static final int silentTriggerError_offset = 1464; public static final int silentTriggerError_offset = 1464;
public static final int slowAdcAlpha_offset = 2088; public static final int slowAdcAlpha_offset = 2088;
public static final int sparkDwellRpmBins_offset = 332; public static final int sparkDwellRpmBins_offset = 332;
@ -1432,7 +1431,7 @@ public class Fields {
public static final char TS_SD_R_COMMAND = 'r'; public static final char TS_SD_R_COMMAND = 'r';
public static final char TS_SD_W_COMMAND = 'w'; public static final char TS_SD_W_COMMAND = 'w';
public static final char TS_SET_LOGGER_SWITCH = 'l'; public static final char TS_SET_LOGGER_SWITCH = 'l';
public static final String TS_SIGNATURE = "rusEFI 2020.11.05.all.663278325"; public static final String TS_SIGNATURE = "rusEFI 2020.11.05.all.2827431207";
public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final char TS_SINGLE_WRITE_COMMAND = 'W';
public static final int TT_TT_60_2_VW = 20; public static final int TT_TT_60_2_VW = 20;
public static final int TT_TT_ONE = 18; public static final int TT_TT_ONE = 18;

View File

@ -1,6 +1,6 @@
<roms> <roms>
<!-- was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh Thu Nov 05 13:05:58 UTC 2020 --> <!-- was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh Thu Nov 05 20:36:27 UTC 2020 -->
<rom> <rom>
<romid> <romid>