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 9870b112ca..fa5cb012db 100644 --- a/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Sun Jul 04 03:49:00 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Sun Jul 04 13:24:23 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -2449,15 +2449,13 @@ struct engine_configuration_s { */ int ignMathCalculateAtIndex; /** - RPM * offset 1492 */ - int16_t acCutoffLowRpm; + int16_t unused1492; /** - RPM * offset 1494 */ - int16_t acCutoffHighRpm; + int16_t unused1494; /** * Extra idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling. RPM @@ -4251,4 +4249,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 Sun Jul 04 03:49:00 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Sun Jul 04 13:24:23 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 03a1f18703..15c6389f3a 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 @@ -3,8 +3,6 @@ // #define accelerometerSpiDevice_offset 2712 -#define acCutoffHighRpm_offset 1494 -#define acCutoffLowRpm_offset 1492 #define acFanPin_offset 762 #define acFanPinMode_offset 763 #define acIdleExtraMin_offset 761 @@ -1300,7 +1298,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD hellen_cypress #define SIGNATURE_DATE 2021.07.04 -#define SIGNATURE_HASH 316352747 +#define SIGNATURE_HASH 3943007764 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1653,7 +1651,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.07.04.hellen_cypress.316352747" +#define TS_SIGNATURE "rusEFI 2021.07.04.hellen_cypress.3943007764" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' @@ -1722,6 +1720,8 @@ #define unused1476b20_offset 1476 #define unused1476b3_offset 1476 #define unused1476b8_offset 1476 +#define unused1492_offset 1492 +#define unused1494_offset 1494 #define unused1756_offset 1756 #define unused2260_offset 2260 #define unused2432_offset 2432 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 4157d5d2f2..58a34e4825 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sun Jul 04 03:48:58 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sun Jul 04 13:24:21 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -2449,15 +2449,13 @@ struct engine_configuration_s { */ int ignMathCalculateAtIndex; /** - RPM * offset 1492 */ - int16_t acCutoffLowRpm; + int16_t unused1492; /** - RPM * offset 1494 */ - int16_t acCutoffHighRpm; + int16_t unused1494; /** * Extra idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling. RPM @@ -4245,4 +4243,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 Sun Jul 04 03:48:58 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sun Jul 04 13:24:21 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 35dcc4011d..151d571d98 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -3,8 +3,6 @@ // #define accelerometerSpiDevice_offset 2684 -#define acCutoffHighRpm_offset 1494 -#define acCutoffLowRpm_offset 1492 #define acFanPin_offset 762 #define acFanPinMode_offset 763 #define acIdleExtraMin_offset 761 @@ -1284,7 +1282,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD kin #define SIGNATURE_DATE 2021.07.04 -#define SIGNATURE_HASH 3984516119 +#define SIGNATURE_HASH 346049256 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1637,7 +1635,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator true #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.07.04.kin.3984516119" +#define TS_SIGNATURE "rusEFI 2021.07.04.kin.346049256" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' @@ -1706,6 +1704,8 @@ #define unused1476b20_offset 1476 #define unused1476b3_offset 1476 #define unused1476b8_offset 1476 +#define unused1492_offset 1492 +#define unused1494_offset 1494 #define unused1756_offset 1756 #define unused2260_offset 2252 #define unused2432_offset 2424 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 cf536f730e..351e3bf493 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 Sun Jul 04 03:49:02 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 Sun Jul 04 13:24:25 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -2449,15 +2449,13 @@ struct engine_configuration_s { */ int ignMathCalculateAtIndex; /** - RPM * offset 1492 */ - int16_t acCutoffLowRpm; + int16_t unused1492; /** - RPM * offset 1494 */ - int16_t acCutoffHighRpm; + int16_t unused1494; /** * Extra idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling. RPM @@ -4251,4 +4249,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 Sun Jul 04 03:49:02 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 Sun Jul 04 13:24:25 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 51a79c8408..9b083fc3d3 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 @@ -3,8 +3,6 @@ // #define accelerometerSpiDevice_offset 2712 -#define acCutoffHighRpm_offset 1494 -#define acCutoffLowRpm_offset 1492 #define acFanPin_offset 762 #define acFanPinMode_offset 763 #define acIdleExtraMin_offset 761 @@ -1300,7 +1298,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD subaru_eg33_f7 #define SIGNATURE_DATE 2021.07.04 -#define SIGNATURE_HASH 4261149997 +#define SIGNATURE_HASH 69555154 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1653,7 +1651,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port false -#define TS_SIGNATURE "rusEFI 2021.07.04.subaru_eg33_f7.4261149997" +#define TS_SIGNATURE "rusEFI 2021.07.04.subaru_eg33_f7.69555154" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' @@ -1722,6 +1720,8 @@ #define unused1476b20_offset 1476 #define unused1476b3_offset 1476 #define unused1476b8_offset 1476 +#define unused1492_offset 1492 +#define unused1494_offset 1494 #define unused1756_offset 1756 #define unused2260_offset 2260 #define unused2432_offset 2432 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index 733bb57acf..e9aca30a95 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 04 03:48:29 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 04 13:23:50 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -2449,15 +2449,13 @@ struct engine_configuration_s { */ int ignMathCalculateAtIndex; /** - RPM * offset 1492 */ - int16_t acCutoffLowRpm; + int16_t unused1492; /** - RPM * offset 1494 */ - int16_t acCutoffHighRpm; + int16_t unused1494; /** * Extra idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling. RPM @@ -4251,4 +4249,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 Sun Jul 04 03:48:29 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 04 13:23:50 UTC 2021 diff --git a/firmware/controllers/generated/fsio_enums_generated.def b/firmware/controllers/generated/fsio_enums_generated.def index fdb29364c8..41f9154404 100644 --- a/firmware/controllers/generated/fsio_enums_generated.def +++ b/firmware/controllers/generated/fsio_enums_generated.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 04 03:48:29 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 04 13:23:50 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 a58aa3e387..8a7b841d61 100644 --- a/firmware/controllers/generated/fsio_getters.def +++ b/firmware/controllers/generated/fsio_getters.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 04 03:48:29 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 04 13:23:50 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 2a98ae57f4..ed0d7339fe 100644 --- a/firmware/controllers/generated/fsio_names.def +++ b/firmware/controllers/generated/fsio_names.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 04 03:48:29 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 04 13:23:50 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 2ba1af459b..19213402c6 100644 --- a/firmware/controllers/generated/fsio_strings.def +++ b/firmware/controllers/generated/fsio_strings.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 04 03:48:29 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 04 13:23:50 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 c87436796a..723fbe8f30 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -3,8 +3,6 @@ // #define accelerometerSpiDevice_offset 2712 -#define acCutoffHighRpm_offset 1494 -#define acCutoffLowRpm_offset 1492 #define acFanPin_offset 762 #define acFanPinMode_offset 763 #define acIdleExtraMin_offset 761 @@ -1297,7 +1295,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD all #define SIGNATURE_DATE 2021.07.04 -#define SIGNATURE_HASH 1353184059 +#define SIGNATURE_HASH 2843303364 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1650,7 +1648,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.07.04.all.1353184059" +#define TS_SIGNATURE "rusEFI 2021.07.04.all.2843303364" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' @@ -1719,6 +1717,8 @@ #define unused1476b20_offset 1476 #define unused1476b3_offset 1476 #define unused1476b8_offset 1476 +#define unused1492_offset 1492 +#define unused1494_offset 1494 #define unused1756_offset 1756 #define unused2260_offset 2260 #define unused2432_offset 2432 diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index 5534c33367..79a06563f3 100644 --- a/firmware/controllers/generated/signature_all.h +++ b/firmware/controllers/generated/signature_all.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD all #define SIGNATURE_DATE 2021.07.04 -#define SIGNATURE_HASH 3293311818 -#define TS_SIGNATURE "rusEFI 2021.07.04.all.3293311818" +#define SIGNATURE_HASH 2843303364 +#define TS_SIGNATURE "rusEFI 2021.07.04.all.2843303364" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index aed70f8d4a..3049a92153 100644 --- a/firmware/controllers/generated/signature_f429-discovery.h +++ b/firmware/controllers/generated/signature_f429-discovery.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD f429-discovery #define SIGNATURE_DATE 2021.07.04 -#define SIGNATURE_HASH 2251761818 -#define TS_SIGNATURE "rusEFI 2021.07.04.f429-discovery.2251761818" +#define SIGNATURE_HASH 3943007764 +#define TS_SIGNATURE "rusEFI 2021.07.04.f429-discovery.3943007764" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index d2ee0b0542..89b53f90fb 100644 --- a/firmware/controllers/generated/signature_frankenso_na6.h +++ b/firmware/controllers/generated/signature_frankenso_na6.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD frankenso_na6 #define SIGNATURE_DATE 2021.07.04 -#define SIGNATURE_HASH 4228218227 -#define TS_SIGNATURE "rusEFI 2021.07.04.frankenso_na6.4228218227" +#define SIGNATURE_HASH 2436355069 +#define TS_SIGNATURE "rusEFI 2021.07.04.frankenso_na6.2436355069" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index 17a2914b98..6e38ef0671 100644 --- a/firmware/controllers/generated/signature_hellen121nissan.h +++ b/firmware/controllers/generated/signature_hellen121nissan.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD hellen121nissan #define SIGNATURE_DATE 2021.07.04 -#define SIGNATURE_HASH 3852074522 -#define TS_SIGNATURE "rusEFI 2021.07.04.hellen121nissan.3852074522" +#define SIGNATURE_HASH 2292928660 +#define TS_SIGNATURE "rusEFI 2021.07.04.hellen121nissan.2292928660" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index bdab7fa23c..63c7448e7d 100644 --- a/firmware/controllers/generated/signature_hellen121vag.h +++ b/firmware/controllers/generated/signature_hellen121vag.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD hellen121vag #define SIGNATURE_DATE 2021.07.04 -#define SIGNATURE_HASH 914299143 -#define TS_SIGNATURE "rusEFI 2021.07.04.hellen121vag.914299143" +#define SIGNATURE_HASH 1531819913 +#define TS_SIGNATURE "rusEFI 2021.07.04.hellen121vag.1531819913" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index ba44dccec1..dbb357382f 100644 --- a/firmware/controllers/generated/signature_hellen128.h +++ b/firmware/controllers/generated/signature_hellen128.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD hellen128 #define SIGNATURE_DATE 2021.07.04 -#define SIGNATURE_HASH 867559342 -#define TS_SIGNATURE "rusEFI 2021.07.04.hellen128.867559342" +#define SIGNATURE_HASH 1585924384 +#define TS_SIGNATURE "rusEFI 2021.07.04.hellen128.1585924384" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index d5deccd92a..234ec4a585 100644 --- a/firmware/controllers/generated/signature_hellen72.h +++ b/firmware/controllers/generated/signature_hellen72.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD hellen72 #define SIGNATURE_DATE 2021.07.04 -#define SIGNATURE_HASH 4126121909 -#define TS_SIGNATURE "rusEFI 2021.07.04.hellen72.4126121909" +#define SIGNATURE_HASH 2564632891 +#define TS_SIGNATURE "rusEFI 2021.07.04.hellen72.2564632891" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index deea491253..86637872de 100644 --- a/firmware/controllers/generated/signature_hellenNA6.h +++ b/firmware/controllers/generated/signature_hellenNA6.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD hellenNA6 #define SIGNATURE_DATE 2021.07.04 -#define SIGNATURE_HASH 3117862466 -#define TS_SIGNATURE "rusEFI 2021.07.04.hellenNA6.3117862466" +#define SIGNATURE_HASH 3571736780 +#define TS_SIGNATURE "rusEFI 2021.07.04.hellenNA6.3571736780" diff --git a/firmware/controllers/generated/signature_hellen_cypress.h b/firmware/controllers/generated/signature_hellen_cypress.h index 70c7773f59..2c67a4c587 100644 --- a/firmware/controllers/generated/signature_hellen_cypress.h +++ b/firmware/controllers/generated/signature_hellen_cypress.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD hellen_cypress #define SIGNATURE_DATE 2021.07.04 -#define SIGNATURE_HASH 2251761818 -#define TS_SIGNATURE "rusEFI 2021.07.04.hellen_cypress.2251761818" +#define SIGNATURE_HASH 3943007764 +#define TS_SIGNATURE "rusEFI 2021.07.04.hellen_cypress.3943007764" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 9a2664fbac..fe1faa2c63 100644 --- a/firmware/controllers/generated/signature_kin.h +++ b/firmware/controllers/generated/signature_kin.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD kin #define SIGNATURE_DATE 2021.07.04 -#define SIGNATURE_HASH 2039669862 -#define TS_SIGNATURE "rusEFI 2021.07.04.kin.2039669862" +#define SIGNATURE_HASH 346049256 +#define TS_SIGNATURE "rusEFI 2021.07.04.kin.346049256" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 7c2cbd7b10..ed345cb7ef 100644 --- a/firmware/controllers/generated/signature_mre_f4.h +++ b/firmware/controllers/generated/signature_mre_f4.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD mre_f4 #define SIGNATURE_DATE 2021.07.04 -#define SIGNATURE_HASH 559136798 -#define TS_SIGNATURE "rusEFI 2021.07.04.mre_f4.559136798" +#define SIGNATURE_HASH 1281453712 +#define TS_SIGNATURE "rusEFI 2021.07.04.mre_f4.1281453712" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index c46a8a542d..000184517d 100644 --- a/firmware/controllers/generated/signature_mre_f7.h +++ b/firmware/controllers/generated/signature_mre_f7.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD mre_f7 #define SIGNATURE_DATE 2021.07.04 -#define SIGNATURE_HASH 559136798 -#define TS_SIGNATURE "rusEFI 2021.07.04.mre_f7.559136798" +#define SIGNATURE_HASH 1281453712 +#define TS_SIGNATURE "rusEFI 2021.07.04.mre_f7.1281453712" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 448fef8c5b..4665dfaf4a 100644 --- a/firmware/controllers/generated/signature_prometheus_405.h +++ b/firmware/controllers/generated/signature_prometheus_405.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD prometheus_405 #define SIGNATURE_DATE 2021.07.04 -#define SIGNATURE_HASH 3604869500 -#define TS_SIGNATURE "rusEFI 2021.07.04.prometheus_405.3604869500" +#define SIGNATURE_HASH 3153027058 +#define TS_SIGNATURE "rusEFI 2021.07.04.prometheus_405.3153027058" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index cbbd9107de..18dabe1865 100644 --- a/firmware/controllers/generated/signature_prometheus_469.h +++ b/firmware/controllers/generated/signature_prometheus_469.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD prometheus_469 #define SIGNATURE_DATE 2021.07.04 -#define SIGNATURE_HASH 3604869500 -#define TS_SIGNATURE "rusEFI 2021.07.04.prometheus_469.3604869500" +#define SIGNATURE_HASH 3153027058 +#define TS_SIGNATURE "rusEFI 2021.07.04.prometheus_469.3153027058" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index f3e10f3a0a..7cdfd9f143 100644 --- a/firmware/controllers/generated/signature_proteus_f4.h +++ b/firmware/controllers/generated/signature_proteus_f4.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD proteus_f4 #define SIGNATURE_DATE 2021.07.04 -#define SIGNATURE_HASH 2919059025 -#define TS_SIGNATURE "rusEFI 2021.07.04.proteus_f4.2919059025" +#define SIGNATURE_HASH 3234848991 +#define TS_SIGNATURE "rusEFI 2021.07.04.proteus_f4.3234848991" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 59b5752a8d..d981cc79ff 100644 --- a/firmware/controllers/generated/signature_proteus_f7.h +++ b/firmware/controllers/generated/signature_proteus_f7.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD proteus_f7 #define SIGNATURE_DATE 2021.07.04 -#define SIGNATURE_HASH 2919059025 -#define TS_SIGNATURE "rusEFI 2021.07.04.proteus_f7.2919059025" +#define SIGNATURE_HASH 3234848991 +#define TS_SIGNATURE "rusEFI 2021.07.04.proteus_f7.3234848991" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index 5209c6daf0..ff8ca67113 100644 --- a/firmware/controllers/generated/signature_subaru_eg33_f7.h +++ b/firmware/controllers/generated/signature_subaru_eg33_f7.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD subaru_eg33_f7 #define SIGNATURE_DATE 2021.07.04 -#define SIGNATURE_HASH 1763179868 -#define TS_SIGNATURE "rusEFI 2021.07.04.subaru_eg33_f7.1763179868" +#define SIGNATURE_HASH 69555154 +#define TS_SIGNATURE "rusEFI 2021.07.04.subaru_eg33_f7.69555154" diff --git a/firmware/tunerstudio/generated/cache.zip b/firmware/tunerstudio/generated/cache.zip index b8d75aba4f..0f2c114f39 100644 Binary files a/firmware/tunerstudio/generated/cache.zip and b/firmware/tunerstudio/generated/cache.zip differ diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index edd88cdb60..8c5f6ca985 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.07.04.all.3293311818" + signature = "rusEFI 2021.07.04.all.2843303364" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.04.all.3293311818" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.04.all.2843303364" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 04 04:09:43 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 04 13:23:50 UTC 2021 pageSize = 20000 page = 1 @@ -738,8 +738,8 @@ engineChartSize = scalar, U32, 1480, "count", 1, 0, 0, 300, 0 idlePidRpmUpperLimit = scalar, S16, 1484, "RPM", 1, 0, 0, 500, 0 primeInjFalloffTemperature = scalar, S16, 1486, "*C", 1, 0, 0, 1000, 0 ignMathCalculateAtIndex = scalar, S32, 1488, "index", 1, 0, 0, 7000, 0 -acCutoffLowRpm = scalar, S16, 1492, "RPM", 1, 0, 1, 15000, 0 -acCutoffHighRpm = scalar, S16, 1494, "RPM", 1, 0, 1, 15000, 0 +unused1492 = scalar, S16, 1492, "", 1, 0, 1, 15000, 0 +unused1494 = scalar, S16, 1494, "", 1, 0, 1, 15000, 0 acIdleRpmBump = scalar, S16, 1496, "RPM", 1, 0, 0, 1000, 0 warningPeriod = scalar, S16, 1498, "seconds", 1, 0, 0, 60, 0 knockDetectionWindowStart = scalar, F32, 1500, "angle", 1, 0, -1000, 1000, 2 @@ -4463,26 +4463,24 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "RX pin", binarySerialRxPin, {useSerialPort == 1} dialog = canBus, "CAN Bus" - field = "Can Read Enabled", canReadEnabled - field = "Can Write Enabled", canWriteEnabled - field = "consumeObdSensors", consumeObdSensors, { canReadEnabled == 1 && canWriteEnabled == 1} - field = "Can Nbc Type", canNbcType - field = "Can Baud Rate", canBaudRate + field = "CAN read enabled", canReadEnabled + field = "CAN write enabled", canWriteEnabled + field = "CAN bitrate", canBaudRate + field = "CAN dash type", canNbcType field = "Enable rusEFI CAN broadcast", enableVerboseCanTx - field = "use FSIO Table CAN Sniffing Filtering",useFSIOTableForCanSniffingFiltering field = "rusEFI CAN data base address", verboseCanBaseAddress - field = "Can Sleep Period", canSleepPeriodMs + field = "rusEFI CAN data period", canSleepPeriodMs field = "RX pin", canRxPin field = "TX pin", canTxPin dialog = canBus2, "Secondary CAN Bus" - field = "Can Read Enabled", can2ReadEnabled - field = "Can Write Enabled", can2WriteEnabled - field = "Can Nbc Type", can2NbcType - field = "Can Baud Rate", can2BaudRate + field = "CAN read enabled", can2ReadEnabled + field = "CAN write enabled", can2WriteEnabled + field = "CAN bitrate", can2BaudRate + field = "CAN dash type", can2NbcType field = "Enable rusEFI CAN broadcast", enableVerboseCan2Tx field = "rusEFI CAN data base address", verboseCan2BaseAddress - field = "Can Sleep Period", can2SleepPeriodMs + field = "rusEFI CAN data period", can2SleepPeriodMs field = "RX pin", can2RxPin field = "TX pin", can2TxPin @@ -5070,6 +5068,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "showHumanReadableWarning (affects Burn)", showHumanReadableWarning field = "Warning Message", warning_message field = "Ford redundant TPS mode", useFordRedundantTps + field = "consumeObdSensors", consumeObdSensors, { canReadEnabled == 1 && canWriteEnabled == 1} + field = "use FSIO Table CAN Sniffing Filtering",useFSIOTableForCanSniffingFiltering help = helpGeneral, "rusEFI General Help" diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index c94e3bdff5..5bccbf5183 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.07.04.f429-discovery.2251761818" + signature = "rusEFI 2021.07.04.f429-discovery.3943007764" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.04.f429-discovery.2251761818" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.04.f429-discovery.3943007764" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 04 04:09:46 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 04 13:23:53 UTC 2021 pageSize = 20000 page = 1 @@ -738,8 +738,8 @@ engineChartSize = scalar, U32, 1480, "count", 1, 0, 0, 300, 0 idlePidRpmUpperLimit = scalar, S16, 1484, "RPM", 1, 0, 0, 500, 0 primeInjFalloffTemperature = scalar, S16, 1486, "*C", 1, 0, 0, 1000, 0 ignMathCalculateAtIndex = scalar, S32, 1488, "index", 1, 0, 0, 7000, 0 -acCutoffLowRpm = scalar, S16, 1492, "RPM", 1, 0, 1, 15000, 0 -acCutoffHighRpm = scalar, S16, 1494, "RPM", 1, 0, 1, 15000, 0 +unused1492 = scalar, S16, 1492, "", 1, 0, 1, 15000, 0 +unused1494 = scalar, S16, 1494, "", 1, 0, 1, 15000, 0 acIdleRpmBump = scalar, S16, 1496, "RPM", 1, 0, 0, 1000, 0 warningPeriod = scalar, S16, 1498, "seconds", 1, 0, 0, 60, 0 knockDetectionWindowStart = scalar, F32, 1500, "angle", 1, 0, -1000, 1000, 2 @@ -4463,26 +4463,24 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "RX pin", binarySerialRxPin, {useSerialPort == 1} dialog = canBus, "CAN Bus" - field = "Can Read Enabled", canReadEnabled - field = "Can Write Enabled", canWriteEnabled - field = "consumeObdSensors", consumeObdSensors, { canReadEnabled == 1 && canWriteEnabled == 1} - field = "Can Nbc Type", canNbcType - field = "Can Baud Rate", canBaudRate + field = "CAN read enabled", canReadEnabled + field = "CAN write enabled", canWriteEnabled + field = "CAN bitrate", canBaudRate + field = "CAN dash type", canNbcType field = "Enable rusEFI CAN broadcast", enableVerboseCanTx - field = "use FSIO Table CAN Sniffing Filtering",useFSIOTableForCanSniffingFiltering field = "rusEFI CAN data base address", verboseCanBaseAddress - field = "Can Sleep Period", canSleepPeriodMs + field = "rusEFI CAN data period", canSleepPeriodMs field = "RX pin", canRxPin field = "TX pin", canTxPin dialog = canBus2, "Secondary CAN Bus" - field = "Can Read Enabled", can2ReadEnabled - field = "Can Write Enabled", can2WriteEnabled - field = "Can Nbc Type", can2NbcType - field = "Can Baud Rate", can2BaudRate + field = "CAN read enabled", can2ReadEnabled + field = "CAN write enabled", can2WriteEnabled + field = "CAN bitrate", can2BaudRate + field = "CAN dash type", can2NbcType field = "Enable rusEFI CAN broadcast", enableVerboseCan2Tx field = "rusEFI CAN data base address", verboseCan2BaseAddress - field = "Can Sleep Period", can2SleepPeriodMs + field = "rusEFI CAN data period", can2SleepPeriodMs field = "RX pin", can2RxPin field = "TX pin", can2TxPin @@ -5070,6 +5068,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "showHumanReadableWarning (affects Burn)", showHumanReadableWarning field = "Warning Message", warning_message field = "Ford redundant TPS mode", useFordRedundantTps + field = "consumeObdSensors", consumeObdSensors, { canReadEnabled == 1 && canWriteEnabled == 1} + field = "use FSIO Table CAN Sniffing Filtering",useFSIOTableForCanSniffingFiltering help = helpGeneral, "rusEFI General Help" diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 6c8065fe8e..a92ef10bec 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.07.04.frankenso_na6.4228218227" + signature = "rusEFI 2021.07.04.frankenso_na6.2436355069" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.04.frankenso_na6.4228218227" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.04.frankenso_na6.2436355069" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 04 04:10:06 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 04 13:24:10 UTC 2021 pageSize = 20000 page = 1 @@ -738,8 +738,8 @@ engineChartSize = scalar, U32, 1480, "count", 1, 0, 0, 300, 0 idlePidRpmUpperLimit = scalar, S16, 1484, "RPM", 1, 0, 0, 500, 0 primeInjFalloffTemperature = scalar, S16, 1486, "*C", 1, 0, 0, 1000, 0 ignMathCalculateAtIndex = scalar, S32, 1488, "index", 1, 0, 0, 7000, 0 -acCutoffLowRpm = scalar, S16, 1492, "RPM", 1, 0, 1, 15000, 0 -acCutoffHighRpm = scalar, S16, 1494, "RPM", 1, 0, 1, 15000, 0 +unused1492 = scalar, S16, 1492, "", 1, 0, 1, 15000, 0 +unused1494 = scalar, S16, 1494, "", 1, 0, 1, 15000, 0 acIdleRpmBump = scalar, S16, 1496, "RPM", 1, 0, 0, 1000, 0 warningPeriod = scalar, S16, 1498, "seconds", 1, 0, 0, 60, 0 knockDetectionWindowStart = scalar, F32, 1500, "angle", 1, 0, -1000, 1000, 2 @@ -4463,26 +4463,24 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "RX pin", binarySerialRxPin, {useSerialPort == 1} dialog = canBus, "CAN Bus" - field = "Can Read Enabled", canReadEnabled - field = "Can Write Enabled", canWriteEnabled - field = "consumeObdSensors", consumeObdSensors, { canReadEnabled == 1 && canWriteEnabled == 1} - field = "Can Nbc Type", canNbcType - field = "Can Baud Rate", canBaudRate + field = "CAN read enabled", canReadEnabled + field = "CAN write enabled", canWriteEnabled + field = "CAN bitrate", canBaudRate + field = "CAN dash type", canNbcType field = "Enable rusEFI CAN broadcast", enableVerboseCanTx - field = "use FSIO Table CAN Sniffing Filtering",useFSIOTableForCanSniffingFiltering field = "rusEFI CAN data base address", verboseCanBaseAddress - field = "Can Sleep Period", canSleepPeriodMs + field = "rusEFI CAN data period", canSleepPeriodMs field = "RX pin", canRxPin field = "TX pin", canTxPin dialog = canBus2, "Secondary CAN Bus" - field = "Can Read Enabled", can2ReadEnabled - field = "Can Write Enabled", can2WriteEnabled - field = "Can Nbc Type", can2NbcType - field = "Can Baud Rate", can2BaudRate + field = "CAN read enabled", can2ReadEnabled + field = "CAN write enabled", can2WriteEnabled + field = "CAN bitrate", can2BaudRate + field = "CAN dash type", can2NbcType field = "Enable rusEFI CAN broadcast", enableVerboseCan2Tx field = "rusEFI CAN data base address", verboseCan2BaseAddress - field = "Can Sleep Period", can2SleepPeriodMs + field = "rusEFI CAN data period", can2SleepPeriodMs field = "RX pin", can2RxPin field = "TX pin", can2TxPin @@ -5061,6 +5059,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "showHumanReadableWarning (affects Burn)", showHumanReadableWarning field = "Warning Message", warning_message field = "Ford redundant TPS mode", useFordRedundantTps + field = "consumeObdSensors", consumeObdSensors, { canReadEnabled == 1 && canWriteEnabled == 1} + field = "use FSIO Table CAN Sniffing Filtering",useFSIOTableForCanSniffingFiltering help = helpGeneral, "rusEFI General Help" diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index 70d64e6864..e42cc65457 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.07.04.hellen121nissan.3852074522" + signature = "rusEFI 2021.07.04.hellen121nissan.2292928660" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.04.hellen121nissan.3852074522" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.04.hellen121nissan.2292928660" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 04 04:34:02 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 04 13:23:59 UTC 2021 pageSize = 20000 page = 1 @@ -738,8 +738,8 @@ engineChartSize = scalar, U32, 1480, "count", 1, 0, 0, 300, 0 idlePidRpmUpperLimit = scalar, S16, 1484, "RPM", 1, 0, 0, 500, 0 primeInjFalloffTemperature = scalar, S16, 1486, "*C", 1, 0, 0, 1000, 0 ignMathCalculateAtIndex = scalar, S32, 1488, "index", 1, 0, 0, 7000, 0 -acCutoffLowRpm = scalar, S16, 1492, "RPM", 1, 0, 1, 15000, 0 -acCutoffHighRpm = scalar, S16, 1494, "RPM", 1, 0, 1, 15000, 0 +unused1492 = scalar, S16, 1492, "", 1, 0, 1, 15000, 0 +unused1494 = scalar, S16, 1494, "", 1, 0, 1, 15000, 0 acIdleRpmBump = scalar, S16, 1496, "RPM", 1, 0, 0, 1000, 0 warningPeriod = scalar, S16, 1498, "seconds", 1, 0, 0, 60, 0 knockDetectionWindowStart = scalar, F32, 1500, "angle", 1, 0, -1000, 1000, 2 @@ -4446,24 +4446,22 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "RX pin", binarySerialRxPin, {useSerialPort == 1} dialog = canBus, "CAN Bus" - field = "Can Read Enabled", canReadEnabled - field = "Can Write Enabled", canWriteEnabled - field = "consumeObdSensors", consumeObdSensors, { canReadEnabled == 1 && canWriteEnabled == 1} - field = "Can Nbc Type", canNbcType - field = "Can Baud Rate", canBaudRate + field = "CAN read enabled", canReadEnabled + field = "CAN write enabled", canWriteEnabled + field = "CAN bitrate", canBaudRate + field = "CAN dash type", canNbcType field = "Enable rusEFI CAN broadcast", enableVerboseCanTx - field = "use FSIO Table CAN Sniffing Filtering",useFSIOTableForCanSniffingFiltering field = "rusEFI CAN data base address", verboseCanBaseAddress - field = "Can Sleep Period", canSleepPeriodMs + field = "rusEFI CAN data period", canSleepPeriodMs dialog = canBus2, "Secondary CAN Bus" - field = "Can Read Enabled", can2ReadEnabled - field = "Can Write Enabled", can2WriteEnabled - field = "Can Nbc Type", can2NbcType - field = "Can Baud Rate", can2BaudRate + field = "CAN read enabled", can2ReadEnabled + field = "CAN write enabled", can2WriteEnabled + field = "CAN bitrate", can2BaudRate + field = "CAN dash type", can2NbcType field = "Enable rusEFI CAN broadcast", enableVerboseCan2Tx field = "rusEFI CAN data base address", verboseCan2BaseAddress - field = "Can Sleep Period", can2SleepPeriodMs + field = "rusEFI CAN data period", can2SleepPeriodMs dialog = canBusMain, "CAN Bus Communication", yAxis panel = canBus @@ -5021,6 +5019,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "showHumanReadableWarning (affects Burn)", showHumanReadableWarning field = "Warning Message", warning_message field = "Ford redundant TPS mode", useFordRedundantTps + field = "consumeObdSensors", consumeObdSensors, { canReadEnabled == 1 && canWriteEnabled == 1} + field = "use FSIO Table CAN Sniffing Filtering",useFSIOTableForCanSniffingFiltering help = helpGeneral, "rusEFI General Help" diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index fb28998991..3dd8fd6e39 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.07.04.hellen121vag.914299143" + signature = "rusEFI 2021.07.04.hellen121vag.1531819913" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.04.hellen121vag.914299143" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.04.hellen121vag.1531819913" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 04 04:09:51 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 04 13:23:57 UTC 2021 pageSize = 20000 page = 1 @@ -738,8 +738,8 @@ engineChartSize = scalar, U32, 1480, "count", 1, 0, 0, 300, 0 idlePidRpmUpperLimit = scalar, S16, 1484, "RPM", 1, 0, 0, 500, 0 primeInjFalloffTemperature = scalar, S16, 1486, "*C", 1, 0, 0, 1000, 0 ignMathCalculateAtIndex = scalar, S32, 1488, "index", 1, 0, 0, 7000, 0 -acCutoffLowRpm = scalar, S16, 1492, "RPM", 1, 0, 1, 15000, 0 -acCutoffHighRpm = scalar, S16, 1494, "RPM", 1, 0, 1, 15000, 0 +unused1492 = scalar, S16, 1492, "", 1, 0, 1, 15000, 0 +unused1494 = scalar, S16, 1494, "", 1, 0, 1, 15000, 0 acIdleRpmBump = scalar, S16, 1496, "RPM", 1, 0, 0, 1000, 0 warningPeriod = scalar, S16, 1498, "seconds", 1, 0, 0, 60, 0 knockDetectionWindowStart = scalar, F32, 1500, "angle", 1, 0, -1000, 1000, 2 @@ -4446,24 +4446,22 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "RX pin", binarySerialRxPin, {useSerialPort == 1} dialog = canBus, "CAN Bus" - field = "Can Read Enabled", canReadEnabled - field = "Can Write Enabled", canWriteEnabled - field = "consumeObdSensors", consumeObdSensors, { canReadEnabled == 1 && canWriteEnabled == 1} - field = "Can Nbc Type", canNbcType - field = "Can Baud Rate", canBaudRate + field = "CAN read enabled", canReadEnabled + field = "CAN write enabled", canWriteEnabled + field = "CAN bitrate", canBaudRate + field = "CAN dash type", canNbcType field = "Enable rusEFI CAN broadcast", enableVerboseCanTx - field = "use FSIO Table CAN Sniffing Filtering",useFSIOTableForCanSniffingFiltering field = "rusEFI CAN data base address", verboseCanBaseAddress - field = "Can Sleep Period", canSleepPeriodMs + field = "rusEFI CAN data period", canSleepPeriodMs dialog = canBus2, "Secondary CAN Bus" - field = "Can Read Enabled", can2ReadEnabled - field = "Can Write Enabled", can2WriteEnabled - field = "Can Nbc Type", can2NbcType - field = "Can Baud Rate", can2BaudRate + field = "CAN read enabled", can2ReadEnabled + field = "CAN write enabled", can2WriteEnabled + field = "CAN bitrate", can2BaudRate + field = "CAN dash type", can2NbcType field = "Enable rusEFI CAN broadcast", enableVerboseCan2Tx field = "rusEFI CAN data base address", verboseCan2BaseAddress - field = "Can Sleep Period", can2SleepPeriodMs + field = "rusEFI CAN data period", can2SleepPeriodMs dialog = canBusMain, "CAN Bus Communication", yAxis panel = canBus @@ -5021,6 +5019,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "showHumanReadableWarning (affects Burn)", showHumanReadableWarning field = "Warning Message", warning_message field = "Ford redundant TPS mode", useFordRedundantTps + field = "consumeObdSensors", consumeObdSensors, { canReadEnabled == 1 && canWriteEnabled == 1} + field = "use FSIO Table CAN Sniffing Filtering",useFSIOTableForCanSniffingFiltering help = helpGeneral, "rusEFI General Help" diff --git a/firmware/tunerstudio/generated/rusefi_hellen128.ini b/firmware/tunerstudio/generated/rusefi_hellen128.ini index 59d4bc6796..4e2b37aeb0 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen128.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen128.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.07.04.hellen128.867559342" + signature = "rusEFI 2021.07.04.hellen128.1585924384" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.04.hellen128.867559342" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.04.hellen128.1585924384" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 04 04:09:49 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 04 13:23:55 UTC 2021 pageSize = 20000 page = 1 @@ -738,8 +738,8 @@ engineChartSize = scalar, U32, 1480, "count", 1, 0, 0, 300, 0 idlePidRpmUpperLimit = scalar, S16, 1484, "RPM", 1, 0, 0, 500, 0 primeInjFalloffTemperature = scalar, S16, 1486, "*C", 1, 0, 0, 1000, 0 ignMathCalculateAtIndex = scalar, S32, 1488, "index", 1, 0, 0, 7000, 0 -acCutoffLowRpm = scalar, S16, 1492, "RPM", 1, 0, 1, 15000, 0 -acCutoffHighRpm = scalar, S16, 1494, "RPM", 1, 0, 1, 15000, 0 +unused1492 = scalar, S16, 1492, "", 1, 0, 1, 15000, 0 +unused1494 = scalar, S16, 1494, "", 1, 0, 1, 15000, 0 acIdleRpmBump = scalar, S16, 1496, "RPM", 1, 0, 0, 1000, 0 warningPeriod = scalar, S16, 1498, "seconds", 1, 0, 0, 60, 0 knockDetectionWindowStart = scalar, F32, 1500, "angle", 1, 0, -1000, 1000, 2 @@ -4446,24 +4446,22 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "RX pin", binarySerialRxPin, {useSerialPort == 1} dialog = canBus, "CAN Bus" - field = "Can Read Enabled", canReadEnabled - field = "Can Write Enabled", canWriteEnabled - field = "consumeObdSensors", consumeObdSensors, { canReadEnabled == 1 && canWriteEnabled == 1} - field = "Can Nbc Type", canNbcType - field = "Can Baud Rate", canBaudRate + field = "CAN read enabled", canReadEnabled + field = "CAN write enabled", canWriteEnabled + field = "CAN bitrate", canBaudRate + field = "CAN dash type", canNbcType field = "Enable rusEFI CAN broadcast", enableVerboseCanTx - field = "use FSIO Table CAN Sniffing Filtering",useFSIOTableForCanSniffingFiltering field = "rusEFI CAN data base address", verboseCanBaseAddress - field = "Can Sleep Period", canSleepPeriodMs + field = "rusEFI CAN data period", canSleepPeriodMs dialog = canBus2, "Secondary CAN Bus" - field = "Can Read Enabled", can2ReadEnabled - field = "Can Write Enabled", can2WriteEnabled - field = "Can Nbc Type", can2NbcType - field = "Can Baud Rate", can2BaudRate + field = "CAN read enabled", can2ReadEnabled + field = "CAN write enabled", can2WriteEnabled + field = "CAN bitrate", can2BaudRate + field = "CAN dash type", can2NbcType field = "Enable rusEFI CAN broadcast", enableVerboseCan2Tx field = "rusEFI CAN data base address", verboseCan2BaseAddress - field = "Can Sleep Period", can2SleepPeriodMs + field = "rusEFI CAN data period", can2SleepPeriodMs dialog = canBusMain, "CAN Bus Communication", yAxis panel = canBus @@ -5021,6 +5019,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "showHumanReadableWarning (affects Burn)", showHumanReadableWarning field = "Warning Message", warning_message field = "Ford redundant TPS mode", useFordRedundantTps + field = "consumeObdSensors", consumeObdSensors, { canReadEnabled == 1 && canWriteEnabled == 1} + field = "use FSIO Table CAN Sniffing Filtering",useFSIOTableForCanSniffingFiltering help = helpGeneral, "rusEFI General Help" diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index 4eb4bc5a33..e94ffcebba 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.07.04.hellen72.4126121909" + signature = "rusEFI 2021.07.04.hellen72.2564632891" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.04.hellen72.4126121909" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.04.hellen72.2564632891" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 04 04:09:56 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 04 13:24:01 UTC 2021 pageSize = 20000 page = 1 @@ -738,8 +738,8 @@ engineChartSize = scalar, U32, 1480, "count", 1, 0, 0, 300, 0 idlePidRpmUpperLimit = scalar, S16, 1484, "RPM", 1, 0, 0, 500, 0 primeInjFalloffTemperature = scalar, S16, 1486, "*C", 1, 0, 0, 1000, 0 ignMathCalculateAtIndex = scalar, S32, 1488, "index", 1, 0, 0, 7000, 0 -acCutoffLowRpm = scalar, S16, 1492, "RPM", 1, 0, 1, 15000, 0 -acCutoffHighRpm = scalar, S16, 1494, "RPM", 1, 0, 1, 15000, 0 +unused1492 = scalar, S16, 1492, "", 1, 0, 1, 15000, 0 +unused1494 = scalar, S16, 1494, "", 1, 0, 1, 15000, 0 acIdleRpmBump = scalar, S16, 1496, "RPM", 1, 0, 0, 1000, 0 warningPeriod = scalar, S16, 1498, "seconds", 1, 0, 0, 60, 0 knockDetectionWindowStart = scalar, F32, 1500, "angle", 1, 0, -1000, 1000, 2 @@ -4446,24 +4446,22 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "RX pin", binarySerialRxPin, {useSerialPort == 1} dialog = canBus, "CAN Bus" - field = "Can Read Enabled", canReadEnabled - field = "Can Write Enabled", canWriteEnabled - field = "consumeObdSensors", consumeObdSensors, { canReadEnabled == 1 && canWriteEnabled == 1} - field = "Can Nbc Type", canNbcType - field = "Can Baud Rate", canBaudRate + field = "CAN read enabled", canReadEnabled + field = "CAN write enabled", canWriteEnabled + field = "CAN bitrate", canBaudRate + field = "CAN dash type", canNbcType field = "Enable rusEFI CAN broadcast", enableVerboseCanTx - field = "use FSIO Table CAN Sniffing Filtering",useFSIOTableForCanSniffingFiltering field = "rusEFI CAN data base address", verboseCanBaseAddress - field = "Can Sleep Period", canSleepPeriodMs + field = "rusEFI CAN data period", canSleepPeriodMs dialog = canBus2, "Secondary CAN Bus" - field = "Can Read Enabled", can2ReadEnabled - field = "Can Write Enabled", can2WriteEnabled - field = "Can Nbc Type", can2NbcType - field = "Can Baud Rate", can2BaudRate + field = "CAN read enabled", can2ReadEnabled + field = "CAN write enabled", can2WriteEnabled + field = "CAN bitrate", can2BaudRate + field = "CAN dash type", can2NbcType field = "Enable rusEFI CAN broadcast", enableVerboseCan2Tx field = "rusEFI CAN data base address", verboseCan2BaseAddress - field = "Can Sleep Period", can2SleepPeriodMs + field = "rusEFI CAN data period", can2SleepPeriodMs dialog = canBusMain, "CAN Bus Communication", yAxis panel = canBus @@ -5021,6 +5019,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "showHumanReadableWarning (affects Burn)", showHumanReadableWarning field = "Warning Message", warning_message field = "Ford redundant TPS mode", useFordRedundantTps + field = "consumeObdSensors", consumeObdSensors, { canReadEnabled == 1 && canWriteEnabled == 1} + field = "use FSIO Table CAN Sniffing Filtering",useFSIOTableForCanSniffingFiltering help = helpGeneral, "rusEFI General Help" diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index 31b107ae91..c6da88eda8 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.07.04.hellenNA6.3117862466" + signature = "rusEFI 2021.07.04.hellenNA6.3571736780" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.04.hellenNA6.3117862466" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.04.hellenNA6.3571736780" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 04 04:09:59 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 04 13:24:03 UTC 2021 pageSize = 20000 page = 1 @@ -738,8 +738,8 @@ engineChartSize = scalar, U32, 1480, "count", 1, 0, 0, 300, 0 idlePidRpmUpperLimit = scalar, S16, 1484, "RPM", 1, 0, 0, 500, 0 primeInjFalloffTemperature = scalar, S16, 1486, "*C", 1, 0, 0, 1000, 0 ignMathCalculateAtIndex = scalar, S32, 1488, "index", 1, 0, 0, 7000, 0 -acCutoffLowRpm = scalar, S16, 1492, "RPM", 1, 0, 1, 15000, 0 -acCutoffHighRpm = scalar, S16, 1494, "RPM", 1, 0, 1, 15000, 0 +unused1492 = scalar, S16, 1492, "", 1, 0, 1, 15000, 0 +unused1494 = scalar, S16, 1494, "", 1, 0, 1, 15000, 0 acIdleRpmBump = scalar, S16, 1496, "RPM", 1, 0, 0, 1000, 0 warningPeriod = scalar, S16, 1498, "seconds", 1, 0, 0, 60, 0 knockDetectionWindowStart = scalar, F32, 1500, "angle", 1, 0, -1000, 1000, 2 @@ -4446,24 +4446,22 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "RX pin", binarySerialRxPin, {useSerialPort == 1} dialog = canBus, "CAN Bus" - field = "Can Read Enabled", canReadEnabled - field = "Can Write Enabled", canWriteEnabled - field = "consumeObdSensors", consumeObdSensors, { canReadEnabled == 1 && canWriteEnabled == 1} - field = "Can Nbc Type", canNbcType - field = "Can Baud Rate", canBaudRate + field = "CAN read enabled", canReadEnabled + field = "CAN write enabled", canWriteEnabled + field = "CAN bitrate", canBaudRate + field = "CAN dash type", canNbcType field = "Enable rusEFI CAN broadcast", enableVerboseCanTx - field = "use FSIO Table CAN Sniffing Filtering",useFSIOTableForCanSniffingFiltering field = "rusEFI CAN data base address", verboseCanBaseAddress - field = "Can Sleep Period", canSleepPeriodMs + field = "rusEFI CAN data period", canSleepPeriodMs dialog = canBus2, "Secondary CAN Bus" - field = "Can Read Enabled", can2ReadEnabled - field = "Can Write Enabled", can2WriteEnabled - field = "Can Nbc Type", can2NbcType - field = "Can Baud Rate", can2BaudRate + field = "CAN read enabled", can2ReadEnabled + field = "CAN write enabled", can2WriteEnabled + field = "CAN bitrate", can2BaudRate + field = "CAN dash type", can2NbcType field = "Enable rusEFI CAN broadcast", enableVerboseCan2Tx field = "rusEFI CAN data base address", verboseCan2BaseAddress - field = "Can Sleep Period", can2SleepPeriodMs + field = "rusEFI CAN data period", can2SleepPeriodMs dialog = canBusMain, "CAN Bus Communication", yAxis panel = canBus @@ -5023,6 +5021,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "showHumanReadableWarning (affects Burn)", showHumanReadableWarning field = "Warning Message", warning_message field = "Ford redundant TPS mode", useFordRedundantTps + field = "consumeObdSensors", consumeObdSensors, { canReadEnabled == 1 && canWriteEnabled == 1} + field = "use FSIO Table CAN Sniffing Filtering",useFSIOTableForCanSniffingFiltering help = helpGeneral, "rusEFI General Help" diff --git a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini index e74d37f522..c971e015e3 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.07.04.hellen_cypress.2251761818" + signature = "rusEFI 2021.07.04.hellen_cypress.3943007764" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.04.hellen_cypress.2251761818" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.04.hellen_cypress.3943007764" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Sun Jul 04 04:10:20 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Sun Jul 04 13:24:23 UTC 2021 pageSize = 20000 page = 1 @@ -738,8 +738,8 @@ engineChartSize = scalar, U32, 1480, "count", 1, 0, 0, 300, 0 idlePidRpmUpperLimit = scalar, S16, 1484, "RPM", 1, 0, 0, 500, 0 primeInjFalloffTemperature = scalar, S16, 1486, "*C", 1, 0, 0, 1000, 0 ignMathCalculateAtIndex = scalar, S32, 1488, "index", 1, 0, 0, 7000, 0 -acCutoffLowRpm = scalar, S16, 1492, "RPM", 1, 0, 1, 15000, 0 -acCutoffHighRpm = scalar, S16, 1494, "RPM", 1, 0, 1, 15000, 0 +unused1492 = scalar, S16, 1492, "", 1, 0, 1, 15000, 0 +unused1494 = scalar, S16, 1494, "", 1, 0, 1, 15000, 0 acIdleRpmBump = scalar, S16, 1496, "RPM", 1, 0, 0, 1000, 0 warningPeriod = scalar, S16, 1498, "seconds", 1, 0, 0, 60, 0 knockDetectionWindowStart = scalar, F32, 1500, "angle", 1, 0, -1000, 1000, 2 @@ -4463,26 +4463,24 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "RX pin", binarySerialRxPin, {useSerialPort == 1} dialog = canBus, "CAN Bus" - field = "Can Read Enabled", canReadEnabled - field = "Can Write Enabled", canWriteEnabled - field = "consumeObdSensors", consumeObdSensors, { canReadEnabled == 1 && canWriteEnabled == 1} - field = "Can Nbc Type", canNbcType - field = "Can Baud Rate", canBaudRate + field = "CAN read enabled", canReadEnabled + field = "CAN write enabled", canWriteEnabled + field = "CAN bitrate", canBaudRate + field = "CAN dash type", canNbcType field = "Enable rusEFI CAN broadcast", enableVerboseCanTx - field = "use FSIO Table CAN Sniffing Filtering",useFSIOTableForCanSniffingFiltering field = "rusEFI CAN data base address", verboseCanBaseAddress - field = "Can Sleep Period", canSleepPeriodMs + field = "rusEFI CAN data period", canSleepPeriodMs field = "RX pin", canRxPin field = "TX pin", canTxPin dialog = canBus2, "Secondary CAN Bus" - field = "Can Read Enabled", can2ReadEnabled - field = "Can Write Enabled", can2WriteEnabled - field = "Can Nbc Type", can2NbcType - field = "Can Baud Rate", can2BaudRate + field = "CAN read enabled", can2ReadEnabled + field = "CAN write enabled", can2WriteEnabled + field = "CAN bitrate", can2BaudRate + field = "CAN dash type", can2NbcType field = "Enable rusEFI CAN broadcast", enableVerboseCan2Tx field = "rusEFI CAN data base address", verboseCan2BaseAddress - field = "Can Sleep Period", can2SleepPeriodMs + field = "rusEFI CAN data period", can2SleepPeriodMs field = "RX pin", can2RxPin field = "TX pin", can2TxPin @@ -5070,6 +5068,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "showHumanReadableWarning (affects Burn)", showHumanReadableWarning field = "Warning Message", warning_message field = "Ford redundant TPS mode", useFordRedundantTps + field = "consumeObdSensors", consumeObdSensors, { canReadEnabled == 1 && canWriteEnabled == 1} + field = "use FSIO Table CAN Sniffing Filtering",useFSIOTableForCanSniffingFiltering help = helpGeneral, "rusEFI General Help" diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini index fb4dbdc278..0527e707c6 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.07.04.kin.2039669862" + signature = "rusEFI 2021.07.04.kin.346049256" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.04.kin.2039669862" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.04.kin.346049256" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sun Jul 04 04:10:18 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sun Jul 04 13:24:21 UTC 2021 pageSize = 19972 page = 1 @@ -732,8 +732,8 @@ engineChartSize = scalar, U32, 1480, "count", 1, 0, 0, 300, 0 idlePidRpmUpperLimit = scalar, S16, 1484, "RPM", 1, 0, 0, 500, 0 primeInjFalloffTemperature = scalar, S16, 1486, "*C", 1, 0, 0, 1000, 0 ignMathCalculateAtIndex = scalar, S32, 1488, "index", 1, 0, 0, 7000, 0 -acCutoffLowRpm = scalar, S16, 1492, "RPM", 1, 0, 1, 15000, 0 -acCutoffHighRpm = scalar, S16, 1494, "RPM", 1, 0, 1, 15000, 0 +unused1492 = scalar, S16, 1492, "", 1, 0, 1, 15000, 0 +unused1494 = scalar, S16, 1494, "", 1, 0, 1, 15000, 0 acIdleRpmBump = scalar, S16, 1496, "RPM", 1, 0, 0, 1000, 0 warningPeriod = scalar, S16, 1498, "seconds", 1, 0, 0, 60, 0 knockDetectionWindowStart = scalar, F32, 1500, "angle", 1, 0, -1000, 1000, 2 @@ -4439,26 +4439,24 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "RX pin", binarySerialRxPin, {useSerialPort == 1} dialog = canBus, "CAN Bus" - field = "Can Read Enabled", canReadEnabled - field = "Can Write Enabled", canWriteEnabled - field = "consumeObdSensors", consumeObdSensors, { canReadEnabled == 1 && canWriteEnabled == 1} - field = "Can Nbc Type", canNbcType - field = "Can Baud Rate", canBaudRate + field = "CAN read enabled", canReadEnabled + field = "CAN write enabled", canWriteEnabled + field = "CAN bitrate", canBaudRate + field = "CAN dash type", canNbcType field = "Enable rusEFI CAN broadcast", enableVerboseCanTx - field = "use FSIO Table CAN Sniffing Filtering",useFSIOTableForCanSniffingFiltering field = "rusEFI CAN data base address", verboseCanBaseAddress - field = "Can Sleep Period", canSleepPeriodMs + field = "rusEFI CAN data period", canSleepPeriodMs field = "RX pin", canRxPin field = "TX pin", canTxPin dialog = canBus2, "Secondary CAN Bus" - field = "Can Read Enabled", can2ReadEnabled - field = "Can Write Enabled", can2WriteEnabled - field = "Can Nbc Type", can2NbcType - field = "Can Baud Rate", can2BaudRate + field = "CAN read enabled", can2ReadEnabled + field = "CAN write enabled", can2WriteEnabled + field = "CAN bitrate", can2BaudRate + field = "CAN dash type", can2NbcType field = "Enable rusEFI CAN broadcast", enableVerboseCan2Tx field = "rusEFI CAN data base address", verboseCan2BaseAddress - field = "Can Sleep Period", can2SleepPeriodMs + field = "rusEFI CAN data period", can2SleepPeriodMs field = "RX pin", can2RxPin field = "TX pin", can2TxPin @@ -5046,6 +5044,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "showHumanReadableWarning (affects Burn)", showHumanReadableWarning field = "Warning Message", warning_message field = "Ford redundant TPS mode", useFordRedundantTps + field = "consumeObdSensors", consumeObdSensors, { canReadEnabled == 1 && canWriteEnabled == 1} + field = "use FSIO Table CAN Sniffing Filtering",useFSIOTableForCanSniffingFiltering help = helpGeneral, "rusEFI General Help" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 27750b5091..6051143654 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.07.04.mre_f4.559136798" + signature = "rusEFI 2021.07.04.mre_f4.1281453712" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.04.mre_f4.559136798" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.04.mre_f4.1281453712" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 04 04:10:04 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 04 13:24:07 UTC 2021 pageSize = 20000 page = 1 @@ -738,8 +738,8 @@ engineChartSize = scalar, U32, 1480, "count", 1, 0, 0, 300, 0 idlePidRpmUpperLimit = scalar, S16, 1484, "RPM", 1, 0, 0, 500, 0 primeInjFalloffTemperature = scalar, S16, 1486, "*C", 1, 0, 0, 1000, 0 ignMathCalculateAtIndex = scalar, S32, 1488, "index", 1, 0, 0, 7000, 0 -acCutoffLowRpm = scalar, S16, 1492, "RPM", 1, 0, 1, 15000, 0 -acCutoffHighRpm = scalar, S16, 1494, "RPM", 1, 0, 1, 15000, 0 +unused1492 = scalar, S16, 1492, "", 1, 0, 1, 15000, 0 +unused1494 = scalar, S16, 1494, "", 1, 0, 1, 15000, 0 acIdleRpmBump = scalar, S16, 1496, "RPM", 1, 0, 0, 1000, 0 warningPeriod = scalar, S16, 1498, "seconds", 1, 0, 0, 60, 0 knockDetectionWindowStart = scalar, F32, 1500, "angle", 1, 0, -1000, 1000, 2 @@ -4445,24 +4445,22 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "RX pin", binarySerialRxPin, {useSerialPort == 1} dialog = canBus, "CAN Bus" - field = "Can Read Enabled", canReadEnabled - field = "Can Write Enabled", canWriteEnabled - field = "consumeObdSensors", consumeObdSensors, { canReadEnabled == 1 && canWriteEnabled == 1} - field = "Can Nbc Type", canNbcType - field = "Can Baud Rate", canBaudRate + field = "CAN read enabled", canReadEnabled + field = "CAN write enabled", canWriteEnabled + field = "CAN bitrate", canBaudRate + field = "CAN dash type", canNbcType field = "Enable rusEFI CAN broadcast", enableVerboseCanTx - field = "use FSIO Table CAN Sniffing Filtering",useFSIOTableForCanSniffingFiltering field = "rusEFI CAN data base address", verboseCanBaseAddress - field = "Can Sleep Period", canSleepPeriodMs + field = "rusEFI CAN data period", canSleepPeriodMs dialog = canBus2, "Secondary CAN Bus" - field = "Can Read Enabled", can2ReadEnabled - field = "Can Write Enabled", can2WriteEnabled - field = "Can Nbc Type", can2NbcType - field = "Can Baud Rate", can2BaudRate + field = "CAN read enabled", can2ReadEnabled + field = "CAN write enabled", can2WriteEnabled + field = "CAN bitrate", can2BaudRate + field = "CAN dash type", can2NbcType field = "Enable rusEFI CAN broadcast", enableVerboseCan2Tx field = "rusEFI CAN data base address", verboseCan2BaseAddress - field = "Can Sleep Period", can2SleepPeriodMs + field = "rusEFI CAN data period", can2SleepPeriodMs dialog = canBusMain, "CAN Bus Communication", yAxis panel = canBus @@ -5028,6 +5026,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "showHumanReadableWarning (affects Burn)", showHumanReadableWarning field = "Warning Message", warning_message field = "Ford redundant TPS mode", useFordRedundantTps + field = "consumeObdSensors", consumeObdSensors, { canReadEnabled == 1 && canWriteEnabled == 1} + field = "use FSIO Table CAN Sniffing Filtering",useFSIOTableForCanSniffingFiltering help = helpGeneral, "rusEFI General Help" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index a0e86a4a76..719f30773c 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.07.04.mre_f7.559136798" + signature = "rusEFI 2021.07.04.mre_f7.1281453712" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.04.mre_f7.559136798" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.04.mre_f7.1281453712" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 04 04:10:01 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 04 13:24:05 UTC 2021 pageSize = 20000 page = 1 @@ -738,8 +738,8 @@ engineChartSize = scalar, U32, 1480, "count", 1, 0, 0, 300, 0 idlePidRpmUpperLimit = scalar, S16, 1484, "RPM", 1, 0, 0, 500, 0 primeInjFalloffTemperature = scalar, S16, 1486, "*C", 1, 0, 0, 1000, 0 ignMathCalculateAtIndex = scalar, S32, 1488, "index", 1, 0, 0, 7000, 0 -acCutoffLowRpm = scalar, S16, 1492, "RPM", 1, 0, 1, 15000, 0 -acCutoffHighRpm = scalar, S16, 1494, "RPM", 1, 0, 1, 15000, 0 +unused1492 = scalar, S16, 1492, "", 1, 0, 1, 15000, 0 +unused1494 = scalar, S16, 1494, "", 1, 0, 1, 15000, 0 acIdleRpmBump = scalar, S16, 1496, "RPM", 1, 0, 0, 1000, 0 warningPeriod = scalar, S16, 1498, "seconds", 1, 0, 0, 60, 0 knockDetectionWindowStart = scalar, F32, 1500, "angle", 1, 0, -1000, 1000, 2 @@ -4445,24 +4445,22 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "RX pin", binarySerialRxPin, {useSerialPort == 1} dialog = canBus, "CAN Bus" - field = "Can Read Enabled", canReadEnabled - field = "Can Write Enabled", canWriteEnabled - field = "consumeObdSensors", consumeObdSensors, { canReadEnabled == 1 && canWriteEnabled == 1} - field = "Can Nbc Type", canNbcType - field = "Can Baud Rate", canBaudRate + field = "CAN read enabled", canReadEnabled + field = "CAN write enabled", canWriteEnabled + field = "CAN bitrate", canBaudRate + field = "CAN dash type", canNbcType field = "Enable rusEFI CAN broadcast", enableVerboseCanTx - field = "use FSIO Table CAN Sniffing Filtering",useFSIOTableForCanSniffingFiltering field = "rusEFI CAN data base address", verboseCanBaseAddress - field = "Can Sleep Period", canSleepPeriodMs + field = "rusEFI CAN data period", canSleepPeriodMs dialog = canBus2, "Secondary CAN Bus" - field = "Can Read Enabled", can2ReadEnabled - field = "Can Write Enabled", can2WriteEnabled - field = "Can Nbc Type", can2NbcType - field = "Can Baud Rate", can2BaudRate + field = "CAN read enabled", can2ReadEnabled + field = "CAN write enabled", can2WriteEnabled + field = "CAN bitrate", can2BaudRate + field = "CAN dash type", can2NbcType field = "Enable rusEFI CAN broadcast", enableVerboseCan2Tx field = "rusEFI CAN data base address", verboseCan2BaseAddress - field = "Can Sleep Period", can2SleepPeriodMs + field = "rusEFI CAN data period", can2SleepPeriodMs dialog = canBusMain, "CAN Bus Communication", yAxis panel = canBus @@ -5028,6 +5026,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "showHumanReadableWarning (affects Burn)", showHumanReadableWarning field = "Warning Message", warning_message field = "Ford redundant TPS mode", useFordRedundantTps + field = "consumeObdSensors", consumeObdSensors, { canReadEnabled == 1 && canWriteEnabled == 1} + field = "use FSIO Table CAN Sniffing Filtering",useFSIOTableForCanSniffingFiltering help = helpGeneral, "rusEFI General Help" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index 40225ee82b..81b9f41687 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.07.04.prometheus_405.3604869500" + signature = "rusEFI 2021.07.04.prometheus_405.3153027058" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.04.prometheus_405.3604869500" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.04.prometheus_405.3153027058" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 04 04:10:11 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 04 13:24:14 UTC 2021 pageSize = 20000 page = 1 @@ -738,8 +738,8 @@ engineChartSize = scalar, U32, 1480, "count", 1, 0, 0, 300, 0 idlePidRpmUpperLimit = scalar, S16, 1484, "RPM", 1, 0, 0, 500, 0 primeInjFalloffTemperature = scalar, S16, 1486, "*C", 1, 0, 0, 1000, 0 ignMathCalculateAtIndex = scalar, S32, 1488, "index", 1, 0, 0, 7000, 0 -acCutoffLowRpm = scalar, S16, 1492, "RPM", 1, 0, 1, 15000, 0 -acCutoffHighRpm = scalar, S16, 1494, "RPM", 1, 0, 1, 15000, 0 +unused1492 = scalar, S16, 1492, "", 1, 0, 1, 15000, 0 +unused1494 = scalar, S16, 1494, "", 1, 0, 1, 15000, 0 acIdleRpmBump = scalar, S16, 1496, "RPM", 1, 0, 0, 1000, 0 warningPeriod = scalar, S16, 1498, "seconds", 1, 0, 0, 60, 0 knockDetectionWindowStart = scalar, F32, 1500, "angle", 1, 0, -1000, 1000, 2 @@ -4458,26 +4458,24 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "RX pin", binarySerialRxPin, {useSerialPort == 1} dialog = canBus, "CAN Bus" - field = "Can Read Enabled", canReadEnabled - field = "Can Write Enabled", canWriteEnabled - field = "consumeObdSensors", consumeObdSensors, { canReadEnabled == 1 && canWriteEnabled == 1} - field = "Can Nbc Type", canNbcType - field = "Can Baud Rate", canBaudRate + field = "CAN read enabled", canReadEnabled + field = "CAN write enabled", canWriteEnabled + field = "CAN bitrate", canBaudRate + field = "CAN dash type", canNbcType field = "Enable rusEFI CAN broadcast", enableVerboseCanTx - field = "use FSIO Table CAN Sniffing Filtering",useFSIOTableForCanSniffingFiltering field = "rusEFI CAN data base address", verboseCanBaseAddress - field = "Can Sleep Period", canSleepPeriodMs + field = "rusEFI CAN data period", canSleepPeriodMs field = "RX pin", canRxPin field = "TX pin", canTxPin dialog = canBus2, "Secondary CAN Bus" - field = "Can Read Enabled", can2ReadEnabled - field = "Can Write Enabled", can2WriteEnabled - field = "Can Nbc Type", can2NbcType - field = "Can Baud Rate", can2BaudRate + field = "CAN read enabled", can2ReadEnabled + field = "CAN write enabled", can2WriteEnabled + field = "CAN bitrate", can2BaudRate + field = "CAN dash type", can2NbcType field = "Enable rusEFI CAN broadcast", enableVerboseCan2Tx field = "rusEFI CAN data base address", verboseCan2BaseAddress - field = "Can Sleep Period", can2SleepPeriodMs + field = "rusEFI CAN data period", can2SleepPeriodMs field = "RX pin", can2RxPin field = "TX pin", can2TxPin @@ -5065,6 +5063,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "showHumanReadableWarning (affects Burn)", showHumanReadableWarning field = "Warning Message", warning_message field = "Ford redundant TPS mode", useFordRedundantTps + field = "consumeObdSensors", consumeObdSensors, { canReadEnabled == 1 && canWriteEnabled == 1} + field = "use FSIO Table CAN Sniffing Filtering",useFSIOTableForCanSniffingFiltering help = helpGeneral, "rusEFI General Help" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index 0736623698..e759b3a78e 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.07.04.prometheus_469.3604869500" + signature = "rusEFI 2021.07.04.prometheus_469.3153027058" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.04.prometheus_469.3604869500" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.04.prometheus_469.3153027058" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 04 04:10:09 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 04 13:24:12 UTC 2021 pageSize = 20000 page = 1 @@ -738,8 +738,8 @@ engineChartSize = scalar, U32, 1480, "count", 1, 0, 0, 300, 0 idlePidRpmUpperLimit = scalar, S16, 1484, "RPM", 1, 0, 0, 500, 0 primeInjFalloffTemperature = scalar, S16, 1486, "*C", 1, 0, 0, 1000, 0 ignMathCalculateAtIndex = scalar, S32, 1488, "index", 1, 0, 0, 7000, 0 -acCutoffLowRpm = scalar, S16, 1492, "RPM", 1, 0, 1, 15000, 0 -acCutoffHighRpm = scalar, S16, 1494, "RPM", 1, 0, 1, 15000, 0 +unused1492 = scalar, S16, 1492, "", 1, 0, 1, 15000, 0 +unused1494 = scalar, S16, 1494, "", 1, 0, 1, 15000, 0 acIdleRpmBump = scalar, S16, 1496, "RPM", 1, 0, 0, 1000, 0 warningPeriod = scalar, S16, 1498, "seconds", 1, 0, 0, 60, 0 knockDetectionWindowStart = scalar, F32, 1500, "angle", 1, 0, -1000, 1000, 2 @@ -4458,26 +4458,24 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "RX pin", binarySerialRxPin, {useSerialPort == 1} dialog = canBus, "CAN Bus" - field = "Can Read Enabled", canReadEnabled - field = "Can Write Enabled", canWriteEnabled - field = "consumeObdSensors", consumeObdSensors, { canReadEnabled == 1 && canWriteEnabled == 1} - field = "Can Nbc Type", canNbcType - field = "Can Baud Rate", canBaudRate + field = "CAN read enabled", canReadEnabled + field = "CAN write enabled", canWriteEnabled + field = "CAN bitrate", canBaudRate + field = "CAN dash type", canNbcType field = "Enable rusEFI CAN broadcast", enableVerboseCanTx - field = "use FSIO Table CAN Sniffing Filtering",useFSIOTableForCanSniffingFiltering field = "rusEFI CAN data base address", verboseCanBaseAddress - field = "Can Sleep Period", canSleepPeriodMs + field = "rusEFI CAN data period", canSleepPeriodMs field = "RX pin", canRxPin field = "TX pin", canTxPin dialog = canBus2, "Secondary CAN Bus" - field = "Can Read Enabled", can2ReadEnabled - field = "Can Write Enabled", can2WriteEnabled - field = "Can Nbc Type", can2NbcType - field = "Can Baud Rate", can2BaudRate + field = "CAN read enabled", can2ReadEnabled + field = "CAN write enabled", can2WriteEnabled + field = "CAN bitrate", can2BaudRate + field = "CAN dash type", can2NbcType field = "Enable rusEFI CAN broadcast", enableVerboseCan2Tx field = "rusEFI CAN data base address", verboseCan2BaseAddress - field = "Can Sleep Period", can2SleepPeriodMs + field = "rusEFI CAN data period", can2SleepPeriodMs field = "RX pin", can2RxPin field = "TX pin", can2TxPin @@ -5065,6 +5063,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "showHumanReadableWarning (affects Burn)", showHumanReadableWarning field = "Warning Message", warning_message field = "Ford redundant TPS mode", useFordRedundantTps + field = "consumeObdSensors", consumeObdSensors, { canReadEnabled == 1 && canWriteEnabled == 1} + field = "use FSIO Table CAN Sniffing Filtering",useFSIOTableForCanSniffingFiltering help = helpGeneral, "rusEFI General Help" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index 144b4f2b85..49938527fe 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.07.04.proteus_f4.2919059025" + signature = "rusEFI 2021.07.04.proteus_f4.3234848991" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.04.proteus_f4.2919059025" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.04.proteus_f4.3234848991" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 04 04:10:16 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 04 13:24:19 UTC 2021 pageSize = 20000 page = 1 @@ -738,8 +738,8 @@ engineChartSize = scalar, U32, 1480, "count", 1, 0, 0, 300, 0 idlePidRpmUpperLimit = scalar, S16, 1484, "RPM", 1, 0, 0, 500, 0 primeInjFalloffTemperature = scalar, S16, 1486, "*C", 1, 0, 0, 1000, 0 ignMathCalculateAtIndex = scalar, S32, 1488, "index", 1, 0, 0, 7000, 0 -acCutoffLowRpm = scalar, S16, 1492, "RPM", 1, 0, 1, 15000, 0 -acCutoffHighRpm = scalar, S16, 1494, "RPM", 1, 0, 1, 15000, 0 +unused1492 = scalar, S16, 1492, "", 1, 0, 1, 15000, 0 +unused1494 = scalar, S16, 1494, "", 1, 0, 1, 15000, 0 acIdleRpmBump = scalar, S16, 1496, "RPM", 1, 0, 0, 1000, 0 warningPeriod = scalar, S16, 1498, "seconds", 1, 0, 0, 60, 0 knockDetectionWindowStart = scalar, F32, 1500, "angle", 1, 0, -1000, 1000, 2 @@ -4439,24 +4439,22 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "RX pin", binarySerialRxPin, {useSerialPort == 1} dialog = canBus, "CAN Bus" - field = "Can Read Enabled", canReadEnabled - field = "Can Write Enabled", canWriteEnabled - field = "consumeObdSensors", consumeObdSensors, { canReadEnabled == 1 && canWriteEnabled == 1} - field = "Can Nbc Type", canNbcType - field = "Can Baud Rate", canBaudRate + field = "CAN read enabled", canReadEnabled + field = "CAN write enabled", canWriteEnabled + field = "CAN bitrate", canBaudRate + field = "CAN dash type", canNbcType field = "Enable rusEFI CAN broadcast", enableVerboseCanTx - field = "use FSIO Table CAN Sniffing Filtering",useFSIOTableForCanSniffingFiltering field = "rusEFI CAN data base address", verboseCanBaseAddress - field = "Can Sleep Period", canSleepPeriodMs + field = "rusEFI CAN data period", canSleepPeriodMs dialog = canBus2, "Secondary CAN Bus" - field = "Can Read Enabled", can2ReadEnabled - field = "Can Write Enabled", can2WriteEnabled - field = "Can Nbc Type", can2NbcType - field = "Can Baud Rate", can2BaudRate + field = "CAN read enabled", can2ReadEnabled + field = "CAN write enabled", can2WriteEnabled + field = "CAN bitrate", can2BaudRate + field = "CAN dash type", can2NbcType field = "Enable rusEFI CAN broadcast", enableVerboseCan2Tx field = "rusEFI CAN data base address", verboseCan2BaseAddress - field = "Can Sleep Period", can2SleepPeriodMs + field = "rusEFI CAN data period", can2SleepPeriodMs dialog = canBusMain, "CAN Bus Communication", yAxis panel = canBus @@ -5017,6 +5015,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "showHumanReadableWarning (affects Burn)", showHumanReadableWarning field = "Warning Message", warning_message field = "Ford redundant TPS mode", useFordRedundantTps + field = "consumeObdSensors", consumeObdSensors, { canReadEnabled == 1 && canWriteEnabled == 1} + field = "use FSIO Table CAN Sniffing Filtering",useFSIOTableForCanSniffingFiltering help = helpGeneral, "rusEFI General Help" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index b17d4dd566..a7d2dc16ea 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.07.04.proteus_f7.2919059025" + signature = "rusEFI 2021.07.04.proteus_f7.3234848991" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.04.proteus_f7.2919059025" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.04.proteus_f7.3234848991" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 04 04:10:13 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 04 13:24:16 UTC 2021 pageSize = 20000 page = 1 @@ -738,8 +738,8 @@ engineChartSize = scalar, U32, 1480, "count", 1, 0, 0, 300, 0 idlePidRpmUpperLimit = scalar, S16, 1484, "RPM", 1, 0, 0, 500, 0 primeInjFalloffTemperature = scalar, S16, 1486, "*C", 1, 0, 0, 1000, 0 ignMathCalculateAtIndex = scalar, S32, 1488, "index", 1, 0, 0, 7000, 0 -acCutoffLowRpm = scalar, S16, 1492, "RPM", 1, 0, 1, 15000, 0 -acCutoffHighRpm = scalar, S16, 1494, "RPM", 1, 0, 1, 15000, 0 +unused1492 = scalar, S16, 1492, "", 1, 0, 1, 15000, 0 +unused1494 = scalar, S16, 1494, "", 1, 0, 1, 15000, 0 acIdleRpmBump = scalar, S16, 1496, "RPM", 1, 0, 0, 1000, 0 warningPeriod = scalar, S16, 1498, "seconds", 1, 0, 0, 60, 0 knockDetectionWindowStart = scalar, F32, 1500, "angle", 1, 0, -1000, 1000, 2 @@ -4439,24 +4439,22 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "RX pin", binarySerialRxPin, {useSerialPort == 1} dialog = canBus, "CAN Bus" - field = "Can Read Enabled", canReadEnabled - field = "Can Write Enabled", canWriteEnabled - field = "consumeObdSensors", consumeObdSensors, { canReadEnabled == 1 && canWriteEnabled == 1} - field = "Can Nbc Type", canNbcType - field = "Can Baud Rate", canBaudRate + field = "CAN read enabled", canReadEnabled + field = "CAN write enabled", canWriteEnabled + field = "CAN bitrate", canBaudRate + field = "CAN dash type", canNbcType field = "Enable rusEFI CAN broadcast", enableVerboseCanTx - field = "use FSIO Table CAN Sniffing Filtering",useFSIOTableForCanSniffingFiltering field = "rusEFI CAN data base address", verboseCanBaseAddress - field = "Can Sleep Period", canSleepPeriodMs + field = "rusEFI CAN data period", canSleepPeriodMs dialog = canBus2, "Secondary CAN Bus" - field = "Can Read Enabled", can2ReadEnabled - field = "Can Write Enabled", can2WriteEnabled - field = "Can Nbc Type", can2NbcType - field = "Can Baud Rate", can2BaudRate + field = "CAN read enabled", can2ReadEnabled + field = "CAN write enabled", can2WriteEnabled + field = "CAN bitrate", can2BaudRate + field = "CAN dash type", can2NbcType field = "Enable rusEFI CAN broadcast", enableVerboseCan2Tx field = "rusEFI CAN data base address", verboseCan2BaseAddress - field = "Can Sleep Period", can2SleepPeriodMs + field = "rusEFI CAN data period", can2SleepPeriodMs dialog = canBusMain, "CAN Bus Communication", yAxis panel = canBus @@ -5017,6 +5015,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "showHumanReadableWarning (affects Burn)", showHumanReadableWarning field = "Warning Message", warning_message field = "Ford redundant TPS mode", useFordRedundantTps + field = "consumeObdSensors", consumeObdSensors, { canReadEnabled == 1 && canWriteEnabled == 1} + field = "use FSIO Table CAN Sniffing Filtering",useFSIOTableForCanSniffingFiltering help = helpGeneral, "rusEFI General Help" diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index f2acbff53a..85d893656b 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.07.04.subaru_eg33_f7.1763179868" + signature = "rusEFI 2021.07.04.subaru_eg33_f7.69555154" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.04.subaru_eg33_f7.1763179868" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.04.subaru_eg33_f7.69555154" ; 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 Sun Jul 04 04:10:22 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 Sun Jul 04 13:24:25 UTC 2021 pageSize = 20000 page = 1 @@ -738,8 +738,8 @@ engineChartSize = scalar, U32, 1480, "count", 1, 0, 0, 300, 0 idlePidRpmUpperLimit = scalar, S16, 1484, "RPM", 1, 0, 0, 500, 0 primeInjFalloffTemperature = scalar, S16, 1486, "*C", 1, 0, 0, 1000, 0 ignMathCalculateAtIndex = scalar, S32, 1488, "index", 1, 0, 0, 7000, 0 -acCutoffLowRpm = scalar, S16, 1492, "RPM", 1, 0, 1, 15000, 0 -acCutoffHighRpm = scalar, S16, 1494, "RPM", 1, 0, 1, 15000, 0 +unused1492 = scalar, S16, 1492, "", 1, 0, 1, 15000, 0 +unused1494 = scalar, S16, 1494, "", 1, 0, 1, 15000, 0 acIdleRpmBump = scalar, S16, 1496, "RPM", 1, 0, 0, 1000, 0 warningPeriod = scalar, S16, 1498, "seconds", 1, 0, 0, 60, 0 knockDetectionWindowStart = scalar, F32, 1500, "angle", 1, 0, -1000, 1000, 2 @@ -4456,26 +4456,24 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "RX pin", binarySerialRxPin, {useSerialPort == 1} dialog = canBus, "CAN Bus" - field = "Can Read Enabled", canReadEnabled - field = "Can Write Enabled", canWriteEnabled - field = "consumeObdSensors", consumeObdSensors, { canReadEnabled == 1 && canWriteEnabled == 1} - field = "Can Nbc Type", canNbcType - field = "Can Baud Rate", canBaudRate + field = "CAN read enabled", canReadEnabled + field = "CAN write enabled", canWriteEnabled + field = "CAN bitrate", canBaudRate + field = "CAN dash type", canNbcType field = "Enable rusEFI CAN broadcast", enableVerboseCanTx - field = "use FSIO Table CAN Sniffing Filtering",useFSIOTableForCanSniffingFiltering field = "rusEFI CAN data base address", verboseCanBaseAddress - field = "Can Sleep Period", canSleepPeriodMs + field = "rusEFI CAN data period", canSleepPeriodMs field = "RX pin", canRxPin field = "TX pin", canTxPin dialog = canBus2, "Secondary CAN Bus" - field = "Can Read Enabled", can2ReadEnabled - field = "Can Write Enabled", can2WriteEnabled - field = "Can Nbc Type", can2NbcType - field = "Can Baud Rate", can2BaudRate + field = "CAN read enabled", can2ReadEnabled + field = "CAN write enabled", can2WriteEnabled + field = "CAN bitrate", can2BaudRate + field = "CAN dash type", can2NbcType field = "Enable rusEFI CAN broadcast", enableVerboseCan2Tx field = "rusEFI CAN data base address", verboseCan2BaseAddress - field = "Can Sleep Period", can2SleepPeriodMs + field = "rusEFI CAN data period", can2SleepPeriodMs field = "RX pin", can2RxPin field = "TX pin", can2TxPin @@ -5053,6 +5051,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "showHumanReadableWarning (affects Burn)", showHumanReadableWarning field = "Warning Message", warning_message field = "Ford redundant TPS mode", useFordRedundantTps + field = "consumeObdSensors", consumeObdSensors, { canReadEnabled == 1 && canWriteEnabled == 1} + field = "use FSIO Table CAN Sniffing Filtering",useFSIOTableForCanSniffingFiltering help = helpGeneral, "rusEFI General Help" 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 2fb22808d6..e517cca5de 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,14 +1,12 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 04 03:48:29 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 04 13:23:50 UTC 2021 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; public class Fields { public static final int accelerometerSpiDevice_offset = 2712; - public static final int acCutoffHighRpm_offset = 1494; - public static final int acCutoffLowRpm_offset = 1492; public static final int acFanPin_offset = 762; public static final int acFanPinMode_offset = 763; public static final int acIdleExtraMin_offset = 761; @@ -1251,7 +1249,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 = 1353184059; public static final int silentTriggerError_offset = 1464; public static final int slowAdcAlpha_offset = 2088; public static final int sparkDwellRpmBins_offset = 332; @@ -1553,7 +1550,7 @@ public class Fields { public static final char TS_SD_R_COMMAND = 'r'; public static final char TS_SD_W_COMMAND = 'w'; public static final char TS_SET_LOGGER_SWITCH = 'l'; - public static final String TS_SIGNATURE = "rusEFI 2021.07.04.all.1353184059"; + public static final String TS_SIGNATURE = "rusEFI 2021.07.04.all.2843303364"; 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; @@ -1619,6 +1616,8 @@ public class Fields { public static final int unused1476b20_offset = 1476; public static final int unused1476b3_offset = 1476; public static final int unused1476b8_offset = 1476; + public static final int unused1492_offset = 1492; + public static final int unused1494_offset = 1494; public static final int unused1756_offset = 1756; public static final int unused2260_offset = 2260; public static final int unused2432_offset = 2432; @@ -2411,8 +2410,8 @@ public class Fields { public static final Field IDLEPIDRPMUPPERLIMIT = Field.create("IDLEPIDRPMUPPERLIMIT", 1484, FieldType.INT16); public static final Field PRIMEINJFALLOFFTEMPERATURE = Field.create("PRIMEINJFALLOFFTEMPERATURE", 1486, FieldType.INT16); public static final Field IGNMATHCALCULATEATINDEX = Field.create("IGNMATHCALCULATEATINDEX", 1488, FieldType.INT); - public static final Field ACCUTOFFLOWRPM = Field.create("ACCUTOFFLOWRPM", 1492, FieldType.INT16); - public static final Field ACCUTOFFHIGHRPM = Field.create("ACCUTOFFHIGHRPM", 1494, FieldType.INT16); + public static final Field UNUSED1492 = Field.create("UNUSED1492", 1492, FieldType.INT16); + public static final Field UNUSED1494 = Field.create("UNUSED1494", 1494, FieldType.INT16); public static final Field ACIDLERPMBUMP = Field.create("ACIDLERPMBUMP", 1496, FieldType.INT16); public static final Field WARNINGPERIOD = Field.create("WARNINGPERIOD", 1498, FieldType.INT16); public static final Field KNOCKDETECTIONWINDOWSTART = Field.create("KNOCKDETECTIONWINDOWSTART", 1500, FieldType.FLOAT); @@ -3519,8 +3518,8 @@ public class Fields { IDLEPIDRPMUPPERLIMIT, PRIMEINJFALLOFFTEMPERATURE, IGNMATHCALCULATEATINDEX, - ACCUTOFFLOWRPM, - ACCUTOFFHIGHRPM, + UNUSED1492, + UNUSED1494, ACIDLERPMBUMP, WARNINGPERIOD, KNOCKDETECTIONWINDOWSTART, diff --git a/java_console/rusefi.xml b/java_console/rusefi.xml index 0596b2519f..fbe726f2c8 100644 --- a/java_console/rusefi.xml +++ b/java_console/rusefi.xml @@ -1,6 +1,6 @@ - +