Auto-generated configs and docs

This commit is contained in:
GitHub build-firmware Action 2020-08-24 03:43:14 +00:00
parent 12bc5eb28b
commit 927d3354ff
19 changed files with 162 additions and 54 deletions

View File

@ -4,5 +4,5 @@
#define SIGNATURE_BOARD all #define SIGNATURE_BOARD all
#define SIGNATURE_DATE 2020.08.24 #define SIGNATURE_DATE 2020.08.24
#define SIGNATURE_HASH 1867104539 #define SIGNATURE_HASH 4044930334
#define TS_SIGNATURE "rusEFI 2020.08.24.all.1867104539" #define TS_SIGNATURE "rusEFI 2020.08.24.all.4044930334"

View File

@ -4,5 +4,5 @@
#define SIGNATURE_BOARD frankenso_na6 #define SIGNATURE_BOARD frankenso_na6
#define SIGNATURE_DATE 2020.08.24 #define SIGNATURE_DATE 2020.08.24
#define SIGNATURE_HASH 2817901586 #define SIGNATURE_HASH 967096343
#define TS_SIGNATURE "rusEFI 2020.08.24.frankenso_na6.2817901586" #define TS_SIGNATURE "rusEFI 2020.08.24.frankenso_na6.967096343"

View File

@ -4,5 +4,5 @@
#define SIGNATURE_BOARD kin #define SIGNATURE_BOARD kin
#define SIGNATURE_DATE 2020.08.24 #define SIGNATURE_DATE 2020.08.24
#define SIGNATURE_HASH 1084064955 #define SIGNATURE_HASH 3737974974
#define TS_SIGNATURE "rusEFI 2020.08.24.kin.1084064955" #define TS_SIGNATURE "rusEFI 2020.08.24.kin.3737974974"

View File

@ -4,5 +4,5 @@
#define SIGNATURE_BOARD mre_f4 #define SIGNATURE_BOARD mre_f4
#define SIGNATURE_DATE 2020.08.24 #define SIGNATURE_DATE 2020.08.24
#define SIGNATURE_HASH 2498188352 #define SIGNATURE_HASH 179710021
#define TS_SIGNATURE "rusEFI 2020.08.24.mre_f4.2498188352" #define TS_SIGNATURE "rusEFI 2020.08.24.mre_f4.179710021"

View File

@ -4,5 +4,5 @@
#define SIGNATURE_BOARD mre_f7 #define SIGNATURE_BOARD mre_f7
#define SIGNATURE_DATE 2020.08.24 #define SIGNATURE_DATE 2020.08.24
#define SIGNATURE_HASH 2498188352 #define SIGNATURE_HASH 179710021
#define TS_SIGNATURE "rusEFI 2020.08.24.mre_f7.2498188352" #define TS_SIGNATURE "rusEFI 2020.08.24.mre_f7.179710021"

View File

@ -4,5 +4,5 @@
#define SIGNATURE_BOARD prometheus_405 #define SIGNATURE_BOARD prometheus_405
#define SIGNATURE_DATE 2020.08.24 #define SIGNATURE_DATE 2020.08.24
#define SIGNATURE_HASH 2025816229 #define SIGNATURE_HASH 3874421920
#define TS_SIGNATURE "rusEFI 2020.08.24.prometheus_405.2025816229" #define TS_SIGNATURE "rusEFI 2020.08.24.prometheus_405.3874421920"

View File

@ -4,5 +4,5 @@
#define SIGNATURE_BOARD prometheus_469 #define SIGNATURE_BOARD prometheus_469
#define SIGNATURE_DATE 2020.08.24 #define SIGNATURE_DATE 2020.08.24
#define SIGNATURE_HASH 2025816229 #define SIGNATURE_HASH 3874421920
#define TS_SIGNATURE "rusEFI 2020.08.24.prometheus_469.2025816229" #define TS_SIGNATURE "rusEFI 2020.08.24.prometheus_469.3874421920"

View File

@ -4,5 +4,5 @@
#define SIGNATURE_BOARD proteus_f4 #define SIGNATURE_BOARD proteus_f4
#define SIGNATURE_DATE 2020.08.24 #define SIGNATURE_DATE 2020.08.24
#define SIGNATURE_HASH 2397577024 #define SIGNATURE_HASH 280585029
#define TS_SIGNATURE "rusEFI 2020.08.24.proteus_f4.2397577024" #define TS_SIGNATURE "rusEFI 2020.08.24.proteus_f4.280585029"

View File

