From 62d35df02500f4e20db355401b951b0f9cc55cf7 Mon Sep 17 00:00:00 2001 From: GitHub build-firmware Action Date: Mon, 14 Dec 2020 02:54:40 +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 | 6 +++--- .../generated/signature_frankenso_na6.h | 6 +++--- .../generated/signature_hellen_cypress.h | 6 +++--- .../controllers/generated/signature_kin.h | 6 +++--- .../controllers/generated/signature_mre_f4.h | 6 +++--- .../controllers/generated/signature_mre_f7.h | 6 +++--- .../generated/signature_prometheus_405.h | 6 +++--- .../generated/signature_prometheus_469.h | 6 +++--- .../generated/signature_proteus_f4.h | 6 +++--- .../generated/signature_proteus_f7.h | 6 +++--- firmware/tunerstudio/generated/cache.zip | Bin 975975 -> 976005 bytes firmware/tunerstudio/generated/rusefi.ini | 8 ++++---- .../generated/rusefi_frankenso_na6.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 ++++---- .../com/rusefi/config/generated/Fields.java | 7 +++---- java_console/rusefi.xml | 2 +- 33 files changed, 96 insertions(+), 97 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 bc579a40a9..85faa8e8ff 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 Dec 13 22:48:25 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon Dec 14 02:54:20 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3782,4 +3782,4 @@ struct persistent_config_s { typedef struct persistent_config_s persistent_config_s; // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Sun Dec 13 22:48:25 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon Dec 14 02:54:20 UTC 2020 diff --git a/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h index 501d6aac8a..1e4c627223 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 @@ -1224,8 +1224,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD hellen_cypress -#define SIGNATURE_DATE 2020.12.13 -#define SIGNATURE_HASH 2221834029 +#define SIGNATURE_DATE 2020.12.14 +#define SIGNATURE_HASH 1373263022 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1423,7 +1423,7 @@ #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_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", "trg51", "trg52", "INVALID" +#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", "INVALID" #define trigger_type_offset 524 #define trigger_unusedBit_4_10_offset 528 #define trigger_unusedBit_4_11_offset 528 @@ -1556,7 +1556,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2020.12.13.hellen_cypress.2221834029" +#define TS_SIGNATURE "rusEFI 2020.12.14.hellen_cypress.1373263022" #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 6cc665f861..08cfc9a20f 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 Dec 13 22:48:23 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Dec 14 02:54:18 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3782,4 +3782,4 @@ struct persistent_config_s { typedef struct persistent_config_s persistent_config_s; // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sun Dec 13 22:48:23 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Dec 14 02:54:18 UTC 2020 diff --git a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h index b44d2afbcf..d6ef713f8c 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -1224,8 +1224,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD kin -#define SIGNATURE_DATE 2020.12.13 -#define SIGNATURE_HASH 3581035991 +#define SIGNATURE_DATE 2020.12.14 +#define SIGNATURE_HASH 13004372 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1423,7 +1423,7 @@ #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_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", "trg51", "trg52", "INVALID" +#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", "INVALID" #define trigger_type_offset 524 #define trigger_unusedBit_4_10_offset 528 #define trigger_unusedBit_4_11_offset 528 @@ -1556,7 +1556,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator true #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2020.12.13.kin.3581035991" +#define TS_SIGNATURE "rusEFI 2020.12.14.kin.13004372" #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 81cbb24505..ac68e7a057 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 Dec 13 22:48:04 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Dec 14 02:54:04 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3782,4 +3782,4 @@ struct persistent_config_s { typedef struct persistent_config_s persistent_config_s; // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Dec 13 22:48:04 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Dec 14 02:54:04 UTC 2020 diff --git a/firmware/controllers/generated/fsio_enums_generated.def b/firmware/controllers/generated/fsio_enums_generated.def index 130fde8264..a73efa0c9e 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 Dec 13 22:48:04 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Dec 14 02:54:04 UTC 2020 // by class com.rusefi.output.FileFsioSettingsConsumer FSIO_SETTING_FANONTEMPERATURE = 1000, diff --git a/firmware/controllers/generated/fsio_getters.def b/firmware/controllers/generated/fsio_getters.def index 420d4f8ec5..524ca2ee33 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 Dec 13 22:48:04 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Dec 14 02:54:04 UTC 2020 // by class com.rusefi.output.FileFsioSettingsConsumer case FSIO_SETTING_FANONTEMPERATURE: diff --git a/firmware/controllers/generated/fsio_names.def b/firmware/controllers/generated/fsio_names.def index c3b74f90e8..a086ff0240 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 Dec 13 22:48:04 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Dec 14 02:54:04 UTC 2020 // by class com.rusefi.output.FileFsioSettingsConsumer static LENameOrdinalPair lefanOnTemperature(FSIO_SETTING_FANONTEMPERATURE, "cfg_fanOnTemperature"); diff --git a/firmware/controllers/generated/fsio_strings.def b/firmware/controllers/generated/fsio_strings.def index c44b28e2f0..688fcb2faf 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 Dec 13 22:48:04 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Dec 14 02:54:04 UTC 2020 // by class com.rusefi.output.FileFsioSettingsConsumer case FSIO_SETTING_FANONTEMPERATURE: diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index 3ead282fa3..0cb65b930c 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -1224,8 +1224,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD all -#define SIGNATURE_DATE 2020.12.13 -#define SIGNATURE_HASH 1302321646 +#define SIGNATURE_DATE 2020.12.14 +#define SIGNATURE_HASH 2553016941 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1423,7 +1423,7 @@ #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_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", "trg51", "trg52", "INVALID" +#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", "INVALID" #define trigger_type_offset 524 #define trigger_unusedBit_4_10_offset 528 #define trigger_unusedBit_4_11_offset 528 @@ -1556,7 +1556,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2020.12.13.all.1302321646" +#define TS_SIGNATURE "rusEFI 2020.12.14.all.2553016941" #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 47b6760001..edf0996d0e 100644 --- a/firmware/controllers/generated/signature_all.h +++ b/firmware/controllers/generated/signature_all.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD all -#define SIGNATURE_DATE 2020.12.13 -#define SIGNATURE_HASH 1302321646 -#define TS_SIGNATURE "rusEFI 2020.12.13.all.1302321646" +#define SIGNATURE_DATE 2020.12.14 +#define SIGNATURE_HASH 2553016941 +#define TS_SIGNATURE "rusEFI 2020.12.14.all.2553016941" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 4ad493b41d..6401ac5436 100644 --- a/firmware/controllers/generated/signature_frankenso_na6.h +++ b/firmware/controllers/generated/signature_frankenso_na6.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD frankenso_na6 -#define SIGNATURE_DATE 2020.12.13 -#define SIGNATURE_HASH 3689900053 -#define TS_SIGNATURE "rusEFI 2020.12.13.frankenso_na6.3689900053" +#define SIGNATURE_DATE 2020.12.14 +#define SIGNATURE_HASH 240862102 +#define TS_SIGNATURE "rusEFI 2020.12.14.frankenso_na6.240862102" diff --git a/firmware/controllers/generated/signature_hellen_cypress.h b/firmware/controllers/generated/signature_hellen_cypress.h index 16fbd5f512..2a9e4f9aa0 100644 --- a/firmware/controllers/generated/signature_hellen_cypress.h +++ b/firmware/controllers/generated/signature_hellen_cypress.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD hellen_cypress -#define SIGNATURE_DATE 2020.12.13 -#define SIGNATURE_HASH 2221834029 -#define TS_SIGNATURE "rusEFI 2020.12.13.hellen_cypress.2221834029" +#define SIGNATURE_DATE 2020.12.14 +#define SIGNATURE_HASH 1373263022 +#define TS_SIGNATURE "rusEFI 2020.12.14.hellen_cypress.1373263022" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 452dcacaa3..3182982975 100644 --- a/firmware/controllers/generated/signature_kin.h +++ b/firmware/controllers/generated/signature_kin.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD kin -#define SIGNATURE_DATE 2020.12.13 -#define SIGNATURE_HASH 3581035991 -#define TS_SIGNATURE "rusEFI 2020.12.13.kin.3581035991" +#define SIGNATURE_DATE 2020.12.14 +#define SIGNATURE_HASH 13004372 +#define TS_SIGNATURE "rusEFI 2020.12.14.kin.13004372" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 732af4e57a..e180bbf20a 100644 --- a/firmware/controllers/generated/signature_mre_f4.h +++ b/firmware/controllers/generated/signature_mre_f4.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD mre_f4 -#define SIGNATURE_DATE 2020.12.13 -#define SIGNATURE_HASH 1515128727 -#define TS_SIGNATURE "rusEFI 2020.12.13.mre_f4.1515128727" +#define SIGNATURE_DATE 2020.12.14 +#define SIGNATURE_HASH 2415602708 +#define TS_SIGNATURE "rusEFI 2020.12.14.mre_f4.2415602708" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index f229cba7c2..7474c02b71 100644 --- a/firmware/controllers/generated/signature_mre_f7.h +++ b/firmware/controllers/generated/signature_mre_f7.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD mre_f7 -#define SIGNATURE_DATE 2020.12.13 -#define SIGNATURE_HASH 1515128727 -#define TS_SIGNATURE "rusEFI 2020.12.13.mre_f7.1515128727" +#define SIGNATURE_DATE 2020.12.14 +#define SIGNATURE_HASH 2415602708 +#define TS_SIGNATURE "rusEFI 2020.12.14.mre_f7.2415602708" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 60787a5247..f85d51729b 100644 --- a/firmware/controllers/generated/signature_prometheus_405.h +++ b/firmware/controllers/generated/signature_prometheus_405.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD prometheus_405 -#define SIGNATURE_DATE 2020.12.13 -#define SIGNATURE_HASH 256368575 -#define TS_SIGNATURE "rusEFI 2020.12.13.prometheus_405.256368575" +#define SIGNATURE_DATE 2020.12.14 +#define SIGNATURE_HASH 3673420860 +#define TS_SIGNATURE "rusEFI 2020.12.14.prometheus_405.3673420860" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index b2b0f942ae..05f0882087 100644 --- a/firmware/controllers/generated/signature_prometheus_469.h +++ b/firmware/controllers/generated/signature_prometheus_469.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD prometheus_469 -#define SIGNATURE_DATE 2020.12.13 -#define SIGNATURE_HASH 256368575 -#define TS_SIGNATURE "rusEFI 2020.12.13.prometheus_469.256368575" +#define SIGNATURE_DATE 2020.12.14 +#define SIGNATURE_HASH 3673420860 +#define TS_SIGNATURE "rusEFI 2020.12.14.prometheus_469.3673420860" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 1b2d87bb48..3f74a6171c 100644 --- a/firmware/controllers/generated/signature_proteus_f4.h +++ b/firmware/controllers/generated/signature_proteus_f4.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD proteus_f4 -#define SIGNATURE_DATE 2020.12.13 -#define SIGNATURE_HASH 2218103600 -#define TS_SIGNATURE "rusEFI 2020.12.13.proteus_f4.2218103600" +#define SIGNATURE_DATE 2020.12.14 +#define SIGNATURE_HASH 1367455923 +#define TS_SIGNATURE "rusEFI 2020.12.14.proteus_f4.1367455923" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index e17bf5824a..94f7f1a957 100644 --- a/firmware/controllers/generated/signature_proteus_f7.h +++ b/firmware/controllers/generated/signature_proteus_f7.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD proteus_f7 -#define SIGNATURE_DATE 2020.12.13 -#define SIGNATURE_HASH 2218103600 -#define TS_SIGNATURE "rusEFI 2020.12.13.proteus_f7.2218103600" +#define SIGNATURE_DATE 2020.12.14 +#define SIGNATURE_HASH 1367455923 +#define TS_SIGNATURE "rusEFI 2020.12.14.proteus_f7.1367455923" diff --git a/firmware/tunerstudio/generated/cache.zip b/firmware/tunerstudio/generated/cache.zip index 9d4eefcf2c69a3e24a08c11802d900b787231e25..6dfe55cc9ecdba9216fad453122d965b34fc3116 100644 GIT binary patch delta 175187 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 z

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 delta 175166 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 T!lWqW@^|I^it=`WCja_BdYt;Z diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index cc1b71f59e..3fab16c8d3 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 2020.12.13.all.1302321646" + signature = "rusEFI 2020.12.14.all.2553016941" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.12.13.all.1302321646" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.12.14.all.2553016941" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,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 Dec 13 22:48:04 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Dec 14 02:54:04 UTC 2020 pageSize = 20000 page = 1 @@ -193,7 +193,7 @@ page = 1 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 ; size 4 - 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", "trg51", "trg52", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "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", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "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 323bccb2db..3f0e808669 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 2020.12.13.frankenso_na6.3689900053" + signature = "rusEFI 2020.12.14.frankenso_na6.240862102" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.12.13.frankenso_na6.3689900053" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.12.14.frankenso_na6.240862102" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,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 Dec 13 22:48:09 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Dec 14 02:54:09 UTC 2020 pageSize = 20000 page = 1 @@ -193,7 +193,7 @@ page = 1 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 ; size 4 - 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", "trg51", "trg52", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "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", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "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 5293d8ad2f..a1864b286c 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 2020.12.13.hellen_cypress.2221834029" + signature = "rusEFI 2020.12.14.hellen_cypress.1373263022" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.12.13.hellen_cypress.2221834029" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.12.14.hellen_cypress.1373263022" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,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 Dec 13 22:48:25 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon Dec 14 02:54:20 UTC 2020 pageSize = 20000 page = 1 @@ -193,7 +193,7 @@ page = 1 tps2_1AdcChannel = bits, U08, 515, [0:5] "Disabled", "P10 (B_0)", "P11 (B_1)", "P12 (B_2)", "P13 (B_3)", "P14 (B_4)", "P15 (B_5)", "P16 (B_6)", "P17 (B_7)", "P18 (B_8)", "P19 (B_9)", "P1A (B_10)", "P1B (B_11)", "P1C (B_12)", "P1D (B_13)", "P1E (B_14)", "P1F (B_15)", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "P2A (C_10)", "P29 (C_9)", "P28 (C_8)", "P27 (C_7)", "P25 (C_5)", "P24 (C_4)", "P23 (C_3)", "P22 (C_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" idle_derivativeFilterLoss = scalar, F32, 516, "x", 1.0, 0.0, -1000000, 1000000, 4 sensorChartFrequency = scalar, S32, 520, "index", 1.0, 0, 0, 300, 0 ; size 4 - 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", "trg51", "trg52", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "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", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "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 63af4a2d0b..5b5a68ef41 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 2020.12.13.kin.3581035991" + signature = "rusEFI 2020.12.14.kin.13004372" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.12.13.kin.3581035991" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.12.14.kin.13004372" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,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 Dec 13 22:48:23 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Dec 14 02:54:18 UTC 2020 pageSize = 20000 page = 1 @@ -193,7 +193,7 @@ page = 1 tps2_1AdcChannel = bits, U08, 515, [0:5] "Disabled", "PA2", "PA3", "INVALID", "PD3", "INVALID", "INVALID", "INVALID", "PB12", "PB13", "INVALID", "PE2", "INVALID", "PC14", "PC15", "PC16", "PC17", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "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 ; size 4 - 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", "trg51", "trg52", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "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", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "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 7de1f1d702..22b2e4d466 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 2020.12.13.mre_f4.1515128727" + signature = "rusEFI 2020.12.14.mre_f4.2415602708" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.12.13.mre_f4.1515128727" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.12.14.mre_f4.2415602708" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,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 Dec 13 22:48:08 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Dec 14 02:54:08 UTC 2020 pageSize = 20000 page = 1 @@ -193,7 +193,7 @@ page = 1 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 ; size 4 - 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", "trg51", "trg52", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "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", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "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 62e3a4d1af..0dd57cf81d 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 2020.12.13.mre_f7.1515128727" + signature = "rusEFI 2020.12.14.mre_f7.2415602708" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.12.13.mre_f7.1515128727" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.12.14.mre_f7.2415602708" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,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 Dec 13 22:48:06 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Dec 14 02:54:06 UTC 2020 pageSize = 20000 page = 1 @@ -193,7 +193,7 @@ page = 1 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 ; size 4 - 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", "trg51", "trg52", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "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", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "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 d8d322d1c6..78853954ec 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 2020.12.13.prometheus_405.256368575" + signature = "rusEFI 2020.12.14.prometheus_405.3673420860" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.12.13.prometheus_405.256368575" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.12.14.prometheus_405.3673420860" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,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 Dec 13 22:48:15 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Dec 14 02:54:13 UTC 2020 pageSize = 20000 page = 1 @@ -193,7 +193,7 @@ page = 1 tps2_1AdcChannel = bits, U08, 515, [0:5] "NONE","Analog 3O","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","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 ; size 4 - 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", "trg51", "trg52", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "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", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "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 944dddd342..3e538ca4c0 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 2020.12.13.prometheus_469.256368575" + signature = "rusEFI 2020.12.14.prometheus_469.3673420860" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.12.13.prometheus_469.256368575" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.12.14.prometheus_469.3673420860" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,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 Dec 13 22:48:11 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Dec 14 02:54:11 UTC 2020 pageSize = 20000 page = 1 @@ -193,7 +193,7 @@ page = 1 tps2_1AdcChannel = bits, U08, 515, [0:5] "NONE","Analog 3O","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","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 ; size 4 - 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", "trg51", "trg52", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "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", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "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 2be45818f9..60ec083bbe 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 2020.12.13.proteus_f4.2218103600" + signature = "rusEFI 2020.12.14.proteus_f4.1367455923" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.12.13.proteus_f4.2218103600" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.12.14.proteus_f4.1367455923" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,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 Dec 13 22:48:22 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Dec 14 02:54:16 UTC 2020 pageSize = 20000 page = 1 @@ -193,7 +193,7 @@ page = 1 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 ; size 4 - 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", "trg51", "trg52", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "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", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "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 520a501c4d..77051a1838 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 2020.12.13.proteus_f7.2218103600" + signature = "rusEFI 2020.12.14.proteus_f7.1367455923" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.12.13.proteus_f7.2218103600" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.12.14.proteus_f7.1367455923" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,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 Dec 13 22:48:20 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Dec 14 02:54:15 UTC 2020 pageSize = 20000 page = 1 @@ -193,7 +193,7 @@ page = 1 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 ; size 4 - 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", "trg51", "trg52", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "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", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "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 633db22440..947c70280f 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 Dec 13 22:48:04 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Dec 14 02:54:04 UTC 2020 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -1179,7 +1179,6 @@ public class Fields { public static final int servoOutputPins8_offset = 3147; public static final int showHumanReadableWarning_offset = 976; public static final int showSdCardWarning_offset = 76; - public static final int SIGNATURE_HASH = 1302321646; public static final int silentTriggerError_offset = 1464; public static final int slowAdcAlpha_offset = 2088; public static final int sparkDwellRpmBins_offset = 332; @@ -1460,7 +1459,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 2020.12.13.all.1302321646"; + public static final String TS_SIGNATURE = "rusEFI 2020.12.14.all.2553016941"; 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; @@ -1751,7 +1750,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", "trg51", "trg52", "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", "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 0d30c30407..ec7d2867e4 100644 --- a/java_console/rusefi.xml +++ b/java_console/rusefi.xml @@ -1,6 +1,6 @@ - +