From 95d14ca2d8827cc4c7728927a3c87bb48230ff7d Mon Sep 17 00:00:00 2001 From: GitHub build-firmware Action Date: Thu, 1 Jul 2021 21:43:39 +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 ++-- .../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 | 4 ++-- .../generated/signature_f429-discovery.h | 4 ++-- .../generated/signature_frankenso_na6.h | 4 ++-- .../generated/signature_hellen121nissan.h | 4 ++-- .../generated/signature_hellen121vag.h | 4 ++-- .../generated/signature_hellen128.h | 4 ++-- .../generated/signature_hellen72.h | 4 ++-- .../generated/signature_hellenNA6.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 ++-- .../generated/signature_subaru_eg33_f7.h | 4 ++-- firmware/tunerstudio/generated/cache.zip | Bin 1585552 -> 1585654 bytes firmware/tunerstudio/generated/rusefi.ini | 6 +++--- .../generated/rusefi_f429-discovery.ini | 6 +++--- .../generated/rusefi_frankenso_na6.ini | 6 +++--- .../generated/rusefi_hellen121nissan.ini | 6 +++--- .../generated/rusefi_hellen121vag.ini | 6 +++--- .../generated/rusefi_hellen128.ini | 6 +++--- .../tunerstudio/generated/rusefi_hellen72.ini | 6 +++--- .../generated/rusefi_hellenNA6.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 +++--- .../generated/rusefi_subaru_eg33_f7.ini | 6 +++--- .../com/rusefi/config/generated/Fields.java | 6 +++--- java_console/rusefi.xml | 2 +- 49 files changed, 117 insertions(+), 113 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 db5bf5a10f..88ff66af16 100644 --- a/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Thu Jul 01 21:05:21 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Thu Jul 01 21:42:50 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4236,4 +4236,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 Thu Jul 01 21:05:21 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Thu Jul 01 21:42:50 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 18ec5a2683..b4ede33612 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 @@ -1299,7 +1299,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD hellen_cypress #define SIGNATURE_DATE 2021.07.01 -#define SIGNATURE_HASH 787999402 +#define SIGNATURE_HASH 2208488390 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1499,7 +1499,7 @@ #define TRIGGER_SIMULATOR_PIN_COUNT 3 #define trigger_todoRemoveMeOneDay0_offset 528 #define trigger_todoRemoveMeOneDay1_offset 528 -#define trigger_type_e_auto_enum "TT_TOOTHED_WHEEL", "TT_FORD_ASPIRE", "TT_DODGE_NEON_1995", "TT_MAZDA_MIATA_NA", "TT_MAZDA_MIATA_NB1", "TT_GM_7X", "TT_DAIHATSU", "TT_MAZDA_SOHC_4", "TT_TOOTHED_WHEEL_60_2", "TT_TOOTHED_WHEEL_36_1", "TT_HONDA_4_24_1", "TT_MITSUBISHI", "TT_HONDA_4_24", "TT_HONDA_1_4_24", "TT_DODGE_NEON_2003_CAM", "TT_MAZDA_DOHC_1_4", "TT_ONE_PLUS_ONE", "TT_VVT_JZ", "TT_ONE", "TT_DODGE_RAM", "TT_60_2_VW", "TT_HONDA_1_24", "TT_DODGE_STRATUS", "TT_36_2_2_2", "TT_NISSAN_SR20VE", "TT_2JZ_3_34", "TT_ROVER_K", "TT_GM_LS_24", "TT_HONDA_CBR_600", "TT_2JZ_1_12", "TT_CHRYSLER_NGC_36_2_2", "TT_3_1_CAM", "TT_DODGE_NEON_2003_CRANK", "TT_MIATA_VVT", "TT_HONDA_ACCORD_1_24_SHIFTED", "TT_MAZDA_MIATA_VVT_TEST", "TT_SUBARU_7_6", "TT_JEEP_18_2_2_2", "TT_NISSAN_SR20VE_360", "TT_DODGE_NEON_1995_ONLY_CRANK", "TT_JEEP_4_CYL", "TT_FIAT_IAW_P8", "TT_FORD_ST170", "TT_VVT_MIATA_NB2", "TT_RENIX_44_2_2", "TT_RENIX_66_2_2_2", "TT_HONDA_K_12_1", "TT_VVT_BOSCH_QUICK_START", "TT_TOOTHED_WHEEL_36_2", "TT_SUBARU_SVX", "TT_1_16", "TT_SUBARU_7_WITHOUT_6", "TT_52", "TT_TRI_TACH", "TT_GM_60_2_2_2", "TT_SKODA_FAVORIT", "TT_VVT_BARRA_3_PLUS_1", "TT_KAWA_KX450F", "INVALID", "TT_UNUSED" +#define trigger_type_e_auto_enum "TT_TOOTHED_WHEEL", "TT_FORD_ASPIRE", "TT_DODGE_NEON_1995", "TT_MAZDA_MIATA_NA", "TT_MAZDA_MIATA_NB1", "TT_GM_7X", "TT_DAIHATSU", "TT_MAZDA_SOHC_4", "TT_TOOTHED_WHEEL_60_2", "TT_TOOTHED_WHEEL_36_1", "TT_HONDA_4_24_1", "TT_MITSUBISHI", "TT_HONDA_4_24", "TT_HONDA_1_4_24", "TT_DODGE_NEON_2003_CAM", "TT_MAZDA_DOHC_1_4", "TT_ONE_PLUS_ONE", "TT_VVT_JZ", "TT_ONE", "TT_DODGE_RAM", "TT_60_2_VW", "TT_HONDA_1_24", "TT_DODGE_STRATUS", "TT_36_2_2_2", "TT_NISSAN_SR20VE", "TT_2JZ_3_34", "TT_ROVER_K", "TT_GM_LS_24", "TT_HONDA_CBR_600", "TT_2JZ_1_12", "TT_CHRYSLER_NGC_36_2_2", "TT_3_1_CAM", "TT_DODGE_NEON_2003_CRANK", "TT_MIATA_VVT", "TT_HONDA_ACCORD_1_24_SHIFTED", "TT_MAZDA_MIATA_VVT_TEST", "TT_SUBARU_7_6", "TT_JEEP_18_2_2_2", "TT_NISSAN_SR20VE_360", "TT_DODGE_NEON_1995_ONLY_CRANK", "TT_JEEP_4_CYL", "TT_FIAT_IAW_P8", "TT_FORD_ST170", "TT_VVT_MIATA_NB2", "TT_RENIX_44_2_2", "TT_RENIX_66_2_2_2", "TT_HONDA_K_12_1", "TT_VVT_BOSCH_QUICK_START", "TT_TOOTHED_WHEEL_36_2", "TT_SUBARU_SVX", "TT_1_16", "TT_SUBARU_7_WITHOUT_6", "TT_52", "TT_TRI_TACH", "TT_GM_60_2_2_2", "TT_SKODA_FAVORIT", "TT_VVT_BARRA_3_PLUS_1", "TT_KAWA_KX450F", "TT_NISSAN_VQ", "TT_UNUSED" #define trigger_type_e_enum "custom toothed wheel", "Ford Aspire", "Dodge Neon 1995", "Miata NA", "Miata NB", "GM_7X", "Cooper R50", "Mazda SOHC 4", "60/2", "36/1", "Honda 4+24+1", "Mitsubishi", "Honda 4+24", "Honda 1+4+24", "Dodge Neon 2003", "Mazda DOHC 1+4", "1+1", "INVALID", "Single Tooth", "Dodge Ram 1+16", "60/2 VW", "Honda 1+24", "Dodge Stratus", "36_2_2_2", "Nissan Primera", "dev 2JZ 3/34 simulator", "Rover K", "GM LS 24", "Honda CBR 600", "2JZ_1_12", "Honda CBR 600 custom", "3/1 skipped", "Dodge Neon 2003 crank", "Miata VVT", "trg34", "trg35", "Subaru 7+6", "Jeep 18-2-2-2", "WIP", "Dodge Neon 1995 crank only", "Jeep XJ 4 cyl", "FiatIAQ_P8", "Mazda Z5", "trg43", "Renix 44-2-2", "Renix 66-2-2-2", "Honda K 12+1", "trg47", "36/2", "Subaru SVX", "1+16", "Subaru 7 without 6", "trg52", "TriTach", "GM 60/2/2/2", "Skoda Favorit", "Barra 3+1 Cam", "Kawa KX450F", "trg58", "trg59", "trg60", "INVALID" #define trigger_type_offset 524 #define trigger_unusedBit_4_10_offset 528 @@ -1652,7 +1652,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.07.01.hellen_cypress.787999402" +#define TS_SIGNATURE "rusEFI 2021.07.01.hellen_cypress.2208488390" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' @@ -1702,6 +1702,7 @@ #define TT_TT_VVT_BOSCH_QUICK_START 47 #define TT_TT_VVT_JZ 17 #define TT_TT_VVT_MIATA_NB2 43 +#define TT_TT_VVT_NISSAN_VQ 59 #define tunerStudioSerialSpeed_offset 728 #define twoWireBatchIgnition_offset 1476 #define twoWireBatchInjection_offset 1476 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 be0f9fd12c..71c1a4901d 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Thu Jul 01 21:05:19 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Thu Jul 01 21:42:48 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4231,4 +4231,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 Thu Jul 01 21:05:19 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Thu Jul 01 21:42:48 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 49fe4766e5..660656b91c 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -1283,7 +1283,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD kin #define SIGNATURE_DATE 2021.07.01 -#define SIGNATURE_HASH 3511821910 +#define SIGNATURE_HASH 2080839482 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1483,7 +1483,7 @@ #define TRIGGER_SIMULATOR_PIN_COUNT 3 #define trigger_todoRemoveMeOneDay0_offset 528 #define trigger_todoRemoveMeOneDay1_offset 528 -#define trigger_type_e_auto_enum "TT_TOOTHED_WHEEL", "TT_FORD_ASPIRE", "TT_DODGE_NEON_1995", "TT_MAZDA_MIATA_NA", "TT_MAZDA_MIATA_NB1", "TT_GM_7X", "TT_DAIHATSU", "TT_MAZDA_SOHC_4", "TT_TOOTHED_WHEEL_60_2", "TT_TOOTHED_WHEEL_36_1", "TT_HONDA_4_24_1", "TT_MITSUBISHI", "TT_HONDA_4_24", "TT_HONDA_1_4_24", "TT_DODGE_NEON_2003_CAM", "TT_MAZDA_DOHC_1_4", "TT_ONE_PLUS_ONE", "TT_VVT_JZ", "TT_ONE", "TT_DODGE_RAM", "TT_60_2_VW", "TT_HONDA_1_24", "TT_DODGE_STRATUS", "TT_36_2_2_2", "TT_NISSAN_SR20VE", "TT_2JZ_3_34", "TT_ROVER_K", "TT_GM_LS_24", "TT_HONDA_CBR_600", "TT_2JZ_1_12", "TT_CHRYSLER_NGC_36_2_2", "TT_3_1_CAM", "TT_DODGE_NEON_2003_CRANK", "TT_MIATA_VVT", "TT_HONDA_ACCORD_1_24_SHIFTED", "TT_MAZDA_MIATA_VVT_TEST", "TT_SUBARU_7_6", "TT_JEEP_18_2_2_2", "TT_NISSAN_SR20VE_360", "TT_DODGE_NEON_1995_ONLY_CRANK", "TT_JEEP_4_CYL", "TT_FIAT_IAW_P8", "TT_FORD_ST170", "TT_VVT_MIATA_NB2", "TT_RENIX_44_2_2", "TT_RENIX_66_2_2_2", "TT_HONDA_K_12_1", "TT_VVT_BOSCH_QUICK_START", "TT_TOOTHED_WHEEL_36_2", "TT_SUBARU_SVX", "TT_1_16", "TT_SUBARU_7_WITHOUT_6", "TT_52", "TT_TRI_TACH", "TT_GM_60_2_2_2", "TT_SKODA_FAVORIT", "TT_VVT_BARRA_3_PLUS_1", "TT_KAWA_KX450F", "INVALID", "TT_UNUSED" +#define trigger_type_e_auto_enum "TT_TOOTHED_WHEEL", "TT_FORD_ASPIRE", "TT_DODGE_NEON_1995", "TT_MAZDA_MIATA_NA", "TT_MAZDA_MIATA_NB1", "TT_GM_7X", "TT_DAIHATSU", "TT_MAZDA_SOHC_4", "TT_TOOTHED_WHEEL_60_2", "TT_TOOTHED_WHEEL_36_1", "TT_HONDA_4_24_1", "TT_MITSUBISHI", "TT_HONDA_4_24", "TT_HONDA_1_4_24", "TT_DODGE_NEON_2003_CAM", "TT_MAZDA_DOHC_1_4", "TT_ONE_PLUS_ONE", "TT_VVT_JZ", "TT_ONE", "TT_DODGE_RAM", "TT_60_2_VW", "TT_HONDA_1_24", "TT_DODGE_STRATUS", "TT_36_2_2_2", "TT_NISSAN_SR20VE", "TT_2JZ_3_34", "TT_ROVER_K", "TT_GM_LS_24", "TT_HONDA_CBR_600", "TT_2JZ_1_12", "TT_CHRYSLER_NGC_36_2_2", "TT_3_1_CAM", "TT_DODGE_NEON_2003_CRANK", "TT_MIATA_VVT", "TT_HONDA_ACCORD_1_24_SHIFTED", "TT_MAZDA_MIATA_VVT_TEST", "TT_SUBARU_7_6", "TT_JEEP_18_2_2_2", "TT_NISSAN_SR20VE_360", "TT_DODGE_NEON_1995_ONLY_CRANK", "TT_JEEP_4_CYL", "TT_FIAT_IAW_P8", "TT_FORD_ST170", "TT_VVT_MIATA_NB2", "TT_RENIX_44_2_2", "TT_RENIX_66_2_2_2", "TT_HONDA_K_12_1", "TT_VVT_BOSCH_QUICK_START", "TT_TOOTHED_WHEEL_36_2", "TT_SUBARU_SVX", "TT_1_16", "TT_SUBARU_7_WITHOUT_6", "TT_52", "TT_TRI_TACH", "TT_GM_60_2_2_2", "TT_SKODA_FAVORIT", "TT_VVT_BARRA_3_PLUS_1", "TT_KAWA_KX450F", "TT_NISSAN_VQ", "TT_UNUSED" #define trigger_type_e_enum "custom toothed wheel", "Ford Aspire", "Dodge Neon 1995", "Miata NA", "Miata NB", "GM_7X", "Cooper R50", "Mazda SOHC 4", "60/2", "36/1", "Honda 4+24+1", "Mitsubishi", "Honda 4+24", "Honda 1+4+24", "Dodge Neon 2003", "Mazda DOHC 1+4", "1+1", "INVALID", "Single Tooth", "Dodge Ram 1+16", "60/2 VW", "Honda 1+24", "Dodge Stratus", "36_2_2_2", "Nissan Primera", "dev 2JZ 3/34 simulator", "Rover K", "GM LS 24", "Honda CBR 600", "2JZ_1_12", "Honda CBR 600 custom", "3/1 skipped", "Dodge Neon 2003 crank", "Miata VVT", "trg34", "trg35", "Subaru 7+6", "Jeep 18-2-2-2", "WIP", "Dodge Neon 1995 crank only", "Jeep XJ 4 cyl", "FiatIAQ_P8", "Mazda Z5", "trg43", "Renix 44-2-2", "Renix 66-2-2-2", "Honda K 12+1", "trg47", "36/2", "Subaru SVX", "1+16", "Subaru 7 without 6", "trg52", "TriTach", "GM 60/2/2/2", "Skoda Favorit", "Barra 3+1 Cam", "Kawa KX450F", "trg58", "trg59", "trg60", "INVALID" #define trigger_type_offset 524 #define trigger_unusedBit_4_10_offset 528 @@ -1636,7 +1636,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator true #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.07.01.kin.3511821910" +#define TS_SIGNATURE "rusEFI 2021.07.01.kin.2080839482" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' @@ -1686,6 +1686,7 @@ #define TT_TT_VVT_BOSCH_QUICK_START 47 #define TT_TT_VVT_JZ 17 #define TT_TT_VVT_MIATA_NB2 43 +#define TT_TT_VVT_NISSAN_VQ 59 #define tunerStudioSerialSpeed_offset 728 #define twoWireBatchIgnition_offset 1476 #define twoWireBatchInjection_offset 1476 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 01cb82ec48..bce646e328 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 Thu Jul 01 21:05:23 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 Thu Jul 01 21:42:52 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4236,4 +4236,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 Thu Jul 01 21:05:23 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 Thu Jul 01 21:42:52 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 202188d577..ec7a0d2549 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 @@ -1299,7 +1299,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD subaru_eg33_f7 #define SIGNATURE_DATE 2021.07.01 -#define SIGNATURE_HASH 3252109164 +#define SIGNATURE_HASH 1820462592 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1499,7 +1499,7 @@ #define TRIGGER_SIMULATOR_PIN_COUNT 3 #define trigger_todoRemoveMeOneDay0_offset 528 #define trigger_todoRemoveMeOneDay1_offset 528 -#define trigger_type_e_auto_enum "TT_TOOTHED_WHEEL", "TT_FORD_ASPIRE", "TT_DODGE_NEON_1995", "TT_MAZDA_MIATA_NA", "TT_MAZDA_MIATA_NB1", "TT_GM_7X", "TT_DAIHATSU", "TT_MAZDA_SOHC_4", "TT_TOOTHED_WHEEL_60_2", "TT_TOOTHED_WHEEL_36_1", "TT_HONDA_4_24_1", "TT_MITSUBISHI", "TT_HONDA_4_24", "TT_HONDA_1_4_24", "TT_DODGE_NEON_2003_CAM", "TT_MAZDA_DOHC_1_4", "TT_ONE_PLUS_ONE", "TT_VVT_JZ", "TT_ONE", "TT_DODGE_RAM", "TT_60_2_VW", "TT_HONDA_1_24", "TT_DODGE_STRATUS", "TT_36_2_2_2", "TT_NISSAN_SR20VE", "TT_2JZ_3_34", "TT_ROVER_K", "TT_GM_LS_24", "TT_HONDA_CBR_600", "TT_2JZ_1_12", "TT_CHRYSLER_NGC_36_2_2", "TT_3_1_CAM", "TT_DODGE_NEON_2003_CRANK", "TT_MIATA_VVT", "TT_HONDA_ACCORD_1_24_SHIFTED", "TT_MAZDA_MIATA_VVT_TEST", "TT_SUBARU_7_6", "TT_JEEP_18_2_2_2", "TT_NISSAN_SR20VE_360", "TT_DODGE_NEON_1995_ONLY_CRANK", "TT_JEEP_4_CYL", "TT_FIAT_IAW_P8", "TT_FORD_ST170", "TT_VVT_MIATA_NB2", "TT_RENIX_44_2_2", "TT_RENIX_66_2_2_2", "TT_HONDA_K_12_1", "TT_VVT_BOSCH_QUICK_START", "TT_TOOTHED_WHEEL_36_2", "TT_SUBARU_SVX", "TT_1_16", "TT_SUBARU_7_WITHOUT_6", "TT_52", "TT_TRI_TACH", "TT_GM_60_2_2_2", "TT_SKODA_FAVORIT", "TT_VVT_BARRA_3_PLUS_1", "TT_KAWA_KX450F", "INVALID", "TT_UNUSED" +#define trigger_type_e_auto_enum "TT_TOOTHED_WHEEL", "TT_FORD_ASPIRE", "TT_DODGE_NEON_1995", "TT_MAZDA_MIATA_NA", "TT_MAZDA_MIATA_NB1", "TT_GM_7X", "TT_DAIHATSU", "TT_MAZDA_SOHC_4", "TT_TOOTHED_WHEEL_60_2", "TT_TOOTHED_WHEEL_36_1", "TT_HONDA_4_24_1", "TT_MITSUBISHI", "TT_HONDA_4_24", "TT_HONDA_1_4_24", "TT_DODGE_NEON_2003_CAM", "TT_MAZDA_DOHC_1_4", "TT_ONE_PLUS_ONE", "TT_VVT_JZ", "TT_ONE", "TT_DODGE_RAM", "TT_60_2_VW", "TT_HONDA_1_24", "TT_DODGE_STRATUS", "TT_36_2_2_2", "TT_NISSAN_SR20VE", "TT_2JZ_3_34", "TT_ROVER_K", "TT_GM_LS_24", "TT_HONDA_CBR_600", "TT_2JZ_1_12", "TT_CHRYSLER_NGC_36_2_2", "TT_3_1_CAM", "TT_DODGE_NEON_2003_CRANK", "TT_MIATA_VVT", "TT_HONDA_ACCORD_1_24_SHIFTED", "TT_MAZDA_MIATA_VVT_TEST", "TT_SUBARU_7_6", "TT_JEEP_18_2_2_2", "TT_NISSAN_SR20VE_360", "TT_DODGE_NEON_1995_ONLY_CRANK", "TT_JEEP_4_CYL", "TT_FIAT_IAW_P8", "TT_FORD_ST170", "TT_VVT_MIATA_NB2", "TT_RENIX_44_2_2", "TT_RENIX_66_2_2_2", "TT_HONDA_K_12_1", "TT_VVT_BOSCH_QUICK_START", "TT_TOOTHED_WHEEL_36_2", "TT_SUBARU_SVX", "TT_1_16", "TT_SUBARU_7_WITHOUT_6", "TT_52", "TT_TRI_TACH", "TT_GM_60_2_2_2", "TT_SKODA_FAVORIT", "TT_VVT_BARRA_3_PLUS_1", "TT_KAWA_KX450F", "TT_NISSAN_VQ", "TT_UNUSED" #define trigger_type_e_enum "custom toothed wheel", "Ford Aspire", "Dodge Neon 1995", "Miata NA", "Miata NB", "GM_7X", "Cooper R50", "Mazda SOHC 4", "60/2", "36/1", "Honda 4+24+1", "Mitsubishi", "Honda 4+24", "Honda 1+4+24", "Dodge Neon 2003", "Mazda DOHC 1+4", "1+1", "INVALID", "Single Tooth", "Dodge Ram 1+16", "60/2 VW", "Honda 1+24", "Dodge Stratus", "36_2_2_2", "Nissan Primera", "dev 2JZ 3/34 simulator", "Rover K", "GM LS 24", "Honda CBR 600", "2JZ_1_12", "Honda CBR 600 custom", "3/1 skipped", "Dodge Neon 2003 crank", "Miata VVT", "trg34", "trg35", "Subaru 7+6", "Jeep 18-2-2-2", "WIP", "Dodge Neon 1995 crank only", "Jeep XJ 4 cyl", "FiatIAQ_P8", "Mazda Z5", "trg43", "Renix 44-2-2", "Renix 66-2-2-2", "Honda K 12+1", "trg47", "36/2", "Subaru SVX", "1+16", "Subaru 7 without 6", "trg52", "TriTach", "GM 60/2/2/2", "Skoda Favorit", "Barra 3+1 Cam", "Kawa KX450F", "trg58", "trg59", "trg60", "INVALID" #define trigger_type_offset 524 #define trigger_unusedBit_4_10_offset 528 @@ -1652,7 +1652,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port false -#define TS_SIGNATURE "rusEFI 2021.07.01.subaru_eg33_f7.3252109164" +#define TS_SIGNATURE "rusEFI 2021.07.01.subaru_eg33_f7.1820462592" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' @@ -1702,6 +1702,7 @@ #define TT_TT_VVT_BOSCH_QUICK_START 47 #define TT_TT_VVT_JZ 17 #define TT_TT_VVT_MIATA_NB2 43 +#define TT_TT_VVT_NISSAN_VQ 59 #define tunerStudioSerialSpeed_offset 728 #define twoWireBatchIgnition_offset 1476 #define twoWireBatchInjection_offset 1476 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index dc7ec3e66a..d8cfdb751c 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jul 01 21:04:43 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jul 01 21:42:12 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4236,4 +4236,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 Thu Jul 01 21:04:43 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jul 01 21:42:12 UTC 2021 diff --git a/firmware/controllers/generated/fsio_enums_generated.def b/firmware/controllers/generated/fsio_enums_generated.def index 6adeaa667a..9d723d69bd 100644 --- a/firmware/controllers/generated/fsio_enums_generated.def +++ b/firmware/controllers/generated/fsio_enums_generated.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jul 01 21:04:43 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jul 01 21:42:12 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 473b28a507..2effe85048 100644 --- a/firmware/controllers/generated/fsio_getters.def +++ b/firmware/controllers/generated/fsio_getters.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jul 01 21:04:43 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jul 01 21:42:12 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 904adcfc14..fd00358da9 100644 --- a/firmware/controllers/generated/fsio_names.def +++ b/firmware/controllers/generated/fsio_names.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jul 01 21:04:43 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jul 01 21:42:12 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 43848f0204..360dc66afe 100644 --- a/firmware/controllers/generated/fsio_strings.def +++ b/firmware/controllers/generated/fsio_strings.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jul 01 21:04:43 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jul 01 21:42:12 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 d4a344e3ab..407fe13ebd 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -1296,7 +1296,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD all #define SIGNATURE_DATE 2021.07.01 -#define SIGNATURE_HASH 1821061498 +#define SIGNATURE_HASH 3252551702 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1496,7 +1496,7 @@ #define TRIGGER_SIMULATOR_PIN_COUNT 3 #define trigger_todoRemoveMeOneDay0_offset 528 #define trigger_todoRemoveMeOneDay1_offset 528 -#define trigger_type_e_auto_enum "TT_TOOTHED_WHEEL", "TT_FORD_ASPIRE", "TT_DODGE_NEON_1995", "TT_MAZDA_MIATA_NA", "TT_MAZDA_MIATA_NB1", "TT_GM_7X", "TT_DAIHATSU", "TT_MAZDA_SOHC_4", "TT_TOOTHED_WHEEL_60_2", "TT_TOOTHED_WHEEL_36_1", "TT_HONDA_4_24_1", "TT_MITSUBISHI", "TT_HONDA_4_24", "TT_HONDA_1_4_24", "TT_DODGE_NEON_2003_CAM", "TT_MAZDA_DOHC_1_4", "TT_ONE_PLUS_ONE", "TT_VVT_JZ", "TT_ONE", "TT_DODGE_RAM", "TT_60_2_VW", "TT_HONDA_1_24", "TT_DODGE_STRATUS", "TT_36_2_2_2", "TT_NISSAN_SR20VE", "TT_2JZ_3_34", "TT_ROVER_K", "TT_GM_LS_24", "TT_HONDA_CBR_600", "TT_2JZ_1_12", "TT_CHRYSLER_NGC_36_2_2", "TT_3_1_CAM", "TT_DODGE_NEON_2003_CRANK", "TT_MIATA_VVT", "TT_HONDA_ACCORD_1_24_SHIFTED", "TT_MAZDA_MIATA_VVT_TEST", "TT_SUBARU_7_6", "TT_JEEP_18_2_2_2", "TT_NISSAN_SR20VE_360", "TT_DODGE_NEON_1995_ONLY_CRANK", "TT_JEEP_4_CYL", "TT_FIAT_IAW_P8", "TT_FORD_ST170", "TT_VVT_MIATA_NB2", "TT_RENIX_44_2_2", "TT_RENIX_66_2_2_2", "TT_HONDA_K_12_1", "TT_VVT_BOSCH_QUICK_START", "TT_TOOTHED_WHEEL_36_2", "TT_SUBARU_SVX", "TT_1_16", "TT_SUBARU_7_WITHOUT_6", "TT_52", "TT_TRI_TACH", "TT_GM_60_2_2_2", "TT_SKODA_FAVORIT", "TT_VVT_BARRA_3_PLUS_1", "TT_KAWA_KX450F", "INVALID", "TT_UNUSED" +#define trigger_type_e_auto_enum "TT_TOOTHED_WHEEL", "TT_FORD_ASPIRE", "TT_DODGE_NEON_1995", "TT_MAZDA_MIATA_NA", "TT_MAZDA_MIATA_NB1", "TT_GM_7X", "TT_DAIHATSU", "TT_MAZDA_SOHC_4", "TT_TOOTHED_WHEEL_60_2", "TT_TOOTHED_WHEEL_36_1", "TT_HONDA_4_24_1", "TT_MITSUBISHI", "TT_HONDA_4_24", "TT_HONDA_1_4_24", "TT_DODGE_NEON_2003_CAM", "TT_MAZDA_DOHC_1_4", "TT_ONE_PLUS_ONE", "TT_VVT_JZ", "TT_ONE", "TT_DODGE_RAM", "TT_60_2_VW", "TT_HONDA_1_24", "TT_DODGE_STRATUS", "TT_36_2_2_2", "TT_NISSAN_SR20VE", "TT_2JZ_3_34", "TT_ROVER_K", "TT_GM_LS_24", "TT_HONDA_CBR_600", "TT_2JZ_1_12", "TT_CHRYSLER_NGC_36_2_2", "TT_3_1_CAM", "TT_DODGE_NEON_2003_CRANK", "TT_MIATA_VVT", "TT_HONDA_ACCORD_1_24_SHIFTED", "TT_MAZDA_MIATA_VVT_TEST", "TT_SUBARU_7_6", "TT_JEEP_18_2_2_2", "TT_NISSAN_SR20VE_360", "TT_DODGE_NEON_1995_ONLY_CRANK", "TT_JEEP_4_CYL", "TT_FIAT_IAW_P8", "TT_FORD_ST170", "TT_VVT_MIATA_NB2", "TT_RENIX_44_2_2", "TT_RENIX_66_2_2_2", "TT_HONDA_K_12_1", "TT_VVT_BOSCH_QUICK_START", "TT_TOOTHED_WHEEL_36_2", "TT_SUBARU_SVX", "TT_1_16", "TT_SUBARU_7_WITHOUT_6", "TT_52", "TT_TRI_TACH", "TT_GM_60_2_2_2", "TT_SKODA_FAVORIT", "TT_VVT_BARRA_3_PLUS_1", "TT_KAWA_KX450F", "TT_NISSAN_VQ", "TT_UNUSED" #define trigger_type_e_enum "custom toothed wheel", "Ford Aspire", "Dodge Neon 1995", "Miata NA", "Miata NB", "GM_7X", "Cooper R50", "Mazda SOHC 4", "60/2", "36/1", "Honda 4+24+1", "Mitsubishi", "Honda 4+24", "Honda 1+4+24", "Dodge Neon 2003", "Mazda DOHC 1+4", "1+1", "INVALID", "Single Tooth", "Dodge Ram 1+16", "60/2 VW", "Honda 1+24", "Dodge Stratus", "36_2_2_2", "Nissan Primera", "dev 2JZ 3/34 simulator", "Rover K", "GM LS 24", "Honda CBR 600", "2JZ_1_12", "Honda CBR 600 custom", "3/1 skipped", "Dodge Neon 2003 crank", "Miata VVT", "trg34", "trg35", "Subaru 7+6", "Jeep 18-2-2-2", "WIP", "Dodge Neon 1995 crank only", "Jeep XJ 4 cyl", "FiatIAQ_P8", "Mazda Z5", "trg43", "Renix 44-2-2", "Renix 66-2-2-2", "Honda K 12+1", "trg47", "36/2", "Subaru SVX", "1+16", "Subaru 7 without 6", "trg52", "TriTach", "GM 60/2/2/2", "Skoda Favorit", "Barra 3+1 Cam", "Kawa KX450F", "trg58", "trg59", "trg60", "INVALID" #define trigger_type_offset 524 #define trigger_unusedBit_4_10_offset 528 @@ -1649,7 +1649,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.07.01.all.1821061498" +#define TS_SIGNATURE "rusEFI 2021.07.01.all.3252551702" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' @@ -1699,6 +1699,7 @@ #define TT_TT_VVT_BOSCH_QUICK_START 47 #define TT_TT_VVT_JZ 17 #define TT_TT_VVT_MIATA_NB2 43 +#define TT_TT_VVT_NISSAN_VQ 59 #define tunerStudioSerialSpeed_offset 728 #define twoWireBatchIgnition_offset 1476 #define twoWireBatchInjection_offset 1476 diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index 3a2a9ecd91..4766cb7cd5 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.07.01 -#define SIGNATURE_HASH 1821061498 -#define TS_SIGNATURE "rusEFI 2021.07.01.all.1821061498" +#define SIGNATURE_HASH 3252551702 +#define TS_SIGNATURE "rusEFI 2021.07.01.all.3252551702" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index 0f4a7b06e3..039347eeff 100644 --- a/firmware/controllers/generated/signature_f429-discovery.h +++ b/firmware/controllers/generated/signature_f429-discovery.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD f429-discovery #define SIGNATURE_DATE 2021.07.01 -#define SIGNATURE_HASH 787999402 -#define TS_SIGNATURE "rusEFI 2021.07.01.f429-discovery.787999402" +#define SIGNATURE_HASH 2208488390 +#define TS_SIGNATURE "rusEFI 2021.07.01.f429-discovery.2208488390" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 916cbdbd06..195a1b1418 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.07.01 -#define SIGNATURE_HASH 1422245699 -#define TS_SIGNATURE "rusEFI 2021.07.01.frankenso_na6.1422245699" +#define SIGNATURE_HASH 4187000367 +#define TS_SIGNATURE "rusEFI 2021.07.01.frankenso_na6.4187000367" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index 2d9aad7105..9ab4cc283b 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.07.01 -#define SIGNATURE_HASH 1646363405 -#define TS_SIGNATURE "rusEFI 2021.07.01.hellen121nissan.1646363405" +#define SIGNATURE_HASH 3480531553 +#define TS_SIGNATURE "rusEFI 2021.07.01.hellen121nissan.3480531553" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index fa2b207b6a..8d565aa572 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.07.01 -#define SIGNATURE_HASH 2663373623 -#define TS_SIGNATURE "rusEFI 2021.07.01.hellen121vag.2663373623" +#define SIGNATURE_HASH 871033435 +#define TS_SIGNATURE "rusEFI 2021.07.01.hellen121vag.871033435" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index af2ee09ed5..a65722c0de 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.07.01 -#define SIGNATURE_HASH 2608145822 -#define TS_SIGNATURE "rusEFI 2021.07.01.hellen128.2608145822" +#define SIGNATURE_HASH 908072178 +#define TS_SIGNATURE "rusEFI 2021.07.01.hellen128.908072178" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index 0563e3c611..1768187885 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.07.01 -#define SIGNATURE_HASH 1563385221 -#define TS_SIGNATURE "rusEFI 2021.07.01.hellen72.1563385221" +#define SIGNATURE_HASH 4034555113 +#define TS_SIGNATURE "rusEFI 2021.07.01.hellen72.4034555113" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index e0549203da..75e9d9b651 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.07.01 -#define SIGNATURE_HASH 1893720046 -#define TS_SIGNATURE "rusEFI 2021.07.01.hellenNA6.1893720046" +#define SIGNATURE_HASH 3716869762 +#define TS_SIGNATURE "rusEFI 2021.07.01.hellenNA6.3716869762" diff --git a/firmware/controllers/generated/signature_hellen_cypress.h b/firmware/controllers/generated/signature_hellen_cypress.h index 37483e6023..88743a7ec2 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.07.01 -#define SIGNATURE_HASH 787999402 -#define TS_SIGNATURE "rusEFI 2021.07.01.hellen_cypress.787999402" +#define SIGNATURE_HASH 2208488390 +#define TS_SIGNATURE "rusEFI 2021.07.01.hellen_cypress.2208488390" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 0448915e32..0fd2a9d94c 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.07.01 -#define SIGNATURE_HASH 3511821910 -#define TS_SIGNATURE "rusEFI 2021.07.01.kin.3511821910" +#define SIGNATURE_HASH 2080839482 +#define TS_SIGNATURE "rusEFI 2021.07.01.kin.2080839482" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 372d1df9a4..fe622ffd5a 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.07.01 -#define SIGNATURE_HASH 924772595 -#define TS_SIGNATURE "rusEFI 2021.07.01.mre_f4.924772595" +#define SIGNATURE_HASH 2588662175 +#define TS_SIGNATURE "rusEFI 2021.07.01.mre_f4.2588662175" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 94534be1a2..157b9dcefc 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.07.01 -#define SIGNATURE_HASH 924772595 -#define TS_SIGNATURE "rusEFI 2021.07.01.mre_f7.924772595" +#define SIGNATURE_HASH 2588662175 +#define TS_SIGNATURE "rusEFI 2021.07.01.mre_f7.2588662175" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index a8d547cc03..64b2f19367 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.07.01 -#define SIGNATURE_HASH 2115842892 -#define TS_SIGNATURE "rusEFI 2021.07.01.prometheus_405.2115842892" +#define SIGNATURE_HASH 3544711712 +#define TS_SIGNATURE "rusEFI 2021.07.01.prometheus_405.3544711712" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 7656925ecd..fc0ebb2777 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.07.01 -#define SIGNATURE_HASH 2115842892 -#define TS_SIGNATURE "rusEFI 2021.07.01.prometheus_469.2115842892" +#define SIGNATURE_HASH 3544711712 +#define TS_SIGNATURE "rusEFI 2021.07.01.prometheus_469.3544711712" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index d7e965c6ea..21b4f963c2 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.07.01 -#define SIGNATURE_HASH 87919713 -#define TS_SIGNATURE "rusEFI 2021.07.01.proteus_f4.87919713" +#define SIGNATURE_HASH 2825436429 +#define TS_SIGNATURE "rusEFI 2021.07.01.proteus_f4.2825436429" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 5c91a70ad0..52f6d9977a 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.07.01 -#define SIGNATURE_HASH 87919713 -#define TS_SIGNATURE "rusEFI 2021.07.01.proteus_f7.87919713" +#define SIGNATURE_HASH 2825436429 +#define TS_SIGNATURE "rusEFI 2021.07.01.proteus_f7.2825436429" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index 3e58a0c3d0..5d836c346c 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.07.01 -#define SIGNATURE_HASH 3252109164 -#define TS_SIGNATURE "rusEFI 2021.07.01.subaru_eg33_f7.3252109164" +#define SIGNATURE_HASH 1820462592 +#define TS_SIGNATURE "rusEFI 2021.07.01.subaru_eg33_f7.1820462592" diff --git a/firmware/tunerstudio/generated/cache.zip b/firmware/tunerstudio/generated/cache.zip index d002fd2632448edbbf5f353348ab24952b255c52..5f5dd361d99656ed94bdc1e18ab52fb7cb8fc36e 100644 GIT binary patch delta 405991 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 delta 406032 zcmV(&K;ggk<6w~EV1R@HgaU*Ev;=rJ0+*MWo9e@7O z)|S|uza9s+QZ_&rPtQI4zYX4pgZqby?Ob{Azd?s&%U-ubK!Ja##P(1_Jvwz(j*s^pt7vn-sF@$6t9$*n-mdOMq0pZdc39J_1e)QZ^7ttJz zmly5J%l0+)fm5@Z2+Y*&cb(dPLF!8N$h$&#yHrB$Y z27;6Vl-B%tp(b>6B+ z^Z|QBo2fm2nZ`=BW0%8ELsXU^YX{CQSn$Z%pTaM|(4%qiwKRX2|9>qF(`oS6D?eKL z)9=}})x(_ZgKL!QeA+?}VR@2MOhWOe%y0(a-zRZihX2vgQzfErDkKnj(<+sMx|NX73J>9E8kC&T=))|G zb{zye8#yC5FNSb*T7QrixdUI8DRj~)`-49rWXt`B#Q7^?IaK$Lj}MQID$ZY=chkEM z4~zGoqr#6|#rqGHa%n$HQm(*$czk$FX*fw^do-)z53@Utj|C`5bTR92m49{a{4~Av z@0;;rK`I^Scn`7qJ>7v*|K7QD&uL8Tw+iVKz7`x^O=Z%n>VI#{@Nx)IEbfBzDF~u$ zeCXB_{rDK41VKy4n=r|PD(q9G)>$;03A((kEewhhCTH_p|#!feK$kkM4KtisKD&!NX8xnIkAM&nD}ys9_kTX}HmHxl8-PngwnNg*o2|M`mT;n@`H|jv&}&}$6noeZSTDoN_F=Vr%;9k0 z{T{yOTTchR5r#chcYA$N9rS8tgtEWx4(V18qvU1DWe{5N61sR0PlG59$B4Vo*cmME z{KfJEN&rdvJPibATG>%NA}WDiQaIX4JPSCDtbf8;I36QEXV>#YN+)iEQG9>`#I2@z z!=N}c1k8if=kx(ysXA3{Og0Aa7>t|#V*JskaCp|NSgg*9{8dhg?HwN6RgU?^l&}^AilI#_Z_Hod8E+C8 zjKTT><%Y1ISnr_NJ}>esKYf5Y6{N;4+iqO>^KJMUehtRkjh!=8i7K>`AVgg#&&!N$ zqw6}RCO{b$7!XTlm*Nmg(g?#MO%->6?|a?IP?9;V|?DdIBS+22%w?>_^mx82BheKm)b>NMS(? zzIvQ{0jK2Li^}eH5_*ED4|62)$G(0DNz)&K%^Q1Z=PJC z)eXbAU|2vxUI9sl7%d2Ua4dE3`hOuIdlHG93E3)M#noDO7L*Y-6Y-%yEM_zr<7S{* zL#f!T*8d7~d`V#kxYAcv;D6mvfms9D0=3A>2d7CKUy|UB=tpE2G*+L!CsQ3whx2DL z1B!5lW0(U50|Ln$*qloN!4koY(AYc}xq#eRb0y>Kf(!^BH`nlS8n8Q6O5I`?&$$jcovi=%TL9B`W8o}iltP-;B zFoce}oRy7H)ti^ZRk7NN3dDqd@OX(Z9t7xuQuRm+W58LVpXR_tDa@}j4BM5vYYJV1 zd=yc4=#m)v2TqFCT--0`Eq}L+I{Uaa%K2}Cz-}ZGy&c4pl(9t=ZrjY79tuL zsgqb-E%`VOTvFBmohF>EPdIXljB#16=eWn9e1)c^D_W z7T73@dW!E(vsxKFs~@Cz;heK6s2s5cgU<30&X3`^-GiM68@X_!@u1ah?C|CF+k>~X zsE@8Lesdn4oH!YMMt>$SR{1FKV)76K6qyAVIqq(sBhsqFPLBHwZVtFv;HJYHMq^vT ztXR5@s&VK11rfYXVdrBDuEx$sjKMh_EzypNzd8s6rFP1RhJ-r>Y4vmD+$4dvO;qPZ zXV3Wp?J#nyFO6;ZuzIRjdWC!}reC3H{^AQUioRID!P!}Go`0HgNaD&zpTa8+Fe%Qe z<(vdyKIH;gY|=F*Zlg?t$OECNX}Kd zEc4wiM+!}0uHc3#d#UR9gfQP4+n4z}dlQ#iCx-P5sS(C}vjtyf5LY4OaoC3IyUzZu zbFk|i?m9=i&VMnR4^$9OxB3d3_Z13q4Nws!Cm{+`Uc5ko@&QAccfAU#r{t$s^QvAQ zUewf!BM)RL@4(yl4!tVE5ULN54qn#a)jCRAt>4ZvWLDO{qhWFmknbfgmjQ`dEucRnFz{`> zm2|^}12R8s`s9!>oj>?{*S587?q!@lv*sVlq529vb?|Nh{$4iZ?~$n zN^e+9CoA9dB}+y!-6DlLDEs%h8f4T^6QWf332PH3A;r7A4@gbpqdIg1V!GMQl*a5M z%p7C*I}{131Mm%1XG=QPv41{J7gCb(3&z_fF;+dmYwi~@2sqG}6Z_Ih znTxJefT9qUM^Z#2fy6~`vprPm(L1c$31&;SaNJhlxb|Q;pUl(!Q~VLK64iS6w%jLxC^<1P^#IHc{2Uq8;b*+zB*aimYAwxo&2Dd(-tXbv+TMJ+ynnx&Ez(3U zcDgh890}1R{X?l|luAb$*J7<^9J@--Yt@e#?DX-Xm_it4=oX`K*cMk8V1ItV7@Y`e zjcgZ@Q%|ox?mFTyLkBOSL*|bxXtRUmt{uIc?)~|2!Erk;Aw&AmRfo35Hi_`20C93s z5DuJtkG34Kf3Ey0D){bntd@yz0knk1FV+c$@@iEJ%+qc-?TMn+#W)0_=4pSOv*#Uk zo6_X2jZ{FK(n>mx0~HU#r+?EwEGN=jlYRnN?7pZHXn4)-ZkIP2rFb4KX#-5jFAx7w zS9jR+{uKC%VAE>4N`=PO=8}^Y`r?8sQ}~tV$e%IJG+iKUZ`s-TiC0dG)5;y%gZfBJ z5J^W)EZdFZX`Esg0h3e6DH*UPs{~X#JSaCkoMG&z_l~X-m17<3YkwRPHn9p5r%rjA z!qGf^U)s_gcIOq3F)EK67wbQ zCUtw{aoh}Rt8(tr@u+B%hRzlhlEa}yJLvGu7ov-1984zRD1Ss{%T6EL^X}UbNJXkeqD!W8AdZp@k~!-@ zG>#I~u_jvc%vTmX7c*b*cTn-gZ|`}ESV?!CFS8F1g@659&1(bw$cyeqFRQ<SpQ;mQ=!IC zQwhJW??z-+NaCw+2`l(Km#-j(@-Kr3Rj5M*d9B_bZ=s->UL$HC^&Nn^8y!6~x7Pr^Qko#pC^YU5xI_m4^AV zyYPMqr{Avn!eYVO0g8<(lzbMdd`5vqkV{R7Tc^|Kl5>TJ5mbNg2|BULhGrYjnH8E+ zW}z;=sEi~YLG|jVoe2xxSrqzUiz|R$MF(q?ZGCE;Y1t^ z+7T?ax2$5|;f#JaSQU8p45yPBqEy_%xIkAl@D6Ake9cKHT6cKSqLxvJpjW1S2vAJh zkbgMu)|a;eXt05lzNfs4$IrVW;D|AzqmTM@x7`y%sH}{fZ#Hd=Mh(`sIA6pgko^_z zG((a+#%RCk!&);S1MwEzxbDg6LSnXMY&&u4<8=MVa#9=z~f zwyIeu1sV{!I;2%=NF_XrHKv)hoC0l0xm4k%-N*6RwAjN4W!Vhf)1IyR2S;s_gX(^@ylGa8DYz0)^M5Y; zDkKve8iMJ&wAc?j*V*;8dlJsZ?1bPui$oqtR*9o^9E8ff`ip3&i*5JoO3yF%oa9J z`_2Jlktk=;m5?7?cuE*)&8;5E0_@?HQ>=(=lb*m2W+GH1a)@Yzk9u-Y;=C!mwM|oWc?rtzdH50 zs)(Nt4zjAb;XgW+Dvu>*J(NjQHAo-aev%PCFdL*LrUS{m&zNqDaOku22t$BFj{l{M zUt*~5%zwmd7{2F_5KT_gr++U0(SHJh$Y)ZOd8B?E%Z~#~@XQo0)^dC?npMH-JvrHW zlPiVbLv~*Db|eoO7sRQ-az2j{cx_L(i0JCfVv!fVLE8>gbaQCjtDqYNE&sW^?n8w? zKy6)^5wz{vJ7hd3{;b75WlPB+C4{F7V^drkk(f}Pi#TGc%=}@T`hQbe!+gEp*ydBB z$w~JOVS;lFc%8g1pLt)q!iD8UCT=0H8!Y&6v>COI zg>Kj+tvbbYXD|<2^vXb#Lfh0}eC5wGgI8O#rF3U(>&HjKvD_%)W>1%wVyA;19)*g< zT?0~zgJp~H^T3}F41XBO&W#=X2@C>HmU1I!D1>~|o))AYktD`h9sb(m%3>||oUYR>6H?*?iUmM{b3=h1Mx*I+92m!2yv2Hp#-je>`K{s@WXK-oNuba$ z{vsreImLWbN`FK2w8x^Le7Kr>#nF=6|~k-Sac`Ab7=co>V5ir~1{K%*z#zSPJG6*9aLei62vjS=rdOjX3p< zhm8ZOGJit5^IzB%q!kK}UYlY7f9T`t7#OAF2oymT!R!uWdtk>#m6gW&Z`Is4xz@lT zbP+%j*j)RX4&iuGH9gYuWzvmc9v>F1m+ii$zHe-0drgF%OlrL}STImGMP+ubLzfQm zCuX;5B47dsvXMfQ#Fc(4O&q$h(onxR5TmAWrr&a!g z35kk%(IZE}xY7j%8mi!pD#lMEQG;$1IXk3*^oG_bUpfpxA`r6VQ~2IsFFfvpU^*G3 zp|XE*-bHK}lOSpwIuc-Yyp^g^gF+}`^yg^UZFOI0bz{44+u&tB=GN5zh5ec_xNom> zoqyloGs73Oh0f=@e?JX4Qu2t61K7O)s~jVsyTruLpg{bOAj2uSD_n#borFu4SXF^ zy_xahqDB-YG+Jx{hg+np0W@aDFRjjbr`H|kSCYg=?8PY>3B_au+=R0pV+$9O6@O^S zNp1hQ{S+*qr@QzffLdstppZk}z1{=8BOwRFH`+TBrf4R1hEb9ww$7w*XsK0>_V*Lx zP-^X07_3`#5QFDvMAEZaKvCnJ?d$G))Zu>`Q&99XKYvN>WBm$D;qogcV(F>k8K{LfY&Qa3-wzUy(nb&e z)k3X&Jg3m#bi69O9jU%_J0ild!fGf|$5&ra$G=#}Yb5p8oC0W>eU_}RlIK@s_JQ){ z+915^G=>zP9TCrN+LzvC`xgEkx~G?Ig`}wd;I5 z?e045^Dc<$8XO+4hDbK2u`xC*XohlBfRIokfvOVA$`RpSSybEH07& zL?)rru}BZA3rloX&1B79kou#CF1=XCf~^#5_Qf#jBQQ%rCgeF2#@s3aTpH*g#I84DU8aX9CwGqOMT67=P$=-(FQB%w6`+%_1Q_hwBi{l zKY$uC@oVh-pj4Zgxql&g)lXp?M5RmWe<2f51XLK2c{7S9e)P;x7HkFwgFqILjqPSX zcXVTbYExWP40zDFy18@_m})%}w$7!EHku)GSOI4q1|wo)IOb^QhZdPI#$-pJw6KiS z!PYS(@J>;rg5xg=T!>>O&=GWg<-i0SK^(6d#8FtvB9547@P8>hzX~N}rC56LoXj3B zcq5=Jg^G?Nzq@ykCFc*iPF#J^Qu5BVzgWai;%8iS_zMrRRvr)zPRV)Oy(TNn46#YP zCU)V|*%^IH82-sIU|U$PV9Mr28=pZGSuDrnE;@QK1c)bKCLRjYm7Mv*PkFd!zKph&`lg4J#gWi zb#URrDJPz4a2%9Fbe0U?%Y4iAk%L6m>jdN@eM;szBVWM*Wd~g`*J0Z?RtAzA5%3GV zM_D*VtR2IWC?TY!BsEJCC1*)Z16nn?DM#l^8>3A6?=fxqGd>f+F{mFVFdfkNc@g48 zBHkZD3x5>rf&&Dc5blG*d|aRyCtvwVisJ*4gBlG)z?h39*KwQ5|4)d+ z)ioA4Muk5@Ff`d*0{MhJ1gRM)1Hi(@glei!(V<#-b1_K7{R3L$(jQd3k-q^k0e6|k zdkCq9j9I|%RMW0wSY^6AXaBprpY&G?uLTwYq$J6aw zJDXw5NH9(nry&~A|4{k&WZU#CW|);laL=eQv_FLl1%iuNRky>>P6V4SA^c5oa)l#v zt966fCloOd^wDi!IiL3U31@-qu74jvCPrCr>pSOdKGR#ZyVa@)Sp&tQyX-EzK$9#& z2Cja@E=dIa7u<`X19_^WqLA1YNS)|CU8riY5%ay~g?oM7zRU}=bdGRgw|o9ASgcjJ zn97g>g|MlQDgM-n(u;UHrtfR@Iawm5k@?QquN@p6mX9llwNm|ms>gekU4QY4X1f*` z;c!d`4A^qVPN!v@m!F*iQK^EeTkiqSs%YMzGaz)>p>46W zPW?h>_q^@}IUO)8QtB0}VS2#=p_NS%tNZ&zoPF6aI^zqEo$g#}== z2o)4wLP!D9)kUWvgcgMPa({K@Ubph|=6)W=YYsje^I>;s#ap6qw{TK}0D=q74srTR z`+T@=>Z)4;Qom>3GD{GfUSm>cYSnMt{;;BcRMn3f8p|nl0xSJ871*GKTiF;F5C!p4 zN-zXk0eK}9=iF87rE;ManW=UW8;F8C4-?NUf7~Q_F<8(tZ5bE(MSoTag-K~9bj6@U zn{qtyIbWaPI4j@mWgDeGMNQzdI;rMKqrMnqwh#^S=Mhs|WY1J5n~LD!VNA%kdm5Zp zGj?L=TW<>P_=qsv{%PtrHNUv)eWW%r^7quue~xxDT;Ad664=wXWX3E7K4wicL<)CNtL%2Jl=))FCJQXh zt4T-_8$EnLNe!W)Q${@&Yo*3EQ@;X#R?c0#%Nd0rF?(zQg@2`lk!9UMYmip^o|8m~ z%c1mevVr1ZmhgDT1R4hWH3@bcm>0y~!m9|o>Z1D$e`MT56tQx9Z`PngR(*dQ&+tx#1d1sW-U-US#Zs{lz+@w)0=O_1xilWY@oWNCS_Zn~S#%pDM*M zx9Ll9+->-xVsGa^RCQqmpVpODT~}IdEon7f*y^Xk(njN%x`9JOC;!fALKh*x08DTV z8SB7wgEO;0D2mcVJFk6?i1)G&CJ5+MOb2q|_J(VSbARV*{zv?bh_YW8U0{_m_1!IK zj{0`GK3jABrxt&*#Rp{1unFD3OJ#|W`A8}I#Rtrye590LrYvi6VBrAjs8Mm7&GsdE z#I%QQ=d#^$7?*+W^Wil7HSczm`5lYDfK}&)5Gjm7RzTv($yTlqencR&l-+Gbw=Ru$ zSRQfYynn{#dqy|R{D~cxR(j%*Tv;BeMUNy@J=SzPRx)j9N`;zITn)zY-FmZH8oXh$ z$v-0V|j3l;nhLQy48mf_ zbA8sO^d~3iqfELNchKx~%x)@7o)u0cc|sDEzCz9B(hHL7!hvXX^@Vdal}uI)%#;=4 z&Zd$JlG{gsm)N|R^N2?Q@p)9!K%a-nLog;dD)JT)#-!kG7z$)gsNf*Pqx}iV4+){a z7=MOVrkH7>Ch!E)jIvNHW&15Qs~%W_^&c=kTh5C}({K#^0Nu0*`G0Oux5lBltM~kL4si|0ZMR|IyncDB8dEXe19Gwp_b{WPlv7Mu9)^%#Ia(Ew9Wf?nP<{N zT5FR0?g$qLRXRjiWnUNUBCw1NaE9(Y8#;?6etcj@w4J8-?+T)c(u-uCK7??`uwaS4 z9C)|l9YbA3sov+0Kox@6HQe`_*~IBY(85$*%4HwLV$uE#JoDmi5svRsbC%s(;C~rY z1wpyklLQ3!M2MB@el33pr0W;mH>{#J)pQ&vgORUS-=Cs~7r$npY?CyHV?`309vxe&#uCl||^ANAoFj44#`6S?G>q@DXHUIZlNU->xOmblZJmp6i4 zgPvX)@DoX^c$tWXHst6=Z{~}b)_*uDegxVIraoS5tDrc<^2HC1^tv+&GUWt*5;D3t zS~~2Cc9ak$5via3-^5Rf^x2FKq@oHb6|r2lmId5-=r1VD_UT*dtA5l6ZTyfFX(hO_*Ge|rj5wvk16unj#JAV`>qv^+}IjpY-_kNh{@VNc#=rRe52+($Uf~UEqaq z8m3-#zk(52-fX=gFQ8xA!++DfgcGE9op_6(pDm?;=_*U-w2#_eO{18LIhd_8JETNJOQQrVA@|UOXRdAQmKQtYA&aMXzPhR7cq3pYI8)rDUXTc8%G#HRWt-T$viT zi2!Ncy0Q!3OZ&1g88jxtJm9$%qmzW&#`cf%hZQTka;`K}`m+6Iz;L?xEMMX*c zj`>VtxzHcJVrD_cfq!pw5apB(3p{c&N{jH7HKDD8JEq`lBxMp}w!?1<&4caiBv7G~ zzPRd>+rCEiqpul5Dt4@=5F}_?y-bY;_pTgiG?ax9@(z4obH=bjpNK(~E^31w+UW0j z@*2f88+6*tu7z6I4VmD82!bF&_rsqp#q(QDuZL&qVY>%^Gk?af+)qcy{@>)Z1AN}P z^1lQeyG@^G2wL}?q?G1E@Cdv;NIysY_TO(h{dS8@OLr+5No}Bz|eF=sD7r8OKynk^iigezfVd-c0%k07M%l@H4 zd3Mw8bbN|7!%Y+SsvV7AX;m)M?W01M`;rI4u;4I6B$_AH{mhenFq&@uKK8flJGkoa zxVNjm?%vLnNGtV&`kfr}aimzpLJ2FwFwvH9{3B7PO*t^KH-a;TJkA8ROSV~y8T)OT zS*~g8-G7eTZ0z(F$baQn$Clr=3R)kuGUKnh!Fa^40R z72&qU9|I62a$rp;&J{K5tx|lkZu~6gw-cZ%02CM0ugG=G8kW8Tbkn1V7lr{V%A=U-M)iIZXm}N$e&XBxrX#0|~-&n1P-hY{O7Oi&D!vL!gX&3n@rq@DTuaxwJn^bm(>* zMt^6&{AV>^+`J>NJ!{l#NoE+$Z`FjE?Z-uUVD%j<>x`r-Oo>`Iq}J#$bdB5?PItU7hVJMB*?aRfSB7aW8 zaV2FKD)yjwi~N%Pv!ktie_+GeztQ?slTTM-VrPCtUZcWd28$JM>4$L6VuJ=)D!R?_ zM|`wxpw*tTHo@oa+%-XRyAGDnQtiBK1dE9Hi?$Y8tZmV zoi)L{GN2;Duxtyui^9ynenUYo3x8k3v#ZBqFmpT|DJLffwM6jN65DJ_J*xmpI=4Gu}FJ&wr?uMaZmX zlv*;Jg0k`Kg%;+VUUO<4>ZN2$Mu!J?wVcAT?%``icTsdz_7IYoEXtm%1M5aiajYAU zC4~{f>omOeG$8HiT4z3`dkP+VGd{UxiVo*K%O?cO%!eV*m*&s$X{;|!RKXP2C<|ww zxsx%8qEFDl;%VY!`?sI9C4YaNm^FfE&zvj_FADOtpwA$*+=WvFQM`MWD+pcSg0(v& zIY=-kLCHfiLggVTcHvSSUCKJF(^2_T3^;0h7cU#-YeLRzDl~=&B`S851Sd7~YWi(o z5q6Luy9m~N1tvu+v+YPttdFo=D4TR!bDj;x?Q6z?CVJNSm|S{X{C@}->v&1iMEZ^> z%pF&h+g%1Z^3dYrMPooI(J9+_tEQ#i_$wM5cYRnR;(Q*TOhT7oUo|<$?Ko*SAJw|gHqxOozH^boQ z3*DmNX_*kkNi_f?M}M?h6X6YO<|uE;gF^7+aBiBXm-IOg>h&<2M=3m=LQezqw(Ezu zHrnHRoC-2Fjh)-R@=hU2$gdNo^@tq&B6Rd4!Igdca)XD7J^ED8d|86Ouk{$t>;0xa zPz(H>8GP)0NsBNTA_#Q^coaVa)(y;eYb}3LjCXgNoWnp^rhoj-JAa8h52LcZhXYY3 za`YKVoG-QcgRdk8Y6N9rj;XjR?1+SZhMqDolTZN%X>9cOKG$+$NBu2|}M=TEQL}F-GQ3kJ?C^t9F>fd$T;jYuXgnv*vq>(}I3|#&1 zi}4I}kUpU>V}D$g9`U(M*)zbZ%~uZk#Bb{U?-gTDtKjC!EFdwq3v=Iti}f0 zx2|`nDSxOm2w($1BpF38_1Fc@rkd-XC~ zm!KRm&Vn~_JV~^$LQ@r0l5rXkBn+c^XxLwhb)J0R1AOAjPam2pki46AFsMRf$4xn6 zMut8CuN6)JY48+_*;@pR>j<3kfsAXu1|!6<_1;1_)t*K4H0mHe!>=A73zH0KRvd zPJb4zicdY-jV3p%GmUqK14OC{_UR&UZtD$Vawn_qBL^0w3)z8ai};T)Nb!?GsiCNF zHb&M8esWQMzKz(JTOp-lj|#L!pZt;HXb3B{VY!`EvH&?orMH>KQe*ozXY5zqTD2E_ z(GZvJ`;|watg(zfg5FoYN;dP{H;gZs!ha}sN26d$5jC~qkB4OtjFJXJnX-v5FZ@5% zD>WLgg0T`;FMU`Yu(v;ImtVi;uiW0h$8x70`sLK^<6!jJ8v9oQPexHm1tXOkwjADm z)j-W%TLi9J&YfREM{4?EQi8AdNH#&_e#y*I4vxPv9>IBJ1#1^Y%geC};3r}gjDPX2 z>{Y4%^OJw}ZZ0oxdjBre{9pGIySLT-c&)uzvMIj7FyMeJnR2TEogMJMyds-@_nJZ# zH*fm4ZCRE&r1w0bIF0&5McNG`hJ+cq5mi~lYKFZ5tYc&|IcAb=LN8V;++bA~4JG8! zv?n2|Cl?gp#d$kR-bzSw6t9;mWPct8pn!)xrTynjdsg@bQESZzR$|4 zRo=5-5t#Wj_+Q--`7*efQ5SHyUG3cLHj5)AQ@FHMw}wi2#jgRYfDW^&fDw3o6@_+D zR`JbgY86js*sORHF$VRp2=|qbHNA;|bzwuZS?WAJ`N7a%Hg?!$niOZ`pMOi5N7A37 zXonsvqJaA%_WWUzgmXNzW-b~mw4!A@Zuk-!vE&qc?$Us=CFu%?azlLy(mM@mDo66e z{e%4MFvOv(sN%?NFGpuvDJO@c`eF&D;Rf1xh;^%SAOBOeB&&=B;ZZ8`J$g*g+7YV> z1S3P}e%SwQB-`prWD0&e3x6r}%!+YHwTAs;QRRPaoRP1TNz*)m_t`CarA%-oP#nK2 zIoEOO2!iByF9pjGlAyr#Bo$&F7*^1>&%cESP~ZWTOH^R!gg_ui&#ngR7t z@_vL7rYBR3R=6G7_t>A4afg=n3BV|h;T-likbgl^<1;a<4dK*|?te~r!3fFTWFZ%F zg>V54%>AffMHuQZjbl>sv+W$-QQ6|)UZrfX$@RtKsc&8RbQ7?-f}<5atbKM!$C)|% zqhD#<~pTq>7yY@~pm7DkQD zD>TOVk{KMue_7roWPcZsiceLE6d0NN)Z0X|h;!K8vsn!C+6_c82QzM7aXycxsX9!f zO`E}mPlMEN?3A6q!a5TOu>jVlgeO9)1!BXnFd>O69)z3HDZ38VrQjB!LC)Cu5XyLx zG(iNXn}-?s)HSxxWFO8k*(#wQS}{syvt<-=T>8s^&_H(XaDQT3HB#66O%$_at=m7H9QMPaVmdX8w08ynl5Ol8N=`$ZF~mYDLJlq2 z6y1f9zj$VpOn=6!)@&09fg|BH8pooa^l9JiP^6Ca1u&BJo7_16;@*7nFgC%^z4SnE zzHR3<2LAFZ8NVilmKNz~c{5KQ!bxiI@8WdmYM4u@)HA=dug^QzZST6<8MH0wmQ)~w zFxU8z;S1P+k+&CtG{{1X=@{!M;J}GgR*rJH11ZvkiGL!tYRK2GpyCy0ZYBB_MvW3< zTKJW*-vf#aS1rt#q0u*XILMP|?ICTv*i=}iKeM2(XffQ(&m`PP#?_&lIFbU&d4zmN z3}_CCunTeZEW_zo-ir2Ojpi+ViKcXSqR!(zzLX$2kSviwV&JO|vR*;v z!By#+T?hGs@oQtV1?s(~VCz-X4fGYOs?W!uYVOw$M|oFQDf@T%n;Mwh9} zU4E(6pxKN+I(l-o2o zyOGLXVAQPnV1N-A*u%!8z~*agQ8c2w4-7m9RAcOFOOUTwHma`Sm0H8UgJpeDXb!`cmF-C*q^iEz=$l7`E zYBF*qyowCdY5~Eln(T^V#q8>J{_5(SpaoQ&z~j0m>;;@YsMUZX4)Z zM*0_NT`e6+waa)6y7ItNOg+(1{N%t+kT~y9$b2tcI}0KT32xh>EBYL%xDc3N!9mx* zM;v@KB=q6<`4-j&THD~Wwozj^>Gc+DMIBq!J!^C%1{HfvPok5-Xn({3gYlvHJasT0 zHHuz;&idId?gcm6laqqlv8QvTz~dk3Yxk`GukP#uOzP?@L8%L4d{qC{K|XLg{4Phq z>hJRu*#NY>66VwP6@OZZN2URwbMrjBkN(I!&%6@;#hgXllf)?}3-~SAjO!OY`6^v< zgiE}3Kp&-brKk_e;DttchvS=yV%SnCDPdKjYb4?fDIdl7pJR}uY|yQ0phj8uP7m|R zoRpXAAbHIM3e2AOY=+%griyGh6u3QggJ#%EDxaRwGNog*Tz{L##6X}3ig~qqjjO+7 z#uDAfIPd&BkN}ry@V@9!$+{yT!Xt1}Z|L^g{a?vm3Z+jv^onYdthNZ#G;j3!nnF<6 zL&G#S{jp1^<{k3b*bJi=bk8MPWP!yQ$b*f1EN^-r`P2BG5g}E_PtXFMeTo}w4bR5z zy9)1%4oj`33V(cI!}9T2h5j)w%V4gOr=b$KXe>o7MzK)hCl#D+RXyw&1>tP}CzKT2 z$5hGy_2CVS{>d{d(`T+6!YWxIIfR9#d&ONpDA3*a2*{nHbX({X6l`f=U{9e&4u(O2ox}h7`Wyt>`Av0j zj!ktq4$hD~COAxz0Rh;Yy4OGEXNUm^o(0VCqYA0e*m`a%74T1LbZBOejzL*Gq!8D-|v3JCbqnfomQKFHM`fh?fw8`*|Wl(!4HQqMt|vk zeZCJOVw@8Dk51hmPrHsghk5iBBWuxmyj@+3wLe@jp2aPruRV-iQfKysN*S@~T{C=; zg4Uf<;V7v|#Vxk7d2@e^H)1+lkDnX%s8?S(>VMT2M_o}-ttea8awW>6V0ssDVoTercyV6B)80r3SoAtt)$QGRG*$cmKk$QN zcFe;ur@@eUNP|cv6e&uHD>SR5RHEb*QAvo{Dx##MLP;VSl1fTRk|B{wA(BFb-^Tsi zdkmk?KfnLJ>v`AOcddI~&-Z)3_iGR5?AE%Egu*k|h27L$eDa*23*&uv$9>^QOV_j{ z(_c4Teb&#GRNXz$yhk*gr^dtLVMT340*{cGrjZ%@L&>7}%3?LE&tGDH1bv9vcY@MB zuWaw`N*0xx7nE(;s+YOc@lLAAW($g^@)Ge& z)3gS|KZRdSM-gF(b1EM-x9?`ExaI6{6=BKK|qADbgXgA#lwhmot7})BiG8 znI-BWd~;@XkPe&u4NJ${G}hpZ6eO3u32Iiz@s+?6UbwFFb8v$M@mOGw#Y$ZhzDYXUEp`p8X}q(t zn72i3)45mK&HiVb*?N>~y!!)Ew1VrkzZ5(FED~%#DX@A{oUVhSlY-d?d+Db^)s2Ha zaebkCWPLRyR$YI$AZ_6Or@6n4=Lw$Uc)V-n^rWelA5_<`C^53F6k1hr(;r4OD{N*FWlNIt$qG0PIq957s&E6IPW z`g*V>_t^qHZlah&+UHtwjC9*p$B1J2Hqh_L%gbMD zsjWUyrO?vZUSi+Be#Yv&tDmP#+5GLC>K%{4w*4)Pq`Ka~{k(<8Ed5h+_C;h(Z%%RP zaGv^FplS6_TgDo}^-`~=v=sz<_t2(Q&y8DPTRkw)kTXmC{(`%-jU^6OPUF>ODo6ZZ*?z&!J@Z89K(_PW6I!$_??(BHivgzJS?DI_3UWN46h0ayonM6}#7uR2jLyQ%u)ehb4YJ@26|`t6&xX-lA3aF3htz zRl7S#*?>AzI?`i7(>o70<6qs|o(DQz&pYhX5VxFhs_{#*Wnf^;66Hc8_v;MB!;;&s zytU~y-|}!{Q?l+u^U6D=OAj06ZrRsw+~A{q)$OBzT)P-X%8e_ZnCa9+foe<@t8F=f1zYQesTG)%{tz z4dw}X?`Li@@^>lGDdgpRKdU{rmf^+liaRIuaMKU=`tZ#^V;{;+`&VqXjNp>Qw z#^=y(_uTx8KkN&(diS(teEJ&Z+x+99$;?AvZ~J#ewcBquS#sDYt!%Y#_$=A-hYo$A z4xe%kee(9WW#3X<9OZbV<4BYAr=vP^e_0u{87odbS~ErKclpcBn(k{vs^z?A7JBx| zFtnQ=h5LO?Gz<1KG}T=Y#L@q-e%^`@yN&j@3Kusk1QxrAro1&5V)GTt*z^31-hO$P z)BrR8(ntCQjLjiVJqJ%#CfHmur}plS6E{C4opoW?j|VPk`863F{rSh*o_ZNvGi5!v zxg&Qq@1bc5?8@@hC)uCS-1i?X)u6j<^Dn%Y$as`|x;xbA^*iOfg}E1(ryS*S-jpk9 zA>PPis(Yz1VRdusb^C$%#?qkb){M3};+uR^6n;HVuD?F*=^KaNMm*s!Lt40^FM2YT zo0co9wBB5G=c73_bHhn#KkYBSgX|mDAKOP+UT(5>_Ils$`wLy>aLNBjO>#FQ)?DSb z?YO&gpEhHWPMq+YnUbN;%neKOkNvgw!K&K<2APQ(rxGG0cRc9TFjMNhH(SIwx~RDO zK-BB$3Y-<$V%-bAS{y1~5GukG=zL|SC&y0>lNkbhM;Gol4QKnJzff{f0?(ZaV~kN{3&|c%@eJ=6^`E3cG(npF2*aqAlKHT z_Vg*y-8+_FH7zdrtCqnfzD#1-m!iABT&ayYAD??svom5_yd-r5&2SI}2IyC>mSR0#d*<*9?I$yqz} zjeq^H_~Fh`kza4`rTWaesO%w6!hEjJ;yGrr9CDj`_J=>ae!4@fW-}uu#(cR{>WA0? zz3m5PU0t5_s=4;n4dG=;Hbu3EpP$t{A0b-hV4WfG;!B#u)LFlaKD5YQIym^^x>QvE zwQF5@1L?_8hxCnP_j>N=J8;WWCE%$g$n{*pT-?MRe~D5ygWi7*&2o-AmT}%n^!I9r&v%>RPIrQhRwn?c0I$j8Dp$0|^vA6|_|vbK<@{`;RV5W}`bSG|g(^q6)hSEmMi`Xz%c$Qo>Fh1>4*j6& zc(=0hTgm)KQp%B%?Z>;=HGe+&E_&l}ZR?VIYCK1Mj!iDs5%{ASF#BnX$FVDA*BHAm z9aBzN?2xkmlj!I9+20>^Iiz3e$b9Y5J-55KcQ8XTt>eA9_{J*pRR!#hEPq(fPdl+9 zg;i^Lwco?(zJVR@UKQre(K>g9FY5K2xp`eXcP)<5K3;m38vOm`Te-NiI{eofZts1c zRnr-Ga80PsGrg@FcX+nFh`iY! zi^@)HY`XdTc96P3b9L0R@J_qif-;Y-YJW{>GP|X+bFh!`oKJr8G@GuvJNwwHi&B0| zdzc3mHtd|Gd#rnB!Lrbg>nN-$0SndbdphEZgU(l$%c)n(_Nb?xQ*;TMk^Z$f?W2J+ zpT(1BY40Dfrre@-OGm|;A6esMJ()W2GjhjPPls9R>u<5!wYXbqCZ0Cm;(JJbQ%#{= zZ_x4CHcLAm*#+-reB}z%UbWkE`_}{wx6YuMQbpG%XR7k)-xlG|aL6$`^%vvbSycoc-j<-W}!- z`)m%}s~nIxdFbZSY~x~C66CFc^}xJ zwppWDvr6BUD|O*&|8?_y8w}4a*zro)>a}KFiBs7@>yl|7yP^cRX(e0FSf0qJKeaq` z>Fw0>>&!|!EDQ{cqNSIxxNbVSuesh{t^J)&REUKU&mUi!jeVYBf5NoeX98aF)@rW5 zpmlMEtzvhMe)0;J6M>Oexlb_4L~kdF-KTbF=?Qs76GY?N2cUBJ zJ3p!LOL0^w%kPqRN>M+)`gXyVYYz>YRB0g!$(K(TP7h=++WR7{d}D@6vr`J=R!nXO z?b#k{<0fwjBOZUHo=Mb7HHY-4T|Z{Bw$41FES41G(OYPDWVh@ICFQCkP9~SVjB@_) zbZ<;|+2x&3?A4XC_N2CgE9aE1@0DBto2A#pO0yEy{Wy1ciZQ^}{ zeiqixa~)_*nfpTB^o2?;hof^awLq5f$ox~D%JggD-S(1;#m=cbI_Y5}mi>7cz^Be9kEjU!Az_M$44)5oC*4dJ&n_p}ZIXGx^)Mrr6-?Y5X zPICvx;jOlMheB^x*UM}7%R275>oeW_slUm`3%4Fk78MYgp;r%%MdNWBZ*$Wwa#4>;x@Wi z@#9O4du!zU3-$tkVh4jcl1`V^1p3=1@ExBcmw1jPK`rFCtCH~v%7A9q;ijbz+;cOE z7o0ghc*2e?jf-Jh5G}8{O;GprSM?t)OS|)%!zm$6MMqgC?Z{h#b=Hply#CZGC9 z>CV+K?cILk(Y;nzS2bam4N^9$R*i?-GwUb4<=oWvYF3BwH~wDrL2<>UMIFc9O^;7u z*+N)cjKAU{C1u*G>ib^c>}tcjxGnV}vNG(k{JlJEYCp22eynU#&$?u=S!~y3g(s7U zqcPhAQ_uBSzqfdh#Gv?GVL3OivNnSCvgh^<=jZD=(-h6u8Po|Xrnmokxz?OTE#~Q- zJ8N@7-aOrRB|bbUqSyL}${YFE;{D|Rfw4Dsme`+!o@pvc^pL@RalbXMgQOB%tjwR@ z_ zb2;MPnZ{|jg)=oTxJcQ2aqk(PGRIt22A!8}yTpK&_`0Wu9=6lA(u+Un&K7Y{TrkOz z-Br%_=ZsCKy0zD*i% zsO_sT-(7x6xZ>)QeXWuzyKggY>T_sy3TU*?&=^egv%V*&_CSb?0Xfv4F*XLG=B!eElg-&fyRKN>0{#@mF+1N~Mt6 z6X&^|j8oq2o2RRMIcNP=)MQPLm%-vro^H8ZCv6>2jZcz}BJi zL1}ts^vBsbZ{Mmu7<|3Ir_h>j`_^lzmk#VX_VlvwuL#2xW_w!WqslHcdvLwW&{R(8 z7f$Jsy_6r+VrH;NueDo@^?X%v$m3~emPokIe^a!);0HtMiPgccMYrTX+LdlNw70oo z>ePC*rpEnul#eDT#!N~3veU$)aqqpWl?e{MR%TUCOnH|~bF@0znH0)a_F+$y@3Ac` zVxm32BA;!38+!Eq;cDu%oJR()X)+cT=4Z?|>HX9aHl#oM5OpxRKQ2o@N`$W}VrIJW zI$p=HBK3|XFM|~s0isLU{SM_7`8hr1ie7ABR=7R?b1aAS_f0K~u+oRZ74|!K$Zh$( zmdfjR;2Pftp5VmE!HV_@W@0{hi#vRtcfQK*Xi!}rvEcZChMm!ZzF<9TN0$w)X^G+7 z7q%HNik(-q_Qe=#6g9bSD9w}ceC0_Kaev<~7kl-$WsytDk*x0w*9MCVI(r;1wn+SJ zE6tRfJZsTH8@>2}f-Q#A-ReyqEHf6U=A9S$eZ`^n#sSNVFP;W!ge{zTZN6r=w$KxW zm;%9DNlqJg&JIl9FKNkNd)=BNf=%DRy7%F?HHItI57e3cC40ZDz4^m(A;(a4c?WOK z4F|7m);MuAel9I`NshnBGe&7}R_nW$7VNuSh3f*iZ^vD)Gxj^HZ8&dhue$utaybr9 zujuX1?rwV>S1+(p`Rsl1ne9dW@$Uj7zQ=QBpOsIzc58)8wrNhx(kmiAZ-!MZoo-Jv zw96%Y0axkGtd4kON!r4TG;%TM}K>tSD)G2zBE-jUqPwi zthT}8lb_QMJT)n(^{)_#JRTT##bagf?Bj~|_8MA0<&5t8PHG9zf8d)*E0p;e=otF# z{kdYFvln@CMB0C5%yBQ?Q(fU|ESABD2rJ+#yt5^5?PG2J@D&A3v$d@DUroCz%$n7t zDRj$u>6~0?Prprp=Tqf2ua{nxKH$MR?Z94^7qq7`$8%j4@pXz2lRmrd_-6YoP($yh zdm%^JlcT~LPjya?;SaL=wRZ|9?|tIJFO?tb=biFoC`vk)D*k-;eYHfIx_jrfoMmqD z42Qb{@7e>@^Oz_HsnId( zb^Xp18|Qg$-E=4{+&3;|&~9VEj+VEp1Xb%7F!H=g&O6`G(&D4&%qWbp(|(?2_DCh# zmLp?nb>#a$lZ*;?yv$m1`kpMUI44CrJ!M6YAKlNB8mRnCVBt&NJgLX8)%=%DT75`O z#5g{ivc~khF^wfz{*3-7y)5aTb<&srl8@R*+wa~%zsAFD6TG>|gHO`N+t-oKzT&0( zQLh>k#>FjnVp8_JUMf1(>q0rdaccaZ8LcX-tVH<}aw+fH-&lxTW^Z9#Ib%-qR}U_# zt6w1>Q%5l$ymv@`H!IDV8Z)wiART0q{|w#78iO-dH3^IRB2tTK4rGg zy)~EWto~_EUf;4W7b`Em<1=jg>qe4n&$}p&S+li+<-gDG6Up^onW@EHKYRK2@BAxt zE7eb3IWnm2rID->dW-buM3Sh}|+o8emgmy^ulK?bt=@w+mN#`Aa$HukRcUXN)4k%}=f(w>u1q~9S@1P6XnxicJ&xmj4^>Nx%{4`iR~(x!wRt+#Z6CLc zTg=v@5^+gI12^8wJP5JAex;(J>rqkvcCBEng zqm%mI$~^UyoOexLzOmte<6axX4~_=A&zq5d>~+_)xPN6f-P7#l!o`|T_xr5aYe%%0 zRQpt`&l590x4LlP=-iDfmS^*CwF=yO_^EAR-p3x@Z|hCx8P}#xZCzh+eg6@8ne<2V zZx~-?tWg(?;5?*TnClnl@GL*g%XH=g^`e@!&mOgig_gw4wC(tIcE^o!m*BHr$BobW z$i3Jn{dRAYyK;=$gD;kif61S`VI-x!C2CDW_F2_?#ZTAr9@xW9grB{XQ-Jk@ebqNz2al{j z6>_%1yz#>6&E2YeZgXN?re@nl>DX}8d?*%sBl_#~&RZ-mJM@=bt31tVPA$$-6UDA6g-M!s4S zf5_K}?b=S+Sruj$2SZFtrKxi8e%1-{ao%I%Jo`Ls?+TeN7?!XV2a zZ5DN9-_{i$OwL@{a=S0*!llY-OV@?3w3xT5Tz!YV%I}SKXY=E87E;4k&0lqfsuNOH z-(~qITSj_i?W2;tdyc6VB*|Zv4d9F{-jOh6fNi-2C)ce^?HhZ%D3pvy7Rqu9HmWFv zi;Igw%HGSvR+k1gEI*F*aXJ5$E zK_cNJ8<21y;XuNHgaZi&5)LFBNH~yiAmKp5frJAI2NDh>97s5ja3JA8!hwVX2?r7m zBpgUMkZ>U3K*E890|^Hb4kR2%IFN84;XuNHgaZi&5)LFBNH~yiAmKp5frJAI2NDh> z97s5ja3JA8!hwVX2?r7mBpgUMkZ>U3K*E890|^Hb4kR2%IFN84;XuNHgaZi&5)LFB zNH~yiAmKp5frJAI2NDh>97s5ja3JA8!hwVX2?r7mBpgUMkZ>U3K*Gl(;iT+cRL;JL zS@s^Wz=sNz>{d(#LiR1Y+z>GRAHBm7Jf@yDCPh^Lb@!bdh3;V{Bsgu@7j z5e_39MmUUc7~wF&VT8j7hY=1V97Z^da2Vk*!eNBN2!|04BOFFJjBps?Fv4Mk!w82F z4kH{!IE-)@;V{Bsgu@7j5e_39MmUUc7~wF&VT8j7hY=1V97Z^da2Vk*!eNBN2!|04 zBOFFJjBps?Fv4Mk!w82F4kH{!IE-)@;V{Bsgu@7j5e_39MmUUc7~wF&VT8j7hY=1V z97Z^da2Vk*!eNBN2!|04BOFFJjBps?Fv4Mkk2k_e*}L`!hcUD4Jz|8Dg~~3DmCS`1 z-5duw*v=$15Z$WOIYfIuhahvgZYeh(%W!$wG^!-APM9u3qft1S%b&Mz{G)x0}}@(4on=FI52Tw;=sg#i31Y{CJsy-m^d(TVB)~Ufr$eX2PO_o z9GEyTabV)W#DR$e69*;^OdOavFmYhwz{G)x0}}@(4on=FI52Tw;=sg#i31Y{CJsy- zm^d(TVB)~Ufr$eX2PO_o9GEyTabV)W#DR$e69*;^OdOavFmYhwz{G)x0}}@(4on=F zI52Tw;=sg#i31Y{CJsy-m^d(TVB)~Ufr$eX2PO_o9GEyTabV)W#DR&A$HYn5TYHxn zop>h6rOM2EkBH)A^_DD`J##@^j?0XTl`J?Za#=GMMlA7jBsD&uM3o}8iPGhUEO90> ze8duuNg@J@xlDL^NK1TVgC!129F{mNaaiK8#9@iU5{D%YOB|LsEOA)ku*6}B!xD!j z4oe)CI4p5k;;_VFiNg|yB@Rm*mN+bNSmLn6VTr>Mhb0b69F{mNaaiK8#9@iU5{D%Y zOB|LsEOA)ku*6}B!xD!j4oe)CI4p5k;;_VFiNg|yB@Rm*mN+bNSmLn6VTr>Mhb0b6 z9F{mNaaiK8#9@iU5{D%YOB|LsEOA)ku*6}B!xD!j4oe)CI4p5k;;_VFiNg|yB@Rpc z|DGjoLJeOvf7KbPPDojOm*t~u8R?a^k4pCLIi^~WB!5{pfHSgqN5Yf=w&fO_T(>f{ zZ;ZFZV@Ufuei~_izf+^~5Mc|r6_}ClVNsk)W^9O^RH`^ptwxBCdbuHst9eQSp%ts5nq@pyEKqfrBl)Xvvn@(_XP(_JDKCB|l#`mx(&PqlC z+<0u53k_~OsXRl4a4(+4%!Lt0oGf&D^UPu{j5y-)q$4iPYsAw}I^rW69C0|}aKzz= z!x4ug4o4i0I2>^};&8;_h{F+wBMwI#jyN1~IO1@`;fTW#ha(P09F8~~aX8{|#Nmj; z5r-oVM;wkg9C0|}aKzz=!x4ug4o4i0I2>^};&8;_h{F+wBMwI#jyN1~IO1@`;fTW# zha(P09F8~~aX8{|#Nmj;5r-oVM;wkg9C0|}aKzz=!x4ug4o4i0I2>^};&8;_h{F+w zBMwI#jyN1~IO1@`;fTW#ha(P09F8~~aX8{|#P@hnC>fC~l;sv|R8a~S7Z-(;y@OBl z8Z*n@BYHSlI2z6C#9a6u&7027N){5&^R8kl5TqV1PDsb`4zk53H4w|DQ6-4(KN5lw zZD)m;VwoeB_{AjR&3rxs9*Rbt^T-BE9F{mNaaiK8#9@iU5{D%YOB|LsEOA)ku*6}B z!xD!j4oe)CI4p5k;;_VFiNg|yB@Rm*mN+bNSmLn6VTr>Mhb0b69F{mNaaiK8#9@iU z5{D%YOB|LsEOA)ku*6}B!xD!j4oe)CI4p5k;;_VFiNg|yB@Rm*mN+bNSmLn6VTr>M zhb0b69F{mNaaiK8#9@iU5{D%YOB|LsEOA)ku*6}B!xD!j4oe)CI4p5k;;_VFiNg|y zB@Rm*mN+c&@s>C#d#7jf88XY>BbGQ>DELZ~AkIADQzCZC(Ya|f3MZ5QJ($ZkiG`I+ zDdh86G7mr5LgVK8yI@4*KjGtNsuFFTv~O$|NpYM-gQ`Oa{-OyoRWqmmqR9_WI-`V7 zpSdu?kS8P&t=nk^Jgg)`KC*!!2SW~q91J-aaxmmz$ia|(-o>A2hRm|}2t!U5NQQg~b74dtCkv!JETfFaZ8f1~1wNyNQs zLAi)hX#qkbnqQoUlhnmWHt6Ee#i5Hs7l$qmT^zbNbaCk7(8ZyPLl=iG4qY6&ICOF7 z;?TvRi$fQOE)HEBx;S)k=;F}Dp^HNohb|6X9J)Akap>aE#i5Hs7l$qmT^zbNbaCk7 z(8ZyPLl=iG4qY6&ICOF7;?TvRi$fQOE)HEBx;S)k=;F}Dp^HNohb|6X9J)Akap>aE z#i5Hs7l$qmT^zbNbaCk7(8ZyPLl=iG4qY6&ICOF7;?TvRi$fQOE)HEBx;S)k=;F}D zp^J~##Yy5jeua=6F;`DeiJA8vA;yQQtB0zy1l9Qd#lP#EiG7DzcMu!wgy^hf#@CL_ zv`wMQ(r6UUe`9|u;+KaN@r69xBpyDp0S^Zr4m=!qIPh@b;lRUzhXW4>9u7PlcsTHI z;Nif-frkSR2ObVQ9C$eJaNyy9u7PlcsTHI;Nif-frkSR2ObVQ9C$eJaNyy9u7PlcsTHI;Nif-frkSR2ObVQ9C$eJaNyy< z!-0nb4+kC&JbXMJPRiaS9=?cK_8xJ=hYG8Omhk;cevcx<$udcX8;u&*F1GgqYf=(n z*ef)ThmWMfM>bI5pu$0gg9--~4k{c}IH+(?;h@4ng@XzQ6%HyKR5++`P~o7$L4|_~ z2Nez~98@@{a8Ti(!a;?D3I`PqDjZZesBlo>pu$0gg9--~4k{c}IH+(?;h@4ng@XzQ z6%HyKR5++`P~o7$L4|_~2Nez~98@@{a8Ti(!a;?D3I`PqDjZZesBlo>pu$0gg9--~ z4k{c}IH+(?;h@4ng@XzQ6%HyKR5++`P~o7$L4|_~2Nez~98@@{a8Ti(!a;?Pr@~3u zTW+`Td}i5ugbF7MKEA?6M2;ezpGKo_GST0=_X&Hl4VmC%U?HKUMCTq8FgYNs|DV7z z=BX=ug%ySiJ%@!CG8KqLe!|s5Gb;EC&tdvJlVzA6zdFp1OGj8J^AmBhbdjOm@skw! z$OeiW6genzP~@P>WFb>w#40C0C#`a6qUMH(JX7&+usk`5IIv7~E{`CIl#gsc%7K&vDF;#xq#Q^& zka8g9K+1uX11Sem4x}7NIgoN7Hfs_L&2T~5C97s8k zavHfs_L&2T~5C97s8kavHfs_L&ACHuiviF)NqDIWJ_lQeQ7Hpo0+AU3K*E89 z0|^Hb4kR2%IFN84;XuNHgaZi&5)LFBNH~yiAmKp5frJAI2NDh>97s5ja3JA8!hwVX z2?r7mBpgUMkZ>U3K*E890|^Hb4kR2%IFN84;XuNHgaZi&5)LFBNH~yiAmKp5frJAI z2NDh>97s5ja3JA8!hwVX2?r7mBpgUMkZ>U3K*E890|^Hb4kR2%IFN84;XuNHgaZi& z5)LFBNH~yiAmKp5frO7o!b#a%yjg4!v+O;Bgbx+k#JrgbgzQ^(xgiStk2eRMC~Ff_ zWGZHkK;hSu2(K{lg*;*;6h5*63I`MpC>&5Ypm0FpfWiTV0}2Ne4k#Q@IG}Jq;ef&c zg#!u)6b>jHP&lA)K;eMG0fhq!2NVt{98fr*a6sXJ!U2T?3I`MpC>&5Ypm0FpfWiTV z0}2Ne4k#Q@IG}Jq;ef&cg#!u)6b>jHP&lA)K;eMG0fhq!2NVt{98fr*a6sXJ!U2T? z3I`MpC>&5Ypm0FpfWiTV0}2Ne4k#Q@IG}Jq;ef&cg#!u)6b>jHP&lA)K;eMG0fhq! z2NVt{d^{9R%HEFL5{sB+?-3}REbI`JFqJe>U!bp};qBtK-F797!pS6n=g=h5SXoDM zw#*Ye7nHF2Pr;N3)uQv!MvwFnk$BDW_efJBT1-NKdH78+iSxr%YY7PprUG$ULgLBL zsGW2PBc{)XjB>XNnbWc*B396dqz0Q?nc6pokCZ5)(Ps*`snQ_?yLwl3Wbl8LXoF%Q~v!&ojA--SDI+z?4gO} zvZ%!TEUL8L1QSOyuP>5?qBd&cQhRoy!=7DJj2zi9X4%n6gt|I8`;BsTLXD5EK;%!N ziwIAUDiff~u-qWp1nBc7Du-#4lT3TdPRyT4m5FFO%RjWtvD2IxvrMH?%lzogLHPDd zNDvy){31hZ?Hse#Gf70BAi0~|9~{KD9~^4`CF3AOX0p0C2$n&KNrW>eor@6c=Ai$V z^oyZ%R6le2TR(@ue@Qz_(PdbF4-j_3bQR69>pM5*@TQMCymTT>n69JQHRhm(1~Fd~ zqfcEJAtXZA)1GLMZq@2SRW1tUi#mm}aMYecWVwj6X;dxZtQwV<7?9=S9Xguva}Z@B z+NdYLH7Y7oo*QmmNOA zL-$9|m|hGGXYPgOsNwSoc`@?F8$XEHB1WFW1*Y6Y8I`U$bjGELTvP7hqn;rBWhlL3 z>Az_~!cd$pIMKvT;$(v!5I*8`EzPkr#f~{v#Zim(BWlFy8p3^JjxaWfkd`2K@8HTq zuy9bNM{c(XQu~Kewr)JcO-{NlA=}L{d^8gTTZe+{yoQ6yM2Qy5TOVm&;=VNR^r4Haf6Vd5|9#7@I?YRH$WtYVx&{fl z@C2!ClH_4nNAnW(eG-zyBsD6HNRy;1PZVt)in^a?jv8~(1qdT4@+3|$_0T=b_BoE1 z`2I&i;y;HtHg|E%Ax<6Dp!oTG5e0mr|6I5f@^7qQe)tcKX1;JoUkm#PZE5ma7(a;E zB~3m~+;fRC8Tu6Bg&dui*eOTnnam5uxIf zhuSSUQD~@%Y^yr|35_&y=%yOK!~fO9b3aF>5d1}>4c!{!M-xNcWaI9lMX-p95<9zS z!(Wr7I;LshYJwDZ7laRml zttt6)#FE^MM(re4RDfuw3n&rwVgkH`vY5c|*W>s(2zv!`PtIb0r{fjK4o{FO8A?Tw zcPu%l-q6)KJ~R4hHTrhaC6-U7Ym7UD#4&vueMxs@3q%x1%ly+O&M|FD9Qhr@`cjt= znnIr;JVD)V3VCD%}XfspO5v zJ!Wy2M;6CoNyJa3>rYf3UYq4=;=)wAC?PeCt~gO>cwN&8_i1!Zt+BgE8nZ6tQ5V41 z-w}C}CI4w2-4D#^9>QA?1qTq&<#8`lRTz3qklX~6E3QBbz#9VT}e(N;#J98tn)FEt4e-fPEa2p z>ujwhq7eS4OXblHD)!p<>tK3B4=WVyeOLb;zMLH^hO1IJSlrvLx| diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index 88da31bf0c..8c08154c9c 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.07.01.all.1821061498" + signature = "rusEFI 2021.07.01.all.3252551702" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.01.all.1821061498" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.01.all.3252551702" ; 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 Thu Jul 01 21:04:43 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jul 01 21:42:12 UTC 2021 pageSize = 20000 page = 1 diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index 3943c86ef1..3cd6c59e93 100644 --- a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.07.01.f429-discovery.787999402" + signature = "rusEFI 2021.07.01.f429-discovery.2208488390" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.01.f429-discovery.787999402" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.01.f429-discovery.2208488390" ; 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 Thu Jul 01 21:04:47 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jul 01 21:42:14 UTC 2021 pageSize = 20000 page = 1 diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index bab2d64ae8..517c3b5b9b 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.07.01.frankenso_na6.1422245699" + signature = "rusEFI 2021.07.01.frankenso_na6.4187000367" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.01.frankenso_na6.1422245699" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.01.frankenso_na6.4187000367" ; 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 Thu Jul 01 21:05:07 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jul 01 21:42:35 UTC 2021 pageSize = 20000 page = 1 diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index f5bf903f74..50f2d24dd7 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.07.01.hellen121nissan.1646363405" + signature = "rusEFI 2021.07.01.hellen121nissan.3480531553" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.01.hellen121nissan.1646363405" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.01.hellen121nissan.3480531553" ; 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 Thu Jul 01 21:04:54 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jul 01 21:42:23 UTC 2021 pageSize = 20000 page = 1 diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index 1cbb4d23bf..e98c0e75b2 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.07.01.hellen121vag.2663373623" + signature = "rusEFI 2021.07.01.hellen121vag.871033435" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.01.hellen121vag.2663373623" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.01.hellen121vag.871033435" ; 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 Thu Jul 01 21:04:52 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jul 01 21:42:20 UTC 2021 pageSize = 20000 page = 1 diff --git a/firmware/tunerstudio/generated/rusefi_hellen128.ini b/firmware/tunerstudio/generated/rusefi_hellen128.ini index 588b2fe011..abe0ab0b08 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.07.01.hellen128.2608145822" + signature = "rusEFI 2021.07.01.hellen128.908072178" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.01.hellen128.2608145822" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.01.hellen128.908072178" ; 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 Thu Jul 01 21:04:50 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jul 01 21:42:17 UTC 2021 pageSize = 20000 page = 1 diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index 20302869eb..fe2106c12f 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.07.01.hellen72.1563385221" + signature = "rusEFI 2021.07.01.hellen72.4034555113" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.01.hellen72.1563385221" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.01.hellen72.4034555113" ; 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 Thu Jul 01 21:04:57 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jul 01 21:42:25 UTC 2021 pageSize = 20000 page = 1 diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index 5d892f5a05..f051e6d808 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.07.01.hellenNA6.1893720046" + signature = "rusEFI 2021.07.01.hellenNA6.3716869762" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.01.hellenNA6.1893720046" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.01.hellenNA6.3716869762" ; 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 Thu Jul 01 21:04:59 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jul 01 21:42:28 UTC 2021 pageSize = 20000 page = 1 diff --git a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini index eb08b44b0f..0274291e7c 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.07.01.hellen_cypress.787999402" + signature = "rusEFI 2021.07.01.hellen_cypress.2208488390" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.01.hellen_cypress.787999402" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.01.hellen_cypress.2208488390" ; 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 Thu Jul 01 21:05:21 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Thu Jul 01 21:42:50 UTC 2021 pageSize = 20000 page = 1 diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini index 39844f5622..391d4ec49f 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.07.01.kin.3511821910" + signature = "rusEFI 2021.07.01.kin.2080839482" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.01.kin.3511821910" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.01.kin.2080839482" ; 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 Thu Jul 01 21:05:19 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Thu Jul 01 21:42:48 UTC 2021 pageSize = 19972 page = 1 diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 13a7304ce1..93529cb74f 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.07.01.mre_f4.924772595" + signature = "rusEFI 2021.07.01.mre_f4.2588662175" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.01.mre_f4.924772595" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.01.mre_f4.2588662175" ; 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 Thu Jul 01 21:05:04 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jul 01 21:42:33 UTC 2021 pageSize = 20000 page = 1 diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 4b536f5c36..257b37facc 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.07.01.mre_f7.924772595" + signature = "rusEFI 2021.07.01.mre_f7.2588662175" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.01.mre_f7.924772595" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.01.mre_f7.2588662175" ; 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 Thu Jul 01 21:05:02 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jul 01 21:42:30 UTC 2021 pageSize = 20000 page = 1 diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index 7aedb4c098..10673fad28 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.07.01.prometheus_405.2115842892" + signature = "rusEFI 2021.07.01.prometheus_405.3544711712" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.01.prometheus_405.2115842892" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.01.prometheus_405.3544711712" ; 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 Thu Jul 01 21:05:12 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jul 01 21:42:40 UTC 2021 pageSize = 20000 page = 1 diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index e8db23ba6a..a157b751c9 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.07.01.prometheus_469.2115842892" + signature = "rusEFI 2021.07.01.prometheus_469.3544711712" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.01.prometheus_469.2115842892" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.01.prometheus_469.3544711712" ; 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 Thu Jul 01 21:05:09 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jul 01 21:42:38 UTC 2021 pageSize = 20000 page = 1 diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index 6c7a83c3a8..129a1df42e 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.07.01.proteus_f4.87919713" + signature = "rusEFI 2021.07.01.proteus_f4.2825436429" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.01.proteus_f4.87919713" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.01.proteus_f4.2825436429" ; 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 Thu Jul 01 21:05:16 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jul 01 21:42:45 UTC 2021 pageSize = 20000 page = 1 diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index f5072adf7f..fd1d0b1fc3 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.07.01.proteus_f7.87919713" + signature = "rusEFI 2021.07.01.proteus_f7.2825436429" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.01.proteus_f7.87919713" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.01.proteus_f7.2825436429" ; 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 Thu Jul 01 21:05:14 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jul 01 21:42:42 UTC 2021 pageSize = 20000 page = 1 diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index af4cee5bf1..529911c7c7 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.07.01.subaru_eg33_f7.3252109164" + signature = "rusEFI 2021.07.01.subaru_eg33_f7.1820462592" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.01.subaru_eg33_f7.3252109164" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.01.subaru_eg33_f7.1820462592" ; 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 Thu Jul 01 21:05:23 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 Thu Jul 01 21:42:52 UTC 2021 pageSize = 20000 page = 1 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 82872fe78b..e943dbf5c2 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 Thu Jul 01 21:04:43 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jul 01 21:42:12 UTC 2021 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -1250,7 +1250,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 = 1821061498; public static final int silentTriggerError_offset = 1464; public static final int slowAdcAlpha_offset = 2088; public static final int sparkDwellRpmBins_offset = 332; @@ -1552,7 +1551,7 @@ 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.07.01.all.1821061498"; + public static final String TS_SIGNATURE = "rusEFI 2021.07.01.all.3252551702"; 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; @@ -1600,6 +1599,7 @@ public class Fields { public static final int TT_TT_VVT_BOSCH_QUICK_START = 47; public static final int TT_TT_VVT_JZ = 17; public static final int TT_TT_VVT_MIATA_NB2 = 43; + public static final int TT_TT_VVT_NISSAN_VQ = 59; public static final int tunerStudioSerialSpeed_offset = 728; public static final int twoWireBatchIgnition_offset = 1476; public static final int twoWireBatchInjection_offset = 1476; diff --git a/java_console/rusefi.xml b/java_console/rusefi.xml index f8ca8faf75..caf6e85b64 100644 --- a/java_console/rusefi.xml +++ b/java_console/rusefi.xml @@ -1,6 +1,6 @@ - +