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

Merge remote-tracking branch 'origin/master' into master

This commit is contained in:
rusefi 2020-09-27 10:15:08 -04:00
parent a1eeef0937 6ddaa0a334
commit 4fdbd9fa1a
29 changed files with 61 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h
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 Sun Sep 27 12:51:32 UTC 2020
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sun Sep 27 13:59:16 UTC 2020
// by class com.rusefi.output.CHeaderConsumer
// begin
#pragma once
@ -3726,4 +3726,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 Sun Sep 27 12:51:32 UTC 2020
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sun Sep 27 13:59:16 UTC 2020

4
firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h
View File

@ -1172,7 +1172,7 @@
#define showSdCardWarning_offset 76
#define SIGNATURE_BOARD kin
#define SIGNATURE_DATE 2020.09.27
#define SIGNATURE_HASH 3991263314
#define SIGNATURE_HASH 3558730808
#define silentTriggerError_offset 1464
#define slowAdcAlpha_offset 2088
#define solenoidPadding_offset 1198
@ -1484,7 +1484,7 @@
#define ts_show_spi true
#define ts_show_trigger_comparator true
#define ts_show_tunerstudio_port true
#define TS_SIGNATURE "rusEFI 2020.09.27.kin.3991263314"
#define TS_SIGNATURE "rusEFI 2020.09.27.kin.3558730808"
#define TS_SINGLE_WRITE_COMMAND 'W'
#define TS_SINGLE_WRITE_COMMAND_char W
#define TS_TEST_COMMAND 't' // 0x74

4
firmware/controllers/generated/engine_configuration_generated_structures.h
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 Sun Sep 27 12:51:12 UTC 2020
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Sep 27 13:58:59 UTC 2020
// by class com.rusefi.output.CHeaderConsumer
// begin
#pragma once
@ -3726,4 +3726,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 Sun Sep 27 12:51:12 UTC 2020
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Sep 27 13:58:59 UTC 2020

2
firmware/controllers/generated/fsio_enums_generated.def
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 Sun Sep 27 12:51:12 UTC 2020
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Sep 27 13:58:59 UTC 2020
// by class com.rusefi.output.FileFsioSettingsConsumer
FSIO_SETTING_FANONTEMPERATURE = 1000,

2
firmware/controllers/generated/fsio_getters.def
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 Sun Sep 27 12:51:12 UTC 2020
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Sep 27 13:58:59 UTC 2020
// by class com.rusefi.output.FileFsioSettingsConsumer
case FSIO_SETTING_FANONTEMPERATURE:

2
firmware/controllers/generated/fsio_names.def
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 Sun Sep 27 12:51:12 UTC 2020
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Sep 27 13:58:59 UTC 2020
// by class com.rusefi.output.FileFsioSettingsConsumer
static LENameOrdinalPair lefanOnTemperature(FSIO_SETTING_FANONTEMPERATURE, "cfg_fanOnTemperature");

2
firmware/controllers/generated/fsio_strings.def
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 Sun Sep 27 12:51:12 UTC 2020
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Sep 27 13:58:59 UTC 2020
// by class com.rusefi.output.FileFsioSettingsConsumer
case FSIO_SETTING_FANONTEMPERATURE:

4
firmware/controllers/generated/rusefi_generated.h
View File

@ -1172,7 +1172,7 @@
#define showSdCardWarning_offset 76
#define SIGNATURE_BOARD all
#define SIGNATURE_DATE 2020.09.27
#define SIGNATURE_HASH 104784854
#define SIGNATURE_HASH 1069995964
#define silentTriggerError_offset 1464
#define slowAdcAlpha_offset 2088
#define solenoidPadding_offset 1198
@ -1484,7 +1484,7 @@
#define ts_show_spi true
#define ts_show_trigger_comparator false
#define ts_show_tunerstudio_port true
#define TS_SIGNATURE "rusEFI 2020.09.27.all.104784854"
#define TS_SIGNATURE "rusEFI 2020.09.27.all.1069995964"
#define TS_SINGLE_WRITE_COMMAND 'W'
#define TS_SINGLE_WRITE_COMMAND_char W
#define TS_TEST_COMMAND 't' // 0x74

