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 724d6c2760..a2ae28be13 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 @@ -1820,7 +1820,7 @@ #define show_test_presets true #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 -#define SIGNATURE_HASH 1067648504 +#define SIGNATURE_HASH 3170672277 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -2338,7 +2338,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.12.07.hellen_cypress.1067648504" +#define TS_SIGNATURE "rusEFI 2021.12.07.hellen_cypress.3170672277" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' @@ -2522,8 +2522,8 @@ #define vssFilterReciprocal_offset 19596 #define vssGearRatio_offset 616 #define vssToothCount_offset 618 -#define vvt_mode_e_auto_enum "VVT_INACTIVE", "VVT_SECOND_HALF", "VVT_2JZ", "VVT_MIATA_NB2", "VVT_FIRST_HALF", "VVT_BOSCH_QUICK_START", "VVT_TOYOTA_4_1", "VVT_FORD_ST170", "VVT_BARRA_3_PLUS_1", "VVT_NISSAN_VQ", "VVT_HONDA_K", "VVT_NISSAN_MR", "VVT_MAP_V_TWIN" -#define vvt_mode_e_enum "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "vvt13", "vvt14", "vvt15" +#define vvt_mode_e_auto_enum "VVT_INACTIVE", "VVT_SECOND_HALF", "VVT_2JZ", "VVT_MIATA_NB2", "VVT_FIRST_HALF", "VVT_BOSCH_QUICK_START", "VVT_TOYOTA_4_1", "VVT_FORD_ST170", "VVT_BARRA_3_PLUS_1", "VVT_NISSAN_VQ", "VVT_HONDA_K", "VVT_NISSAN_MR", "VVT_MAP_V_TWIN", "VVT_MAP_V_TWIN_ANOTHER" +#define vvt_mode_e_enum "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "VTwin by MAP", "vvt14", "vvt15" #define vvt_mode_e_VVT_2JZ 2 #define vvt_mode_e_VVT_BARRA_3_PLUS_1 8 #define vvt_mode_e_VVT_BOSCH_QUICK_START 5 @@ -2532,6 +2532,7 @@ #define vvt_mode_e_VVT_HONDA_K 10 #define vvt_mode_e_VVT_INACTIVE 0 #define vvt_mode_e_VVT_MAP_V_TWIN 12 +#define vvt_mode_e_VVT_MAP_V_TWIN_ANOTHER 13 #define vvt_mode_e_VVT_MIATA_NB2 3 #define vvt_mode_e_VVT_NISSAN_MR 11 #define vvt_mode_e_VVT_NISSAN_VQ 9 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 c12b8eb024..80fe128372 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -1805,7 +1805,7 @@ #define show_test_presets true #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 -#define SIGNATURE_HASH 3221670148 +#define SIGNATURE_HASH 1129927273 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -2323,7 +2323,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator true #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.12.07.kin.3221670148" +#define TS_SIGNATURE "rusEFI 2021.12.07.kin.1129927273" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' @@ -2507,8 +2507,8 @@ #define vssFilterReciprocal_offset 19568 #define vssGearRatio_offset 616 #define vssToothCount_offset 618 -#define vvt_mode_e_auto_enum "VVT_INACTIVE", "VVT_SECOND_HALF", "VVT_2JZ", "VVT_MIATA_NB2", "VVT_FIRST_HALF", "VVT_BOSCH_QUICK_START", "VVT_TOYOTA_4_1", "VVT_FORD_ST170", "VVT_BARRA_3_PLUS_1", "VVT_NISSAN_VQ", "VVT_HONDA_K", "VVT_NISSAN_MR", "VVT_MAP_V_TWIN" -#define vvt_mode_e_enum "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "vvt13", "vvt14", "vvt15" +#define vvt_mode_e_auto_enum "VVT_INACTIVE", "VVT_SECOND_HALF", "VVT_2JZ", "VVT_MIATA_NB2", "VVT_FIRST_HALF", "VVT_BOSCH_QUICK_START", "VVT_TOYOTA_4_1", "VVT_FORD_ST170", "VVT_BARRA_3_PLUS_1", "VVT_NISSAN_VQ", "VVT_HONDA_K", "VVT_NISSAN_MR", "VVT_MAP_V_TWIN", "VVT_MAP_V_TWIN_ANOTHER" +#define vvt_mode_e_enum "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "VTwin by MAP", "vvt14", "vvt15" #define vvt_mode_e_VVT_2JZ 2 #define vvt_mode_e_VVT_BARRA_3_PLUS_1 8 #define vvt_mode_e_VVT_BOSCH_QUICK_START 5 @@ -2517,6 +2517,7 @@ #define vvt_mode_e_VVT_HONDA_K 10 #define vvt_mode_e_VVT_INACTIVE 0 #define vvt_mode_e_VVT_MAP_V_TWIN 12 +#define vvt_mode_e_VVT_MAP_V_TWIN_ANOTHER 13 #define vvt_mode_e_VVT_MIATA_NB2 3 #define vvt_mode_e_VVT_NISSAN_MR 11 #define vvt_mode_e_VVT_NISSAN_VQ 9 diff --git a/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h index cdce929dc6..72023b6fe1 100644 --- a/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h @@ -1833,7 +1833,7 @@ #define show_test_presets false #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 -#define SIGNATURE_HASH 3337417748 +#define SIGNATURE_HASH 1169387385 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -2351,7 +2351,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port false -#define TS_SIGNATURE "rusEFI 2021.12.07.subaru_eg33_f7.3337417748" +#define TS_SIGNATURE "rusEFI 2021.12.07.subaru_eg33_f7.1169387385" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' @@ -2535,8 +2535,8 @@ #define vssFilterReciprocal_offset 19596 #define vssGearRatio_offset 616 #define vssToothCount_offset 618 -#define vvt_mode_e_auto_enum "VVT_INACTIVE", "VVT_SECOND_HALF", "VVT_2JZ", "VVT_MIATA_NB2", "VVT_FIRST_HALF", "VVT_BOSCH_QUICK_START", "VVT_TOYOTA_4_1", "VVT_FORD_ST170", "VVT_BARRA_3_PLUS_1", "VVT_NISSAN_VQ", "VVT_HONDA_K", "VVT_NISSAN_MR", "VVT_MAP_V_TWIN" -#define vvt_mode_e_enum "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "vvt13", "vvt14", "vvt15" +#define vvt_mode_e_auto_enum "VVT_INACTIVE", "VVT_SECOND_HALF", "VVT_2JZ", "VVT_MIATA_NB2", "VVT_FIRST_HALF", "VVT_BOSCH_QUICK_START", "VVT_TOYOTA_4_1", "VVT_FORD_ST170", "VVT_BARRA_3_PLUS_1", "VVT_NISSAN_VQ", "VVT_HONDA_K", "VVT_NISSAN_MR", "VVT_MAP_V_TWIN", "VVT_MAP_V_TWIN_ANOTHER" +#define vvt_mode_e_enum "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "VTwin by MAP", "vvt14", "vvt15" #define vvt_mode_e_VVT_2JZ 2 #define vvt_mode_e_VVT_BARRA_3_PLUS_1 8 #define vvt_mode_e_VVT_BOSCH_QUICK_START 5 @@ -2545,6 +2545,7 @@ #define vvt_mode_e_VVT_HONDA_K 10 #define vvt_mode_e_VVT_INACTIVE 0 #define vvt_mode_e_VVT_MAP_V_TWIN 12 +#define vvt_mode_e_VVT_MAP_V_TWIN_ANOTHER 13 #define vvt_mode_e_VVT_MIATA_NB2 3 #define vvt_mode_e_VVT_NISSAN_MR 11 #define vvt_mode_e_VVT_NISSAN_VQ 9 diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index b3656bf0d7..6c3bb51731 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -1820,7 +1820,7 @@ #define show_test_presets true #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 -#define SIGNATURE_HASH 89580100 +#define SIGNATURE_HASH 2248767785 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -2338,7 +2338,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.12.07.all.89580100" +#define TS_SIGNATURE "rusEFI 2021.12.07.all.2248767785" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' @@ -2522,8 +2522,8 @@ #define vssFilterReciprocal_offset 19596 #define vssGearRatio_offset 616 #define vssToothCount_offset 618 -#define vvt_mode_e_auto_enum "VVT_INACTIVE", "VVT_SECOND_HALF", "VVT_2JZ", "VVT_MIATA_NB2", "VVT_FIRST_HALF", "VVT_BOSCH_QUICK_START", "VVT_TOYOTA_4_1", "VVT_FORD_ST170", "VVT_BARRA_3_PLUS_1", "VVT_NISSAN_VQ", "VVT_HONDA_K", "VVT_NISSAN_MR", "VVT_MAP_V_TWIN" -#define vvt_mode_e_enum "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "vvt13", "vvt14", "vvt15" +#define vvt_mode_e_auto_enum "VVT_INACTIVE", "VVT_SECOND_HALF", "VVT_2JZ", "VVT_MIATA_NB2", "VVT_FIRST_HALF", "VVT_BOSCH_QUICK_START", "VVT_TOYOTA_4_1", "VVT_FORD_ST170", "VVT_BARRA_3_PLUS_1", "VVT_NISSAN_VQ", "VVT_HONDA_K", "VVT_NISSAN_MR", "VVT_MAP_V_TWIN", "VVT_MAP_V_TWIN_ANOTHER" +#define vvt_mode_e_enum "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "VTwin by MAP", "vvt14", "vvt15" #define vvt_mode_e_VVT_2JZ 2 #define vvt_mode_e_VVT_BARRA_3_PLUS_1 8 #define vvt_mode_e_VVT_BOSCH_QUICK_START 5 @@ -2532,6 +2532,7 @@ #define vvt_mode_e_VVT_HONDA_K 10 #define vvt_mode_e_VVT_INACTIVE 0 #define vvt_mode_e_VVT_MAP_V_TWIN 12 +#define vvt_mode_e_VVT_MAP_V_TWIN_ANOTHER 13 #define vvt_mode_e_VVT_MIATA_NB2 3 #define vvt_mode_e_VVT_NISSAN_MR 11 #define vvt_mode_e_VVT_NISSAN_VQ 9 diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index 3503bab765..a5c17e91f0 100644 --- a/firmware/controllers/generated/signature_all.h +++ b/firmware/controllers/generated/signature_all.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 89580100 -#define TS_SIGNATURE "rusEFI 2021.12.07.all.89580100" +#define SIGNATURE_HASH 2248767785 +#define TS_SIGNATURE "rusEFI 2021.12.07.all.2248767785" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index f625c171cb..e924fdb772 100644 --- a/firmware/controllers/generated/signature_atlas.h +++ b/firmware/controllers/generated/signature_atlas.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 429660003 -#define TS_SIGNATURE "rusEFI 2021.12.07.atlas.429660003" +#define SIGNATURE_HASH 2596506638 +#define TS_SIGNATURE "rusEFI 2021.12.07.atlas.2596506638" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index 587ce28385..9f7a6889db 100644 --- a/firmware/controllers/generated/signature_f429-discovery.h +++ b/firmware/controllers/generated/signature_f429-discovery.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 89580100 -#define TS_SIGNATURE "rusEFI 2021.12.07.f429-discovery.89580100" +#define SIGNATURE_HASH 2248767785 +#define TS_SIGNATURE "rusEFI 2021.12.07.f429-discovery.2248767785" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index a866614426..63b31851c4 100644 --- a/firmware/controllers/generated/signature_frankenso_na6.h +++ b/firmware/controllers/generated/signature_frankenso_na6.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 2137307053 -#define TS_SIGNATURE "rusEFI 2021.12.07.frankenso_na6.2137307053" +#define SIGNATURE_HASH 4231736512 +#define TS_SIGNATURE "rusEFI 2021.12.07.frankenso_na6.4231736512" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index 8b710c7f51..0ffe5107ef 100644 --- a/firmware/controllers/generated/signature_hellen-nb1.h +++ b/firmware/controllers/generated/signature_hellen-nb1.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 2693059277 -#define TS_SIGNATURE "rusEFI 2021.12.07.hellen-nb1.2693059277" +#define SIGNATURE_HASH 601573792 +#define TS_SIGNATURE "rusEFI 2021.12.07.hellen-nb1.601573792" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index 4678faf49c..d4974cda52 100644 --- a/firmware/controllers/generated/signature_hellen121nissan.h +++ b/firmware/controllers/generated/signature_hellen121nissan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 3201466597 -#define TS_SIGNATURE "rusEFI 2021.12.07.hellen121nissan.3201466597" +#define SIGNATURE_HASH 1032657800 +#define TS_SIGNATURE "rusEFI 2021.12.07.hellen121nissan.1032657800" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index 95be6197c0..440e4de923 100644 --- a/firmware/controllers/generated/signature_hellen121vag.h +++ b/firmware/controllers/generated/signature_hellen121vag.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 1526056526 -#define TS_SIGNATURE "rusEFI 2021.12.07.hellen121vag.1526056526" +#define SIGNATURE_HASH 3651820835 +#define TS_SIGNATURE "rusEFI 2021.12.07.hellen121vag.3651820835" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index 8cce742328..ecd00c27b8 100644 --- a/firmware/controllers/generated/signature_hellen128.h +++ b/firmware/controllers/generated/signature_hellen128.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 2677049827 -#define TS_SIGNATURE "rusEFI 2021.12.07.hellen128.2677049827" +#define SIGNATURE_HASH 483332750 +#define TS_SIGNATURE "rusEFI 2021.12.07.hellen128.483332750" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index 5cc29253bf..505245af1e 100644 --- a/firmware/controllers/generated/signature_hellen154hyundai.h +++ b/firmware/controllers/generated/signature_hellen154hyundai.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 662888674 -#define TS_SIGNATURE "rusEFI 2021.12.07.hellen154hyundai.662888674" +#define SIGNATURE_HASH 2765978511 +#define TS_SIGNATURE "rusEFI 2021.12.07.hellen154hyundai.2765978511" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index a55e5436d2..42503f5c0c 100644 --- a/firmware/controllers/generated/signature_hellen72.h +++ b/firmware/controllers/generated/signature_hellen72.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 4058736116 -#define TS_SIGNATURE "rusEFI 2021.12.07.hellen72.4058736116" +#define SIGNATURE_HASH 1924464281 +#define TS_SIGNATURE "rusEFI 2021.12.07.hellen72.1924464281" diff --git a/firmware/controllers/generated/signature_hellen81.h b/firmware/controllers/generated/signature_hellen81.h index 411dc6676f..e2869f84c9 100644 --- a/firmware/controllers/generated/signature_hellen81.h +++ b/firmware/controllers/generated/signature_hellen81.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 1172764679 -#define TS_SIGNATURE "rusEFI 2021.12.07.hellen81.1172764679" +#define SIGNATURE_HASH 3334038378 +#define TS_SIGNATURE "rusEFI 2021.12.07.hellen81.3334038378" diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h index 4cd8e859ab..be5cc574c4 100644 --- a/firmware/controllers/generated/signature_hellen88bmw.h +++ b/firmware/controllers/generated/signature_hellen88bmw.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 2761323291 -#define TS_SIGNATURE "rusEFI 2021.12.07.hellen88bmw.2761323291" +#define SIGNATURE_HASH 667543670 +#define TS_SIGNATURE "rusEFI 2021.12.07.hellen88bmw.667543670" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index 29dfcd6218..c6fd33948a 100644 --- a/firmware/controllers/generated/signature_hellenNA6.h +++ b/firmware/controllers/generated/signature_hellenNA6.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 1936434412 -#define TS_SIGNATURE "rusEFI 2021.12.07.hellenNA6.1936434412" +#define SIGNATURE_HASH 4029955969 +#define TS_SIGNATURE "rusEFI 2021.12.07.hellenNA6.4029955969" diff --git a/firmware/controllers/generated/signature_hellen_cypress.h b/firmware/controllers/generated/signature_hellen_cypress.h index 4c30349029..95a7da165b 100644 --- a/firmware/controllers/generated/signature_hellen_cypress.h +++ b/firmware/controllers/generated/signature_hellen_cypress.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt // -#define SIGNATURE_HASH 1067648504 -#define TS_SIGNATURE "rusEFI 2021.12.07.hellen_cypress.1067648504" +#define SIGNATURE_HASH 3170672277 +#define TS_SIGNATURE "rusEFI 2021.12.07.hellen_cypress.3170672277" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 1f764fc9ed..548626638d 100644 --- a/firmware/controllers/generated/signature_kin.h +++ b/firmware/controllers/generated/signature_kin.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt // -#define SIGNATURE_HASH 3221670148 -#define TS_SIGNATURE "rusEFI 2021.12.07.kin.3221670148" +#define SIGNATURE_HASH 1129927273 +#define TS_SIGNATURE "rusEFI 2021.12.07.kin.1129927273" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index e01868b318..a44e247587 100644 --- a/firmware/controllers/generated/signature_mre_f4.h +++ b/firmware/controllers/generated/signature_mre_f4.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 3060898032 -#define TS_SIGNATURE "rusEFI 2021.12.07.mre_f4.3060898032" +#define SIGNATURE_HASH 892208029 +#define TS_SIGNATURE "rusEFI 2021.12.07.mre_f4.892208029" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index fd5908974c..9f5379492b 100644 --- a/firmware/controllers/generated/signature_mre_f7.h +++ b/firmware/controllers/generated/signature_mre_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 3060898032 -#define TS_SIGNATURE "rusEFI 2021.12.07.mre_f7.3060898032" +#define SIGNATURE_HASH 892208029 +#define TS_SIGNATURE "rusEFI 2021.12.07.mre_f7.892208029" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 174a86effc..f3bbd3f7f9 100644 --- a/firmware/controllers/generated/signature_prometheus_405.h +++ b/firmware/controllers/generated/signature_prometheus_405.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 1438399394 -#define TS_SIGNATURE "rusEFI 2021.12.07.prometheus_405.1438399394" +#define SIGNATURE_HASH 3605242063 +#define TS_SIGNATURE "rusEFI 2021.12.07.prometheus_405.3605242063" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index d96b6aaf22..a8d393449e 100644 --- a/firmware/controllers/generated/signature_prometheus_469.h +++ b/firmware/controllers/generated/signature_prometheus_469.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 1438399394 -#define TS_SIGNATURE "rusEFI 2021.12.07.prometheus_469.1438399394" +#define SIGNATURE_HASH 3605242063 +#define TS_SIGNATURE "rusEFI 2021.12.07.prometheus_469.3605242063" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 0a5091b4b3..a3ab542582 100644 --- a/firmware/controllers/generated/signature_proteus_f4.h +++ b/firmware/controllers/generated/signature_proteus_f4.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 3110541803 -#define TS_SIGNATURE "rusEFI 2021.12.07.proteus_f4.3110541803" +#define SIGNATURE_HASH 976781958 +#define TS_SIGNATURE "rusEFI 2021.12.07.proteus_f4.976781958" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 118df33202..954dcee86c 100644 --- a/firmware/controllers/generated/signature_proteus_f7.h +++ b/firmware/controllers/generated/signature_proteus_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 3110541803 -#define TS_SIGNATURE "rusEFI 2021.12.07.proteus_f7.3110541803" +#define SIGNATURE_HASH 976781958 +#define TS_SIGNATURE "rusEFI 2021.12.07.proteus_f7.976781958" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index 951c9c46a4..49fc8f88f5 100644 --- a/firmware/controllers/generated/signature_subaru_eg33_f7.h +++ b/firmware/controllers/generated/signature_subaru_eg33_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 3337417748 -#define TS_SIGNATURE "rusEFI 2021.12.07.subaru_eg33_f7.3337417748" +#define SIGNATURE_HASH 1169387385 +#define TS_SIGNATURE "rusEFI 2021.12.07.subaru_eg33_f7.1169387385" diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index 8a0d3499d2..1c14438473 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.12.07.all.89580100" + signature = "rusEFI 2021.12.07.all.2248767785" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.07.all.89580100" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.07.all.2248767785" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Dec 07 03:11:56 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Dec 07 14:02:04 UTC 2021 pageSize = 24400 page = 1 @@ -877,8 +877,8 @@ alternatorPwmFrequency = scalar, S32, 2256, "Hz", 1, 0, 0, 3000, 0 unused2260 = scalar, S32, 2260, "units", 1, 0, -20, 100, 0 narrowToWideOxygenBins = array, F32, 2264, [8], "V", 1, 0, -10, 10, 3 narrowToWideOxygen = array, F32, 2296, [8], "ratio", 1, 0, -40, 40, 2 -vvtMode1 = bits, U08, 2328, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "vvt13", "vvt14", "vvt15" -vvtMode2 = bits, U08, 2329, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "vvt13", "vvt14", "vvt15" +vvtMode1 = bits, U08, 2328, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "VTwin by MAP", "vvt14", "vvt15" +vvtMode2 = bits, U08, 2329, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "VTwin by MAP", "vvt14", "vvt15" fan2ExtraIdle = scalar, U08, 2330, "%", 1, 0, 0, 100, 0 unusedOldBiquad = array, U08, 2331, [1], "units", 1, 0, -20, 100, 0 @@ -2259,14 +2259,8 @@ unusedAtTheEnd153 = scalar, U08, 472, "", 1, 0 unusedAtTheEnd154 = scalar, U08, 473, "", 1, 0 unusedAtTheEnd155 = scalar, U08, 474, "", 1, 0 unusedAtTheEnd156 = scalar, U08, 475, "", 1, 0 -unusedAtTheEnd157 = scalar, U08, 476, "", 1, 0 -unusedAtTheEnd158 = scalar, U08, 477, "", 1, 0 -unusedAtTheEnd159 = scalar, U08, 478, "", 1, 0 -unusedAtTheEnd160 = scalar, U08, 479, "", 1, 0 -unusedAtTheEnd161 = scalar, U08, 480, "", 1, 0 -unusedAtTheEnd162 = scalar, U08, 481, "", 1, 0 -unusedAtTheEnd163 = scalar, U08, 482, "", 1, 0 -unusedAtTheEnd164 = scalar, U08, 483, "", 1, 0 +TEMPLOG_MAP_AT_SPECIAL_POINT = scalar, F32, 476, "", 1, 0 +TEMPLOG_MAP_AT_DIFF = scalar, F32, 480, "", 1, 0 vvtSyncGapRatio = scalar, F32, 484, "", 1, 0 vvtCurrentPosition = scalar, F32, 488, "", 1, 0 triggerSyncGapRatio = scalar, F32, 492, "", 1, 0 @@ -2938,8 +2932,6 @@ etbStatus_dTermGauge = etbStatus_dTerm,"etbStatus_ dTerm", "", -10000.0,10000.0, etbStatus_outputGauge = etbStatus_output,"etbStatus_ output", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 etbStatus_errorGauge = etbStatus_error,"etbStatus_ error", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 etbStatus_resetCounterGauge = etbStatus_resetCounter,"etbStatus_ resetCounter", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 0,0 -TEMPLOG_MAP_INSTANT_AVERAGEGauge = TEMPLOG_MAP_INSTANT_AVERAGE,"TEMPLOG_MAP_INSTANT_AVERAGE", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 -TEMPLOG_map_peakGauge = TEMPLOG_map_peak,"TEMPLOG_map_peak", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 canReadCounterGauge = canReadCounter,"canReadCounter", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 canWriteOkGauge = canWriteOk,"canWriteOk", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 canWriteNotOkGauge = canWriteNotOk,"canWriteNotOk", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 @@ -2948,6 +2940,12 @@ triggerStateIndexGauge = triggerStateIndex,"triggerStateIndex", "", -10000.0,100 vvtSyncGapRatioGauge = vvtSyncGapRatio,"vvtSyncGapRatio", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 vvtStateIndexGauge = vvtStateIndex,"vvtStateIndex", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +gaugeCategory = MAP Cam +TEMPLOG_MAP_INSTANT_AVERAGEGauge = TEMPLOG_MAP_INSTANT_AVERAGE,"TEMPLOG_MAP_INSTANT_AVERAGE", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +TEMPLOG_map_peakGauge = TEMPLOG_map_peak,"TEMPLOG_map_peak", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +TEMPLOG_MAP_AT_SPECIAL_POINTGauge = TEMPLOG_MAP_AT_SPECIAL_POINT,"TEMPLOG_MAP_AT_SPECIAL_POINT", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +TEMPLOG_MAP_AT_DIFFGauge = TEMPLOG_MAP_AT_DIFF,"TEMPLOG_MAP_AT_DIFF", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 + gaugeCategory = Sensors - Extra 2 egt1Gauge = egt1, "EGT#1", "C", 0, 2000 @@ -3418,6 +3416,8 @@ entry = vvtTargets2, "vvtTargets2", int, "%d" entry = vvtTargets3, "vvtTargets3", int, "%d" entry = vvtTargets4, "vvtTargets4", int, "%d" entry = turboSpeed, "Turbocharger Speed", int, "%d" +entry = TEMPLOG_MAP_AT_SPECIAL_POINT, "TEMPLOG_MAP_AT_SPECIAL_POINT", float, "%.3f" +entry = TEMPLOG_MAP_AT_DIFF, "TEMPLOG_MAP_AT_DIFF", float, "%.3f" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" entry = triggerSyncGapRatio, "triggerSyncGapRatio", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index a42dd8a4a6..2e7e2a65df 100644 --- a/firmware/tunerstudio/generated/rusefi_atlas.ini +++ b/firmware/tunerstudio/generated/rusefi_atlas.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.12.07.atlas.429660003" + signature = "rusEFI 2021.12.07.atlas.2596506638" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.07.atlas.429660003" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.07.atlas.2596506638" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Dec 07 03:11:53 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Dec 07 14:02:01 UTC 2021 pageSize = 24400 page = 1 @@ -877,8 +877,8 @@ alternatorPwmFrequency = scalar, S32, 2256, "Hz", 1, 0, 0, 3000, 0 unused2260 = scalar, S32, 2260, "units", 1, 0, -20, 100, 0 narrowToWideOxygenBins = array, F32, 2264, [8], "V", 1, 0, -10, 10, 3 narrowToWideOxygen = array, F32, 2296, [8], "ratio", 1, 0, -40, 40, 2 -vvtMode1 = bits, U08, 2328, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "vvt13", "vvt14", "vvt15" -vvtMode2 = bits, U08, 2329, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "vvt13", "vvt14", "vvt15" +vvtMode1 = bits, U08, 2328, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "VTwin by MAP", "vvt14", "vvt15" +vvtMode2 = bits, U08, 2329, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "VTwin by MAP", "vvt14", "vvt15" fan2ExtraIdle = scalar, U08, 2330, "%", 1, 0, 0, 100, 0 unusedOldBiquad = array, U08, 2331, [1], "units", 1, 0, -20, 100, 0 @@ -2259,14 +2259,8 @@ unusedAtTheEnd153 = scalar, U08, 472, "", 1, 0 unusedAtTheEnd154 = scalar, U08, 473, "", 1, 0 unusedAtTheEnd155 = scalar, U08, 474, "", 1, 0 unusedAtTheEnd156 = scalar, U08, 475, "", 1, 0 -unusedAtTheEnd157 = scalar, U08, 476, "", 1, 0 -unusedAtTheEnd158 = scalar, U08, 477, "", 1, 0 -unusedAtTheEnd159 = scalar, U08, 478, "", 1, 0 -unusedAtTheEnd160 = scalar, U08, 479, "", 1, 0 -unusedAtTheEnd161 = scalar, U08, 480, "", 1, 0 -unusedAtTheEnd162 = scalar, U08, 481, "", 1, 0 -unusedAtTheEnd163 = scalar, U08, 482, "", 1, 0 -unusedAtTheEnd164 = scalar, U08, 483, "", 1, 0 +TEMPLOG_MAP_AT_SPECIAL_POINT = scalar, F32, 476, "", 1, 0 +TEMPLOG_MAP_AT_DIFF = scalar, F32, 480, "", 1, 0 vvtSyncGapRatio = scalar, F32, 484, "", 1, 0 vvtCurrentPosition = scalar, F32, 488, "", 1, 0 triggerSyncGapRatio = scalar, F32, 492, "", 1, 0 @@ -2938,8 +2932,6 @@ etbStatus_dTermGauge = etbStatus_dTerm,"etbStatus_ dTerm", "", -10000.0,10000.0, etbStatus_outputGauge = etbStatus_output,"etbStatus_ output", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 etbStatus_errorGauge = etbStatus_error,"etbStatus_ error", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 etbStatus_resetCounterGauge = etbStatus_resetCounter,"etbStatus_ resetCounter", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 0,0 -TEMPLOG_MAP_INSTANT_AVERAGEGauge = TEMPLOG_MAP_INSTANT_AVERAGE,"TEMPLOG_MAP_INSTANT_AVERAGE", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 -TEMPLOG_map_peakGauge = TEMPLOG_map_peak,"TEMPLOG_map_peak", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 canReadCounterGauge = canReadCounter,"canReadCounter", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 canWriteOkGauge = canWriteOk,"canWriteOk", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 canWriteNotOkGauge = canWriteNotOk,"canWriteNotOk", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 @@ -2948,6 +2940,12 @@ triggerStateIndexGauge = triggerStateIndex,"triggerStateIndex", "", -10000.0,100 vvtSyncGapRatioGauge = vvtSyncGapRatio,"vvtSyncGapRatio", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 vvtStateIndexGauge = vvtStateIndex,"vvtStateIndex", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +gaugeCategory = MAP Cam +TEMPLOG_MAP_INSTANT_AVERAGEGauge = TEMPLOG_MAP_INSTANT_AVERAGE,"TEMPLOG_MAP_INSTANT_AVERAGE", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +TEMPLOG_map_peakGauge = TEMPLOG_map_peak,"TEMPLOG_map_peak", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +TEMPLOG_MAP_AT_SPECIAL_POINTGauge = TEMPLOG_MAP_AT_SPECIAL_POINT,"TEMPLOG_MAP_AT_SPECIAL_POINT", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +TEMPLOG_MAP_AT_DIFFGauge = TEMPLOG_MAP_AT_DIFF,"TEMPLOG_MAP_AT_DIFF", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 + gaugeCategory = Sensors - Extra 2 egt1Gauge = egt1, "EGT#1", "C", 0, 2000 @@ -3418,6 +3416,8 @@ entry = vvtTargets2, "vvtTargets2", int, "%d" entry = vvtTargets3, "vvtTargets3", int, "%d" entry = vvtTargets4, "vvtTargets4", int, "%d" entry = turboSpeed, "Turbocharger Speed", int, "%d" +entry = TEMPLOG_MAP_AT_SPECIAL_POINT, "TEMPLOG_MAP_AT_SPECIAL_POINT", float, "%.3f" +entry = TEMPLOG_MAP_AT_DIFF, "TEMPLOG_MAP_AT_DIFF", float, "%.3f" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" entry = triggerSyncGapRatio, "triggerSyncGapRatio", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index bc6b1706c8..2a3eaffcdd 100644 --- a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.12.07.f429-discovery.89580100" + signature = "rusEFI 2021.12.07.f429-discovery.2248767785" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.07.f429-discovery.89580100" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.07.f429-discovery.2248767785" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Dec 07 03:10:57 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Dec 07 14:01:03 UTC 2021 pageSize = 24400 page = 1 @@ -877,8 +877,8 @@ alternatorPwmFrequency = scalar, S32, 2256, "Hz", 1, 0, 0, 3000, 0 unused2260 = scalar, S32, 2260, "units", 1, 0, -20, 100, 0 narrowToWideOxygenBins = array, F32, 2264, [8], "V", 1, 0, -10, 10, 3 narrowToWideOxygen = array, F32, 2296, [8], "ratio", 1, 0, -40, 40, 2 -vvtMode1 = bits, U08, 2328, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "vvt13", "vvt14", "vvt15" -vvtMode2 = bits, U08, 2329, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "vvt13", "vvt14", "vvt15" +vvtMode1 = bits, U08, 2328, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "VTwin by MAP", "vvt14", "vvt15" +vvtMode2 = bits, U08, 2329, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "VTwin by MAP", "vvt14", "vvt15" fan2ExtraIdle = scalar, U08, 2330, "%", 1, 0, 0, 100, 0 unusedOldBiquad = array, U08, 2331, [1], "units", 1, 0, -20, 100, 0 @@ -2259,14 +2259,8 @@ unusedAtTheEnd153 = scalar, U08, 472, "", 1, 0 unusedAtTheEnd154 = scalar, U08, 473, "", 1, 0 unusedAtTheEnd155 = scalar, U08, 474, "", 1, 0 unusedAtTheEnd156 = scalar, U08, 475, "", 1, 0 -unusedAtTheEnd157 = scalar, U08, 476, "", 1, 0 -unusedAtTheEnd158 = scalar, U08, 477, "", 1, 0 -unusedAtTheEnd159 = scalar, U08, 478, "", 1, 0 -unusedAtTheEnd160 = scalar, U08, 479, "", 1, 0 -unusedAtTheEnd161 = scalar, U08, 480, "", 1, 0 -unusedAtTheEnd162 = scalar, U08, 481, "", 1, 0 -unusedAtTheEnd163 = scalar, U08, 482, "", 1, 0 -unusedAtTheEnd164 = scalar, U08, 483, "", 1, 0 +TEMPLOG_MAP_AT_SPECIAL_POINT = scalar, F32, 476, "", 1, 0 +TEMPLOG_MAP_AT_DIFF = scalar, F32, 480, "", 1, 0 vvtSyncGapRatio = scalar, F32, 484, "", 1, 0 vvtCurrentPosition = scalar, F32, 488, "", 1, 0 triggerSyncGapRatio = scalar, F32, 492, "", 1, 0 @@ -2938,8 +2932,6 @@ etbStatus_dTermGauge = etbStatus_dTerm,"etbStatus_ dTerm", "", -10000.0,10000.0, etbStatus_outputGauge = etbStatus_output,"etbStatus_ output", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 etbStatus_errorGauge = etbStatus_error,"etbStatus_ error", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 etbStatus_resetCounterGauge = etbStatus_resetCounter,"etbStatus_ resetCounter", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 0,0 -TEMPLOG_MAP_INSTANT_AVERAGEGauge = TEMPLOG_MAP_INSTANT_AVERAGE,"TEMPLOG_MAP_INSTANT_AVERAGE", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 -TEMPLOG_map_peakGauge = TEMPLOG_map_peak,"TEMPLOG_map_peak", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 canReadCounterGauge = canReadCounter,"canReadCounter", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 canWriteOkGauge = canWriteOk,"canWriteOk", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 canWriteNotOkGauge = canWriteNotOk,"canWriteNotOk", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 @@ -2948,6 +2940,12 @@ triggerStateIndexGauge = triggerStateIndex,"triggerStateIndex", "", -10000.0,100 vvtSyncGapRatioGauge = vvtSyncGapRatio,"vvtSyncGapRatio", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 vvtStateIndexGauge = vvtStateIndex,"vvtStateIndex", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +gaugeCategory = MAP Cam +TEMPLOG_MAP_INSTANT_AVERAGEGauge = TEMPLOG_MAP_INSTANT_AVERAGE,"TEMPLOG_MAP_INSTANT_AVERAGE", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +TEMPLOG_map_peakGauge = TEMPLOG_map_peak,"TEMPLOG_map_peak", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +TEMPLOG_MAP_AT_SPECIAL_POINTGauge = TEMPLOG_MAP_AT_SPECIAL_POINT,"TEMPLOG_MAP_AT_SPECIAL_POINT", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +TEMPLOG_MAP_AT_DIFFGauge = TEMPLOG_MAP_AT_DIFF,"TEMPLOG_MAP_AT_DIFF", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 + gaugeCategory = Sensors - Extra 2 egt1Gauge = egt1, "EGT#1", "C", 0, 2000 @@ -3418,6 +3416,8 @@ entry = vvtTargets2, "vvtTargets2", int, "%d" entry = vvtTargets3, "vvtTargets3", int, "%d" entry = vvtTargets4, "vvtTargets4", int, "%d" entry = turboSpeed, "Turbocharger Speed", int, "%d" +entry = TEMPLOG_MAP_AT_SPECIAL_POINT, "TEMPLOG_MAP_AT_SPECIAL_POINT", float, "%.3f" +entry = TEMPLOG_MAP_AT_DIFF, "TEMPLOG_MAP_AT_DIFF", float, "%.3f" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" entry = triggerSyncGapRatio, "triggerSyncGapRatio", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 23d6b7defb..0d9ed1bd90 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.12.07.frankenso_na6.2137307053" + signature = "rusEFI 2021.12.07.frankenso_na6.4231736512" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.07.frankenso_na6.2137307053" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.07.frankenso_na6.4231736512" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Dec 07 03:11:37 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Dec 07 14:01:44 UTC 2021 pageSize = 24400 page = 1 @@ -877,8 +877,8 @@ alternatorPwmFrequency = scalar, S32, 2256, "Hz", 1, 0, 0, 3000, 0 unused2260 = scalar, S32, 2260, "units", 1, 0, -20, 100, 0 narrowToWideOxygenBins = array, F32, 2264, [8], "V", 1, 0, -10, 10, 3 narrowToWideOxygen = array, F32, 2296, [8], "ratio", 1, 0, -40, 40, 2 -vvtMode1 = bits, U08, 2328, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "vvt13", "vvt14", "vvt15" -vvtMode2 = bits, U08, 2329, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "vvt13", "vvt14", "vvt15" +vvtMode1 = bits, U08, 2328, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "VTwin by MAP", "vvt14", "vvt15" +vvtMode2 = bits, U08, 2329, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "VTwin by MAP", "vvt14", "vvt15" fan2ExtraIdle = scalar, U08, 2330, "%", 1, 0, 0, 100, 0 unusedOldBiquad = array, U08, 2331, [1], "units", 1, 0, -20, 100, 0 @@ -2259,14 +2259,8 @@ unusedAtTheEnd153 = scalar, U08, 472, "", 1, 0 unusedAtTheEnd154 = scalar, U08, 473, "", 1, 0 unusedAtTheEnd155 = scalar, U08, 474, "", 1, 0 unusedAtTheEnd156 = scalar, U08, 475, "", 1, 0 -unusedAtTheEnd157 = scalar, U08, 476, "", 1, 0 -unusedAtTheEnd158 = scalar, U08, 477, "", 1, 0 -unusedAtTheEnd159 = scalar, U08, 478, "", 1, 0 -unusedAtTheEnd160 = scalar, U08, 479, "", 1, 0 -unusedAtTheEnd161 = scalar, U08, 480, "", 1, 0 -unusedAtTheEnd162 = scalar, U08, 481, "", 1, 0 -unusedAtTheEnd163 = scalar, U08, 482, "", 1, 0 -unusedAtTheEnd164 = scalar, U08, 483, "", 1, 0 +TEMPLOG_MAP_AT_SPECIAL_POINT = scalar, F32, 476, "", 1, 0 +TEMPLOG_MAP_AT_DIFF = scalar, F32, 480, "", 1, 0 vvtSyncGapRatio = scalar, F32, 484, "", 1, 0 vvtCurrentPosition = scalar, F32, 488, "", 1, 0 triggerSyncGapRatio = scalar, F32, 492, "", 1, 0 @@ -2938,8 +2932,6 @@ etbStatus_dTermGauge = etbStatus_dTerm,"etbStatus_ dTerm", "", -10000.0,10000.0, etbStatus_outputGauge = etbStatus_output,"etbStatus_ output", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 etbStatus_errorGauge = etbStatus_error,"etbStatus_ error", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 etbStatus_resetCounterGauge = etbStatus_resetCounter,"etbStatus_ resetCounter", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 0,0 -TEMPLOG_MAP_INSTANT_AVERAGEGauge = TEMPLOG_MAP_INSTANT_AVERAGE,"TEMPLOG_MAP_INSTANT_AVERAGE", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 -TEMPLOG_map_peakGauge = TEMPLOG_map_peak,"TEMPLOG_map_peak", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 canReadCounterGauge = canReadCounter,"canReadCounter", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 canWriteOkGauge = canWriteOk,"canWriteOk", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 canWriteNotOkGauge = canWriteNotOk,"canWriteNotOk", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 @@ -2948,6 +2940,12 @@ triggerStateIndexGauge = triggerStateIndex,"triggerStateIndex", "", -10000.0,100 vvtSyncGapRatioGauge = vvtSyncGapRatio,"vvtSyncGapRatio", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 vvtStateIndexGauge = vvtStateIndex,"vvtStateIndex", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +gaugeCategory = MAP Cam +TEMPLOG_MAP_INSTANT_AVERAGEGauge = TEMPLOG_MAP_INSTANT_AVERAGE,"TEMPLOG_MAP_INSTANT_AVERAGE", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +TEMPLOG_map_peakGauge = TEMPLOG_map_peak,"TEMPLOG_map_peak", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +TEMPLOG_MAP_AT_SPECIAL_POINTGauge = TEMPLOG_MAP_AT_SPECIAL_POINT,"TEMPLOG_MAP_AT_SPECIAL_POINT", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +TEMPLOG_MAP_AT_DIFFGauge = TEMPLOG_MAP_AT_DIFF,"TEMPLOG_MAP_AT_DIFF", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 + gaugeCategory = Sensors - Extra 2 egt1Gauge = egt1, "EGT#1", "C", 0, 2000 @@ -3418,6 +3416,8 @@ entry = vvtTargets2, "vvtTargets2", int, "%d" entry = vvtTargets3, "vvtTargets3", int, "%d" entry = vvtTargets4, "vvtTargets4", int, "%d" entry = turboSpeed, "Turbocharger Speed", int, "%d" +entry = TEMPLOG_MAP_AT_SPECIAL_POINT, "TEMPLOG_MAP_AT_SPECIAL_POINT", float, "%.3f" +entry = TEMPLOG_MAP_AT_DIFF, "TEMPLOG_MAP_AT_DIFF", float, "%.3f" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" entry = triggerSyncGapRatio, "triggerSyncGapRatio", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini index df306a8fa4..7dfe17e7cc 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.12.07.hellen-nb1.2693059277" + signature = "rusEFI 2021.12.07.hellen-nb1.601573792" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.07.hellen-nb1.2693059277" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.07.hellen-nb1.601573792" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Dec 07 03:11:23 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Dec 07 14:01:30 UTC 2021 pageSize = 24400 page = 1 @@ -877,8 +877,8 @@ alternatorPwmFrequency = scalar, S32, 2256, "Hz", 1, 0, 0, 3000, 0 unused2260 = scalar, S32, 2260, "units", 1, 0, -20, 100, 0 narrowToWideOxygenBins = array, F32, 2264, [8], "V", 1, 0, -10, 10, 3 narrowToWideOxygen = array, F32, 2296, [8], "ratio", 1, 0, -40, 40, 2 -vvtMode1 = bits, U08, 2328, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "vvt13", "vvt14", "vvt15" -vvtMode2 = bits, U08, 2329, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "vvt13", "vvt14", "vvt15" +vvtMode1 = bits, U08, 2328, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "VTwin by MAP", "vvt14", "vvt15" +vvtMode2 = bits, U08, 2329, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "VTwin by MAP", "vvt14", "vvt15" fan2ExtraIdle = scalar, U08, 2330, "%", 1, 0, 0, 100, 0 unusedOldBiquad = array, U08, 2331, [1], "units", 1, 0, -20, 100, 0 @@ -2259,14 +2259,8 @@ unusedAtTheEnd153 = scalar, U08, 472, "", 1, 0 unusedAtTheEnd154 = scalar, U08, 473, "", 1, 0 unusedAtTheEnd155 = scalar, U08, 474, "", 1, 0 unusedAtTheEnd156 = scalar, U08, 475, "", 1, 0 -unusedAtTheEnd157 = scalar, U08, 476, "", 1, 0 -unusedAtTheEnd158 = scalar, U08, 477, "", 1, 0 -unusedAtTheEnd159 = scalar, U08, 478, "", 1, 0 -unusedAtTheEnd160 = scalar, U08, 479, "", 1, 0 -unusedAtTheEnd161 = scalar, U08, 480, "", 1, 0 -unusedAtTheEnd162 = scalar, U08, 481, "", 1, 0 -unusedAtTheEnd163 = scalar, U08, 482, "", 1, 0 -unusedAtTheEnd164 = scalar, U08, 483, "", 1, 0 +TEMPLOG_MAP_AT_SPECIAL_POINT = scalar, F32, 476, "", 1, 0 +TEMPLOG_MAP_AT_DIFF = scalar, F32, 480, "", 1, 0 vvtSyncGapRatio = scalar, F32, 484, "", 1, 0 vvtCurrentPosition = scalar, F32, 488, "", 1, 0 triggerSyncGapRatio = scalar, F32, 492, "", 1, 0 @@ -2938,8 +2932,6 @@ etbStatus_dTermGauge = etbStatus_dTerm,"etbStatus_ dTerm", "", -10000.0,10000.0, etbStatus_outputGauge = etbStatus_output,"etbStatus_ output", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 etbStatus_errorGauge = etbStatus_error,"etbStatus_ error", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 etbStatus_resetCounterGauge = etbStatus_resetCounter,"etbStatus_ resetCounter", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 0,0 -TEMPLOG_MAP_INSTANT_AVERAGEGauge = TEMPLOG_MAP_INSTANT_AVERAGE,"TEMPLOG_MAP_INSTANT_AVERAGE", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 -TEMPLOG_map_peakGauge = TEMPLOG_map_peak,"TEMPLOG_map_peak", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 canReadCounterGauge = canReadCounter,"canReadCounter", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 canWriteOkGauge = canWriteOk,"canWriteOk", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 canWriteNotOkGauge = canWriteNotOk,"canWriteNotOk", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 @@ -2948,6 +2940,12 @@ triggerStateIndexGauge = triggerStateIndex,"triggerStateIndex", "", -10000.0,100 vvtSyncGapRatioGauge = vvtSyncGapRatio,"vvtSyncGapRatio", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 vvtStateIndexGauge = vvtStateIndex,"vvtStateIndex", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +gaugeCategory = MAP Cam +TEMPLOG_MAP_INSTANT_AVERAGEGauge = TEMPLOG_MAP_INSTANT_AVERAGE,"TEMPLOG_MAP_INSTANT_AVERAGE", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +TEMPLOG_map_peakGauge = TEMPLOG_map_peak,"TEMPLOG_map_peak", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +TEMPLOG_MAP_AT_SPECIAL_POINTGauge = TEMPLOG_MAP_AT_SPECIAL_POINT,"TEMPLOG_MAP_AT_SPECIAL_POINT", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +TEMPLOG_MAP_AT_DIFFGauge = TEMPLOG_MAP_AT_DIFF,"TEMPLOG_MAP_AT_DIFF", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 + gaugeCategory = Sensors - Extra 2 egt1Gauge = egt1, "EGT#1", "C", 0, 2000 @@ -3418,6 +3416,8 @@ entry = vvtTargets2, "vvtTargets2", int, "%d" entry = vvtTargets3, "vvtTargets3", int, "%d" entry = vvtTargets4, "vvtTargets4", int, "%d" entry = turboSpeed, "Turbocharger Speed", int, "%d" +entry = TEMPLOG_MAP_AT_SPECIAL_POINT, "TEMPLOG_MAP_AT_SPECIAL_POINT", float, "%.3f" +entry = TEMPLOG_MAP_AT_DIFF, "TEMPLOG_MAP_AT_DIFF", float, "%.3f" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" entry = triggerSyncGapRatio, "triggerSyncGapRatio", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index edf812e94e..542cb8d44b 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.12.07.hellen121nissan.3201466597" + signature = "rusEFI 2021.12.07.hellen121nissan.1032657800" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.07.hellen121nissan.3201466597" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.07.hellen121nissan.1032657800" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Dec 07 03:11:07 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Dec 07 14:01:13 UTC 2021 pageSize = 24400 page = 1 @@ -877,8 +877,8 @@ alternatorPwmFrequency = scalar, S32, 2256, "Hz", 1, 0, 0, 3000, 0 unused2260 = scalar, S32, 2260, "units", 1, 0, -20, 100, 0 narrowToWideOxygenBins = array, F32, 2264, [8], "V", 1, 0, -10, 10, 3 narrowToWideOxygen = array, F32, 2296, [8], "ratio", 1, 0, -40, 40, 2 -vvtMode1 = bits, U08, 2328, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "vvt13", "vvt14", "vvt15" -vvtMode2 = bits, U08, 2329, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "vvt13", "vvt14", "vvt15" +vvtMode1 = bits, U08, 2328, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "VTwin by MAP", "vvt14", "vvt15" +vvtMode2 = bits, U08, 2329, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "VTwin by MAP", "vvt14", "vvt15" fan2ExtraIdle = scalar, U08, 2330, "%", 1, 0, 0, 100, 0 unusedOldBiquad = array, U08, 2331, [1], "units", 1, 0, -20, 100, 0 @@ -2259,14 +2259,8 @@ unusedAtTheEnd153 = scalar, U08, 472, "", 1, 0 unusedAtTheEnd154 = scalar, U08, 473, "", 1, 0 unusedAtTheEnd155 = scalar, U08, 474, "", 1, 0 unusedAtTheEnd156 = scalar, U08, 475, "", 1, 0 -unusedAtTheEnd157 = scalar, U08, 476, "", 1, 0 -unusedAtTheEnd158 = scalar, U08, 477, "", 1, 0 -unusedAtTheEnd159 = scalar, U08, 478, "", 1, 0 -unusedAtTheEnd160 = scalar, U08, 479, "", 1, 0 -unusedAtTheEnd161 = scalar, U08, 480, "", 1, 0 -unusedAtTheEnd162 = scalar, U08, 481, "", 1, 0 -unusedAtTheEnd163 = scalar, U08, 482, "", 1, 0 -unusedAtTheEnd164 = scalar, U08, 483, "", 1, 0 +TEMPLOG_MAP_AT_SPECIAL_POINT = scalar, F32, 476, "", 1, 0 +TEMPLOG_MAP_AT_DIFF = scalar, F32, 480, "", 1, 0 vvtSyncGapRatio = scalar, F32, 484, "", 1, 0 vvtCurrentPosition = scalar, F32, 488, "", 1, 0 triggerSyncGapRatio = scalar, F32, 492, "", 1, 0 @@ -2938,8 +2932,6 @@ etbStatus_dTermGauge = etbStatus_dTerm,"etbStatus_ dTerm", "", -10000.0,10000.0, etbStatus_outputGauge = etbStatus_output,"etbStatus_ output", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 etbStatus_errorGauge = etbStatus_error,"etbStatus_ error", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 etbStatus_resetCounterGauge = etbStatus_resetCounter,"etbStatus_ resetCounter", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 0,0 -TEMPLOG_MAP_INSTANT_AVERAGEGauge = TEMPLOG_MAP_INSTANT_AVERAGE,"TEMPLOG_MAP_INSTANT_AVERAGE", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 -TEMPLOG_map_peakGauge = TEMPLOG_map_peak,"TEMPLOG_map_peak", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 canReadCounterGauge = canReadCounter,"canReadCounter", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 canWriteOkGauge = canWriteOk,"canWriteOk", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 canWriteNotOkGauge = canWriteNotOk,"canWriteNotOk", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 @@ -2948,6 +2940,12 @@ triggerStateIndexGauge = triggerStateIndex,"triggerStateIndex", "", -10000.0,100 vvtSyncGapRatioGauge = vvtSyncGapRatio,"vvtSyncGapRatio", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 vvtStateIndexGauge = vvtStateIndex,"vvtStateIndex", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +gaugeCategory = MAP Cam +TEMPLOG_MAP_INSTANT_AVERAGEGauge = TEMPLOG_MAP_INSTANT_AVERAGE,"TEMPLOG_MAP_INSTANT_AVERAGE", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +TEMPLOG_map_peakGauge = TEMPLOG_map_peak,"TEMPLOG_map_peak", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +TEMPLOG_MAP_AT_SPECIAL_POINTGauge = TEMPLOG_MAP_AT_SPECIAL_POINT,"TEMPLOG_MAP_AT_SPECIAL_POINT", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +TEMPLOG_MAP_AT_DIFFGauge = TEMPLOG_MAP_AT_DIFF,"TEMPLOG_MAP_AT_DIFF", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 + gaugeCategory = Sensors - Extra 2 egt1Gauge = egt1, "EGT#1", "C", 0, 2000 @@ -3418,6 +3416,8 @@ entry = vvtTargets2, "vvtTargets2", int, "%d" entry = vvtTargets3, "vvtTargets3", int, "%d" entry = vvtTargets4, "vvtTargets4", int, "%d" entry = turboSpeed, "Turbocharger Speed", int, "%d" +entry = TEMPLOG_MAP_AT_SPECIAL_POINT, "TEMPLOG_MAP_AT_SPECIAL_POINT", float, "%.3f" +entry = TEMPLOG_MAP_AT_DIFF, "TEMPLOG_MAP_AT_DIFF", float, "%.3f" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" entry = triggerSyncGapRatio, "triggerSyncGapRatio", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index c1fdb1aacf..37d33b8c65 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.12.07.hellen121vag.1526056526" + signature = "rusEFI 2021.12.07.hellen121vag.3651820835" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.07.hellen121vag.1526056526" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.07.hellen121vag.3651820835" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Dec 07 03:11:04 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Dec 07 14:01:09 UTC 2021 pageSize = 24400 page = 1 @@ -877,8 +877,8 @@ alternatorPwmFrequency = scalar, S32, 2256, "Hz", 1, 0, 0, 3000, 0 unused2260 = scalar, S32, 2260, "units", 1, 0, -20, 100, 0 narrowToWideOxygenBins = array, F32, 2264, [8], "V", 1, 0, -10, 10, 3 narrowToWideOxygen = array, F32, 2296, [8], "ratio", 1, 0, -40, 40, 2 -vvtMode1 = bits, U08, 2328, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "vvt13", "vvt14", "vvt15" -vvtMode2 = bits, U08, 2329, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "vvt13", "vvt14", "vvt15" +vvtMode1 = bits, U08, 2328, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "VTwin by MAP", "vvt14", "vvt15" +vvtMode2 = bits, U08, 2329, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "VTwin by MAP", "vvt14", "vvt15" fan2ExtraIdle = scalar, U08, 2330, "%", 1, 0, 0, 100, 0 unusedOldBiquad = array, U08, 2331, [1], "units", 1, 0, -20, 100, 0 @@ -2259,14 +2259,8 @@ unusedAtTheEnd153 = scalar, U08, 472, "", 1, 0 unusedAtTheEnd154 = scalar, U08, 473, "", 1, 0 unusedAtTheEnd155 = scalar, U08, 474, "", 1, 0 unusedAtTheEnd156 = scalar, U08, 475, "", 1, 0 -unusedAtTheEnd157 = scalar, U08, 476, "", 1, 0 -unusedAtTheEnd158 = scalar, U08, 477, "", 1, 0 -unusedAtTheEnd159 = scalar, U08, 478, "", 1, 0 -unusedAtTheEnd160 = scalar, U08, 479, "", 1, 0 -unusedAtTheEnd161 = scalar, U08, 480, "", 1, 0 -unusedAtTheEnd162 = scalar, U08, 481, "", 1, 0 -unusedAtTheEnd163 = scalar, U08, 482, "", 1, 0 -unusedAtTheEnd164 = scalar, U08, 483, "", 1, 0 +TEMPLOG_MAP_AT_SPECIAL_POINT = scalar, F32, 476, "", 1, 0 +TEMPLOG_MAP_AT_DIFF = scalar, F32, 480, "", 1, 0 vvtSyncGapRatio = scalar, F32, 484, "", 1, 0 vvtCurrentPosition = scalar, F32, 488, "", 1, 0 triggerSyncGapRatio = scalar, F32, 492, "", 1, 0 @@ -2938,8 +2932,6 @@ etbStatus_dTermGauge = etbStatus_dTerm,"etbStatus_ dTerm", "", -10000.0,10000.0, etbStatus_outputGauge = etbStatus_output,"etbStatus_ output", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 etbStatus_errorGauge = etbStatus_error,"etbStatus_ error", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 etbStatus_resetCounterGauge = etbStatus_resetCounter,"etbStatus_ resetCounter", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 0,0 -TEMPLOG_MAP_INSTANT_AVERAGEGauge = TEMPLOG_MAP_INSTANT_AVERAGE,"TEMPLOG_MAP_INSTANT_AVERAGE", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 -TEMPLOG_map_peakGauge = TEMPLOG_map_peak,"TEMPLOG_map_peak", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 canReadCounterGauge = canReadCounter,"canReadCounter", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 canWriteOkGauge = canWriteOk,"canWriteOk", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 canWriteNotOkGauge = canWriteNotOk,"canWriteNotOk", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 @@ -2948,6 +2940,12 @@ triggerStateIndexGauge = triggerStateIndex,"triggerStateIndex", "", -10000.0,100 vvtSyncGapRatioGauge = vvtSyncGapRatio,"vvtSyncGapRatio", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 vvtStateIndexGauge = vvtStateIndex,"vvtStateIndex", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +gaugeCategory = MAP Cam +TEMPLOG_MAP_INSTANT_AVERAGEGauge = TEMPLOG_MAP_INSTANT_AVERAGE,"TEMPLOG_MAP_INSTANT_AVERAGE", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +TEMPLOG_map_peakGauge = TEMPLOG_map_peak,"TEMPLOG_map_peak", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +TEMPLOG_MAP_AT_SPECIAL_POINTGauge = TEMPLOG_MAP_AT_SPECIAL_POINT,"TEMPLOG_MAP_AT_SPECIAL_POINT", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +TEMPLOG_MAP_AT_DIFFGauge = TEMPLOG_MAP_AT_DIFF,"TEMPLOG_MAP_AT_DIFF", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 + gaugeCategory = Sensors - Extra 2 egt1Gauge = egt1, "EGT#1", "C", 0, 2000 @@ -3418,6 +3416,8 @@ entry = vvtTargets2, "vvtTargets2", int, "%d" entry = vvtTargets3, "vvtTargets3", int, "%d" entry = vvtTargets4, "vvtTargets4", int, "%d" entry = turboSpeed, "Turbocharger Speed", int, "%d" +entry = TEMPLOG_MAP_AT_SPECIAL_POINT, "TEMPLOG_MAP_AT_SPECIAL_POINT", float, "%.3f" +entry = TEMPLOG_MAP_AT_DIFF, "TEMPLOG_MAP_AT_DIFF", float, "%.3f" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" entry = triggerSyncGapRatio, "triggerSyncGapRatio", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini index 7824d13558..3674fc9d1a 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.12.07.hellen128.2677049827" + signature = "rusEFI 2021.12.07.hellen128.483332750" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.07.hellen128.2677049827" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.07.hellen128.483332750" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Dec 07 03:11:00 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Dec 07 14:01:06 UTC 2021 pageSize = 24400 page = 1 @@ -877,8 +877,8 @@ alternatorPwmFrequency = scalar, S32, 2256, "Hz", 1, 0, 0, 3000, 0 unused2260 = scalar, S32, 2260, "units", 1, 0, -20, 100, 0 narrowToWideOxygenBins = array, F32, 2264, [8], "V", 1, 0, -10, 10, 3 narrowToWideOxygen = array, F32, 2296, [8], "ratio", 1, 0, -40, 40, 2 -vvtMode1 = bits, U08, 2328, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "vvt13", "vvt14", "vvt15" -vvtMode2 = bits, U08, 2329, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "vvt13", "vvt14", "vvt15" +vvtMode1 = bits, U08, 2328, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "VTwin by MAP", "vvt14", "vvt15" +vvtMode2 = bits, U08, 2329, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "VTwin by MAP", "vvt14", "vvt15" fan2ExtraIdle = scalar, U08, 2330, "%", 1, 0, 0, 100, 0 unusedOldBiquad = array, U08, 2331, [1], "units", 1, 0, -20, 100, 0 @@ -2259,14 +2259,8 @@ unusedAtTheEnd153 = scalar, U08, 472, "", 1, 0 unusedAtTheEnd154 = scalar, U08, 473, "", 1, 0 unusedAtTheEnd155 = scalar, U08, 474, "", 1, 0 unusedAtTheEnd156 = scalar, U08, 475, "", 1, 0 -unusedAtTheEnd157 = scalar, U08, 476, "", 1, 0 -unusedAtTheEnd158 = scalar, U08, 477, "", 1, 0 -unusedAtTheEnd159 = scalar, U08, 478, "", 1, 0 -unusedAtTheEnd160 = scalar, U08, 479, "", 1, 0 -unusedAtTheEnd161 = scalar, U08, 480, "", 1, 0 -unusedAtTheEnd162 = scalar, U08, 481, "", 1, 0 -unusedAtTheEnd163 = scalar, U08, 482, "", 1, 0 -unusedAtTheEnd164 = scalar, U08, 483, "", 1, 0 +TEMPLOG_MAP_AT_SPECIAL_POINT = scalar, F32, 476, "", 1, 0 +TEMPLOG_MAP_AT_DIFF = scalar, F32, 480, "", 1, 0 vvtSyncGapRatio = scalar, F32, 484, "", 1, 0 vvtCurrentPosition = scalar, F32, 488, "", 1, 0 triggerSyncGapRatio = scalar, F32, 492, "", 1, 0 @@ -2938,8 +2932,6 @@ etbStatus_dTermGauge = etbStatus_dTerm,"etbStatus_ dTerm", "", -10000.0,10000.0, etbStatus_outputGauge = etbStatus_output,"etbStatus_ output", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 etbStatus_errorGauge = etbStatus_error,"etbStatus_ error", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 etbStatus_resetCounterGauge = etbStatus_resetCounter,"etbStatus_ resetCounter", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 0,0 -TEMPLOG_MAP_INSTANT_AVERAGEGauge = TEMPLOG_MAP_INSTANT_AVERAGE,"TEMPLOG_MAP_INSTANT_AVERAGE", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 -TEMPLOG_map_peakGauge = TEMPLOG_map_peak,"TEMPLOG_map_peak", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 canReadCounterGauge = canReadCounter,"canReadCounter", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 canWriteOkGauge = canWriteOk,"canWriteOk", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 canWriteNotOkGauge = canWriteNotOk,"canWriteNotOk", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 @@ -2948,6 +2940,12 @@ triggerStateIndexGauge = triggerStateIndex,"triggerStateIndex", "", -10000.0,100 vvtSyncGapRatioGauge = vvtSyncGapRatio,"vvtSyncGapRatio", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 vvtStateIndexGauge = vvtStateIndex,"vvtStateIndex", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +gaugeCategory = MAP Cam +TEMPLOG_MAP_INSTANT_AVERAGEGauge = TEMPLOG_MAP_INSTANT_AVERAGE,"TEMPLOG_MAP_INSTANT_AVERAGE", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +TEMPLOG_map_peakGauge = TEMPLOG_map_peak,"TEMPLOG_map_peak", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +TEMPLOG_MAP_AT_SPECIAL_POINTGauge = TEMPLOG_MAP_AT_SPECIAL_POINT,"TEMPLOG_MAP_AT_SPECIAL_POINT", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +TEMPLOG_MAP_AT_DIFFGauge = TEMPLOG_MAP_AT_DIFF,"TEMPLOG_MAP_AT_DIFF", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 + gaugeCategory = Sensors - Extra 2 egt1Gauge = egt1, "EGT#1", "C", 0, 2000 @@ -3418,6 +3416,8 @@ entry = vvtTargets2, "vvtTargets2", int, "%d" entry = vvtTargets3, "vvtTargets3", int, "%d" entry = vvtTargets4, "vvtTargets4", int, "%d" entry = turboSpeed, "Turbocharger Speed", int, "%d" +entry = TEMPLOG_MAP_AT_SPECIAL_POINT, "TEMPLOG_MAP_AT_SPECIAL_POINT", float, "%.3f" +entry = TEMPLOG_MAP_AT_DIFF, "TEMPLOG_MAP_AT_DIFF", float, "%.3f" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" entry = triggerSyncGapRatio, "triggerSyncGapRatio", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini index 70689c7963..92180e44c8 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.12.07.hellen154hyundai.662888674" + signature = "rusEFI 2021.12.07.hellen154hyundai.2765978511" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.07.hellen154hyundai.662888674" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.07.hellen154hyundai.2765978511" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Dec 07 03:11:10 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Dec 07 14:01:16 UTC 2021 pageSize = 24400 page = 1 @@ -877,8 +877,8 @@ alternatorPwmFrequency = scalar, S32, 2256, "Hz", 1, 0, 0, 3000, 0 unused2260 = scalar, S32, 2260, "units", 1, 0, -20, 100, 0 narrowToWideOxygenBins = array, F32, 2264, [8], "V", 1, 0, -10, 10, 3 narrowToWideOxygen = array, F32, 2296, [8], "ratio", 1, 0, -40, 40, 2 -vvtMode1 = bits, U08, 2328, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "vvt13", "vvt14", "vvt15" -vvtMode2 = bits, U08, 2329, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "vvt13", "vvt14", "vvt15" +vvtMode1 = bits, U08, 2328, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "VTwin by MAP", "vvt14", "vvt15" +vvtMode2 = bits, U08, 2329, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "VTwin by MAP", "vvt14", "vvt15" fan2ExtraIdle = scalar, U08, 2330, "%", 1, 0, 0, 100, 0 unusedOldBiquad = array, U08, 2331, [1], "units", 1, 0, -20, 100, 0 @@ -2259,14 +2259,8 @@ unusedAtTheEnd153 = scalar, U08, 472, "", 1, 0 unusedAtTheEnd154 = scalar, U08, 473, "", 1, 0 unusedAtTheEnd155 = scalar, U08, 474, "", 1, 0 unusedAtTheEnd156 = scalar, U08, 475, "", 1, 0 -unusedAtTheEnd157 = scalar, U08, 476, "", 1, 0 -unusedAtTheEnd158 = scalar, U08, 477, "", 1, 0 -unusedAtTheEnd159 = scalar, U08, 478, "", 1, 0 -unusedAtTheEnd160 = scalar, U08, 479, "", 1, 0 -unusedAtTheEnd161 = scalar, U08, 480, "", 1, 0 -unusedAtTheEnd162 = scalar, U08, 481, "", 1, 0 -unusedAtTheEnd163 = scalar, U08, 482, "", 1, 0 -unusedAtTheEnd164 = scalar, U08, 483, "", 1, 0 +TEMPLOG_MAP_AT_SPECIAL_POINT = scalar, F32, 476, "", 1, 0 +TEMPLOG_MAP_AT_DIFF = scalar, F32, 480, "", 1, 0 vvtSyncGapRatio = scalar, F32, 484, "", 1, 0 vvtCurrentPosition = scalar, F32, 488, "", 1, 0 triggerSyncGapRatio = scalar, F32, 492, "", 1, 0 @@ -2938,8 +2932,6 @@ etbStatus_dTermGauge = etbStatus_dTerm,"etbStatus_ dTerm", "", -10000.0,10000.0, etbStatus_outputGauge = etbStatus_output,"etbStatus_ output", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 etbStatus_errorGauge = etbStatus_error,"etbStatus_ error", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 etbStatus_resetCounterGauge = etbStatus_resetCounter,"etbStatus_ resetCounter", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 0,0 -TEMPLOG_MAP_INSTANT_AVERAGEGauge = TEMPLOG_MAP_INSTANT_AVERAGE,"TEMPLOG_MAP_INSTANT_AVERAGE", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 -TEMPLOG_map_peakGauge = TEMPLOG_map_peak,"TEMPLOG_map_peak", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 canReadCounterGauge = canReadCounter,"canReadCounter", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 canWriteOkGauge = canWriteOk,"canWriteOk", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 canWriteNotOkGauge = canWriteNotOk,"canWriteNotOk", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 @@ -2948,6 +2940,12 @@ triggerStateIndexGauge = triggerStateIndex,"triggerStateIndex", "", -10000.0,100 vvtSyncGapRatioGauge = vvtSyncGapRatio,"vvtSyncGapRatio", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 vvtStateIndexGauge = vvtStateIndex,"vvtStateIndex", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +gaugeCategory = MAP Cam +TEMPLOG_MAP_INSTANT_AVERAGEGauge = TEMPLOG_MAP_INSTANT_AVERAGE,"TEMPLOG_MAP_INSTANT_AVERAGE", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +TEMPLOG_map_peakGauge = TEMPLOG_map_peak,"TEMPLOG_map_peak", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +TEMPLOG_MAP_AT_SPECIAL_POINTGauge = TEMPLOG_MAP_AT_SPECIAL_POINT,"TEMPLOG_MAP_AT_SPECIAL_POINT", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +TEMPLOG_MAP_AT_DIFFGauge = TEMPLOG_MAP_AT_DIFF,"TEMPLOG_MAP_AT_DIFF", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 + gaugeCategory = Sensors - Extra 2 egt1Gauge = egt1, "EGT#1", "C", 0, 2000 @@ -3418,6 +3416,8 @@ entry = vvtTargets2, "vvtTargets2", int, "%d" entry = vvtTargets3, "vvtTargets3", int, "%d" entry = vvtTargets4, "vvtTargets4", int, "%d" entry = turboSpeed, "Turbocharger Speed", int, "%d" +entry = TEMPLOG_MAP_AT_SPECIAL_POINT, "TEMPLOG_MAP_AT_SPECIAL_POINT", float, "%.3f" +entry = TEMPLOG_MAP_AT_DIFF, "TEMPLOG_MAP_AT_DIFF", float, "%.3f" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" entry = triggerSyncGapRatio, "triggerSyncGapRatio", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index d1a095bb02..a2842994f3 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen72.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen72.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.12.07.hellen72.4058736116" + signature = "rusEFI 2021.12.07.hellen72.1924464281" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.07.hellen72.4058736116" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.07.hellen72.1924464281" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Dec 07 03:11:17 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Dec 07 14:01:23 UTC 2021 pageSize = 24400 page = 1 @@ -877,8 +877,8 @@ alternatorPwmFrequency = scalar, S32, 2256, "Hz", 1, 0, 0, 3000, 0 unused2260 = scalar, S32, 2260, "units", 1, 0, -20, 100, 0 narrowToWideOxygenBins = array, F32, 2264, [8], "V", 1, 0, -10, 10, 3 narrowToWideOxygen = array, F32, 2296, [8], "ratio", 1, 0, -40, 40, 2 -vvtMode1 = bits, U08, 2328, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "vvt13", "vvt14", "vvt15" -vvtMode2 = bits, U08, 2329, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "vvt13", "vvt14", "vvt15" +vvtMode1 = bits, U08, 2328, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "VTwin by MAP", "vvt14", "vvt15" +vvtMode2 = bits, U08, 2329, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "VTwin by MAP", "vvt14", "vvt15" fan2ExtraIdle = scalar, U08, 2330, "%", 1, 0, 0, 100, 0 unusedOldBiquad = array, U08, 2331, [1], "units", 1, 0, -20, 100, 0 @@ -2259,14 +2259,8 @@ unusedAtTheEnd153 = scalar, U08, 472, "", 1, 0 unusedAtTheEnd154 = scalar, U08, 473, "", 1, 0 unusedAtTheEnd155 = scalar, U08, 474, "", 1, 0 unusedAtTheEnd156 = scalar, U08, 475, "", 1, 0 -unusedAtTheEnd157 = scalar, U08, 476, "", 1, 0 -unusedAtTheEnd158 = scalar, U08, 477, "", 1, 0 -unusedAtTheEnd159 = scalar, U08, 478, "", 1, 0 -unusedAtTheEnd160 = scalar, U08, 479, "", 1, 0 -unusedAtTheEnd161 = scalar, U08, 480, "", 1, 0 -unusedAtTheEnd162 = scalar, U08, 481, "", 1, 0 -unusedAtTheEnd163 = scalar, U08, 482, "", 1, 0 -unusedAtTheEnd164 = scalar, U08, 483, "", 1, 0 +TEMPLOG_MAP_AT_SPECIAL_POINT = scalar, F32, 476, "", 1, 0 +TEMPLOG_MAP_AT_DIFF = scalar, F32, 480, "", 1, 0 vvtSyncGapRatio = scalar, F32, 484, "", 1, 0 vvtCurrentPosition = scalar, F32, 488, "", 1, 0 triggerSyncGapRatio = scalar, F32, 492, "", 1, 0 @@ -2938,8 +2932,6 @@ etbStatus_dTermGauge = etbStatus_dTerm,"etbStatus_ dTerm", "", -10000.0,10000.0, etbStatus_outputGauge = etbStatus_output,"etbStatus_ output", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 etbStatus_errorGauge = etbStatus_error,"etbStatus_ error", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 etbStatus_resetCounterGauge = etbStatus_resetCounter,"etbStatus_ resetCounter", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 0,0 -TEMPLOG_MAP_INSTANT_AVERAGEGauge = TEMPLOG_MAP_INSTANT_AVERAGE,"TEMPLOG_MAP_INSTANT_AVERAGE", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 -TEMPLOG_map_peakGauge = TEMPLOG_map_peak,"TEMPLOG_map_peak", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 canReadCounterGauge = canReadCounter,"canReadCounter", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 canWriteOkGauge = canWriteOk,"canWriteOk", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 canWriteNotOkGauge = canWriteNotOk,"canWriteNotOk", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 @@ -2948,6 +2940,12 @@ triggerStateIndexGauge = triggerStateIndex,"triggerStateIndex", "", -10000.0,100 vvtSyncGapRatioGauge = vvtSyncGapRatio,"vvtSyncGapRatio", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 vvtStateIndexGauge = vvtStateIndex,"vvtStateIndex", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +gaugeCategory = MAP Cam +TEMPLOG_MAP_INSTANT_AVERAGEGauge = TEMPLOG_MAP_INSTANT_AVERAGE,"TEMPLOG_MAP_INSTANT_AVERAGE", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +TEMPLOG_map_peakGauge = TEMPLOG_map_peak,"TEMPLOG_map_peak", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +TEMPLOG_MAP_AT_SPECIAL_POINTGauge = TEMPLOG_MAP_AT_SPECIAL_POINT,"TEMPLOG_MAP_AT_SPECIAL_POINT", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +TEMPLOG_MAP_AT_DIFFGauge = TEMPLOG_MAP_AT_DIFF,"TEMPLOG_MAP_AT_DIFF", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 + gaugeCategory = Sensors - Extra 2 egt1Gauge = egt1, "EGT#1", "C", 0, 2000 @@ -3418,6 +3416,8 @@ entry = vvtTargets2, "vvtTargets2", int, "%d" entry = vvtTargets3, "vvtTargets3", int, "%d" entry = vvtTargets4, "vvtTargets4", int, "%d" entry = turboSpeed, "Turbocharger Speed", int, "%d" +entry = TEMPLOG_MAP_AT_SPECIAL_POINT, "TEMPLOG_MAP_AT_SPECIAL_POINT", float, "%.3f" +entry = TEMPLOG_MAP_AT_DIFF, "TEMPLOG_MAP_AT_DIFF", float, "%.3f" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" entry = triggerSyncGapRatio, "triggerSyncGapRatio", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_hellen81.ini b/firmware/tunerstudio/generated/rusefi_hellen81.ini index 4ae86e4947..40545ea85a 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen81.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen81.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.12.07.hellen81.1172764679" + signature = "rusEFI 2021.12.07.hellen81.3334038378" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.07.hellen81.1172764679" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.07.hellen81.3334038378" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Dec 07 03:11:20 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Dec 07 14:01:27 UTC 2021 pageSize = 24400 page = 1 @@ -877,8 +877,8 @@ alternatorPwmFrequency = scalar, S32, 2256, "Hz", 1, 0, 0, 3000, 0 unused2260 = scalar, S32, 2260, "units", 1, 0, -20, 100, 0 narrowToWideOxygenBins = array, F32, 2264, [8], "V", 1, 0, -10, 10, 3 narrowToWideOxygen = array, F32, 2296, [8], "ratio", 1, 0, -40, 40, 2 -vvtMode1 = bits, U08, 2328, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "vvt13", "vvt14", "vvt15" -vvtMode2 = bits, U08, 2329, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "vvt13", "vvt14", "vvt15" +vvtMode1 = bits, U08, 2328, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "VTwin by MAP", "vvt14", "vvt15" +vvtMode2 = bits, U08, 2329, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "VTwin by MAP", "vvt14", "vvt15" fan2ExtraIdle = scalar, U08, 2330, "%", 1, 0, 0, 100, 0 unusedOldBiquad = array, U08, 2331, [1], "units", 1, 0, -20, 100, 0 @@ -2259,14 +2259,8 @@ unusedAtTheEnd153 = scalar, U08, 472, "", 1, 0 unusedAtTheEnd154 = scalar, U08, 473, "", 1, 0 unusedAtTheEnd155 = scalar, U08, 474, "", 1, 0 unusedAtTheEnd156 = scalar, U08, 475, "", 1, 0 -unusedAtTheEnd157 = scalar, U08, 476, "", 1, 0 -unusedAtTheEnd158 = scalar, U08, 477, "", 1, 0 -unusedAtTheEnd159 = scalar, U08, 478, "", 1, 0 -unusedAtTheEnd160 = scalar, U08, 479, "", 1, 0 -unusedAtTheEnd161 = scalar, U08, 480, "", 1, 0 -unusedAtTheEnd162 = scalar, U08, 481, "", 1, 0 -unusedAtTheEnd163 = scalar, U08, 482, "", 1, 0 -unusedAtTheEnd164 = scalar, U08, 483, "", 1, 0 +TEMPLOG_MAP_AT_SPECIAL_POINT = scalar, F32, 476, "", 1, 0 +TEMPLOG_MAP_AT_DIFF = scalar, F32, 480, "", 1, 0 vvtSyncGapRatio = scalar, F32, 484, "", 1, 0 vvtCurrentPosition = scalar, F32, 488, "", 1, 0 triggerSyncGapRatio = scalar, F32, 492, "", 1, 0 @@ -2938,8 +2932,6 @@ etbStatus_dTermGauge = etbStatus_dTerm,"etbStatus_ dTerm", "", -10000.0,10000.0, etbStatus_outputGauge = etbStatus_output,"etbStatus_ output", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 etbStatus_errorGauge = etbStatus_error,"etbStatus_ error", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 etbStatus_resetCounterGauge = etbStatus_resetCounter,"etbStatus_ resetCounter", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 0,0 -TEMPLOG_MAP_INSTANT_AVERAGEGauge = TEMPLOG_MAP_INSTANT_AVERAGE,"TEMPLOG_MAP_INSTANT_AVERAGE", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 -TEMPLOG_map_peakGauge = TEMPLOG_map_peak,"TEMPLOG_map_peak", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 canReadCounterGauge = canReadCounter,"canReadCounter", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 canWriteOkGauge = canWriteOk,"canWriteOk", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 canWriteNotOkGauge = canWriteNotOk,"canWriteNotOk", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 @@ -2948,6 +2940,12 @@ triggerStateIndexGauge = triggerStateIndex,"triggerStateIndex", "", -10000.0,100 vvtSyncGapRatioGauge = vvtSyncGapRatio,"vvtSyncGapRatio", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 vvtStateIndexGauge = vvtStateIndex,"vvtStateIndex", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +gaugeCategory = MAP Cam +TEMPLOG_MAP_INSTANT_AVERAGEGauge = TEMPLOG_MAP_INSTANT_AVERAGE,"TEMPLOG_MAP_INSTANT_AVERAGE", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +TEMPLOG_map_peakGauge = TEMPLOG_map_peak,"TEMPLOG_map_peak", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +TEMPLOG_MAP_AT_SPECIAL_POINTGauge = TEMPLOG_MAP_AT_SPECIAL_POINT,"TEMPLOG_MAP_AT_SPECIAL_POINT", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +TEMPLOG_MAP_AT_DIFFGauge = TEMPLOG_MAP_AT_DIFF,"TEMPLOG_MAP_AT_DIFF", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 + gaugeCategory = Sensors - Extra 2 egt1Gauge = egt1, "EGT#1", "C", 0, 2000 @@ -3418,6 +3416,8 @@ entry = vvtTargets2, "vvtTargets2", int, "%d" entry = vvtTargets3, "vvtTargets3", int, "%d" entry = vvtTargets4, "vvtTargets4", int, "%d" entry = turboSpeed, "Turbocharger Speed", int, "%d" +entry = TEMPLOG_MAP_AT_SPECIAL_POINT, "TEMPLOG_MAP_AT_SPECIAL_POINT", float, "%.3f" +entry = TEMPLOG_MAP_AT_DIFF, "TEMPLOG_MAP_AT_DIFF", float, "%.3f" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" entry = triggerSyncGapRatio, "triggerSyncGapRatio", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini index d0a68a3935..61a1cb05a9 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.12.07.hellen88bmw.2761323291" + signature = "rusEFI 2021.12.07.hellen88bmw.667543670" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.07.hellen88bmw.2761323291" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.07.hellen88bmw.667543670" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Dec 07 03:11:13 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Dec 07 14:01:20 UTC 2021 pageSize = 24400 page = 1 @@ -877,8 +877,8 @@ alternatorPwmFrequency = scalar, S32, 2256, "Hz", 1, 0, 0, 3000, 0 unused2260 = scalar, S32, 2260, "units", 1, 0, -20, 100, 0 narrowToWideOxygenBins = array, F32, 2264, [8], "V", 1, 0, -10, 10, 3 narrowToWideOxygen = array, F32, 2296, [8], "ratio", 1, 0, -40, 40, 2 -vvtMode1 = bits, U08, 2328, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "vvt13", "vvt14", "vvt15" -vvtMode2 = bits, U08, 2329, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "vvt13", "vvt14", "vvt15" +vvtMode1 = bits, U08, 2328, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "VTwin by MAP", "vvt14", "vvt15" +vvtMode2 = bits, U08, 2329, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "VTwin by MAP", "vvt14", "vvt15" fan2ExtraIdle = scalar, U08, 2330, "%", 1, 0, 0, 100, 0 unusedOldBiquad = array, U08, 2331, [1], "units", 1, 0, -20, 100, 0 @@ -2259,14 +2259,8 @@ unusedAtTheEnd153 = scalar, U08, 472, "", 1, 0 unusedAtTheEnd154 = scalar, U08, 473, "", 1, 0 unusedAtTheEnd155 = scalar, U08, 474, "", 1, 0 unusedAtTheEnd156 = scalar, U08, 475, "", 1, 0 -unusedAtTheEnd157 = scalar, U08, 476, "", 1, 0 -unusedAtTheEnd158 = scalar, U08, 477, "", 1, 0 -unusedAtTheEnd159 = scalar, U08, 478, "", 1, 0 -unusedAtTheEnd160 = scalar, U08, 479, "", 1, 0 -unusedAtTheEnd161 = scalar, U08, 480, "", 1, 0 -unusedAtTheEnd162 = scalar, U08, 481, "", 1, 0 -unusedAtTheEnd163 = scalar, U08, 482, "", 1, 0 -unusedAtTheEnd164 = scalar, U08, 483, "", 1, 0 +TEMPLOG_MAP_AT_SPECIAL_POINT = scalar, F32, 476, "", 1, 0 +TEMPLOG_MAP_AT_DIFF = scalar, F32, 480, "", 1, 0 vvtSyncGapRatio = scalar, F32, 484, "", 1, 0 vvtCurrentPosition = scalar, F32, 488, "", 1, 0 triggerSyncGapRatio = scalar, F32, 492, "", 1, 0 @@ -2938,8 +2932,6 @@ etbStatus_dTermGauge = etbStatus_dTerm,"etbStatus_ dTerm", "", -10000.0,10000.0, etbStatus_outputGauge = etbStatus_output,"etbStatus_ output", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 etbStatus_errorGauge = etbStatus_error,"etbStatus_ error", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 etbStatus_resetCounterGauge = etbStatus_resetCounter,"etbStatus_ resetCounter", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 0,0 -TEMPLOG_MAP_INSTANT_AVERAGEGauge = TEMPLOG_MAP_INSTANT_AVERAGE,"TEMPLOG_MAP_INSTANT_AVERAGE", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 -TEMPLOG_map_peakGauge = TEMPLOG_map_peak,"TEMPLOG_map_peak", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 canReadCounterGauge = canReadCounter,"canReadCounter", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 canWriteOkGauge = canWriteOk,"canWriteOk", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 canWriteNotOkGauge = canWriteNotOk,"canWriteNotOk", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 @@ -2948,6 +2940,12 @@ triggerStateIndexGauge = triggerStateIndex,"triggerStateIndex", "", -10000.0,100 vvtSyncGapRatioGauge = vvtSyncGapRatio,"vvtSyncGapRatio", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 vvtStateIndexGauge = vvtStateIndex,"vvtStateIndex", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +gaugeCategory = MAP Cam +TEMPLOG_MAP_INSTANT_AVERAGEGauge = TEMPLOG_MAP_INSTANT_AVERAGE,"TEMPLOG_MAP_INSTANT_AVERAGE", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +TEMPLOG_map_peakGauge = TEMPLOG_map_peak,"TEMPLOG_map_peak", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +TEMPLOG_MAP_AT_SPECIAL_POINTGauge = TEMPLOG_MAP_AT_SPECIAL_POINT,"TEMPLOG_MAP_AT_SPECIAL_POINT", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +TEMPLOG_MAP_AT_DIFFGauge = TEMPLOG_MAP_AT_DIFF,"TEMPLOG_MAP_AT_DIFF", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 + gaugeCategory = Sensors - Extra 2 egt1Gauge = egt1, "EGT#1", "C", 0, 2000 @@ -3418,6 +3416,8 @@ entry = vvtTargets2, "vvtTargets2", int, "%d" entry = vvtTargets3, "vvtTargets3", int, "%d" entry = vvtTargets4, "vvtTargets4", int, "%d" entry = turboSpeed, "Turbocharger Speed", int, "%d" +entry = TEMPLOG_MAP_AT_SPECIAL_POINT, "TEMPLOG_MAP_AT_SPECIAL_POINT", float, "%.3f" +entry = TEMPLOG_MAP_AT_DIFF, "TEMPLOG_MAP_AT_DIFF", float, "%.3f" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" entry = triggerSyncGapRatio, "triggerSyncGapRatio", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index 17933f9a3a..2c62145eef 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.12.07.hellenNA6.1936434412" + signature = "rusEFI 2021.12.07.hellenNA6.4029955969" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.07.hellenNA6.1936434412" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.07.hellenNA6.4029955969" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Dec 07 03:11:27 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Dec 07 14:01:33 UTC 2021 pageSize = 24400 page = 1 @@ -877,8 +877,8 @@ alternatorPwmFrequency = scalar, S32, 2256, "Hz", 1, 0, 0, 3000, 0 unused2260 = scalar, S32, 2260, "units", 1, 0, -20, 100, 0 narrowToWideOxygenBins = array, F32, 2264, [8], "V", 1, 0, -10, 10, 3 narrowToWideOxygen = array, F32, 2296, [8], "ratio", 1, 0, -40, 40, 2 -vvtMode1 = bits, U08, 2328, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "vvt13", "vvt14", "vvt15" -vvtMode2 = bits, U08, 2329, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "vvt13", "vvt14", "vvt15" +vvtMode1 = bits, U08, 2328, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "VTwin by MAP", "vvt14", "vvt15" +vvtMode2 = bits, U08, 2329, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "VTwin by MAP", "vvt14", "vvt15" fan2ExtraIdle = scalar, U08, 2330, "%", 1, 0, 0, 100, 0 unusedOldBiquad = array, U08, 2331, [1], "units", 1, 0, -20, 100, 0 @@ -2259,14 +2259,8 @@ unusedAtTheEnd153 = scalar, U08, 472, "", 1, 0 unusedAtTheEnd154 = scalar, U08, 473, "", 1, 0 unusedAtTheEnd155 = scalar, U08, 474, "", 1, 0 unusedAtTheEnd156 = scalar, U08, 475, "", 1, 0 -unusedAtTheEnd157 = scalar, U08, 476, "", 1, 0 -unusedAtTheEnd158 = scalar, U08, 477, "", 1, 0 -unusedAtTheEnd159 = scalar, U08, 478, "", 1, 0 -unusedAtTheEnd160 = scalar, U08, 479, "", 1, 0 -unusedAtTheEnd161 = scalar, U08, 480, "", 1, 0 -unusedAtTheEnd162 = scalar, U08, 481, "", 1, 0 -unusedAtTheEnd163 = scalar, U08, 482, "", 1, 0 -unusedAtTheEnd164 = scalar, U08, 483, "", 1, 0 +TEMPLOG_MAP_AT_SPECIAL_POINT = scalar, F32, 476, "", 1, 0 +TEMPLOG_MAP_AT_DIFF = scalar, F32, 480, "", 1, 0 vvtSyncGapRatio = scalar, F32, 484, "", 1, 0 vvtCurrentPosition = scalar, F32, 488, "", 1, 0 triggerSyncGapRatio = scalar, F32, 492, "", 1, 0 @@ -2938,8 +2932,6 @@ etbStatus_dTermGauge = etbStatus_dTerm,"etbStatus_ dTerm", "", -10000.0,10000.0, etbStatus_outputGauge = etbStatus_output,"etbStatus_ output", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 etbStatus_errorGauge = etbStatus_error,"etbStatus_ error", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 etbStatus_resetCounterGauge = etbStatus_resetCounter,"etbStatus_ resetCounter", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 0,0 -TEMPLOG_MAP_INSTANT_AVERAGEGauge = TEMPLOG_MAP_INSTANT_AVERAGE,"TEMPLOG_MAP_INSTANT_AVERAGE", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 -TEMPLOG_map_peakGauge = TEMPLOG_map_peak,"TEMPLOG_map_peak", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 canReadCounterGauge = canReadCounter,"canReadCounter", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 canWriteOkGauge = canWriteOk,"canWriteOk", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 canWriteNotOkGauge = canWriteNotOk,"canWriteNotOk", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 @@ -2948,6 +2940,12 @@ triggerStateIndexGauge = triggerStateIndex,"triggerStateIndex", "", -10000.0,100 vvtSyncGapRatioGauge = vvtSyncGapRatio,"vvtSyncGapRatio", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 vvtStateIndexGauge = vvtStateIndex,"vvtStateIndex", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +gaugeCategory = MAP Cam +TEMPLOG_MAP_INSTANT_AVERAGEGauge = TEMPLOG_MAP_INSTANT_AVERAGE,"TEMPLOG_MAP_INSTANT_AVERAGE", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +TEMPLOG_map_peakGauge = TEMPLOG_map_peak,"TEMPLOG_map_peak", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +TEMPLOG_MAP_AT_SPECIAL_POINTGauge = TEMPLOG_MAP_AT_SPECIAL_POINT,"TEMPLOG_MAP_AT_SPECIAL_POINT", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +TEMPLOG_MAP_AT_DIFFGauge = TEMPLOG_MAP_AT_DIFF,"TEMPLOG_MAP_AT_DIFF", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 + gaugeCategory = Sensors - Extra 2 egt1Gauge = egt1, "EGT#1", "C", 0, 2000 @@ -3418,6 +3416,8 @@ entry = vvtTargets2, "vvtTargets2", int, "%d" entry = vvtTargets3, "vvtTargets3", int, "%d" entry = vvtTargets4, "vvtTargets4", int, "%d" entry = turboSpeed, "Turbocharger Speed", int, "%d" +entry = TEMPLOG_MAP_AT_SPECIAL_POINT, "TEMPLOG_MAP_AT_SPECIAL_POINT", float, "%.3f" +entry = TEMPLOG_MAP_AT_DIFF, "TEMPLOG_MAP_AT_DIFF", float, "%.3f" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" entry = triggerSyncGapRatio, "triggerSyncGapRatio", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini index 2f98aa2f82..2e3deb2c38 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.12.07.hellen_cypress.1067648504" + signature = "rusEFI 2021.12.07.hellen_cypress.3170672277" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.07.hellen_cypress.1067648504" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.07.hellen_cypress.3170672277" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Tue Dec 07 03:12:02 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Tue Dec 07 14:02:10 UTC 2021 pageSize = 24400 page = 1 @@ -877,8 +877,8 @@ alternatorPwmFrequency = scalar, S32, 2256, "Hz", 1, 0, 0, 3000, 0 unused2260 = scalar, S32, 2260, "units", 1, 0, -20, 100, 0 narrowToWideOxygenBins = array, F32, 2264, [8], "V", 1, 0, -10, 10, 3 narrowToWideOxygen = array, F32, 2296, [8], "ratio", 1, 0, -40, 40, 2 -vvtMode1 = bits, U08, 2328, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "vvt13", "vvt14", "vvt15" -vvtMode2 = bits, U08, 2329, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "vvt13", "vvt14", "vvt15" +vvtMode1 = bits, U08, 2328, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "VTwin by MAP", "vvt14", "vvt15" +vvtMode2 = bits, U08, 2329, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "VTwin by MAP", "vvt14", "vvt15" fan2ExtraIdle = scalar, U08, 2330, "%", 1, 0, 0, 100, 0 unusedOldBiquad = array, U08, 2331, [1], "units", 1, 0, -20, 100, 0 @@ -2259,14 +2259,8 @@ unusedAtTheEnd153 = scalar, U08, 472, "", 1, 0 unusedAtTheEnd154 = scalar, U08, 473, "", 1, 0 unusedAtTheEnd155 = scalar, U08, 474, "", 1, 0 unusedAtTheEnd156 = scalar, U08, 475, "", 1, 0 -unusedAtTheEnd157 = scalar, U08, 476, "", 1, 0 -unusedAtTheEnd158 = scalar, U08, 477, "", 1, 0 -unusedAtTheEnd159 = scalar, U08, 478, "", 1, 0 -unusedAtTheEnd160 = scalar, U08, 479, "", 1, 0 -unusedAtTheEnd161 = scalar, U08, 480, "", 1, 0 -unusedAtTheEnd162 = scalar, U08, 481, "", 1, 0 -unusedAtTheEnd163 = scalar, U08, 482, "", 1, 0 -unusedAtTheEnd164 = scalar, U08, 483, "", 1, 0 +TEMPLOG_MAP_AT_SPECIAL_POINT = scalar, F32, 476, "", 1, 0 +TEMPLOG_MAP_AT_DIFF = scalar, F32, 480, "", 1, 0 vvtSyncGapRatio = scalar, F32, 484, "", 1, 0 vvtCurrentPosition = scalar, F32, 488, "", 1, 0 triggerSyncGapRatio = scalar, F32, 492, "", 1, 0 @@ -2938,8 +2932,6 @@ etbStatus_dTermGauge = etbStatus_dTerm,"etbStatus_ dTerm", "", -10000.0,10000.0, etbStatus_outputGauge = etbStatus_output,"etbStatus_ output", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 etbStatus_errorGauge = etbStatus_error,"etbStatus_ error", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 etbStatus_resetCounterGauge = etbStatus_resetCounter,"etbStatus_ resetCounter", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 0,0 -TEMPLOG_MAP_INSTANT_AVERAGEGauge = TEMPLOG_MAP_INSTANT_AVERAGE,"TEMPLOG_MAP_INSTANT_AVERAGE", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 -TEMPLOG_map_peakGauge = TEMPLOG_map_peak,"TEMPLOG_map_peak", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 canReadCounterGauge = canReadCounter,"canReadCounter", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 canWriteOkGauge = canWriteOk,"canWriteOk", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 canWriteNotOkGauge = canWriteNotOk,"canWriteNotOk", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 @@ -2948,6 +2940,12 @@ triggerStateIndexGauge = triggerStateIndex,"triggerStateIndex", "", -10000.0,100 vvtSyncGapRatioGauge = vvtSyncGapRatio,"vvtSyncGapRatio", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 vvtStateIndexGauge = vvtStateIndex,"vvtStateIndex", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +gaugeCategory = MAP Cam +TEMPLOG_MAP_INSTANT_AVERAGEGauge = TEMPLOG_MAP_INSTANT_AVERAGE,"TEMPLOG_MAP_INSTANT_AVERAGE", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +TEMPLOG_map_peakGauge = TEMPLOG_map_peak,"TEMPLOG_map_peak", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +TEMPLOG_MAP_AT_SPECIAL_POINTGauge = TEMPLOG_MAP_AT_SPECIAL_POINT,"TEMPLOG_MAP_AT_SPECIAL_POINT", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +TEMPLOG_MAP_AT_DIFFGauge = TEMPLOG_MAP_AT_DIFF,"TEMPLOG_MAP_AT_DIFF", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 + gaugeCategory = Sensors - Extra 2 egt1Gauge = egt1, "EGT#1", "C", 0, 2000 @@ -3418,6 +3416,8 @@ entry = vvtTargets2, "vvtTargets2", int, "%d" entry = vvtTargets3, "vvtTargets3", int, "%d" entry = vvtTargets4, "vvtTargets4", int, "%d" entry = turboSpeed, "Turbocharger Speed", int, "%d" +entry = TEMPLOG_MAP_AT_SPECIAL_POINT, "TEMPLOG_MAP_AT_SPECIAL_POINT", float, "%.3f" +entry = TEMPLOG_MAP_AT_DIFF, "TEMPLOG_MAP_AT_DIFF", float, "%.3f" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" entry = triggerSyncGapRatio, "triggerSyncGapRatio", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini index 83519972b0..90afa23ec7 100644 --- a/firmware/tunerstudio/generated/rusefi_kinetis.ini +++ b/firmware/tunerstudio/generated/rusefi_kinetis.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.12.07.kin.3221670148" + signature = "rusEFI 2021.12.07.kin.1129927273" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.07.kin.3221670148" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.07.kin.1129927273" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Tue Dec 07 03:11:59 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Tue Dec 07 14:02:07 UTC 2021 pageSize = 24372 page = 1 @@ -863,7 +863,7 @@ alternatorPwmFrequency = scalar, S32, 2248, "Hz", 1, 0, 0, 3000, 0 unused2260 = scalar, S32, 2252, "units", 1, 0, -20, 100, 0 narrowToWideOxygenBins = array, F32, 2256, [8], "V", 1, 0, -10, 10, 3 narrowToWideOxygen = array, F32, 2288, [8], "ratio", 1, 0, -40, 40, 2 -vvtMode1 = bits, U08, 2320, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "vvt13", "vvt14", "vvt15" +vvtMode1 = bits, U08, 2320, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "VTwin by MAP", "vvt14", "vvt15" vvtModePadding = array, U08, 2321, [1], fan2ExtraIdle = scalar, U08, 2322, "%", 1, 0, 0, 100, 0 unusedOldBiquad = array, U08, 2323, [1], "units", 1, 0, -20, 100, 0 @@ -2225,14 +2225,8 @@ unusedAtTheEnd153 = scalar, U08, 472, "", 1, 0 unusedAtTheEnd154 = scalar, U08, 473, "", 1, 0 unusedAtTheEnd155 = scalar, U08, 474, "", 1, 0 unusedAtTheEnd156 = scalar, U08, 475, "", 1, 0 -unusedAtTheEnd157 = scalar, U08, 476, "", 1, 0 -unusedAtTheEnd158 = scalar, U08, 477, "", 1, 0 -unusedAtTheEnd159 = scalar, U08, 478, "", 1, 0 -unusedAtTheEnd160 = scalar, U08, 479, "", 1, 0 -unusedAtTheEnd161 = scalar, U08, 480, "", 1, 0 -unusedAtTheEnd162 = scalar, U08, 481, "", 1, 0 -unusedAtTheEnd163 = scalar, U08, 482, "", 1, 0 -unusedAtTheEnd164 = scalar, U08, 483, "", 1, 0 +TEMPLOG_MAP_AT_SPECIAL_POINT = scalar, F32, 476, "", 1, 0 +TEMPLOG_MAP_AT_DIFF = scalar, F32, 480, "", 1, 0 vvtSyncGapRatio = scalar, F32, 484, "", 1, 0 vvtCurrentPosition = scalar, F32, 488, "", 1, 0 triggerSyncGapRatio = scalar, F32, 492, "", 1, 0 @@ -2904,8 +2898,6 @@ etbStatus_dTermGauge = etbStatus_dTerm,"etbStatus_ dTerm", "", -10000.0,10000.0, etbStatus_outputGauge = etbStatus_output,"etbStatus_ output", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 etbStatus_errorGauge = etbStatus_error,"etbStatus_ error", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 etbStatus_resetCounterGauge = etbStatus_resetCounter,"etbStatus_ resetCounter", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 0,0 -TEMPLOG_MAP_INSTANT_AVERAGEGauge = TEMPLOG_MAP_INSTANT_AVERAGE,"TEMPLOG_MAP_INSTANT_AVERAGE", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 -TEMPLOG_map_peakGauge = TEMPLOG_map_peak,"TEMPLOG_map_peak", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 canReadCounterGauge = canReadCounter,"canReadCounter", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 canWriteOkGauge = canWriteOk,"canWriteOk", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 canWriteNotOkGauge = canWriteNotOk,"canWriteNotOk", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 @@ -2914,6 +2906,12 @@ triggerStateIndexGauge = triggerStateIndex,"triggerStateIndex", "", -10000.0,100 vvtSyncGapRatioGauge = vvtSyncGapRatio,"vvtSyncGapRatio", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 vvtStateIndexGauge = vvtStateIndex,"vvtStateIndex", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +gaugeCategory = MAP Cam +TEMPLOG_MAP_INSTANT_AVERAGEGauge = TEMPLOG_MAP_INSTANT_AVERAGE,"TEMPLOG_MAP_INSTANT_AVERAGE", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +TEMPLOG_map_peakGauge = TEMPLOG_map_peak,"TEMPLOG_map_peak", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +TEMPLOG_MAP_AT_SPECIAL_POINTGauge = TEMPLOG_MAP_AT_SPECIAL_POINT,"TEMPLOG_MAP_AT_SPECIAL_POINT", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +TEMPLOG_MAP_AT_DIFFGauge = TEMPLOG_MAP_AT_DIFF,"TEMPLOG_MAP_AT_DIFF", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 + gaugeCategory = Sensors - Extra 2 egt1Gauge = egt1, "EGT#1", "C", 0, 2000 @@ -3384,6 +3382,8 @@ entry = vvtTargets2, "vvtTargets2", int, "%d" entry = vvtTargets3, "vvtTargets3", int, "%d" entry = vvtTargets4, "vvtTargets4", int, "%d" entry = turboSpeed, "Turbocharger Speed", int, "%d" +entry = TEMPLOG_MAP_AT_SPECIAL_POINT, "TEMPLOG_MAP_AT_SPECIAL_POINT", float, "%.3f" +entry = TEMPLOG_MAP_AT_DIFF, "TEMPLOG_MAP_AT_DIFF", float, "%.3f" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" entry = triggerSyncGapRatio, "triggerSyncGapRatio", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 7ff0b7992f..1fdd61fca3 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.12.07.mre_f4.3060898032" + signature = "rusEFI 2021.12.07.mre_f4.892208029" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.07.mre_f4.3060898032" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.07.mre_f4.892208029" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Dec 07 03:11:33 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Dec 07 14:01:40 UTC 2021 pageSize = 24400 page = 1 @@ -877,8 +877,8 @@ alternatorPwmFrequency = scalar, S32, 2256, "Hz", 1, 0, 0, 3000, 0 unused2260 = scalar, S32, 2260, "units", 1, 0, -20, 100, 0 narrowToWideOxygenBins = array, F32, 2264, [8], "V", 1, 0, -10, 10, 3 narrowToWideOxygen = array, F32, 2296, [8], "ratio", 1, 0, -40, 40, 2 -vvtMode1 = bits, U08, 2328, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "vvt13", "vvt14", "vvt15" -vvtMode2 = bits, U08, 2329, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "vvt13", "vvt14", "vvt15" +vvtMode1 = bits, U08, 2328, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "VTwin by MAP", "vvt14", "vvt15" +vvtMode2 = bits, U08, 2329, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "VTwin by MAP", "vvt14", "vvt15" fan2ExtraIdle = scalar, U08, 2330, "%", 1, 0, 0, 100, 0 unusedOldBiquad = array, U08, 2331, [1], "units", 1, 0, -20, 100, 0 @@ -2259,14 +2259,8 @@ unusedAtTheEnd153 = scalar, U08, 472, "", 1, 0 unusedAtTheEnd154 = scalar, U08, 473, "", 1, 0 unusedAtTheEnd155 = scalar, U08, 474, "", 1, 0 unusedAtTheEnd156 = scalar, U08, 475, "", 1, 0 -unusedAtTheEnd157 = scalar, U08, 476, "", 1, 0 -unusedAtTheEnd158 = scalar, U08, 477, "", 1, 0 -unusedAtTheEnd159 = scalar, U08, 478, "", 1, 0 -unusedAtTheEnd160 = scalar, U08, 479, "", 1, 0 -unusedAtTheEnd161 = scalar, U08, 480, "", 1, 0 -unusedAtTheEnd162 = scalar, U08, 481, "", 1, 0 -unusedAtTheEnd163 = scalar, U08, 482, "", 1, 0 -unusedAtTheEnd164 = scalar, U08, 483, "", 1, 0 +TEMPLOG_MAP_AT_SPECIAL_POINT = scalar, F32, 476, "", 1, 0 +TEMPLOG_MAP_AT_DIFF = scalar, F32, 480, "", 1, 0 vvtSyncGapRatio = scalar, F32, 484, "", 1, 0 vvtCurrentPosition = scalar, F32, 488, "", 1, 0 triggerSyncGapRatio = scalar, F32, 492, "", 1, 0 @@ -2938,8 +2932,6 @@ etbStatus_dTermGauge = etbStatus_dTerm,"etbStatus_ dTerm", "", -10000.0,10000.0, etbStatus_outputGauge = etbStatus_output,"etbStatus_ output", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 etbStatus_errorGauge = etbStatus_error,"etbStatus_ error", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 etbStatus_resetCounterGauge = etbStatus_resetCounter,"etbStatus_ resetCounter", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 0,0 -TEMPLOG_MAP_INSTANT_AVERAGEGauge = TEMPLOG_MAP_INSTANT_AVERAGE,"TEMPLOG_MAP_INSTANT_AVERAGE", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 -TEMPLOG_map_peakGauge = TEMPLOG_map_peak,"TEMPLOG_map_peak", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 canReadCounterGauge = canReadCounter,"canReadCounter", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 canWriteOkGauge = canWriteOk,"canWriteOk", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 canWriteNotOkGauge = canWriteNotOk,"canWriteNotOk", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 @@ -2948,6 +2940,12 @@ triggerStateIndexGauge = triggerStateIndex,"triggerStateIndex", "", -10000.0,100 vvtSyncGapRatioGauge = vvtSyncGapRatio,"vvtSyncGapRatio", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 vvtStateIndexGauge = vvtStateIndex,"vvtStateIndex", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +gaugeCategory = MAP Cam +TEMPLOG_MAP_INSTANT_AVERAGEGauge = TEMPLOG_MAP_INSTANT_AVERAGE,"TEMPLOG_MAP_INSTANT_AVERAGE", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +TEMPLOG_map_peakGauge = TEMPLOG_map_peak,"TEMPLOG_map_peak", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +TEMPLOG_MAP_AT_SPECIAL_POINTGauge = TEMPLOG_MAP_AT_SPECIAL_POINT,"TEMPLOG_MAP_AT_SPECIAL_POINT", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +TEMPLOG_MAP_AT_DIFFGauge = TEMPLOG_MAP_AT_DIFF,"TEMPLOG_MAP_AT_DIFF", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 + gaugeCategory = Sensors - Extra 2 egt1Gauge = egt1, "EGT#1", "C", 0, 2000 @@ -3418,6 +3416,8 @@ entry = vvtTargets2, "vvtTargets2", int, "%d" entry = vvtTargets3, "vvtTargets3", int, "%d" entry = vvtTargets4, "vvtTargets4", int, "%d" entry = turboSpeed, "Turbocharger Speed", int, "%d" +entry = TEMPLOG_MAP_AT_SPECIAL_POINT, "TEMPLOG_MAP_AT_SPECIAL_POINT", float, "%.3f" +entry = TEMPLOG_MAP_AT_DIFF, "TEMPLOG_MAP_AT_DIFF", float, "%.3f" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" entry = triggerSyncGapRatio, "triggerSyncGapRatio", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index f78e75b8b0..972f9d94e9 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.12.07.mre_f7.3060898032" + signature = "rusEFI 2021.12.07.mre_f7.892208029" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.07.mre_f7.3060898032" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.07.mre_f7.892208029" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Dec 07 03:11:30 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Dec 07 14:01:37 UTC 2021 pageSize = 24400 page = 1 @@ -877,8 +877,8 @@ alternatorPwmFrequency = scalar, S32, 2256, "Hz", 1, 0, 0, 3000, 0 unused2260 = scalar, S32, 2260, "units", 1, 0, -20, 100, 0 narrowToWideOxygenBins = array, F32, 2264, [8], "V", 1, 0, -10, 10, 3 narrowToWideOxygen = array, F32, 2296, [8], "ratio", 1, 0, -40, 40, 2 -vvtMode1 = bits, U08, 2328, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "vvt13", "vvt14", "vvt15" -vvtMode2 = bits, U08, 2329, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "vvt13", "vvt14", "vvt15" +vvtMode1 = bits, U08, 2328, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "VTwin by MAP", "vvt14", "vvt15" +vvtMode2 = bits, U08, 2329, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "VTwin by MAP", "vvt14", "vvt15" fan2ExtraIdle = scalar, U08, 2330, "%", 1, 0, 0, 100, 0 unusedOldBiquad = array, U08, 2331, [1], "units", 1, 0, -20, 100, 0 @@ -2259,14 +2259,8 @@ unusedAtTheEnd153 = scalar, U08, 472, "", 1, 0 unusedAtTheEnd154 = scalar, U08, 473, "", 1, 0 unusedAtTheEnd155 = scalar, U08, 474, "", 1, 0 unusedAtTheEnd156 = scalar, U08, 475, "", 1, 0 -unusedAtTheEnd157 = scalar, U08, 476, "", 1, 0 -unusedAtTheEnd158 = scalar, U08, 477, "", 1, 0 -unusedAtTheEnd159 = scalar, U08, 478, "", 1, 0 -unusedAtTheEnd160 = scalar, U08, 479, "", 1, 0 -unusedAtTheEnd161 = scalar, U08, 480, "", 1, 0 -unusedAtTheEnd162 = scalar, U08, 481, "", 1, 0 -unusedAtTheEnd163 = scalar, U08, 482, "", 1, 0 -unusedAtTheEnd164 = scalar, U08, 483, "", 1, 0 +TEMPLOG_MAP_AT_SPECIAL_POINT = scalar, F32, 476, "", 1, 0 +TEMPLOG_MAP_AT_DIFF = scalar, F32, 480, "", 1, 0 vvtSyncGapRatio = scalar, F32, 484, "", 1, 0 vvtCurrentPosition = scalar, F32, 488, "", 1, 0 triggerSyncGapRatio = scalar, F32, 492, "", 1, 0 @@ -2938,8 +2932,6 @@ etbStatus_dTermGauge = etbStatus_dTerm,"etbStatus_ dTerm", "", -10000.0,10000.0, etbStatus_outputGauge = etbStatus_output,"etbStatus_ output", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 etbStatus_errorGauge = etbStatus_error,"etbStatus_ error", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 etbStatus_resetCounterGauge = etbStatus_resetCounter,"etbStatus_ resetCounter", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 0,0 -TEMPLOG_MAP_INSTANT_AVERAGEGauge = TEMPLOG_MAP_INSTANT_AVERAGE,"TEMPLOG_MAP_INSTANT_AVERAGE", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 -TEMPLOG_map_peakGauge = TEMPLOG_map_peak,"TEMPLOG_map_peak", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 canReadCounterGauge = canReadCounter,"canReadCounter", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 canWriteOkGauge = canWriteOk,"canWriteOk", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 canWriteNotOkGauge = canWriteNotOk,"canWriteNotOk", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 @@ -2948,6 +2940,12 @@ triggerStateIndexGauge = triggerStateIndex,"triggerStateIndex", "", -10000.0,100 vvtSyncGapRatioGauge = vvtSyncGapRatio,"vvtSyncGapRatio", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 vvtStateIndexGauge = vvtStateIndex,"vvtStateIndex", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +gaugeCategory = MAP Cam +TEMPLOG_MAP_INSTANT_AVERAGEGauge = TEMPLOG_MAP_INSTANT_AVERAGE,"TEMPLOG_MAP_INSTANT_AVERAGE", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +TEMPLOG_map_peakGauge = TEMPLOG_map_peak,"TEMPLOG_map_peak", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +TEMPLOG_MAP_AT_SPECIAL_POINTGauge = TEMPLOG_MAP_AT_SPECIAL_POINT,"TEMPLOG_MAP_AT_SPECIAL_POINT", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +TEMPLOG_MAP_AT_DIFFGauge = TEMPLOG_MAP_AT_DIFF,"TEMPLOG_MAP_AT_DIFF", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 + gaugeCategory = Sensors - Extra 2 egt1Gauge = egt1, "EGT#1", "C", 0, 2000 @@ -3418,6 +3416,8 @@ entry = vvtTargets2, "vvtTargets2", int, "%d" entry = vvtTargets3, "vvtTargets3", int, "%d" entry = vvtTargets4, "vvtTargets4", int, "%d" entry = turboSpeed, "Turbocharger Speed", int, "%d" +entry = TEMPLOG_MAP_AT_SPECIAL_POINT, "TEMPLOG_MAP_AT_SPECIAL_POINT", float, "%.3f" +entry = TEMPLOG_MAP_AT_DIFF, "TEMPLOG_MAP_AT_DIFF", float, "%.3f" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" entry = triggerSyncGapRatio, "triggerSyncGapRatio", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index 46cbc553eb..21a978dcc9 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.12.07.prometheus_405.1438399394" + signature = "rusEFI 2021.12.07.prometheus_405.3605242063" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.07.prometheus_405.1438399394" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.07.prometheus_405.3605242063" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Dec 07 03:11:43 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Dec 07 14:01:50 UTC 2021 pageSize = 24400 page = 1 @@ -877,8 +877,8 @@ alternatorPwmFrequency = scalar, S32, 2256, "Hz", 1, 0, 0, 3000, 0 unused2260 = scalar, S32, 2260, "units", 1, 0, -20, 100, 0 narrowToWideOxygenBins = array, F32, 2264, [8], "V", 1, 0, -10, 10, 3 narrowToWideOxygen = array, F32, 2296, [8], "ratio", 1, 0, -40, 40, 2 -vvtMode1 = bits, U08, 2328, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "vvt13", "vvt14", "vvt15" -vvtMode2 = bits, U08, 2329, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "vvt13", "vvt14", "vvt15" +vvtMode1 = bits, U08, 2328, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "VTwin by MAP", "vvt14", "vvt15" +vvtMode2 = bits, U08, 2329, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "VTwin by MAP", "vvt14", "vvt15" fan2ExtraIdle = scalar, U08, 2330, "%", 1, 0, 0, 100, 0 unusedOldBiquad = array, U08, 2331, [1], "units", 1, 0, -20, 100, 0 @@ -2259,14 +2259,8 @@ unusedAtTheEnd153 = scalar, U08, 472, "", 1, 0 unusedAtTheEnd154 = scalar, U08, 473, "", 1, 0 unusedAtTheEnd155 = scalar, U08, 474, "", 1, 0 unusedAtTheEnd156 = scalar, U08, 475, "", 1, 0 -unusedAtTheEnd157 = scalar, U08, 476, "", 1, 0 -unusedAtTheEnd158 = scalar, U08, 477, "", 1, 0 -unusedAtTheEnd159 = scalar, U08, 478, "", 1, 0 -unusedAtTheEnd160 = scalar, U08, 479, "", 1, 0 -unusedAtTheEnd161 = scalar, U08, 480, "", 1, 0 -unusedAtTheEnd162 = scalar, U08, 481, "", 1, 0 -unusedAtTheEnd163 = scalar, U08, 482, "", 1, 0 -unusedAtTheEnd164 = scalar, U08, 483, "", 1, 0 +TEMPLOG_MAP_AT_SPECIAL_POINT = scalar, F32, 476, "", 1, 0 +TEMPLOG_MAP_AT_DIFF = scalar, F32, 480, "", 1, 0 vvtSyncGapRatio = scalar, F32, 484, "", 1, 0 vvtCurrentPosition = scalar, F32, 488, "", 1, 0 triggerSyncGapRatio = scalar, F32, 492, "", 1, 0 @@ -2938,8 +2932,6 @@ etbStatus_dTermGauge = etbStatus_dTerm,"etbStatus_ dTerm", "", -10000.0,10000.0, etbStatus_outputGauge = etbStatus_output,"etbStatus_ output", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 etbStatus_errorGauge = etbStatus_error,"etbStatus_ error", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 etbStatus_resetCounterGauge = etbStatus_resetCounter,"etbStatus_ resetCounter", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 0,0 -TEMPLOG_MAP_INSTANT_AVERAGEGauge = TEMPLOG_MAP_INSTANT_AVERAGE,"TEMPLOG_MAP_INSTANT_AVERAGE", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 -TEMPLOG_map_peakGauge = TEMPLOG_map_peak,"TEMPLOG_map_peak", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 canReadCounterGauge = canReadCounter,"canReadCounter", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 canWriteOkGauge = canWriteOk,"canWriteOk", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 canWriteNotOkGauge = canWriteNotOk,"canWriteNotOk", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 @@ -2948,6 +2940,12 @@ triggerStateIndexGauge = triggerStateIndex,"triggerStateIndex", "", -10000.0,100 vvtSyncGapRatioGauge = vvtSyncGapRatio,"vvtSyncGapRatio", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 vvtStateIndexGauge = vvtStateIndex,"vvtStateIndex", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +gaugeCategory = MAP Cam +TEMPLOG_MAP_INSTANT_AVERAGEGauge = TEMPLOG_MAP_INSTANT_AVERAGE,"TEMPLOG_MAP_INSTANT_AVERAGE", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +TEMPLOG_map_peakGauge = TEMPLOG_map_peak,"TEMPLOG_map_peak", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +TEMPLOG_MAP_AT_SPECIAL_POINTGauge = TEMPLOG_MAP_AT_SPECIAL_POINT,"TEMPLOG_MAP_AT_SPECIAL_POINT", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +TEMPLOG_MAP_AT_DIFFGauge = TEMPLOG_MAP_AT_DIFF,"TEMPLOG_MAP_AT_DIFF", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 + gaugeCategory = Sensors - Extra 2 egt1Gauge = egt1, "EGT#1", "C", 0, 2000 @@ -3418,6 +3416,8 @@ entry = vvtTargets2, "vvtTargets2", int, "%d" entry = vvtTargets3, "vvtTargets3", int, "%d" entry = vvtTargets4, "vvtTargets4", int, "%d" entry = turboSpeed, "Turbocharger Speed", int, "%d" +entry = TEMPLOG_MAP_AT_SPECIAL_POINT, "TEMPLOG_MAP_AT_SPECIAL_POINT", float, "%.3f" +entry = TEMPLOG_MAP_AT_DIFF, "TEMPLOG_MAP_AT_DIFF", float, "%.3f" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" entry = triggerSyncGapRatio, "triggerSyncGapRatio", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index 16a0679d78..36164170da 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.12.07.prometheus_469.1438399394" + signature = "rusEFI 2021.12.07.prometheus_469.3605242063" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.07.prometheus_469.1438399394" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.07.prometheus_469.3605242063" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Dec 07 03:11:40 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Dec 07 14:01:47 UTC 2021 pageSize = 24400 page = 1 @@ -877,8 +877,8 @@ alternatorPwmFrequency = scalar, S32, 2256, "Hz", 1, 0, 0, 3000, 0 unused2260 = scalar, S32, 2260, "units", 1, 0, -20, 100, 0 narrowToWideOxygenBins = array, F32, 2264, [8], "V", 1, 0, -10, 10, 3 narrowToWideOxygen = array, F32, 2296, [8], "ratio", 1, 0, -40, 40, 2 -vvtMode1 = bits, U08, 2328, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "vvt13", "vvt14", "vvt15" -vvtMode2 = bits, U08, 2329, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "vvt13", "vvt14", "vvt15" +vvtMode1 = bits, U08, 2328, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "VTwin by MAP", "vvt14", "vvt15" +vvtMode2 = bits, U08, 2329, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "VTwin by MAP", "vvt14", "vvt15" fan2ExtraIdle = scalar, U08, 2330, "%", 1, 0, 0, 100, 0 unusedOldBiquad = array, U08, 2331, [1], "units", 1, 0, -20, 100, 0 @@ -2259,14 +2259,8 @@ unusedAtTheEnd153 = scalar, U08, 472, "", 1, 0 unusedAtTheEnd154 = scalar, U08, 473, "", 1, 0 unusedAtTheEnd155 = scalar, U08, 474, "", 1, 0 unusedAtTheEnd156 = scalar, U08, 475, "", 1, 0 -unusedAtTheEnd157 = scalar, U08, 476, "", 1, 0 -unusedAtTheEnd158 = scalar, U08, 477, "", 1, 0 -unusedAtTheEnd159 = scalar, U08, 478, "", 1, 0 -unusedAtTheEnd160 = scalar, U08, 479, "", 1, 0 -unusedAtTheEnd161 = scalar, U08, 480, "", 1, 0 -unusedAtTheEnd162 = scalar, U08, 481, "", 1, 0 -unusedAtTheEnd163 = scalar, U08, 482, "", 1, 0 -unusedAtTheEnd164 = scalar, U08, 483, "", 1, 0 +TEMPLOG_MAP_AT_SPECIAL_POINT = scalar, F32, 476, "", 1, 0 +TEMPLOG_MAP_AT_DIFF = scalar, F32, 480, "", 1, 0 vvtSyncGapRatio = scalar, F32, 484, "", 1, 0 vvtCurrentPosition = scalar, F32, 488, "", 1, 0 triggerSyncGapRatio = scalar, F32, 492, "", 1, 0 @@ -2938,8 +2932,6 @@ etbStatus_dTermGauge = etbStatus_dTerm,"etbStatus_ dTerm", "", -10000.0,10000.0, etbStatus_outputGauge = etbStatus_output,"etbStatus_ output", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 etbStatus_errorGauge = etbStatus_error,"etbStatus_ error", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 etbStatus_resetCounterGauge = etbStatus_resetCounter,"etbStatus_ resetCounter", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 0,0 -TEMPLOG_MAP_INSTANT_AVERAGEGauge = TEMPLOG_MAP_INSTANT_AVERAGE,"TEMPLOG_MAP_INSTANT_AVERAGE", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 -TEMPLOG_map_peakGauge = TEMPLOG_map_peak,"TEMPLOG_map_peak", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 canReadCounterGauge = canReadCounter,"canReadCounter", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 canWriteOkGauge = canWriteOk,"canWriteOk", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 canWriteNotOkGauge = canWriteNotOk,"canWriteNotOk", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 @@ -2948,6 +2940,12 @@ triggerStateIndexGauge = triggerStateIndex,"triggerStateIndex", "", -10000.0,100 vvtSyncGapRatioGauge = vvtSyncGapRatio,"vvtSyncGapRatio", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 vvtStateIndexGauge = vvtStateIndex,"vvtStateIndex", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +gaugeCategory = MAP Cam +TEMPLOG_MAP_INSTANT_AVERAGEGauge = TEMPLOG_MAP_INSTANT_AVERAGE,"TEMPLOG_MAP_INSTANT_AVERAGE", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +TEMPLOG_map_peakGauge = TEMPLOG_map_peak,"TEMPLOG_map_peak", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +TEMPLOG_MAP_AT_SPECIAL_POINTGauge = TEMPLOG_MAP_AT_SPECIAL_POINT,"TEMPLOG_MAP_AT_SPECIAL_POINT", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +TEMPLOG_MAP_AT_DIFFGauge = TEMPLOG_MAP_AT_DIFF,"TEMPLOG_MAP_AT_DIFF", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 + gaugeCategory = Sensors - Extra 2 egt1Gauge = egt1, "EGT#1", "C", 0, 2000 @@ -3418,6 +3416,8 @@ entry = vvtTargets2, "vvtTargets2", int, "%d" entry = vvtTargets3, "vvtTargets3", int, "%d" entry = vvtTargets4, "vvtTargets4", int, "%d" entry = turboSpeed, "Turbocharger Speed", int, "%d" +entry = TEMPLOG_MAP_AT_SPECIAL_POINT, "TEMPLOG_MAP_AT_SPECIAL_POINT", float, "%.3f" +entry = TEMPLOG_MAP_AT_DIFF, "TEMPLOG_MAP_AT_DIFF", float, "%.3f" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" entry = triggerSyncGapRatio, "triggerSyncGapRatio", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index b5cdeee681..bc707a04d6 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.12.07.proteus_f4.3110541803" + signature = "rusEFI 2021.12.07.proteus_f4.976781958" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.07.proteus_f4.3110541803" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.07.proteus_f4.976781958" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Dec 07 03:11:49 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Dec 07 14:01:57 UTC 2021 pageSize = 24400 page = 1 @@ -877,8 +877,8 @@ alternatorPwmFrequency = scalar, S32, 2256, "Hz", 1, 0, 0, 3000, 0 unused2260 = scalar, S32, 2260, "units", 1, 0, -20, 100, 0 narrowToWideOxygenBins = array, F32, 2264, [8], "V", 1, 0, -10, 10, 3 narrowToWideOxygen = array, F32, 2296, [8], "ratio", 1, 0, -40, 40, 2 -vvtMode1 = bits, U08, 2328, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "vvt13", "vvt14", "vvt15" -vvtMode2 = bits, U08, 2329, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "vvt13", "vvt14", "vvt15" +vvtMode1 = bits, U08, 2328, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "VTwin by MAP", "vvt14", "vvt15" +vvtMode2 = bits, U08, 2329, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "VTwin by MAP", "vvt14", "vvt15" fan2ExtraIdle = scalar, U08, 2330, "%", 1, 0, 0, 100, 0 unusedOldBiquad = array, U08, 2331, [1], "units", 1, 0, -20, 100, 0 @@ -2259,14 +2259,8 @@ unusedAtTheEnd153 = scalar, U08, 472, "", 1, 0 unusedAtTheEnd154 = scalar, U08, 473, "", 1, 0 unusedAtTheEnd155 = scalar, U08, 474, "", 1, 0 unusedAtTheEnd156 = scalar, U08, 475, "", 1, 0 -unusedAtTheEnd157 = scalar, U08, 476, "", 1, 0 -unusedAtTheEnd158 = scalar, U08, 477, "", 1, 0 -unusedAtTheEnd159 = scalar, U08, 478, "", 1, 0 -unusedAtTheEnd160 = scalar, U08, 479, "", 1, 0 -unusedAtTheEnd161 = scalar, U08, 480, "", 1, 0 -unusedAtTheEnd162 = scalar, U08, 481, "", 1, 0 -unusedAtTheEnd163 = scalar, U08, 482, "", 1, 0 -unusedAtTheEnd164 = scalar, U08, 483, "", 1, 0 +TEMPLOG_MAP_AT_SPECIAL_POINT = scalar, F32, 476, "", 1, 0 +TEMPLOG_MAP_AT_DIFF = scalar, F32, 480, "", 1, 0 vvtSyncGapRatio = scalar, F32, 484, "", 1, 0 vvtCurrentPosition = scalar, F32, 488, "", 1, 0 triggerSyncGapRatio = scalar, F32, 492, "", 1, 0 @@ -2938,8 +2932,6 @@ etbStatus_dTermGauge = etbStatus_dTerm,"etbStatus_ dTerm", "", -10000.0,10000.0, etbStatus_outputGauge = etbStatus_output,"etbStatus_ output", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 etbStatus_errorGauge = etbStatus_error,"etbStatus_ error", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 etbStatus_resetCounterGauge = etbStatus_resetCounter,"etbStatus_ resetCounter", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 0,0 -TEMPLOG_MAP_INSTANT_AVERAGEGauge = TEMPLOG_MAP_INSTANT_AVERAGE,"TEMPLOG_MAP_INSTANT_AVERAGE", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 -TEMPLOG_map_peakGauge = TEMPLOG_map_peak,"TEMPLOG_map_peak", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 canReadCounterGauge = canReadCounter,"canReadCounter", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 canWriteOkGauge = canWriteOk,"canWriteOk", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 canWriteNotOkGauge = canWriteNotOk,"canWriteNotOk", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 @@ -2948,6 +2940,12 @@ triggerStateIndexGauge = triggerStateIndex,"triggerStateIndex", "", -10000.0,100 vvtSyncGapRatioGauge = vvtSyncGapRatio,"vvtSyncGapRatio", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 vvtStateIndexGauge = vvtStateIndex,"vvtStateIndex", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +gaugeCategory = MAP Cam +TEMPLOG_MAP_INSTANT_AVERAGEGauge = TEMPLOG_MAP_INSTANT_AVERAGE,"TEMPLOG_MAP_INSTANT_AVERAGE", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +TEMPLOG_map_peakGauge = TEMPLOG_map_peak,"TEMPLOG_map_peak", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +TEMPLOG_MAP_AT_SPECIAL_POINTGauge = TEMPLOG_MAP_AT_SPECIAL_POINT,"TEMPLOG_MAP_AT_SPECIAL_POINT", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +TEMPLOG_MAP_AT_DIFFGauge = TEMPLOG_MAP_AT_DIFF,"TEMPLOG_MAP_AT_DIFF", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 + gaugeCategory = Sensors - Extra 2 egt1Gauge = egt1, "EGT#1", "C", 0, 2000 @@ -3418,6 +3416,8 @@ entry = vvtTargets2, "vvtTargets2", int, "%d" entry = vvtTargets3, "vvtTargets3", int, "%d" entry = vvtTargets4, "vvtTargets4", int, "%d" entry = turboSpeed, "Turbocharger Speed", int, "%d" +entry = TEMPLOG_MAP_AT_SPECIAL_POINT, "TEMPLOG_MAP_AT_SPECIAL_POINT", float, "%.3f" +entry = TEMPLOG_MAP_AT_DIFF, "TEMPLOG_MAP_AT_DIFF", float, "%.3f" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" entry = triggerSyncGapRatio, "triggerSyncGapRatio", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index 619b9f6f13..0630b4cb22 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.12.07.proteus_f7.3110541803" + signature = "rusEFI 2021.12.07.proteus_f7.976781958" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.07.proteus_f7.3110541803" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.07.proteus_f7.976781958" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Dec 07 03:11:46 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Dec 07 14:01:53 UTC 2021 pageSize = 24400 page = 1 @@ -877,8 +877,8 @@ alternatorPwmFrequency = scalar, S32, 2256, "Hz", 1, 0, 0, 3000, 0 unused2260 = scalar, S32, 2260, "units", 1, 0, -20, 100, 0 narrowToWideOxygenBins = array, F32, 2264, [8], "V", 1, 0, -10, 10, 3 narrowToWideOxygen = array, F32, 2296, [8], "ratio", 1, 0, -40, 40, 2 -vvtMode1 = bits, U08, 2328, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "vvt13", "vvt14", "vvt15" -vvtMode2 = bits, U08, 2329, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "vvt13", "vvt14", "vvt15" +vvtMode1 = bits, U08, 2328, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "VTwin by MAP", "vvt14", "vvt15" +vvtMode2 = bits, U08, 2329, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "VTwin by MAP", "vvt14", "vvt15" fan2ExtraIdle = scalar, U08, 2330, "%", 1, 0, 0, 100, 0 unusedOldBiquad = array, U08, 2331, [1], "units", 1, 0, -20, 100, 0 @@ -2259,14 +2259,8 @@ unusedAtTheEnd153 = scalar, U08, 472, "", 1, 0 unusedAtTheEnd154 = scalar, U08, 473, "", 1, 0 unusedAtTheEnd155 = scalar, U08, 474, "", 1, 0 unusedAtTheEnd156 = scalar, U08, 475, "", 1, 0 -unusedAtTheEnd157 = scalar, U08, 476, "", 1, 0 -unusedAtTheEnd158 = scalar, U08, 477, "", 1, 0 -unusedAtTheEnd159 = scalar, U08, 478, "", 1, 0 -unusedAtTheEnd160 = scalar, U08, 479, "", 1, 0 -unusedAtTheEnd161 = scalar, U08, 480, "", 1, 0 -unusedAtTheEnd162 = scalar, U08, 481, "", 1, 0 -unusedAtTheEnd163 = scalar, U08, 482, "", 1, 0 -unusedAtTheEnd164 = scalar, U08, 483, "", 1, 0 +TEMPLOG_MAP_AT_SPECIAL_POINT = scalar, F32, 476, "", 1, 0 +TEMPLOG_MAP_AT_DIFF = scalar, F32, 480, "", 1, 0 vvtSyncGapRatio = scalar, F32, 484, "", 1, 0 vvtCurrentPosition = scalar, F32, 488, "", 1, 0 triggerSyncGapRatio = scalar, F32, 492, "", 1, 0 @@ -2938,8 +2932,6 @@ etbStatus_dTermGauge = etbStatus_dTerm,"etbStatus_ dTerm", "", -10000.0,10000.0, etbStatus_outputGauge = etbStatus_output,"etbStatus_ output", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 etbStatus_errorGauge = etbStatus_error,"etbStatus_ error", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 etbStatus_resetCounterGauge = etbStatus_resetCounter,"etbStatus_ resetCounter", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 0,0 -TEMPLOG_MAP_INSTANT_AVERAGEGauge = TEMPLOG_MAP_INSTANT_AVERAGE,"TEMPLOG_MAP_INSTANT_AVERAGE", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 -TEMPLOG_map_peakGauge = TEMPLOG_map_peak,"TEMPLOG_map_peak", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 canReadCounterGauge = canReadCounter,"canReadCounter", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 canWriteOkGauge = canWriteOk,"canWriteOk", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 canWriteNotOkGauge = canWriteNotOk,"canWriteNotOk", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 @@ -2948,6 +2940,12 @@ triggerStateIndexGauge = triggerStateIndex,"triggerStateIndex", "", -10000.0,100 vvtSyncGapRatioGauge = vvtSyncGapRatio,"vvtSyncGapRatio", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 vvtStateIndexGauge = vvtStateIndex,"vvtStateIndex", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +gaugeCategory = MAP Cam +TEMPLOG_MAP_INSTANT_AVERAGEGauge = TEMPLOG_MAP_INSTANT_AVERAGE,"TEMPLOG_MAP_INSTANT_AVERAGE", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +TEMPLOG_map_peakGauge = TEMPLOG_map_peak,"TEMPLOG_map_peak", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +TEMPLOG_MAP_AT_SPECIAL_POINTGauge = TEMPLOG_MAP_AT_SPECIAL_POINT,"TEMPLOG_MAP_AT_SPECIAL_POINT", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +TEMPLOG_MAP_AT_DIFFGauge = TEMPLOG_MAP_AT_DIFF,"TEMPLOG_MAP_AT_DIFF", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 + gaugeCategory = Sensors - Extra 2 egt1Gauge = egt1, "EGT#1", "C", 0, 2000 @@ -3418,6 +3416,8 @@ entry = vvtTargets2, "vvtTargets2", int, "%d" entry = vvtTargets3, "vvtTargets3", int, "%d" entry = vvtTargets4, "vvtTargets4", int, "%d" entry = turboSpeed, "Turbocharger Speed", int, "%d" +entry = TEMPLOG_MAP_AT_SPECIAL_POINT, "TEMPLOG_MAP_AT_SPECIAL_POINT", float, "%.3f" +entry = TEMPLOG_MAP_AT_DIFF, "TEMPLOG_MAP_AT_DIFF", float, "%.3f" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" entry = triggerSyncGapRatio, "triggerSyncGapRatio", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index 57328cb121..19e83af463 100644 --- a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.12.07.subaru_eg33_f7.3337417748" + signature = "rusEFI 2021.12.07.subaru_eg33_f7.1169387385" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.07.subaru_eg33_f7.3337417748" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.07.subaru_eg33_f7.1169387385" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Tue Dec 07 03:12:04 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Tue Dec 07 14:02:13 UTC 2021 pageSize = 24400 page = 1 @@ -877,8 +877,8 @@ alternatorPwmFrequency = scalar, S32, 2256, "Hz", 1, 0, 0, 3000, 0 unused2260 = scalar, S32, 2260, "units", 1, 0, -20, 100, 0 narrowToWideOxygenBins = array, F32, 2264, [8], "V", 1, 0, -10, 10, 3 narrowToWideOxygen = array, F32, 2296, [8], "ratio", 1, 0, -40, 40, 2 -vvtMode1 = bits, U08, 2328, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "vvt13", "vvt14", "vvt15" -vvtMode2 = bits, U08, 2329, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "vvt13", "vvt14", "vvt15" +vvtMode1 = bits, U08, 2328, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "VTwin by MAP", "vvt14", "vvt15" +vvtMode2 = bits, U08, 2329, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "VTwin by MAP", "vvt14", "vvt15" fan2ExtraIdle = scalar, U08, 2330, "%", 1, 0, 0, 100, 0 unusedOldBiquad = array, U08, 2331, [1], "units", 1, 0, -20, 100, 0 @@ -2259,14 +2259,8 @@ unusedAtTheEnd153 = scalar, U08, 472, "", 1, 0 unusedAtTheEnd154 = scalar, U08, 473, "", 1, 0 unusedAtTheEnd155 = scalar, U08, 474, "", 1, 0 unusedAtTheEnd156 = scalar, U08, 475, "", 1, 0 -unusedAtTheEnd157 = scalar, U08, 476, "", 1, 0 -unusedAtTheEnd158 = scalar, U08, 477, "", 1, 0 -unusedAtTheEnd159 = scalar, U08, 478, "", 1, 0 -unusedAtTheEnd160 = scalar, U08, 479, "", 1, 0 -unusedAtTheEnd161 = scalar, U08, 480, "", 1, 0 -unusedAtTheEnd162 = scalar, U08, 481, "", 1, 0 -unusedAtTheEnd163 = scalar, U08, 482, "", 1, 0 -unusedAtTheEnd164 = scalar, U08, 483, "", 1, 0 +TEMPLOG_MAP_AT_SPECIAL_POINT = scalar, F32, 476, "", 1, 0 +TEMPLOG_MAP_AT_DIFF = scalar, F32, 480, "", 1, 0 vvtSyncGapRatio = scalar, F32, 484, "", 1, 0 vvtCurrentPosition = scalar, F32, 488, "", 1, 0 triggerSyncGapRatio = scalar, F32, 492, "", 1, 0 @@ -2938,8 +2932,6 @@ etbStatus_dTermGauge = etbStatus_dTerm,"etbStatus_ dTerm", "", -10000.0,10000.0, etbStatus_outputGauge = etbStatus_output,"etbStatus_ output", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 etbStatus_errorGauge = etbStatus_error,"etbStatus_ error", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 etbStatus_resetCounterGauge = etbStatus_resetCounter,"etbStatus_ resetCounter", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 0,0 -TEMPLOG_MAP_INSTANT_AVERAGEGauge = TEMPLOG_MAP_INSTANT_AVERAGE,"TEMPLOG_MAP_INSTANT_AVERAGE", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 -TEMPLOG_map_peakGauge = TEMPLOG_map_peak,"TEMPLOG_map_peak", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 canReadCounterGauge = canReadCounter,"canReadCounter", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 canWriteOkGauge = canWriteOk,"canWriteOk", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 canWriteNotOkGauge = canWriteNotOk,"canWriteNotOk", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 @@ -2948,6 +2940,12 @@ triggerStateIndexGauge = triggerStateIndex,"triggerStateIndex", "", -10000.0,100 vvtSyncGapRatioGauge = vvtSyncGapRatio,"vvtSyncGapRatio", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 vvtStateIndexGauge = vvtStateIndex,"vvtStateIndex", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +gaugeCategory = MAP Cam +TEMPLOG_MAP_INSTANT_AVERAGEGauge = TEMPLOG_MAP_INSTANT_AVERAGE,"TEMPLOG_MAP_INSTANT_AVERAGE", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +TEMPLOG_map_peakGauge = TEMPLOG_map_peak,"TEMPLOG_map_peak", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +TEMPLOG_MAP_AT_SPECIAL_POINTGauge = TEMPLOG_MAP_AT_SPECIAL_POINT,"TEMPLOG_MAP_AT_SPECIAL_POINT", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +TEMPLOG_MAP_AT_DIFFGauge = TEMPLOG_MAP_AT_DIFF,"TEMPLOG_MAP_AT_DIFF", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 + gaugeCategory = Sensors - Extra 2 egt1Gauge = egt1, "EGT#1", "C", 0, 2000 @@ -3418,6 +3416,8 @@ entry = vvtTargets2, "vvtTargets2", int, "%d" entry = vvtTargets3, "vvtTargets3", int, "%d" entry = vvtTargets4, "vvtTargets4", int, "%d" entry = turboSpeed, "Turbocharger Speed", int, "%d" +entry = TEMPLOG_MAP_AT_SPECIAL_POINT, "TEMPLOG_MAP_AT_SPECIAL_POINT", float, "%.3f" +entry = TEMPLOG_MAP_AT_DIFF, "TEMPLOG_MAP_AT_DIFF", float, "%.3f" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" entry = triggerSyncGapRatio, "triggerSyncGapRatio", float, "%.3f" 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 2858afb965..b97bb84d69 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 Tue Dec 07 03:12:08 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Dec 07 14:02:17 UTC 2021 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -1747,7 +1747,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 = 89580100; public static final int silentTriggerError_offset = 1464; public static final int slowAdcAlpha_offset = 2088; public static final int sparkDwellRpmBins_offset = 332; @@ -2210,7 +2209,7 @@ public class Fields { public static final int TS_RESPONSE_UNDERRUN = 0x80; public static final int TS_RESPONSE_UNRECOGNIZED_COMMAND = 0x83; public static final char TS_SET_LOGGER_SWITCH = 'l'; - public static final String TS_SIGNATURE = "rusEFI 2021.12.07.all.89580100"; + public static final String TS_SIGNATURE = "rusEFI 2021.12.07.all.2248767785"; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final char TS_TEST_COMMAND = 't'; public static final int tunerStudioSerialSpeed_offset = 728; @@ -2396,6 +2395,7 @@ public class Fields { public static final int vvt_mode_e_VVT_HONDA_K = 10; public static final int vvt_mode_e_VVT_INACTIVE = 0; public static final int vvt_mode_e_VVT_MAP_V_TWIN = 12; + public static final int vvt_mode_e_VVT_MAP_V_TWIN_ANOTHER = 13; public static final int vvt_mode_e_VVT_MIATA_NB2 = 3; public static final int vvt_mode_e_VVT_NISSAN_MR = 11; public static final int vvt_mode_e_VVT_NISSAN_VQ = 9; @@ -3238,7 +3238,7 @@ public class Fields { public static final Field UNUSED2260 = Field.create("UNUSED2260", 2260, FieldType.INT); public static final Field NARROWTOWIDEOXYGENBINS = Field.create("NARROWTOWIDEOXYGENBINS", 2264, FieldType.FLOAT); public static final Field NARROWTOWIDEOXYGEN = Field.create("NARROWTOWIDEOXYGEN", 2296, FieldType.FLOAT); - public static final String[] vvt_mode_e = {"Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "vvt13", "vvt14", "vvt15"}; + public static final String[] vvt_mode_e = {"Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "VTwin by MAP", "vvt14", "vvt15"}; public static final Field VVTMODE1 = Field.create("VVTMODE1", 2328, FieldType.INT8, vvt_mode_e); public static final Field VVTMODE2 = Field.create("VVTMODE2", 2329, FieldType.INT8, vvt_mode_e); public static final Field VVTMODEPADDING = Field.create("VVTMODEPADDING", 2330, FieldType.INT8);