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

Merge remote-tracking branch 'origin/master'

This commit is contained in:
rusefi 2020-05-10 02:06:35 -04:00
parent 3f7ca92241 a52952c668
commit 33d277535c
7 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
firmware/tunerstudio/rusefi.ini
View File

@ -89,7 +89,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.bat integration\rusefi_config.txt Sun May 10 00:25:55 EDT 2020 ; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sun May 10 01:52:33 EDT 2020
pageSize = 20000 pageSize = 20000
page = 1 page = 1
@ -637,7 +637,7 @@ page = 1
engineCode = string, ASCII, 1128, 32 engineCode = string, ASCII, 1128, 32
vehicleName = string, ASCII, 1160, 32 vehicleName = string, ASCII, 1160, 32
;no TS info - skipping unusedAtOldBoardConfigurationEnd offset 1192 ;no TS info - skipping unusedAtOldBoardConfigurationEnd offset 1192
vvtDisplayInverted = bits, U32, 1464, [0:0], "false", "true" unusedHereWeHave = bits, U32, 1464, [0:0], "false", "true"
fuelClosedLoopCorrectionEnabled= bits, U32, 1464, [1:1], "false", "true" fuelClosedLoopCorrectionEnabled= bits, U32, 1464, [1:1], "false", "true"
isVerboseIAC = bits, U32, 1464, [2:2], "false", "true" isVerboseIAC = bits, U32, 1464, [2:2], "false", "true"
isVerboseETB = bits, U32, 1464, [3:3], "false", "true" isVerboseETB = bits, U32, 1464, [3:3], "false", "true"
@ -2925,7 +2925,6 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00"
field = "VVT mode", vvtMode, {trigger_type != 80} field = "VVT mode", vvtMode, {trigger_type != 80}
field = "VVT use rise front", vvtCamSensorUseRise, {trigger_type != 80} field = "VVT use rise front", vvtCamSensorUseRise, {trigger_type != 80}
field = "VVT position display offset", vvtOffset field = "VVT position display offset", vvtOffset
field = "VVT display inverted", vvtDisplayInverted
field = "print verbose sync details to console",verboseTriggerSynchDetails field = "print verbose sync details to console",verboseTriggerSynchDetails
field = "Do not print messages in case of sync error", silentTriggerError field = "Do not print messages in case of sync error", silentTriggerError
field = "Enable noise filtering", useNoiselessTriggerDecoder, {trigger_type == 8 || trigger_type == 9} field = "Enable noise filtering", useNoiselessTriggerDecoder, {trigger_type == 8 || trigger_type == 9}

5
firmware/tunerstudio/rusefi_frankenso.ini
View File

@ -89,7 +89,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.bat integration\rusefi_config.txt Sun May 10 00:26:00 EDT 2020 ; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sun May 10 01:53:58 EDT 2020
pageSize = 20000 pageSize = 20000
page = 1 page = 1
@ -637,7 +637,7 @@ page = 1
engineCode = string, ASCII, 1128, 32 engineCode = string, ASCII, 1128, 32
vehicleName = string, ASCII, 1160, 32 vehicleName = string, ASCII, 1160, 32
;no TS info - skipping unusedAtOldBoardConfigurationEnd offset 1192 ;no TS info - skipping unusedAtOldBoardConfigurationEnd offset 1192
vvtDisplayInverted = bits, U32, 1464, [0:0], "false", "true" unusedHereWeHave = bits, U32, 1464, [0:0], "false", "true"
fuelClosedLoopCorrectionEnabled= bits, U32, 1464, [1:1], "false", "true" fuelClosedLoopCorrectionEnabled= bits, U32, 1464, [1:1], "false", "true"
isVerboseIAC = bits, U32, 1464, [2:2], "false", "true" isVerboseIAC = bits, U32, 1464, [2:2], "false", "true"
isVerboseETB = bits, U32, 1464, [3:3], "false", "true" isVerboseETB = bits, U32, 1464, [3:3], "false", "true"
@ -2925,7 +2925,6 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00"
field = "VVT mode", vvtMode, {trigger_type != 80} field = "VVT mode", vvtMode, {trigger_type != 80}
field = "VVT use rise front", vvtCamSensorUseRise, {trigger_type != 80} field = "VVT use rise front", vvtCamSensorUseRise, {trigger_type != 80}
field = "VVT position display offset", vvtOffset field = "VVT position display offset", vvtOffset
field = "VVT display inverted", vvtDisplayInverted
field = "print verbose sync details to console",verboseTriggerSynchDetails field = "print verbose sync details to console",verboseTriggerSynchDetails
field = "Do not print messages in case of sync error", silentTriggerError field = "Do not print messages in case of sync error", silentTriggerError
field = "Enable noise filtering", useNoiselessTriggerDecoder, {trigger_type == 8 || trigger_type == 9} field = "Enable noise filtering", useNoiselessTriggerDecoder, {trigger_type == 8 || trigger_type == 9}