4
firmware/controllers/generated/signature_all.h
View File

@ -4,5 +4,5 @@
#define SIGNATURE_BOARD all
#define SIGNATURE_DATE 2020.09.27
#define SIGNATURE_HASH 104784854
#define TS_SIGNATURE "rusEFI 2020.09.27.all.104784854"
#define SIGNATURE_HASH 1069995964
#define TS_SIGNATURE "rusEFI 2020.09.27.all.1069995964"

4
firmware/controllers/generated/signature_frankenso_na6.h
View File

@ -4,5 +4,5 @@
#define SIGNATURE_BOARD frankenso_na6
#define SIGNATURE_DATE 2020.09.27
#define SIGNATURE_HASH 2711979501
#define TS_SIGNATURE "rusEFI 2020.09.27.frankenso_na6.2711979501"
#define SIGNATURE_HASH 2556277127
#define TS_SIGNATURE "rusEFI 2020.09.27.frankenso_na6.2556277127"

4
firmware/controllers/generated/signature_kin.h
View File

@ -4,5 +4,5 @@
#define SIGNATURE_BOARD kin
#define SIGNATURE_DATE 2020.09.27
#define SIGNATURE_HASH 3991263314
#define TS_SIGNATURE "rusEFI 2020.09.27.kin.3991263314"
#define SIGNATURE_HASH 3558730808
#define TS_SIGNATURE "rusEFI 2020.09.27.kin.3558730808"

4
firmware/controllers/generated/signature_mre_f4.h
View File

@ -4,5 +4,5 @@
#define SIGNATURE_BOARD mre_f4
#define SIGNATURE_DATE 2020.09.27
#define SIGNATURE_HASH 4049935425
#define TS_SIGNATURE "rusEFI 2020.09.27.mre_f4.4049935425"
#define SIGNATURE_HASH 3365742635
#define TS_SIGNATURE "rusEFI 2020.09.27.mre_f4.3365742635"

4
firmware/controllers/generated/signature_mre_f7.h
View File

@ -4,5 +4,5 @@
#define SIGNATURE_BOARD mre_f7
#define SIGNATURE_DATE 2020.09.27
#define SIGNATURE_HASH 4049935425
#define TS_SIGNATURE "rusEFI 2020.09.27.mre_f7.4049935425"
#define SIGNATURE_HASH 3365742635
#define TS_SIGNATURE "rusEFI 2020.09.27.mre_f7.3365742635"

4
firmware/controllers/generated/signature_prometheus_405.h
View File

@ -4,5 +4,5 @@
#define SIGNATURE_BOARD prometheus_405
#define SIGNATURE_DATE 2020.09.27
#define SIGNATURE_HASH 3004238501
#define TS_SIGNATURE "rusEFI 2020.09.27.prometheus_405.3004238501"
#define SIGNATURE_HASH 2330541775
#define TS_SIGNATURE "rusEFI 2020.09.27.prometheus_405.2330541775"

4
firmware/controllers/generated/signature_prometheus_469.h
View File

@ -4,5 +4,5 @@
#define SIGNATURE_BOARD prometheus_469
#define SIGNATURE_DATE 2020.09.27
#define SIGNATURE_HASH 3004238501
#define TS_SIGNATURE "rusEFI 2020.09.27.prometheus_469.3004238501"
#define SIGNATURE_HASH 2330541775
#define TS_SIGNATURE "rusEFI 2020.09.27.prometheus_469.2330541775"

4
firmware/controllers/generated/signature_proteus_f4.h
View File

@ -4,5 +4,5 @@
#define SIGNATURE_BOARD proteus_f4
#define SIGNATURE_DATE 2020.09.27
#define SIGNATURE_HASH 3857660102
#define TS_SIGNATURE "rusEFI 2020.09.27.proteus_f4.3857660102"
#define SIGNATURE_HASH 3692498092
#define TS_SIGNATURE "rusEFI 2020.09.27.proteus_f4.3692498092"

