From be5fda78eb1aca04c47bc1a448caba5705051d04 Mon Sep 17 00:00:00 2001 From: GitHub build-firmware Action Date: Thu, 9 Jul 2020 20:02:54 +0000 Subject: [PATCH] Auto-generated configs and docs --- ...ngine_configuration_generated_structures.h | 5 +++-- .../generated/fsio_enums_generated.def | 2 +- .../controllers/generated/fsio_getters.def | 2 +- firmware/controllers/generated/fsio_names.def | 2 +- .../controllers/generated/fsio_strings.def | 2 +- .../controllers/generated/rusefi_generated.h | 6 +++--- .../controllers/generated/signature_all.h | 4 ++-- .../generated/signature_frankenso_na6.h | 4 ++-- .../controllers/generated/signature_mre_f4.h | 4 ++-- .../controllers/generated/signature_mre_f7.h | 4 ++-- .../generated/signature_prometheus_405.h | 4 ++-- .../generated/signature_prometheus_469.h | 4 ++-- .../generated/signature_proteus_f4.h | 4 ++-- .../generated/signature_proteus_f7.h | 4 ++-- firmware/tunerstudio/generated/cache.zip | Bin 842845 -> 842957 bytes firmware/tunerstudio/generated/rusefi.ini | 6 +++--- .../generated/rusefi_frankenso_na6.ini | 6 +++--- .../tunerstudio/generated/rusefi_mre_f4.ini | 6 +++--- .../tunerstudio/generated/rusefi_mre_f7.ini | 6 +++--- .../generated/rusefi_prometheus_405.ini | 6 +++--- .../generated/rusefi_prometheus_469.ini | 6 +++--- .../generated/rusefi_proteus_f4.ini | 6 +++--- .../generated/rusefi_proteus_f7.ini | 6 +++--- .../com/rusefi/config/generated/Fields.java | 5 ++--- java_console/rusefi.xml | 2 +- 25 files changed, 53 insertions(+), 53 deletions(-) diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index 5c5f464cb1..f98e4e6d0c 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 08 03:02:21 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jul 09 20:02:17 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -1373,6 +1373,7 @@ struct engine_configuration_s { offset 744 bit 2 */ bool is_enabled_spi_3 : 1; /** + * enable sd/disable sd offset 744 bit 3 */ bool isSdCardEnabled : 1; /** @@ -3526,4 +3527,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 Wed Jul 08 03:02:21 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jul 09 20:02:17 UTC 2020 diff --git a/firmware/controllers/generated/fsio_enums_generated.def b/firmware/controllers/generated/fsio_enums_generated.def index 109d737913..2cecdea759 100644 --- a/firmware/controllers/generated/fsio_enums_generated.def +++ b/firmware/controllers/generated/fsio_enums_generated.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 08 03:02:21 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jul 09 20:02:17 UTC 2020 // by class com.rusefi.output.FileFsioSettingsConsumer FSIO_SETTING_FANONTEMPERATURE = 1000, diff --git a/firmware/controllers/generated/fsio_getters.def b/firmware/controllers/generated/fsio_getters.def index 4dd19aec03..ad4ae8bfc6 100644 --- a/firmware/controllers/generated/fsio_getters.def +++ b/firmware/controllers/generated/fsio_getters.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 08 03:02:21 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jul 09 20:02:17 UTC 2020 // by class com.rusefi.output.FileFsioSettingsConsumer case FSIO_SETTING_FANONTEMPERATURE: diff --git a/firmware/controllers/generated/fsio_names.def b/firmware/controllers/generated/fsio_names.def index 1f7b8aa077..f9f92b2ee4 100644 --- a/firmware/controllers/generated/fsio_names.def +++ b/firmware/controllers/generated/fsio_names.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 08 03:02:21 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jul 09 20:02:17 UTC 2020 // by class com.rusefi.output.FileFsioSettingsConsumer static LENameOrdinalPair lefanOnTemperature(FSIO_SETTING_FANONTEMPERATURE, "cfg_fanOnTemperature"); diff --git a/firmware/controllers/generated/fsio_strings.def b/firmware/controllers/generated/fsio_strings.def index 57cc9b8774..aeb8687443 100644 --- a/firmware/controllers/generated/fsio_strings.def +++ b/firmware/controllers/generated/fsio_strings.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 08 03:02:21 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jul 09 20:02:17 UTC 2020 // by class com.rusefi.output.FileFsioSettingsConsumer case FSIO_SETTING_FANONTEMPERATURE: diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index 49de586091..2edcad326e 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -1062,8 +1062,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD all -#define SIGNATURE_DATE 2020.07.08 -#define SIGNATURE_HASH 35698347 +#define SIGNATURE_DATE 2020.07.09 +#define SIGNATURE_HASH 3499007089 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1323,7 +1323,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2020.07.08.all.35698347" +#define TS_SIGNATURE "rusEFI 2020.07.09.all.3499007089" #define TS_SINGLE_WRITE_COMMAND 'W' #define tunerStudioSerialSpeed_offset 728 #define twoWireBatchIgnition_offset 1476 diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index f8cfae9a2d..f54b96bdcc 100644 --- a/firmware/controllers/generated/signature_all.h +++ b/firmware/controllers/generated/signature_all.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD all #define SIGNATURE_DATE 2020.07.09 -#define SIGNATURE_HASH 4220792071 -#define TS_SIGNATURE "rusEFI 2020.07.09.all.4220792071" +#define SIGNATURE_HASH 3499007089 +#define TS_SIGNATURE "rusEFI 2020.07.09.all.3499007089" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 3ff3a3cd93..b02577cc70 100644 --- a/firmware/controllers/generated/signature_frankenso_na6.h +++ b/firmware/controllers/generated/signature_frankenso_na6.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD frankenso_na6 #define SIGNATURE_DATE 2020.07.09 -#define SIGNATURE_HASH 622019044 -#define TS_SIGNATURE "rusEFI 2020.07.09.frankenso_na6.622019044" +#define SIGNATURE_HASH 235532434 +#define TS_SIGNATURE "rusEFI 2020.07.09.frankenso_na6.235532434" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 2a49b2193a..30a59be7f5 100644 --- a/firmware/controllers/generated/signature_mre_f4.h +++ b/firmware/controllers/generated/signature_mre_f4.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD mre_f4 #define SIGNATURE_DATE 2020.07.09 -#define SIGNATURE_HASH 2993355657 -#define TS_SIGNATURE "rusEFI 2020.07.09.mre_f4.2993355657" +#define SIGNATURE_HASH 2574273279 +#define TS_SIGNATURE "rusEFI 2020.07.09.mre_f4.2574273279" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index a62116047e..fa1b39bb0b 100644 --- a/firmware/controllers/generated/signature_mre_f7.h +++ b/firmware/controllers/generated/signature_mre_f7.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD mre_f7 #define SIGNATURE_DATE 2020.07.09 -#define SIGNATURE_HASH 2993355657 -#define TS_SIGNATURE "rusEFI 2020.07.09.mre_f7.2993355657" +#define SIGNATURE_HASH 2574273279 +#define TS_SIGNATURE "rusEFI 2020.07.09.mre_f7.2574273279" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 53eb013ddd..6207d56ed8 100644 --- a/firmware/controllers/generated/signature_prometheus_405.h +++ b/firmware/controllers/generated/signature_prometheus_405.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD prometheus_405 #define SIGNATURE_DATE 2020.07.09 -#define SIGNATURE_HASH 243856771 -#define TS_SIGNATURE "rusEFI 2020.07.09.prometheus_405.243856771" +#define SIGNATURE_HASH 630342901 +#define TS_SIGNATURE "rusEFI 2020.07.09.prometheus_405.630342901" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index b99b6cf886..8d1f44d3f8 100644 --- a/firmware/controllers/generated/signature_prometheus_469.h +++ b/firmware/controllers/generated/signature_prometheus_469.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD prometheus_469 #define SIGNATURE_DATE 2020.07.09 -#define SIGNATURE_HASH 243856771 -#define TS_SIGNATURE "rusEFI 2020.07.09.prometheus_469.243856771" +#define SIGNATURE_HASH 630342901 +#define TS_SIGNATURE "rusEFI 2020.07.09.prometheus_469.630342901" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index bf21b9317d..59eb46098b 100644 --- a/firmware/controllers/generated/signature_proteus_f4.h +++ b/firmware/controllers/generated/signature_proteus_f4.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD proteus_f4 #define SIGNATURE_DATE 2020.07.09 -#define SIGNATURE_HASH 1980062920 -#define TS_SIGNATURE "rusEFI 2020.07.09.proteus_f4.1980062920" +#define SIGNATURE_HASH 1562373566 +#define TS_SIGNATURE "rusEFI 2020.07.09.proteus_f4.1562373566" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 404ab3d987..704f8a1269 100644 --- a/firmware/controllers/generated/signature_proteus_f7.h +++ b/firmware/controllers/generated/signature_proteus_f7.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD proteus_f7 #define SIGNATURE_DATE 2020.07.09 -#define SIGNATURE_HASH 1980062920 -#define TS_SIGNATURE "rusEFI 2020.07.09.proteus_f7.1980062920" +#define SIGNATURE_HASH 1562373566 +#define TS_SIGNATURE "rusEFI 2020.07.09.proteus_f7.1562373566" diff --git a/firmware/tunerstudio/generated/cache.zip b/firmware/tunerstudio/generated/cache.zip index 02bebd488b635deb64c13c5986ff06cfde9cce43..a52d07fd975cb5db489138c7d97a8d08b7b5f9f8 100644 GIT binary patch delta 111793 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 cb`iz@Ux+Iik_suK?14EU8ad+$g1104rod5s; diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index ba77157537..ba11d577bd 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -45,12 +45,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.07.09.all.4220792071" + signature = "rusEFI 2020.07.09.all.3499007089" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.07.09.all.4220792071" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.07.09.all.3499007089" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -88,7 +88,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 Thu Jul 09 02:04:48 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jul 09 20:02:17 UTC 2020 pageSize = 20000 page = 1 diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index e9105340d2..4a9feb15ed 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -45,12 +45,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.07.09.frankenso_na6.622019044" + signature = "rusEFI 2020.07.09.frankenso_na6.235532434" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.07.09.frankenso_na6.622019044" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.07.09.frankenso_na6.235532434" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -88,7 +88,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 Thu Jul 09 02:04:54 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jul 09 20:02:26 UTC 2020 pageSize = 20000 page = 1 diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 3cc3000c46..0a25f7918b 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -45,12 +45,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.07.09.mre_f4.2993355657" + signature = "rusEFI 2020.07.09.mre_f4.2574273279" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.07.09.mre_f4.2993355657" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.07.09.mre_f4.2574273279" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -88,7 +88,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 Thu Jul 09 02:04:53 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jul 09 20:02:25 UTC 2020 pageSize = 20000 page = 1 diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 1367dc0312..67b2f11a58 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -45,12 +45,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.07.09.mre_f7.2993355657" + signature = "rusEFI 2020.07.09.mre_f7.2574273279" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.07.09.mre_f7.2993355657" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.07.09.mre_f7.2574273279" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -88,7 +88,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 Thu Jul 09 02:04:52 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jul 09 20:02:24 UTC 2020 pageSize = 20000 page = 1 diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index 7a91c3b736..bde8c7f1c7 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini @@ -45,12 +45,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.07.09.prometheus_405.243856771" + signature = "rusEFI 2020.07.09.prometheus_405.630342901" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.07.09.prometheus_405.243856771" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.07.09.prometheus_405.630342901" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -88,7 +88,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 Thu Jul 09 02:04:57 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jul 09 20:02:29 UTC 2020 pageSize = 20000 page = 1 diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index 50b14a6f3e..909e289703 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini @@ -45,12 +45,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.07.09.prometheus_469.243856771" + signature = "rusEFI 2020.07.09.prometheus_469.630342901" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.07.09.prometheus_469.243856771" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.07.09.prometheus_469.630342901" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -88,7 +88,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 Thu Jul 09 02:04:55 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jul 09 20:02:28 UTC 2020 pageSize = 20000 page = 1 diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index ed8ca5021f..c84ffda193 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -45,12 +45,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.07.09.proteus_f4.1980062920" + signature = "rusEFI 2020.07.09.proteus_f4.1562373566" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.07.09.proteus_f4.1980062920" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.07.09.proteus_f4.1562373566" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -88,7 +88,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 Thu Jul 09 02:04:59 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jul 09 20:02:31 UTC 2020 pageSize = 20000 page = 1 diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index 0fdfe5a931..c51d28b09b 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -45,12 +45,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.07.09.proteus_f7.1980062920" + signature = "rusEFI 2020.07.09.proteus_f7.1562373566" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.07.09.proteus_f7.1980062920" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.07.09.proteus_f7.1562373566" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -88,7 +88,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 Thu Jul 09 02:04:58 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jul 09 20:02:30 UTC 2020 pageSize = 20000 page = 1 diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java b/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java index 0259348353..491d8ef1db 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java @@ -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 Wed Jul 08 03:02:21 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jul 09 20:02:17 UTC 2020 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -1044,7 +1044,6 @@ 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 = 35698347; public static final int silentTriggerError_offset = 1464; public static final int slowAdcAlpha_offset = 2088; public static final int sparkDwellRpmBins_offset = 332; @@ -1283,7 +1282,7 @@ public class Fields { public static final int TS_RESPONSE_COMMAND_OK = 7; public static final int TS_RESPONSE_OK = 0; public static final char TS_SET_LOGGER_SWITCH = 'l'; - public static final String TS_SIGNATURE = "rusEFI 2020.07.08.all.35698347"; + public static final String TS_SIGNATURE = "rusEFI 2020.07.09.all.3499007089"; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final int tunerStudioSerialSpeed_offset = 728; public static final int twoWireBatchIgnition_offset = 1476; diff --git a/java_console/rusefi.xml b/java_console/rusefi.xml index 18f867ba35..a0f86096a9 100644 --- a/java_console/rusefi.xml +++ b/java_console/rusefi.xml @@ -1,6 +1,6 @@ - +