5
firmware/tunerstudio/rusefi_kinetis.ini
View File

@ -89,7 +89,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 kineris_gen_config.bat integration/rusefi_config.txt Sun May 10 00:26:06 EDT 2020 ; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Sun May 10 01:54:15 EDT 2020
pageSize = 20000 pageSize = 20000
page = 1 page = 1
@ -637,7 +637,7 @@ page = 1
engineCode = string, ASCII, 1128, 32 engineCode = string, ASCII, 1128, 32
vehicleName = string, ASCII, 1160, 32 vehicleName = string, ASCII, 1160, 32
;no TS info - skipping unusedAtOldBoardConfigurationEnd offset 1192 ;no TS info - skipping unusedAtOldBoardConfigurationEnd offset 1192
vvtDisplayInverted = bits, U32, 1464, [0:0], "false", "true" unusedHereWeHave = bits, U32, 1464, [0:0], "false", "true"
fuelClosedLoopCorrectionEnabled= bits, U32, 1464, [1:1], "false", "true" fuelClosedLoopCorrectionEnabled= bits, U32, 1464, [1:1], "false", "true"
isVerboseIAC = bits, U32, 1464, [2:2], "false", "true" isVerboseIAC = bits, U32, 1464, [2:2], "false", "true"
isVerboseETB = bits, U32, 1464, [3:3], "false", "true" isVerboseETB = bits, U32, 1464, [3:3], "false", "true"
@ -2925,7 +2925,6 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00"
field = "VVT mode", vvtMode, {trigger_type != 80} field = "VVT mode", vvtMode, {trigger_type != 80}
field = "VVT use rise front", vvtCamSensorUseRise, {trigger_type != 80} field = "VVT use rise front", vvtCamSensorUseRise, {trigger_type != 80}
field = "VVT position display offset", vvtOffset field = "VVT position display offset", vvtOffset
field = "VVT display inverted", vvtDisplayInverted
field = "print verbose sync details to console",verboseTriggerSynchDetails field = "print verbose sync details to console",verboseTriggerSynchDetails
field = "Do not print messages in case of sync error", silentTriggerError field = "Do not print messages in case of sync error", silentTriggerError
field = "Enable noise filtering", useNoiselessTriggerDecoder, {trigger_type == 8 || trigger_type == 9} field = "Enable noise filtering", useNoiselessTriggerDecoder, {trigger_type == 8 || trigger_type == 9}

5
firmware/tunerstudio/rusefi_microrusefi.ini
View File

@ -89,7 +89,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.bat integration\rusefi_config.txt Sun May 10 00:25:58 EDT 2020 ; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sun May 10 01:53:53 EDT 2020
pageSize = 20000 pageSize = 20000
page = 1 page = 1
@ -637,7 +637,7 @@ page = 1
engineCode = string, ASCII, 1128, 32 engineCode = string, ASCII, 1128, 32
vehicleName = string, ASCII, 1160, 32 vehicleName = string, ASCII, 1160, 32
;no TS info - skipping unusedAtOldBoardConfigurationEnd offset 1192 ;no TS info - skipping unusedAtOldBoardConfigurationEnd offset 1192
vvtDisplayInverted = bits, U32, 1464, [0:0], "false", "true" unusedHereWeHave = bits, U32, 1464, [0:0], "false", "true"
fuelClosedLoopCorrectionEnabled= bits, U32, 1464, [1:1], "false", "true" fuelClosedLoopCorrectionEnabled= bits, U32, 1464, [1:1], "false", "true"
isVerboseIAC = bits, U32, 1464, [2:2], "false", "true" isVerboseIAC = bits, U32, 1464, [2:2], "false", "true"
isVerboseETB = bits, U32, 1464, [3:3], "false", "true" isVerboseETB = bits, U32, 1464, [3:3], "false", "true"
@ -2916,7 +2916,6 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00"
field = "VVT mode", vvtMode, {trigger_type != 80} field = "VVT mode", vvtMode, {trigger_type != 80}
field = "VVT use rise front", vvtCamSensorUseRise, {trigger_type != 80} field = "VVT use rise front", vvtCamSensorUseRise, {trigger_type != 80}
field = "VVT position display offset", vvtOffset field = "VVT position display offset", vvtOffset
field = "VVT display inverted", vvtDisplayInverted
field = "print verbose sync details to console",verboseTriggerSynchDetails field = "print verbose sync details to console",verboseTriggerSynchDetails
field = "Do not print messages in case of sync error", silentTriggerError field = "Do not print messages in case of sync error", silentTriggerError
field = "Enable noise filtering", useNoiselessTriggerDecoder, {trigger_type == 8 || trigger_type == 9} field = "Enable noise filtering", useNoiselessTriggerDecoder, {trigger_type == 8 || trigger_type == 9}

