From 07abef847326b43f388683f2c164a842527862ae Mon Sep 17 00:00:00 2001 From: GitHub build-firmware Action Date: Tue, 5 Jan 2021 04:52:50 +0000 Subject: [PATCH] Auto-generated configs and docs --- ...ngine_configuration_generated_structures.h | 4 ++-- .../controllers/algo/rusefi_generated.h | 10 +++++----- ...ngine_configuration_generated_structures.h | 4 ++-- .../controllers/algo/rusefi_generated.h | 10 +++++----- ...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 | 10 +++++----- .../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 985155 -> 985285 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 | 6 +++--- java_console/rusefi.xml | 2 +- 33 files changed, 99 insertions(+), 99 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 fdc690f509..06f63643bf 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 Jan 03 18:07:46 UTC 2021 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Tue Jan 05 04:52:27 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3780,4 +3780,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 Jan 03 18:07:46 UTC 2021 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Tue Jan 05 04:52:27 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 5c2de97855..9a73391fa3 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 @@ -1240,8 +1240,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD hellen_cypress -#define SIGNATURE_DATE 2021.01.03 -#define SIGNATURE_HASH 420118622 +#define SIGNATURE_DATE 2021.01.05 +#define SIGNATURE_HASH 1694693775 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1438,8 +1438,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_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", "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_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", "trg54", "trg55", "INVALID" #define trigger_type_offset 524 #define trigger_unusedBit_4_10_offset 528 #define trigger_unusedBit_4_11_offset 528 @@ -1572,7 +1572,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.01.03.hellen_cypress.420118622" +#define TS_SIGNATURE "rusEFI 2021.01.05.hellen_cypress.1694693775" #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 fb42a1a648..25135205ac 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 Jan 03 18:07:44 UTC 2021 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Tue Jan 05 04:52:25 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3780,4 +3780,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 Jan 03 18:07:44 UTC 2021 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Tue Jan 05 04:52:25 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 3c563fcb7f..801f88dfe0 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -1240,8 +1240,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD kin -#define SIGNATURE_DATE 2021.01.03 -#define SIGNATURE_HASH 1209449124 +#define SIGNATURE_DATE 2021.01.05 +#define SIGNATURE_HASH 874431349 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1438,8 +1438,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_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", "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_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", "trg54", "trg55", "INVALID" #define trigger_type_offset 524 #define trigger_unusedBit_4_10_offset 528 #define trigger_unusedBit_4_11_offset 528 @@ -1572,7 +1572,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator true #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.01.03.kin.1209449124" +#define TS_SIGNATURE "rusEFI 2021.01.05.kin.874431349" #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 325afef99a..e579f4b710 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 Jan 03 18:07:20 UTC 2021 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jan 05 04:52:02 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3780,4 +3780,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 Jan 03 18:07:20 UTC 2021 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jan 05 04:52:02 UTC 2021 diff --git a/firmware/controllers/generated/fsio_enums_generated.def b/firmware/controllers/generated/fsio_enums_generated.def index e52c85767f..6c5ac341dc 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 Jan 03 18:07:20 UTC 2021 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jan 05 04:52:02 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 fa477e342e..ec20ea4d38 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 Jan 03 18:07:20 UTC 2021 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jan 05 04:52:02 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 519c61416a..16b23d950b 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 Jan 03 18:07:20 UTC 2021 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jan 05 04:52:02 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 4807ae1031..3d11068116 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 Jan 03 18:07:20 UTC 2021 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jan 05 04:52:02 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 2687defa5d..1e025146e8 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -1240,8 +1240,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD all -#define SIGNATURE_DATE 2021.01.03 -#define SIGNATURE_HASH 3506120349 +#define SIGNATURE_DATE 2021.01.05 +#define SIGNATURE_HASH 2901630796 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1438,8 +1438,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_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", "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_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", "trg54", "trg55", "INVALID" #define trigger_type_offset 524 #define trigger_unusedBit_4_10_offset 528 #define trigger_unusedBit_4_11_offset 528 @@ -1572,7 +1572,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.01.03.all.3506120349" +#define TS_SIGNATURE "rusEFI 2021.01.05.all.2901630796" #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 54203a162c..d54fb655c3 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 2021.01.04 -#define SIGNATURE_HASH 3169691736 -#define TS_SIGNATURE "rusEFI 2021.01.04.all.3169691736" +#define SIGNATURE_DATE 2021.01.05 +#define SIGNATURE_HASH 2901630796 +#define TS_SIGNATURE "rusEFI 2021.01.05.all.2901630796" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 06a4f49ea5..f69e28833a 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 2021.01.04 -#define SIGNATURE_HASH 714938787 -#define TS_SIGNATURE "rusEFI 2021.01.04.frankenso_na6.714938787" +#define SIGNATURE_DATE 2021.01.05 +#define SIGNATURE_HASH 981724855 +#define TS_SIGNATURE "rusEFI 2021.01.05.frankenso_na6.981724855" diff --git a/firmware/controllers/generated/signature_hellen_cypress.h b/firmware/controllers/generated/signature_hellen_cypress.h index 928cb73893..f77849f236 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 2021.01.04 -#define SIGNATURE_HASH 1964773019 -#define TS_SIGNATURE "rusEFI 2021.01.04.hellen_cypress.1964773019" +#define SIGNATURE_DATE 2021.01.05 +#define SIGNATURE_HASH 1694693775 +#define TS_SIGNATURE "rusEFI 2021.01.05.hellen_cypress.1694693775" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index af8523a38b..46bc51c4ba 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 2021.01.04 -#define SIGNATURE_HASH 603993185 -#define TS_SIGNATURE "rusEFI 2021.01.04.kin.603993185" +#define SIGNATURE_DATE 2021.01.05 +#define SIGNATURE_HASH 874431349 +#define TS_SIGNATURE "rusEFI 2021.01.05.kin.874431349" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 5290c2240f..7781b2a449 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 2021.01.04 -#define SIGNATURE_HASH 2872931873 -#define TS_SIGNATURE "rusEFI 2021.01.04.mre_f4.2872931873" +#define SIGNATURE_DATE 2021.01.05 +#define SIGNATURE_HASH 3139666229 +#define TS_SIGNATURE "rusEFI 2021.01.05.mre_f4.3139666229" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index b541dc1528..3c9919568b 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 2021.01.04 -#define SIGNATURE_HASH 2872931873 -#define TS_SIGNATURE "rusEFI 2021.01.04.mre_f7.2872931873" +#define SIGNATURE_DATE 2021.01.05 +#define SIGNATURE_HASH 3139666229 +#define TS_SIGNATURE "rusEFI 2021.01.05.mre_f7.3139666229" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index b2a1b8efb5..0c8d3f68a4 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 2021.01.04 -#define SIGNATURE_HASH 4264930825 -#define TS_SIGNATURE "rusEFI 2021.01.04.prometheus_405.4264930825" +#define SIGNATURE_DATE 2021.01.05 +#define SIGNATURE_HASH 3995818269 +#define TS_SIGNATURE "rusEFI 2021.01.05.prometheus_405.3995818269" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 87025d0ea5..f6c0f5fdfa 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 2021.01.04 -#define SIGNATURE_HASH 4264930825 -#define TS_SIGNATURE "rusEFI 2021.01.04.prometheus_469.4264930825" +#define SIGNATURE_DATE 2021.01.05 +#define SIGNATURE_HASH 3995818269 +#define TS_SIGNATURE "rusEFI 2021.01.05.prometheus_469.3995818269" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index f6941c572c..06322f48b6 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 2021.01.04 -#define SIGNATURE_HASH 1967645318 -#define TS_SIGNATURE "rusEFI 2021.01.04.proteus_f4.1967645318" +#define SIGNATURE_DATE 2021.01.05 +#define SIGNATURE_HASH 1700337042 +#define TS_SIGNATURE "rusEFI 2021.01.05.proteus_f4.1700337042" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index c4bf4fd433..b4af5dc36e 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 2021.01.04 -#define SIGNATURE_HASH 1967645318 -#define TS_SIGNATURE "rusEFI 2021.01.04.proteus_f7.1967645318" +#define SIGNATURE_DATE 2021.01.05 +#define SIGNATURE_HASH 1700337042 +#define TS_SIGNATURE "rusEFI 2021.01.05.proteus_f7.1700337042" diff --git a/firmware/tunerstudio/generated/cache.zip b/firmware/tunerstudio/generated/cache.zip index 91f5535717dccb37828c4910ad27e80b1014525f..2b1aaf200d04804e2e4607ebf79b50eebcf54c30 100644 GIT binary patch delta 148142 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 diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index 9b22ad25e6..d5418472f7 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.01.04.all.3169691736" + signature = "rusEFI 2021.01.05.all.2901630796" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.01.04.all.3169691736" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.01.05.all.2901630796" ; 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 Mon Jan 04 04:53:43 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jan 05 04:52:02 UTC 2021 pageSize = 20000 page = 1 @@ -196,7 +196,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", "Subaru 7 without 6", "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", "TriTach", "trg54", "trg55", "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 77798eaac9..1719d55b36 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.01.04.frankenso_na6.714938787" + signature = "rusEFI 2021.01.05.frankenso_na6.981724855" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.01.04.frankenso_na6.714938787" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.01.05.frankenso_na6.981724855" ; 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 Mon Jan 04 04:53:48 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jan 05 04:52:08 UTC 2021 pageSize = 20000 page = 1 @@ -196,7 +196,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", "Subaru 7 without 6", "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", "TriTach", "trg54", "trg55", "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 fa05002f84..0435b694a3 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.01.04.hellen_cypress.1964773019" + signature = "rusEFI 2021.01.05.hellen_cypress.1694693775" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.01.04.hellen_cypress.1964773019" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.01.05.hellen_cypress.1694693775" ; 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 Mon Jan 04 04:54:06 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Tue Jan 05 04:52:27 UTC 2021 pageSize = 20000 page = 1 @@ -196,7 +196,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", "Subaru 7 without 6", "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", "TriTach", "trg54", "trg55", "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 a34a407387..d1224dd3f0 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.01.04.kin.603993185" + signature = "rusEFI 2021.01.05.kin.874431349" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.01.04.kin.603993185" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.01.05.kin.874431349" ; 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 Mon Jan 04 04:54:04 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Tue Jan 05 04:52:25 UTC 2021 pageSize = 20000 page = 1 @@ -196,7 +196,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", "Subaru 7 without 6", "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", "TriTach", "trg54", "trg55", "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 d7699a6686..a4889711bd 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.01.04.mre_f4.2872931873" + signature = "rusEFI 2021.01.05.mre_f4.3139666229" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.01.04.mre_f4.2872931873" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.01.05.mre_f4.3139666229" ; 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 Mon Jan 04 04:53:46 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jan 05 04:52:06 UTC 2021 pageSize = 20000 page = 1 @@ -196,7 +196,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", "Subaru 7 without 6", "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", "TriTach", "trg54", "trg55", "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 df57c3a02d..d4f22a018d 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.01.04.mre_f7.2872931873" + signature = "rusEFI 2021.01.05.mre_f7.3139666229" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.01.04.mre_f7.2872931873" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.01.05.mre_f7.3139666229" ; 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 Mon Jan 04 04:53:44 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jan 05 04:52:04 UTC 2021 pageSize = 20000 page = 1 @@ -196,7 +196,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", "Subaru 7 without 6", "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", "TriTach", "trg54", "trg55", "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 4e111dafeb..f0a0407ef7 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.01.04.prometheus_405.4264930825" + signature = "rusEFI 2021.01.05.prometheus_405.3995818269" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.01.04.prometheus_405.4264930825" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.01.05.prometheus_405.3995818269" ; 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 Mon Jan 04 04:53:52 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jan 05 04:52:12 UTC 2021 pageSize = 20000 page = 1 @@ -196,7 +196,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", "Subaru 7 without 6", "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", "TriTach", "trg54", "trg55", "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 f55744bb4a..c80e426c1d 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.01.04.prometheus_469.4264930825" + signature = "rusEFI 2021.01.05.prometheus_469.3995818269" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.01.04.prometheus_469.4264930825" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.01.05.prometheus_469.3995818269" ; 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 Mon Jan 04 04:53:50 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jan 05 04:52:10 UTC 2021 pageSize = 20000 page = 1 @@ -196,7 +196,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", "Subaru 7 without 6", "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", "TriTach", "trg54", "trg55", "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 25f2cc34b6..e8d6ba6231 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.01.04.proteus_f4.1967645318" + signature = "rusEFI 2021.01.05.proteus_f4.1700337042" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.01.04.proteus_f4.1967645318" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.01.05.proteus_f4.1700337042" ; 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 Mon Jan 04 04:53:58 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jan 05 04:52:17 UTC 2021 pageSize = 20000 page = 1 @@ -196,7 +196,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", "Subaru 7 without 6", "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", "TriTach", "trg54", "trg55", "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 408a7d0521..5aac39ea5e 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.01.04.proteus_f7.1967645318" + signature = "rusEFI 2021.01.05.proteus_f7.1700337042" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.01.04.proteus_f7.1967645318" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.01.05.proteus_f7.1700337042" ; 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 Mon Jan 04 04:53:54 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jan 05 04:52:14 UTC 2021 pageSize = 20000 page = 1 @@ -196,7 +196,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", "Subaru 7 without 6", "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", "TriTach", "trg54", "trg55", "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 44d241e41c..a757e407e5 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 Jan 03 18:07:20 UTC 2021 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jan 05 04:52:02 UTC 2021 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -1475,7 +1475,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.01.03.all.3506120349"; + public static final String TS_SIGNATURE = "rusEFI 2021.01.05.all.2901630796"; 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; @@ -1765,7 +1765,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", "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", "trg54", "trg55", "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 4cf0d2c156..1aa2986f52 100644 --- a/java_console/rusefi.xml +++ b/java_console/rusefi.xml @@ -1,6 +1,6 @@ - +