From 0f070101fb62d98c760318622bdfdd885d458ea5 Mon Sep 17 00:00:00 2001 From: GitHub build-firmware Action Date: Fri, 1 Oct 2021 01:57:38 +0000 Subject: [PATCH] Auto-generated configs and docs --- ...ngine_configuration_generated_structures.h | 4 ++-- .../controllers/algo/rusefi_generated.h | 9 +++++---- ...ngine_configuration_generated_structures.h | 4 ++-- .../controllers/algo/rusefi_generated.h | 9 +++++---- ...ngine_configuration_generated_structures.h | 4 ++-- .../controllers/algo/rusefi_generated.h | 9 +++++---- ...ngine_configuration_generated_structures.h | 4 ++-- .../generated/fsio_enums_generated.def | 2 +- .../controllers/generated/fsio_getters.def | 2 +- firmware/controllers/generated/fsio_names.def | 2 +- .../controllers/generated/fsio_strings.def | 2 +- .../controllers/generated/rusefi_generated.h | 9 +++++---- .../controllers/generated/signature_all.h | 6 +++--- .../controllers/generated/signature_atlas.h | 6 +++--- .../generated/signature_f429-discovery.h | 6 +++--- .../generated/signature_frankenso_na6.h | 6 +++--- .../generated/signature_hellen-nb1.h | 6 +++--- .../generated/signature_hellen121nissan.h | 6 +++--- .../generated/signature_hellen121vag.h | 6 +++--- .../generated/signature_hellen128.h | 6 +++--- .../generated/signature_hellen154hyundai.h | 6 +++--- .../generated/signature_hellen72.h | 6 +++--- .../generated/signature_hellenNA6.h | 6 +++--- .../generated/signature_hellen_cypress.h | 6 +++--- .../controllers/generated/signature_kin.h | 6 +++--- .../controllers/generated/signature_mre_f4.h | 6 +++--- .../controllers/generated/signature_mre_f7.h | 6 +++--- .../generated/signature_prometheus_405.h | 6 +++--- .../generated/signature_prometheus_469.h | 6 +++--- .../generated/signature_proteus_f4.h | 6 +++--- .../generated/signature_proteus_f7.h | 6 +++--- .../generated/signature_subaru_eg33_f7.h | 6 +++--- firmware/tunerstudio/generated/cache.zip | Bin 1978507 -> 1978407 bytes firmware/tunerstudio/generated/rusefi.ini | 10 +++++----- .../tunerstudio/generated/rusefi_atlas.ini | 10 +++++----- .../generated/rusefi_f429-discovery.ini | 10 +++++----- .../generated/rusefi_frankenso_na6.ini | 10 +++++----- .../generated/rusefi_hellen-nb1.ini | 10 +++++----- .../generated/rusefi_hellen121nissan.ini | 10 +++++----- .../generated/rusefi_hellen121vag.ini | 10 +++++----- .../generated/rusefi_hellen128mercedes.ini | 10 +++++----- .../generated/rusefi_hellen154hyundai.ini | 10 +++++----- .../tunerstudio/generated/rusefi_hellen72.ini | 10 +++++----- .../generated/rusefi_hellenNA6.ini | 10 +++++----- .../generated/rusefi_hellen_cypress.ini | 10 +++++----- .../tunerstudio/generated/rusefi_kinetis.ini | 10 +++++----- .../tunerstudio/generated/rusefi_mre_f4.ini | 10 +++++----- .../tunerstudio/generated/rusefi_mre_f7.ini | 10 +++++----- .../generated/rusefi_prometheus_405.ini | 10 +++++----- .../generated/rusefi_prometheus_469.ini | 10 +++++----- .../generated/rusefi_proteus_f4.ini | 10 +++++----- .../generated/rusefi_proteus_f7.ini | 10 +++++----- .../generated/rusefi_subaru_eg33_f7.ini | 10 +++++----- .../com/rusefi/config/generated/Fields.java | 5 ++--- java_console/rusefi.xml | 2 +- 55 files changed, 195 insertions(+), 192 deletions(-) diff --git a/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h b/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h index 4543cf297f..9d47bf751b 100644 --- a/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Thu Sep 30 19:22:41 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Fri Oct 01 01:56:36 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4351,4 +4351,4 @@ struct persistent_config_s { }; // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Thu Sep 30 19:22:41 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Fri Oct 01 01:56:36 UTC 2021 diff --git a/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h index 27fc23a7bd..ae11a1bd29 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 @@ -37,7 +37,7 @@ #define afterstartEnrich_offset 6184 #define afterstartHoldTime_offset 6152 #define air_pressure_sensor_config_s_size 16 -#define air_pressure_sensor_type_e_auto_enum "MT_CUSTOM", "MT_DENSO183", "MT_MPX4250", "MT_HONDA3BAR", "MT_DODGE_NEON_2003", "MT_SUBY_DENSO", "MT_GM_3_BAR", "MT_MPX4100", "MT_TOYOTA_89420_02010", "MT_MPX4250A", "MT_BOSCH_2_5", "MT_MAZDA_1_BAR", "MT_GM_2_BAR", "MT_GM_1_BAR" +#define air_pressure_sensor_type_e_auto_enum "MT_CUSTOM", "MT_DENSO183", "MT_MPX4250", "MT_HONDA3BAR", "MT_DODGE_NEON_2003", "MT_SUBY_DENSO", "MT_GM_3_BAR", "MT_MPX4100", "MT_TOYOTA_89420_02010", "MT_MPX4250A", "MT_BOSCH_2_5", "MT_MAZDA_1_BAR", "MT_GM_2_BAR", "MT_GM_1_BAR", "MT_MPXH6400" #define alignEngineSnifferAtTDC_offset 744 #define alignmentFill_at_2227_offset 2227 #define alignmentFill_at_2253_offset 2253 @@ -930,6 +930,7 @@ #define IM_IM_BATCH 2 #define IM_IM_SINGLE_POINT 3 #define IM_IM_WASTED_SPARK 2 +#define imu_type_e_auto_enum "IMU_NONE", "IMU_VAG", "IMU_TYPE_2", "IMU_TYPE_3", "IMU_TYPE_4" #define imuType_offset 778 #define INDICATOR_NAME_AC_SWITCH "AC switch" #define INDICATOR_NAME_BRAKE_DOWN "brake: down" @@ -1288,8 +1289,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD hellen_cypress -#define SIGNATURE_DATE 2021.09.30 -#define SIGNATURE_HASH 2110414632 +#define SIGNATURE_DATE 2021.10.01 +#define SIGNATURE_HASH 4173245735 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1645,7 +1646,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.09.30.hellen_cypress.2110414632" +#define TS_SIGNATURE "rusEFI 2021.10.01.hellen_cypress.4173245735" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' diff --git a/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h b/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h index ba3ae53657..6c9f637bb5 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Thu Sep 30 19:22:38 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Fri Oct 01 01:56:34 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4345,4 +4345,4 @@ struct persistent_config_s { }; // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Thu Sep 30 19:22:38 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Fri Oct 01 01:56:34 UTC 2021 diff --git a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h index 387a79acc6..7b062c85a1 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -37,7 +37,7 @@ #define afterstartEnrich_offset 6156 #define afterstartHoldTime_offset 6124 #define air_pressure_sensor_config_s_size 16 -#define air_pressure_sensor_type_e_auto_enum "MT_CUSTOM", "MT_DENSO183", "MT_MPX4250", "MT_HONDA3BAR", "MT_DODGE_NEON_2003", "MT_SUBY_DENSO", "MT_GM_3_BAR", "MT_MPX4100", "MT_TOYOTA_89420_02010", "MT_MPX4250A", "MT_BOSCH_2_5", "MT_MAZDA_1_BAR", "MT_GM_2_BAR", "MT_GM_1_BAR" +#define air_pressure_sensor_type_e_auto_enum "MT_CUSTOM", "MT_DENSO183", "MT_MPX4250", "MT_HONDA3BAR", "MT_DODGE_NEON_2003", "MT_SUBY_DENSO", "MT_GM_3_BAR", "MT_MPX4100", "MT_TOYOTA_89420_02010", "MT_MPX4250A", "MT_BOSCH_2_5", "MT_MAZDA_1_BAR", "MT_GM_2_BAR", "MT_GM_1_BAR", "MT_MPXH6400" #define alignEngineSnifferAtTDC_offset 744 #define alignmentFill_at_2247_offset 2247 #define alignmentFill_at_4511_offset 4511 @@ -911,6 +911,7 @@ #define IM_IM_BATCH 2 #define IM_IM_SINGLE_POINT 3 #define IM_IM_WASTED_SPARK 2 +#define imu_type_e_auto_enum "IMU_NONE", "IMU_VAG", "IMU_TYPE_2", "IMU_TYPE_3", "IMU_TYPE_4" #define imuType_offset 778 #define INDICATOR_NAME_AC_SWITCH "AC switch" #define INDICATOR_NAME_BRAKE_DOWN "brake: down" @@ -1269,8 +1270,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD kin -#define SIGNATURE_DATE 2021.09.30 -#define SIGNATURE_HASH 2188350420 +#define SIGNATURE_DATE 2021.10.01 +#define SIGNATURE_HASH 119235035 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1626,7 +1627,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator true #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.09.30.kin.2188350420" +#define TS_SIGNATURE "rusEFI 2021.10.01.kin.119235035" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' diff --git a/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h b/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h index 46588d79f8..950e51fc54 100644 --- a/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Thu Sep 30 19:22:43 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 Fri Oct 01 01:56:38 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4351,4 +4351,4 @@ struct persistent_config_s { }; // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Thu Sep 30 19:22:43 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 Fri Oct 01 01:56:38 UTC 2021 diff --git a/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h index 24dba163ce..70b87dba02 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 @@ -37,7 +37,7 @@ #define afterstartEnrich_offset 6184 #define afterstartHoldTime_offset 6152 #define air_pressure_sensor_config_s_size 16 -#define air_pressure_sensor_type_e_auto_enum "MT_CUSTOM", "MT_DENSO183", "MT_MPX4250", "MT_HONDA3BAR", "MT_DODGE_NEON_2003", "MT_SUBY_DENSO", "MT_GM_3_BAR", "MT_MPX4100", "MT_TOYOTA_89420_02010", "MT_MPX4250A", "MT_BOSCH_2_5", "MT_MAZDA_1_BAR", "MT_GM_2_BAR", "MT_GM_1_BAR" +#define air_pressure_sensor_type_e_auto_enum "MT_CUSTOM", "MT_DENSO183", "MT_MPX4250", "MT_HONDA3BAR", "MT_DODGE_NEON_2003", "MT_SUBY_DENSO", "MT_GM_3_BAR", "MT_MPX4100", "MT_TOYOTA_89420_02010", "MT_MPX4250A", "MT_BOSCH_2_5", "MT_MAZDA_1_BAR", "MT_GM_2_BAR", "MT_GM_1_BAR", "MT_MPXH6400" #define alignEngineSnifferAtTDC_offset 744 #define alignmentFill_at_2227_offset 2227 #define alignmentFill_at_2253_offset 2253 @@ -930,6 +930,7 @@ #define IM_IM_BATCH 2 #define IM_IM_SINGLE_POINT 3 #define IM_IM_WASTED_SPARK 2 +#define imu_type_e_auto_enum "IMU_NONE", "IMU_VAG", "IMU_TYPE_2", "IMU_TYPE_3", "IMU_TYPE_4" #define imuType_offset 778 #define INDICATOR_NAME_AC_SWITCH "AC switch" #define INDICATOR_NAME_BRAKE_DOWN "brake: down" @@ -1289,8 +1290,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD subaru_eg33_f7 -#define SIGNATURE_DATE 2021.09.30 -#define SIGNATURE_HASH 2856087451 +#define SIGNATURE_DATE 2021.10.01 +#define SIGNATURE_HASH 793288084 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1646,7 +1647,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port false -#define TS_SIGNATURE "rusEFI 2021.09.30.subaru_eg33_f7.2856087451" +#define TS_SIGNATURE "rusEFI 2021.10.01.subaru_eg33_f7.793288084" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index 9a56b91e72..50b4a4b65d 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 30 19:22:35 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Oct 01 01:56:32 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4351,4 +4351,4 @@ struct persistent_config_s { }; // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 30 19:22:35 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Oct 01 01:56:32 UTC 2021 diff --git a/firmware/controllers/generated/fsio_enums_generated.def b/firmware/controllers/generated/fsio_enums_generated.def index 6fefdbfeaf..a3102a27a2 100644 --- a/firmware/controllers/generated/fsio_enums_generated.def +++ b/firmware/controllers/generated/fsio_enums_generated.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 30 19:22:35 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Oct 01 01:56:32 UTC 2021 // by class com.rusefi.output.FileFsioSettingsConsumer FSIO_SETTING_ACIDLEEXTRAOFFSET = 1000, diff --git a/firmware/controllers/generated/fsio_getters.def b/firmware/controllers/generated/fsio_getters.def index c3f5676b47..c008b1019d 100644 --- a/firmware/controllers/generated/fsio_getters.def +++ b/firmware/controllers/generated/fsio_getters.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 30 19:22:35 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Oct 01 01:56:32 UTC 2021 // by class com.rusefi.output.FileFsioSettingsConsumer case FSIO_SETTING_ACIDLEEXTRAOFFSET: diff --git a/firmware/controllers/generated/fsio_names.def b/firmware/controllers/generated/fsio_names.def index 18e2285c05..8b76cadcd3 100644 --- a/firmware/controllers/generated/fsio_names.def +++ b/firmware/controllers/generated/fsio_names.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 30 19:22:35 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Oct 01 01:56:32 UTC 2021 // by class com.rusefi.output.FileFsioSettingsConsumer static LENameOrdinalPair leacIdleExtraOffset(FSIO_SETTING_ACIDLEEXTRAOFFSET, "cfg_acIdleExtraOffset"); diff --git a/firmware/controllers/generated/fsio_strings.def b/firmware/controllers/generated/fsio_strings.def index d984a12b9f..f58f8f9461 100644 --- a/firmware/controllers/generated/fsio_strings.def +++ b/firmware/controllers/generated/fsio_strings.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 30 19:22:35 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Oct 01 01:56:32 UTC 2021 // by class com.rusefi.output.FileFsioSettingsConsumer case FSIO_SETTING_ACIDLEEXTRAOFFSET: diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index 6fdea96637..0ff5a60e17 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -37,7 +37,7 @@ #define afterstartEnrich_offset 6184 #define afterstartHoldTime_offset 6152 #define air_pressure_sensor_config_s_size 16 -#define air_pressure_sensor_type_e_auto_enum "MT_CUSTOM", "MT_DENSO183", "MT_MPX4250", "MT_HONDA3BAR", "MT_DODGE_NEON_2003", "MT_SUBY_DENSO", "MT_GM_3_BAR", "MT_MPX4100", "MT_TOYOTA_89420_02010", "MT_MPX4250A", "MT_BOSCH_2_5", "MT_MAZDA_1_BAR", "MT_GM_2_BAR", "MT_GM_1_BAR" +#define air_pressure_sensor_type_e_auto_enum "MT_CUSTOM", "MT_DENSO183", "MT_MPX4250", "MT_HONDA3BAR", "MT_DODGE_NEON_2003", "MT_SUBY_DENSO", "MT_GM_3_BAR", "MT_MPX4100", "MT_TOYOTA_89420_02010", "MT_MPX4250A", "MT_BOSCH_2_5", "MT_MAZDA_1_BAR", "MT_GM_2_BAR", "MT_GM_1_BAR", "MT_MPXH6400" #define alignEngineSnifferAtTDC_offset 744 #define alignmentFill_at_2227_offset 2227 #define alignmentFill_at_2253_offset 2253 @@ -930,6 +930,7 @@ #define IM_IM_BATCH 2 #define IM_IM_SINGLE_POINT 3 #define IM_IM_WASTED_SPARK 2 +#define imu_type_e_auto_enum "IMU_NONE", "IMU_VAG", "IMU_TYPE_2", "IMU_TYPE_3", "IMU_TYPE_4" #define imuType_offset 778 #define INDICATOR_NAME_AC_SWITCH "AC switch" #define INDICATOR_NAME_BRAKE_DOWN "brake: down" @@ -1288,8 +1289,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD all -#define SIGNATURE_DATE 2021.09.30 -#define SIGNATURE_HASH 1068926200 +#define SIGNATURE_DATE 2021.10.01 +#define SIGNATURE_HASH 3133306615 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1645,7 +1646,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.09.30.all.1068926200" +#define TS_SIGNATURE "rusEFI 2021.10.01.all.3133306615" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index 9e147faf98..8def3c126d 100644 --- a/firmware/controllers/generated/signature_all.h +++ b/firmware/controllers/generated/signature_all.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD all -#define SIGNATURE_DATE 2021.09.30 -#define SIGNATURE_HASH 372528739 -#define TS_SIGNATURE "rusEFI 2021.09.30.all.372528739" +#define SIGNATURE_DATE 2021.10.01 +#define SIGNATURE_HASH 3133306615 +#define TS_SIGNATURE "rusEFI 2021.10.01.all.3133306615" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index faf9d28270..23783f1355 100644 --- a/firmware/controllers/generated/signature_atlas.h +++ b/firmware/controllers/generated/signature_atlas.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD atlas -#define SIGNATURE_DATE 2021.09.30 -#define SIGNATURE_HASH 372528739 -#define TS_SIGNATURE "rusEFI 2021.09.30.atlas.372528739" +#define SIGNATURE_DATE 2021.10.01 +#define SIGNATURE_HASH 3133306615 +#define TS_SIGNATURE "rusEFI 2021.10.01.atlas.3133306615" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index 35dafe5146..1ec28bc694 100644 --- a/firmware/controllers/generated/signature_f429-discovery.h +++ b/firmware/controllers/generated/signature_f429-discovery.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD f429-discovery -#define SIGNATURE_DATE 2021.09.30 -#define SIGNATURE_HASH 372528739 -#define TS_SIGNATURE "rusEFI 2021.09.30.f429-discovery.372528739" +#define SIGNATURE_DATE 2021.10.01 +#define SIGNATURE_HASH 3133306615 +#define TS_SIGNATURE "rusEFI 2021.10.01.f429-discovery.3133306615" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 32c0bf5fd8..32a374652a 100644 --- a/firmware/controllers/generated/signature_frankenso_na6.h +++ b/firmware/controllers/generated/signature_frankenso_na6.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD frankenso_na6 -#define SIGNATURE_DATE 2021.09.30 -#define SIGNATURE_HASH 1812333450 -#define TS_SIGNATURE "rusEFI 2021.09.30.frankenso_na6.1812333450" +#define SIGNATURE_DATE 2021.10.01 +#define SIGNATURE_HASH 3236963102 +#define TS_SIGNATURE "rusEFI 2021.10.01.frankenso_na6.3236963102" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index d8d3da9a03..92b8e39961 100644 --- a/firmware/controllers/generated/signature_hellen-nb1.h +++ b/firmware/controllers/generated/signature_hellen-nb1.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD hellen-nb1 -#define SIGNATURE_DATE 2021.09.30 -#define SIGNATURE_HASH 2962364855 -#define TS_SIGNATURE "rusEFI 2021.09.30.hellen-nb1.2962364855" +#define SIGNATURE_DATE 2021.10.01 +#define SIGNATURE_HASH 476330275 +#define TS_SIGNATURE "rusEFI 2021.10.01.hellen-nb1.476330275" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index 9ce691217b..a6b8b6264d 100644 --- a/firmware/controllers/generated/signature_hellen121nissan.h +++ b/firmware/controllers/generated/signature_hellen121nissan.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD hellen121nissan -#define SIGNATURE_DATE 2021.09.30 -#define SIGNATURE_HASH 2646937121 -#define TS_SIGNATURE "rusEFI 2021.09.30.hellen121nissan.2646937121" +#define SIGNATURE_DATE 2021.10.01 +#define SIGNATURE_HASH 825437877 +#define TS_SIGNATURE "rusEFI 2021.10.01.hellen121nissan.825437877" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index 6fc309050f..21cde9efac 100644 --- a/firmware/controllers/generated/signature_hellen121vag.h +++ b/firmware/controllers/generated/signature_hellen121vag.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD hellen121vag -#define SIGNATURE_DATE 2021.09.30 -#define SIGNATURE_HASH 1171830309 -#define TS_SIGNATURE "rusEFI 2021.09.30.hellen121vag.1171830309" +#define SIGNATURE_DATE 2021.10.01 +#define SIGNATURE_HASH 3912144561 +#define TS_SIGNATURE "rusEFI 2021.10.01.hellen121vag.3912144561" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index 69638e65f9..a7e9cc8c3f 100644 --- a/firmware/controllers/generated/signature_hellen128.h +++ b/firmware/controllers/generated/signature_hellen128.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD hellen128 -#define SIGNATURE_DATE 2021.09.30 -#define SIGNATURE_HASH 2398948368 -#define TS_SIGNATURE "rusEFI 2021.09.30.hellen128.2398948368" +#define SIGNATURE_DATE 2021.10.01 +#define SIGNATURE_HASH 571157636 +#define TS_SIGNATURE "rusEFI 2021.10.01.hellen128.571157636" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index 78267326c7..62cd5d1cae 100644 --- a/firmware/controllers/generated/signature_hellen154hyundai.h +++ b/firmware/controllers/generated/signature_hellen154hyundai.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD hellen154hyundai -#define SIGNATURE_DATE 2021.09.30 -#define SIGNATURE_HASH 881731771 -#define TS_SIGNATURE "rusEFI 2021.09.30.hellen154hyundai.881731771" +#define SIGNATURE_DATE 2021.10.01 +#define SIGNATURE_HASH 2558003247 +#define TS_SIGNATURE "rusEFI 2021.10.01.hellen154hyundai.2558003247" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index bfa3dec8f2..9dd3a08bc1 100644 --- a/firmware/controllers/generated/signature_hellen72.h +++ b/firmware/controllers/generated/signature_hellen72.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD hellen72 -#define SIGNATURE_DATE 2021.09.30 -#define SIGNATURE_HASH 1889613380 -#define TS_SIGNATURE "rusEFI 2021.09.30.hellen72.1889613380" +#define SIGNATURE_DATE 2021.10.01 +#define SIGNATURE_HASH 3696694992 +#define TS_SIGNATURE "rusEFI 2021.10.01.hellen72.3696694992" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index 13608a4b73..52f052936d 100644 --- a/firmware/controllers/generated/signature_hellenNA6.h +++ b/firmware/controllers/generated/signature_hellenNA6.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD hellenNA6 -#define SIGNATURE_DATE 2021.09.30 -#define SIGNATURE_HASH 3774758799 -#define TS_SIGNATURE "rusEFI 2021.09.30.hellenNA6.3774758799" +#define SIGNATURE_DATE 2021.10.01 +#define SIGNATURE_HASH 1275600667 +#define TS_SIGNATURE "rusEFI 2021.10.01.hellenNA6.1275600667" diff --git a/firmware/controllers/generated/signature_hellen_cypress.h b/firmware/controllers/generated/signature_hellen_cypress.h index a627e5adb1..13862f994b 100644 --- a/firmware/controllers/generated/signature_hellen_cypress.h +++ b/firmware/controllers/generated/signature_hellen_cypress.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD hellen_cypress -#define SIGNATURE_DATE 2021.09.30 -#define SIGNATURE_HASH 1414041011 -#define TS_SIGNATURE "rusEFI 2021.09.30.hellen_cypress.1414041011" +#define SIGNATURE_DATE 2021.10.01 +#define SIGNATURE_HASH 4173245735 +#define TS_SIGNATURE "rusEFI 2021.10.01.hellen_cypress.4173245735" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 5d1632a268..73afb47fb9 100644 --- a/firmware/controllers/generated/signature_kin.h +++ b/firmware/controllers/generated/signature_kin.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD kin -#define SIGNATURE_DATE 2021.09.30 -#define SIGNATURE_HASH 2884452687 -#define TS_SIGNATURE "rusEFI 2021.09.30.kin.2884452687" +#define SIGNATURE_DATE 2021.10.01 +#define SIGNATURE_HASH 119235035 +#define TS_SIGNATURE "rusEFI 2021.10.01.kin.119235035" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 6f52b8e8d6..74d51cd179 100644 --- a/firmware/controllers/generated/signature_mre_f4.h +++ b/firmware/controllers/generated/signature_mre_f4.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD mre_f4 -#define SIGNATURE_DATE 2021.09.30 -#define SIGNATURE_HASH 2661564919 -#define TS_SIGNATURE "rusEFI 2021.09.30.mre_f4.2661564919" +#define SIGNATURE_DATE 2021.10.01 +#define SIGNATURE_HASH 844259683 +#define TS_SIGNATURE "rusEFI 2021.10.01.mre_f4.844259683" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 431cc43752..66bb7d88c9 100644 --- a/firmware/controllers/generated/signature_mre_f7.h +++ b/firmware/controllers/generated/signature_mre_f7.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD mre_f7 -#define SIGNATURE_DATE 2021.09.30 -#define SIGNATURE_HASH 2661564919 -#define TS_SIGNATURE "rusEFI 2021.09.30.mre_f7.2661564919" +#define SIGNATURE_DATE 2021.10.01 +#define SIGNATURE_HASH 844259683 +#define TS_SIGNATURE "rusEFI 2021.10.01.mre_f7.844259683" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index ac9a274db0..6f6bcf8e49 100644 --- a/firmware/controllers/generated/signature_prometheus_405.h +++ b/firmware/controllers/generated/signature_prometheus_405.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD prometheus_405 -#define SIGNATURE_DATE 2021.09.30 -#define SIGNATURE_HASH 1188990853 -#define TS_SIGNATURE "rusEFI 2021.09.30.prometheus_405.1188990853" +#define SIGNATURE_DATE 2021.10.01 +#define SIGNATURE_HASH 3928534801 +#define TS_SIGNATURE "rusEFI 2021.10.01.prometheus_405.3928534801" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index d53aa13694..c6147ac4a3 100644 --- a/firmware/controllers/generated/signature_prometheus_469.h +++ b/firmware/controllers/generated/signature_prometheus_469.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD prometheus_469 -#define SIGNATURE_DATE 2021.09.30 -#define SIGNATURE_HASH 1188990853 -#define TS_SIGNATURE "rusEFI 2021.09.30.prometheus_469.1188990853" +#define SIGNATURE_DATE 2021.10.01 +#define SIGNATURE_HASH 3928534801 +#define TS_SIGNATURE "rusEFI 2021.10.01.prometheus_469.3928534801" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 73c646cb5a..a5c17b6437 100644 --- a/firmware/controllers/generated/signature_proteus_f4.h +++ b/firmware/controllers/generated/signature_proteus_f4.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD proteus_f4 -#define SIGNATURE_DATE 2021.09.30 -#define SIGNATURE_HASH 4042414277 -#define TS_SIGNATURE "rusEFI 2021.09.30.proteus_f4.4042414277" +#define SIGNATURE_DATE 2021.10.01 +#define SIGNATURE_HASH 1543796817 +#define TS_SIGNATURE "rusEFI 2021.10.01.proteus_f4.1543796817" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 9cabdb7e8c..d239a2710a 100644 --- a/firmware/controllers/generated/signature_proteus_f7.h +++ b/firmware/controllers/generated/signature_proteus_f7.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD proteus_f7 -#define SIGNATURE_DATE 2021.09.30 -#define SIGNATURE_HASH 4042414277 -#define TS_SIGNATURE "rusEFI 2021.09.30.proteus_f7.4042414277" +#define SIGNATURE_DATE 2021.10.01 +#define SIGNATURE_HASH 1543796817 +#define TS_SIGNATURE "rusEFI 2021.10.01.proteus_f7.1543796817" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index c8e74cd5ea..27f2787ed1 100644 --- a/firmware/controllers/generated/signature_subaru_eg33_f7.h +++ b/firmware/controllers/generated/signature_subaru_eg33_f7.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD subaru_eg33_f7 -#define SIGNATURE_DATE 2021.09.30 -#define SIGNATURE_HASH 2210315520 -#define TS_SIGNATURE "rusEFI 2021.09.30.subaru_eg33_f7.2210315520" +#define SIGNATURE_DATE 2021.10.01 +#define SIGNATURE_HASH 793288084 +#define TS_SIGNATURE "rusEFI 2021.10.01.subaru_eg33_f7.793288084" diff --git a/firmware/tunerstudio/generated/cache.zip b/firmware/tunerstudio/generated/cache.zip index dc65f889db99c72efbcf63121a55c523ef7d8f72..c6445bf86525555483e9d5f67f0d593dc6e16353 100644 GIT binary patch delta 480169 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 delta 480028 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 diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index 57f1f6d721..eaa9c698ea 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.09.30.all.372528739" + signature = "rusEFI 2021.10.01.all.3133306615" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.09.30.all.372528739" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.10.01.all.3133306615" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 30 20:14:33 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Oct 01 01:56:32 UTC 2021 pageSize = 20000 page = 1 @@ -135,7 +135,7 @@ map_samplingWindowBins = array, F32, 172, [8], "", 1, 0, 0, 18000, 2 map_samplingWindow = array, F32, 204, [8], "deg", 1, 0, -720, 720, 2 map_sensor_lowValue = scalar, F32, 236, "kpa", 1, 0, -400, 800, 2 map_sensor_highValue = scalar, F32, 240, "kpa", 1, 0, -400, 800, 2 -map_sensor_type = bits, U32, 244, [0:3], "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "Bosch 2.5", "Mazda1Bar", "GM 2 Bar", "GM 1 Bar", "INVALID", "INVALID" +map_sensor_type = bits, U32, 244, [0:4], "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "Bosch 2.5", "Mazda1Bar", "GM 2 Bar", "GM 1 Bar", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" map_sensor_hwChannel = bits, U08, 248, [0:5], "Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" map_sensor_alignmentFill = array, U08, 249, [3], "unit", 1, 0, 0, 100, 0 clt_tempC_1 = scalar, F32, 252, "*C", 1, 0, -40, 200, 1 @@ -258,7 +258,7 @@ tle6240_csPinMode = bits, U08, 582, [0:1], "default", "default inverted", "open throttlePedalUpPin = bits, U08, 583, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" baroSensor_lowValue = scalar, F32, 584, "kpa", 1, 0, -400, 800, 2 baroSensor_highValue = scalar, F32, 588, "kpa", 1, 0, -400, 800, 2 -baroSensor_type = bits, U32, 592, [0:3], "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "Bosch 2.5", "Mazda1Bar", "GM 2 Bar", "GM 1 Bar", "INVALID", "INVALID" +baroSensor_type = bits, U32, 592, [0:4], "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "Bosch 2.5", "Mazda1Bar", "GM 2 Bar", "GM 1 Bar", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" baroSensor_hwChannel = bits, U08, 596, [0:5], "Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" baroSensor_alignmentFill = array, U08, 597, [3], "unit", 1, 0, 0, 100, 0 idle_solenoidFrequency = scalar, S32, 600, "Hz", 1, 0, 0, 3000, 0 diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index 1c6b91de64..eb7a7044a6 100644 --- a/firmware/tunerstudio/generated/rusefi_atlas.ini +++ b/firmware/tunerstudio/generated/rusefi_atlas.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.09.30.atlas.372528739" + signature = "rusEFI 2021.10.01.atlas.3133306615" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.09.30.atlas.372528739" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.10.01.atlas.3133306615" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 30 20:14:31 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Oct 01 01:56:29 UTC 2021 pageSize = 20000 page = 1 @@ -135,7 +135,7 @@ map_samplingWindowBins = array, F32, 172, [8], "", 1, 0, 0, 18000, 2 map_samplingWindow = array, F32, 204, [8], "deg", 1, 0, -720, 720, 2 map_sensor_lowValue = scalar, F32, 236, "kpa", 1, 0, -400, 800, 2 map_sensor_highValue = scalar, F32, 240, "kpa", 1, 0, -400, 800, 2 -map_sensor_type = bits, U32, 244, [0:3], "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "Bosch 2.5", "Mazda1Bar", "GM 2 Bar", "GM 1 Bar", "INVALID", "INVALID" +map_sensor_type = bits, U32, 244, [0:4], "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "Bosch 2.5", "Mazda1Bar", "GM 2 Bar", "GM 1 Bar", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" map_sensor_hwChannel = bits, U08, 248, [0:5], "Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" map_sensor_alignmentFill = array, U08, 249, [3], "unit", 1, 0, 0, 100, 0 clt_tempC_1 = scalar, F32, 252, "*C", 1, 0, -40, 200, 1 @@ -258,7 +258,7 @@ tle6240_csPinMode = bits, U08, 582, [0:1], "default", "default inverted", "open throttlePedalUpPin = bits, U08, 583, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" baroSensor_lowValue = scalar, F32, 584, "kpa", 1, 0, -400, 800, 2 baroSensor_highValue = scalar, F32, 588, "kpa", 1, 0, -400, 800, 2 -baroSensor_type = bits, U32, 592, [0:3], "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "Bosch 2.5", "Mazda1Bar", "GM 2 Bar", "GM 1 Bar", "INVALID", "INVALID" +baroSensor_type = bits, U32, 592, [0:4], "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "Bosch 2.5", "Mazda1Bar", "GM 2 Bar", "GM 1 Bar", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" baroSensor_hwChannel = bits, U08, 596, [0:5], "Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" baroSensor_alignmentFill = array, U08, 597, [3], "unit", 1, 0, 0, 100, 0 idle_solenoidFrequency = scalar, S32, 600, "Hz", 1, 0, 0, 3000, 0 diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index a51f61c92f..404a6f95ed 100644 --- a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.09.30.f429-discovery.372528739" + signature = "rusEFI 2021.10.01.f429-discovery.3133306615" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.09.30.f429-discovery.372528739" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.10.01.f429-discovery.3133306615" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 30 20:13:58 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Oct 01 01:55:55 UTC 2021 pageSize = 20000 page = 1 @@ -135,7 +135,7 @@ map_samplingWindowBins = array, F32, 172, [8], "", 1, 0, 0, 18000, 2 map_samplingWindow = array, F32, 204, [8], "deg", 1, 0, -720, 720, 2 map_sensor_lowValue = scalar, F32, 236, "kpa", 1, 0, -400, 800, 2 map_sensor_highValue = scalar, F32, 240, "kpa", 1, 0, -400, 800, 2 -map_sensor_type = bits, U32, 244, [0:3], "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "Bosch 2.5", "Mazda1Bar", "GM 2 Bar", "GM 1 Bar", "INVALID", "INVALID" +map_sensor_type = bits, U32, 244, [0:4], "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "Bosch 2.5", "Mazda1Bar", "GM 2 Bar", "GM 1 Bar", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" map_sensor_hwChannel = bits, U08, 248, [0:5], "Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" map_sensor_alignmentFill = array, U08, 249, [3], "unit", 1, 0, 0, 100, 0 clt_tempC_1 = scalar, F32, 252, "*C", 1, 0, -40, 200, 1 @@ -258,7 +258,7 @@ tle6240_csPinMode = bits, U08, 582, [0:1], "default", "default inverted", "open throttlePedalUpPin = bits, U08, 583, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" baroSensor_lowValue = scalar, F32, 584, "kpa", 1, 0, -400, 800, 2 baroSensor_highValue = scalar, F32, 588, "kpa", 1, 0, -400, 800, 2 -baroSensor_type = bits, U32, 592, [0:3], "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "Bosch 2.5", "Mazda1Bar", "GM 2 Bar", "GM 1 Bar", "INVALID", "INVALID" +baroSensor_type = bits, U32, 592, [0:4], "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "Bosch 2.5", "Mazda1Bar", "GM 2 Bar", "GM 1 Bar", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" baroSensor_hwChannel = bits, U08, 596, [0:5], "Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" baroSensor_alignmentFill = array, U08, 597, [3], "unit", 1, 0, 0, 100, 0 idle_solenoidFrequency = scalar, S32, 600, "Hz", 1, 0, 0, 3000, 0 diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 9527065878..78d39061cc 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.09.30.frankenso_na6.1812333450" + signature = "rusEFI 2021.10.01.frankenso_na6.3236963102" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.09.30.frankenso_na6.1812333450" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.10.01.frankenso_na6.3236963102" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 30 20:14:20 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Oct 01 01:56:18 UTC 2021 pageSize = 20000 page = 1 @@ -135,7 +135,7 @@ map_samplingWindowBins = array, F32, 172, [8], "", 1, 0, 0, 18000, 2 map_samplingWindow = array, F32, 204, [8], "deg", 1, 0, -720, 720, 2 map_sensor_lowValue = scalar, F32, 236, "kpa", 1, 0, -400, 800, 2 map_sensor_highValue = scalar, F32, 240, "kpa", 1, 0, -400, 800, 2 -map_sensor_type = bits, U32, 244, [0:3], "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "Bosch 2.5", "Mazda1Bar", "GM 2 Bar", "GM 1 Bar", "INVALID", "INVALID" +map_sensor_type = bits, U32, 244, [0:4], "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "Bosch 2.5", "Mazda1Bar", "GM 2 Bar", "GM 1 Bar", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" map_sensor_hwChannel = bits, U08, 248, [0:5], "NONE","Analog 3O","Analog 3L","Analog 3M","Analog 3J","Analog 3I","INVALID","Analog 3H","Analog 3G","INVALID","INVALID","INVALID","Analog 3P","Analog 3Q","Analog 3N","Analog VBatt","Analog 3E", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" map_sensor_alignmentFill = array, U08, 249, [3], "unit", 1, 0, 0, 100, 0 clt_tempC_1 = scalar, F32, 252, "*C", 1, 0, -40, 200, 1 @@ -258,7 +258,7 @@ tle6240_csPinMode = bits, U08, 582, [0:1], "default", "default inverted", "open throttlePedalUpPin = bits, U08, 583, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" baroSensor_lowValue = scalar, F32, 584, "kpa", 1, 0, -400, 800, 2 baroSensor_highValue = scalar, F32, 588, "kpa", 1, 0, -400, 800, 2 -baroSensor_type = bits, U32, 592, [0:3], "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "Bosch 2.5", "Mazda1Bar", "GM 2 Bar", "GM 1 Bar", "INVALID", "INVALID" +baroSensor_type = bits, U32, 592, [0:4], "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "Bosch 2.5", "Mazda1Bar", "GM 2 Bar", "GM 1 Bar", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" baroSensor_hwChannel = bits, U08, 596, [0:5], "NONE","Analog 3O","Analog 3L","Analog 3M","Analog 3J","Analog 3I","INVALID","Analog 3H","Analog 3G","INVALID","INVALID","INVALID","Analog 3P","Analog 3Q","Analog 3N","Analog VBatt","Analog 3E", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" baroSensor_alignmentFill = array, U08, 597, [3], "unit", 1, 0, 0, 100, 0 idle_solenoidFrequency = scalar, S32, 600, "Hz", 1, 0, 0, 3000, 0 diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini index 962262c007..a246fa4dc2 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.09.30.hellen-nb1.2962364855" + signature = "rusEFI 2021.10.01.hellen-nb1.476330275" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.09.30.hellen-nb1.2962364855" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.10.01.hellen-nb1.476330275" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 30 20:14:11 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Oct 01 01:56:09 UTC 2021 pageSize = 20000 page = 1 @@ -135,7 +135,7 @@ map_samplingWindowBins = array, F32, 172, [8], "", 1, 0, 0, 18000, 2 map_samplingWindow = array, F32, 204, [8], "deg", 1, 0, -720, 720, 2 map_sensor_lowValue = scalar, F32, 236, "kpa", 1, 0, -400, 800, 2 map_sensor_highValue = scalar, F32, 240, "kpa", 1, 0, -400, 800, 2 -map_sensor_type = bits, U32, 244, [0:3], "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "Bosch 2.5", "Mazda1Bar", "GM 2 Bar", "GM 1 Bar", "INVALID", "INVALID" +map_sensor_type = bits, U32, 244, [0:4], "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "Bosch 2.5", "Mazda1Bar", "GM 2 Bar", "GM 1 Bar", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" map_sensor_hwChannel = bits, U08, 248, [0:5], "NONE","2C - O2S","TPS1","intMAP","PPS1","3E - TPS","1B - Battery Sense","2H - CAM","3S - EGR BOOST IN","2A - Pressure Input","2J - CRANK","2L - MAF","3D - MAP","2E - Coolant","2B - IAT","4C - IN TEMP/PPS2","1P - AC Switch", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" map_sensor_alignmentFill = array, U08, 249, [3], "unit", 1, 0, 0, 100, 0 clt_tempC_1 = scalar, F32, 252, "*C", 1, 0, -40, 200, 1 @@ -258,7 +258,7 @@ tle6240_csPinMode = bits, U08, 582, [0:1], "default", "default inverted", "open throttlePedalUpPin = bits, U08, 583, [0:7], "NONE","INVALID","INVALID","TPS1","INVALID","PPS1","INVALID","INVALID","INVALID","3S - EGR BOOST IN","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","2A - Pressure Input","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","4C - IN TEMP/PPS2","1P - AC Switch","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","3I - Clutch","1V - Neutral","INVALID","INVALID","INVALID","INVALID","3J - O2S2","INVALID","INVALID","INVALID","INVALID","INVALID","1F - Brake/RES1","1G - Steering/RES2", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" baroSensor_lowValue = scalar, F32, 584, "kpa", 1, 0, -400, 800, 2 baroSensor_highValue = scalar, F32, 588, "kpa", 1, 0, -400, 800, 2 -baroSensor_type = bits, U32, 592, [0:3], "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "Bosch 2.5", "Mazda1Bar", "GM 2 Bar", "GM 1 Bar", "INVALID", "INVALID" +baroSensor_type = bits, U32, 592, [0:4], "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "Bosch 2.5", "Mazda1Bar", "GM 2 Bar", "GM 1 Bar", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" baroSensor_hwChannel = bits, U08, 596, [0:5], "NONE","2C - O2S","TPS1","intMAP","PPS1","3E - TPS","1B - Battery Sense","2H - CAM","3S - EGR BOOST IN","2A - Pressure Input","2J - CRANK","2L - MAF","3D - MAP","2E - Coolant","2B - IAT","4C - IN TEMP/PPS2","1P - AC Switch", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" baroSensor_alignmentFill = array, U08, 597, [3], "unit", 1, 0, 0, 100, 0 idle_solenoidFrequency = scalar, S32, 600, "Hz", 1, 0, 0, 3000, 0 diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index d2c97aeab6..49f5da0b30 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.09.30.hellen121nissan.2646937121" + signature = "rusEFI 2021.10.01.hellen121nissan.825437877" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.09.30.hellen121nissan.2646937121" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.10.01.hellen121nissan.825437877" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 30 20:14:04 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Oct 01 01:56:02 UTC 2021 pageSize = 20000 page = 1 @@ -135,7 +135,7 @@ map_samplingWindowBins = array, F32, 172, [8], "", 1, 0, 0, 18000, 2 map_samplingWindow = array, F32, 204, [8], "deg", 1, 0, -720, 720, 2 map_sensor_lowValue = scalar, F32, 236, "kpa", 1, 0, -400, 800, 2 map_sensor_highValue = scalar, F32, 240, "kpa", 1, 0, -400, 800, 2 -map_sensor_type = bits, U32, 244, [0:3], "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "Bosch 2.5", "Mazda1Bar", "GM 2 Bar", "GM 1 Bar", "INVALID", "INVALID" +map_sensor_type = bits, U32, 244, [0:4], "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "Bosch 2.5", "Mazda1Bar", "GM 2 Bar", "GM 1 Bar", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" map_sensor_hwChannel = bits, U08, 248, [0:5], "NONE","INVALID","INVALID","INVALID","106 - PPS 1","50 - TPS 1","109 Ignition Key Voltage","INVALID","INVALID","69 - TPS 2","INVALID","INVALID","INVALID","73 - CLT","34 - IAT","98 - PPS 2", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" map_sensor_alignmentFill = array, U08, 249, [3], "unit", 1, 0, 0, 100, 0 clt_tempC_1 = scalar, F32, 252, "*C", 1, 0, -40, 200, 1 @@ -258,7 +258,7 @@ tle6240_csPinMode = bits, U08, 582, [0:1], "default", "default inverted", "open throttlePedalUpPin = bits, U08, 583, [0:7], "NONE","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","101 - Brake Input","102 - Power Steering Input", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" baroSensor_lowValue = scalar, F32, 584, "kpa", 1, 0, -400, 800, 2 baroSensor_highValue = scalar, F32, 588, "kpa", 1, 0, -400, 800, 2 -baroSensor_type = bits, U32, 592, [0:3], "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "Bosch 2.5", "Mazda1Bar", "GM 2 Bar", "GM 1 Bar", "INVALID", "INVALID" +baroSensor_type = bits, U32, 592, [0:4], "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "Bosch 2.5", "Mazda1Bar", "GM 2 Bar", "GM 1 Bar", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" baroSensor_hwChannel = bits, U08, 596, [0:5], "NONE","INVALID","INVALID","INVALID","106 - PPS 1","50 - TPS 1","109 Ignition Key Voltage","INVALID","INVALID","69 - TPS 2","INVALID","INVALID","INVALID","73 - CLT","34 - IAT","98 - PPS 2", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" baroSensor_alignmentFill = array, U08, 597, [3], "unit", 1, 0, 0, 100, 0 idle_solenoidFrequency = scalar, S32, 600, "Hz", 1, 0, 0, 3000, 0 diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index 2a381c55a0..68bb616502 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.09.30.hellen121vag.1171830309" + signature = "rusEFI 2021.10.01.hellen121vag.3912144561" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.09.30.hellen121vag.1171830309" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.10.01.hellen121vag.3912144561" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 30 20:14:02 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Oct 01 01:56:00 UTC 2021 pageSize = 20000 page = 1 @@ -135,7 +135,7 @@ map_samplingWindowBins = array, F32, 172, [8], "", 1, 0, 0, 18000, 2 map_samplingWindow = array, F32, 204, [8], "deg", 1, 0, -720, 720, 2 map_sensor_lowValue = scalar, F32, 236, "kpa", 1, 0, -400, 800, 2 map_sensor_highValue = scalar, F32, 240, "kpa", 1, 0, -400, 800, 2 -map_sensor_type = bits, U32, 244, [0:3], "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "Bosch 2.5", "Mazda1Bar", "GM 2 Bar", "GM 1 Bar", "INVALID", "INVALID" +map_sensor_type = bits, U32, 244, [0:4], "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "Bosch 2.5", "Mazda1Bar", "GM 2 Bar", "GM 1 Bar", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" map_sensor_hwChannel = bits, U08, 248, [0:5], "NONE","14 - O2","INVALID","INVALID","34 In PPS1","92 - TPS 1","106 - KNOCK","86 - CAM1","87 - CAM2","84 - TPS2","INVALID","29 In Maf","101 - MAP2","93 - CLT","85 - IAT","35 In PPS2", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" map_sensor_alignmentFill = array, U08, 249, [3], "unit", 1, 0, 0, 100, 0 clt_tempC_1 = scalar, F32, 252, "*C", 1, 0, -40, 200, 1 @@ -258,7 +258,7 @@ tle6240_csPinMode = bits, U08, 582, [0:1], "default", "default inverted", "open throttlePedalUpPin = bits, U08, 583, [0:7], "NONE","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","In D1","In D2","In D3","In D4","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","48 - IN RES1","39 - IN RES2", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" baroSensor_lowValue = scalar, F32, 584, "kpa", 1, 0, -400, 800, 2 baroSensor_highValue = scalar, F32, 588, "kpa", 1, 0, -400, 800, 2 -baroSensor_type = bits, U32, 592, [0:3], "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "Bosch 2.5", "Mazda1Bar", "GM 2 Bar", "GM 1 Bar", "INVALID", "INVALID" +baroSensor_type = bits, U32, 592, [0:4], "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "Bosch 2.5", "Mazda1Bar", "GM 2 Bar", "GM 1 Bar", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" baroSensor_hwChannel = bits, U08, 596, [0:5], "NONE","14 - O2","INVALID","INVALID","34 In PPS1","92 - TPS 1","106 - KNOCK","86 - CAM1","87 - CAM2","84 - TPS2","INVALID","29 In Maf","101 - MAP2","93 - CLT","85 - IAT","35 In PPS2", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" baroSensor_alignmentFill = array, U08, 597, [3], "unit", 1, 0, 0, 100, 0 idle_solenoidFrequency = scalar, S32, 600, "Hz", 1, 0, 0, 3000, 0 diff --git a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini index 766aaa2ae4..0b3d59de68 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.09.30.hellen128.2398948368" + signature = "rusEFI 2021.10.01.hellen128.571157636" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.09.30.hellen128.2398948368" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.10.01.hellen128.571157636" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 30 20:14:00 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Oct 01 01:55:58 UTC 2021 pageSize = 20000 page = 1 @@ -135,7 +135,7 @@ map_samplingWindowBins = array, F32, 172, [8], "", 1, 0, 0, 18000, 2 map_samplingWindow = array, F32, 204, [8], "deg", 1, 0, -720, 720, 2 map_sensor_lowValue = scalar, F32, 236, "kpa", 1, 0, -400, 800, 2 map_sensor_highValue = scalar, F32, 240, "kpa", 1, 0, -400, 800, 2 -map_sensor_type = bits, U32, 244, [0:3], "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "Bosch 2.5", "Mazda1Bar", "GM 2 Bar", "GM 1 Bar", "INVALID", "INVALID" +map_sensor_type = bits, U32, 244, [0:4], "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "Bosch 2.5", "Mazda1Bar", "GM 2 Bar", "GM 1 Bar", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" map_sensor_hwChannel = bits, U08, 248, [0:5], "NONE","C31 - O2S","P31_IN_O2S2","INVALID","C24 - PPS1","E31 - TPS1","Battery Sense","E40 - IN_CAM","P30_IN_AUX4","E34 - TPS2","E37 - Crank Input","E47 - MAF","E23 - MAP","E29 - Coolant Temp","E45 - IAT","C25 - PPS2", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" map_sensor_alignmentFill = array, U08, 249, [3], "unit", 1, 0, 0, 100, 0 clt_tempC_1 = scalar, F32, 252, "*C", 1, 0, -40, 200, 1 @@ -258,7 +258,7 @@ tle6240_csPinMode = bits, U08, 582, [0:1], "default", "default inverted", "open throttlePedalUpPin = bits, U08, 583, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" baroSensor_lowValue = scalar, F32, 584, "kpa", 1, 0, -400, 800, 2 baroSensor_highValue = scalar, F32, 588, "kpa", 1, 0, -400, 800, 2 -baroSensor_type = bits, U32, 592, [0:3], "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "Bosch 2.5", "Mazda1Bar", "GM 2 Bar", "GM 1 Bar", "INVALID", "INVALID" +baroSensor_type = bits, U32, 592, [0:4], "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "Bosch 2.5", "Mazda1Bar", "GM 2 Bar", "GM 1 Bar", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" baroSensor_hwChannel = bits, U08, 596, [0:5], "NONE","C31 - O2S","P31_IN_O2S2","INVALID","C24 - PPS1","E31 - TPS1","Battery Sense","E40 - IN_CAM","P30_IN_AUX4","E34 - TPS2","E37 - Crank Input","E47 - MAF","E23 - MAP","E29 - Coolant Temp","E45 - IAT","C25 - PPS2", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" baroSensor_alignmentFill = array, U08, 597, [3], "unit", 1, 0, 0, 100, 0 idle_solenoidFrequency = scalar, S32, 600, "Hz", 1, 0, 0, 3000, 0 diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini index 0a05342ed3..09b9680e0a 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.09.30.hellen154hyundai.881731771" + signature = "rusEFI 2021.10.01.hellen154hyundai.2558003247" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.09.30.hellen154hyundai.881731771" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.10.01.hellen154hyundai.2558003247" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 30 20:14:07 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Oct 01 01:56:04 UTC 2021 pageSize = 20000 page = 1 @@ -135,7 +135,7 @@ map_samplingWindowBins = array, F32, 172, [8], "", 1, 0, 0, 18000, 2 map_samplingWindow = array, F32, 204, [8], "deg", 1, 0, -720, 720, 2 map_sensor_lowValue = scalar, F32, 236, "kpa", 1, 0, -400, 800, 2 map_sensor_highValue = scalar, F32, 240, "kpa", 1, 0, -400, 800, 2 -map_sensor_type = bits, U32, 244, [0:3], "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "Bosch 2.5", "Mazda1Bar", "GM 2 Bar", "GM 1 Bar", "INVALID", "INVALID" +map_sensor_type = bits, U32, 244, [0:4], "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "Bosch 2.5", "Mazda1Bar", "GM 2 Bar", "GM 1 Bar", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" map_sensor_hwChannel = bits, U08, 248, [0:5], "Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" map_sensor_alignmentFill = array, U08, 249, [3], "unit", 1, 0, 0, 100, 0 clt_tempC_1 = scalar, F32, 252, "*C", 1, 0, -40, 200, 1 @@ -258,7 +258,7 @@ tle6240_csPinMode = bits, U08, 582, [0:1], "default", "default inverted", "open throttlePedalUpPin = bits, U08, 583, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" baroSensor_lowValue = scalar, F32, 584, "kpa", 1, 0, -400, 800, 2 baroSensor_highValue = scalar, F32, 588, "kpa", 1, 0, -400, 800, 2 -baroSensor_type = bits, U32, 592, [0:3], "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "Bosch 2.5", "Mazda1Bar", "GM 2 Bar", "GM 1 Bar", "INVALID", "INVALID" +baroSensor_type = bits, U32, 592, [0:4], "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "Bosch 2.5", "Mazda1Bar", "GM 2 Bar", "GM 1 Bar", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" baroSensor_hwChannel = bits, U08, 596, [0:5], "Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" baroSensor_alignmentFill = array, U08, 597, [3], "unit", 1, 0, 0, 100, 0 idle_solenoidFrequency = scalar, S32, 600, "Hz", 1, 0, 0, 3000, 0 diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index 423d0c9b76..2660b5af61 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen72.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen72.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.09.30.hellen72.1889613380" + signature = "rusEFI 2021.10.01.hellen72.3696694992" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.09.30.hellen72.1889613380" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.10.01.hellen72.3696694992" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 30 20:14:09 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Oct 01 01:56:07 UTC 2021 pageSize = 20000 page = 1 @@ -135,7 +135,7 @@ map_samplingWindowBins = array, F32, 172, [8], "", 1, 0, 0, 18000, 2 map_samplingWindow = array, F32, 204, [8], "deg", 1, 0, -720, 720, 2 map_sensor_lowValue = scalar, F32, 236, "kpa", 1, 0, -400, 800, 2 map_sensor_highValue = scalar, F32, 240, "kpa", 1, 0, -400, 800, 2 -map_sensor_type = bits, U32, 244, [0:3], "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "Bosch 2.5", "Mazda1Bar", "GM 2 Bar", "GM 1 Bar", "INVALID", "INVALID" +map_sensor_type = bits, U32, 244, [0:4], "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "Bosch 2.5", "Mazda1Bar", "GM 2 Bar", "GM 1 Bar", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" map_sensor_hwChannel = bits, U08, 248, [0:5], "NONE","4W - O2S (A13)","3L - IGN_7 / AFR","intMAP (A15)","4AB - FTP/PPS (A18)","4V - TPS (A17)","4T - Alternator voltage (A5)","3V - CAM (A19)","4J - VTCS/AUX4 (A20)","4F - AC_PRES/AUX1 (A23)","4AA - O2S2 (A12)","4X - MAF (A9)","4U - MAP2/Ign8 (A10)","4P - CLT (A11)","4N - IAT (A14)","4AD - FUEL_LEVEL (A21)","4AE - EGR/MAP4 (A22)", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" map_sensor_alignmentFill = array, U08, 249, [3], "unit", 1, 0, 0, 100, 0 clt_tempC_1 = scalar, F32, 252, "*C", 1, 0, -40, 200, 1 @@ -258,7 +258,7 @@ tle6240_csPinMode = bits, U08, 582, [0:1], "default", "default inverted", "open throttlePedalUpPin = bits, U08, 583, [0:7], "NONE","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","4J - VTCS/AUX4 (A20)","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","4F - AC_PRES/AUX1 (A23)","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","4H - Neutral/AUX2 (A21)","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","4I - Clutch (A8)","4B - Brake/RES1 (A7)","4C - Steering/RES2 (A16)", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" baroSensor_lowValue = scalar, F32, 584, "kpa", 1, 0, -400, 800, 2 baroSensor_highValue = scalar, F32, 588, "kpa", 1, 0, -400, 800, 2 -baroSensor_type = bits, U32, 592, [0:3], "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "Bosch 2.5", "Mazda1Bar", "GM 2 Bar", "GM 1 Bar", "INVALID", "INVALID" +baroSensor_type = bits, U32, 592, [0:4], "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "Bosch 2.5", "Mazda1Bar", "GM 2 Bar", "GM 1 Bar", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" baroSensor_hwChannel = bits, U08, 596, [0:5], "NONE","4W - O2S (A13)","3L - IGN_7 / AFR","intMAP (A15)","4AB - FTP/PPS (A18)","4V - TPS (A17)","4T - Alternator voltage (A5)","3V - CAM (A19)","4J - VTCS/AUX4 (A20)","4F - AC_PRES/AUX1 (A23)","4AA - O2S2 (A12)","4X - MAF (A9)","4U - MAP2/Ign8 (A10)","4P - CLT (A11)","4N - IAT (A14)","4AD - FUEL_LEVEL (A21)","4AE - EGR/MAP4 (A22)", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" baroSensor_alignmentFill = array, U08, 597, [3], "unit", 1, 0, 0, 100, 0 idle_solenoidFrequency = scalar, S32, 600, "Hz", 1, 0, 0, 3000, 0 diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index b1e5f81928..7ba3bdb95d 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.09.30.hellenNA6.3774758799" + signature = "rusEFI 2021.10.01.hellenNA6.1275600667" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.09.30.hellenNA6.3774758799" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.10.01.hellenNA6.1275600667" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 30 20:14:14 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Oct 01 01:56:11 UTC 2021 pageSize = 20000 page = 1 @@ -135,7 +135,7 @@ map_samplingWindowBins = array, F32, 172, [8], "", 1, 0, 0, 18000, 2 map_samplingWindow = array, F32, 204, [8], "deg", 1, 0, -720, 720, 2 map_sensor_lowValue = scalar, F32, 236, "kpa", 1, 0, -400, 800, 2 map_sensor_highValue = scalar, F32, 240, "kpa", 1, 0, -400, 800, 2 -map_sensor_type = bits, U32, 244, [0:3], "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "Bosch 2.5", "Mazda1Bar", "GM 2 Bar", "GM 1 Bar", "INVALID", "INVALID" +map_sensor_type = bits, U32, 244, [0:4], "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "Bosch 2.5", "Mazda1Bar", "GM 2 Bar", "GM 1 Bar", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" map_sensor_hwChannel = bits, U08, 248, [0:5], "NONE","3N - O2S","2N - Temperature Sensor","intMAP (A15)","INVALID","TPS Input","1B - Battery Sense","INVALID","INVALID","INVALID","INVALID","3O - MAF","2M - Pressure Sensor","3Q - CLT","3P - IAT","1V - Clutch Switch","1Q AC Switch", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" map_sensor_alignmentFill = array, U08, 249, [3], "unit", 1, 0, 0, 100, 0 clt_tempC_1 = scalar, F32, 252, "*C", 1, 0, -40, 200, 1 @@ -258,7 +258,7 @@ tle6240_csPinMode = bits, U08, 582, [0:1], "default", "default inverted", "open throttlePedalUpPin = bits, U08, 583, [0:7], "NONE","INVALID","INVALID","2N - Temperature Sensor","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","2M - Pressure Sensor","INVALID","INVALID","1V - Clutch Switch","1Q AC Switch", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" baroSensor_lowValue = scalar, F32, 584, "kpa", 1, 0, -400, 800, 2 baroSensor_highValue = scalar, F32, 588, "kpa", 1, 0, -400, 800, 2 -baroSensor_type = bits, U32, 592, [0:3], "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "Bosch 2.5", "Mazda1Bar", "GM 2 Bar", "GM 1 Bar", "INVALID", "INVALID" +baroSensor_type = bits, U32, 592, [0:4], "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "Bosch 2.5", "Mazda1Bar", "GM 2 Bar", "GM 1 Bar", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" baroSensor_hwChannel = bits, U08, 596, [0:5], "NONE","3N - O2S","2N - Temperature Sensor","intMAP (A15)","INVALID","TPS Input","1B - Battery Sense","INVALID","INVALID","INVALID","INVALID","3O - MAF","2M - Pressure Sensor","3Q - CLT","3P - IAT","1V - Clutch Switch","1Q AC Switch", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" baroSensor_alignmentFill = array, U08, 597, [3], "unit", 1, 0, 0, 100, 0 idle_solenoidFrequency = scalar, S32, 600, "Hz", 1, 0, 0, 3000, 0 diff --git a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini index 5a54130a4c..cfad286cb4 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.09.30.hellen_cypress.1414041011" + signature = "rusEFI 2021.10.01.hellen_cypress.4173245735" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.09.30.hellen_cypress.1414041011" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.10.01.hellen_cypress.4173245735" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Thu Sep 30 20:14:37 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Fri Oct 01 01:56:36 UTC 2021 pageSize = 20000 page = 1 @@ -135,7 +135,7 @@ map_samplingWindowBins = array, F32, 172, [8], "", 1, 0, 0, 18000, 2 map_samplingWindow = array, F32, 204, [8], "deg", 1, 0, -720, 720, 2 map_sensor_lowValue = scalar, F32, 236, "kpa", 1, 0, -400, 800, 2 map_sensor_highValue = scalar, F32, 240, "kpa", 1, 0, -400, 800, 2 -map_sensor_type = bits, U32, 244, [0:3], "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "Bosch 2.5", "Mazda1Bar", "GM 2 Bar", "GM 1 Bar", "INVALID", "INVALID" +map_sensor_type = bits, U32, 244, [0:4], "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "Bosch 2.5", "Mazda1Bar", "GM 2 Bar", "GM 1 Bar", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" map_sensor_hwChannel = bits, U08, 248, [0:5], "Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" map_sensor_alignmentFill = array, U08, 249, [3], "unit", 1, 0, 0, 100, 0 clt_tempC_1 = scalar, F32, 252, "*C", 1, 0, -40, 200, 1 @@ -258,7 +258,7 @@ tle6240_csPinMode = bits, U08, 582, [0:1], "default", "default inverted", "open throttlePedalUpPin = bits, U08, 583, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" baroSensor_lowValue = scalar, F32, 584, "kpa", 1, 0, -400, 800, 2 baroSensor_highValue = scalar, F32, 588, "kpa", 1, 0, -400, 800, 2 -baroSensor_type = bits, U32, 592, [0:3], "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "Bosch 2.5", "Mazda1Bar", "GM 2 Bar", "GM 1 Bar", "INVALID", "INVALID" +baroSensor_type = bits, U32, 592, [0:4], "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "Bosch 2.5", "Mazda1Bar", "GM 2 Bar", "GM 1 Bar", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" baroSensor_hwChannel = bits, U08, 596, [0:5], "Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" baroSensor_alignmentFill = array, U08, 597, [3], "unit", 1, 0, 0, 100, 0 idle_solenoidFrequency = scalar, S32, 600, "Hz", 1, 0, 0, 3000, 0 diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini index 69da36d194..0a761a31a2 100644 --- a/firmware/tunerstudio/generated/rusefi_kinetis.ini +++ b/firmware/tunerstudio/generated/rusefi_kinetis.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.09.30.kin.2884452687" + signature = "rusEFI 2021.10.01.kin.119235035" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.09.30.kin.2884452687" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.10.01.kin.119235035" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Thu Sep 30 20:14:35 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Fri Oct 01 01:56:34 UTC 2021 pageSize = 19972 page = 1 @@ -135,7 +135,7 @@ map_samplingWindowBins = array, F32, 172, [8], "", 1, 0, 0, 18000, 2 map_samplingWindow = array, F32, 204, [8], "deg", 1, 0, -720, 720, 2 map_sensor_lowValue = scalar, F32, 236, "kpa", 1, 0, -400, 800, 2 map_sensor_highValue = scalar, F32, 240, "kpa", 1, 0, -400, 800, 2 -map_sensor_type = bits, U32, 244, [0:3], "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "Bosch 2.5", "Mazda1Bar", "GM 2 Bar", "GM 1 Bar", "INVALID", "INVALID" +map_sensor_type = bits, U32, 244, [0:4], "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "Bosch 2.5", "Mazda1Bar", "GM 2 Bar", "GM 1 Bar", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" map_sensor_hwChannel = bits, U08, 248, [0:5], "Disabled", "PA2", "PA3", "INVALID", "PD3", "INVALID", "INVALID", "INVALID", "PB12", "PB13", "INVALID", "PE2", "INVALID", "PC14", "PC15", "PC16", "PC17", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" map_sensor_alignmentFill = array, U08, 249, [3], "unit", 1, 0, 0, 100, 0 clt_tempC_1 = scalar, F32, 252, "*C", 1, 0, -40, 200, 1 @@ -255,7 +255,7 @@ tle6240_csPinMode = bits, U08, 582, [0:1], "default", "default inverted", "open throttlePedalUpPin = bits, U08, 583, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "N/A", "N/A", "PA10", "PA11", "PA12", "PA13", "N/A", "N/A", "N/A", "N/A", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "N/A", "N/A", "N/A", "N/A", "PB12", "PB13", "N/A", "N/A", "N/A", "N/A", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "N/A", "N/A", "N/A", "N/A", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "PD15", "PD16", "N/A", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" baroSensor_lowValue = scalar, F32, 584, "kpa", 1, 0, -400, 800, 2 baroSensor_highValue = scalar, F32, 588, "kpa", 1, 0, -400, 800, 2 -baroSensor_type = bits, U32, 592, [0:3], "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "Bosch 2.5", "Mazda1Bar", "GM 2 Bar", "GM 1 Bar", "INVALID", "INVALID" +baroSensor_type = bits, U32, 592, [0:4], "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "Bosch 2.5", "Mazda1Bar", "GM 2 Bar", "GM 1 Bar", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" baroSensor_hwChannel = bits, U08, 596, [0:5], "Disabled", "PA2", "PA3", "INVALID", "PD3", "INVALID", "INVALID", "INVALID", "PB12", "PB13", "INVALID", "PE2", "INVALID", "PC14", "PC15", "PC16", "PC17", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" baroSensor_alignmentFill = array, U08, 597, [3], "unit", 1, 0, 0, 100, 0 idle_solenoidFrequency = scalar, S32, 600, "Hz", 1, 0, 0, 3000, 0 diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 62a1c3e32b..e6a5e58587 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.09.30.mre_f4.2661564919" + signature = "rusEFI 2021.10.01.mre_f4.844259683" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.09.30.mre_f4.2661564919" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.10.01.mre_f4.844259683" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 30 20:14:18 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Oct 01 01:56:16 UTC 2021 pageSize = 20000 page = 1 @@ -135,7 +135,7 @@ map_samplingWindowBins = array, F32, 172, [8], "", 1, 0, 0, 18000, 2 map_samplingWindow = array, F32, 204, [8], "deg", 1, 0, -720, 720, 2 map_sensor_lowValue = scalar, F32, 236, "kpa", 1, 0, -400, 800, 2 map_sensor_highValue = scalar, F32, 240, "kpa", 1, 0, -400, 800, 2 -map_sensor_type = bits, U32, 244, [0:3], "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "Bosch 2.5", "Mazda1Bar", "GM 2 Bar", "GM 1 Bar", "INVALID", "INVALID" +map_sensor_type = bits, U32, 244, [0:4], "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "Bosch 2.5", "Mazda1Bar", "GM 2 Bar", "GM 1 Bar", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" map_sensor_hwChannel = bits, U08, 248, [0:5], "NONE","18 - AN temp 1","23 - AN temp 2","24 - AN temp 3","22 - AN temp 4","28 - AN volt 10","INVALID","26 - AN volt 2","31 - AN volt 3","36 - AN volt 8","40 - AN volt 9","27 - AN volt 1","Battery Sense","19 - AN volt 4","20 - AN volt 5","32 - AN volt 6","30 - AN volt 7", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" map_sensor_alignmentFill = array, U08, 249, [3], "unit", 1, 0, 0, 100, 0 clt_tempC_1 = scalar, F32, 252, "*C", 1, 0, -40, 200, 1 @@ -258,7 +258,7 @@ tle6240_csPinMode = bits, U08, 582, [0:1], "default", "default inverted", "open throttlePedalUpPin = bits, U08, 583, [0:7], "NONE","INVALID","18 - AN temp 1","23 - AN temp 2","24 - AN temp 3","22 - AN temp 4","28 - AN volt 10","25 - Hall Cam","26 - AN volt 2","31 - AN volt 3","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","36 - AN volt 8","40 - AN volt 9","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","27 - AN volt 1","INVALID","19 - AN volt 4","20 - AN volt 5","32 - AN volt 6","30 - AN volt 7", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" baroSensor_lowValue = scalar, F32, 584, "kpa", 1, 0, -400, 800, 2 baroSensor_highValue = scalar, F32, 588, "kpa", 1, 0, -400, 800, 2 -baroSensor_type = bits, U32, 592, [0:3], "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "Bosch 2.5", "Mazda1Bar", "GM 2 Bar", "GM 1 Bar", "INVALID", "INVALID" +baroSensor_type = bits, U32, 592, [0:4], "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "Bosch 2.5", "Mazda1Bar", "GM 2 Bar", "GM 1 Bar", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" baroSensor_hwChannel = bits, U08, 596, [0:5], "NONE","18 - AN temp 1","23 - AN temp 2","24 - AN temp 3","22 - AN temp 4","28 - AN volt 10","INVALID","26 - AN volt 2","31 - AN volt 3","36 - AN volt 8","40 - AN volt 9","27 - AN volt 1","Battery Sense","19 - AN volt 4","20 - AN volt 5","32 - AN volt 6","30 - AN volt 7", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" baroSensor_alignmentFill = array, U08, 597, [3], "unit", 1, 0, 0, 100, 0 idle_solenoidFrequency = scalar, S32, 600, "Hz", 1, 0, 0, 3000, 0 diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index d63ff0ace7..1678529617 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.09.30.mre_f7.2661564919" + signature = "rusEFI 2021.10.01.mre_f7.844259683" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.09.30.mre_f7.2661564919" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.10.01.mre_f7.844259683" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 30 20:14:16 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Oct 01 01:56:13 UTC 2021 pageSize = 20000 page = 1 @@ -135,7 +135,7 @@ map_samplingWindowBins = array, F32, 172, [8], "", 1, 0, 0, 18000, 2 map_samplingWindow = array, F32, 204, [8], "deg", 1, 0, -720, 720, 2 map_sensor_lowValue = scalar, F32, 236, "kpa", 1, 0, -400, 800, 2 map_sensor_highValue = scalar, F32, 240, "kpa", 1, 0, -400, 800, 2 -map_sensor_type = bits, U32, 244, [0:3], "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "Bosch 2.5", "Mazda1Bar", "GM 2 Bar", "GM 1 Bar", "INVALID", "INVALID" +map_sensor_type = bits, U32, 244, [0:4], "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "Bosch 2.5", "Mazda1Bar", "GM 2 Bar", "GM 1 Bar", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" map_sensor_hwChannel = bits, U08, 248, [0:5], "NONE","18 - AN temp 1","23 - AN temp 2","24 - AN temp 3","22 - AN temp 4","28 - AN volt 10","INVALID","26 - AN volt 2","31 - AN volt 3","36 - AN volt 8","40 - AN volt 9","27 - AN volt 1","Battery Sense","19 - AN volt 4","20 - AN volt 5","32 - AN volt 6","30 - AN volt 7", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" map_sensor_alignmentFill = array, U08, 249, [3], "unit", 1, 0, 0, 100, 0 clt_tempC_1 = scalar, F32, 252, "*C", 1, 0, -40, 200, 1 @@ -258,7 +258,7 @@ tle6240_csPinMode = bits, U08, 582, [0:1], "default", "default inverted", "open throttlePedalUpPin = bits, U08, 583, [0:7], "NONE","INVALID","18 - AN temp 1","23 - AN temp 2","24 - AN temp 3","22 - AN temp 4","28 - AN volt 10","25 - Hall Cam","26 - AN volt 2","31 - AN volt 3","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","36 - AN volt 8","40 - AN volt 9","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","27 - AN volt 1","INVALID","19 - AN volt 4","20 - AN volt 5","32 - AN volt 6","30 - AN volt 7", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" baroSensor_lowValue = scalar, F32, 584, "kpa", 1, 0, -400, 800, 2 baroSensor_highValue = scalar, F32, 588, "kpa", 1, 0, -400, 800, 2 -baroSensor_type = bits, U32, 592, [0:3], "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "Bosch 2.5", "Mazda1Bar", "GM 2 Bar", "GM 1 Bar", "INVALID", "INVALID" +baroSensor_type = bits, U32, 592, [0:4], "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "Bosch 2.5", "Mazda1Bar", "GM 2 Bar", "GM 1 Bar", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" baroSensor_hwChannel = bits, U08, 596, [0:5], "NONE","18 - AN temp 1","23 - AN temp 2","24 - AN temp 3","22 - AN temp 4","28 - AN volt 10","INVALID","26 - AN volt 2","31 - AN volt 3","36 - AN volt 8","40 - AN volt 9","27 - AN volt 1","Battery Sense","19 - AN volt 4","20 - AN volt 5","32 - AN volt 6","30 - AN volt 7", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" baroSensor_alignmentFill = array, U08, 597, [3], "unit", 1, 0, 0, 100, 0 idle_solenoidFrequency = scalar, S32, 600, "Hz", 1, 0, 0, 3000, 0 diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index fc955023e0..4cd22b8c4a 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.09.30.prometheus_405.1188990853" + signature = "rusEFI 2021.10.01.prometheus_405.3928534801" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.09.30.prometheus_405.1188990853" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.10.01.prometheus_405.3928534801" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 30 20:14:24 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Oct 01 01:56:22 UTC 2021 pageSize = 20000 page = 1 @@ -135,7 +135,7 @@ map_samplingWindowBins = array, F32, 172, [8], "", 1, 0, 0, 18000, 2 map_samplingWindow = array, F32, 204, [8], "deg", 1, 0, -720, 720, 2 map_sensor_lowValue = scalar, F32, 236, "kpa", 1, 0, -400, 800, 2 map_sensor_highValue = scalar, F32, 240, "kpa", 1, 0, -400, 800, 2 -map_sensor_type = bits, U32, 244, [0:3], "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "Bosch 2.5", "Mazda1Bar", "GM 2 Bar", "GM 1 Bar", "INVALID", "INVALID" +map_sensor_type = bits, U32, 244, [0:4], "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "Bosch 2.5", "Mazda1Bar", "GM 2 Bar", "GM 1 Bar", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" map_sensor_hwChannel = bits, U08, 248, [0:5], "Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" map_sensor_alignmentFill = array, U08, 249, [3], "unit", 1, 0, 0, 100, 0 clt_tempC_1 = scalar, F32, 252, "*C", 1, 0, -40, 200, 1 @@ -258,7 +258,7 @@ tle6240_csPinMode = bits, U08, 582, [0:1], "default", "default inverted", "open throttlePedalUpPin = bits, U08, 583, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" baroSensor_lowValue = scalar, F32, 584, "kpa", 1, 0, -400, 800, 2 baroSensor_highValue = scalar, F32, 588, "kpa", 1, 0, -400, 800, 2 -baroSensor_type = bits, U32, 592, [0:3], "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "Bosch 2.5", "Mazda1Bar", "GM 2 Bar", "GM 1 Bar", "INVALID", "INVALID" +baroSensor_type = bits, U32, 592, [0:4], "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "Bosch 2.5", "Mazda1Bar", "GM 2 Bar", "GM 1 Bar", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" baroSensor_hwChannel = bits, U08, 596, [0:5], "Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" baroSensor_alignmentFill = array, U08, 597, [3], "unit", 1, 0, 0, 100, 0 idle_solenoidFrequency = scalar, S32, 600, "Hz", 1, 0, 0, 3000, 0 diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index 8496cca8ad..8634997c95 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.09.30.prometheus_469.1188990853" + signature = "rusEFI 2021.10.01.prometheus_469.3928534801" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.09.30.prometheus_469.1188990853" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.10.01.prometheus_469.3928534801" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 30 20:14:22 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Oct 01 01:56:20 UTC 2021 pageSize = 20000 page = 1 @@ -135,7 +135,7 @@ map_samplingWindowBins = array, F32, 172, [8], "", 1, 0, 0, 18000, 2 map_samplingWindow = array, F32, 204, [8], "deg", 1, 0, -720, 720, 2 map_sensor_lowValue = scalar, F32, 236, "kpa", 1, 0, -400, 800, 2 map_sensor_highValue = scalar, F32, 240, "kpa", 1, 0, -400, 800, 2 -map_sensor_type = bits, U32, 244, [0:3], "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "Bosch 2.5", "Mazda1Bar", "GM 2 Bar", "GM 1 Bar", "INVALID", "INVALID" +map_sensor_type = bits, U32, 244, [0:4], "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "Bosch 2.5", "Mazda1Bar", "GM 2 Bar", "GM 1 Bar", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" map_sensor_hwChannel = bits, U08, 248, [0:5], "Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" map_sensor_alignmentFill = array, U08, 249, [3], "unit", 1, 0, 0, 100, 0 clt_tempC_1 = scalar, F32, 252, "*C", 1, 0, -40, 200, 1 @@ -258,7 +258,7 @@ tle6240_csPinMode = bits, U08, 582, [0:1], "default", "default inverted", "open throttlePedalUpPin = bits, U08, 583, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" baroSensor_lowValue = scalar, F32, 584, "kpa", 1, 0, -400, 800, 2 baroSensor_highValue = scalar, F32, 588, "kpa", 1, 0, -400, 800, 2 -baroSensor_type = bits, U32, 592, [0:3], "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "Bosch 2.5", "Mazda1Bar", "GM 2 Bar", "GM 1 Bar", "INVALID", "INVALID" +baroSensor_type = bits, U32, 592, [0:4], "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "Bosch 2.5", "Mazda1Bar", "GM 2 Bar", "GM 1 Bar", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" baroSensor_hwChannel = bits, U08, 596, [0:5], "Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" baroSensor_alignmentFill = array, U08, 597, [3], "unit", 1, 0, 0, 100, 0 idle_solenoidFrequency = scalar, S32, 600, "Hz", 1, 0, 0, 3000, 0 diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index 8811bcb797..c2ea51162f 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.09.30.proteus_f4.4042414277" + signature = "rusEFI 2021.10.01.proteus_f4.1543796817" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.09.30.proteus_f4.4042414277" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.10.01.proteus_f4.1543796817" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 30 20:14:29 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Oct 01 01:56:27 UTC 2021 pageSize = 20000 page = 1 @@ -135,7 +135,7 @@ map_samplingWindowBins = array, F32, 172, [8], "", 1, 0, 0, 18000, 2 map_samplingWindow = array, F32, 204, [8], "deg", 1, 0, -720, 720, 2 map_sensor_lowValue = scalar, F32, 236, "kpa", 1, 0, -400, 800, 2 map_sensor_highValue = scalar, F32, 240, "kpa", 1, 0, -400, 800, 2 -map_sensor_type = bits, U32, 244, [0:3], "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "Bosch 2.5", "Mazda1Bar", "GM 2 Bar", "GM 1 Bar", "INVALID", "INVALID" +map_sensor_type = bits, U32, 244, [0:4], "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "Bosch 2.5", "Mazda1Bar", "GM 2 Bar", "GM 1 Bar", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" map_sensor_hwChannel = bits, U08, 248, [0:5], "NONE","Analog Volt 5","Analog Volt 6","Analog Volt 7","Analog Volt 8","Analog Volt 9","Analog Volt 10","Analog Volt 11","Battery Sense","Analog Temp 3","Analog Temp 4","Analog Volt 1","Analog Volt 2","Analog Volt 3","Analog Volt 4","Analog Temp 1","Analog Temp 2", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" map_sensor_alignmentFill = array, U08, 249, [3], "unit", 1, 0, 0, 100, 0 clt_tempC_1 = scalar, F32, 252, "*C", 1, 0, -40, 200, 1 @@ -258,7 +258,7 @@ tle6240_csPinMode = bits, U08, 582, [0:1], "default", "default inverted", "open throttlePedalUpPin = bits, U08, 583, [0:7], "NONE","INVALID","Analog Volt 5","Analog Volt 6","Analog Volt 7","Analog Volt 8","Analog Volt 9","Analog Volt 10","Analog Volt 11","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Analog Temp 3","Analog Temp 4","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Analog Volt 1","Analog Volt 2","Analog Volt 3","Analog Volt 4","Analog Temp 1","Analog Temp 2","Digital 1","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Digital 2","Digital 3","Digital 4","Digital 5","Digital 6", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" baroSensor_lowValue = scalar, F32, 584, "kpa", 1, 0, -400, 800, 2 baroSensor_highValue = scalar, F32, 588, "kpa", 1, 0, -400, 800, 2 -baroSensor_type = bits, U32, 592, [0:3], "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "Bosch 2.5", "Mazda1Bar", "GM 2 Bar", "GM 1 Bar", "INVALID", "INVALID" +baroSensor_type = bits, U32, 592, [0:4], "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "Bosch 2.5", "Mazda1Bar", "GM 2 Bar", "GM 1 Bar", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" baroSensor_hwChannel = bits, U08, 596, [0:5], "NONE","Analog Volt 5","Analog Volt 6","Analog Volt 7","Analog Volt 8","Analog Volt 9","Analog Volt 10","Analog Volt 11","Battery Sense","Analog Temp 3","Analog Temp 4","Analog Volt 1","Analog Volt 2","Analog Volt 3","Analog Volt 4","Analog Temp 1","Analog Temp 2", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" baroSensor_alignmentFill = array, U08, 597, [3], "unit", 1, 0, 0, 100, 0 idle_solenoidFrequency = scalar, S32, 600, "Hz", 1, 0, 0, 3000, 0 diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index e3913fc53b..5700b287a0 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.09.30.proteus_f7.4042414277" + signature = "rusEFI 2021.10.01.proteus_f7.1543796817" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.09.30.proteus_f7.4042414277" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.10.01.proteus_f7.1543796817" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 30 20:14:26 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Oct 01 01:56:25 UTC 2021 pageSize = 20000 page = 1 @@ -135,7 +135,7 @@ map_samplingWindowBins = array, F32, 172, [8], "", 1, 0, 0, 18000, 2 map_samplingWindow = array, F32, 204, [8], "deg", 1, 0, -720, 720, 2 map_sensor_lowValue = scalar, F32, 236, "kpa", 1, 0, -400, 800, 2 map_sensor_highValue = scalar, F32, 240, "kpa", 1, 0, -400, 800, 2 -map_sensor_type = bits, U32, 244, [0:3], "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "Bosch 2.5", "Mazda1Bar", "GM 2 Bar", "GM 1 Bar", "INVALID", "INVALID" +map_sensor_type = bits, U32, 244, [0:4], "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "Bosch 2.5", "Mazda1Bar", "GM 2 Bar", "GM 1 Bar", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" map_sensor_hwChannel = bits, U08, 248, [0:5], "NONE","Analog Volt 5","Analog Volt 6","Analog Volt 7","Analog Volt 8","Analog Volt 9","Analog Volt 10","Analog Volt 11","Battery Sense","Analog Temp 3","Analog Temp 4","Analog Volt 1","Analog Volt 2","Analog Volt 3","Analog Volt 4","Analog Temp 1","Analog Temp 2", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" map_sensor_alignmentFill = array, U08, 249, [3], "unit", 1, 0, 0, 100, 0 clt_tempC_1 = scalar, F32, 252, "*C", 1, 0, -40, 200, 1 @@ -258,7 +258,7 @@ tle6240_csPinMode = bits, U08, 582, [0:1], "default", "default inverted", "open throttlePedalUpPin = bits, U08, 583, [0:7], "NONE","INVALID","Analog Volt 5","Analog Volt 6","Analog Volt 7","Analog Volt 8","Analog Volt 9","Analog Volt 10","Analog Volt 11","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Analog Temp 3","Analog Temp 4","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Analog Volt 1","Analog Volt 2","Analog Volt 3","Analog Volt 4","Analog Temp 1","Analog Temp 2","Digital 1","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Digital 2","Digital 3","Digital 4","Digital 5","Digital 6", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" baroSensor_lowValue = scalar, F32, 584, "kpa", 1, 0, -400, 800, 2 baroSensor_highValue = scalar, F32, 588, "kpa", 1, 0, -400, 800, 2 -baroSensor_type = bits, U32, 592, [0:3], "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "Bosch 2.5", "Mazda1Bar", "GM 2 Bar", "GM 1 Bar", "INVALID", "INVALID" +baroSensor_type = bits, U32, 592, [0:4], "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "Bosch 2.5", "Mazda1Bar", "GM 2 Bar", "GM 1 Bar", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" baroSensor_hwChannel = bits, U08, 596, [0:5], "NONE","Analog Volt 5","Analog Volt 6","Analog Volt 7","Analog Volt 8","Analog Volt 9","Analog Volt 10","Analog Volt 11","Battery Sense","Analog Temp 3","Analog Temp 4","Analog Volt 1","Analog Volt 2","Analog Volt 3","Analog Volt 4","Analog Temp 1","Analog Temp 2", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" baroSensor_alignmentFill = array, U08, 597, [3], "unit", 1, 0, 0, 100, 0 idle_solenoidFrequency = scalar, S32, 600, "Hz", 1, 0, 0, 3000, 0 diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index fe0f835265..3b9ba3db6b 100644 --- a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.09.30.subaru_eg33_f7.2210315520" + signature = "rusEFI 2021.10.01.subaru_eg33_f7.793288084" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.09.30.subaru_eg33_f7.2210315520" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.10.01.subaru_eg33_f7.793288084" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Thu Sep 30 20:14:39 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 Fri Oct 01 01:56:38 UTC 2021 pageSize = 20000 page = 1 @@ -135,7 +135,7 @@ map_samplingWindowBins = array, F32, 172, [8], "", 1, 0, 0, 18000, 2 map_samplingWindow = array, F32, 204, [8], "deg", 1, 0, -720, 720, 2 map_sensor_lowValue = scalar, F32, 236, "kpa", 1, 0, -400, 800, 2 map_sensor_highValue = scalar, F32, 240, "kpa", 1, 0, -400, 800, 2 -map_sensor_type = bits, U32, 244, [0:3], "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "Bosch 2.5", "Mazda1Bar", "GM 2 Bar", "GM 1 Bar", "INVALID", "INVALID" +map_sensor_type = bits, U32, 244, [0:4], "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "Bosch 2.5", "Mazda1Bar", "GM 2 Bar", "GM 1 Bar", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" map_sensor_hwChannel = bits, U08, 248, [0:5], "NONE","AUX0_18 - MAP Ain","INVALID","INVALID","B05 - MAF Ain","INVALID","AUX0_19 - IAT Ain","A02 - VBat","INVALID","A06 - Oxyg 2 Ain","A04 - EGR t Ain","INVALID","A18 - AUX0 Ain","B02 - TPS Ain","INVALID","A03 - Coolant t Ain","A06 - Oxyg 1 Ain", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" map_sensor_alignmentFill = array, U08, 249, [3], "unit", 1, 0, 0, 100, 0 clt_tempC_1 = scalar, F32, 252, "*C", 1, 0, -40, 200, 1 @@ -258,7 +258,7 @@ tle6240_csPinMode = bits, U08, 582, [0:1], "default", "default inverted", "open throttlePedalUpPin = bits, U08, 583, [0:7], "NONE","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","C10 - Starter Din","C12 - Memory SW Din","C13 - Test SW Din","D04 - California ID Din","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","C09 - Air Condition request Din","B12 - IGN Din","INVALID","B10 - N pos Din","B09 - P pos Din","A20 - Torque Ctrl Din","A19 - AC Ctrl Din", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" baroSensor_lowValue = scalar, F32, 584, "kpa", 1, 0, -400, 800, 2 baroSensor_highValue = scalar, F32, 588, "kpa", 1, 0, -400, 800, 2 -baroSensor_type = bits, U32, 592, [0:3], "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "Bosch 2.5", "Mazda1Bar", "GM 2 Bar", "GM 1 Bar", "INVALID", "INVALID" +baroSensor_type = bits, U32, 592, [0:4], "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "Bosch 2.5", "Mazda1Bar", "GM 2 Bar", "GM 1 Bar", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" baroSensor_hwChannel = bits, U08, 596, [0:5], "NONE","AUX0_18 - MAP Ain","INVALID","INVALID","B05 - MAF Ain","INVALID","AUX0_19 - IAT Ain","A02 - VBat","INVALID","A06 - Oxyg 2 Ain","A04 - EGR t Ain","INVALID","A18 - AUX0 Ain","B02 - TPS Ain","INVALID","A03 - Coolant t Ain","A06 - Oxyg 1 Ain", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" baroSensor_alignmentFill = array, U08, 597, [3], "unit", 1, 0, 0, 100, 0 idle_solenoidFrequency = scalar, S32, 600, "Hz", 1, 0, 0, 3000, 0 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 62c300ec3a..e17e7805c7 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 30 19:22:35 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Oct 01 01:56:32 UTC 2021 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -1239,7 +1239,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 = 1068926200; public static final int silentTriggerError_offset = 1464; public static final int slowAdcAlpha_offset = 2088; public static final int sparkDwellRpmBins_offset = 332; @@ -1546,7 +1545,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.09.30.all.1068926200"; + public static final String TS_SIGNATURE = "rusEFI 2021.10.01.all.3133306615"; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final char TS_TEST_COMMAND = 't'; public static final int TT_TT_1_16 = 50; diff --git a/java_console/rusefi.xml b/java_console/rusefi.xml index 31825ecb96..186909c694 100644 --- a/java_console/rusefi.xml +++ b/java_console/rusefi.xml @@ -1,6 +1,6 @@ - +