Merge remote-tracking branch 'origin/master'

This commit is contained in:
rusefi 2020-06-01 08:05:04 -04:00
commit c936f4fe35
4 changed files with 32 additions and 8 deletions

View File

@ -89,7 +89,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Mon Jun 01 07:18:39 EDT 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Mon Jun 01 08:01:23 EDT 2020
pageSize = 20000
page = 1
@ -648,7 +648,7 @@ page = 1
;no TS info - skipping unusedAtOldBoardConfigurationEnd offset 1200
tps2SecondaryMin = scalar, U16, 1460, "ADC", 1, 0, 0, 1000, 0
tps2SecondaryMax = scalar, U16, 1462, "ADC", 1, 0, 0, 1000, 0
unusedHereWeHave = bits, U32, 1464, [0:0], "false", "true"
useFSIO6ForRevLimiter = bits, U32, 1464, [0:0], "false", "true"
fuelClosedLoopCorrectionEnabled= bits, U32, 1464, [1:1], "false", "true"
isVerboseIAC = bits, U32, 1464, [2:2], "false", "true"
isVerboseETB = bits, U32, 1464, [3:3], "false", "true"
@ -4077,12 +4077,18 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00"
field = "#1", fsioFormulas1
field = "#2", fsioFormulas2
field = "#3", fsioFormulas3
field = "use FSIO #4 for serious engine warning",useFSIO4ForSeriousEngineWarning
field = "#4", fsioFormulas4
field = "use FSIO #5 for critical engine stop", useFSIO5ForCriticalIssueEngineStop
field = "#5", fsioFormulas5
field = "use FSIO #6 for rev limiter", useFSIO6ForRevLimiter
field = "#6", fsioFormulas6
field = "#7", fsioFormulas7
field = "use FSIO #8 for servo #1", useFSIO8ForServo1
field = "#8", fsioFormulas8
field = "use FSIO #9 for servo #2", useFSIO9ForServo2

View File

@ -89,7 +89,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Mon Jun 01 07:18:46 EDT 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Mon Jun 01 08:01:27 EDT 2020
pageSize = 20000
page = 1
@ -648,7 +648,7 @@ page = 1
;no TS info - skipping unusedAtOldBoardConfigurationEnd offset 1200
tps2SecondaryMin = scalar, U16, 1460, "ADC", 1, 0, 0, 1000, 0
tps2SecondaryMax = scalar, U16, 1462, "ADC", 1, 0, 0, 1000, 0
unusedHereWeHave = bits, U32, 1464, [0:0], "false", "true"
useFSIO6ForRevLimiter = bits, U32, 1464, [0:0], "false", "true"
fuelClosedLoopCorrectionEnabled= bits, U32, 1464, [1:1], "false", "true"
isVerboseIAC = bits, U32, 1464, [2:2], "false", "true"
isVerboseETB = bits, U32, 1464, [3:3], "false", "true"
@ -4078,12 +4078,18 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00"
field = "#1", fsioFormulas1
field = "#2", fsioFormulas2
field = "#3", fsioFormulas3
field = "use FSIO #4 for serious engine warning",useFSIO4ForSeriousEngineWarning
field = "#4", fsioFormulas4
field = "use FSIO #5 for critical engine stop", useFSIO5ForCriticalIssueEngineStop
field = "#5", fsioFormulas5
field = "use FSIO #6 for rev limiter", useFSIO6ForRevLimiter
field = "#6", fsioFormulas6
field = "#7", fsioFormulas7
field = "use FSIO #8 for servo #1", useFSIO8ForServo1
field = "#8", fsioFormulas8
field = "use FSIO #9 for servo #2", useFSIO9ForServo2

View File

@ -89,7 +89,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Mon Jun 01 07:18:37 EDT 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Mon Jun 01 08:01:20 EDT 2020
pageSize = 20000
page = 1
@ -648,7 +648,7 @@ page = 1
;no TS info - skipping unusedAtOldBoardConfigurationEnd offset 1200
tps2SecondaryMin = scalar, U16, 1460, "ADC", 1, 0, 0, 1000, 0
tps2SecondaryMax = scalar, U16, 1462, "ADC", 1, 0, 0, 1000, 0
unusedHereWeHave = bits, U32, 1464, [0:0], "false", "true"
useFSIO6ForRevLimiter = bits, U32, 1464, [0:0], "false", "true"
fuelClosedLoopCorrectionEnabled= bits, U32, 1464, [1:1], "false", "true"
isVerboseIAC = bits, U32, 1464, [2:2], "false", "true"
isVerboseETB = bits, U32, 1464, [3:3], "false", "true"
@ -4051,12 +4051,18 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00"
field = "#1", fsioFormulas1
field = "#2", fsioFormulas2
field = "#3", fsioFormulas3
field = "use FSIO #4 for serious engine warning",useFSIO4ForSeriousEngineWarning
field = "#4", fsioFormulas4
field = "use FSIO #5 for critical engine stop", useFSIO5ForCriticalIssueEngineStop
field = "#5", fsioFormulas5
field = "use FSIO #6 for rev limiter", useFSIO6ForRevLimiter
field = "#6", fsioFormulas6
field = "#7", fsioFormulas7
field = "use FSIO #8 for servo #1", useFSIO8ForServo1
field = "#8", fsioFormulas8
field = "use FSIO #9 for servo #2", useFSIO9ForServo2

View File

@ -89,7 +89,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Mon Jun 01 07:18:41 EDT 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Mon Jun 01 08:01:24 EDT 2020
pageSize = 20000
page = 1
@ -648,7 +648,7 @@ page = 1
;no TS info - skipping unusedAtOldBoardConfigurationEnd offset 1200
tps2SecondaryMin = scalar, U16, 1460, "ADC", 1, 0, 0, 1000, 0
tps2SecondaryMax = scalar, U16, 1462, "ADC", 1, 0, 0, 1000, 0
unusedHereWeHave = bits, U32, 1464, [0:0], "false", "true"
useFSIO6ForRevLimiter = bits, U32, 1464, [0:0], "false", "true"
fuelClosedLoopCorrectionEnabled= bits, U32, 1464, [1:1], "false", "true"
isVerboseIAC = bits, U32, 1464, [2:2], "false", "true"
isVerboseETB = bits, U32, 1464, [3:3], "false", "true"
@ -4073,12 +4073,18 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00"
field = "#1", fsioFormulas1
field = "#2", fsioFormulas2
field = "#3", fsioFormulas3
field = "use FSIO #4 for serious engine warning",useFSIO4ForSeriousEngineWarning
field = "#4", fsioFormulas4
field = "use FSIO #5 for critical engine stop", useFSIO5ForCriticalIssueEngineStop
field = "#5", fsioFormulas5
field = "use FSIO #6 for rev limiter", useFSIO6ForRevLimiter
field = "#6", fsioFormulas6
field = "#7", fsioFormulas7
field = "use FSIO #8 for servo #1", useFSIO8ForServo1
field = "#8", fsioFormulas8
field = "use FSIO #9 for servo #2", useFSIO9ForServo2