From 6a32510a4cb21ae1ac71bbe658da0b7ff5a74f4d Mon Sep 17 00:00:00 2001 From: GitHub build-firmware Action Date: Wed, 6 Jan 2021 18:49:08 +0000 Subject: [PATCH] Auto-generated configs and docs --- ...ngine_configuration_generated_structures.h | 4 ++-- .../controllers/algo/rusefi_generated.h | 11 ++++++++--- ...ngine_configuration_generated_structures.h | 4 ++-- .../controllers/algo/rusefi_generated.h | 11 ++++++++--- ...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 | 11 ++++++++--- .../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 987235 -> 987585 bytes firmware/tunerstudio/generated/rusefi.ini | 18 +++++++++--------- .../generated/rusefi_frankenso_na6.ini | 18 +++++++++--------- .../generated/rusefi_hellen_cypress.ini | 18 +++++++++--------- .../tunerstudio/generated/rusefi_kinetis.ini | 18 +++++++++--------- .../tunerstudio/generated/rusefi_mre_f4.ini | 18 +++++++++--------- .../tunerstudio/generated/rusefi_mre_f7.ini | 18 +++++++++--------- .../generated/rusefi_prometheus_405.ini | 18 +++++++++--------- .../generated/rusefi_prometheus_469.ini | 18 +++++++++--------- .../generated/rusefi_proteus_f4.ini | 18 +++++++++--------- .../generated/rusefi_proteus_f7.ini | 18 +++++++++--------- .../com/rusefi/config/generated/Fields.java | 12 ++++++++---- java_console/rusefi.xml | 2 +- 33 files changed, 153 insertions(+), 134 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 000c68e550..1734b4ce2d 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 Wed Jan 06 03:32:04 UTC 2021 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Wed Jan 06 18:48:54 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3785,4 +3785,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 Wed Jan 06 03:32:04 UTC 2021 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Wed Jan 06 18:48:54 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 a553fe4fc0..68ab0c295b 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 @@ -290,7 +290,12 @@ #define CMD_TS_FSIO_CATEGORY 33 #define CMD_TS_IGNITION_CATEGORY 18 #define CMD_TS_INJECTOR_CATEGORY 19 -#define CMD_TS_SOLENOID_CATEGORY 20 +#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 #define CMD_VSS_PIN "vss_pin" #define CMD_WRITECONFIG "writeconfig" #define coastingFuelCutClt_offset 3154 @@ -1244,7 +1249,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD hellen_cypress #define SIGNATURE_DATE 2021.01.06 -#define SIGNATURE_HASH 3843654885 +#define SIGNATURE_HASH 706166197 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1576,7 +1581,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.01.06.hellen_cypress.3843654885" +#define TS_SIGNATURE "rusEFI 2021.01.06.hellen_cypress.706166197" #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 7a4d8c6e13..5c584cf9eb 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 Wed Jan 06 03:31:58 UTC 2021 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Wed Jan 06 18:48:44 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3785,4 +3785,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 Wed Jan 06 03:31:58 UTC 2021 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Wed Jan 06 18:48:44 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 1bce8b57ba..335400cb05 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -290,7 +290,12 @@ #define CMD_TS_FSIO_CATEGORY 33 #define CMD_TS_IGNITION_CATEGORY 18 #define CMD_TS_INJECTOR_CATEGORY 19 -#define CMD_TS_SOLENOID_CATEGORY 20 +#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 #define CMD_VSS_PIN "vss_pin" #define CMD_WRITECONFIG "writeconfig" #define coastingFuelCutClt_offset 3154 @@ -1244,7 +1249,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD kin #define SIGNATURE_DATE 2021.01.06 -#define SIGNATURE_HASH 3020275231 +#define SIGNATURE_HASH 2064320335 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1576,7 +1581,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator true #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.01.06.kin.3020275231" +#define TS_SIGNATURE "rusEFI 2021.01.06.kin.2064320335" #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 30a8339bb8..ebbc5dcc6a 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 Jan 06 03:31:41 UTC 2021 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jan 06 18:48:31 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3785,4 +3785,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 Jan 06 03:31:41 UTC 2021 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jan 06 18:48:31 UTC 2021 diff --git a/firmware/controllers/generated/fsio_enums_generated.def b/firmware/controllers/generated/fsio_enums_generated.def index 0716fd0eab..45e5ceac52 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 Jan 06 03:31:41 UTC 2021 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jan 06 18:48:31 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 29a888c2a3..085982aeb7 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 Jan 06 03:31:41 UTC 2021 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jan 06 18:48:31 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 04ee368161..21c5b2fd11 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 Jan 06 03:31:41 UTC 2021 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jan 06 18:48:31 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 393f3445b3..cc17055d54 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 Jan 06 03:31:41 UTC 2021 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jan 06 18:48:31 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 23fc7cd7bf..4e9754f913 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -290,7 +290,12 @@ #define CMD_TS_FSIO_CATEGORY 33 #define CMD_TS_IGNITION_CATEGORY 18 #define CMD_TS_INJECTOR_CATEGORY 19 -#define CMD_TS_SOLENOID_CATEGORY 20 +#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 #define CMD_VSS_PIN "vss_pin" #define CMD_WRITECONFIG "writeconfig" #define coastingFuelCutClt_offset 3154 @@ -1244,7 +1249,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD all #define SIGNATURE_DATE 2021.01.06 -#define SIGNATURE_HASH 753410598 +#define SIGNATURE_HASH 3823541110 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1576,7 +1581,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.01.06.all.753410598" +#define TS_SIGNATURE "rusEFI 2021.01.06.all.3823541110" #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 ccd7450759..f716d9aac6 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.06 -#define SIGNATURE_HASH 753410598 -#define TS_SIGNATURE "rusEFI 2021.01.06.all.753410598" +#define SIGNATURE_HASH 3823541110 +#define TS_SIGNATURE "rusEFI 2021.01.06.all.3823541110" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 765ad67eab..4392a7ef63 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.06 -#define SIGNATURE_HASH 3130561501 -#define TS_SIGNATURE "rusEFI 2021.01.06.frankenso_na6.3130561501" +#define SIGNATURE_HASH 1972775565 +#define TS_SIGNATURE "rusEFI 2021.01.06.frankenso_na6.1972775565" diff --git a/firmware/controllers/generated/signature_hellen_cypress.h b/firmware/controllers/generated/signature_hellen_cypress.h index dfd377c611..29c7426af4 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.06 -#define SIGNATURE_HASH 3843654885 -#define TS_SIGNATURE "rusEFI 2021.01.06.hellen_cypress.3843654885" +#define SIGNATURE_HASH 706166197 +#define TS_SIGNATURE "rusEFI 2021.01.06.hellen_cypress.706166197" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index c13f1adc1d..a1cee0dab0 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.06 -#define SIGNATURE_HASH 3020275231 -#define TS_SIGNATURE "rusEFI 2021.01.06.kin.3020275231" +#define SIGNATURE_HASH 2064320335 +#define TS_SIGNATURE "rusEFI 2021.01.06.kin.2064320335" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index ef3bdcd612..f0c6867f1b 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.06 -#define SIGNATURE_HASH 993590367 -#define TS_SIGNATURE "rusEFI 2021.01.06.mre_f4.993590367" +#define SIGNATURE_HASH 4097197327 +#define TS_SIGNATURE "rusEFI 2021.01.06.mre_f4.4097197327" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 1087efe0b9..acd579389b 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.06 -#define SIGNATURE_HASH 993590367 -#define TS_SIGNATURE "rusEFI 2021.01.06.mre_f7.993590367" +#define SIGNATURE_HASH 4097197327 +#define TS_SIGNATURE "rusEFI 2021.01.06.mre_f7.4097197327" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index c15f09ddb6..0a962c25c5 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.06 -#define SIGNATURE_HASH 1848648823 -#define TS_SIGNATURE "rusEFI 2021.01.06.prometheus_405.1848648823" +#define SIGNATURE_HASH 2705235239 +#define TS_SIGNATURE "rusEFI 2021.01.06.prometheus_405.2705235239" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 7420ad62ac..44a22064b3 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.06 -#define SIGNATURE_HASH 1848648823 -#define TS_SIGNATURE "rusEFI 2021.01.06.prometheus_469.1848648823" +#define SIGNATURE_HASH 2705235239 +#define TS_SIGNATURE "rusEFI 2021.01.06.prometheus_469.2705235239" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 6381ec6c7a..3ff095c359 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.06 -#define SIGNATURE_HASH 3846334712 -#define TS_SIGNATURE "rusEFI 2021.01.06.proteus_f4.3846334712" +#define SIGNATURE_HASH 709677480 +#define TS_SIGNATURE "rusEFI 2021.01.06.proteus_f4.709677480" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 2c2b6ada99..b363dd46c2 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.06 -#define SIGNATURE_HASH 3846334712 -#define TS_SIGNATURE "rusEFI 2021.01.06.proteus_f7.3846334712" +#define SIGNATURE_HASH 709677480 +#define TS_SIGNATURE "rusEFI 2021.01.06.proteus_f7.709677480" diff --git a/firmware/tunerstudio/generated/cache.zip b/firmware/tunerstudio/generated/cache.zip index 54c06c70420949b7403e2dbe972cd9020a87b0e5..36917b53b68175d86aaceb88a9b08aa96d852188 100644 GIT binary patch delta 33779 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 Lh~Xz>_<#QgT9p`p delta 33342 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 - +