From fb0863a1bef5aa6675209d40b406d97c928efef9 Mon Sep 17 00:00:00 2001 From: GitHub build-firmware Action Date: Thu, 26 Nov 2020 22:30:00 +0000 Subject: [PATCH] Auto-generated configs and docs --- ...ngine_configuration_generated_structures.h | 4 ++-- .../controllers/algo/rusefi_generated.h | 7 ++++--- ...ngine_configuration_generated_structures.h | 4 ++-- .../controllers/algo/rusefi_generated.h | 7 ++++--- ...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 | 7 ++++--- .../controllers/generated/signature_all.h | 6 +++--- .../generated/signature_frankenso_na6.h | 6 +++--- .../generated/signature_hellen_cypress.h | 6 +++--- .../controllers/generated/signature_kin.h | 6 +++--- .../controllers/generated/signature_mre_f4.h | 6 +++--- .../controllers/generated/signature_mre_f7.h | 6 +++--- .../generated/signature_prometheus_405.h | 6 +++--- .../generated/signature_prometheus_469.h | 6 +++--- .../generated/signature_proteus_f4.h | 6 +++--- .../generated/signature_proteus_f7.h | 6 +++--- firmware/tunerstudio/generated/cache.zip | Bin 965765 -> 965805 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, 87 insertions(+), 83 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 193cbb38a3..65bef80169 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 Nov 25 18:21:22 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Thu Nov 26 22:29:35 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3777,4 +3777,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 Nov 25 18:21:22 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Thu Nov 26 22:29:35 UTC 2020 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 ee82d85cd4..5f2c3c9635 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 @@ -255,6 +255,7 @@ #define CMD_INJECTION "injection" #define CMD_MIL_BENCH "milbench" #define CMD_PINS "pins" +#define CMD_PWM "pwm" #define CMD_REBOOT "reboot" #define CMD_REBOOT_DFU "reboot_dfu" #define CMD_RESET_ENGINE_SNIFFER "reset_engine_chart" @@ -1210,8 +1211,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD hellen_cypress -#define SIGNATURE_DATE 2020.11.25 -#define SIGNATURE_HASH 4200326349 +#define SIGNATURE_DATE 2020.11.26 +#define SIGNATURE_HASH 2590151221 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1541,7 +1542,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2020.11.25.hellen_cypress.4200326349" +#define TS_SIGNATURE "rusEFI 2020.11.26.hellen_cypress.2590151221" #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 abd7e9c571..e0fe9c6439 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 Nov 25 18:21:20 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Thu Nov 26 22:29:33 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3777,4 +3777,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 Nov 25 18:21:20 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Thu Nov 26 22:29:33 UTC 2020 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 c500ad4da4..7c948006e6 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -255,6 +255,7 @@ #define CMD_INJECTION "injection" #define CMD_MIL_BENCH "milbench" #define CMD_PINS "pins" +#define CMD_PWM "pwm" #define CMD_REBOOT "reboot" #define CMD_REBOOT_DFU "reboot_dfu" #define CMD_RESET_ENGINE_SNIFFER "reset_engine_chart" @@ -1210,8 +1211,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD kin -#define SIGNATURE_DATE 2020.11.25 -#define SIGNATURE_HASH 2873613879 +#define SIGNATURE_DATE 2020.11.26 +#define SIGNATURE_HASH 3414075599 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1541,7 +1542,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator true #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2020.11.25.kin.2873613879" +#define TS_SIGNATURE "rusEFI 2020.11.26.kin.3414075599" #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 38ad59b02e..c9854de39a 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 Nov 25 18:20:57 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 26 22:29:07 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3777,4 +3777,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 Nov 25 18:20:57 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 26 22:29:07 UTC 2020 diff --git a/firmware/controllers/generated/fsio_enums_generated.def b/firmware/controllers/generated/fsio_enums_generated.def index 36620f0d27..42abac791b 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 Nov 25 18:20:57 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 26 22:29:07 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 dafcd30140..d9bf5932de 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 Nov 25 18:20:57 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 26 22:29:07 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 c0bb21f6a2..41c098703e 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 Nov 25 18:20:57 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 26 22:29:07 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 7509cec2f0..0e36c28a30 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 Nov 25 18:20:57 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 26 22:29:07 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 345f40b4d1..54809063c1 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -255,6 +255,7 @@ #define CMD_INJECTION "injection" #define CMD_MIL_BENCH "milbench" #define CMD_PINS "pins" +#define CMD_PWM "pwm" #define CMD_REBOOT "reboot" #define CMD_REBOOT_DFU "reboot_dfu" #define CMD_RESET_ENGINE_SNIFFER "reset_engine_chart" @@ -1210,8 +1211,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD all -#define SIGNATURE_DATE 2020.11.25 -#define SIGNATURE_HASH 866796046 +#define SIGNATURE_DATE 2020.11.26 +#define SIGNATURE_HASH 1402156278 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1541,7 +1542,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2020.11.25.all.866796046" +#define TS_SIGNATURE "rusEFI 2020.11.26.all.1402156278" #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 f94ba6a74e..b6fd64c610 100644 --- a/firmware/controllers/generated/signature_all.h +++ b/firmware/controllers/generated/signature_all.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD all -#define SIGNATURE_DATE 2020.11.25 -#define SIGNATURE_HASH 822932680 -#define TS_SIGNATURE "rusEFI 2020.11.25.all.822932680" +#define SIGNATURE_DATE 2020.11.26 +#define SIGNATURE_HASH 1402156278 +#define TS_SIGNATURE "rusEFI 2020.11.26.all.1402156278" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 6e05f1ae40..5c9b87c6ff 100644 --- a/firmware/controllers/generated/signature_frankenso_na6.h +++ b/firmware/controllers/generated/signature_frankenso_na6.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD frankenso_na6 -#define SIGNATURE_DATE 2020.11.25 -#define SIGNATURE_HASH 2809939251 -#define TS_SIGNATURE "rusEFI 2020.11.25.frankenso_na6.2809939251" +#define SIGNATURE_DATE 2020.11.26 +#define SIGNATURE_HASH 3320022285 +#define TS_SIGNATURE "rusEFI 2020.11.26.frankenso_na6.3320022285" diff --git a/firmware/controllers/generated/signature_hellen_cypress.h b/firmware/controllers/generated/signature_hellen_cypress.h index 3d4809ed4d..45d6d9f7a9 100644 --- a/firmware/controllers/generated/signature_hellen_cypress.h +++ b/firmware/controllers/generated/signature_hellen_cypress.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD hellen_cypress -#define SIGNATURE_DATE 2020.11.25 -#define SIGNATURE_HASH 4177351179 -#define TS_SIGNATURE "rusEFI 2020.11.25.hellen_cypress.4177351179" +#define SIGNATURE_DATE 2020.11.26 +#define SIGNATURE_HASH 2590151221 +#define TS_SIGNATURE "rusEFI 2020.11.26.hellen_cypress.2590151221" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 392d40b68a..438e239b6b 100644 --- a/firmware/controllers/generated/signature_kin.h +++ b/firmware/controllers/generated/signature_kin.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD kin -#define SIGNATURE_DATE 2020.11.25 -#define SIGNATURE_HASH 2850121969 -#define TS_SIGNATURE "rusEFI 2020.11.25.kin.2850121969" +#define SIGNATURE_DATE 2020.11.26 +#define SIGNATURE_HASH 3414075599 +#define TS_SIGNATURE "rusEFI 2020.11.26.kin.3414075599" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index b1abf06a4a..9869cfaee4 100644 --- a/firmware/controllers/generated/signature_mre_f4.h +++ b/firmware/controllers/generated/signature_mre_f4.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD mre_f4 -#define SIGNATURE_DATE 2020.11.25 -#define SIGNATURE_HASH 651963057 -#define TS_SIGNATURE "rusEFI 2020.11.25.mre_f4.651963057" +#define SIGNATURE_DATE 2020.11.26 +#define SIGNATURE_HASH 1145301647 +#define TS_SIGNATURE "rusEFI 2020.11.26.mre_f4.1145301647" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 7a39930173..624a38b053 100644 --- a/firmware/controllers/generated/signature_mre_f7.h +++ b/firmware/controllers/generated/signature_mre_f7.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD mre_f7 -#define SIGNATURE_DATE 2020.11.25 -#define SIGNATURE_HASH 651963057 -#define TS_SIGNATURE "rusEFI 2020.11.25.mre_f7.651963057" +#define SIGNATURE_DATE 2020.11.26 +#define SIGNATURE_HASH 1145301647 +#define TS_SIGNATURE "rusEFI 2020.11.26.mre_f7.1145301647" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 6dcb196cee..f696447ca7 100644 --- a/firmware/controllers/generated/signature_prometheus_405.h +++ b/firmware/controllers/generated/signature_prometheus_405.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD prometheus_405 -#define SIGNATURE_DATE 2020.11.25 -#define SIGNATURE_HASH 1943335577 -#define TS_SIGNATURE "rusEFI 2020.11.25.prometheus_405.1943335577" +#define SIGNATURE_DATE 2020.11.26 +#define SIGNATURE_HASH 290140839 +#define TS_SIGNATURE "rusEFI 2020.11.26.prometheus_405.290140839" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 07edbc63f7..0c56802584 100644 --- a/firmware/controllers/generated/signature_prometheus_469.h +++ b/firmware/controllers/generated/signature_prometheus_469.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD prometheus_469 -#define SIGNATURE_DATE 2020.11.25 -#define SIGNATURE_HASH 1943335577 -#define TS_SIGNATURE "rusEFI 2020.11.25.prometheus_469.1943335577" +#define SIGNATURE_DATE 2020.11.26 +#define SIGNATURE_HASH 290140839 +#define TS_SIGNATURE "rusEFI 2020.11.26.prometheus_469.290140839" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 62e92acc1b..c4d8caf23f 100644 --- a/firmware/controllers/generated/signature_proteus_f4.h +++ b/firmware/controllers/generated/signature_proteus_f4.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD proteus_f4 -#define SIGNATURE_DATE 2020.11.25 -#define SIGNATURE_HASH 4171677206 -#define TS_SIGNATURE "rusEFI 2020.11.25.proteus_f4.4171677206" +#define SIGNATURE_DATE 2020.11.26 +#define SIGNATURE_HASH 2587459112 +#define TS_SIGNATURE "rusEFI 2020.11.26.proteus_f4.2587459112" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index d802749c00..f9993202a6 100644 --- a/firmware/controllers/generated/signature_proteus_f7.h +++ b/firmware/controllers/generated/signature_proteus_f7.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD proteus_f7 -#define SIGNATURE_DATE 2020.11.25 -#define SIGNATURE_HASH 4171677206 -#define TS_SIGNATURE "rusEFI 2020.11.25.proteus_f7.4171677206" +#define SIGNATURE_DATE 2020.11.26 +#define SIGNATURE_HASH 2587459112 +#define TS_SIGNATURE "rusEFI 2020.11.26.proteus_f7.2587459112" diff --git a/firmware/tunerstudio/generated/cache.zip b/firmware/tunerstudio/generated/cache.zip index 0f96af4c5c2888e29c77d76b50bc7a63ad639942..e3e0589b37a4f12db94290d32a7104a027ea758e 100644 GIT binary patch delta 26360 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 - +