4
firmware/controllers/generated/signature_proteus_f7.h
View File

@ -4,5 +4,5 @@
#define SIGNATURE_BOARD proteus_f7
#define SIGNATURE_DATE 2020.09.27
#define SIGNATURE_HASH 3857660102
#define TS_SIGNATURE "rusEFI 2020.09.27.proteus_f7.3857660102"
#define SIGNATURE_HASH 3692498092
#define TS_SIGNATURE "rusEFI 2020.09.27.proteus_f7.3692498092"

BIN
firmware/tunerstudio/generated/cache.zip
View File

Binary file not shown.

6
firmware/tunerstudio/generated/rusefi.ini
View File

@ -33,12 +33,12 @@ enable2ndByteCanID = false
[MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
signature = "rusEFI 2020.09.27.all.104784854"
signature = "rusEFI 2020.09.27.all.1069995964"
[TunerStudio]
queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI 2020.09.27.all.104784854" ; signature is expected to be 7 or more characters.
signature = "rusEFI 2020.09.27.all.1069995964" ; signature is expected to be 7 or more characters.
[Constants]
; new packet serial format with CRC
@ -74,7 +74,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 Sun Sep 27 12:51:12 UTC 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Sep 27 13:58:59 UTC 2020
pageSize = 20000
page = 1

6
firmware/tunerstudio/generated/rusefi_frankenso_na6.ini
View File

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

6
firmware/tunerstudio/generated/rusefi_kinetis.ini
View File

@ -33,12 +33,12 @@ enable2ndByteCanID = false
[MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
signature = "rusEFI 2020.09.27.kin.3991263314"
signature = "rusEFI 2020.09.27.kin.3558730808"
[TunerStudio]
queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI 2020.09.27.kin.3991263314" ; signature is expected to be 7 or more characters.
signature = "rusEFI 2020.09.27.kin.3558730808" ; signature is expected to be 7 or more characters.
[Constants]
; new packet serial format with CRC
@ -74,7 +74,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 Sun Sep 27 12:51:32 UTC 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sun Sep 27 13:59:16 UTC 2020
pageSize = 20000
page = 1

6
firmware/tunerstudio/generated/rusefi_mre_f4.ini
View File

@ -33,12 +33,12 @@ enable2ndByteCanID = false
[MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
signature = "rusEFI 2020.09.27.mre_f4.4049935425"
signature = "rusEFI 2020.09.27.mre_f4.3365742635"
[TunerStudio]
queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI 2020.09.27.mre_f4.4049935425" ; signature is expected to be 7 or more characters.
signature = "rusEFI 2020.09.27.mre_f4.3365742635" ; signature is expected to be 7 or more characters.
[Constants]
; new packet serial format with CRC
@ -74,7 +74,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 Sun Sep 27 12:51:21 UTC 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Sep 27 13:59:06 UTC 2020
pageSize = 20000
page = 1

6
firmware/tunerstudio/generated/rusefi_mre_f7.ini
View File

@ -33,12 +33,12 @@ enable2ndByteCanID = false
[MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
signature = "rusEFI 2020.09.27.mre_f7.4049935425"
signature = "rusEFI 2020.09.27.mre_f7.3365742635"
[TunerStudio]
queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI 2020.09.27.mre_f7.4049935425" ; signature is expected to be 7 or more characters.
signature = "rusEFI 2020.09.27.mre_f7.3365742635" ; signature is expected to be 7 or more characters.
[Constants]
; new packet serial format with CRC
@ -74,7 +74,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 Sun Sep 27 12:51:17 UTC 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Sep 27 13:59:04 UTC 2020
pageSize = 20000
page = 1

6
firmware/tunerstudio/generated/rusefi_prometheus_405.ini
View File

@ -33,12 +33,12 @@ enable2ndByteCanID = false
[MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
signature = "rusEFI 2020.09.27.prometheus_405.3004238501"
signature = "rusEFI 2020.09.27.prometheus_405.2330541775"
[TunerStudio]
queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI 2020.09.27.prometheus_405.3004238501" ; signature is expected to be 7 or more characters.
signature = "rusEFI 2020.09.27.prometheus_405.2330541775" ; signature is expected to be 7 or more characters.
[Constants]
; new packet serial format with CRC
@ -74,7 +74,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 Sun Sep 27 12:51:27 UTC 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Sep 27 13:59:11 UTC 2020
pageSize = 20000
page = 1

6
firmware/tunerstudio/generated/rusefi_prometheus_469.ini
View File

@ -33,12 +33,12 @@ enable2ndByteCanID = false
[MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
signature = "rusEFI 2020.09.27.prometheus_469.3004238501"
signature = "rusEFI 2020.09.27.prometheus_469.2330541775"
[TunerStudio]
queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI 2020.09.27.prometheus_469.3004238501" ; signature is expected to be 7 or more characters.
signature = "rusEFI 2020.09.27.prometheus_469.2330541775" ; signature is expected to be 7 or more characters.
[Constants]
; new packet serial format with CRC
@ -74,7 +74,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 Sun Sep 27 12:51:25 UTC 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Sep 27 13:59:09 UTC 2020
pageSize = 20000
page = 1

6
firmware/tunerstudio/generated/rusefi_proteus_f4.ini
View File

@ -33,12 +33,12 @@ enable2ndByteCanID = false
[MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
signature = "rusEFI 2020.09.27.proteus_f4.3857660102"
signature = "rusEFI 2020.09.27.proteus_f4.3692498092"
[TunerStudio]
queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI 2020.09.27.proteus_f4.3857660102" ; signature is expected to be 7 or more characters.
signature = "rusEFI 2020.09.27.proteus_f4.3692498092" ; signature is expected to be 7 or more characters.
[Constants]
; new packet serial format with CRC
@ -74,7 +74,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 Sun Sep 27 12:51:30 UTC 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Sep 27 13:59:14 UTC 2020
pageSize = 20000
page = 1

6
firmware/tunerstudio/generated/rusefi_proteus_f7.ini
View File

@ -33,12 +33,12 @@ enable2ndByteCanID = false
[MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
signature = "rusEFI 2020.09.27.proteus_f7.3857660102"
signature = "rusEFI 2020.09.27.proteus_f7.3692498092"
[TunerStudio]
queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI 2020.09.27.proteus_f7.3857660102" ; signature is expected to be 7 or more characters.
signature = "rusEFI 2020.09.27.proteus_f7.3692498092" ; signature is expected to be 7 or more characters.
[Constants]
; new packet serial format with CRC
@ -74,7 +74,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 Sun Sep 27 12:51:29 UTC 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Sep 27 13:59:12 UTC 2020
pageSize = 20000
page = 1

6
java_console/models/src/main/java/com/rusefi/config/generated/Fields.java
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 Sun Sep 27 12:51:12 UTC 2020
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Sep 27 13:58:59 UTC 2020
// by class com.rusefi.output.FileJavaFieldsConsumer
import com.rusefi.config.*;
@ -1127,7 +1127,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 = 104784854;
public static final int SIGNATURE_HASH = 1069995964;
public static final int silentTriggerError_offset = 1464;
public static final int slowAdcAlpha_offset = 2088;
public static final int solenoidPadding_offset = 1198;
@ -1389,7 +1389,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.09.27.all.104784854";
public static final String TS_SIGNATURE = "rusEFI 2020.09.27.all.1069995964";
public static final char TS_SINGLE_WRITE_COMMAND = 'W';
public static final int TT_TT_60_2_VW = 20;
public static final int TT_TT_ONE = 18;

2
java_console/rusefi.xml
View File

@ -1,6 +1,6 @@
<roms>
<!-- was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh Sun Sep 27 12:51:13 UTC 2020 -->
<!-- was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh Sun Sep 27 13:59:03 UTC 2020 -->
<rom>
<romid>