From 27e944f2bfa1efec38a5c82b7f02f0bd7da319c7 Mon Sep 17 00:00:00 2001 From: GitHub build-firmware Action Date: Thu, 7 Jan 2021 13:25:37 +0000 Subject: [PATCH] Auto-generated configs and docs --- ...ngine_configuration_generated_structures.h | 4 ++-- .../controllers/algo/rusefi_generated.h | 5 ++--- ...ngine_configuration_generated_structures.h | 4 ++-- .../controllers/algo/rusefi_generated.h | 5 ++--- ...ngine_configuration_generated_structures.h | 4 ++-- .../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 | 5 ++--- .../controllers/generated/signature_all.h | 4 ++-- .../generated/signature_frankenso_na6.h | 4 ++-- .../generated/signature_hellen_cypress.h | 4 ++-- .../controllers/generated/signature_kin.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 987125 -> 987065 bytes firmware/tunerstudio/generated/rusefi.ini | 6 +++--- .../generated/rusefi_frankenso_na6.ini | 6 +++--- .../generated/rusefi_hellen_cypress.ini | 6 +++--- .../tunerstudio/generated/rusefi_kinetis.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 | 7 +++---- java_console/rusefi.xml | 2 +- 33 files changed, 70 insertions(+), 74 deletions(-) diff --git a/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h b/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h index eeb86b4485..ba89529f71 100644 --- a/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Thu Jan 07 13:07:57 UTC 2021 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Thu Jan 07 13:25:14 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3783,4 +3783,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 hellen_cypress_gen_config.bat integration/rusefi_config.txt Thu Jan 07 13:07:57 UTC 2021 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Thu Jan 07 13:25:14 UTC 2021 diff --git a/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h index ddd2b1a2cf..153877321c 100644 --- a/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h @@ -292,7 +292,6 @@ #define CMD_TS_INJECTOR_CATEGORY 19 #define CMD_TS_SOLENOID_CATEGORY 41 #define CMD_TS_X14 20 -#define CMD_TS_X15 21 #define CMD_TS_X17 23 #define CMD_TS_X18 24 #define CMD_TS_X31 49 @@ -1247,7 +1246,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD hellen_cypress #define SIGNATURE_DATE 2021.01.07 -#define SIGNATURE_HASH 3614967747 +#define SIGNATURE_HASH 3472719309 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1579,7 +1578,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.01.07.hellen_cypress.3614967747" +#define TS_SIGNATURE "rusEFI 2021.01.07.hellen_cypress.3472719309" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' // 0x74 diff --git a/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h b/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h index 0c9973f2a3..7a27c22de2 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Thu Jan 07 13:07:49 UTC 2021 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Thu Jan 07 13:25:07 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3783,4 +3783,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 Thu Jan 07 13:07:49 UTC 2021 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Thu Jan 07 13:25:07 UTC 2021 diff --git a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h index 9134599ad6..fafadfd0fd 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -292,7 +292,6 @@ #define CMD_TS_INJECTOR_CATEGORY 19 #define CMD_TS_SOLENOID_CATEGORY 41 #define CMD_TS_X14 20 -#define CMD_TS_X15 21 #define CMD_TS_X17 23 #define CMD_TS_X18 24 #define CMD_TS_X31 49 @@ -1247,7 +1246,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD kin #define SIGNATURE_DATE 2021.01.07 -#define SIGNATURE_HASH 2254716217 +#define SIGNATURE_HASH 2682341175 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1579,7 +1578,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator true #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.01.07.kin.2254716217" +#define TS_SIGNATURE "rusEFI 2021.01.07.kin.2682341175" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' // 0x74 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index ad205bda1c..31e09097af 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 Thu Jan 07 13:07:35 UTC 2021 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jan 07 13:24:50 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3783,4 +3783,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 Thu Jan 07 13:07:35 UTC 2021 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jan 07 13:24:50 UTC 2021 diff --git a/firmware/controllers/generated/fsio_enums_generated.def b/firmware/controllers/generated/fsio_enums_generated.def index 72c4e68796..64afee0968 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 Thu Jan 07 13:07:35 UTC 2021 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jan 07 13:24:50 UTC 2021 // 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 549200f0c5..5c37c29d3a 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 Thu Jan 07 13:07:35 UTC 2021 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jan 07 13:24:50 UTC 2021 // 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 75bb7ba93a..78a67a3868 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 Thu Jan 07 13:07:35 UTC 2021 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jan 07 13:24:50 UTC 2021 // 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 c02d2a203e..8bfb93cf7c 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 Thu Jan 07 13:07:35 UTC 2021 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jan 07 13:24:50 UTC 2021 // 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 e37827588a..c67f60d5b4 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -292,7 +292,6 @@ #define CMD_TS_INJECTOR_CATEGORY 19 #define CMD_TS_SOLENOID_CATEGORY 41 #define CMD_TS_X14 20 -#define CMD_TS_X15 21 #define CMD_TS_X17 23 #define CMD_TS_X18 24 #define CMD_TS_X31 49 @@ -1247,7 +1246,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD all #define SIGNATURE_DATE 2021.01.07 -#define SIGNATURE_HASH 512336128 +#define SIGNATURE_HASH 118283022 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1579,7 +1578,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.01.07.all.512336128" +#define TS_SIGNATURE "rusEFI 2021.01.07.all.118283022" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' // 0x74 diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index 6b2e1db765..ceb4b66b12 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 2021.01.07 -#define SIGNATURE_HASH 512336128 -#define TS_SIGNATURE "rusEFI 2021.01.07.all.512336128" +#define SIGNATURE_HASH 118283022 +#define TS_SIGNATURE "rusEFI 2021.01.07.all.118283022" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index e773e6173d..a410369039 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 2021.01.07 -#define SIGNATURE_HASH 2298024187 -#define TS_SIGNATURE "rusEFI 2021.01.07.frankenso_na6.2298024187" +#define SIGNATURE_HASH 2440850165 +#define TS_SIGNATURE "rusEFI 2021.01.07.frankenso_na6.2440850165" diff --git a/firmware/controllers/generated/signature_hellen_cypress.h b/firmware/controllers/generated/signature_hellen_cypress.h index e39ebba438..5687bf3677 100644 --- a/firmware/controllers/generated/signature_hellen_cypress.h +++ b/firmware/controllers/generated/signature_hellen_cypress.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD hellen_cypress #define SIGNATURE_DATE 2021.01.07 -#define SIGNATURE_HASH 3614967747 -#define TS_SIGNATURE "rusEFI 2021.01.07.hellen_cypress.3614967747" +#define SIGNATURE_HASH 3472719309 +#define TS_SIGNATURE "rusEFI 2021.01.07.hellen_cypress.3472719309" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 43237294e0..c35087fdf5 100644 --- a/firmware/controllers/generated/signature_kin.h +++ b/firmware/controllers/generated/signature_kin.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD kin #define SIGNATURE_DATE 2021.01.07 -#define SIGNATURE_HASH 2254716217 -#define TS_SIGNATURE "rusEFI 2021.01.07.kin.2254716217" +#define SIGNATURE_HASH 2682341175 +#define TS_SIGNATURE "rusEFI 2021.01.07.kin.2682341175" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 3700176856..dbcdf6b863 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 2021.01.07 -#define SIGNATURE_HASH 156860281 -#define TS_SIGNATURE "rusEFI 2021.01.07.mre_f4.156860281" +#define SIGNATURE_HASH 282854775 +#define TS_SIGNATURE "rusEFI 2021.01.07.mre_f4.282854775" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index a05cc5e877..3ad431da99 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 2021.01.07 -#define SIGNATURE_HASH 156860281 -#define TS_SIGNATURE "rusEFI 2021.01.07.mre_f7.156860281" +#define SIGNATURE_HASH 282854775 +#define TS_SIGNATURE "rusEFI 2021.01.07.mre_f7.282854775" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 1104c01355..bc5703f6d0 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 2021.01.07 -#define SIGNATURE_HASH 1548855121 -#define TS_SIGNATURE "rusEFI 2021.01.07.prometheus_405.1548855121" +#define SIGNATURE_HASH 1171578207 +#define TS_SIGNATURE "rusEFI 2021.01.07.prometheus_405.1171578207" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index a90ee9a528..dc7ad3ed58 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 2021.01.07 -#define SIGNATURE_HASH 1548855121 -#define TS_SIGNATURE "rusEFI 2021.01.07.prometheus_469.1548855121" +#define SIGNATURE_HASH 1171578207 +#define TS_SIGNATURE "rusEFI 2021.01.07.prometheus_469.1171578207" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 1428a02b6f..22b0de5d31 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 2021.01.07 -#define SIGNATURE_HASH 3609455582 -#define TS_SIGNATURE "rusEFI 2021.01.07.proteus_f4.3609455582" +#define SIGNATURE_HASH 3467022800 +#define TS_SIGNATURE "rusEFI 2021.01.07.proteus_f4.3467022800" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 6d016d04d5..7880075673 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 2021.01.07 -#define SIGNATURE_HASH 3609455582 -#define TS_SIGNATURE "rusEFI 2021.01.07.proteus_f7.3609455582" +#define SIGNATURE_HASH 3467022800 +#define TS_SIGNATURE "rusEFI 2021.01.07.proteus_f7.3467022800" diff --git a/firmware/tunerstudio/generated/cache.zip b/firmware/tunerstudio/generated/cache.zip index 9abfccbff42dec54e45a335f6beb128573c3dc1b..683a58a682b1e981dcb6e8dcbbfa20ba9c000d31 100644 GIT binary patch delta 33301 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 Xv%XVWq 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 - +