Merge remote-tracking branch 'origin/master'

This commit is contained in:
rusefi 2020-08-08 17:38:16 -04:00
commit 92bc869b59
29 changed files with 67 additions and 61 deletions

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 Sat Aug 08 15:46:11 UTC 2020
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sat Aug 08 21:30:29 UTC 2020
// by class com.rusefi.output.CHeaderConsumer
// begin
#pragma once
@ -3651,4 +3651,4 @@ struct persistent_config_s {
typedef struct persistent_config_s persistent_config_s;
// end
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sat Aug 08 15:46:11 UTC 2020
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sat Aug 08 21:30:29 UTC 2020

View File

@ -244,7 +244,9 @@
#define CMD_RPM "rpm"
#define CMD_SELF_STIMULATION "self_stimulation"
#define CMD_TRIGGER_HW_INPUT "trigger_hw_input"
#define CMD_TRIGGER_PIN "set_trigger_input_pin"
#define CMD_TRIGGERINFO "triggerinfo"
#define CMD_VSS_PIN "vss_pin"
#define CMD_WRITECONFIG "writeconfig"
#define coastingFuelCutClt_offset 3154
#define coastingFuelCutEnabled_offset 744
@ -1091,7 +1093,7 @@
#define showSdCardWarning_offset 76
#define SIGNATURE_BOARD kin
#define SIGNATURE_DATE 2020.08.08
#define SIGNATURE_HASH 1352920504
#define SIGNATURE_HASH 702334611
#define silentTriggerError_offset 1464
#define slowAdcAlpha_offset 2088
#define sparkDwellRpmBins_offset 332
@ -1391,7 +1393,7 @@
#define ts_show_spi true
#define ts_show_trigger_comparator true
#define ts_show_tunerstudio_port true
#define TS_SIGNATURE "rusEFI 2020.08.08.kin.1352920504"
#define TS_SIGNATURE "rusEFI 2020.08.08.kin.702334611"
#define TS_SINGLE_WRITE_COMMAND 'W'
#define TS_SINGLE_WRITE_COMMAND_char W
#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 Sat Aug 08 15:46:01 UTC 2020
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 08 21:30:19 UTC 2020
// by class com.rusefi.output.CHeaderConsumer
// begin
#pragma once
@ -3651,4 +3651,4 @@ struct persistent_config_s {
typedef struct persistent_config_s persistent_config_s;
// end
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 08 15:46:01 UTC 2020
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 08 21:30:19 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 Sat Aug 08 15:46:01 UTC 2020
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 08 21:30:19 UTC 2020
// by class com.rusefi.output.FileFsioSettingsConsumer
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 Sat Aug 08 15:46:01 UTC 2020
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 08 21:30:19 UTC 2020
// by class com.rusefi.output.FileFsioSettingsConsumer
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 Sat Aug 08 15:46:01 UTC 2020
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 08 21:30:19 UTC 2020
// by class com.rusefi.output.FileFsioSettingsConsumer
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 Sat Aug 08 15:46:01 UTC 2020
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 08 21:30:19 UTC 2020
// by class com.rusefi.output.FileFsioSettingsConsumer
case FSIO_SETTING_FANONTEMPERATURE:

View File

@ -244,7 +244,9 @@
#define CMD_RPM "rpm"
#define CMD_SELF_STIMULATION "self_stimulation"
#define CMD_TRIGGER_HW_INPUT "trigger_hw_input"
#define CMD_TRIGGER_PIN "set_trigger_input_pin"
#define CMD_TRIGGERINFO "triggerinfo"
#define CMD_VSS_PIN "vss_pin"
#define CMD_WRITECONFIG "writeconfig"
#define coastingFuelCutClt_offset 3154
#define coastingFuelCutEnabled_offset 744
@ -1091,7 +1093,7 @@
#define showSdCardWarning_offset 76
#define SIGNATURE_BOARD all
#define SIGNATURE_DATE 2020.08.08
#define SIGNATURE_HASH 2138548248
#define SIGNATURE_HASH 101221171
#define silentTriggerError_offset 1464
#define slowAdcAlpha_offset 2088
#define sparkDwellRpmBins_offset 332
@ -1391,7 +1393,7 @@
#define ts_show_spi true
#define ts_show_trigger_comparator false
#define ts_show_tunerstudio_port true
#define TS_SIGNATURE "rusEFI 2020.08.08.all.2138548248"
#define TS_SIGNATURE "rusEFI 2020.08.08.all.101221171"
#define TS_SINGLE_WRITE_COMMAND 'W'
#define TS_SINGLE_WRITE_COMMAND_char W
#define TS_TEST_COMMAND 't' // 0x74

View File

@ -4,5 +4,5 @@
#define SIGNATURE_BOARD all
#define SIGNATURE_DATE 2020.08.08
#define SIGNATURE_HASH 2138548248
#define TS_SIGNATURE "rusEFI 2020.08.08.all.2138548248"
#define SIGNATURE_HASH 101221171
#define TS_SIGNATURE "rusEFI 2020.08.08.all.101221171"

View File

@ -4,5 +4,5 @@
#define SIGNATURE_BOARD frankenso_na6
#define SIGNATURE_DATE 2020.08.08
#define SIGNATURE_HASH 1125801409
#define TS_SIGNATURE "rusEFI 2020.08.08.frankenso_na6.1125801409"
#define SIGNATURE_HASH 979728106
#define TS_SIGNATURE "rusEFI 2020.08.08.frankenso_na6.979728106"

View File

@ -4,5 +4,5 @@
#define SIGNATURE_BOARD kin
#define SIGNATURE_DATE 2020.08.08
#define SIGNATURE_HASH 1352920504
#define TS_SIGNATURE "rusEFI 2020.08.08.kin.1352920504"
#define SIGNATURE_HASH 702334611
#define TS_SIGNATURE "rusEFI 2020.08.08.kin.702334611"

View File

@ -4,5 +4,5 @@
#define SIGNATURE_BOARD mre_f4
#define SIGNATURE_DATE 2020.08.08
#define SIGNATURE_HASH 2228829507
#define TS_SIGNATURE "rusEFI 2020.08.08.mre_f4.2228829507"
#define SIGNATURE_HASH 4255520360
#define TS_SIGNATURE "rusEFI 2020.08.08.mre_f4.4255520360"

View File

@ -4,5 +4,5 @@
#define SIGNATURE_BOARD mre_f7
#define SIGNATURE_DATE 2020.08.08
#define SIGNATURE_HASH 2228829507
#define TS_SIGNATURE "rusEFI 2020.08.08.mre_f7.2228829507"
#define SIGNATURE_HASH 4255520360
#define TS_SIGNATURE "rusEFI 2020.08.08.mre_f7.4255520360"

View File

@ -4,5 +4,5 @@
#define SIGNATURE_BOARD prometheus_405
#define SIGNATURE_DATE 2020.08.08
#define SIGNATURE_HASH 1753344422
#define TS_SIGNATURE "rusEFI 2020.08.08.prometheus_405.1753344422"
#define SIGNATURE_HASH 301908621
#define TS_SIGNATURE "rusEFI 2020.08.08.prometheus_405.301908621"

View File

@ -4,5 +4,5 @@
#define SIGNATURE_BOARD prometheus_469
#define SIGNATURE_DATE 2020.08.08
#define SIGNATURE_HASH 1753344422
#define TS_SIGNATURE "rusEFI 2020.08.08.prometheus_469.1753344422"
#define SIGNATURE_HASH 301908621
#define TS_SIGNATURE "rusEFI 2020.08.08.prometheus_469.301908621"

View File

@ -4,5 +4,5 @@
#define SIGNATURE_BOARD proteus_f4
#define SIGNATURE_DATE 2020.08.08
#define SIGNATURE_HASH 1086005699
#define TS_SIGNATURE "rusEFI 2020.08.08.proteus_f4.1086005699"
#define SIGNATURE_HASH 969149160
#define TS_SIGNATURE "rusEFI 2020.08.08.proteus_f4.969149160"

View File

@ -4,5 +4,5 @@
#define SIGNATURE_BOARD proteus_f7
#define SIGNATURE_DATE 2020.08.08
#define SIGNATURE_HASH 1086005699
#define TS_SIGNATURE "rusEFI 2020.08.08.proteus_f7.1086005699"
#define SIGNATURE_HASH 969149160
#define TS_SIGNATURE "rusEFI 2020.08.08.proteus_f7.969149160"

View File

@ -33,12 +33,12 @@ enable2ndByteCanID = false
[MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
signature = "rusEFI 2020.08.08.all.2138548248"
signature = "rusEFI 2020.08.08.all.101221171"
[TunerStudio]
queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI 2020.08.08.all.2138548248" ; signature is expected to be 7 or more characters.
signature = "rusEFI 2020.08.08.all.101221171" ; signature is expected to be 7 or more characters.
[Constants]
; new packet serial format with CRC
@ -76,7 +76,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.sh integration/rusefi_config.txt Sat Aug 08 15:46:01 UTC 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 08 21:30:19 UTC 2020
pageSize = 20000
page = 1

View File

@ -33,12 +33,12 @@ enable2ndByteCanID = false
[MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
signature = "rusEFI 2020.08.08.frankenso_na6.1125801409"
signature = "rusEFI 2020.08.08.frankenso_na6.979728106"
[TunerStudio]
queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI 2020.08.08.frankenso_na6.1125801409" ; signature is expected to be 7 or more characters.
signature = "rusEFI 2020.08.08.frankenso_na6.979728106" ; signature is expected to be 7 or more characters.
[Constants]
; new packet serial format with CRC
@ -76,7 +76,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.sh integration/rusefi_config.txt Sat Aug 08 15:46:05 UTC 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 08 21:30:23 UTC 2020
pageSize = 20000
page = 1

View File

@ -33,12 +33,12 @@ enable2ndByteCanID = false
[MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
signature = "rusEFI 2020.08.08.kin.1352920504"
signature = "rusEFI 2020.08.08.kin.702334611"
[TunerStudio]
queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI 2020.08.08.kin.1352920504" ; signature is expected to be 7 or more characters.
signature = "rusEFI 2020.08.08.kin.702334611" ; signature is expected to be 7 or more characters.
[Constants]
; new packet serial format with CRC
@ -76,7 +76,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 kinetis_gen_config.bat integration/rusefi_config.txt Sat Aug 08 15:46:11 UTC 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sat Aug 08 21:30:29 UTC 2020
pageSize = 20000
page = 1

View File

@ -33,12 +33,12 @@ enable2ndByteCanID = false
[MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
signature = "rusEFI 2020.08.08.mre_f4.2228829507"
signature = "rusEFI 2020.08.08.mre_f4.4255520360"
[TunerStudio]
queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI 2020.08.08.mre_f4.2228829507" ; signature is expected to be 7 or more characters.
signature = "rusEFI 2020.08.08.mre_f4.4255520360" ; signature is expected to be 7 or more characters.
[Constants]
; new packet serial format with CRC
@ -76,7 +76,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.sh integration/rusefi_config.txt Sat Aug 08 15:46:04 UTC 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 08 21:30:22 UTC 2020
pageSize = 20000
page = 1

View File

@ -33,12 +33,12 @@ enable2ndByteCanID = false
[MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
signature = "rusEFI 2020.08.08.mre_f7.2228829507"
signature = "rusEFI 2020.08.08.mre_f7.4255520360"
[TunerStudio]
queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI 2020.08.08.mre_f7.2228829507" ; signature is expected to be 7 or more characters.
signature = "rusEFI 2020.08.08.mre_f7.4255520360" ; signature is expected to be 7 or more characters.
[Constants]
; new packet serial format with CRC
@ -76,7 +76,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.sh integration/rusefi_config.txt Sat Aug 08 15:46:03 UTC 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 08 21:30:20 UTC 2020
pageSize = 20000
page = 1

View File

@ -33,12 +33,12 @@ enable2ndByteCanID = false
[MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
signature = "rusEFI 2020.08.08.prometheus_405.1753344422"
signature = "rusEFI 2020.08.08.prometheus_405.301908621"
[TunerStudio]
queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI 2020.08.08.prometheus_405.1753344422" ; signature is expected to be 7 or more characters.
signature = "rusEFI 2020.08.08.prometheus_405.301908621" ; signature is expected to be 7 or more characters.
[Constants]
; new packet serial format with CRC
@ -76,7 +76,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.sh integration/rusefi_config.txt Sat Aug 08 15:46:07 UTC 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 08 21:30:25 UTC 2020
pageSize = 20000
page = 1

View File

@ -33,12 +33,12 @@ enable2ndByteCanID = false
[MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
signature = "rusEFI 2020.08.08.prometheus_469.1753344422"
signature = "rusEFI 2020.08.08.prometheus_469.301908621"
[TunerStudio]
queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI 2020.08.08.prometheus_469.1753344422" ; signature is expected to be 7 or more characters.
signature = "rusEFI 2020.08.08.prometheus_469.301908621" ; signature is expected to be 7 or more characters.
[Constants]
; new packet serial format with CRC
@ -76,7 +76,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.sh integration/rusefi_config.txt Sat Aug 08 15:46:06 UTC 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 08 21:30:24 UTC 2020
pageSize = 20000
page = 1

View File

@ -33,12 +33,12 @@ enable2ndByteCanID = false
[MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
signature = "rusEFI 2020.08.08.proteus_f4.1086005699"
signature = "rusEFI 2020.08.08.proteus_f4.969149160"
[TunerStudio]
queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI 2020.08.08.proteus_f4.1086005699" ; signature is expected to be 7 or more characters.
signature = "rusEFI 2020.08.08.proteus_f4.969149160" ; signature is expected to be 7 or more characters.
[Constants]
; new packet serial format with CRC
@ -76,7 +76,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.sh integration/rusefi_config.txt Sat Aug 08 15:46:10 UTC 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 08 21:30:28 UTC 2020
pageSize = 20000
page = 1

View File

@ -33,12 +33,12 @@ enable2ndByteCanID = false
[MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
signature = "rusEFI 2020.08.08.proteus_f7.1086005699"
signature = "rusEFI 2020.08.08.proteus_f7.969149160"
[TunerStudio]
queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI 2020.08.08.proteus_f7.1086005699" ; signature is expected to be 7 or more characters.
signature = "rusEFI 2020.08.08.proteus_f7.969149160" ; signature is expected to be 7 or more characters.
[Constants]
; new packet serial format with CRC
@ -76,7 +76,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.sh integration/rusefi_config.txt Sat Aug 08 15:46:09 UTC 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 08 21:30:26 UTC 2020
pageSize = 20000
page = 1

View File

@ -1,6 +1,6 @@
package com.rusefi.config.generated;
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 08 15:46:01 UTC 2020
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 08 21:30:19 UTC 2020
// by class com.rusefi.output.FileJavaFieldsConsumer
import com.rusefi.config.*;
@ -243,7 +243,9 @@ public class Fields {
public static final String CMD_RPM = "rpm";
public static final String CMD_SELF_STIMULATION = "self_stimulation";
public static final String CMD_TRIGGER_HW_INPUT = "trigger_hw_input";
public static final String CMD_TRIGGER_PIN = "set_trigger_input_pin";
public static final String CMD_TRIGGERINFO = "triggerinfo";
public static final String CMD_VSS_PIN = "vss_pin";
public static final String CMD_WRITECONFIG = "writeconfig";
public static final int coastingFuelCutClt_offset = 3154;
public static final int coastingFuelCutEnabled_offset = 744;
@ -1073,7 +1075,7 @@ public class Fields {
public static final int servoOutputPins8_offset = 3147;
public static final int showHumanReadableWarning_offset = 976;
public static final int showSdCardWarning_offset = 76;
public static final int SIGNATURE_HASH = 2138548248;
public static final int SIGNATURE_HASH = 101221171;
public static final int silentTriggerError_offset = 1464;
public static final int slowAdcAlpha_offset = 2088;
public static final int sparkDwellRpmBins_offset = 332;
@ -1329,7 +1331,7 @@ public class Fields {
public static final char TS_SD_R_COMMAND = 'r';
public static final char TS_SD_W_COMMAND = 'w';
public static final char TS_SET_LOGGER_SWITCH = 'l';
public static final String TS_SIGNATURE = "rusEFI 2020.08.08.all.2138548248";
public static final String TS_SIGNATURE = "rusEFI 2020.08.08.all.101221171";
public static final char TS_SINGLE_WRITE_COMMAND = 'W';
public static final int tunerStudioSerialSpeed_offset = 728;
public static final int twoWireBatchIgnition_offset = 1476;

View File

@ -1,6 +1,6 @@
<roms>
<!-- was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh Sat Aug 08 15:46:02 UTC 2020 -->
<!-- was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh Sat Aug 08 21:30:20 UTC 2020 -->
<rom>
<romid>