5
firmware/tunerstudio/rusefi_prometheus.ini
View File

@ -89,7 +89,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.bat integration\rusefi_config.txt Sun May 10 00:26:03 EDT 2020 ; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sun May 10 01:54:10 EDT 2020
pageSize = 20000 pageSize = 20000
page = 1 page = 1
@ -637,7 +637,7 @@ page = 1
engineCode = string, ASCII, 1128, 32 engineCode = string, ASCII, 1128, 32
vehicleName = string, ASCII, 1160, 32 vehicleName = string, ASCII, 1160, 32
;no TS info - skipping unusedAtOldBoardConfigurationEnd offset 1192 ;no TS info - skipping unusedAtOldBoardConfigurationEnd offset 1192
vvtDisplayInverted = bits, U32, 1464, [0:0], "false", "true" unusedHereWeHave = bits, U32, 1464, [0:0], "false", "true"
fuelClosedLoopCorrectionEnabled= bits, U32, 1464, [1:1], "false", "true" fuelClosedLoopCorrectionEnabled= bits, U32, 1464, [1:1], "false", "true"
isVerboseIAC = bits, U32, 1464, [2:2], "false", "true" isVerboseIAC = bits, U32, 1464, [2:2], "false", "true"
isVerboseETB = bits, U32, 1464, [3:3], "false", "true" isVerboseETB = bits, U32, 1464, [3:3], "false", "true"
@ -2921,7 +2921,6 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00"
field = "VVT mode", vvtMode, {trigger_type != 80} field = "VVT mode", vvtMode, {trigger_type != 80}
field = "VVT use rise front", vvtCamSensorUseRise, {trigger_type != 80} field = "VVT use rise front", vvtCamSensorUseRise, {trigger_type != 80}
field = "VVT position display offset", vvtOffset field = "VVT position display offset", vvtOffset
field = "VVT display inverted", vvtDisplayInverted
field = "print verbose sync details to console",verboseTriggerSynchDetails field = "print verbose sync details to console",verboseTriggerSynchDetails
field = "Do not print messages in case of sync error", silentTriggerError field = "Do not print messages in case of sync error", silentTriggerError
field = "Enable noise filtering", useNoiselessTriggerDecoder, {trigger_type == 8 || trigger_type == 9} field = "Enable noise filtering", useNoiselessTriggerDecoder, {trigger_type == 8 || trigger_type == 9}

5
firmware/tunerstudio/rusefi_proteus.ini
View File

@ -89,7 +89,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.bat integration\rusefi_config.txt Sun May 10 00:26:05 EDT 2020 ; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sun May 10 01:54:12 EDT 2020
pageSize = 20000 pageSize = 20000
page = 1 page = 1
@ -637,7 +637,7 @@ page = 1
engineCode = string, ASCII, 1128, 32 engineCode = string, ASCII, 1128, 32
vehicleName = string, ASCII, 1160, 32 vehicleName = string, ASCII, 1160, 32
;no TS info - skipping unusedAtOldBoardConfigurationEnd offset 1192 ;no TS info - skipping unusedAtOldBoardConfigurationEnd offset 1192
vvtDisplayInverted = bits, U32, 1464, [0:0], "false", "true" unusedHereWeHave = bits, U32, 1464, [0:0], "false", "true"
fuelClosedLoopCorrectionEnabled= bits, U32, 1464, [1:1], "false", "true" fuelClosedLoopCorrectionEnabled= bits, U32, 1464, [1:1], "false", "true"
isVerboseIAC = bits, U32, 1464, [2:2], "false", "true" isVerboseIAC = bits, U32, 1464, [2:2], "false", "true"
isVerboseETB = bits, U32, 1464, [3:3], "false", "true" isVerboseETB = bits, U32, 1464, [3:3], "false", "true"
@ -2916,7 +2916,6 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00"
field = "VVT mode", vvtMode, {trigger_type != 80} field = "VVT mode", vvtMode, {trigger_type != 80}
field = "VVT use rise front", vvtCamSensorUseRise, {trigger_type != 80} field = "VVT use rise front", vvtCamSensorUseRise, {trigger_type != 80}
field = "VVT position display offset", vvtOffset field = "VVT position display offset", vvtOffset
field = "VVT display inverted", vvtDisplayInverted
field = "print verbose sync details to console",verboseTriggerSynchDetails field = "print verbose sync details to console",verboseTriggerSynchDetails
field = "Do not print messages in case of sync error", silentTriggerError field = "Do not print messages in case of sync error", silentTriggerError
field = "Enable noise filtering", useNoiselessTriggerDecoder, {trigger_type == 8 || trigger_type == 9} field = "Enable noise filtering", useNoiselessTriggerDecoder, {trigger_type == 8 || trigger_type == 9}