@ -4,5 +4,5 @@
#define SIGNATURE_BOARD proteus_f7 #define SIGNATURE_BOARD proteus_f7
#define SIGNATURE_DATE 2020.08.24 #define SIGNATURE_DATE 2020.08.24
#define SIGNATURE_HASH 2397577024 #define SIGNATURE_HASH 280585029
#define TS_SIGNATURE "rusEFI 2020.08.24.proteus_f7.2397577024" #define TS_SIGNATURE "rusEFI 2020.08.24.proteus_f7.280585029"

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.08.24.all.1867104539" signature = "rusEFI 2020.08.24.all.4044930334"
[TunerStudio] [TunerStudio]
queryCommand = "S" queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar. versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI 2020.08.24.all.1867104539" ; signature is expected to be 7 or more characters. signature = "rusEFI 2020.08.24.all.4044930334" ; 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 Mon Aug 24 03:19:17 UTC 2020 ; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 24 03:42:39 UTC 2020
pageSize = 20000 pageSize = 20000
page = 1 page = 1
@ -1727,6 +1727,14 @@ page = 1
maintainConstantValue = tps1SecondaryMax, { (calibrationMode == 6 ) ? calibrationValue : tps1SecondaryMax } maintainConstantValue = tps1SecondaryMax, { (calibrationMode == 6 ) ? calibrationValue : tps1SecondaryMax }
maintainConstantValue = tps1SecondaryMin, { (calibrationMode == 7 ) ? calibrationValue : tps1SecondaryMin } maintainConstantValue = tps1SecondaryMin, { (calibrationMode == 7 ) ? calibrationValue : tps1SecondaryMin }
; TPS 2 Primary
maintainConstantValue = tps2Max, { (calibrationMode == 8 ) ? calibrationValue : tps2Max }
maintainConstantValue = tps2Min, { (calibrationMode == 9 ) ? calibrationValue : tps2Min }
; TPS 2 Secondary
maintainConstantValue = tps2SecondaryMax, { (calibrationMode == 10 ) ? calibrationValue : tps2SecondaryMax }
maintainConstantValue = tps2SecondaryMin, { (calibrationMode == 11 ) ? calibrationValue : tps2SecondaryMin }
; ETB Auto Gain Calibration ; ETB Auto Gain Calibration
maintainConstantValue = etb_pFactor, { (calibrationMode == 3 ) ? calibrationValue : etb_pFactor } maintainConstantValue = etb_pFactor, { (calibrationMode == 3 ) ? calibrationValue : etb_pFactor }
maintainConstantValue = etb_iFactor, { (calibrationMode == 4 ) ? calibrationValue : etb_iFactor } maintainConstantValue = etb_iFactor, { (calibrationMode == 4 ) ? calibrationValue : etb_iFactor }
@ -2762,6 +2770,7 @@ cmd_test_starter_relay = "Z\x00\x14\x00\x0B"
cmd_etb_autotune = "Z\x00\x14\x00\x0C" cmd_etb_autotune = "Z\x00\x14\x00\x0C"
cmd_enable_self_stim = "Z\x00\x14\x00\x0D" cmd_enable_self_stim = "Z\x00\x14\x00\x0D"
cmb_etb_auto_calibrate = "Z\x00\x14\x00\x0E" cmb_etb_auto_calibrate = "Z\x00\x14\x00\x0E"
cmb_etb_auto_calibrate_2 = "Z\x00\x14\x00\x11"
cmd_disable_self_stim = "Z\x00\x14\x00\x0F" cmd_disable_self_stim = "Z\x00\x14\x00\x0F"
cmd_etb_autotune_stop = "Z\x00\x14\x00\x10" cmd_etb_autotune_stop = "Z\x00\x14\x00\x10"
@ -3065,6 +3074,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
field = "Secondary sensor", tps1_2AdcChannel field = "Secondary sensor", tps1_2AdcChannel
field = "Secondary min", tps1SecondaryMin, {tps1_2AdcChannel != 16} field = "Secondary min", tps1SecondaryMin, {tps1_2AdcChannel != 16}
field = "Secondary max", tps1SecondaryMax, {tps1_2AdcChannel != 16} field = "Secondary max", tps1SecondaryMax, {tps1_2AdcChannel != 16}
commandButton = "Auto Calibrate TPS 1", cmb_etb_auto_calibrate, {tps1_2AdcChannel != 16 && throttlePedalPositionAdcChannel != 16}
dialog = tpsNum2, "Throttle #2" dialog = tpsNum2, "Throttle #2"
field = "Primary sensor", tps2_1AdcChannel field = "Primary sensor", tps2_1AdcChannel
@ -3073,6 +3083,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
field = "Secondary sensor", tps2_2AdcChannel field = "Secondary sensor", tps2_2AdcChannel
field = "Secondary min", tps2SecondaryMin, {tps2_2AdcChannel != 16} field = "Secondary min", tps2SecondaryMin, {tps2_2AdcChannel != 16}
field = "Secondary max", tps2SecondaryMax, {tps2_2AdcChannel != 16} field = "Secondary max", tps2SecondaryMax, {tps2_2AdcChannel != 16}
commandButton = "Auto Calibrate TPS 2", cmb_etb_auto_calibrate_2, {tps2_2AdcChannel != 16 && throttlePedalPositionAdcChannel != 16}
dialog = tpsLimits, "TPS Limits" dialog = tpsLimits, "TPS Limits"
field = "TPS minimum valid value", tpsErrorDetectionTooLow, {tps1_1AdcChannel != 16} field = "TPS minimum valid value", tpsErrorDetectionTooLow, {tps1_1AdcChannel != 16}
@ -4200,7 +4211,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
dialog = etbAutotune, "PID Autotune" dialog = etbAutotune, "PID Autotune"
field = "First step: calibrate TPS and hit 'Burn'" field = "First step: calibrate TPS and hit 'Burn'"
commandButton = "Auto Calibrate TPS", cmb_etb_auto_calibrate commandButton = "Auto Calibrate TPS 1", cmb_etb_auto_calibrate
commandButton = "Auto Calibrate TPS 2", cmb_etb_auto_calibrate_2
field = "Second step" field = "Second step"
commandButton = "Start ETB PID Autotune", cmd_etb_autotune commandButton = "Start ETB PID Autotune", cmd_etb_autotune
commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop

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.08.24.frankenso_na6.2817901586" signature = "rusEFI 2020.08.24.frankenso_na6.967096343"
[TunerStudio] [TunerStudio]
queryCommand = "S" queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar. versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI 2020.08.24.frankenso_na6.2817901586" ; signature is expected to be 7 or more characters. signature = "rusEFI 2020.08.24.frankenso_na6.967096343" ; 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 Mon Aug 24 03:19:22 UTC 2020 ; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 24 03:42:44 UTC 2020
pageSize = 20000 pageSize = 20000
page = 1 page = 1
@ -1727,6 +1727,14 @@ page = 1
maintainConstantValue = tps1SecondaryMax, { (calibrationMode == 6 ) ? calibrationValue : tps1SecondaryMax } maintainConstantValue = tps1SecondaryMax, { (calibrationMode == 6 ) ? calibrationValue : tps1SecondaryMax }
maintainConstantValue = tps1SecondaryMin, { (calibrationMode == 7 ) ? calibrationValue : tps1SecondaryMin } maintainConstantValue = tps1SecondaryMin, { (calibrationMode == 7 ) ? calibrationValue : tps1SecondaryMin }
; TPS 2 Primary
maintainConstantValue = tps2Max, { (calibrationMode == 8 ) ? calibrationValue : tps2Max }
maintainConstantValue = tps2Min, { (calibrationMode == 9 ) ? calibrationValue : tps2Min }
; TPS 2 Secondary
maintainConstantValue = tps2SecondaryMax, { (calibrationMode == 10 ) ? calibrationValue : tps2SecondaryMax }
maintainConstantValue = tps2SecondaryMin, { (calibrationMode == 11 ) ? calibrationValue : tps2SecondaryMin }
; ETB Auto Gain Calibration ; ETB Auto Gain Calibration
maintainConstantValue = etb_pFactor, { (calibrationMode == 3 ) ? calibrationValue : etb_pFactor } maintainConstantValue = etb_pFactor, { (calibrationMode == 3 ) ? calibrationValue : etb_pFactor }
maintainConstantValue = etb_iFactor, { (calibrationMode == 4 ) ? calibrationValue : etb_iFactor } maintainConstantValue = etb_iFactor, { (calibrationMode == 4 ) ? calibrationValue : etb_iFactor }
@ -2762,6 +2770,7 @@ cmd_test_starter_relay = "Z\x00\x14\x00\x0B"
cmd_etb_autotune = "Z\x00\x14\x00\x0C" cmd_etb_autotune = "Z\x00\x14\x00\x0C"
cmd_enable_self_stim = "Z\x00\x14\x00\x0D" cmd_enable_self_stim = "Z\x00\x14\x00\x0D"
cmb_etb_auto_calibrate = "Z\x00\x14\x00\x0E" cmb_etb_auto_calibrate = "Z\x00\x14\x00\x0E"
cmb_etb_auto_calibrate_2 = "Z\x00\x14\x00\x11"
cmd_disable_self_stim = "Z\x00\x14\x00\x0F" cmd_disable_self_stim = "Z\x00\x14\x00\x0F"
cmd_etb_autotune_stop = "Z\x00\x14\x00\x10" cmd_etb_autotune_stop = "Z\x00\x14\x00\x10"
@ -3065,6 +3074,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
field = "Secondary sensor", tps1_2AdcChannel field = "Secondary sensor", tps1_2AdcChannel
field = "Secondary min", tps1SecondaryMin, {tps1_2AdcChannel != 16} field = "Secondary min", tps1SecondaryMin, {tps1_2AdcChannel != 16}
field = "Secondary max", tps1SecondaryMax, {tps1_2AdcChannel != 16} field = "Secondary max", tps1SecondaryMax, {tps1_2AdcChannel != 16}
commandButton = "Auto Calibrate TPS 1", cmb_etb_auto_calibrate, {tps1_2AdcChannel != 16 && throttlePedalPositionAdcChannel != 16}
dialog = tpsNum2, "Throttle #2" dialog = tpsNum2, "Throttle #2"
field = "Primary sensor", tps2_1AdcChannel field = "Primary sensor", tps2_1AdcChannel
@ -3073,6 +3083,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
field = "Secondary sensor", tps2_2AdcChannel field = "Secondary sensor", tps2_2AdcChannel
field = "Secondary min", tps2SecondaryMin, {tps2_2AdcChannel != 16} field = "Secondary min", tps2SecondaryMin, {tps2_2AdcChannel != 16}
field = "Secondary max", tps2SecondaryMax, {tps2_2AdcChannel != 16} field = "Secondary max", tps2SecondaryMax, {tps2_2AdcChannel != 16}
commandButton = "Auto Calibrate TPS 2", cmb_etb_auto_calibrate_2, {tps2_2AdcChannel != 16 && throttlePedalPositionAdcChannel != 16}
dialog = tpsLimits, "TPS Limits" dialog = tpsLimits, "TPS Limits"
field = "TPS minimum valid value", tpsErrorDetectionTooLow, {tps1_1AdcChannel != 16} field = "TPS minimum valid value", tpsErrorDetectionTooLow, {tps1_1AdcChannel != 16}
@ -4200,7 +4211,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
dialog = etbAutotune, "PID Autotune" dialog = etbAutotune, "PID Autotune"
field = "First step: calibrate TPS and hit 'Burn'" field = "First step: calibrate TPS and hit 'Burn'"
commandButton = "Auto Calibrate TPS", cmb_etb_auto_calibrate commandButton = "Auto Calibrate TPS 1", cmb_etb_auto_calibrate
commandButton = "Auto Calibrate TPS 2", cmb_etb_auto_calibrate_2
field = "Second step" field = "Second step"
commandButton = "Start ETB PID Autotune", cmd_etb_autotune commandButton = "Start ETB PID Autotune", cmd_etb_autotune
commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop

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.08.24.kin.1084064955" signature = "rusEFI 2020.08.24.kin.3737974974"
[TunerStudio] [TunerStudio]
queryCommand = "S" queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar. versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI 2020.08.24.kin.1084064955" ; signature is expected to be 7 or more characters. signature = "rusEFI 2020.08.24.kin.3737974974" ; 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 Mon Aug 24 03:19:36 UTC 2020 ; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Aug 24 03:42:59 UTC 2020
pageSize = 20000 pageSize = 20000
page = 1 page = 1
@ -1727,6 +1727,14 @@ page = 1
maintainConstantValue = tps1SecondaryMax, { (calibrationMode == 6 ) ? calibrationValue : tps1SecondaryMax } maintainConstantValue = tps1SecondaryMax, { (calibrationMode == 6 ) ? calibrationValue : tps1SecondaryMax }
maintainConstantValue = tps1SecondaryMin, { (calibrationMode == 7 ) ? calibrationValue : tps1SecondaryMin } maintainConstantValue = tps1SecondaryMin, { (calibrationMode == 7 ) ? calibrationValue : tps1SecondaryMin }
; TPS 2 Primary
maintainConstantValue = tps2Max, { (calibrationMode == 8 ) ? calibrationValue : tps2Max }
maintainConstantValue = tps2Min, { (calibrationMode == 9 ) ? calibrationValue : tps2Min }
; TPS 2 Secondary
maintainConstantValue = tps2SecondaryMax, { (calibrationMode == 10 ) ? calibrationValue : tps2SecondaryMax }
maintainConstantValue = tps2SecondaryMin, { (calibrationMode == 11 ) ? calibrationValue : tps2SecondaryMin }
; ETB Auto Gain Calibration ; ETB Auto Gain Calibration
maintainConstantValue = etb_pFactor, { (calibrationMode == 3 ) ? calibrationValue : etb_pFactor } maintainConstantValue = etb_pFactor, { (calibrationMode == 3 ) ? calibrationValue : etb_pFactor }
maintainConstantValue = etb_iFactor, { (calibrationMode == 4 ) ? calibrationValue : etb_iFactor } maintainConstantValue = etb_iFactor, { (calibrationMode == 4 ) ? calibrationValue : etb_iFactor }
@ -2762,6 +2770,7 @@ cmd_test_starter_relay = "Z\x00\x14\x00\x0B"
cmd_etb_autotune = "Z\x00\x14\x00\x0C" cmd_etb_autotune = "Z\x00\x14\x00\x0C"
cmd_enable_self_stim = "Z\x00\x14\x00\x0D" cmd_enable_self_stim = "Z\x00\x14\x00\x0D"
cmb_etb_auto_calibrate = "Z\x00\x14\x00\x0E" cmb_etb_auto_calibrate = "Z\x00\x14\x00\x0E"
cmb_etb_auto_calibrate_2 = "Z\x00\x14\x00\x11"
cmd_disable_self_stim = "Z\x00\x14\x00\x0F" cmd_disable_self_stim = "Z\x00\x14\x00\x0F"
cmd_etb_autotune_stop = "Z\x00\x14\x00\x10" cmd_etb_autotune_stop = "Z\x00\x14\x00\x10"
@ -3066,6 +3075,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
field = "Secondary sensor", tps1_2AdcChannel field = "Secondary sensor", tps1_2AdcChannel
field = "Secondary min", tps1SecondaryMin, {tps1_2AdcChannel != 16} field = "Secondary min", tps1SecondaryMin, {tps1_2AdcChannel != 16}
field = "Secondary max", tps1SecondaryMax, {tps1_2AdcChannel != 16} field = "Secondary max", tps1SecondaryMax, {tps1_2AdcChannel != 16}
commandButton = "Auto Calibrate TPS 1", cmb_etb_auto_calibrate, {tps1_2AdcChannel != 16 && throttlePedalPositionAdcChannel != 16}
dialog = tpsNum2, "Throttle #2" dialog = tpsNum2, "Throttle #2"
field = "Primary sensor", tps2_1AdcChannel field = "Primary sensor", tps2_1AdcChannel
@ -3074,6 +3084,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
field = "Secondary sensor", tps2_2AdcChannel field = "Secondary sensor", tps2_2AdcChannel
field = "Secondary min", tps2SecondaryMin, {tps2_2AdcChannel != 16} field = "Secondary min", tps2SecondaryMin, {tps2_2AdcChannel != 16}
field = "Secondary max", tps2SecondaryMax, {tps2_2AdcChannel != 16} field = "Secondary max", tps2SecondaryMax, {tps2_2AdcChannel != 16}
commandButton = "Auto Calibrate TPS 2", cmb_etb_auto_calibrate_2, {tps2_2AdcChannel != 16 && throttlePedalPositionAdcChannel != 16}
dialog = tpsLimits, "TPS Limits" dialog = tpsLimits, "TPS Limits"
field = "TPS minimum valid value", tpsErrorDetectionTooLow, {tps1_1AdcChannel != 16} field = "TPS minimum valid value", tpsErrorDetectionTooLow, {tps1_1AdcChannel != 16}
@ -4201,7 +4212,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
dialog = etbAutotune, "PID Autotune" dialog = etbAutotune, "PID Autotune"
field = "First step: calibrate TPS and hit 'Burn'" field = "First step: calibrate TPS and hit 'Burn'"
commandButton = "Auto Calibrate TPS", cmb_etb_auto_calibrate commandButton = "Auto Calibrate TPS 1", cmb_etb_auto_calibrate
commandButton = "Auto Calibrate TPS 2", cmb_etb_auto_calibrate_2
field = "Second step" field = "Second step"
commandButton = "Start ETB PID Autotune", cmd_etb_autotune commandButton = "Start ETB PID Autotune", cmd_etb_autotune
commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop

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.08.24.mre_f4.2498188352" signature = "rusEFI 2020.08.24.mre_f4.179710021"
[TunerStudio] [TunerStudio]
queryCommand = "S" queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar. versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI 2020.08.24.mre_f4.2498188352" ; signature is expected to be 7 or more characters. signature = "rusEFI 2020.08.24.mre_f4.179710021" ; 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 Mon Aug 24 03:19:20 UTC 2020 ; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 24 03:42:43 UTC 2020
pageSize = 20000 pageSize = 20000
page = 1 page = 1
@ -1727,6 +1727,14 @@ page = 1
maintainConstantValue = tps1SecondaryMax, { (calibrationMode == 6 ) ? calibrationValue : tps1SecondaryMax } maintainConstantValue = tps1SecondaryMax, { (calibrationMode == 6 ) ? calibrationValue : tps1SecondaryMax }
maintainConstantValue = tps1SecondaryMin, { (calibrationMode == 7 ) ? calibrationValue : tps1SecondaryMin } maintainConstantValue = tps1SecondaryMin, { (calibrationMode == 7 ) ? calibrationValue : tps1SecondaryMin }
; TPS 2 Primary
maintainConstantValue = tps2Max, { (calibrationMode == 8 ) ? calibrationValue : tps2Max }
maintainConstantValue = tps2Min, { (calibrationMode == 9 ) ? calibrationValue : tps2Min }
; TPS 2 Secondary
maintainConstantValue = tps2SecondaryMax, { (calibrationMode == 10 ) ? calibrationValue : tps2SecondaryMax }
maintainConstantValue = tps2SecondaryMin, { (calibrationMode == 11 ) ? calibrationValue : tps2SecondaryMin }
; ETB Auto Gain Calibration ; ETB Auto Gain Calibration
maintainConstantValue = etb_pFactor, { (calibrationMode == 3 ) ? calibrationValue : etb_pFactor } maintainConstantValue = etb_pFactor, { (calibrationMode == 3 ) ? calibrationValue : etb_pFactor }
maintainConstantValue = etb_iFactor, { (calibrationMode == 4 ) ? calibrationValue : etb_iFactor } maintainConstantValue = etb_iFactor, { (calibrationMode == 4 ) ? calibrationValue : etb_iFactor }
@ -2757,6 +2765,7 @@ cmd_test_starter_relay = "Z\x00\x14\x00\x0B"
cmd_etb_autotune = "Z\x00\x14\x00\x0C" cmd_etb_autotune = "Z\x00\x14\x00\x0C"
cmd_enable_self_stim = "Z\x00\x14\x00\x0D" cmd_enable_self_stim = "Z\x00\x14\x00\x0D"
cmb_etb_auto_calibrate = "Z\x00\x14\x00\x0E" cmb_etb_auto_calibrate = "Z\x00\x14\x00\x0E"
cmb_etb_auto_calibrate_2 = "Z\x00\x14\x00\x11"
cmd_disable_self_stim = "Z\x00\x14\x00\x0F" cmd_disable_self_stim = "Z\x00\x14\x00\x0F"
cmd_etb_autotune_stop = "Z\x00\x14\x00\x10" cmd_etb_autotune_stop = "Z\x00\x14\x00\x10"
@ -3060,6 +3069,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
field = "Secondary sensor", tps1_2AdcChannel field = "Secondary sensor", tps1_2AdcChannel
field = "Secondary min", tps1SecondaryMin, {tps1_2AdcChannel != 16} field = "Secondary min", tps1SecondaryMin, {tps1_2AdcChannel != 16}
field = "Secondary max", tps1SecondaryMax, {tps1_2AdcChannel != 16} field = "Secondary max", tps1SecondaryMax, {tps1_2AdcChannel != 16}
commandButton = "Auto Calibrate TPS 1", cmb_etb_auto_calibrate, {tps1_2AdcChannel != 16 && throttlePedalPositionAdcChannel != 16}
dialog = tpsNum2, "Throttle #2" dialog = tpsNum2, "Throttle #2"
field = "Primary sensor", tps2_1AdcChannel field = "Primary sensor", tps2_1AdcChannel
@ -3068,6 +3078,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
field = "Secondary sensor", tps2_2AdcChannel field = "Secondary sensor", tps2_2AdcChannel
field = "Secondary min", tps2SecondaryMin, {tps2_2AdcChannel != 16} field = "Secondary min", tps2SecondaryMin, {tps2_2AdcChannel != 16}
field = "Secondary max", tps2SecondaryMax, {tps2_2AdcChannel != 16} field = "Secondary max", tps2SecondaryMax, {tps2_2AdcChannel != 16}
commandButton = "Auto Calibrate TPS 2", cmb_etb_auto_calibrate_2, {tps2_2AdcChannel != 16 && throttlePedalPositionAdcChannel != 16}
dialog = tpsLimits, "TPS Limits" dialog = tpsLimits, "TPS Limits"
field = "TPS minimum valid value", tpsErrorDetectionTooLow, {tps1_1AdcChannel != 16} field = "TPS minimum valid value", tpsErrorDetectionTooLow, {tps1_1AdcChannel != 16}
@ -4174,7 +4185,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
dialog = etbAutotune, "PID Autotune" dialog = etbAutotune, "PID Autotune"
field = "First step: calibrate TPS and hit 'Burn'" field = "First step: calibrate TPS and hit 'Burn'"
commandButton = "Auto Calibrate TPS", cmb_etb_auto_calibrate commandButton = "Auto Calibrate TPS 1", cmb_etb_auto_calibrate
commandButton = "Auto Calibrate TPS 2", cmb_etb_auto_calibrate_2
field = "Second step" field = "Second step"
commandButton = "Start ETB PID Autotune", cmd_etb_autotune commandButton = "Start ETB PID Autotune", cmd_etb_autotune
commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop

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.08.24.mre_f7.2498188352" signature = "rusEFI 2020.08.24.mre_f7.179710021"
[TunerStudio] [TunerStudio]
queryCommand = "S" queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar. versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI 2020.08.24.mre_f7.2498188352" ; signature is expected to be 7 or more characters. signature = "rusEFI 2020.08.24.mre_f7.179710021" ; 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 Mon Aug 24 03:19:19 UTC 2020 ; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 24 03:42:41 UTC 2020
pageSize = 20000 pageSize = 20000
page = 1 page = 1
@ -1727,6 +1727,14 @@ page = 1
maintainConstantValue = tps1SecondaryMax, { (calibrationMode == 6 ) ? calibrationValue : tps1SecondaryMax } maintainConstantValue = tps1SecondaryMax, { (calibrationMode == 6 ) ? calibrationValue : tps1SecondaryMax }
maintainConstantValue = tps1SecondaryMin, { (calibrationMode == 7 ) ? calibrationValue : tps1SecondaryMin } maintainConstantValue = tps1SecondaryMin, { (calibrationMode == 7 ) ? calibrationValue : tps1SecondaryMin }
; TPS 2 Primary
maintainConstantValue = tps2Max, { (calibrationMode == 8 ) ? calibrationValue : tps2Max }
maintainConstantValue = tps2Min, { (calibrationMode == 9 ) ? calibrationValue : tps2Min }
; TPS 2 Secondary
maintainConstantValue = tps2SecondaryMax, { (calibrationMode == 10 ) ? calibrationValue : tps2SecondaryMax }
maintainConstantValue = tps2SecondaryMin, { (calibrationMode == 11 ) ? calibrationValue : tps2SecondaryMin }
; ETB Auto Gain Calibration ; ETB Auto Gain Calibration
maintainConstantValue = etb_pFactor, { (calibrationMode == 3 ) ? calibrationValue : etb_pFactor } maintainConstantValue = etb_pFactor, { (calibrationMode == 3 ) ? calibrationValue : etb_pFactor }
maintainConstantValue = etb_iFactor, { (calibrationMode == 4 ) ? calibrationValue : etb_iFactor } maintainConstantValue = etb_iFactor, { (calibrationMode == 4 ) ? calibrationValue : etb_iFactor }
@ -2757,6 +2765,7 @@ cmd_test_starter_relay = "Z\x00\x14\x00\x0B"
cmd_etb_autotune = "Z\x00\x14\x00\x0C" cmd_etb_autotune = "Z\x00\x14\x00\x0C"
cmd_enable_self_stim = "Z\x00\x14\x00\x0D" cmd_enable_self_stim = "Z\x00\x14\x00\x0D"
cmb_etb_auto_calibrate = "Z\x00\x14\x00\x0E" cmb_etb_auto_calibrate = "Z\x00\x14\x00\x0E"
cmb_etb_auto_calibrate_2 = "Z\x00\x14\x00\x11"
cmd_disable_self_stim = "Z\x00\x14\x00\x0F" cmd_disable_self_stim = "Z\x00\x14\x00\x0F"
cmd_etb_autotune_stop = "Z\x00\x14\x00\x10" cmd_etb_autotune_stop = "Z\x00\x14\x00\x10"
@ -3060,6 +3069,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
field = "Secondary sensor", tps1_2AdcChannel field = "Secondary sensor", tps1_2AdcChannel
field = "Secondary min", tps1SecondaryMin, {tps1_2AdcChannel != 16} field = "Secondary min", tps1SecondaryMin, {tps1_2AdcChannel != 16}
field = "Secondary max", tps1SecondaryMax, {tps1_2AdcChannel != 16} field = "Secondary max", tps1SecondaryMax, {tps1_2AdcChannel != 16}
commandButton = "Auto Calibrate TPS 1", cmb_etb_auto_calibrate, {tps1_2AdcChannel != 16 && throttlePedalPositionAdcChannel != 16}
dialog = tpsNum2, "Throttle #2" dialog = tpsNum2, "Throttle #2"
field = "Primary sensor", tps2_1AdcChannel field = "Primary sensor", tps2_1AdcChannel
@ -3068,6 +3078,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
field = "Secondary sensor", tps2_2AdcChannel field = "Secondary sensor", tps2_2AdcChannel
field = "Secondary min", tps2SecondaryMin, {tps2_2AdcChannel != 16} field = "Secondary min", tps2SecondaryMin, {tps2_2AdcChannel != 16}
field = "Secondary max", tps2SecondaryMax, {tps2_2AdcChannel != 16} field = "Secondary max", tps2SecondaryMax, {tps2_2AdcChannel != 16}
commandButton = "Auto Calibrate TPS 2", cmb_etb_auto_calibrate_2, {tps2_2AdcChannel != 16 && throttlePedalPositionAdcChannel != 16}
dialog = tpsLimits, "TPS Limits" dialog = tpsLimits, "TPS Limits"
field = "TPS minimum valid value", tpsErrorDetectionTooLow, {tps1_1AdcChannel != 16} field = "TPS minimum valid value", tpsErrorDetectionTooLow, {tps1_1AdcChannel != 16}
@ -4174,7 +4185,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
dialog = etbAutotune, "PID Autotune" dialog = etbAutotune, "PID Autotune"
field = "First step: calibrate TPS and hit 'Burn'" field = "First step: calibrate TPS and hit 'Burn'"
commandButton = "Auto Calibrate TPS", cmb_etb_auto_calibrate commandButton = "Auto Calibrate TPS 1", cmb_etb_auto_calibrate
commandButton = "Auto Calibrate TPS 2", cmb_etb_auto_calibrate_2
field = "Second step" field = "Second step"
commandButton = "Start ETB PID Autotune", cmd_etb_autotune commandButton = "Start ETB PID Autotune", cmd_etb_autotune
commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop

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.08.24.prometheus_405.2025816229" signature = "rusEFI 2020.08.24.prometheus_405.3874421920"
[TunerStudio] [TunerStudio]
queryCommand = "S" queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar. versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI 2020.08.24.prometheus_405.2025816229" ; signature is expected to be 7 or more characters. signature = "rusEFI 2020.08.24.prometheus_405.3874421920" ; 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 Mon Aug 24 03:19:25 UTC 2020 ; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 24 03:42:48 UTC 2020
pageSize = 20000 pageSize = 20000
page = 1 page = 1
@ -1727,6 +1727,14 @@ page = 1
maintainConstantValue = tps1SecondaryMax, { (calibrationMode == 6 ) ? calibrationValue : tps1SecondaryMax } maintainConstantValue = tps1SecondaryMax, { (calibrationMode == 6 ) ? calibrationValue : tps1SecondaryMax }
maintainConstantValue = tps1SecondaryMin, { (calibrationMode == 7 ) ? calibrationValue : tps1SecondaryMin } maintainConstantValue = tps1SecondaryMin, { (calibrationMode == 7 ) ? calibrationValue : tps1SecondaryMin }
; TPS 2 Primary
maintainConstantValue = tps2Max, { (calibrationMode == 8 ) ? calibrationValue : tps2Max }
maintainConstantValue = tps2Min, { (calibrationMode == 9 ) ? calibrationValue : tps2Min }
; TPS 2 Secondary
maintainConstantValue = tps2SecondaryMax, { (calibrationMode == 10 ) ? calibrationValue : tps2SecondaryMax }
maintainConstantValue = tps2SecondaryMin, { (calibrationMode == 11 ) ? calibrationValue : tps2SecondaryMin }
; ETB Auto Gain Calibration ; ETB Auto Gain Calibration
maintainConstantValue = etb_pFactor, { (calibrationMode == 3 ) ? calibrationValue : etb_pFactor } maintainConstantValue = etb_pFactor, { (calibrationMode == 3 ) ? calibrationValue : etb_pFactor }
maintainConstantValue = etb_iFactor, { (calibrationMode == 4 ) ? calibrationValue : etb_iFactor } maintainConstantValue = etb_iFactor, { (calibrationMode == 4 ) ? calibrationValue : etb_iFactor }
@ -2758,6 +2766,7 @@ cmd_test_starter_relay = "Z\x00\x14\x00\x0B"
cmd_etb_autotune = "Z\x00\x14\x00\x0C" cmd_etb_autotune = "Z\x00\x14\x00\x0C"
cmd_enable_self_stim = "Z\x00\x14\x00\x0D" cmd_enable_self_stim = "Z\x00\x14\x00\x0D"
cmb_etb_auto_calibrate = "Z\x00\x14\x00\x0E" cmb_etb_auto_calibrate = "Z\x00\x14\x00\x0E"
cmb_etb_auto_calibrate_2 = "Z\x00\x14\x00\x11"
cmd_disable_self_stim = "Z\x00\x14\x00\x0F" cmd_disable_self_stim = "Z\x00\x14\x00\x0F"
cmd_etb_autotune_stop = "Z\x00\x14\x00\x10" cmd_etb_autotune_stop = "Z\x00\x14\x00\x10"
@ -3061,6 +3070,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
field = "Secondary sensor", tps1_2AdcChannel field = "Secondary sensor", tps1_2AdcChannel
field = "Secondary min", tps1SecondaryMin, {tps1_2AdcChannel != 16} field = "Secondary min", tps1SecondaryMin, {tps1_2AdcChannel != 16}
field = "Secondary max", tps1SecondaryMax, {tps1_2AdcChannel != 16} field = "Secondary max", tps1SecondaryMax, {tps1_2AdcChannel != 16}
commandButton = "Auto Calibrate TPS 1", cmb_etb_auto_calibrate, {tps1_2AdcChannel != 16 && throttlePedalPositionAdcChannel != 16}
dialog = tpsNum2, "Throttle #2" dialog = tpsNum2, "Throttle #2"
field = "Primary sensor", tps2_1AdcChannel field = "Primary sensor", tps2_1AdcChannel
@ -3069,6 +3079,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
field = "Secondary sensor", tps2_2AdcChannel field = "Secondary sensor", tps2_2AdcChannel
field = "Secondary min", tps2SecondaryMin, {tps2_2AdcChannel != 16} field = "Secondary min", tps2SecondaryMin, {tps2_2AdcChannel != 16}
field = "Secondary max", tps2SecondaryMax, {tps2_2AdcChannel != 16} field = "Secondary max", tps2SecondaryMax, {tps2_2AdcChannel != 16}
commandButton = "Auto Calibrate TPS 2", cmb_etb_auto_calibrate_2, {tps2_2AdcChannel != 16 && throttlePedalPositionAdcChannel != 16}
dialog = tpsLimits, "TPS Limits" dialog = tpsLimits, "TPS Limits"
field = "TPS minimum valid value", tpsErrorDetectionTooLow, {tps1_1AdcChannel != 16} field = "TPS minimum valid value", tpsErrorDetectionTooLow, {tps1_1AdcChannel != 16}
@ -4196,7 +4207,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
dialog = etbAutotune, "PID Autotune" dialog = etbAutotune, "PID Autotune"
field = "First step: calibrate TPS and hit 'Burn'" field = "First step: calibrate TPS and hit 'Burn'"
commandButton = "Auto Calibrate TPS", cmb_etb_auto_calibrate commandButton = "Auto Calibrate TPS 1", cmb_etb_auto_calibrate
commandButton = "Auto Calibrate TPS 2", cmb_etb_auto_calibrate_2
field = "Second step" field = "Second step"
commandButton = "Start ETB PID Autotune", cmd_etb_autotune commandButton = "Start ETB PID Autotune", cmd_etb_autotune
commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop

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.08.24.prometheus_469.2025816229" signature = "rusEFI 2020.08.24.prometheus_469.3874421920"
[TunerStudio] [TunerStudio]
queryCommand = "S" queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar. versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI 2020.08.24.prometheus_469.2025816229" ; signature is expected to be 7 or more characters. signature = "rusEFI 2020.08.24.prometheus_469.3874421920" ; 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 Mon Aug 24 03:19:23 UTC 2020 ; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 24 03:42:46 UTC 2020
pageSize = 20000 pageSize = 20000
page = 1 page = 1
@ -1727,6 +1727,14 @@ page = 1
maintainConstantValue = tps1SecondaryMax, { (calibrationMode == 6 ) ? calibrationValue : tps1SecondaryMax } maintainConstantValue = tps1SecondaryMax, { (calibrationMode == 6 ) ? calibrationValue : tps1SecondaryMax }
maintainConstantValue = tps1SecondaryMin, { (calibrationMode == 7 ) ? calibrationValue : tps1SecondaryMin } maintainConstantValue = tps1SecondaryMin, { (calibrationMode == 7 ) ? calibrationValue : tps1SecondaryMin }
; TPS 2 Primary
maintainConstantValue = tps2Max, { (calibrationMode == 8 ) ? calibrationValue : tps2Max }
maintainConstantValue = tps2Min, { (calibrationMode == 9 ) ? calibrationValue : tps2Min }
; TPS 2 Secondary
maintainConstantValue = tps2SecondaryMax, { (calibrationMode == 10 ) ? calibrationValue : tps2SecondaryMax }
maintainConstantValue = tps2SecondaryMin, { (calibrationMode == 11 ) ? calibrationValue : tps2SecondaryMin }
; ETB Auto Gain Calibration ; ETB Auto Gain Calibration
maintainConstantValue = etb_pFactor, { (calibrationMode == 3 ) ? calibrationValue : etb_pFactor } maintainConstantValue = etb_pFactor, { (calibrationMode == 3 ) ? calibrationValue : etb_pFactor }
maintainConstantValue = etb_iFactor, { (calibrationMode == 4 ) ? calibrationValue : etb_iFactor } maintainConstantValue = etb_iFactor, { (calibrationMode == 4 ) ? calibrationValue : etb_iFactor }
@ -2758,6 +2766,7 @@ cmd_test_starter_relay = "Z\x00\x14\x00\x0B"
cmd_etb_autotune = "Z\x00\x14\x00\x0C" cmd_etb_autotune = "Z\x00\x14\x00\x0C"
cmd_enable_self_stim = "Z\x00\x14\x00\x0D" cmd_enable_self_stim = "Z\x00\x14\x00\x0D"
cmb_etb_auto_calibrate = "Z\x00\x14\x00\x0E" cmb_etb_auto_calibrate = "Z\x00\x14\x00\x0E"
cmb_etb_auto_calibrate_2 = "Z\x00\x14\x00\x11"
cmd_disable_self_stim = "Z\x00\x14\x00\x0F" cmd_disable_self_stim = "Z\x00\x14\x00\x0F"
cmd_etb_autotune_stop = "Z\x00\x14\x00\x10" cmd_etb_autotune_stop = "Z\x00\x14\x00\x10"
@ -3061,6 +3070,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
field = "Secondary sensor", tps1_2AdcChannel field = "Secondary sensor", tps1_2AdcChannel
field = "Secondary min", tps1SecondaryMin, {tps1_2AdcChannel != 16} field = "Secondary min", tps1SecondaryMin, {tps1_2AdcChannel != 16}
field = "Secondary max", tps1SecondaryMax, {tps1_2AdcChannel != 16} field = "Secondary max", tps1SecondaryMax, {tps1_2AdcChannel != 16}
commandButton = "Auto Calibrate TPS 1", cmb_etb_auto_calibrate, {tps1_2AdcChannel != 16 && throttlePedalPositionAdcChannel != 16}
dialog = tpsNum2, "Throttle #2" dialog = tpsNum2, "Throttle #2"
field = "Primary sensor", tps2_1AdcChannel field = "Primary sensor", tps2_1AdcChannel
@ -3069,6 +3079,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
field = "Secondary sensor", tps2_2AdcChannel field = "Secondary sensor", tps2_2AdcChannel
field = "Secondary min", tps2SecondaryMin, {tps2_2AdcChannel != 16} field = "Secondary min", tps2SecondaryMin, {tps2_2AdcChannel != 16}
field = "Secondary max", tps2SecondaryMax, {tps2_2AdcChannel != 16} field = "Secondary max", tps2SecondaryMax, {tps2_2AdcChannel != 16}
commandButton = "Auto Calibrate TPS 2", cmb_etb_auto_calibrate_2, {tps2_2AdcChannel != 16 && throttlePedalPositionAdcChannel != 16}
dialog = tpsLimits, "TPS Limits" dialog = tpsLimits, "TPS Limits"
field = "TPS minimum valid value", tpsErrorDetectionTooLow, {tps1_1AdcChannel != 16} field = "TPS minimum valid value", tpsErrorDetectionTooLow, {tps1_1AdcChannel != 16}
@ -4196,7 +4207,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
dialog = etbAutotune, "PID Autotune" dialog = etbAutotune, "PID Autotune"
field = "First step: calibrate TPS and hit 'Burn'" field = "First step: calibrate TPS and hit 'Burn'"
commandButton = "Auto Calibrate TPS", cmb_etb_auto_calibrate commandButton = "Auto Calibrate TPS 1", cmb_etb_auto_calibrate
commandButton = "Auto Calibrate TPS 2", cmb_etb_auto_calibrate_2
field = "Second step" field = "Second step"
commandButton = "Start ETB PID Autotune", cmd_etb_autotune commandButton = "Start ETB PID Autotune", cmd_etb_autotune
commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop

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.08.24.proteus_f4.2397577024" signature = "rusEFI 2020.08.24.proteus_f4.280585029"
[TunerStudio] [TunerStudio]
queryCommand = "S" queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar. versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI 2020.08.24.proteus_f4.2397577024" ; signature is expected to be 7 or more characters. signature = "rusEFI 2020.08.24.proteus_f4.280585029" ; 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 Mon Aug 24 03:19:34 UTC 2020 ; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 24 03:42:51 UTC 2020
pageSize = 20000 pageSize = 20000
page = 1 page = 1
@ -1727,6 +1727,14 @@ page = 1
maintainConstantValue = tps1SecondaryMax, { (calibrationMode == 6 ) ? calibrationValue : tps1SecondaryMax } maintainConstantValue = tps1SecondaryMax, { (calibrationMode == 6 ) ? calibrationValue : tps1SecondaryMax }
maintainConstantValue = tps1SecondaryMin, { (calibrationMode == 7 ) ? calibrationValue : tps1SecondaryMin } maintainConstantValue = tps1SecondaryMin, { (calibrationMode == 7 ) ? calibrationValue : tps1SecondaryMin }
; TPS 2 Primary
maintainConstantValue = tps2Max, { (calibrationMode == 8 ) ? calibrationValue : tps2Max }
maintainConstantValue = tps2Min, { (calibrationMode == 9 ) ? calibrationValue : tps2Min }
; TPS 2 Secondary
maintainConstantValue = tps2SecondaryMax, { (calibrationMode == 10 ) ? calibrationValue : tps2SecondaryMax }
maintainConstantValue = tps2SecondaryMin, { (calibrationMode == 11 ) ? calibrationValue : tps2SecondaryMin }
; ETB Auto Gain Calibration ; ETB Auto Gain Calibration
maintainConstantValue = etb_pFactor, { (calibrationMode == 3 ) ? calibrationValue : etb_pFactor } maintainConstantValue = etb_pFactor, { (calibrationMode == 3 ) ? calibrationValue : etb_pFactor }
maintainConstantValue = etb_iFactor, { (calibrationMode == 4 ) ? calibrationValue : etb_iFactor } maintainConstantValue = etb_iFactor, { (calibrationMode == 4 ) ? calibrationValue : etb_iFactor }
@ -2752,6 +2760,7 @@ cmd_test_starter_relay = "Z\x00\x14\x00\x0B"
cmd_etb_autotune = "Z\x00\x14\x00\x0C" cmd_etb_autotune = "Z\x00\x14\x00\x0C"
cmd_enable_self_stim = "Z\x00\x14\x00\x0D" cmd_enable_self_stim = "Z\x00\x14\x00\x0D"
cmb_etb_auto_calibrate = "Z\x00\x14\x00\x0E" cmb_etb_auto_calibrate = "Z\x00\x14\x00\x0E"
cmb_etb_auto_calibrate_2 = "Z\x00\x14\x00\x11"
cmd_disable_self_stim = "Z\x00\x14\x00\x0F" cmd_disable_self_stim = "Z\x00\x14\x00\x0F"
cmd_etb_autotune_stop = "Z\x00\x14\x00\x10" cmd_etb_autotune_stop = "Z\x00\x14\x00\x10"
@ -3055,6 +3064,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
field = "Secondary sensor", tps1_2AdcChannel field = "Secondary sensor", tps1_2AdcChannel
field = "Secondary min", tps1SecondaryMin, {tps1_2AdcChannel != 16} field = "Secondary min", tps1SecondaryMin, {tps1_2AdcChannel != 16}
field = "Secondary max", tps1SecondaryMax, {tps1_2AdcChannel != 16} field = "Secondary max", tps1SecondaryMax, {tps1_2AdcChannel != 16}
commandButton = "Auto Calibrate TPS 1", cmb_etb_auto_calibrate, {tps1_2AdcChannel != 16 && throttlePedalPositionAdcChannel != 16}
dialog = tpsNum2, "Throttle #2" dialog = tpsNum2, "Throttle #2"
field = "Primary sensor", tps2_1AdcChannel field = "Primary sensor", tps2_1AdcChannel
@ -3063,6 +3073,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
field = "Secondary sensor", tps2_2AdcChannel field = "Secondary sensor", tps2_2AdcChannel
field = "Secondary min", tps2SecondaryMin, {tps2_2AdcChannel != 16} field = "Secondary min", tps2SecondaryMin, {tps2_2AdcChannel != 16}
field = "Secondary max", tps2SecondaryMax, {tps2_2AdcChannel != 16} field = "Secondary max", tps2SecondaryMax, {tps2_2AdcChannel != 16}
commandButton = "Auto Calibrate TPS 2", cmb_etb_auto_calibrate_2, {tps2_2AdcChannel != 16 && throttlePedalPositionAdcChannel != 16}
dialog = tpsLimits, "TPS Limits" dialog = tpsLimits, "TPS Limits"
field = "TPS minimum valid value", tpsErrorDetectionTooLow, {tps1_1AdcChannel != 16} field = "TPS minimum valid value", tpsErrorDetectionTooLow, {tps1_1AdcChannel != 16}
@ -4164,7 +4175,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
dialog = etbAutotune, "PID Autotune" dialog = etbAutotune, "PID Autotune"
field = "First step: calibrate TPS and hit 'Burn'" field = "First step: calibrate TPS and hit 'Burn'"
commandButton = "Auto Calibrate TPS", cmb_etb_auto_calibrate commandButton = "Auto Calibrate TPS 1", cmb_etb_auto_calibrate
commandButton = "Auto Calibrate TPS 2", cmb_etb_auto_calibrate_2
field = "Second step" field = "Second step"
commandButton = "Start ETB PID Autotune", cmd_etb_autotune commandButton = "Start ETB PID Autotune", cmd_etb_autotune
commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop

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.08.24.proteus_f7.2397577024" signature = "rusEFI 2020.08.24.proteus_f7.280585029"
[TunerStudio] [TunerStudio]
queryCommand = "S" queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar. versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI 2020.08.24.proteus_f7.2397577024" ; signature is expected to be 7 or more characters. signature = "rusEFI 2020.08.24.proteus_f7.280585029" ; 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 Mon Aug 24 03:19:26 UTC 2020 ; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 24 03:42:49 UTC 2020
pageSize = 20000 pageSize = 20000
page = 1 page = 1
@ -1727,6 +1727,14 @@ page = 1
maintainConstantValue = tps1SecondaryMax, { (calibrationMode == 6 ) ? calibrationValue : tps1SecondaryMax } maintainConstantValue = tps1SecondaryMax, { (calibrationMode == 6 ) ? calibrationValue : tps1SecondaryMax }
maintainConstantValue = tps1SecondaryMin, { (calibrationMode == 7 ) ? calibrationValue : tps1SecondaryMin } maintainConstantValue = tps1SecondaryMin, { (calibrationMode == 7 ) ? calibrationValue : tps1SecondaryMin }
; TPS 2 Primary
maintainConstantValue = tps2Max, { (calibrationMode == 8 ) ? calibrationValue : tps2Max }
maintainConstantValue = tps2Min, { (calibrationMode == 9 ) ? calibrationValue : tps2Min }
; TPS 2 Secondary
maintainConstantValue = tps2SecondaryMax, { (calibrationMode == 10 ) ? calibrationValue : tps2SecondaryMax }
maintainConstantValue = tps2SecondaryMin, { (calibrationMode == 11 ) ? calibrationValue : tps2SecondaryMin }
; ETB Auto Gain Calibration ; ETB Auto Gain Calibration
maintainConstantValue = etb_pFactor, { (calibrationMode == 3 ) ? calibrationValue : etb_pFactor } maintainConstantValue = etb_pFactor, { (calibrationMode == 3 ) ? calibrationValue : etb_pFactor }
maintainConstantValue = etb_iFactor, { (calibrationMode == 4 ) ? calibrationValue : etb_iFactor } maintainConstantValue = etb_iFactor, { (calibrationMode == 4 ) ? calibrationValue : etb_iFactor }
@ -2752,6 +2760,7 @@ cmd_test_starter_relay = "Z\x00\x14\x00\x0B"
cmd_etb_autotune = "Z\x00\x14\x00\x0C" cmd_etb_autotune = "Z\x00\x14\x00\x0C"
cmd_enable_self_stim = "Z\x00\x14\x00\x0D" cmd_enable_self_stim = "Z\x00\x14\x00\x0D"
cmb_etb_auto_calibrate = "Z\x00\x14\x00\x0E" cmb_etb_auto_calibrate = "Z\x00\x14\x00\x0E"
cmb_etb_auto_calibrate_2 = "Z\x00\x14\x00\x11"
cmd_disable_self_stim = "Z\x00\x14\x00\x0F" cmd_disable_self_stim = "Z\x00\x14\x00\x0F"
cmd_etb_autotune_stop = "Z\x00\x14\x00\x10" cmd_etb_autotune_stop = "Z\x00\x14\x00\x10"
@ -3055,6 +3064,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
field = "Secondary sensor", tps1_2AdcChannel field = "Secondary sensor", tps1_2AdcChannel
field = "Secondary min", tps1SecondaryMin, {tps1_2AdcChannel != 16} field = "Secondary min", tps1SecondaryMin, {tps1_2AdcChannel != 16}
field = "Secondary max", tps1SecondaryMax, {tps1_2AdcChannel != 16} field = "Secondary max", tps1SecondaryMax, {tps1_2AdcChannel != 16}
commandButton = "Auto Calibrate TPS 1", cmb_etb_auto_calibrate, {tps1_2AdcChannel != 16 && throttlePedalPositionAdcChannel != 16}
dialog = tpsNum2, "Throttle #2" dialog = tpsNum2, "Throttle #2"
field = "Primary sensor", tps2_1AdcChannel field = "Primary sensor", tps2_1AdcChannel
@ -3063,6 +3073,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
field = "Secondary sensor", tps2_2AdcChannel field = "Secondary sensor", tps2_2AdcChannel
field = "Secondary min", tps2SecondaryMin, {tps2_2AdcChannel != 16} field = "Secondary min", tps2SecondaryMin, {tps2_2AdcChannel != 16}
field = "Secondary max", tps2SecondaryMax, {tps2_2AdcChannel != 16} field = "Secondary max", tps2SecondaryMax, {tps2_2AdcChannel != 16}
commandButton = "Auto Calibrate TPS 2", cmb_etb_auto_calibrate_2, {tps2_2AdcChannel != 16 && throttlePedalPositionAdcChannel != 16}
dialog = tpsLimits, "TPS Limits" dialog = tpsLimits, "TPS Limits"
field = "TPS minimum valid value", tpsErrorDetectionTooLow, {tps1_1AdcChannel != 16} field = "TPS minimum valid value", tpsErrorDetectionTooLow, {tps1_1AdcChannel != 16}
@ -4164,7 +4175,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
dialog = etbAutotune, "PID Autotune" dialog = etbAutotune, "PID Autotune"
field = "First step: calibrate TPS and hit 'Burn'" field = "First step: calibrate TPS and hit 'Burn'"
commandButton = "Auto Calibrate TPS", cmb_etb_auto_calibrate commandButton = "Auto Calibrate TPS 1", cmb_etb_auto_calibrate
commandButton = "Auto Calibrate TPS 2", cmb_etb_auto_calibrate_2
field = "Second step" field = "Second step"
commandButton = "Start ETB PID Autotune", cmd_etb_autotune commandButton = "Start ETB PID Autotune", cmd_etb_autotune
commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop