From d616892eab7d2e58836a3ef6590d00c9cbeeef3f Mon Sep 17 00:00:00 2001 From: GitHub build-firmware Action Date: Mon, 14 Dec 2020 04:02:29 +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 976005 -> 976155 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 | 6 ++++-- java_console/rusefi.xml | 2 +- 33 files changed, 74 insertions(+), 69 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 85faa8e8ff..037ce90b86 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 Mon Dec 14 02:54:20 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon Dec 14 04:02:05 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3782,4 +3782,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 Mon Dec 14 02:54:20 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon Dec 14 04:02:05 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 1e4c627223..900afc9105 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 @@ -695,6 +695,7 @@ #define GAUGE_NAME_VVT "VVT position" #define GAUGE_NAME_WARNING_COUNTER "warning: counter" #define GAUGE_NAME_WARNING_LAST "warning: last" +#define GAUGE_NAME_WG_POSITION "Wastegate position sensor" #define globalFuelCorrection_offset 544 #define globalTriggerAngleOffset_offset 456 #define gpioPinModes10_offset 773 @@ -1225,7 +1226,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD hellen_cypress #define SIGNATURE_DATE 2020.12.14 -#define SIGNATURE_HASH 1373263022 +#define SIGNATURE_HASH 2213695329 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1556,7 +1557,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2020.12.14.hellen_cypress.1373263022" +#define TS_SIGNATURE "rusEFI 2020.12.14.hellen_cypress.2213695329" #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 08cfc9a20f..7399e6a6ef 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 Mon Dec 14 02:54:18 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Dec 14 04:02:03 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3782,4 +3782,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 Mon Dec 14 02:54:18 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Dec 14 04:02:03 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 d6ef713f8c..06f039c5aa 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -695,6 +695,7 @@ #define GAUGE_NAME_VVT "VVT position" #define GAUGE_NAME_WARNING_COUNTER "warning: counter" #define GAUGE_NAME_WARNING_LAST "warning: last" +#define GAUGE_NAME_WG_POSITION "Wastegate position sensor" #define globalFuelCorrection_offset 544 #define globalTriggerAngleOffset_offset 456 #define gpioPinModes10_offset 773 @@ -1225,7 +1226,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD kin #define SIGNATURE_DATE 2020.12.14 -#define SIGNATURE_HASH 13004372 +#define SIGNATURE_HASH 3538843035 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1556,7 +1557,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator true #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2020.12.14.kin.13004372" +#define TS_SIGNATURE "rusEFI 2020.12.14.kin.3538843035" #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 ac68e7a057..f971aefc68 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 Mon Dec 14 02:54:04 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Dec 14 04:01:48 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3782,4 +3782,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 Mon Dec 14 02:54:04 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Dec 14 04:01:48 UTC 2020 diff --git a/firmware/controllers/generated/fsio_enums_generated.def b/firmware/controllers/generated/fsio_enums_generated.def index a73efa0c9e..e21d03e9f5 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 Mon Dec 14 02:54:04 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Dec 14 04:01:48 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 524ca2ee33..1a021b21b9 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 Mon Dec 14 02:54:04 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Dec 14 04:01:48 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 a086ff0240..6a29cf00cc 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 Mon Dec 14 02:54:04 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Dec 14 04:01:48 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 688fcb2faf..bdaf22abe7 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 Mon Dec 14 02:54:04 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Dec 14 04:01:48 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 0cb65b930c..018b14e92d 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -695,6 +695,7 @@ #define GAUGE_NAME_VVT "VVT position" #define GAUGE_NAME_WARNING_COUNTER "warning: counter" #define GAUGE_NAME_WARNING_LAST "warning: last" +#define GAUGE_NAME_WG_POSITION "Wastegate position sensor" #define globalFuelCorrection_offset 544 #define globalTriggerAngleOffset_offset 456 #define gpioPinModes10_offset 773 @@ -1225,7 +1226,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD all #define SIGNATURE_DATE 2020.12.14 -#define SIGNATURE_HASH 2553016941 +#define SIGNATURE_HASH 1241770402 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1556,7 +1557,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2020.12.14.all.2553016941" +#define TS_SIGNATURE "rusEFI 2020.12.14.all.1241770402" #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 edf0996d0e..d5c5ad2587 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.12.14 -#define SIGNATURE_HASH 2553016941 -#define TS_SIGNATURE "rusEFI 2020.12.14.all.2553016941" +#define SIGNATURE_HASH 1241770402 +#define TS_SIGNATURE "rusEFI 2020.12.14.all.1241770402" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 6401ac5436..b513212ed1 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.12.14 -#define SIGNATURE_HASH 240862102 -#define TS_SIGNATURE "rusEFI 2020.12.14.frankenso_na6.240862102" +#define SIGNATURE_HASH 3698546777 +#define TS_SIGNATURE "rusEFI 2020.12.14.frankenso_na6.3698546777" diff --git a/firmware/controllers/generated/signature_hellen_cypress.h b/firmware/controllers/generated/signature_hellen_cypress.h index 2a9e4f9aa0..a33de6e026 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 2020.12.14 -#define SIGNATURE_HASH 1373263022 -#define TS_SIGNATURE "rusEFI 2020.12.14.hellen_cypress.1373263022" +#define SIGNATURE_HASH 2213695329 +#define TS_SIGNATURE "rusEFI 2020.12.14.hellen_cypress.2213695329" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 3182982975..4c0de8e6a3 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 2020.12.14 -#define SIGNATURE_HASH 13004372 -#define TS_SIGNATURE "rusEFI 2020.12.14.kin.13004372" +#define SIGNATURE_HASH 3538843035 +#define TS_SIGNATURE "rusEFI 2020.12.14.kin.3538843035" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index e180bbf20a..085d3f5425 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.12.14 -#define SIGNATURE_HASH 2415602708 -#define TS_SIGNATURE "rusEFI 2020.12.14.mre_f4.2415602708" +#define SIGNATURE_HASH 1574123483 +#define TS_SIGNATURE "rusEFI 2020.12.14.mre_f4.1574123483" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 7474c02b71..7a47921b9f 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.12.14 -#define SIGNATURE_HASH 2415602708 -#define TS_SIGNATURE "rusEFI 2020.12.14.mre_f7.2415602708" +#define SIGNATURE_HASH 1574123483 +#define TS_SIGNATURE "rusEFI 2020.12.14.mre_f7.1574123483" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index f85d51729b..13ceb9dac3 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.12.14 -#define SIGNATURE_HASH 3673420860 -#define TS_SIGNATURE "rusEFI 2020.12.14.prometheus_405.3673420860" +#define SIGNATURE_HASH 148631539 +#define TS_SIGNATURE "rusEFI 2020.12.14.prometheus_405.148631539" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 05f0882087..2fda291912 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.12.14 -#define SIGNATURE_HASH 3673420860 -#define TS_SIGNATURE "rusEFI 2020.12.14.prometheus_469.3673420860" +#define SIGNATURE_HASH 148631539 +#define TS_SIGNATURE "rusEFI 2020.12.14.prometheus_469.148631539" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 3f74a6171c..086c8fd5da 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.12.14 -#define SIGNATURE_HASH 1367455923 -#define TS_SIGNATURE "rusEFI 2020.12.14.proteus_f4.1367455923" +#define SIGNATURE_HASH 2208932732 +#define TS_SIGNATURE "rusEFI 2020.12.14.proteus_f4.2208932732" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 94f7f1a957..0bd98340be 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.12.14 -#define SIGNATURE_HASH 1367455923 -#define TS_SIGNATURE "rusEFI 2020.12.14.proteus_f7.1367455923" +#define SIGNATURE_HASH 2208932732 +#define TS_SIGNATURE "rusEFI 2020.12.14.proteus_f7.2208932732" diff --git a/firmware/tunerstudio/generated/cache.zip b/firmware/tunerstudio/generated/cache.zip index 6dfe55cc9ecdba9216fad453122d965b34fc3116..7fc63adde6a389b957137dd7d539929f6f166b52 100644 GIT binary patch delta 31611 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 x1i+Pg&aKX&FPr|GWD4q8(F%PXPrd^ - +