8
java_console/models/src/com/rusefi/config/generated/Fields.java
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.bat integration\rusefi_config.txt Sun May 10 00:25:55 EDT 2020 // this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sun May 10 01:52:33 EDT 2020
// by class com.rusefi.output.FileJavaFieldsConsumer // by class com.rusefi.output.FileJavaFieldsConsumer
import com.rusefi.config.*; import com.rusefi.config.*;
@ -1582,6 +1582,7 @@ public class Fields {
public static final int unusedConsoleSerialTxPin_offset = 1818; public static final int unusedConsoleSerialTxPin_offset = 1818;
public static final int unusedFlexFuelSensor_offset = 3100; public static final int unusedFlexFuelSensor_offset = 3100;
public static final int unusedHere_offset = 761; public static final int unusedHere_offset = 761;
public static final int unusedHereWeHave_offset = 1464;
public static final int unusedOldBiquad_offset = 2332; public static final int unusedOldBiquad_offset = 2332;
public static final int unusedSomethingWasHere_offset = 2417; public static final int unusedSomethingWasHere_offset = 2417;
public static final int unusedSomethingWasHere_offset_hex = 971; public static final int unusedSomethingWasHere_offset_hex = 971;
@ -1647,7 +1648,6 @@ public class Fields {
public static final int veTable_offset_hex = 4420; public static final int veTable_offset_hex = 4420;
public static final int vRefAdcChannel_offset = 1470; public static final int vRefAdcChannel_offset = 1470;
public static final int vvtCamSensorUseRise_offset = 744; public static final int vvtCamSensorUseRise_offset = 744;
public static final int vvtDisplayInverted_offset = 1464;
public static final int vvtMode_offset = 2328; public static final int vvtMode_offset = 2328;
public static final int vvtMode_offset_hex = 918; public static final int vvtMode_offset_hex = 918;
public static final int vvtOffset_offset = 2052; public static final int vvtOffset_offset = 2052;
@ -2201,7 +2201,7 @@ public class Fields {
public static final Field ENGINEMAKE = Field.create("ENGINEMAKE", 1096, FieldType.INT); public static final Field ENGINEMAKE = Field.create("ENGINEMAKE", 1096, FieldType.INT);
public static final Field ENGINECODE = Field.create("ENGINECODE", 1128, FieldType.INT); public static final Field ENGINECODE = Field.create("ENGINECODE", 1128, FieldType.INT);
public static final Field VEHICLENAME = Field.create("VEHICLENAME", 1160, FieldType.INT); public static final Field VEHICLENAME = Field.create("VEHICLENAME", 1160, FieldType.INT);
public static final Field VVTDISPLAYINVERTED = Field.create("VVTDISPLAYINVERTED", 1464, FieldType.BIT, 0); public static final Field UNUSEDHEREWEHAVE = Field.create("UNUSEDHEREWEHAVE", 1464, FieldType.BIT, 0);
public static final Field FUELCLOSEDLOOPCORRECTIONENABLED = Field.create("FUELCLOSEDLOOPCORRECTIONENABLED", 1464, FieldType.BIT, 1); public static final Field FUELCLOSEDLOOPCORRECTIONENABLED = Field.create("FUELCLOSEDLOOPCORRECTIONENABLED", 1464, FieldType.BIT, 1);
public static final Field ISVERBOSEIAC = Field.create("ISVERBOSEIAC", 1464, FieldType.BIT, 2); public static final Field ISVERBOSEIAC = Field.create("ISVERBOSEIAC", 1464, FieldType.BIT, 2);
public static final Field ISVERBOSEETB = Field.create("ISVERBOSEETB", 1464, FieldType.BIT, 3); public static final Field ISVERBOSEETB = Field.create("ISVERBOSEETB", 1464, FieldType.BIT, 3);
@ -3172,7 +3172,7 @@ public class Fields {
ENGINEMAKE, ENGINEMAKE,
ENGINECODE, ENGINECODE,
VEHICLENAME, VEHICLENAME,
VVTDISPLAYINVERTED, UNUSEDHEREWEHAVE,
FUELCLOSEDLOOPCORRECTIONENABLED, FUELCLOSEDLOOPCORRECTIONENABLED,
ISVERBOSEIAC, ISVERBOSEIAC,
ISVERBOSEETB, ISVERBOSEETB,