From fe688471ca1cfa315f1891a7d29543c2ebea62a6 Mon Sep 17 00:00:00 2001 From: GitHub build-firmware Action Date: Sun, 7 Feb 2021 01:56:30 +0000 Subject: [PATCH] Auto-generated configs and docs --- ...ngine_configuration_generated_structures.h | 4 ++-- .../controllers/algo/rusefi_generated.h | 8 ++++---- ...ngine_configuration_generated_structures.h | 4 ++-- .../controllers/algo/rusefi_generated.h | 8 ++++---- ...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 | 8 ++++---- .../controllers/generated/signature_all.h | 4 ++-- .../generated/signature_frankenso_na6.h | 4 ++-- .../generated/signature_hellen72.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 1144492 -> 1144576 bytes firmware/tunerstudio/generated/rusefi.ini | 8 ++++---- .../generated/rusefi_frankenso_na6.ini | 8 ++++---- .../tunerstudio/generated/rusefi_hellen72.ini | 8 ++++---- .../generated/rusefi_hellen_cypress.ini | 8 ++++---- .../tunerstudio/generated/rusefi_kinetis.ini | 8 ++++---- .../tunerstudio/generated/rusefi_mre_f4.ini | 8 ++++---- .../tunerstudio/generated/rusefi_mre_f7.ini | 8 ++++---- .../generated/rusefi_prometheus_405.ini | 8 ++++---- .../generated/rusefi_prometheus_469.ini | 8 ++++---- .../generated/rusefi_proteus_f4.ini | 8 ++++---- .../generated/rusefi_proteus_f7.ini | 8 ++++---- .../generated/rusefi_subaru_eg33_f7.ini | 8 ++++---- .../com/rusefi/config/generated/Fields.java | 7 ++++--- java_console/rusefi.xml | 2 +- 37 files changed, 99 insertions(+), 98 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 22d72f74c9..2f911a105a 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 Sun Feb 07 00:51:41 UTC 2021 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Sun Feb 07 01:56:13 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3803,4 +3803,4 @@ struct persistent_config_s { typedef struct persistent_config_s persistent_config_s; // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Sun Feb 07 00:51:41 UTC 2021 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Sun Feb 07 01:56:13 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 0de0a4d839..e5a4c986ce 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 @@ -1258,7 +1258,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD hellen_cypress #define SIGNATURE_DATE 2021.02.07 -#define SIGNATURE_HASH 2431354623 +#define SIGNATURE_HASH 1186009212 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1458,8 +1458,8 @@ #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_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", "trg55", "trg56", "trg57", "INVALID" +#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_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", "trg56", "trg57", "INVALID" #define trigger_type_offset 524 #define trigger_unusedBit_4_10_offset 528 #define trigger_unusedBit_4_11_offset 528 @@ -1592,7 +1592,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.02.07.hellen_cypress.2431354623" +#define TS_SIGNATURE "rusEFI 2021.02.07.hellen_cypress.1186009212" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' // 0x74 diff --git a/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h b/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h index 0363dd3f3e..a20602a944 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 Sun Feb 07 00:51:39 UTC 2021 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sun Feb 07 01:56:11 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3803,4 +3803,4 @@ struct persistent_config_s { typedef struct persistent_config_s persistent_config_s; // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sun Feb 07 00:51:39 UTC 2021 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sun Feb 07 01:56:11 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 0d5ab0a760..aeaef56502 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -1258,7 +1258,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD kin #define SIGNATURE_DATE 2021.02.07 -#define SIGNATURE_HASH 2431354623 +#define SIGNATURE_HASH 1186009212 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1458,8 +1458,8 @@ #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_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", "trg55", "trg56", "trg57", "INVALID" +#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_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", "trg56", "trg57", "INVALID" #define trigger_type_offset 524 #define trigger_unusedBit_4_10_offset 528 #define trigger_unusedBit_4_11_offset 528 @@ -1592,7 +1592,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.02.07.kin.2431354623" +#define TS_SIGNATURE "rusEFI 2021.02.07.kin.1186009212" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' // 0x74 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index bfec9a18d4..8e901a221f 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 Sun Feb 07 00:51:22 UTC 2021 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Feb 07 01:55:53 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3803,4 +3803,4 @@ struct persistent_config_s { typedef struct persistent_config_s persistent_config_s; // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Feb 07 00:51:22 UTC 2021 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Feb 07 01:55:53 UTC 2021 diff --git a/firmware/controllers/generated/fsio_enums_generated.def b/firmware/controllers/generated/fsio_enums_generated.def index a3f2c722bc..bc595c0106 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 Sun Feb 07 00:51:22 UTC 2021 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Feb 07 01:55:53 UTC 2021 // by class com.rusefi.output.FileFsioSettingsConsumer FSIO_SETTING_FANONTEMPERATURE = 1000, diff --git a/firmware/controllers/generated/fsio_getters.def b/firmware/controllers/generated/fsio_getters.def index d51466e6bc..b7285cf4de 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 Sun Feb 07 00:51:22 UTC 2021 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Feb 07 01:55:53 UTC 2021 // by class com.rusefi.output.FileFsioSettingsConsumer case FSIO_SETTING_FANONTEMPERATURE: diff --git a/firmware/controllers/generated/fsio_names.def b/firmware/controllers/generated/fsio_names.def index a28bb70bfb..1f5adc1823 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 Sun Feb 07 00:51:22 UTC 2021 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Feb 07 01:55:53 UTC 2021 // by class com.rusefi.output.FileFsioSettingsConsumer static LENameOrdinalPair lefanOnTemperature(FSIO_SETTING_FANONTEMPERATURE, "cfg_fanOnTemperature"); diff --git a/firmware/controllers/generated/fsio_strings.def b/firmware/controllers/generated/fsio_strings.def index 4df1c476ad..6538befc17 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 Sun Feb 07 00:51:22 UTC 2021 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Feb 07 01:55:53 UTC 2021 // by class com.rusefi.output.FileFsioSettingsConsumer case FSIO_SETTING_FANONTEMPERATURE: diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index acf6df9df8..0ddb63f37e 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -1255,7 +1255,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD all #define SIGNATURE_DATE 2021.02.07 -#define SIGNATURE_HASH 3533135151 +#define SIGNATURE_HASH 80595884 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1455,8 +1455,8 @@ #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_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", "trg55", "trg56", "trg57", "INVALID" +#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_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", "trg56", "trg57", "INVALID" #define trigger_type_offset 524 #define trigger_unusedBit_4_10_offset 528 #define trigger_unusedBit_4_11_offset 528 @@ -1589,7 +1589,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.02.07.all.3533135151" +#define TS_SIGNATURE "rusEFI 2021.02.07.all.80595884" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' // 0x74 diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index b2b07d5e3e..2f93481e7b 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.02.07 -#define SIGNATURE_HASH 3533135151 -#define TS_SIGNATURE "rusEFI 2021.02.07.all.3533135151" +#define SIGNATURE_HASH 80595884 +#define TS_SIGNATURE "rusEFI 2021.02.07.all.80595884" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index d1e0f74c34..6dad1da1d6 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.02.07 -#define SIGNATURE_HASH 1458401468 -#define TS_SIGNATURE "rusEFI 2021.02.07.frankenso_na6.1458401468" +#define SIGNATURE_HASH 2159535679 +#define TS_SIGNATURE "rusEFI 2021.02.07.frankenso_na6.2159535679" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index 0b1849cb22..857f8e9d1f 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.02.07 -#define SIGNATURE_HASH 3234006423 -#define TS_SIGNATURE "rusEFI 2021.02.07.hellen72.3234006423" +#define SIGNATURE_HASH 379163412 +#define TS_SIGNATURE "rusEFI 2021.02.07.hellen72.379163412" diff --git a/firmware/controllers/generated/signature_hellen_cypress.h b/firmware/controllers/generated/signature_hellen_cypress.h index 987f1762b1..847f666e04 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.02.07 -#define SIGNATURE_HASH 2431354623 -#define TS_SIGNATURE "rusEFI 2021.02.07.hellen_cypress.2431354623" +#define SIGNATURE_HASH 1186009212 +#define TS_SIGNATURE "rusEFI 2021.02.07.hellen_cypress.1186009212" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 13a7911f19..73d857ef89 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.02.07 -#define SIGNATURE_HASH 2431354623 -#define TS_SIGNATURE "rusEFI 2021.02.07.kin.2431354623" +#define SIGNATURE_HASH 1186009212 +#define TS_SIGNATURE "rusEFI 2021.02.07.kin.1186009212" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index d84cd42c87..9549a003ae 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.02.07 -#define SIGNATURE_HASH 4233179077 -#define TS_SIGNATURE "rusEFI 2021.02.07.mre_f4.4233179077" +#define SIGNATURE_HASH 705411398 +#define TS_SIGNATURE "rusEFI 2021.02.07.mre_f4.705411398" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index ab517546c4..8507aa056b 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.02.07 -#define SIGNATURE_HASH 4233179077 -#define TS_SIGNATURE "rusEFI 2021.02.07.mre_f7.4233179077" +#define SIGNATURE_HASH 705411398 +#define TS_SIGNATURE "rusEFI 2021.02.07.mre_f7.705411398" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 3dc042dce9..1abe50e7bd 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.02.07 -#define SIGNATURE_HASH 3221315353 -#define TS_SIGNATURE "rusEFI 2021.02.07.prometheus_405.3221315353" +#define SIGNATURE_HASH 375114138 +#define TS_SIGNATURE "rusEFI 2021.02.07.prometheus_405.375114138" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 6593886d21..25371610b8 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.02.07 -#define SIGNATURE_HASH 3221315353 -#define TS_SIGNATURE "rusEFI 2021.02.07.prometheus_469.3221315353" +#define SIGNATURE_HASH 375114138 +#define TS_SIGNATURE "rusEFI 2021.02.07.prometheus_469.375114138" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 7588e8f708..0bb7b2f00c 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.02.07 -#define SIGNATURE_HASH 3047593216 -#define TS_SIGNATURE "rusEFI 2021.02.07.proteus_f4.3047593216" +#define SIGNATURE_HASH 1677460355 +#define TS_SIGNATURE "rusEFI 2021.02.07.proteus_f4.1677460355" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index ac2feaa8fa..7600f99c00 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.02.07 -#define SIGNATURE_HASH 3047593216 -#define TS_SIGNATURE "rusEFI 2021.02.07.proteus_f7.3047593216" +#define SIGNATURE_HASH 1677460355 +#define TS_SIGNATURE "rusEFI 2021.02.07.proteus_f7.1677460355" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index e82b503b06..3ee98c759b 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.02.07 -#define SIGNATURE_HASH 2408458800 -#define TS_SIGNATURE "rusEFI 2021.02.07.subaru_eg33_f7.2408458800" +#define SIGNATURE_HASH 1507114163 +#define TS_SIGNATURE "rusEFI 2021.02.07.subaru_eg33_f7.1507114163" diff --git a/firmware/tunerstudio/generated/cache.zip b/firmware/tunerstudio/generated/cache.zip index 6667c3a11fd53e13ff96940498795d37cf51b62b..ff17299e640a64fd71955c1b0d3cf00cf7947fae 100644 GIT binary patch delta 209230 zcmV(!K;^%z?L~m@MSz3>gaU*Ev;_Jn6#5QFQs7tR?woW00LGUA0384k0GFW^0wM~j zNFQLSNFQLSNVgHG3iB|3F76?K`p%q3yugupROUn^mRMbtSZ8kwT9vUjPfvGuQbk2l z1lQjquiQbS5!8Nj?B6T5G7na2b^tb_7E5+{k6p3lK7jDMYDgx=9{Qh*b?;@UXxyFC`o8?>yEFS zMQq2L)Cx+yBikbKF?P&1t|UazU8XP^f?*E})z}4oJ0yT4VdZ1-m9q5?IDw>WF?S{j z!9tk1O;{k32X|I~e&K~?#7cSZgQ2`uLpDSv&@?Y~ll0XmJuKO0p%OUP zT*EF&2qk)u_?@-rDZe&qS9bfldo$>-1@Lv|q!R>btKrOl$uv^Pj!DkodZfD~)fSxu z`Ce;5mvadlS7IQNb3lQ>!IZJR=Z|Kqv8x@y@#5EOZZOUtD_LMhjpaT_;c6u zg{~t5hCW3FqG;~PFslZ=q~%KP9I*1Z1Y9RWQRVQlSqOK18mwgpG)WKN3RW zjI$L@3FNjwoQS36b6vgKiCs-V2gLKGv!=tDC=Bsc+%}Dl-?Eo~6N4(ZD;| z&(!aK)!lfP^U>W(u9Yf_AM)0&$UcDR3nLtQ+0U777&qWa%5oQK42wT4oL9%u)KBzQ zMk$cs8_H1;IG3*P%;{E6Y-D|Tr0Xr_Jo(Zebl6eMi;hncDwXb)&joKWR*e=Rn_oolW|YCyjfIk3L)dgouB(aKeyWGiYa* z;|qmQ=xW|3UuktU*OQimSzVd(5Kk-NTsLT2K8 zSqn}tnpa#_qPQ55MqesIVQMeK4IgNEWPKP9%Nw$chn0_Bh2<_!FK2+C# zKSc6Ff=i+B++EEV%)r+BLi;W@k7WM2Gn=e@>QXeX8HuS0vLmTSg-}Q)4SAlNS`M;Y zqb!`FVAN)`B8G50c?ii84>y+~9Q+Dd)NQDJGIHa(D#3lgw_sLID;Hc>C4aKH28*GUslfN2?&x*4TUts4)ADUL<#t1d`JA$4_VVI9N62u0{E&d#jT?PQ`+d_$( zx{_iRP>}XBCybKnhc(2x)iWky*~_#w0J5|Z$_?rsa-Er>&DbTxgt|kR090v2oUA>bxTIU@& zG$@dFyk?_Q0tJ>w+ic`5+AR>;)jt7SU6CO7=iUEgsYnLB_W60M$7+&)EOA4~M5HYd zqRRRz7CO8}xMAaooYAyHFE;V}M2ZcYu;=#>oh2h80>MQv>rC-f#~(Z^j_UYAKrqs* z*YSIaWJ{TBcWt*>KSYWa$7)O6B*+=z*`b9dNLZDB3Io#%OBE|=s%@855iz@OXs{Vzyll6jVLs9yI4#Xee`({ z`omCV+P8|y;0}pA(w%>6HqJ+v$kED2O~h*K1$`G0SI7zuBQ!{F?ZMzuUFr;-)ff#T zVSUxR;a1jPOdaxs`&=+5^$t)-R;1OvAElN!HgH7*h1m-`+egj=nJOdR#)uq7$&B1b zc!+!0e;r{xNjA5C)m)>OQwvd3wK5?ku};mDq$}BZzkPLcSwpO=%`81}%C5E?^yi_N z0>;8~M+_zaGXsrD(JB~b0$G1Z6*n9potZF?B3XTg(jXk>QC37~EP*vbr*V!-z(LXR zB1iazi?WEnhRPuTPve3TGL0>~dg^CyBy>ZNreawqsc-Io9c1w7GrAF2QzhVEJIiJ8 zBs|J3gFo=7D@_Pt6tS*DKOAIjhFZ~N5g&{@2<5`iFSfw3u~C{gvtC+!37UFal5ZJY zNdoo=cd2l!Ai2V^xJ0F^ucLB#Se9AY%{vJYB)?s-43K&&;lb2#PF>LQ8tn$lD1OD- zLx)+c(M*69RrRt(k2Fv+p^X|ZmqB!gO$$n*8%sX_ z;1W1%;}V3URsdqP#8CtJL}iJA)bzJpA9=jQJx}0&N}^xMJcoK9deUkaH0brqlPo*GZ`GidR_=q z0&VA)9{MRD922xaG9fs?zzOBv&CJII3S0IoXMvUhZNGzNo9vWC1>-?)LY8LAe+qaM zuZW#24hi}(6-NQY(x64!;;zRujJ zq|QV_%5)jrrn{QSMvMZ7{8Q+jconIl6Kh5EW|(#!W!aLPr&wX-kv9e*V66OjJcUOL zx#m$3p+l}+(i?zIZgGezV(09AUQp|y?Ti$E)Rmw)MWt{WL2^)ufUZ{yA*Zx!4e3WH zh{L(WGIOXPRhI5}HBxOE!cNPchSUt)yI>k)LOHNA^tzT_g^W#cKSfhw`h&VIa?YSB zUt2}NK8oeYiUg#dY}$1Ia|*gQ6v~yRi%O4}uVEJUVd{Eg!7BNq7?@TxL^we)N1_0K ztv=vT!2Q8#*ue%dUhA>=7LQuUnFG+6=R+Wq=vUHvd5gpA(lH)LC!~^qa zu1I|~b0Y>Mp}<)l2h3vM4f4J7T{O}J`Kge(uZYcIfy@M&CR!Xj`V;9HS_bCCIGLIa z=GXj&ZVg#I7&8*_B3wdB?nbak=^GVqO!I&-U<5*+;KtrkqQ+uY+3oPN?ZYNR zuz@q2T;53ESZeP43vQ||#&-IUe)mDL>XL<^IgksT%=7F-O`9uO%Q`-LYZ2&wpL;Ki z8_3xmRc|E6fiQ&r*O~f+B#61)xTsxUw=UB%7ID5Buu=}dYfexZs`Uc=n zgb4I*jYCqMKRV+pg}u%~)X;Or9&P{dMR;i9^&M1@spc02h_25P+7UJp=Fint?Yfzs zNB0Xa*dU*8&4=Bkv`wKz4#P_MNhwpTh|y@6a|5jsvg8{0U6I@9dWo3l};Tei(*D4 zmB_kMLD(x~Tr=npZR-{SB=yibZfY0sS%w0cNoi_ygz<$kyAWV^>deAf`7$luD4iMV zzg{GuU79rNo4#fML5@g&!m1Y8Gu6pv9VjY~2~T%lLEb9HP7Hl_C*xX;2*XXjzKS9? zp-75*u6DsCvF7H^0v2w4h5OJYw1&K1NMo>N46SlrT9n56AaC4s1#mM$KrTWJiKiaN zzKm7>VyyEii35G8(W%s>MziDQU$+or3jKsej}V}x?2OzAPg%%+8n>0CoT?KlqD5#b zwGQ$)3G%61TBOxVi9F8pmOL_xz_vvIBiU;bNhs!v#kHDfT%{1Nv{+ZtIMQQd1GXy{ zbD)}I(zYq0per;bRKhxnB~ilr?6Of4>XAG@VTwUZm6*i75&DP_A{9?!BgPXRA^MI9 zv<&urlK(hTElA0KnR@$V)mh4aXQZj^v$lZb9v??u9@}Gd4MAu^XDNI{HRh?Yv{#Lu zBv2Y|lNf~*y!31(U}@_eV4S7zJa=|- zw+NBMcz!!6(ik9chi|_Ug}zFcOj?bNgXZ4-k|fkX#jrMi{sZ^RA@T_Jt6X?A>u_XK z0j}YbnH}VszGMfwhA%SMb^3#)3d{JksWfX-X{C*%l~iHtpE64ujpy>N3{9e(q0xXY zLRbk{T?&lXfVsY!NgPX|#!&8jUwzsi*ufPJ5mZbYa^V(?3z%~!EB6B=3?8vg znEYPLXpQ`TR^ObhvH4SzKP5#T+%aIEyn&a}J|XtmlID=;g{FMAq_?YJDdbMW0n5>- ztk!6>F3CTqHK?^OTTO$(IOu{O4(!iqH>h;D@?@Qx0--1@wG0wZPj^#=XwG!($}H5@ zqVWccOolj8(z?)kVeU+l(OgAGJd$VBBQ@xe#K6aYl4{0UrY$Yui1gXjV07Hwo%Pb@ z(ldb^<6~kQz4oBps9oCKUhAy=#mLDQImEa`mHmt)m3Y4yEj@yc7LwE?6420d)F#{m zgHVxddc981uHT%Uk#7E%76y(6;zWyu%m-rCBmjPRdV1TsXg4lfcKiCQL+MXX(Y>3r zKec{;qutiKAv1YgIFV!vlBo1GYPOf2kz5rHM5AXkob0J&ph2?S%hvVz;9`5p8Of8U zlGm8Hu;CGo4#dS#Q3QSNg;RHo$`!nzQEVqf*WcHJKwf7s=(RW))?a9*=@}Z1e;bDSo3`%<7_#QFA+E$Qw#db5?)W`87Geq! zVnnL=CsF&}50);8vsVt9$gak2GJ1pnxWc z8m*RiK`CR;5CbY0My%+ZQvf2vbwZDS5ybIgJ1^9Q1mlQ+`wUeiyopG`3x(W-;?iDI znhNla^nIC6SC({R*|B09viRcfTM9~v(+GoO=QFtGWm-)645p4NIt+R{7Hmfw-K@{Y8J z??`*}jN=vwhyXQ^rbv@^(Nfq_PgnsqDNvVI>(mtk7Q6MBFag>oz21)|yC3 zN%0IGa;05wTvdV%y&0q(!8bxTbns^HG6)s~DIfyM&@{sKNS+LA%f=m_O=&xPcT%`7g6h z<5h`$3#}jnVg(yY&U!6|Quae~R-`*3(NHp@)_X>8+lF$sHLggF+eUzB-KMfL-;4Ie zVKHb(25G?YL|{nr6tCufT1?+yV^vI*ud4&&(uc7&H4R{%QTB0hL*XK($70^Ym}Cf0 zh@r{o>Xro}1HRGmic=bYEI5f9M_Rt$TsK-3)W#HBjbu&2zc%>I8@0X30!esluA&#{ zC-~POoGb-5NM9AVdyhVuT)7&nNb9EVl_9zcN=Gnw1HQik`(9eJc8y6FWmnB=)l)PZiv1ZOCaP7%T%{_M(~r`fQ(c3N7!QA=&Rpr{o|(HYc<)jkp--dPch@NOKy-RBvJBZ z-^5Z0HtikdiN|Yao-XhL`;IJ6;BANF_mSi6SN~QZ6_Qim)KTEazV~06*Cx5^%OhuD zD^;m`MU3X#@4$(FywhGgb%V@c%iE!Y)H^U<(X_Io;V=HSb_oM zB-%8}5V_r*WL+C%lQWSZ+)a5EjhBzd$A`sDPDT8mNVLhNC;ps$Z=Wm#^{Z7jWdHTB z^qUZ~YEfr4uA}j1Lx+xP`QtYl5sRU{lZbB*iDS08erdyh^z$lJyNY zQP$gTqIAgQ<-~E0jdzo(PIbT%2SOXw0I8B-E{c*uvXYU-iNavTiNcf`VoSU= zI+PP=5ZV!cuiQM_G)jv`fdk2i^lT)|I!R%BN8y$VMqCELi)}81qcfq>29Mc3+JEV% zX}0rbhaLDGBHnC}$5^sT86H zG0FvE9`>dT)-VdtDBFqnR=d%?!RUD-*AU7N57<_JG|;Z|s(Z01w+t>o!5|3jk)YWz z4yCXlS>U)5^grf}4P${YXW5tu_d0R3X9Y~!78Lz%;B~^J6EY zl<*pF)Iemwi9HjLQj{6whqEm0acm0{&!l62m`Hth`52gq*C+C|m7I4)`M#8VZ_4-O zPG2vE^wsvBF8ODWlSb(^aG!fuJ)tqnD4I zrAuB_Kj^iTnLIC82@WQsH?K1hC>?hFP%}+Nr1{knqifSaCSr&vw$lHAJd2%>{oQnb zhhWQvTV3K?NqoB!W^ReExZ->6qcZPbgG2HbY#gRgk+Lo@oDrXmt7JUKHza(Qk}mJD z=jsq(v3egQv1@k)jaB}+c=B2>%Bjy^lu3?uKza=dOGP(9@6xxqPLrMn&7KM4m7xp~ z#Uv-dQ6y>v_9=>Valjg$dtDZInf0lE*f=R!ByEwtuV7rIlPj7YX!DTSagw7`jwymX8jHrId!WY~yQ5cvb*c_D>P9H>F6|h9xD;PLdmmOvvn-xisG? zEoL4E=V15fkgo`d%M9_D7mCoNTg!cZ7P(`tDT<@+PlM=kJwDq{(!Ru?@~m$1?!j>ScR=E)5r5K(VPEDc7Z)iQQO z=(`vhIdX-nLPembu8SoHl>9m2hFCTe=`R&KS!iAq88+x9WG@L|A#$VkgJirJvAj6? z)0#WVS6`fqAUnDVz#2n;bJ=hj1d$xGP}HbP7BHKp_-$WKy3i%lL?7zKc-1q9?)q>I zsSE6^_-wII$4M0`BgUxO7(@Du>`-Z^%&{v)3!d4 z3;d%V0PIsiiBlMK36bki|8NF-1u*;Fjr=J-yKi0_ay`e(Lv2uN{7I}9l|bbsMvFS( zu?q}z?4Uoeph{2^>r29Q!sOYEV_lI<8}~#E!WyRc4&!6HHpm-|OZW!`P3luCz&CG1Ng^mF9I z)RBU%awJ?bne=Zw@du1!LK3bP{fCTKs=?V-hW5K)h+1s9k#VmSw? zAW2f%6T#+xwCG4I!LkC&52z3#2$e6=x;+oVxeR~?+tYrz$aXKd=a1tkR7=VLg^(4E zEJ-^m2>b=D`ojC;Fwu1oFpDcEnl@y-`dZY+_zKm%TEsCnV&nsOExp@GFDLoT{?cWH zL^zO5$sXw09U*?g-?i8mx-t&q**vf>AqhJe>z6=(OHnL9-%AnFO`)3$OzpxOf7{4bkUidF)uj^A9r7CT(wUswRTS3uV&l zK@;F7sshG%jryk4|NhB8yEm7YH{E{~YW_d>6T7$Bxx3EAUVAFspQ&k_GaR1}$r>zw zwItBR0soH|YNJ=X{;7R^ZZ~dvw=J<+RY>whND(fT#*MTpT8Ioi=p}|2Cq^~s_F;J= zlge7)+8RHSlAZNdY6S1dHe=G5hbY)m?Mz-L67g4Ib)(C6W>L5!h;!so@p!wDgsk@I z$#DnHs=CKM#-wQ?=TuVF(Y*tn6VSnbLTIcWgu%ZThTeis>l7K7uJlM4MALWN{6rAM zg0beZ2FzP^{ECj`e&P*b_T5Iut9{BCt zqgXU-zmhS$IP0vE+SU_fI?vTJax&71T!ipm9_B*GO;99IKEEp%*Fj_mXu}^~i%B79 zgaY3|Vzrol5bq#u#mn zM`U{}6t?0Dkpr)*kiAfUM|)!2^y^6i;SfU?e0l`cx+IpCcNkYWA^f+3k!rC3Adzi7 zN2tK9jqOY(sKH;mWXa300f~=N3PDgWL?%jn6m=Jp6b(J!S-vm`BSR!Bz6ONA@#q?j zTriDc`THP$d zsW*u<2AiD@{TNdzr9S1?*7bS&x@BK?+Wl5Sb|a+&!MRm`Vn2K~k!1caeDmWVUn)?$ zxK$AAN&54_nNb66$~-nE<;geD^-U*IDO6^LTtZ+e{*}2G?h^>cVOo2%Ax2YmkAo%& zwLPQ_mhUV-)~6+ZAgpLv-7L;TU=GEA_n^Z$<^W2Y1XxE5ZUKo5GP*Q|D{nRyZ>3zA z*2HCa7#u1Dq;++B({;wb1io7Z_8kQps3vS0;!&df!e6gKw6TYF~~D349&Wk@%j zh{P={+~yw4{daT$PrMB{CbBMp4ig}=DqspcBl ztX$hDtx9r#-a-ZO5^Z10y>i%6E-Cu)glWI6J5iLh*AtCOhq_JynQ||)r3V=iVDkBb zY;h1-E`tBB=5FIaa2o>r$ZzWcJff@O^#q*#fIygwAz1}!Gzd<@ml&}%F&skke95SG zUwK=B8g#UO_ZlI9Bk>pQrksvE&=Sl2=j%eJ1H?9^i0hqciyrZJ= z4#n1-QT+uym9Ph-rx&z~Fyj^s{I?$5EN@Vck)s=b`rTayd{Kz)7;7+NWP--wDsl^j zB)Elt#{4>@6-WlUY(nt`SI;VZLp3E|iK`bOUu`I=mncexcu1wbZ1+n=t9dD4CB=mv zoFhr8FVNT$^CgaRDwb(_(qMNeh*C5Qy=U+`vgab>w!AWUiDw^8v$^viA$z6x&DWQV z)QD!M;=qLfz0M0vn+a?y1_2SgFkXkmJh1rQ-f!Q4oxB{gxR;4{B+tn;Y3P zEk&RPF()z4M5D(paBA!*>Jgq9$hj$2IJWWwW5|3cpa&{KFk?cIIdLDTvRMYBH!u$srap zkj0a4D|X`~`wmi5Wqu>6y0HghU^Uq7Mvp;J$N908HaF7AVlcRTZ}5qD(fx5lw_e!y zjTstM*2bgSY%z7no}I5LanFZ0x?28!U4;{Tq4F^#*imvcrHI;5wD^2*utYo%uK=g_ zgYbZoVDhhGA;twzY;QUn2KHO6_WZYZI( z55ooaM-JqF`f0%LO8nZq!XL`lHCf6QUsr}Y$f%S6w34Na5KMVB?xA-(*>vlF-?b(@ zy0)|xS1pk4v;s>GwuYPrEvBV^g;pSTy?CTGS;(W?5f3~)=nNHGSCDjSaPWQ&uE*DhMLaO#Xvm-$B)kh-HjU}<9Vmz`KYgj-K?Iq zRM%=fiDAv&(v|2nG8%F4WPE6Uyvz)Y7mhOPU*nEW7Waw=^yz6v?by?)QsD7>`nq=3 z`?EVc0~FkPBPw`i#1QMx4jF>e;hS7Dt#9+qTtPWtyCs8pSpzjHaThpUOctcC-h^eWCy>zucq3=vrd6b_s`r42%4<%| z##K6LjaCuq9~?$>3y6V#KoJx!CgRH)zKN%GrM_dv0^NKWADtn{p{vOKv{}Ha#K!|+ z90g?Agtcl9YTZ`vH?lKBIhphYLK{tXaRkx2R;s$tFA9C$TZ%=26Ad2N7V5P!t+dA` zoBUzWiO#u*WSL?22Qq0j9p{|h`_3%5XOv83S%7{G?E76M9|xg-yUk0;IXY=J8!{Y; z1ae#>olkV|pZKd^Zo-Tw=Ts@n(TotvOo~_&Jjq~iZ@E`6w4!kp{V8R;_W_mL$IF%~ zMmps=tn0J0&bU&UoGvy6u7Wp4-E~|Q5YfAY&`%N16Nn`gGpeuQm8`GIII!}@nAutc zQMqm@vSzF>RBpI`3EdCs1C?qgC@ zbiIUGITP6XDYe=LjlDGZ5oZbXLAXbk=-y%u{|?B+RbO*iAXs_Lb|qPY^Ze~45O(T! z(ZD6VhX(k&yN=Mlb;fD%>@*)@)&4i)(P?&CmUUQsCA1}fv(D>Uuh+S=>uAn=*KW4> zSEF-%+v)+|yB4=E4Cpxs?m#f;Jipw#J~3+%nvgUQclC}@L$A|kZ_bME*vxwKN~IsA z@1_P76I<-=_RF$H`2$!b>dwRpg`c!CrAkc-bi!KZSF0$ogAh5$`>&Pr3RF;hhc#$l zt(o=BBIf>o>H9Rk!PB|j+b_<{w^m9zc?Jhwy4lBg>ae)S)a{uN!lIdrfd|v3nAs;= z^7}{GtMAS|`CGXEqeSM+X1U!|iQ;iCnB_W0P3X}jPfd%6${7v8s@_JcJcIJC3_^M= z>Twf%94E92G^DJhi<4P3%8w20o1|D8V~I6eHc#GvFss-wQ3ipHMLvD!P$H-!#ny!I zX;1_(NJ~KgK7 zCnxtd4XYj5=Hy#LtL$4vsRLHOc8I+v%m1}~e%&76o|qM8m@l;XX2_NzUKJ+LzLNLW zcAMS!5=U64#8{}p_3AB_F0>b=vecx zaHVZi@h58&U6!J2{maJEN}Eb6Z7i)6m$pHVL@sHpRm%obl*Yr$Fd9~SF3hERb^-!Z z!U>dNKnLj`_=*7)8+CjV@fA36T60Bz2db4*707~_phui$S>;I9GR>NKbfRi43Lq@~ z?V>pj0DG>>04AXkXs!V1`7N%419DHzn&zg$o?JbPQ?qHKuby3cZKK*!g!QdO#EY%+ z7CDxk9!Z!q4_V*QSS=r2Q)q0SH%O@`Cns{-NeTKJON7#1Hp!%G#l2ph^@me`XnjA0 z$69fvKZ3wSfqyK0Rp4cNdsoODHE1cbDWa>-D1XKvFd3z)|Zi?H=L(m4~ z+xYW#W=)|&Q%+^I=56h|(aLmxE)xoS8s|9Ds*n!W0aKJm+(!)Kw-t%y(|at7-%l|X z@W)fULDgz7Upx_q?xaE4ul-iZ)~2Gb_ZD;VMoFPppsg)~ZRmP^ zb<04C{V=wdqmVK}h?B;k(mYjSu!&&MKN{i*c5Pc zbI_w_V`~`T{tc~(I7*8^jQXcb@s1GRjNoFSSQtsxm`Xh-!exCg`DBE<(R}fp)MM|4 zq$6iwQWTy9_}S}$PxA@G(-fJFStO3HBSN!C)vt#Uz|qApKg#c*uu0jpFTo$pb#qS; zrAVCwOGp54>`@ePCxoGYKpW|$fNr3L2*dq9qo4GB%8sqscIg_DO-h}Yj2_RX&jRx1BOO6J-#~@fK6X@_ zW7Ln`Pw%sqf0Zb5{QLumO5=mdJv;4SN4zmDJ0o+E!ZVIfbv+4x%*f@e#JV131yYTFHhwn(lfX`0jh^ zP+=S8O^gm`0sLcs4~=g>HrdAb6B!6Whg~^gXtZ^o0RjCd<*D zs_Z%=-L3|8yWXz##cJfxiWC*0?m6tlFF2qwW6#GhWnX=UZ&^{`#ORn&*vDwvNwLSD z7`|%8@!)h92{?F8gE5RlT)151)bpk;b;<5GHNTiQ(NC9uvthM+cLn|Egc{}59AWOq zzL5AmyJoSUX#7H{ou=O6q-dJw4lUU2%wNMMkZM8O8@Nln_^Z+n1C`anQy_b1D=Aw` z`jrkU9v2DAQxqxP$KP3`xZjS3=>fyT90GX!p^a^aC8AxaketdcJnA~<9CHdh*bo}?>odXF9& zZ$Zry@yZzUyUzv%zaePUzu|R^hwyV;Gm7=dH}aT&B3#S}V4v)I=A@cuOi(T_WOL~^ z+#RG;U*cG*2X#q&7spclyFPV5Fvr>Y$E@6S(hjY1BHoO=af7`9#)zO=L`Z|`UZ381 zsKkQ-G)N)xg9NxOO+;(|fA*k`C`I1@HiDuk!*I>HcwAa=TJLLKK2hGR1NY-qHK zAbNg(#%MhM+dMcu?baGU*;h9p*VWE?cH`{)^z^^;MFJS> zky#xh%t{>G2PtS@|JZ75y1$W^G#E~jtq-$*tPnLm30um8IM~Vi9X#w2M0ijzjPqr% zTEsBx>^>Gw2}v38bMQR1onR5Q0#e`!FCDm=^;%kC22q7P&;qgrd|Je(6VvJQCrk(-^$Cq)VZWmFolqR zkwMSJOBf;3$s%U@g3hCEh;vhzwta-OpZCnzojjNB7ihmGG~2(PcR|><8yB_f>(*sIW>Az$ny@f34Qvv& zXOo>U+RW7w`U2I#LNv1^@M&?qh=uDsBudy&L~(Nw!dLCvi--`{Ni}8_DrfkAj5E~6 zBCsKN2d_%_#v-C1`i>%oFAImfK~_=%eRmPqo!{9ID&k!Y$+*wWz-+-Icy`Kl)D}vc zkyr-X(Y`0HUfvv)(Uul#l4YD<+sFVY%WpD5bm%fHOf@&I#DWXwQ8uKH=^UAcT%%S8;oPq(?Wj!(I4lGXmT0ZgvtCWK(+!?ICrnJ%=*}>^d=Fx$ z(PJq9Ha=j~Yz*yKRch8_Dcc>E%KM6y6n+2>^Z{`}BD`m$AQB>CLqJhagf}?qUl7J&=3--Xn$3$*#}96x`5!%hEN2&7*8qX>NC z#lA+}?K)w%sZNtF)tl+KZGC4SWl}-6df!MzLM?G}a#CQC1K27ev9D&19lZ*3f5s`% zQbo@v#z=#B$oyU#W2l|SSa8Sy`=V=Hx#a(dJ5jC7SG+~ks!Fe^TKbmt+o_Dlcypoe zCi5*=(p8tb?w@hMO zaT)to@)G|4l|3t)uC2xa@1yH2V`8RvsjJ!<%DtT?4Gc?ab7unLZh$J;Y7K$h$Vmm^ znjtmY_e_u^5oNyc)yJE1R4g-w^H;zAA`oU@469H)HcyU!PfYXBz+}eX4AYoIrGq&} zZKrIph%0u{vXD=#w-L$H#vm=6EQqwt6;aAA1wm1gtMr&}JCPR1K`;Y2FzQlkDy^o! z(jpwaNsSekugUAF;!^_N&Zc6`W7R|Hwn?L!?i41JY}MIK>oVCa|DTlLTl8^Sk$Ou+ ziQm!$IKeZ2+^lK_yy=T0y%-*0{O}ltjM(0DN8Vx?j4&+qIl`U^@2SrkU|WO%%MfJo zY3jPOyn#+u4aY~+aSDAxaA};ppqyElT576jalB^c&ca5I@HwKZNLmrcTD;Sa9;kX* z?{__Id=xSmYK87lQ0}*~MEU>D8&W+XIE|UANE;1*t)BFu!PLr;V^Gv=eN1)5U{=i6 zJa6RuU0YjkT2$XY`!+12Z<&0L@klHO%VK$G+_AF1w_pOEg63F-c|6Vm*q6)adU4lG6is$x+S zVX|Y%L!^Smuvo5ohmCsgOYGm5pb-le0T-9xkpvV2=5}9~A?XMd3OY|SA5^_?GT>L2 zQPc+-I4;I~l2yPbRd5oHMjX}!V2K}9kf+tYWqrDeHxXwQ1f87KA?Fo{A7wn5_*tAZ zfFCNr;P-atq?eKD2pfO<)%NLiu{FLs1C=GCoF@ru725~4+-|KPj1JtwAI%TRtV%=$ zk%z8OBOS&$Domlm<>Lx{c`0J zKkTheQyGfWUf7}1j+OA5r;ver<5vsXFylL-o)$WMWJNym|oV9)Oy zm$0k_6c_RcRuvs>KI-I2>*d$w+S;0+(rqcagO|Z53>1GCNt|VN_wzvN6h~M8)IC(h;4oV@f*INq&Ux zk}HZ!exR4&6bm#tkDG1r&jMd5i2SeH)svfg?nhDXkLe;>RzL{^7f+N#{V*LiD+g)P z;#wX2%7iK>DAuIOxxaT zGR5aywu}zPCBB-~!}Fn!X2AQiQ9f*AmiC+d1G{fqE0wU0hIQc6!k0aV&|Q~v0SXdK zc5$$Q6AeEB)#E7qRKrgJeysOr8hv(X>Owtrt2T`CSSLa~g)5js5f|+cT+iXEdkCf{ zZq+*k(-XEjF~%ef#xZJhWB)Vmj`89Tm(c+V7b@<-XxQ5^{qdZh4%kbx_&Uy@{cQ7n zQ#g7s=1IT@98|(FMsv7Z?(Dcrm+#mI9)Edtf4{_AYMqa!RjFYN+qcgrsOUbe);G&% z)N@UMkXr(QywCz6UtFFjlnl0S0bWdpQ-#9F>=wv0oWNwfte$t(-v@paf)bxe%}-bg zi}mV;(q;(HQqy9v(MWrtMpd-~XjZjlj*$TIMe`k5=an(@Xb1xj$Fs;6QgXLk-+$+* z;_cOQdJ|8_HW*Q*^4rTa#Sya>zBGYBS4-9T7$LAL@{v&))~Sk*;!zls==J7db?d@b zPVyvykqNzlmxqHAiJmM?jPM}VAmM}T991gjF1CzsCnnL_4nf)cEB zG=Z)z5l?xh&v3<_f;C&xM<8AQL4TkX_5CrSHqZx{!|=!P0FMcmJMj{t)<%|=BLH)g zkK*K-wa*(EWvY~z4|U8{yT>}{)cpQi`?Ow2o2;bnbehy>tkZ4&_MCNk_1_A|Mpak0 zN!4w$UZa2I;}1pIYrkpChUn-R6B;Kx@~_!@J3{EgGq9%Gc7S3+d_tEyqJOf+u&dZX zm>S^5xMa(|>RMxB1i%jr%!v~d#A7;1fmIby*P>l;u&>q0XgIpajC1-5Qn#ubM}Zs*K%lMyIcAEEo*IxuNj&Zp&{&S_hK#* za_AxEkFP>V7_4fV#917~Q9e##lutWjbh_vQbbdO59EMk{_4e&sgMS{@8$R`EJW27? zZ~(f=Yyy1h{Jj+sB)EgZ2+s@w)Nxb;_GkN?NUzZkq z3R{d0dG!Y%GhMatVpZPcNad4FW%et}fKsWH-PuN)l9p%efGnPZd4RrB91kBsdrngy zPXe~KX61WahN)$C&Fbl}2rQzaZE2ed!Tu>au0pVOimq+TTz_6>WXRCvqHW)VQ&|rG zvMq%Vd{O|4g{dBwH6T|P2-Ko&otXRT0dn3(HVNC?HcSK7kuckU4Omygx`$ys3G0~$ z!m#xembKo$Z=)YT_6YhF#dcg!lI5)oHGT7)W&7vlHZAsdEA8BSR8-X-!0|J~Ff$Ac zGY1eKpa_Vfk_ahk;seV|iYB2Kq?V6Vd>bT`y0Y{x&9qFV(RSBIK3bJ6e5A|e3-NI+ zyFS8q4_^%yrdA-D7NV=Whgs`-W&r=>uP?0qhv)a(d;fm>oHNWHu212&%^o_wnz8t~ zbAP?LeEHfd%ci{?k$ODJK4-;;-;~{3wc?6>E+%>i)#y-6MMS8Mfc_Q9w$UYF)uRpZu{SD|#H;c6LM2iQ=j& z3#+%7mw$faPTAn{`SQP_4>*~>;6&J%>a0WR)Al=e{aP$II?{Fx~k6GI_Kx5?_SP(KJHt?)J}$*K^ewb zX_fDVUugb%c5+<%+08z={p5{|WiPC&DeRQ7WM)M|!q1%wjZ15OiMO6{j!CK>_E|tk z&fAv{UXQEU&?jwRyYQ{?RTEY$ZQiRWeaXb{C!E|8^yS(QM+C3STz9V1mh)G2&J+Ks ztol%WGC8?q-Pp{O8)w%J&D?eIy~PJd^%-6`X8D$`ce3BPP^nw6>Hrn9|&7K_QC^ zJ4`;`cEtR|_byKjz1VY5(9TQS2LC%MbGu(wCXOop`kN`84%g@^ zFLm=zC{5Y_$?nOi$MP?j{ccR`V9*th+B9Qu)Un{vTXVB7b@#v3H)le8$&XvV8@_nf z@J(~?{yt|-iL=kD%3}T5FE76MM&7wUZ(Y5<=-k$X!0jn&Z=Vr67ukG)h%G^y&7p5|i+QH+Y&tlSS2m)97Q zwDLvEj|^)JdKuWa!80)0Y0B|&1;&1Ah}X_oR&Cz9GPuTz)o81zqA*(x6}NKKV5?Oz z6-iygJ4Hhvn?PtU6n2hBK?YVs(L{91+P=Or0&;rKjN@cp7*bcp7*bcp7*bcp7*bcp7*bcp7*b zcp7*bcp7*bcp7*bcp7*bcp7*bcp7*bcp7*bcp7*bcp7*bcp7*bcp7*bcp7*bcp7*b zcp7*bcp7*bcp7*bcp7*bcp7*bcp7*bcp7*bcp7*bcp7*bcp7*bcp7*bcp7*bcp7*b zcp7*bjp1qNY@)f-)JrR0xIGOSke)_UapfmdoHpu4HDolr+?1pZ)S?=y-UHRpDIFax znzj_1o9II=J0z~*9^e|_8sHk>8sHk>8sHk>8sHk>8sHk>8sHk>8sHk>8sHk>8sHk> z8sHk>8sHk>8sHk>8sHk>8sHk>8sHk>8sHk>8sHk>8sHk>8sHk>8sHk>8sHk>8sHk> z8sHk>8sHk>8sHk>8sHk>8sHk>8sHk>8sHk>8sHk>8sHk>8sHk>8jXQ#=xxGu*ZhoD zzHs9jGO+J2^Rt?O2&^{u(97!ss?EJL*LS&D4IeL7BhGOktd($1QG=~k#k5n(8t#Ft zfvkb7fvkb7fvkb7fvkb7fvkb7fvkb7fvkb7fvkb7fvkb7fvkb7fvkb7fvkb7fvkb7 zfvkb7fvkb7fvkb7fvkb7fvkb7fvkb7fvkb7fvkb7fvkb7fvkb7fvkb7fvkb7fvkb7 zfvkb7fvkb7fvkb7fvkb7fvkb7fvkb7fvnLOvWAaMB>P$VTQu^8Th@?)$&vo8gxzY1 z(?rGoNdK9789ZpU^wwN=^BPu9UgP9OOLxmIX==C!rUs@4rUs@4rUs@4rUs@4rUs@4 zrUs@4rUs@4rUs@4rUs@4rUs@4rUs@4rUs@4rUs@4rUs@4rUs@4rUs@4rUs@4rUs@4 zrUs@4rUs@4rUs@4rUs@4rUs@4rUs@4rUs@4rUs@4rUs@4rUs@4rUs@4rUs@4rUs@4 zrUs@4rUs@)NL8)szrMX_Osj=#swY#NQni}qbse!41se!41se!41 zse!41se!41se!41se!41se!41se!41se!41se!41se!41se!41se!41se!41se!41 zse!41se!41se!41se!41se!41se!41se!41se!41se!41se!41se!41se!41se!41 zse!41se!41se!41se!4{NT$Zz7X$li<%|ED8cCx9(=-9`?x?`sddX?@A060RbKT8p z1RHIs8P2Toiq!>*azyBq7)2Gi`D(1ys+jgkSHnGUHE=a>HE=a>HE=a>HE=a>HE=a> zHE=a>HE=a>HE=a>HE=a>HE=a>HE=a>HE=a>HE=a>HE=a>HE=a>HE=a>HE=a>HE=a> zHE=a>HE=a>HE=a>HE=a>HE=a>HE=a>HE=a>HE=a>HE=a>HE=a>HE=a>HE=a>HE=a> zHE=a>HE=Z=!__d_L}H$;w?!jgxLpkyD9g8vYw;)$G1^B-PxCQ^D2myv$oQxNTQ}{* zW!2`rE3KZs#sr(ayQM_38twtB0jmM40jmM40jmM40jmM40jmM40jmM40jmM40jmM4 z0jmM40jmM40jmM40jmM40jmM40jmM40jmM40jmM40jmM40jmM40jmM40jmM40jmM4 z0jmM40jmM40jmM40jmM40jmM40jmM40jmM40jmM40jmM40jmM40jmM40jtqStj3`E z_WoM=;{U9MexZFX0#-m1^($-_;p((ziFk1~3w{q0b zpdzp0YXU{H@oKowGdq37LyI9yjLubq6Y6HAW=xzHn_evozM)r?M2{W**yAe>zNj`6 ze`l&D(aLJ@6Z^-j_WJg6%Dr^YiHGCW_H{OS;MGPOk4*+;8XboMLPTz+F*wmzF>Us0 z#5G%cyq<^9Q+zQ&?G#jZl6Yy7?EXfnQB;*0;~QG|mnUxY-Lg_qqA%#Z?ptq>H&JcZ z)q7!`P5apB6wh9snqpF>P0ta3pALw2ZMog67uW2DducBsC&^ywPICA1-A^WQC`k=< z*nI-T{hv(MhIVMUsW?$KNo|+ly@TGXsg52uD0Z&d5#BURY?g086WP=bucq`iF?+H+ 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 Rep3H?_mQMo%@p;g{{seLX^H>< diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index 38349bb0fe..2599952942 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.02.07.all.3533135151" + signature = "rusEFI 2021.02.07.all.80595884" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.02.07.all.3533135151" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.02.07.all.80595884" ; 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 Sun Feb 07 00:51:22 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Feb 07 01:55:53 UTC 2021 pageSize = 20000 page = 1 @@ -196,7 +196,7 @@ fuelLevelSensor = bits, U08, 514, [0:5], "Disabled", "PA0", "PA1", "PA2", "PA3", tps2_1AdcChannel = bits, U08, 515, [0:5], "Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" idle_derivativeFilterLoss = scalar, F32, 516, "x", 1.0, 0.0, -1000000, 1000000, 4 sensorChartFrequency = scalar, S32, 520, "index", 1.0, 0, 0, 300, 0 -trigger_type = bits, U32, 524, [0:5], "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", "trg55", "trg56", "trg57", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +trigger_type = bits, U32, 524, [0:5], "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", "trg56", "trg57", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" trigger_todoRemoveMeOneDay0 = bits, U32, 528, [0:0], "false", "true" trigger_todoRemoveMeOneDay1 = bits, U32, 528, [1:1], "false", "true" trigger_useOnlyFirstChannel = bits, U32, 528, [2:2], "false", "true" diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 8467d0c124..8b5ee5c05f 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.02.07.frankenso_na6.1458401468" + signature = "rusEFI 2021.02.07.frankenso_na6.2159535679" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.02.07.frankenso_na6.1458401468" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.02.07.frankenso_na6.2159535679" ; 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 Sun Feb 07 00:51:29 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Feb 07 01:56:02 UTC 2021 pageSize = 20000 page = 1 @@ -196,7 +196,7 @@ fuelLevelSensor = bits, U08, 514, [0:5], "NONE","Analog 3O","Analog 3L","Analog tps2_1AdcChannel = bits, U08, 515, [0:5], "NONE","Analog 3O","Analog 3L","Analog 3M","Analog 3J","Analog 3I","INVALID","Analog 3H","Analog 3G","INVALID","INVALID","INVALID","Analog 3P","Analog 3Q","Analog 3N","Analog VBatt","Analog 3E", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" idle_derivativeFilterLoss = scalar, F32, 516, "x", 1.0, 0.0, -1000000, 1000000, 4 sensorChartFrequency = scalar, S32, 520, "index", 1.0, 0, 0, 300, 0 -trigger_type = bits, U32, 524, [0:5], "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", "trg55", "trg56", "trg57", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +trigger_type = bits, U32, 524, [0:5], "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", "trg56", "trg57", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" trigger_todoRemoveMeOneDay0 = bits, U32, 528, [0:0], "false", "true" trigger_todoRemoveMeOneDay1 = bits, U32, 528, [1:1], "false", "true" trigger_useOnlyFirstChannel = bits, U32, 528, [2:2], "false", "true" diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index d25deeeb22..ddbd0f6d04 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.02.07.hellen72.3234006423" + signature = "rusEFI 2021.02.07.hellen72.379163412" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.02.07.hellen72.3234006423" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.02.07.hellen72.379163412" ; 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 Sun Feb 07 00:51:24 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Feb 07 01:55:54 UTC 2021 pageSize = 20000 page = 1 @@ -196,7 +196,7 @@ fuelLevelSensor = bits, U08, 514, [0:5], "NONE","4W - O2S (A13)","3L - IGN_7 / A tps2_1AdcChannel = bits, U08, 515, [0:5], "NONE","4W - O2S (A13)","3L - IGN_7 / AFR","4B - Brake/RES1 (A7)","4AB - FTP/PPS (A18)","4V - TPS (A17)","4T - Alternator voltage (A5)","3V - CAM (A19)","4J - VTCS/AUX4 (A20)","4F - AC_PRES/AUX1 (A23)","4AA - O2S2 (A12)","4X - MAF (A9)","4U - MAP2/Ign8 (A10)","4P - CLT (A11)","4N - IAT (A14)","4H - Neutral/AUX2 (A21)","4I - Clutch/AUX3 (A22)", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" idle_derivativeFilterLoss = scalar, F32, 516, "x", 1.0, 0.0, -1000000, 1000000, 4 sensorChartFrequency = scalar, S32, 520, "index", 1.0, 0, 0, 300, 0 -trigger_type = bits, U32, 524, [0:5], "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", "trg55", "trg56", "trg57", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +trigger_type = bits, U32, 524, [0:5], "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", "trg56", "trg57", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" trigger_todoRemoveMeOneDay0 = bits, U32, 528, [0:0], "false", "true" trigger_todoRemoveMeOneDay1 = bits, U32, 528, [1:1], "false", "true" trigger_useOnlyFirstChannel = bits, U32, 528, [2:2], "false", "true" diff --git a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini index 838d00b30b..a4979e1e20 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.02.07.hellen_cypress.2431354623" + signature = "rusEFI 2021.02.07.hellen_cypress.1186009212" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.02.07.hellen_cypress.2431354623" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.02.07.hellen_cypress.1186009212" ; 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 Sun Feb 07 00:51:41 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Sun Feb 07 01:56:13 UTC 2021 pageSize = 20000 page = 1 @@ -196,7 +196,7 @@ fuelLevelSensor = bits, U08, 514, [0:5], "Disabled", "PA0", "PA1", "PA2", "PA3", tps2_1AdcChannel = bits, U08, 515, [0:5], "Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" idle_derivativeFilterLoss = scalar, F32, 516, "x", 1.0, 0.0, -1000000, 1000000, 4 sensorChartFrequency = scalar, S32, 520, "index", 1.0, 0, 0, 300, 0 -trigger_type = bits, U32, 524, [0:5], "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", "trg55", "trg56", "trg57", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +trigger_type = bits, U32, 524, [0:5], "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", "trg56", "trg57", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" trigger_todoRemoveMeOneDay0 = bits, U32, 528, [0:0], "false", "true" trigger_todoRemoveMeOneDay1 = bits, U32, 528, [1:1], "false", "true" trigger_useOnlyFirstChannel = bits, U32, 528, [2:2], "false", "true" diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini index 669f85dc8f..7480d8c8b2 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.02.07.kin.2431354623" + signature = "rusEFI 2021.02.07.kin.1186009212" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.02.07.kin.2431354623" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.02.07.kin.1186009212" ; 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 Sun Feb 07 00:51:39 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sun Feb 07 01:56:11 UTC 2021 pageSize = 20000 page = 1 @@ -196,7 +196,7 @@ fuelLevelSensor = bits, U08, 514, [0:5], "Disabled", "PA0", "PA1", "PA2", "PA3", tps2_1AdcChannel = bits, U08, 515, [0:5], "Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" idle_derivativeFilterLoss = scalar, F32, 516, "x", 1.0, 0.0, -1000000, 1000000, 4 sensorChartFrequency = scalar, S32, 520, "index", 1.0, 0, 0, 300, 0 -trigger_type = bits, U32, 524, [0:5], "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", "trg55", "trg56", "trg57", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +trigger_type = bits, U32, 524, [0:5], "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", "trg56", "trg57", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" trigger_todoRemoveMeOneDay0 = bits, U32, 528, [0:0], "false", "true" trigger_todoRemoveMeOneDay1 = bits, U32, 528, [1:1], "false", "true" trigger_useOnlyFirstChannel = bits, U32, 528, [2:2], "false", "true" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index b652257f9f..cc26fe44f5 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.02.07.mre_f4.4233179077" + signature = "rusEFI 2021.02.07.mre_f4.705411398" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.02.07.mre_f4.4233179077" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.02.07.mre_f4.705411398" ; 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 Sun Feb 07 00:51:27 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Feb 07 01:55:58 UTC 2021 pageSize = 20000 page = 1 @@ -196,7 +196,7 @@ fuelLevelSensor = bits, U08, 514, [0:5], "NONE","18 - AN temp 1","23 - AN temp 2 tps2_1AdcChannel = bits, U08, 515, [0:5], "NONE","18 - AN temp 1","23 - AN temp 2","24 - AN temp 3","22 - AN temp 4","28 - AN volt 10","INVALID","26 - AN volt 2","31 - AN volt 3","36 - AN volt 8","40 - AN volt 9","27 - AN volt 1","Battery Sense","19 - AN volt 4","20 - AN volt 5","32 - AN volt 6","30 - AN volt 7", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" idle_derivativeFilterLoss = scalar, F32, 516, "x", 1.0, 0.0, -1000000, 1000000, 4 sensorChartFrequency = scalar, S32, 520, "index", 1.0, 0, 0, 300, 0 -trigger_type = bits, U32, 524, [0:5], "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", "trg55", "trg56", "trg57", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +trigger_type = bits, U32, 524, [0:5], "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", "trg56", "trg57", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" trigger_todoRemoveMeOneDay0 = bits, U32, 528, [0:0], "false", "true" trigger_todoRemoveMeOneDay1 = bits, U32, 528, [1:1], "false", "true" trigger_useOnlyFirstChannel = bits, U32, 528, [2:2], "false", "true" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 4697636948..bdb58cbc35 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.02.07.mre_f7.4233179077" + signature = "rusEFI 2021.02.07.mre_f7.705411398" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.02.07.mre_f7.4233179077" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.02.07.mre_f7.705411398" ; 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 Sun Feb 07 00:51:26 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Feb 07 01:55:55 UTC 2021 pageSize = 20000 page = 1 @@ -196,7 +196,7 @@ fuelLevelSensor = bits, U08, 514, [0:5], "NONE","18 - AN temp 1","23 - AN temp 2 tps2_1AdcChannel = bits, U08, 515, [0:5], "NONE","18 - AN temp 1","23 - AN temp 2","24 - AN temp 3","22 - AN temp 4","28 - AN volt 10","INVALID","26 - AN volt 2","31 - AN volt 3","36 - AN volt 8","40 - AN volt 9","27 - AN volt 1","Battery Sense","19 - AN volt 4","20 - AN volt 5","32 - AN volt 6","30 - AN volt 7", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" idle_derivativeFilterLoss = scalar, F32, 516, "x", 1.0, 0.0, -1000000, 1000000, 4 sensorChartFrequency = scalar, S32, 520, "index", 1.0, 0, 0, 300, 0 -trigger_type = bits, U32, 524, [0:5], "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", "trg55", "trg56", "trg57", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +trigger_type = bits, U32, 524, [0:5], "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", "trg56", "trg57", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" trigger_todoRemoveMeOneDay0 = bits, U32, 528, [0:0], "false", "true" trigger_todoRemoveMeOneDay1 = bits, U32, 528, [1:1], "false", "true" trigger_useOnlyFirstChannel = bits, U32, 528, [2:2], "false", "true" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index 5a6fc90c7a..3052dfcdea 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.02.07.prometheus_405.3221315353" + signature = "rusEFI 2021.02.07.prometheus_405.375114138" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.02.07.prometheus_405.3221315353" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.02.07.prometheus_405.375114138" ; 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 Sun Feb 07 00:51:33 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Feb 07 01:56:06 UTC 2021 pageSize = 20000 page = 1 @@ -196,7 +196,7 @@ fuelLevelSensor = bits, U08, 514, [0:5], "Disabled", "PA0", "PA1", "PA2", "PA3", tps2_1AdcChannel = bits, U08, 515, [0:5], "Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" idle_derivativeFilterLoss = scalar, F32, 516, "x", 1.0, 0.0, -1000000, 1000000, 4 sensorChartFrequency = scalar, S32, 520, "index", 1.0, 0, 0, 300, 0 -trigger_type = bits, U32, 524, [0:5], "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", "trg55", "trg56", "trg57", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +trigger_type = bits, U32, 524, [0:5], "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", "trg56", "trg57", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" trigger_todoRemoveMeOneDay0 = bits, U32, 528, [0:0], "false", "true" trigger_todoRemoveMeOneDay1 = bits, U32, 528, [1:1], "false", "true" trigger_useOnlyFirstChannel = bits, U32, 528, [2:2], "false", "true" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index 0ceacac562..fd2abd5076 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.02.07.prometheus_469.3221315353" + signature = "rusEFI 2021.02.07.prometheus_469.375114138" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.02.07.prometheus_469.3221315353" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.02.07.prometheus_469.375114138" ; 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 Sun Feb 07 00:51:31 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Feb 07 01:56:05 UTC 2021 pageSize = 20000 page = 1 @@ -196,7 +196,7 @@ fuelLevelSensor = bits, U08, 514, [0:5], "Disabled", "PA0", "PA1", "PA2", "PA3", tps2_1AdcChannel = bits, U08, 515, [0:5], "Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" idle_derivativeFilterLoss = scalar, F32, 516, "x", 1.0, 0.0, -1000000, 1000000, 4 sensorChartFrequency = scalar, S32, 520, "index", 1.0, 0, 0, 300, 0 -trigger_type = bits, U32, 524, [0:5], "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", "trg55", "trg56", "trg57", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +trigger_type = bits, U32, 524, [0:5], "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", "trg56", "trg57", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" trigger_todoRemoveMeOneDay0 = bits, U32, 528, [0:0], "false", "true" trigger_todoRemoveMeOneDay1 = bits, U32, 528, [1:1], "false", "true" trigger_useOnlyFirstChannel = bits, U32, 528, [2:2], "false", "true" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index cdc7d3199c..d66f81c391 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.02.07.proteus_f4.3047593216" + signature = "rusEFI 2021.02.07.proteus_f4.1677460355" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.02.07.proteus_f4.3047593216" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.02.07.proteus_f4.1677460355" ; 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 Sun Feb 07 00:51:36 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Feb 07 01:56:09 UTC 2021 pageSize = 20000 page = 1 @@ -196,7 +196,7 @@ fuelLevelSensor = bits, U08, 514, [0:5], "NONE","Analog Volt 5","Analog Volt 6", tps2_1AdcChannel = bits, U08, 515, [0:5], "NONE","Analog Volt 5","Analog Volt 6","Analog Volt 7","Analog Volt 8","Analog Volt 9","Analog Volt 10","Analog Volt 11","Battery Sense","Analog Temp 3","Analog Temp 4","Analog Volt 1","Analog Volt 2","Analog Volt 3","Analog Volt 4","Analog Temp 1","Analog Temp 2", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" idle_derivativeFilterLoss = scalar, F32, 516, "x", 1.0, 0.0, -1000000, 1000000, 4 sensorChartFrequency = scalar, S32, 520, "index", 1.0, 0, 0, 300, 0 -trigger_type = bits, U32, 524, [0:5], "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", "trg55", "trg56", "trg57", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +trigger_type = bits, U32, 524, [0:5], "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", "trg56", "trg57", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" trigger_todoRemoveMeOneDay0 = bits, U32, 528, [0:0], "false", "true" trigger_todoRemoveMeOneDay1 = bits, U32, 528, [1:1], "false", "true" trigger_useOnlyFirstChannel = bits, U32, 528, [2:2], "false", "true" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index 305d126505..05f4491e9c 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.02.07.proteus_f7.3047593216" + signature = "rusEFI 2021.02.07.proteus_f7.1677460355" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.02.07.proteus_f7.3047593216" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.02.07.proteus_f7.1677460355" ; 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 Sun Feb 07 00:51:34 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Feb 07 01:56:07 UTC 2021 pageSize = 20000 page = 1 @@ -196,7 +196,7 @@ fuelLevelSensor = bits, U08, 514, [0:5], "NONE","Analog Volt 5","Analog Volt 6", tps2_1AdcChannel = bits, U08, 515, [0:5], "NONE","Analog Volt 5","Analog Volt 6","Analog Volt 7","Analog Volt 8","Analog Volt 9","Analog Volt 10","Analog Volt 11","Battery Sense","Analog Temp 3","Analog Temp 4","Analog Volt 1","Analog Volt 2","Analog Volt 3","Analog Volt 4","Analog Temp 1","Analog Temp 2", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" idle_derivativeFilterLoss = scalar, F32, 516, "x", 1.0, 0.0, -1000000, 1000000, 4 sensorChartFrequency = scalar, S32, 520, "index", 1.0, 0, 0, 300, 0 -trigger_type = bits, U32, 524, [0:5], "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", "trg55", "trg56", "trg57", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +trigger_type = bits, U32, 524, [0:5], "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", "trg56", "trg57", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" trigger_todoRemoveMeOneDay0 = bits, U32, 528, [0:0], "false", "true" trigger_todoRemoveMeOneDay1 = bits, U32, 528, [1:1], "false", "true" trigger_useOnlyFirstChannel = bits, U32, 528, [2:2], "false", "true" diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index bd6839fd1c..48bb490f78 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.02.07.subaru_eg33_f7.2408458800" + signature = "rusEFI 2021.02.07.subaru_eg33_f7.1507114163" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.02.07.subaru_eg33_f7.2408458800" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.02.07.subaru_eg33_f7.1507114163" ; 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 Sun Feb 07 00:51:38 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Feb 07 01:56:10 UTC 2021 pageSize = 20000 page = 1 @@ -196,7 +196,7 @@ fuelLevelSensor = bits, U08, 514, [0:5], "Disabled", "PA0", "PA1", "PA2", "PA3", tps2_1AdcChannel = bits, U08, 515, [0:5], "Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" idle_derivativeFilterLoss = scalar, F32, 516, "x", 1.0, 0.0, -1000000, 1000000, 4 sensorChartFrequency = scalar, S32, 520, "index", 1.0, 0, 0, 300, 0 -trigger_type = bits, U32, 524, [0:5], "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", "trg55", "trg56", "trg57", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +trigger_type = bits, U32, 524, [0:5], "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", "trg56", "trg57", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" trigger_todoRemoveMeOneDay0 = bits, U32, 528, [0:0], "false", "true" trigger_todoRemoveMeOneDay1 = bits, U32, 528, [1:1], "false", "true" trigger_useOnlyFirstChannel = bits, U32, 528, [2:2], "false", "true" 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 ee972cdad7..1ab92526ff 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 Sun Feb 07 00:51:22 UTC 2021 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Feb 07 01:55:53 UTC 2021 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -1209,6 +1209,7 @@ 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 = 80595884; public static final int silentTriggerError_offset = 1464; public static final int slowAdcAlpha_offset = 2088; public static final int sparkDwellRpmBins_offset = 332; @@ -1492,7 +1493,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.02.07.all.3533135151"; + public static final String TS_SIGNATURE = "rusEFI 2021.02.07.all.80595884"; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final int TT_TT_1_16 = 50; public static final int TT_TT_2JZ_1_12 = 29; @@ -1785,7 +1786,7 @@ public class Fields { public static final Field TPS2_1ADCCHANNEL = Field.create("TPS2_1ADCCHANNEL", 515, FieldType.INT8, adc_channel_e); public static final Field IDLE_DERIVATIVEFILTERLOSS = Field.create("IDLE_DERIVATIVEFILTERLOSS", 516, FieldType.FLOAT); public static final Field SENSORCHARTFREQUENCY = Field.create("SENSORCHARTFREQUENCY", 520, FieldType.INT); - public static final String[] trigger_type_e = {"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", "trg55", "trg56", "trg57", "INVALID"}; + public static final String[] trigger_type_e = {"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", "trg56", "trg57", "INVALID"}; public static final Field TRIGGER_TYPE = Field.create("TRIGGER_TYPE", 524, FieldType.INT, trigger_type_e); public static final Field TRIGGER_TODOREMOVEMEONEDAY0 = Field.create("TRIGGER_TODOREMOVEMEONEDAY0", 528, FieldType.BIT, 0); public static final Field TRIGGER_TODOREMOVEMEONEDAY1 = Field.create("TRIGGER_TODOREMOVEMEONEDAY1", 528, FieldType.BIT, 1); diff --git a/java_console/rusefi.xml b/java_console/rusefi.xml index 98d425ea0b..718f256436 100644 --- a/java_console/rusefi.xml +++ b/java_console/rusefi.xml @@ -1,6 +1,6 @@ - +