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 2919192e05..e83463da35 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 Jun 16 15:29:21 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Wed Jun 16 21:08:33 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -825,13 +825,13 @@ struct engine_configuration_s { float ignitionDwellForCrankingMs; /** * Once engine speed passes this value, start reducing ETB angle. - 1 + rpm * offset 104 */ uint16_t etbRevLimitStart; /** * This far above 'Soft limiter start', fully close the throttle. At the bottom of the range, throttle control is normal. At the top of the range, the throttle is fully closed. - 1 + rpm * offset 106 */ uint16_t etbRevLimitRange; @@ -4219,4 +4219,4 @@ struct 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 Jun 16 15:29:21 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Wed Jun 16 21:08:33 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 d9399260e4..dc61198a77 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 @@ -1288,7 +1288,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD hellen_cypress #define SIGNATURE_DATE 2021.06.16 -#define SIGNATURE_HASH 445893595 +#define SIGNATURE_HASH 3360936260 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1641,10 +1641,11 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.06.16.hellen_cypress.445893595" +#define TS_SIGNATURE "rusEFI 2021.06.16.hellen_cypress.3360936260" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W -#define TS_TEST_COMMAND 't' // 0x74 +#define TS_TEST_COMMAND 't' +#define TS_TEST_COMMAND_char t #define TT_TT_1_16 50 #define TT_TT_2JZ_1_12 29 #define TT_TT_2JZ_3_34 25 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 4f1be6562c..8a10b8a469 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 Jun 16 15:29:19 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Wed Jun 16 21:08:31 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -825,13 +825,13 @@ struct engine_configuration_s { float ignitionDwellForCrankingMs; /** * Once engine speed passes this value, start reducing ETB angle. - 1 + rpm * offset 104 */ uint16_t etbRevLimitStart; /** * This far above 'Soft limiter start', fully close the throttle. At the bottom of the range, throttle control is normal. At the top of the range, the throttle is fully closed. - 1 + rpm * offset 106 */ uint16_t etbRevLimitRange; @@ -4213,4 +4213,4 @@ struct 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 Jun 16 15:29:19 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Wed Jun 16 21:08:31 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 fb1d95b5d4..eb7f634006 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -1272,7 +1272,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD kin #define SIGNATURE_DATE 2021.06.16 -#define SIGNATURE_HASH 3845523239 +#define SIGNATURE_HASH 938876344 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1625,10 +1625,11 @@ #define ts_show_spi true #define ts_show_trigger_comparator true #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.06.16.kin.3845523239" +#define TS_SIGNATURE "rusEFI 2021.06.16.kin.938876344" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W -#define TS_TEST_COMMAND 't' // 0x74 +#define TS_TEST_COMMAND 't' +#define TS_TEST_COMMAND_char t #define TT_TT_1_16 50 #define TT_TT_2JZ_1_12 29 #define TT_TT_2JZ_3_34 25 diff --git a/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h b/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h index 1d98f0a929..059a8257aa 100644 --- a/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Wed Jun 16 15:29:22 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Wed Jun 16 21:08:34 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -825,13 +825,13 @@ struct engine_configuration_s { float ignitionDwellForCrankingMs; /** * Once engine speed passes this value, start reducing ETB angle. - 1 + rpm * offset 104 */ uint16_t etbRevLimitStart; /** * This far above 'Soft limiter start', fully close the throttle. At the bottom of the range, throttle control is normal. At the top of the range, the throttle is fully closed. - 1 + rpm * offset 106 */ uint16_t etbRevLimitRange; @@ -4219,4 +4219,4 @@ struct persistent_config_s { }; // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Wed Jun 16 15:29:22 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Wed Jun 16 21:08:34 UTC 2021 diff --git a/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h index 147fcb6e61..c341caf3f7 100644 --- a/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h @@ -1288,7 +1288,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD subaru_eg33_f7 #define SIGNATURE_DATE 2021.06.16 -#define SIGNATURE_HASH 4122156573 +#define SIGNATURE_HASH 661849218 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1641,10 +1641,11 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port false -#define TS_SIGNATURE "rusEFI 2021.06.16.subaru_eg33_f7.4122156573" +#define TS_SIGNATURE "rusEFI 2021.06.16.subaru_eg33_f7.661849218" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W -#define TS_TEST_COMMAND 't' // 0x74 +#define TS_TEST_COMMAND 't' +#define TS_TEST_COMMAND_char t #define TT_TT_1_16 50 #define TT_TT_2JZ_1_12 29 #define TT_TT_2JZ_3_34 25 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index 0ca9c41c94..fe09597c42 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 Jun 16 15:28:56 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 16 21:08:10 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -825,13 +825,13 @@ struct engine_configuration_s { float ignitionDwellForCrankingMs; /** * Once engine speed passes this value, start reducing ETB angle. - 1 + rpm * offset 104 */ uint16_t etbRevLimitStart; /** * This far above 'Soft limiter start', fully close the throttle. At the bottom of the range, throttle control is normal. At the top of the range, the throttle is fully closed. - 1 + rpm * offset 106 */ uint16_t etbRevLimitRange; @@ -4219,4 +4219,4 @@ struct persistent_config_s { }; // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 16 15:28:56 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 16 21:08:10 UTC 2021 diff --git a/firmware/controllers/generated/fsio_enums_generated.def b/firmware/controllers/generated/fsio_enums_generated.def index 637406f117..dc187fca94 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 Jun 16 15:28:56 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 16 21:08:10 UTC 2021 // by class com.rusefi.output.FileFsioSettingsConsumer FSIO_SETTING_ACIDLEEXTRAOFFSET = 1000, diff --git a/firmware/controllers/generated/fsio_getters.def b/firmware/controllers/generated/fsio_getters.def index deb1abac73..b8e2af8faf 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 Jun 16 15:28:56 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 16 21:08:10 UTC 2021 // by class com.rusefi.output.FileFsioSettingsConsumer case FSIO_SETTING_ACIDLEEXTRAOFFSET: diff --git a/firmware/controllers/generated/fsio_names.def b/firmware/controllers/generated/fsio_names.def index 18c948cbc5..b2fe9f3223 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 Jun 16 15:28:56 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 16 21:08:10 UTC 2021 // by class com.rusefi.output.FileFsioSettingsConsumer static LENameOrdinalPair leacIdleExtraOffset(FSIO_SETTING_ACIDLEEXTRAOFFSET, "cfg_acIdleExtraOffset"); diff --git a/firmware/controllers/generated/fsio_strings.def b/firmware/controllers/generated/fsio_strings.def index 5579084615..81e0bc8820 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 Jun 16 15:28:56 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 16 21:08:10 UTC 2021 // by class com.rusefi.output.FileFsioSettingsConsumer case FSIO_SETTING_ACIDLEEXTRAOFFSET: diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index e35a5f27d8..df5d84486f 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -1285,7 +1285,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD all #define SIGNATURE_DATE 2021.06.16 -#define SIGNATURE_HASH 1492062219 +#define SIGNATURE_HASH 2318338708 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1638,10 +1638,11 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.06.16.all.1492062219" +#define TS_SIGNATURE "rusEFI 2021.06.16.all.2318338708" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W -#define TS_TEST_COMMAND 't' // 0x74 +#define TS_TEST_COMMAND 't' +#define TS_TEST_COMMAND_char t #define TT_TT_1_16 50 #define TT_TT_2JZ_1_12 29 #define TT_TT_2JZ_3_34 25 diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index 49a03b5922..0cdca396c3 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.06.16 -#define SIGNATURE_HASH 1492062219 -#define TS_SIGNATURE "rusEFI 2021.06.16.all.1492062219" +#define SIGNATURE_HASH 2318338708 +#define TS_SIGNATURE "rusEFI 2021.06.16.all.2318338708" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 154eabc3ac..99ecd00c02 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.06.16 -#define SIGNATURE_HASH 1621204530 -#define TS_SIGNATURE "rusEFI 2021.06.16.frankenso_na6.1621204530" +#define SIGNATURE_HASH 2992735405 +#define TS_SIGNATURE "rusEFI 2021.06.16.frankenso_na6.2992735405" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index 751c50135c..3c88e08abe 100644 --- a/firmware/controllers/generated/signature_hellen121nissan.h +++ b/firmware/controllers/generated/signature_hellen121nissan.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD hellen121nissan #define SIGNATURE_DATE 2021.06.16 -#define SIGNATURE_HASH 2425067576 -#define TS_SIGNATURE "rusEFI 2021.06.16.hellen121nissan.2425067576" +#define SIGNATURE_HASH 1112244903 +#define TS_SIGNATURE "rusEFI 2021.06.16.hellen121nissan.1112244903" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index 353490bd54..7f8077cb49 100644 --- a/firmware/controllers/generated/signature_hellen121vag.h +++ b/firmware/controllers/generated/signature_hellen121vag.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD hellen121vag #define SIGNATURE_DATE 2021.06.16 -#define SIGNATURE_HASH 1119900909 -#define TS_SIGNATURE "rusEFI 2021.06.16.hellen121vag.1119900909" +#define SIGNATURE_HASH 2415939186 +#define TS_SIGNATURE "rusEFI 2021.06.16.hellen121vag.2415939186" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index a1f80fb4e0..f35d1b7fe3 100644 --- a/firmware/controllers/generated/signature_hellen128.h +++ b/firmware/controllers/generated/signature_hellen128.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD hellen128 #define SIGNATURE_DATE 2021.06.16 -#define SIGNATURE_HASH 2937128175 -#define TS_SIGNATURE "rusEFI 2021.06.16.hellen128.2937128175" +#define SIGNATURE_HASH 2110856816 +#define TS_SIGNATURE "rusEFI 2021.06.16.hellen128.2110856816" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index aba9647929..cf0ba13bec 100644 --- a/firmware/controllers/generated/signature_hellen72.h +++ b/firmware/controllers/generated/signature_hellen72.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD hellen72 #define SIGNATURE_DATE 2021.06.16 -#define SIGNATURE_HASH 4128894848 -#define TS_SIGNATURE "rusEFI 2021.06.16.hellen72.4128894848" +#define SIGNATURE_HASH 618263839 +#define TS_SIGNATURE "rusEFI 2021.06.16.hellen72.618263839" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index 94eb9fa4cf..77904ef1c1 100644 --- a/firmware/controllers/generated/signature_hellenNA6.h +++ b/firmware/controllers/generated/signature_hellenNA6.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD hellenNA6 #define SIGNATURE_DATE 2021.06.16 -#define SIGNATURE_HASH 3728907057 -#define TS_SIGNATURE "rusEFI 2021.06.16.hellenNA6.3728907057" +#define SIGNATURE_HASH 209879470 +#define TS_SIGNATURE "rusEFI 2021.06.16.hellenNA6.209879470" diff --git a/firmware/controllers/generated/signature_hellen_cypress.h b/firmware/controllers/generated/signature_hellen_cypress.h index 0114fc45b4..e60ccb8191 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.06.16 -#define SIGNATURE_HASH 445893595 -#define TS_SIGNATURE "rusEFI 2021.06.16.hellen_cypress.445893595" +#define SIGNATURE_HASH 3360936260 +#define TS_SIGNATURE "rusEFI 2021.06.16.hellen_cypress.3360936260" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index f4cc8d5cf5..b46ca9505d 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.06.16 -#define SIGNATURE_HASH 3845523239 -#define TS_SIGNATURE "rusEFI 2021.06.16.kin.3845523239" +#define SIGNATURE_HASH 938876344 +#define TS_SIGNATURE "rusEFI 2021.06.16.kin.938876344" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 60847fc187..7401714065 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.06.16 -#define SIGNATURE_HASH 3661465873 -#define TS_SIGNATURE "rusEFI 2021.06.16.mre_f4.3661465873" +#define SIGNATURE_HASH 150836110 +#define TS_SIGNATURE "rusEFI 2021.06.16.mre_f4.150836110" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 3a0641ae30..0435bad878 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.06.16 -#define SIGNATURE_HASH 3661465873 -#define TS_SIGNATURE "rusEFI 2021.06.16.mre_f7.3661465873" +#define SIGNATURE_HASH 150836110 +#define TS_SIGNATURE "rusEFI 2021.06.16.mre_f7.150836110" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 9bccf6dfd6..68511d910e 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.06.16 -#define SIGNATURE_HASH 1249448509 -#define TS_SIGNATURE "rusEFI 2021.06.16.prometheus_405.1249448509" +#define SIGNATURE_HASH 2562263202 +#define TS_SIGNATURE "rusEFI 2021.06.16.prometheus_405.2562263202" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 472541208c..b50765a5da 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.06.16 -#define SIGNATURE_HASH 1249448509 -#define TS_SIGNATURE "rusEFI 2021.06.16.prometheus_469.1249448509" +#define SIGNATURE_HASH 2562263202 +#define TS_SIGNATURE "rusEFI 2021.06.16.prometheus_469.2562263202" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 03f3f9831e..e3d63f6858 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.06.16 -#define SIGNATURE_HASH 827960592 -#define TS_SIGNATURE "rusEFI 2021.06.16.proteus_f4.827960592" +#define SIGNATURE_HASH 3818502031 +#define TS_SIGNATURE "rusEFI 2021.06.16.proteus_f4.3818502031" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 16a212ee4b..e1e0379bf0 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.06.16 -#define SIGNATURE_HASH 827960592 -#define TS_SIGNATURE "rusEFI 2021.06.16.proteus_f7.827960592" +#define SIGNATURE_HASH 3818502031 +#define TS_SIGNATURE "rusEFI 2021.06.16.proteus_f7.3818502031" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index b72ab5f9af..e5e1636424 100644 --- a/firmware/controllers/generated/signature_subaru_eg33_f7.h +++ b/firmware/controllers/generated/signature_subaru_eg33_f7.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD subaru_eg33_f7 #define SIGNATURE_DATE 2021.06.16 -#define SIGNATURE_HASH 4122156573 -#define TS_SIGNATURE "rusEFI 2021.06.16.subaru_eg33_f7.4122156573" +#define SIGNATURE_HASH 661849218 +#define TS_SIGNATURE "rusEFI 2021.06.16.subaru_eg33_f7.661849218" diff --git a/firmware/tunerstudio/generated/cache.zip b/firmware/tunerstudio/generated/cache.zip index 1975d8d176..998861b5a9 100644 Binary files a/firmware/tunerstudio/generated/cache.zip and b/firmware/tunerstudio/generated/cache.zip differ diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index 6e5cef0476..02fa260752 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.06.16.all.1492062219" + signature = "rusEFI 2021.06.16.all.2318338708" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.06.16.all.1492062219" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.06.16.all.2318338708" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 Wed Jun 16 15:28:56 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 16 21:08:10 UTC 2021 pageSize = 20000 page = 1 @@ -127,8 +127,8 @@ cranking_rpm = scalar, S16, 92, "RPM", 1.0, 0, 0, 3000, 0 cranking_alignmentFill_at_6 = array, U08, 94, [2], "units", 1.0, 0, -20, 100, 0 primingSquirtDurationMs = scalar, F32, 96, "*C", 1.0, 0, -40, 200, 1 ignitionDwellForCrankingMs = scalar, F32, 100, "ms", 1.0, 0, 0, 200, 1 -etbRevLimitStart = scalar, U16, 104, 1, 0.0, 0, 15000, 0 -etbRevLimitRange = scalar, U16, 106, 1, 0.0, 0, 2000, 0 +etbRevLimitStart = scalar, U16, 104, "rpm", 1.0, 0, 0, 15000, 0 +etbRevLimitRange = scalar, U16, 106, "rpm", 1.0, 0, 0, 2000, 0 map_samplingAngleBins = array, F32, 108, [8], "", 1.0, 0, 0.0, 18000, 2 map_samplingAngle = array, F32, 140, [8], "deg", 1.0, 0, -720, 720, 2 map_samplingWindowBins = array, F32, 172, [8], "", 1.0, 0, 0.0, 18000, 2 diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index b133591ba1..84afe9d301 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.06.16.frankenso_na6.1621204530" + signature = "rusEFI 2021.06.16.frankenso_na6.2992735405" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.06.16.frankenso_na6.1621204530" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.06.16.frankenso_na6.2992735405" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 Wed Jun 16 15:29:11 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 16 21:08:24 UTC 2021 pageSize = 20000 page = 1 @@ -127,8 +127,8 @@ cranking_rpm = scalar, S16, 92, "RPM", 1.0, 0, 0, 3000, 0 cranking_alignmentFill_at_6 = array, U08, 94, [2], "units", 1.0, 0, -20, 100, 0 primingSquirtDurationMs = scalar, F32, 96, "*C", 1.0, 0, -40, 200, 1 ignitionDwellForCrankingMs = scalar, F32, 100, "ms", 1.0, 0, 0, 200, 1 -etbRevLimitStart = scalar, U16, 104, 1, 0.0, 0, 15000, 0 -etbRevLimitRange = scalar, U16, 106, 1, 0.0, 0, 2000, 0 +etbRevLimitStart = scalar, U16, 104, "rpm", 1.0, 0, 0, 15000, 0 +etbRevLimitRange = scalar, U16, 106, "rpm", 1.0, 0, 0, 2000, 0 map_samplingAngleBins = array, F32, 108, [8], "", 1.0, 0, 0.0, 18000, 2 map_samplingAngle = array, F32, 140, [8], "deg", 1.0, 0, -720, 720, 2 map_samplingWindowBins = array, F32, 172, [8], "", 1.0, 0, 0.0, 18000, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index dd0f66ee7f..4809908402 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.06.16.hellen121nissan.2425067576" + signature = "rusEFI 2021.06.16.hellen121nissan.1112244903" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.06.16.hellen121nissan.2425067576" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.06.16.hellen121nissan.1112244903" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 Wed Jun 16 15:29:01 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 16 21:08:17 UTC 2021 pageSize = 20000 page = 1 @@ -127,8 +127,8 @@ cranking_rpm = scalar, S16, 92, "RPM", 1.0, 0, 0, 3000, 0 cranking_alignmentFill_at_6 = array, U08, 94, [2], "units", 1.0, 0, -20, 100, 0 primingSquirtDurationMs = scalar, F32, 96, "*C", 1.0, 0, -40, 200, 1 ignitionDwellForCrankingMs = scalar, F32, 100, "ms", 1.0, 0, 0, 200, 1 -etbRevLimitStart = scalar, U16, 104, 1, 0.0, 0, 15000, 0 -etbRevLimitRange = scalar, U16, 106, 1, 0.0, 0, 2000, 0 +etbRevLimitStart = scalar, U16, 104, "rpm", 1.0, 0, 0, 15000, 0 +etbRevLimitRange = scalar, U16, 106, "rpm", 1.0, 0, 0, 2000, 0 map_samplingAngleBins = array, F32, 108, [8], "", 1.0, 0, 0.0, 18000, 2 map_samplingAngle = array, F32, 140, [8], "deg", 1.0, 0, -720, 720, 2 map_samplingWindowBins = array, F32, 172, [8], "", 1.0, 0, 0.0, 18000, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index 663266c4b9..120865c98e 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.06.16.hellen121vag.1119900909" + signature = "rusEFI 2021.06.16.hellen121vag.2415939186" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.06.16.hellen121vag.1119900909" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.06.16.hellen121vag.2415939186" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 Wed Jun 16 15:28:59 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 16 21:08:15 UTC 2021 pageSize = 20000 page = 1 @@ -127,8 +127,8 @@ cranking_rpm = scalar, S16, 92, "RPM", 1.0, 0, 0, 3000, 0 cranking_alignmentFill_at_6 = array, U08, 94, [2], "units", 1.0, 0, -20, 100, 0 primingSquirtDurationMs = scalar, F32, 96, "*C", 1.0, 0, -40, 200, 1 ignitionDwellForCrankingMs = scalar, F32, 100, "ms", 1.0, 0, 0, 200, 1 -etbRevLimitStart = scalar, U16, 104, 1, 0.0, 0, 15000, 0 -etbRevLimitRange = scalar, U16, 106, 1, 0.0, 0, 2000, 0 +etbRevLimitStart = scalar, U16, 104, "rpm", 1.0, 0, 0, 15000, 0 +etbRevLimitRange = scalar, U16, 106, "rpm", 1.0, 0, 0, 2000, 0 map_samplingAngleBins = array, F32, 108, [8], "", 1.0, 0, 0.0, 18000, 2 map_samplingAngle = array, F32, 140, [8], "deg", 1.0, 0, -720, 720, 2 map_samplingWindowBins = array, F32, 172, [8], "", 1.0, 0, 0.0, 18000, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen128.ini b/firmware/tunerstudio/generated/rusefi_hellen128.ini index 5dc17d77c4..519811e6ba 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen128.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen128.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.06.16.hellen128.2937128175" + signature = "rusEFI 2021.06.16.hellen128.2110856816" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.06.16.hellen128.2937128175" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.06.16.hellen128.2110856816" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 Wed Jun 16 15:28:58 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 16 21:08:14 UTC 2021 pageSize = 20000 page = 1 @@ -127,8 +127,8 @@ cranking_rpm = scalar, S16, 92, "RPM", 1.0, 0, 0, 3000, 0 cranking_alignmentFill_at_6 = array, U08, 94, [2], "units", 1.0, 0, -20, 100, 0 primingSquirtDurationMs = scalar, F32, 96, "*C", 1.0, 0, -40, 200, 1 ignitionDwellForCrankingMs = scalar, F32, 100, "ms", 1.0, 0, 0, 200, 1 -etbRevLimitStart = scalar, U16, 104, 1, 0.0, 0, 15000, 0 -etbRevLimitRange = scalar, U16, 106, 1, 0.0, 0, 2000, 0 +etbRevLimitStart = scalar, U16, 104, "rpm", 1.0, 0, 0, 15000, 0 +etbRevLimitRange = scalar, U16, 106, "rpm", 1.0, 0, 0, 2000, 0 map_samplingAngleBins = array, F32, 108, [8], "", 1.0, 0, 0.0, 18000, 2 map_samplingAngle = array, F32, 140, [8], "deg", 1.0, 0, -720, 720, 2 map_samplingWindowBins = array, F32, 172, [8], "", 1.0, 0, 0.0, 18000, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index b700f3401c..34c15e902c 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen72.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen72.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.06.16.hellen72.4128894848" + signature = "rusEFI 2021.06.16.hellen72.618263839" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.06.16.hellen72.4128894848" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.06.16.hellen72.618263839" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 Wed Jun 16 15:29:03 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 16 21:08:18 UTC 2021 pageSize = 20000 page = 1 @@ -127,8 +127,8 @@ cranking_rpm = scalar, S16, 92, "RPM", 1.0, 0, 0, 3000, 0 cranking_alignmentFill_at_6 = array, U08, 94, [2], "units", 1.0, 0, -20, 100, 0 primingSquirtDurationMs = scalar, F32, 96, "*C", 1.0, 0, -40, 200, 1 ignitionDwellForCrankingMs = scalar, F32, 100, "ms", 1.0, 0, 0, 200, 1 -etbRevLimitStart = scalar, U16, 104, 1, 0.0, 0, 15000, 0 -etbRevLimitRange = scalar, U16, 106, 1, 0.0, 0, 2000, 0 +etbRevLimitStart = scalar, U16, 104, "rpm", 1.0, 0, 0, 15000, 0 +etbRevLimitRange = scalar, U16, 106, "rpm", 1.0, 0, 0, 2000, 0 map_samplingAngleBins = array, F32, 108, [8], "", 1.0, 0, 0.0, 18000, 2 map_samplingAngle = array, F32, 140, [8], "deg", 1.0, 0, -720, 720, 2 map_samplingWindowBins = array, F32, 172, [8], "", 1.0, 0, 0.0, 18000, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index 25641a1eb0..f911fed8de 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.06.16.hellenNA6.3728907057" + signature = "rusEFI 2021.06.16.hellenNA6.209879470" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.06.16.hellenNA6.3728907057" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.06.16.hellenNA6.209879470" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 Wed Jun 16 15:29:06 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 16 21:08:20 UTC 2021 pageSize = 20000 page = 1 @@ -127,8 +127,8 @@ cranking_rpm = scalar, S16, 92, "RPM", 1.0, 0, 0, 3000, 0 cranking_alignmentFill_at_6 = array, U08, 94, [2], "units", 1.0, 0, -20, 100, 0 primingSquirtDurationMs = scalar, F32, 96, "*C", 1.0, 0, -40, 200, 1 ignitionDwellForCrankingMs = scalar, F32, 100, "ms", 1.0, 0, 0, 200, 1 -etbRevLimitStart = scalar, U16, 104, 1, 0.0, 0, 15000, 0 -etbRevLimitRange = scalar, U16, 106, 1, 0.0, 0, 2000, 0 +etbRevLimitStart = scalar, U16, 104, "rpm", 1.0, 0, 0, 15000, 0 +etbRevLimitRange = scalar, U16, 106, "rpm", 1.0, 0, 0, 2000, 0 map_samplingAngleBins = array, F32, 108, [8], "", 1.0, 0, 0.0, 18000, 2 map_samplingAngle = array, F32, 140, [8], "deg", 1.0, 0, -720, 720, 2 map_samplingWindowBins = array, F32, 172, [8], "", 1.0, 0, 0.0, 18000, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini index 213586672f..ff469c225a 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.06.16.hellen_cypress.445893595" + signature = "rusEFI 2021.06.16.hellen_cypress.3360936260" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.06.16.hellen_cypress.445893595" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.06.16.hellen_cypress.3360936260" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 hellen_cypress_gen_config.bat integration/rusefi_config.txt Wed Jun 16 15:29:21 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Wed Jun 16 21:08:33 UTC 2021 pageSize = 20000 page = 1 @@ -127,8 +127,8 @@ cranking_rpm = scalar, S16, 92, "RPM", 1.0, 0, 0, 3000, 0 cranking_alignmentFill_at_6 = array, U08, 94, [2], "units", 1.0, 0, -20, 100, 0 primingSquirtDurationMs = scalar, F32, 96, "*C", 1.0, 0, -40, 200, 1 ignitionDwellForCrankingMs = scalar, F32, 100, "ms", 1.0, 0, 0, 200, 1 -etbRevLimitStart = scalar, U16, 104, 1, 0.0, 0, 15000, 0 -etbRevLimitRange = scalar, U16, 106, 1, 0.0, 0, 2000, 0 +etbRevLimitStart = scalar, U16, 104, "rpm", 1.0, 0, 0, 15000, 0 +etbRevLimitRange = scalar, U16, 106, "rpm", 1.0, 0, 0, 2000, 0 map_samplingAngleBins = array, F32, 108, [8], "", 1.0, 0, 0.0, 18000, 2 map_samplingAngle = array, F32, 140, [8], "deg", 1.0, 0, -720, 720, 2 map_samplingWindowBins = array, F32, 172, [8], "", 1.0, 0, 0.0, 18000, 2 diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini index 47c4cadd9a..508847a7d8 100644 --- a/firmware/tunerstudio/generated/rusefi_kinetis.ini +++ b/firmware/tunerstudio/generated/rusefi_kinetis.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.06.16.kin.3845523239" + signature = "rusEFI 2021.06.16.kin.938876344" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.06.16.kin.3845523239" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.06.16.kin.938876344" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 kinetis_gen_config.bat integration/rusefi_config.txt Wed Jun 16 15:29:19 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Wed Jun 16 21:08:31 UTC 2021 pageSize = 19972 page = 1 @@ -127,8 +127,8 @@ cranking_rpm = scalar, S16, 92, "RPM", 1.0, 0, 0, 3000, 0 cranking_alignmentFill_at_6 = array, U08, 94, [2], "units", 1.0, 0, -20, 100, 0 primingSquirtDurationMs = scalar, F32, 96, "*C", 1.0, 0, -40, 200, 1 ignitionDwellForCrankingMs = scalar, F32, 100, "ms", 1.0, 0, 0, 200, 1 -etbRevLimitStart = scalar, U16, 104, 1, 0.0, 0, 15000, 0 -etbRevLimitRange = scalar, U16, 106, 1, 0.0, 0, 2000, 0 +etbRevLimitStart = scalar, U16, 104, "rpm", 1.0, 0, 0, 15000, 0 +etbRevLimitRange = scalar, U16, 106, "rpm", 1.0, 0, 0, 2000, 0 map_samplingAngleBins = array, F32, 108, [8], "", 1.0, 0, 0.0, 18000, 2 map_samplingAngle = array, F32, 140, [8], "deg", 1.0, 0, -720, 720, 2 map_samplingWindowBins = array, F32, 172, [8], "", 1.0, 0, 0.0, 18000, 2 diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index d3fb0275ff..39067f8d67 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.06.16.mre_f4.3661465873" + signature = "rusEFI 2021.06.16.mre_f4.150836110" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.06.16.mre_f4.3661465873" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.06.16.mre_f4.150836110" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 Wed Jun 16 15:29:09 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 16 21:08:22 UTC 2021 pageSize = 20000 page = 1 @@ -127,8 +127,8 @@ cranking_rpm = scalar, S16, 92, "RPM", 1.0, 0, 0, 3000, 0 cranking_alignmentFill_at_6 = array, U08, 94, [2], "units", 1.0, 0, -20, 100, 0 primingSquirtDurationMs = scalar, F32, 96, "*C", 1.0, 0, -40, 200, 1 ignitionDwellForCrankingMs = scalar, F32, 100, "ms", 1.0, 0, 0, 200, 1 -etbRevLimitStart = scalar, U16, 104, 1, 0.0, 0, 15000, 0 -etbRevLimitRange = scalar, U16, 106, 1, 0.0, 0, 2000, 0 +etbRevLimitStart = scalar, U16, 104, "rpm", 1.0, 0, 0, 15000, 0 +etbRevLimitRange = scalar, U16, 106, "rpm", 1.0, 0, 0, 2000, 0 map_samplingAngleBins = array, F32, 108, [8], "", 1.0, 0, 0.0, 18000, 2 map_samplingAngle = array, F32, 140, [8], "deg", 1.0, 0, -720, 720, 2 map_samplingWindowBins = array, F32, 172, [8], "", 1.0, 0, 0.0, 18000, 2 diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 95a099cfe1..d88ce45834 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.06.16.mre_f7.3661465873" + signature = "rusEFI 2021.06.16.mre_f7.150836110" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.06.16.mre_f7.3661465873" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.06.16.mre_f7.150836110" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 Wed Jun 16 15:29:08 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 16 21:08:21 UTC 2021 pageSize = 20000 page = 1 @@ -127,8 +127,8 @@ cranking_rpm = scalar, S16, 92, "RPM", 1.0, 0, 0, 3000, 0 cranking_alignmentFill_at_6 = array, U08, 94, [2], "units", 1.0, 0, -20, 100, 0 primingSquirtDurationMs = scalar, F32, 96, "*C", 1.0, 0, -40, 200, 1 ignitionDwellForCrankingMs = scalar, F32, 100, "ms", 1.0, 0, 0, 200, 1 -etbRevLimitStart = scalar, U16, 104, 1, 0.0, 0, 15000, 0 -etbRevLimitRange = scalar, U16, 106, 1, 0.0, 0, 2000, 0 +etbRevLimitStart = scalar, U16, 104, "rpm", 1.0, 0, 0, 15000, 0 +etbRevLimitRange = scalar, U16, 106, "rpm", 1.0, 0, 0, 2000, 0 map_samplingAngleBins = array, F32, 108, [8], "", 1.0, 0, 0.0, 18000, 2 map_samplingAngle = array, F32, 140, [8], "deg", 1.0, 0, -720, 720, 2 map_samplingWindowBins = array, F32, 172, [8], "", 1.0, 0, 0.0, 18000, 2 diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index e46c356280..0d3f5190ca 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.06.16.prometheus_405.1249448509" + signature = "rusEFI 2021.06.16.prometheus_405.2562263202" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.06.16.prometheus_405.1249448509" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.06.16.prometheus_405.2562263202" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 Wed Jun 16 15:29:14 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 16 21:08:26 UTC 2021 pageSize = 20000 page = 1 @@ -127,8 +127,8 @@ cranking_rpm = scalar, S16, 92, "RPM", 1.0, 0, 0, 3000, 0 cranking_alignmentFill_at_6 = array, U08, 94, [2], "units", 1.0, 0, -20, 100, 0 primingSquirtDurationMs = scalar, F32, 96, "*C", 1.0, 0, -40, 200, 1 ignitionDwellForCrankingMs = scalar, F32, 100, "ms", 1.0, 0, 0, 200, 1 -etbRevLimitStart = scalar, U16, 104, 1, 0.0, 0, 15000, 0 -etbRevLimitRange = scalar, U16, 106, 1, 0.0, 0, 2000, 0 +etbRevLimitStart = scalar, U16, 104, "rpm", 1.0, 0, 0, 15000, 0 +etbRevLimitRange = scalar, U16, 106, "rpm", 1.0, 0, 0, 2000, 0 map_samplingAngleBins = array, F32, 108, [8], "", 1.0, 0, 0.0, 18000, 2 map_samplingAngle = array, F32, 140, [8], "deg", 1.0, 0, -720, 720, 2 map_samplingWindowBins = array, F32, 172, [8], "", 1.0, 0, 0.0, 18000, 2 diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index 6480ae0d2c..92a967e9e4 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.06.16.prometheus_469.1249448509" + signature = "rusEFI 2021.06.16.prometheus_469.2562263202" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.06.16.prometheus_469.1249448509" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.06.16.prometheus_469.2562263202" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 Wed Jun 16 15:29:13 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 16 21:08:25 UTC 2021 pageSize = 20000 page = 1 @@ -127,8 +127,8 @@ cranking_rpm = scalar, S16, 92, "RPM", 1.0, 0, 0, 3000, 0 cranking_alignmentFill_at_6 = array, U08, 94, [2], "units", 1.0, 0, -20, 100, 0 primingSquirtDurationMs = scalar, F32, 96, "*C", 1.0, 0, -40, 200, 1 ignitionDwellForCrankingMs = scalar, F32, 100, "ms", 1.0, 0, 0, 200, 1 -etbRevLimitStart = scalar, U16, 104, 1, 0.0, 0, 15000, 0 -etbRevLimitRange = scalar, U16, 106, 1, 0.0, 0, 2000, 0 +etbRevLimitStart = scalar, U16, 104, "rpm", 1.0, 0, 0, 15000, 0 +etbRevLimitRange = scalar, U16, 106, "rpm", 1.0, 0, 0, 2000, 0 map_samplingAngleBins = array, F32, 108, [8], "", 1.0, 0, 0.0, 18000, 2 map_samplingAngle = array, F32, 140, [8], "deg", 1.0, 0, -720, 720, 2 map_samplingWindowBins = array, F32, 172, [8], "", 1.0, 0, 0.0, 18000, 2 diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index 6bb83e0329..b780d48a0a 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.06.16.proteus_f4.827960592" + signature = "rusEFI 2021.06.16.proteus_f4.3818502031" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.06.16.proteus_f4.827960592" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.06.16.proteus_f4.3818502031" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 Wed Jun 16 15:29:17 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 16 21:08:29 UTC 2021 pageSize = 20000 page = 1 @@ -127,8 +127,8 @@ cranking_rpm = scalar, S16, 92, "RPM", 1.0, 0, 0, 3000, 0 cranking_alignmentFill_at_6 = array, U08, 94, [2], "units", 1.0, 0, -20, 100, 0 primingSquirtDurationMs = scalar, F32, 96, "*C", 1.0, 0, -40, 200, 1 ignitionDwellForCrankingMs = scalar, F32, 100, "ms", 1.0, 0, 0, 200, 1 -etbRevLimitStart = scalar, U16, 104, 1, 0.0, 0, 15000, 0 -etbRevLimitRange = scalar, U16, 106, 1, 0.0, 0, 2000, 0 +etbRevLimitStart = scalar, U16, 104, "rpm", 1.0, 0, 0, 15000, 0 +etbRevLimitRange = scalar, U16, 106, "rpm", 1.0, 0, 0, 2000, 0 map_samplingAngleBins = array, F32, 108, [8], "", 1.0, 0, 0.0, 18000, 2 map_samplingAngle = array, F32, 140, [8], "deg", 1.0, 0, -720, 720, 2 map_samplingWindowBins = array, F32, 172, [8], "", 1.0, 0, 0.0, 18000, 2 diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index 6a423755d7..1ed233deac 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.06.16.proteus_f7.827960592" + signature = "rusEFI 2021.06.16.proteus_f7.3818502031" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.06.16.proteus_f7.827960592" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.06.16.proteus_f7.3818502031" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 Wed Jun 16 15:29:16 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 16 21:08:28 UTC 2021 pageSize = 20000 page = 1 @@ -127,8 +127,8 @@ cranking_rpm = scalar, S16, 92, "RPM", 1.0, 0, 0, 3000, 0 cranking_alignmentFill_at_6 = array, U08, 94, [2], "units", 1.0, 0, -20, 100, 0 primingSquirtDurationMs = scalar, F32, 96, "*C", 1.0, 0, -40, 200, 1 ignitionDwellForCrankingMs = scalar, F32, 100, "ms", 1.0, 0, 0, 200, 1 -etbRevLimitStart = scalar, U16, 104, 1, 0.0, 0, 15000, 0 -etbRevLimitRange = scalar, U16, 106, 1, 0.0, 0, 2000, 0 +etbRevLimitStart = scalar, U16, 104, "rpm", 1.0, 0, 0, 15000, 0 +etbRevLimitRange = scalar, U16, 106, "rpm", 1.0, 0, 0, 2000, 0 map_samplingAngleBins = array, F32, 108, [8], "", 1.0, 0, 0.0, 18000, 2 map_samplingAngle = array, F32, 140, [8], "deg", 1.0, 0, -720, 720, 2 map_samplingWindowBins = array, F32, 172, [8], "", 1.0, 0, 0.0, 18000, 2 diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index f448adfdf0..44ff23b0ce 100644 --- a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.06.16.subaru_eg33_f7.4122156573" + signature = "rusEFI 2021.06.16.subaru_eg33_f7.661849218" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.06.16.subaru_eg33_f7.4122156573" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.06.16.subaru_eg33_f7.661849218" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Wed Jun 16 15:29:22 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Wed Jun 16 21:08:34 UTC 2021 pageSize = 20000 page = 1 @@ -127,8 +127,8 @@ cranking_rpm = scalar, S16, 92, "RPM", 1.0, 0, 0, 3000, 0 cranking_alignmentFill_at_6 = array, U08, 94, [2], "units", 1.0, 0, -20, 100, 0 primingSquirtDurationMs = scalar, F32, 96, "*C", 1.0, 0, -40, 200, 1 ignitionDwellForCrankingMs = scalar, F32, 100, "ms", 1.0, 0, 0, 200, 1 -etbRevLimitStart = scalar, U16, 104, 1, 0.0, 0, 15000, 0 -etbRevLimitRange = scalar, U16, 106, 1, 0.0, 0, 2000, 0 +etbRevLimitStart = scalar, U16, 104, "rpm", 1.0, 0, 0, 15000, 0 +etbRevLimitRange = scalar, U16, 106, "rpm", 1.0, 0, 0, 2000, 0 map_samplingAngleBins = array, F32, 108, [8], "", 1.0, 0, 0.0, 18000, 2 map_samplingAngle = array, F32, 140, [8], "deg", 1.0, 0, -720, 720, 2 map_samplingWindowBins = array, F32, 172, [8], "", 1.0, 0, 0.0, 18000, 2 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 bbdee87373..383523e8f9 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 Jun 16 15:28:56 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 16 21:08:10 UTC 2021 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -1239,7 +1239,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 = 1492062219; public static final int silentTriggerError_offset = 1464; public static final int slowAdcAlpha_offset = 2088; public static final int sparkDwellRpmBins_offset = 332; @@ -1541,8 +1540,9 @@ public class Fields { public static final char TS_SD_R_COMMAND = 'r'; public static final char TS_SD_W_COMMAND = 'w'; public static final char TS_SET_LOGGER_SWITCH = 'l'; - public static final String TS_SIGNATURE = "rusEFI 2021.06.16.all.1492062219"; + public static final String TS_SIGNATURE = "rusEFI 2021.06.16.all.2318338708"; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; + public static final char TS_TEST_COMMAND = 't'; public static final int TT_TT_1_16 = 50; public static final int TT_TT_2JZ_1_12 = 29; public static final int TT_TT_2JZ_3_34 = 25; diff --git a/java_console/rusefi.xml b/java_console/rusefi.xml index b7a862c7ee..ff5b2344b3 100644 --- a/java_console/rusefi.xml +++ b/java_console/rusefi.xml @@ -1,6 +1,6 @@ - +