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 abd7096df0..193cbb38a3 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 Nov 22 23:32:12 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Wed Nov 25 18:21:22 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -1994,7 +1994,15 @@ struct engine_configuration_s { /** * offset 1204 */ - int unusedAtOldBoardConfigurationEnd[64]; + int unusedAtOldBoardConfigurationEnd[63]; + /** + * offset 1456 + */ + uint16_t vehicleWeight; + /** + * offset 1458 + */ + uint16_t unusedHereHereHere; /** * offset 1460 */ @@ -2683,76 +2691,76 @@ struct engine_configuration_s { bool unused1130 : 1; /** offset 2116 bit 8 */ - bool unusedBit_486_8 : 1; + bool unusedBit_488_8 : 1; /** offset 2116 bit 9 */ - bool unusedBit_486_9 : 1; + bool unusedBit_488_9 : 1; /** offset 2116 bit 10 */ - bool unusedBit_486_10 : 1; + bool unusedBit_488_10 : 1; /** offset 2116 bit 11 */ - bool unusedBit_486_11 : 1; + bool unusedBit_488_11 : 1; /** offset 2116 bit 12 */ - bool unusedBit_486_12 : 1; + bool unusedBit_488_12 : 1; /** offset 2116 bit 13 */ - bool unusedBit_486_13 : 1; + bool unusedBit_488_13 : 1; /** offset 2116 bit 14 */ - bool unusedBit_486_14 : 1; + bool unusedBit_488_14 : 1; /** offset 2116 bit 15 */ - bool unusedBit_486_15 : 1; + bool unusedBit_488_15 : 1; /** offset 2116 bit 16 */ - bool unusedBit_486_16 : 1; + bool unusedBit_488_16 : 1; /** offset 2116 bit 17 */ - bool unusedBit_486_17 : 1; + bool unusedBit_488_17 : 1; /** offset 2116 bit 18 */ - bool unusedBit_486_18 : 1; + bool unusedBit_488_18 : 1; /** offset 2116 bit 19 */ - bool unusedBit_486_19 : 1; + bool unusedBit_488_19 : 1; /** offset 2116 bit 20 */ - bool unusedBit_486_20 : 1; + bool unusedBit_488_20 : 1; /** offset 2116 bit 21 */ - bool unusedBit_486_21 : 1; + bool unusedBit_488_21 : 1; /** offset 2116 bit 22 */ - bool unusedBit_486_22 : 1; + bool unusedBit_488_22 : 1; /** offset 2116 bit 23 */ - bool unusedBit_486_23 : 1; + bool unusedBit_488_23 : 1; /** offset 2116 bit 24 */ - bool unusedBit_486_24 : 1; + bool unusedBit_488_24 : 1; /** offset 2116 bit 25 */ - bool unusedBit_486_25 : 1; + bool unusedBit_488_25 : 1; /** offset 2116 bit 26 */ - bool unusedBit_486_26 : 1; + bool unusedBit_488_26 : 1; /** offset 2116 bit 27 */ - bool unusedBit_486_27 : 1; + bool unusedBit_488_27 : 1; /** offset 2116 bit 28 */ - bool unusedBit_486_28 : 1; + bool unusedBit_488_28 : 1; /** offset 2116 bit 29 */ - bool unusedBit_486_29 : 1; + bool unusedBit_488_29 : 1; /** offset 2116 bit 30 */ - bool unusedBit_486_30 : 1; + bool unusedBit_488_30 : 1; /** offset 2116 bit 31 */ - bool unusedBit_486_31 : 1; + bool unusedBit_488_31 : 1; /** * set can_mode X * offset 2120 @@ -3769,4 +3777,4 @@ struct persistent_config_s { typedef struct persistent_config_s persistent_config_s; // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Sun Nov 22 23:32:12 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Wed Nov 25 18:21:22 UTC 2020 diff --git a/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h index 7afb766e53..ee82d85cd4 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 @@ -1210,8 +1210,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD hellen_cypress -#define SIGNATURE_DATE 2020.11.22 -#define SIGNATURE_HASH 1023408261 +#define SIGNATURE_DATE 2020.11.25 +#define SIGNATURE_HASH 4200326349 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1541,7 +1541,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2020.11.22.hellen_cypress.1023408261" +#define TS_SIGNATURE "rusEFI 2020.11.25.hellen_cypress.4200326349" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' // 0x74 @@ -1599,31 +1599,32 @@ #define unusedBit_288_30_offset 976 #define unusedBit_288_31_offset 976 #define unusedBit_34_31_offset 76 -#define unusedBit_486_10_offset 2116 -#define unusedBit_486_11_offset 2116 -#define unusedBit_486_12_offset 2116 -#define unusedBit_486_13_offset 2116 -#define unusedBit_486_14_offset 2116 -#define unusedBit_486_15_offset 2116 -#define unusedBit_486_16_offset 2116 -#define unusedBit_486_17_offset 2116 -#define unusedBit_486_18_offset 2116 -#define unusedBit_486_19_offset 2116 -#define unusedBit_486_20_offset 2116 -#define unusedBit_486_21_offset 2116 -#define unusedBit_486_22_offset 2116 -#define unusedBit_486_23_offset 2116 -#define unusedBit_486_24_offset 2116 -#define unusedBit_486_25_offset 2116 -#define unusedBit_486_26_offset 2116 -#define unusedBit_486_27_offset 2116 -#define unusedBit_486_28_offset 2116 -#define unusedBit_486_29_offset 2116 -#define unusedBit_486_30_offset 2116 -#define unusedBit_486_31_offset 2116 -#define unusedBit_486_8_offset 2116 -#define unusedBit_486_9_offset 2116 +#define unusedBit_488_10_offset 2116 +#define unusedBit_488_11_offset 2116 +#define unusedBit_488_12_offset 2116 +#define unusedBit_488_13_offset 2116 +#define unusedBit_488_14_offset 2116 +#define unusedBit_488_15_offset 2116 +#define unusedBit_488_16_offset 2116 +#define unusedBit_488_17_offset 2116 +#define unusedBit_488_18_offset 2116 +#define unusedBit_488_19_offset 2116 +#define unusedBit_488_20_offset 2116 +#define unusedBit_488_21_offset 2116 +#define unusedBit_488_22_offset 2116 +#define unusedBit_488_23_offset 2116 +#define unusedBit_488_24_offset 2116 +#define unusedBit_488_25_offset 2116 +#define unusedBit_488_26_offset 2116 +#define unusedBit_488_27_offset 2116 +#define unusedBit_488_28_offset 2116 +#define unusedBit_488_29_offset 2116 +#define unusedBit_488_30_offset 2116 +#define unusedBit_488_31_offset 2116 +#define unusedBit_488_8_offset 2116 +#define unusedBit_488_9_offset 2116 #define unusedFlexFuelSensor_offset 3100 +#define unusedHereHereHere_offset 1458 #define unusedHereWeHave_offset 1464 #define unusedOldBiquad_offset 2332 #define unusedSpiPadding4_offset 2593 @@ -1676,6 +1677,7 @@ #define vehicleName_offset 1160 #define vehicleSpeedCoef_offset 476 #define vehicleSpeedSensorInputPin_offset 968 +#define vehicleWeight_offset 1456 #define veLoadBins_offset 18464 #define veOverrideMode_offset 2109 #define verboseCan2BaseAddress_offset 2112 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 50db8ee75c..abd7e9c571 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 Nov 22 23:32:09 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Wed Nov 25 18:21:20 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -1994,7 +1994,15 @@ struct engine_configuration_s { /** * offset 1204 */ - int unusedAtOldBoardConfigurationEnd[64]; + int unusedAtOldBoardConfigurationEnd[63]; + /** + * offset 1456 + */ + uint16_t vehicleWeight; + /** + * offset 1458 + */ + uint16_t unusedHereHereHere; /** * offset 1460 */ @@ -2683,76 +2691,76 @@ struct engine_configuration_s { bool unused1130 : 1; /** offset 2116 bit 8 */ - bool unusedBit_486_8 : 1; + bool unusedBit_488_8 : 1; /** offset 2116 bit 9 */ - bool unusedBit_486_9 : 1; + bool unusedBit_488_9 : 1; /** offset 2116 bit 10 */ - bool unusedBit_486_10 : 1; + bool unusedBit_488_10 : 1; /** offset 2116 bit 11 */ - bool unusedBit_486_11 : 1; + bool unusedBit_488_11 : 1; /** offset 2116 bit 12 */ - bool unusedBit_486_12 : 1; + bool unusedBit_488_12 : 1; /** offset 2116 bit 13 */ - bool unusedBit_486_13 : 1; + bool unusedBit_488_13 : 1; /** offset 2116 bit 14 */ - bool unusedBit_486_14 : 1; + bool unusedBit_488_14 : 1; /** offset 2116 bit 15 */ - bool unusedBit_486_15 : 1; + bool unusedBit_488_15 : 1; /** offset 2116 bit 16 */ - bool unusedBit_486_16 : 1; + bool unusedBit_488_16 : 1; /** offset 2116 bit 17 */ - bool unusedBit_486_17 : 1; + bool unusedBit_488_17 : 1; /** offset 2116 bit 18 */ - bool unusedBit_486_18 : 1; + bool unusedBit_488_18 : 1; /** offset 2116 bit 19 */ - bool unusedBit_486_19 : 1; + bool unusedBit_488_19 : 1; /** offset 2116 bit 20 */ - bool unusedBit_486_20 : 1; + bool unusedBit_488_20 : 1; /** offset 2116 bit 21 */ - bool unusedBit_486_21 : 1; + bool unusedBit_488_21 : 1; /** offset 2116 bit 22 */ - bool unusedBit_486_22 : 1; + bool unusedBit_488_22 : 1; /** offset 2116 bit 23 */ - bool unusedBit_486_23 : 1; + bool unusedBit_488_23 : 1; /** offset 2116 bit 24 */ - bool unusedBit_486_24 : 1; + bool unusedBit_488_24 : 1; /** offset 2116 bit 25 */ - bool unusedBit_486_25 : 1; + bool unusedBit_488_25 : 1; /** offset 2116 bit 26 */ - bool unusedBit_486_26 : 1; + bool unusedBit_488_26 : 1; /** offset 2116 bit 27 */ - bool unusedBit_486_27 : 1; + bool unusedBit_488_27 : 1; /** offset 2116 bit 28 */ - bool unusedBit_486_28 : 1; + bool unusedBit_488_28 : 1; /** offset 2116 bit 29 */ - bool unusedBit_486_29 : 1; + bool unusedBit_488_29 : 1; /** offset 2116 bit 30 */ - bool unusedBit_486_30 : 1; + bool unusedBit_488_30 : 1; /** offset 2116 bit 31 */ - bool unusedBit_486_31 : 1; + bool unusedBit_488_31 : 1; /** * set can_mode X * offset 2120 @@ -3769,4 +3777,4 @@ struct persistent_config_s { typedef struct persistent_config_s persistent_config_s; // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sun Nov 22 23:32:09 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Wed Nov 25 18:21:20 UTC 2020 diff --git a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h index 98b55dc4c7..c500ad4da4 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -1210,8 +1210,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD kin -#define SIGNATURE_DATE 2020.11.22 -#define SIGNATURE_HASH 1843643007 +#define SIGNATURE_DATE 2020.11.25 +#define SIGNATURE_HASH 2873613879 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1541,7 +1541,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator true #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2020.11.22.kin.1843643007" +#define TS_SIGNATURE "rusEFI 2020.11.25.kin.2873613879" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' // 0x74 @@ -1599,31 +1599,32 @@ #define unusedBit_288_30_offset 976 #define unusedBit_288_31_offset 976 #define unusedBit_34_31_offset 76 -#define unusedBit_486_10_offset 2116 -#define unusedBit_486_11_offset 2116 -#define unusedBit_486_12_offset 2116 -#define unusedBit_486_13_offset 2116 -#define unusedBit_486_14_offset 2116 -#define unusedBit_486_15_offset 2116 -#define unusedBit_486_16_offset 2116 -#define unusedBit_486_17_offset 2116 -#define unusedBit_486_18_offset 2116 -#define unusedBit_486_19_offset 2116 -#define unusedBit_486_20_offset 2116 -#define unusedBit_486_21_offset 2116 -#define unusedBit_486_22_offset 2116 -#define unusedBit_486_23_offset 2116 -#define unusedBit_486_24_offset 2116 -#define unusedBit_486_25_offset 2116 -#define unusedBit_486_26_offset 2116 -#define unusedBit_486_27_offset 2116 -#define unusedBit_486_28_offset 2116 -#define unusedBit_486_29_offset 2116 -#define unusedBit_486_30_offset 2116 -#define unusedBit_486_31_offset 2116 -#define unusedBit_486_8_offset 2116 -#define unusedBit_486_9_offset 2116 +#define unusedBit_488_10_offset 2116 +#define unusedBit_488_11_offset 2116 +#define unusedBit_488_12_offset 2116 +#define unusedBit_488_13_offset 2116 +#define unusedBit_488_14_offset 2116 +#define unusedBit_488_15_offset 2116 +#define unusedBit_488_16_offset 2116 +#define unusedBit_488_17_offset 2116 +#define unusedBit_488_18_offset 2116 +#define unusedBit_488_19_offset 2116 +#define unusedBit_488_20_offset 2116 +#define unusedBit_488_21_offset 2116 +#define unusedBit_488_22_offset 2116 +#define unusedBit_488_23_offset 2116 +#define unusedBit_488_24_offset 2116 +#define unusedBit_488_25_offset 2116 +#define unusedBit_488_26_offset 2116 +#define unusedBit_488_27_offset 2116 +#define unusedBit_488_28_offset 2116 +#define unusedBit_488_29_offset 2116 +#define unusedBit_488_30_offset 2116 +#define unusedBit_488_31_offset 2116 +#define unusedBit_488_8_offset 2116 +#define unusedBit_488_9_offset 2116 #define unusedFlexFuelSensor_offset 3100 +#define unusedHereHereHere_offset 1458 #define unusedHereWeHave_offset 1464 #define unusedOldBiquad_offset 2332 #define unusedSpiPadding4_offset 2593 @@ -1676,6 +1677,7 @@ #define vehicleName_offset 1160 #define vehicleSpeedCoef_offset 476 #define vehicleSpeedSensorInputPin_offset 968 +#define vehicleWeight_offset 1456 #define veLoadBins_offset 18464 #define veOverrideMode_offset 2109 #define verboseCan2BaseAddress_offset 2112 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index 0398eb6aac..38ad59b02e 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 Nov 22 23:31:54 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Nov 25 18:20:57 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -1994,7 +1994,15 @@ struct engine_configuration_s { /** * offset 1204 */ - int unusedAtOldBoardConfigurationEnd[64]; + int unusedAtOldBoardConfigurationEnd[63]; + /** + * offset 1456 + */ + uint16_t vehicleWeight; + /** + * offset 1458 + */ + uint16_t unusedHereHereHere; /** * offset 1460 */ @@ -2683,76 +2691,76 @@ struct engine_configuration_s { bool unused1130 : 1; /** offset 2116 bit 8 */ - bool unusedBit_486_8 : 1; + bool unusedBit_488_8 : 1; /** offset 2116 bit 9 */ - bool unusedBit_486_9 : 1; + bool unusedBit_488_9 : 1; /** offset 2116 bit 10 */ - bool unusedBit_486_10 : 1; + bool unusedBit_488_10 : 1; /** offset 2116 bit 11 */ - bool unusedBit_486_11 : 1; + bool unusedBit_488_11 : 1; /** offset 2116 bit 12 */ - bool unusedBit_486_12 : 1; + bool unusedBit_488_12 : 1; /** offset 2116 bit 13 */ - bool unusedBit_486_13 : 1; + bool unusedBit_488_13 : 1; /** offset 2116 bit 14 */ - bool unusedBit_486_14 : 1; + bool unusedBit_488_14 : 1; /** offset 2116 bit 15 */ - bool unusedBit_486_15 : 1; + bool unusedBit_488_15 : 1; /** offset 2116 bit 16 */ - bool unusedBit_486_16 : 1; + bool unusedBit_488_16 : 1; /** offset 2116 bit 17 */ - bool unusedBit_486_17 : 1; + bool unusedBit_488_17 : 1; /** offset 2116 bit 18 */ - bool unusedBit_486_18 : 1; + bool unusedBit_488_18 : 1; /** offset 2116 bit 19 */ - bool unusedBit_486_19 : 1; + bool unusedBit_488_19 : 1; /** offset 2116 bit 20 */ - bool unusedBit_486_20 : 1; + bool unusedBit_488_20 : 1; /** offset 2116 bit 21 */ - bool unusedBit_486_21 : 1; + bool unusedBit_488_21 : 1; /** offset 2116 bit 22 */ - bool unusedBit_486_22 : 1; + bool unusedBit_488_22 : 1; /** offset 2116 bit 23 */ - bool unusedBit_486_23 : 1; + bool unusedBit_488_23 : 1; /** offset 2116 bit 24 */ - bool unusedBit_486_24 : 1; + bool unusedBit_488_24 : 1; /** offset 2116 bit 25 */ - bool unusedBit_486_25 : 1; + bool unusedBit_488_25 : 1; /** offset 2116 bit 26 */ - bool unusedBit_486_26 : 1; + bool unusedBit_488_26 : 1; /** offset 2116 bit 27 */ - bool unusedBit_486_27 : 1; + bool unusedBit_488_27 : 1; /** offset 2116 bit 28 */ - bool unusedBit_486_28 : 1; + bool unusedBit_488_28 : 1; /** offset 2116 bit 29 */ - bool unusedBit_486_29 : 1; + bool unusedBit_488_29 : 1; /** offset 2116 bit 30 */ - bool unusedBit_486_30 : 1; + bool unusedBit_488_30 : 1; /** offset 2116 bit 31 */ - bool unusedBit_486_31 : 1; + bool unusedBit_488_31 : 1; /** * set can_mode X * offset 2120 @@ -3769,4 +3777,4 @@ struct persistent_config_s { typedef struct persistent_config_s persistent_config_s; // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 22 23:31:54 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Nov 25 18:20:57 UTC 2020 diff --git a/firmware/controllers/generated/fsio_enums_generated.def b/firmware/controllers/generated/fsio_enums_generated.def index f6ebf3cc5a..36620f0d27 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 Nov 22 23:31:54 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Nov 25 18:20:57 UTC 2020 // by class com.rusefi.output.FileFsioSettingsConsumer FSIO_SETTING_FANONTEMPERATURE = 1000, diff --git a/firmware/controllers/generated/fsio_getters.def b/firmware/controllers/generated/fsio_getters.def index 06143a4fd5..dafcd30140 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 Nov 22 23:31:54 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Nov 25 18:20:57 UTC 2020 // by class com.rusefi.output.FileFsioSettingsConsumer case FSIO_SETTING_FANONTEMPERATURE: diff --git a/firmware/controllers/generated/fsio_names.def b/firmware/controllers/generated/fsio_names.def index 3d9dcdffd9..c0bb21f6a2 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 Nov 22 23:31:54 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Nov 25 18:20:57 UTC 2020 // by class com.rusefi.output.FileFsioSettingsConsumer static LENameOrdinalPair lefanOnTemperature(FSIO_SETTING_FANONTEMPERATURE, "cfg_fanOnTemperature"); diff --git a/firmware/controllers/generated/fsio_strings.def b/firmware/controllers/generated/fsio_strings.def index e6a990b052..7509cec2f0 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 Nov 22 23:31:54 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Nov 25 18:20:57 UTC 2020 // by class com.rusefi.output.FileFsioSettingsConsumer case FSIO_SETTING_FANONTEMPERATURE: diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index e11fa8463d..345f40b4d1 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -1210,8 +1210,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD all -#define SIGNATURE_DATE 2020.11.22 -#define SIGNATURE_HASH 4111359558 +#define SIGNATURE_DATE 2020.11.25 +#define SIGNATURE_HASH 866796046 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1541,7 +1541,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2020.11.22.all.4111359558" +#define TS_SIGNATURE "rusEFI 2020.11.25.all.866796046" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' // 0x74 @@ -1599,31 +1599,32 @@ #define unusedBit_288_30_offset 976 #define unusedBit_288_31_offset 976 #define unusedBit_34_31_offset 76 -#define unusedBit_486_10_offset 2116 -#define unusedBit_486_11_offset 2116 -#define unusedBit_486_12_offset 2116 -#define unusedBit_486_13_offset 2116 -#define unusedBit_486_14_offset 2116 -#define unusedBit_486_15_offset 2116 -#define unusedBit_486_16_offset 2116 -#define unusedBit_486_17_offset 2116 -#define unusedBit_486_18_offset 2116 -#define unusedBit_486_19_offset 2116 -#define unusedBit_486_20_offset 2116 -#define unusedBit_486_21_offset 2116 -#define unusedBit_486_22_offset 2116 -#define unusedBit_486_23_offset 2116 -#define unusedBit_486_24_offset 2116 -#define unusedBit_486_25_offset 2116 -#define unusedBit_486_26_offset 2116 -#define unusedBit_486_27_offset 2116 -#define unusedBit_486_28_offset 2116 -#define unusedBit_486_29_offset 2116 -#define unusedBit_486_30_offset 2116 -#define unusedBit_486_31_offset 2116 -#define unusedBit_486_8_offset 2116 -#define unusedBit_486_9_offset 2116 +#define unusedBit_488_10_offset 2116 +#define unusedBit_488_11_offset 2116 +#define unusedBit_488_12_offset 2116 +#define unusedBit_488_13_offset 2116 +#define unusedBit_488_14_offset 2116 +#define unusedBit_488_15_offset 2116 +#define unusedBit_488_16_offset 2116 +#define unusedBit_488_17_offset 2116 +#define unusedBit_488_18_offset 2116 +#define unusedBit_488_19_offset 2116 +#define unusedBit_488_20_offset 2116 +#define unusedBit_488_21_offset 2116 +#define unusedBit_488_22_offset 2116 +#define unusedBit_488_23_offset 2116 +#define unusedBit_488_24_offset 2116 +#define unusedBit_488_25_offset 2116 +#define unusedBit_488_26_offset 2116 +#define unusedBit_488_27_offset 2116 +#define unusedBit_488_28_offset 2116 +#define unusedBit_488_29_offset 2116 +#define unusedBit_488_30_offset 2116 +#define unusedBit_488_31_offset 2116 +#define unusedBit_488_8_offset 2116 +#define unusedBit_488_9_offset 2116 #define unusedFlexFuelSensor_offset 3100 +#define unusedHereHereHere_offset 1458 #define unusedHereWeHave_offset 1464 #define unusedOldBiquad_offset 2332 #define unusedSpiPadding4_offset 2593 @@ -1676,6 +1677,7 @@ #define vehicleName_offset 1160 #define vehicleSpeedCoef_offset 476 #define vehicleSpeedSensorInputPin_offset 968 +#define vehicleWeight_offset 1456 #define veLoadBins_offset 18464 #define veOverrideMode_offset 2109 #define verboseCan2BaseAddress_offset 2112 diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index b51875ceb7..259c330faf 100644 --- a/firmware/controllers/generated/signature_all.h +++ b/firmware/controllers/generated/signature_all.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD all -#define SIGNATURE_DATE 2020.11.22 -#define SIGNATURE_HASH 4111359558 -#define TS_SIGNATURE "rusEFI 2020.11.22.all.4111359558" +#define SIGNATURE_DATE 2020.11.25 +#define SIGNATURE_HASH 866796046 +#define TS_SIGNATURE "rusEFI 2020.11.25.all.866796046" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index b92c694487..2b2fe570f8 100644 --- a/firmware/controllers/generated/signature_frankenso_na6.h +++ b/firmware/controllers/generated/signature_frankenso_na6.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD frankenso_na6 -#define SIGNATURE_DATE 2020.11.22 -#define SIGNATURE_HASH 1669263293 -#define TS_SIGNATURE "rusEFI 2020.11.22.frankenso_na6.1669263293" +#define SIGNATURE_DATE 2020.11.25 +#define SIGNATURE_HASH 2782589941 +#define TS_SIGNATURE "rusEFI 2020.11.25.frankenso_na6.2782589941" diff --git a/firmware/controllers/generated/signature_hellen_cypress.h b/firmware/controllers/generated/signature_hellen_cypress.h index 79c626f70e..400bf628b6 100644 --- a/firmware/controllers/generated/signature_hellen_cypress.h +++ b/firmware/controllers/generated/signature_hellen_cypress.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD hellen_cypress -#define SIGNATURE_DATE 2020.11.22 -#define SIGNATURE_HASH 1023408261 -#define TS_SIGNATURE "rusEFI 2020.11.22.hellen_cypress.1023408261" +#define SIGNATURE_DATE 2020.11.25 +#define SIGNATURE_HASH 4200326349 +#define TS_SIGNATURE "rusEFI 2020.11.25.hellen_cypress.4200326349" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 727dd4083e..d8d1ca6b37 100644 --- a/firmware/controllers/generated/signature_kin.h +++ b/firmware/controllers/generated/signature_kin.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD kin -#define SIGNATURE_DATE 2020.11.22 -#define SIGNATURE_HASH 1843643007 -#define TS_SIGNATURE "rusEFI 2020.11.22.kin.1843643007" +#define SIGNATURE_DATE 2020.11.25 +#define SIGNATURE_HASH 2873613879 +#define TS_SIGNATURE "rusEFI 2020.11.25.kin.2873613879" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 2a6829473e..c7cffe2508 100644 --- a/firmware/controllers/generated/signature_mre_f4.h +++ b/firmware/controllers/generated/signature_mre_f4.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD mre_f4 -#define SIGNATURE_DATE 2020.11.22 -#define SIGNATURE_HASH 3806232639 -#define TS_SIGNATURE "rusEFI 2020.11.22.mre_f4.3806232639" +#define SIGNATURE_DATE 2020.11.25 +#define SIGNATURE_HASH 612015223 +#define TS_SIGNATURE "rusEFI 2020.11.25.mre_f4.612015223" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 3e8b036a97..eda7bfb78f 100644 --- a/firmware/controllers/generated/signature_mre_f7.h +++ b/firmware/controllers/generated/signature_mre_f7.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD mre_f7 -#define SIGNATURE_DATE 2020.11.22 -#define SIGNATURE_HASH 3806232639 -#define TS_SIGNATURE "rusEFI 2020.11.22.mre_f7.3806232639" +#define SIGNATURE_DATE 2020.11.25 +#define SIGNATURE_HASH 612015223 +#define TS_SIGNATURE "rusEFI 2020.11.25.mre_f7.612015223" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index d9025f64b4..c5062fdb4b 100644 --- a/firmware/controllers/generated/signature_prometheus_405.h +++ b/firmware/controllers/generated/signature_prometheus_405.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD prometheus_405 -#define SIGNATURE_DATE 2020.11.22 -#define SIGNATURE_HASH 3084277783 -#define TS_SIGNATURE "rusEFI 2020.11.22.prometheus_405.3084277783" +#define SIGNATURE_DATE 2020.11.25 +#define SIGNATURE_HASH 1903314015 +#define TS_SIGNATURE "rusEFI 2020.11.25.prometheus_405.1903314015" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 4dd172a3a7..0070000448 100644 --- a/firmware/controllers/generated/signature_prometheus_469.h +++ b/firmware/controllers/generated/signature_prometheus_469.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD prometheus_469 -#define SIGNATURE_DATE 2020.11.22 -#define SIGNATURE_HASH 3084277783 -#define TS_SIGNATURE "rusEFI 2020.11.22.prometheus_469.3084277783" +#define SIGNATURE_DATE 2020.11.25 +#define SIGNATURE_HASH 1903314015 +#define TS_SIGNATURE "rusEFI 2020.11.25.prometheus_469.1903314015" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 97b59ffa39..155e610ea7 100644 --- a/firmware/controllers/generated/signature_proteus_f4.h +++ b/firmware/controllers/generated/signature_proteus_f4.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD proteus_f4 -#define SIGNATURE_DATE 2020.11.22 -#define SIGNATURE_HASH 1017386136 -#define TS_SIGNATURE "rusEFI 2020.11.22.proteus_f4.1017386136" +#define SIGNATURE_DATE 2020.11.25 +#define SIGNATURE_HASH 4194306256 +#define TS_SIGNATURE "rusEFI 2020.11.25.proteus_f4.4194306256" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 42b9cb030f..8ba8db4dea 100644 --- a/firmware/controllers/generated/signature_proteus_f7.h +++ b/firmware/controllers/generated/signature_proteus_f7.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD proteus_f7 -#define SIGNATURE_DATE 2020.11.22 -#define SIGNATURE_HASH 1017386136 -#define TS_SIGNATURE "rusEFI 2020.11.22.proteus_f7.1017386136" +#define SIGNATURE_DATE 2020.11.25 +#define SIGNATURE_HASH 4194306256 +#define TS_SIGNATURE "rusEFI 2020.11.25.proteus_f7.4194306256" diff --git a/firmware/tunerstudio/generated/cache.zip b/firmware/tunerstudio/generated/cache.zip index 1e90c178b2..740a1ee086 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 c7712e7cf2..958686d5de 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.11.22.all.4111359558" + signature = "rusEFI 2020.11.25.all.866796046" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.11.22.all.4111359558" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.11.25.all.866796046" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 22 23:31:54 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Nov 25 18:20:57 UTC 2020 pageSize = 20000 page = 1 @@ -639,7 +639,9 @@ page = 1 drv8860_cs = bits, U08, 1201, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" drv8860_csPinMode = bits, U08, 1202, [0:1], "default", "default inverted", "open collector", "open collector inverted" drv8860_miso = bits, U08, 1203, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" - unusedAtOldBoardConfigurationEnd = array, S32, 1204, [64], "units", 1.0, 0, -20, 100, 0 + unusedAtOldBoardConfigurationEnd = array, S32, 1204, [63], "units", 1.0, 0, -20, 100, 0 + vehicleWeight = scalar, U16, 1456, "kg", 1.0, 0, 0, 10000, 0 + unusedHereHereHere = scalar, U16, 1458, "ADC", 1.0, 0, 0, 1000, 0 tps2SecondaryMin = scalar, U16, 1460, "ADC", 1.0, 0, 0, 1000, 0 tps2SecondaryMax = scalar, U16, 1462, "ADC", 1.0, 0, 0, 1000, 0 unusedHereWeHave = bits, U32, 1464, [0:0], "false", "true" @@ -839,30 +841,30 @@ page = 1 unused1128 = bits, U32, 2116, [5:5], "false", "true" unused1129 = bits, U32, 2116, [6:6], "false", "true" unused1130 = bits, U32, 2116, [7:7], "false", "true" - unusedBit_486_8 = bits, U32, 2116, [8:8], "false", "true" - unusedBit_486_9 = bits, U32, 2116, [9:9], "false", "true" - unusedBit_486_10 = bits, U32, 2116, [10:10], "false", "true" - unusedBit_486_11 = bits, U32, 2116, [11:11], "false", "true" - unusedBit_486_12 = bits, U32, 2116, [12:12], "false", "true" - unusedBit_486_13 = bits, U32, 2116, [13:13], "false", "true" - unusedBit_486_14 = bits, U32, 2116, [14:14], "false", "true" - unusedBit_486_15 = bits, U32, 2116, [15:15], "false", "true" - unusedBit_486_16 = bits, U32, 2116, [16:16], "false", "true" - unusedBit_486_17 = bits, U32, 2116, [17:17], "false", "true" - unusedBit_486_18 = bits, U32, 2116, [18:18], "false", "true" - unusedBit_486_19 = bits, U32, 2116, [19:19], "false", "true" - unusedBit_486_20 = bits, U32, 2116, [20:20], "false", "true" - unusedBit_486_21 = bits, U32, 2116, [21:21], "false", "true" - unusedBit_486_22 = bits, U32, 2116, [22:22], "false", "true" - unusedBit_486_23 = bits, U32, 2116, [23:23], "false", "true" - unusedBit_486_24 = bits, U32, 2116, [24:24], "false", "true" - unusedBit_486_25 = bits, U32, 2116, [25:25], "false", "true" - unusedBit_486_26 = bits, U32, 2116, [26:26], "false", "true" - unusedBit_486_27 = bits, U32, 2116, [27:27], "false", "true" - unusedBit_486_28 = bits, U32, 2116, [28:28], "false", "true" - unusedBit_486_29 = bits, U32, 2116, [29:29], "false", "true" - unusedBit_486_30 = bits, U32, 2116, [30:30], "false", "true" - unusedBit_486_31 = bits, U32, 2116, [31:31], "false", "true" + unusedBit_488_8 = bits, U32, 2116, [8:8], "false", "true" + unusedBit_488_9 = bits, U32, 2116, [9:9], "false", "true" + unusedBit_488_10 = bits, U32, 2116, [10:10], "false", "true" + unusedBit_488_11 = bits, U32, 2116, [11:11], "false", "true" + unusedBit_488_12 = bits, U32, 2116, [12:12], "false", "true" + unusedBit_488_13 = bits, U32, 2116, [13:13], "false", "true" + unusedBit_488_14 = bits, U32, 2116, [14:14], "false", "true" + unusedBit_488_15 = bits, U32, 2116, [15:15], "false", "true" + unusedBit_488_16 = bits, U32, 2116, [16:16], "false", "true" + unusedBit_488_17 = bits, U32, 2116, [17:17], "false", "true" + unusedBit_488_18 = bits, U32, 2116, [18:18], "false", "true" + unusedBit_488_19 = bits, U32, 2116, [19:19], "false", "true" + unusedBit_488_20 = bits, U32, 2116, [20:20], "false", "true" + unusedBit_488_21 = bits, U32, 2116, [21:21], "false", "true" + unusedBit_488_22 = bits, U32, 2116, [22:22], "false", "true" + unusedBit_488_23 = bits, U32, 2116, [23:23], "false", "true" + unusedBit_488_24 = bits, U32, 2116, [24:24], "false", "true" + unusedBit_488_25 = bits, U32, 2116, [25:25], "false", "true" + unusedBit_488_26 = bits, U32, 2116, [26:26], "false", "true" + unusedBit_488_27 = bits, U32, 2116, [27:27], "false", "true" + unusedBit_488_28 = bits, U32, 2116, [28:28], "false", "true" + unusedBit_488_29 = bits, U32, 2116, [29:29], "false", "true" + unusedBit_488_30 = bits, U32, 2116, [30:30], "false", "true" + unusedBit_488_31 = bits, U32, 2116, [31:31], "false", "true" can2NbcType = bits, U32, 2120, [0:3], "None", "FIAT", "VAG" , "MAZDA RX8", "BMW", "W202", "BMW E90", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2TxPin = bits, U08, 2124, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2RxPin = bits, U08, 2125, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -3096,6 +3098,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Number of Cylinders", cylindersCount field = "Engine Displacement", displacement field = "Firing Order", firingOrder + field = "Vehicle Weight", vehicleWeight ; this field is useful for rusEFI online catalog field = "Compression Ratio", compressionRatio ; this field is useful for rusEFI online catalog diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 3248800459..bde035882b 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.11.22.frankenso_na6.1669263293" + signature = "rusEFI 2020.11.25.frankenso_na6.2782589941" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.11.22.frankenso_na6.1669263293" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.11.25.frankenso_na6.2782589941" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 22 23:31:59 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Nov 25 18:21:05 UTC 2020 pageSize = 20000 page = 1 @@ -639,7 +639,9 @@ page = 1 drv8860_cs = bits, U08, 1201, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" drv8860_csPinMode = bits, U08, 1202, [0:1], "default", "default inverted", "open collector", "open collector inverted" drv8860_miso = bits, U08, 1203, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" - unusedAtOldBoardConfigurationEnd = array, S32, 1204, [64], "units", 1.0, 0, -20, 100, 0 + unusedAtOldBoardConfigurationEnd = array, S32, 1204, [63], "units", 1.0, 0, -20, 100, 0 + vehicleWeight = scalar, U16, 1456, "kg", 1.0, 0, 0, 10000, 0 + unusedHereHereHere = scalar, U16, 1458, "ADC", 1.0, 0, 0, 1000, 0 tps2SecondaryMin = scalar, U16, 1460, "ADC", 1.0, 0, 0, 1000, 0 tps2SecondaryMax = scalar, U16, 1462, "ADC", 1.0, 0, 0, 1000, 0 unusedHereWeHave = bits, U32, 1464, [0:0], "false", "true" @@ -839,30 +841,30 @@ page = 1 unused1128 = bits, U32, 2116, [5:5], "false", "true" unused1129 = bits, U32, 2116, [6:6], "false", "true" unused1130 = bits, U32, 2116, [7:7], "false", "true" - unusedBit_486_8 = bits, U32, 2116, [8:8], "false", "true" - unusedBit_486_9 = bits, U32, 2116, [9:9], "false", "true" - unusedBit_486_10 = bits, U32, 2116, [10:10], "false", "true" - unusedBit_486_11 = bits, U32, 2116, [11:11], "false", "true" - unusedBit_486_12 = bits, U32, 2116, [12:12], "false", "true" - unusedBit_486_13 = bits, U32, 2116, [13:13], "false", "true" - unusedBit_486_14 = bits, U32, 2116, [14:14], "false", "true" - unusedBit_486_15 = bits, U32, 2116, [15:15], "false", "true" - unusedBit_486_16 = bits, U32, 2116, [16:16], "false", "true" - unusedBit_486_17 = bits, U32, 2116, [17:17], "false", "true" - unusedBit_486_18 = bits, U32, 2116, [18:18], "false", "true" - unusedBit_486_19 = bits, U32, 2116, [19:19], "false", "true" - unusedBit_486_20 = bits, U32, 2116, [20:20], "false", "true" - unusedBit_486_21 = bits, U32, 2116, [21:21], "false", "true" - unusedBit_486_22 = bits, U32, 2116, [22:22], "false", "true" - unusedBit_486_23 = bits, U32, 2116, [23:23], "false", "true" - unusedBit_486_24 = bits, U32, 2116, [24:24], "false", "true" - unusedBit_486_25 = bits, U32, 2116, [25:25], "false", "true" - unusedBit_486_26 = bits, U32, 2116, [26:26], "false", "true" - unusedBit_486_27 = bits, U32, 2116, [27:27], "false", "true" - unusedBit_486_28 = bits, U32, 2116, [28:28], "false", "true" - unusedBit_486_29 = bits, U32, 2116, [29:29], "false", "true" - unusedBit_486_30 = bits, U32, 2116, [30:30], "false", "true" - unusedBit_486_31 = bits, U32, 2116, [31:31], "false", "true" + unusedBit_488_8 = bits, U32, 2116, [8:8], "false", "true" + unusedBit_488_9 = bits, U32, 2116, [9:9], "false", "true" + unusedBit_488_10 = bits, U32, 2116, [10:10], "false", "true" + unusedBit_488_11 = bits, U32, 2116, [11:11], "false", "true" + unusedBit_488_12 = bits, U32, 2116, [12:12], "false", "true" + unusedBit_488_13 = bits, U32, 2116, [13:13], "false", "true" + unusedBit_488_14 = bits, U32, 2116, [14:14], "false", "true" + unusedBit_488_15 = bits, U32, 2116, [15:15], "false", "true" + unusedBit_488_16 = bits, U32, 2116, [16:16], "false", "true" + unusedBit_488_17 = bits, U32, 2116, [17:17], "false", "true" + unusedBit_488_18 = bits, U32, 2116, [18:18], "false", "true" + unusedBit_488_19 = bits, U32, 2116, [19:19], "false", "true" + unusedBit_488_20 = bits, U32, 2116, [20:20], "false", "true" + unusedBit_488_21 = bits, U32, 2116, [21:21], "false", "true" + unusedBit_488_22 = bits, U32, 2116, [22:22], "false", "true" + unusedBit_488_23 = bits, U32, 2116, [23:23], "false", "true" + unusedBit_488_24 = bits, U32, 2116, [24:24], "false", "true" + unusedBit_488_25 = bits, U32, 2116, [25:25], "false", "true" + unusedBit_488_26 = bits, U32, 2116, [26:26], "false", "true" + unusedBit_488_27 = bits, U32, 2116, [27:27], "false", "true" + unusedBit_488_28 = bits, U32, 2116, [28:28], "false", "true" + unusedBit_488_29 = bits, U32, 2116, [29:29], "false", "true" + unusedBit_488_30 = bits, U32, 2116, [30:30], "false", "true" + unusedBit_488_31 = bits, U32, 2116, [31:31], "false", "true" can2NbcType = bits, U32, 2120, [0:3], "None", "FIAT", "VAG" , "MAZDA RX8", "BMW", "W202", "BMW E90", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2TxPin = bits, U08, 2124, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2RxPin = bits, U08, 2125, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -3096,6 +3098,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Number of Cylinders", cylindersCount field = "Engine Displacement", displacement field = "Firing Order", firingOrder + field = "Vehicle Weight", vehicleWeight ; this field is useful for rusEFI online catalog field = "Compression Ratio", compressionRatio ; this field is useful for rusEFI online catalog diff --git a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini index d2709c3393..785fe8114a 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.11.22.hellen_cypress.1023408261" + signature = "rusEFI 2020.11.25.hellen_cypress.4200326349" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.11.22.hellen_cypress.1023408261" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.11.25.hellen_cypress.4200326349" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Sun Nov 22 23:32:12 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Wed Nov 25 18:21:22 UTC 2020 pageSize = 20000 page = 1 @@ -639,7 +639,9 @@ page = 1 drv8860_cs = bits, U08, 1201, [0:7], "NONE", "INVALID", "P00 (A_0)", "P01 (A_1)", "P02 (A_2)", "P03 (A_3)", "P04 (A_4)", "P05 (A_5)", "P06 (A_6)", "P07 (A_7)", "P08 (A_8)", "P09 (A_9)", "P0A (A_10)", "P0B (A_11)", "P0C (A_12)", "P0D (A_13)", "P0E (A_14)", "P0F (A_15)", "P10 (B_0)", "P11 (B_1)", "P12 (B_2)", "P13 (B_3)", "P14 (B_4)", "P15 (B_5)", "P16 (B_6)", "P17 (B_7)", "P18 (B_8)", "P19 (B_9)", "P1A (B_10)", "P1B (B_11)", "P1C (B_12)", "P1D (B_13)", "P1E (B_14)", "P1F (B_15)", "P20 (C_0)", "P21 (C_1)", "P22 (C_2)", "P23 (C_3)", "P24 (C_4)", "P25 (C_5)", "P26 (C_6)", "P27 (C_7)", "P28 (C_8)", "P29 (C_9)", "P2A (C_10)", "P2B (C_11)", "P2C (C_12)", "P2D (C_13)", "P2E (C_14)", "P2F (C_15)", "P30 (D_0)", "P31 (D_1)", "P32 (D_2)", "P33 (D_3)", "P34 (D_4)", "P35 (D_5)", "P36 (D_6)", "P37 (D_7)", "P38 (D_8)", "P39 (D_9)", "P3A (D_10)", "P3B (D_11)", "P3C (D_12)", "P3D (D_13)", "P3E (D_14)", "P3F (D_15)", "P40 (E_0)", "P41 (E_1)", "P42 (E_2)", "P43 (E_3)", "P44 (E_4)", "P45 (E_5)", "P46 (E_6)", "P47 (E_7)", "P48 (E_8)", "P49 (E_9)", "P4A (E_10)", "P4B (E_11)", "P4C (E_12)", "P4D (E_13)", "P4E (E_14)", "P4F (E_15)", "P50 (F_0)", "P51 (F_1)", "P52 (F_2)", "P53 (F_3)", "P54 (F_4)", "P55 (F_5)", "P56 (F_6)", "P57 (F_7)", "P58 (F_8)", "P59 (F_9)", "P5A (F_10)", "P5B (F_11)", "P5C (F_12)", "P5D (F_13)", "P5E (F_14)", "P5F (F_15)", "P70 (G_0)", "P71 (G_1)", "P72 (G_2)", "P73 (G_3)", "P74 (G_4)", "P75 (G_5)", "P76 (G_6)", "P77 (G_7)", "P78 (G_8)", "P79 (G_9)", "P7A (G_10)", "P7B (G_11)", "P7C (G_12)", "P7D (G_13)", "P7E (G_14)", "P7F (G_15)", "PA0 (H_0)", "PA1 (H_1)", "PA2 (H_2)", "PA3 (H_3)", "PA4 (H_4)", "PA5 (H_5)", "PA6 (H_6)", "PA7 (H_7)", "PA8 (H_8)", "PA9 (H_9)", "PAA (H_10)", "PAB (H_11)", "PAC (H_12)", "PAD (H_13)", "PAE (H_14)", "PAF (H_15)", "PB0 (I_0)", "PB1 (I_1)", "PB2 (I_2)", "PB3 (I_3)", "PB4 (I_4)", "PB5 (I_5)", "PB6 (I_6)", "PB7 (I_7)", "PB8 (I_8)", "PB9 (I_9)", "PBA (I_10)", "PBB (I_11)", "PBC (I_12)", "PBD (I_13)", "PBE (I_14)", "PBF (I_15)", "PC0 (J_0)", "PC1 (J_1)", "PC2 (J_2)", "PC3 (J_3)", "PC4 (J_4)", "PC5 (J_5)", "PC6 (J_6)", "PC7 (J_7)", "PC8 (J_8)", "PC9 (J_9)", "PCA (J_10)", "PCB (J_11)", "PCC (J_12)", "PCD (J_13)", "PCE (J_14)", "PCF (J_15)", "PF0 (K_0)", "PF1 (K_1)", "PF2 (K_2)", "PF3 (K_3)", "PF4 (K_4)", "PF5 (K_5)", "PF6 (K_6)", "PF7 (K_7)", "PF8 (K_8)", "PF9 (K_9)", "PFA (K_10)", "PFB (K_11)", "PFC (K_12)", "PFD (K_13)", "PFE (K_14)", "PFF (K_15)", "DRV8860_1", "DRV8860_2", "DRV8860_3", "DRV8860_4", "DRV8860_5", "DRV8860_6", "DRV8860_7", "DRV8860_8", "DRV8860_9", "DRV8860_10", "DRV8860_11", "DRV8860_12", "DRV8860_13", "DRV8860_14", "DRV8860_15", "DRV8860_16", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" drv8860_csPinMode = bits, U08, 1202, [0:1], "default", "default inverted", "open collector", "open collector inverted" drv8860_miso = bits, U08, 1203, [0:7], "NONE", "INVALID", "P00 (A_0)", "P01 (A_1)", "P02 (A_2)", "P03 (A_3)", "P04 (A_4)", "P05 (A_5)", "P06 (A_6)", "P07 (A_7)", "P08 (A_8)", "P09 (A_9)", "P0A (A_10)", "P0B (A_11)", "P0C (A_12)", "P0D (A_13)", "P0E (A_14)", "P0F (A_15)", "P10 (B_0)", "P11 (B_1)", "P12 (B_2)", "P13 (B_3)", "P14 (B_4)", "P15 (B_5)", "P16 (B_6)", "P17 (B_7)", "P18 (B_8)", "P19 (B_9)", "P1A (B_10)", "P1B (B_11)", "P1C (B_12)", "P1D (B_13)", "P1E (B_14)", "P1F (B_15)", "P20 (C_0)", "P21 (C_1)", "P22 (C_2)", "P23 (C_3)", "P24 (C_4)", "P25 (C_5)", "P26 (C_6)", "P27 (C_7)", "P28 (C_8)", "P29 (C_9)", "P2A (C_10)", "P2B (C_11)", "P2C (C_12)", "P2D (C_13)", "P2E (C_14)", "P2F (C_15)", "P30 (D_0)", "P31 (D_1)", "P32 (D_2)", "P33 (D_3)", "P34 (D_4)", "P35 (D_5)", "P36 (D_6)", "P37 (D_7)", "P38 (D_8)", "P39 (D_9)", "P3A (D_10)", "P3B (D_11)", "P3C (D_12)", "P3D (D_13)", "P3E (D_14)", "P3F (D_15)", "P40 (E_0)", "P41 (E_1)", "P42 (E_2)", "P43 (E_3)", "P44 (E_4)", "P45 (E_5)", "P46 (E_6)", "P47 (E_7)", "P48 (E_8)", "P49 (E_9)", "P4A (E_10)", "P4B (E_11)", "P4C (E_12)", "P4D (E_13)", "P4E (E_14)", "P4F (E_15)", "P50 (F_0)", "P51 (F_1)", "P52 (F_2)", "P53 (F_3)", "P54 (F_4)", "P55 (F_5)", "P56 (F_6)", "P57 (F_7)", "P58 (F_8)", "P59 (F_9)", "P5A (F_10)", "P5B (F_11)", "P5C (F_12)", "P5D (F_13)", "P5E (F_14)", "P5F (F_15)", "P70 (G_0)", "P71 (G_1)", "P72 (G_2)", "P73 (G_3)", "P74 (G_4)", "P75 (G_5)", "P76 (G_6)", "P77 (G_7)", "P78 (G_8)", "P79 (G_9)", "P7A (G_10)", "P7B (G_11)", "P7C (G_12)", "P7D (G_13)", "P7E (G_14)", "P7F (G_15)", "PA0 (H_0)", "PA1 (H_1)", "PA2 (H_2)", "PA3 (H_3)", "PA4 (H_4)", "PA5 (H_5)", "PA6 (H_6)", "PA7 (H_7)", "PA8 (H_8)", "PA9 (H_9)", "PAA (H_10)", "PAB (H_11)", "PAC (H_12)", "PAD (H_13)", "PAE (H_14)", "PAF (H_15)", "PB0 (I_0)", "PB1 (I_1)", "PB2 (I_2)", "PB3 (I_3)", "PB4 (I_4)", "PB5 (I_5)", "PB6 (I_6)", "PB7 (I_7)", "PB8 (I_8)", "PB9 (I_9)", "PBA (I_10)", "PBB (I_11)", "PBC (I_12)", "PBD (I_13)", "PBE (I_14)", "PBF (I_15)", "PC0 (J_0)", "PC1 (J_1)", "PC2 (J_2)", "PC3 (J_3)", "PC4 (J_4)", "PC5 (J_5)", "PC6 (J_6)", "PC7 (J_7)", "PC8 (J_8)", "PC9 (J_9)", "PCA (J_10)", "PCB (J_11)", "PCC (J_12)", "PCD (J_13)", "PCE (J_14)", "PCF (J_15)", "PF0 (K_0)", "PF1 (K_1)", "PF2 (K_2)", "PF3 (K_3)", "PF4 (K_4)", "PF5 (K_5)", "PF6 (K_6)", "PF7 (K_7)", "PF8 (K_8)", "PF9 (K_9)", "PFA (K_10)", "PFB (K_11)", "PFC (K_12)", "PFD (K_13)", "PFE (K_14)", "PFF (K_15)", "DRV8860_1", "DRV8860_2", "DRV8860_3", "DRV8860_4", "DRV8860_5", "DRV8860_6", "DRV8860_7", "DRV8860_8", "DRV8860_9", "DRV8860_10", "DRV8860_11", "DRV8860_12", "DRV8860_13", "DRV8860_14", "DRV8860_15", "DRV8860_16", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" - unusedAtOldBoardConfigurationEnd = array, S32, 1204, [64], "units", 1.0, 0, -20, 100, 0 + unusedAtOldBoardConfigurationEnd = array, S32, 1204, [63], "units", 1.0, 0, -20, 100, 0 + vehicleWeight = scalar, U16, 1456, "kg", 1.0, 0, 0, 10000, 0 + unusedHereHereHere = scalar, U16, 1458, "ADC", 1.0, 0, 0, 1000, 0 tps2SecondaryMin = scalar, U16, 1460, "ADC", 1.0, 0, 0, 1000, 0 tps2SecondaryMax = scalar, U16, 1462, "ADC", 1.0, 0, 0, 1000, 0 unusedHereWeHave = bits, U32, 1464, [0:0], "false", "true" @@ -839,30 +841,30 @@ page = 1 unused1128 = bits, U32, 2116, [5:5], "false", "true" unused1129 = bits, U32, 2116, [6:6], "false", "true" unused1130 = bits, U32, 2116, [7:7], "false", "true" - unusedBit_486_8 = bits, U32, 2116, [8:8], "false", "true" - unusedBit_486_9 = bits, U32, 2116, [9:9], "false", "true" - unusedBit_486_10 = bits, U32, 2116, [10:10], "false", "true" - unusedBit_486_11 = bits, U32, 2116, [11:11], "false", "true" - unusedBit_486_12 = bits, U32, 2116, [12:12], "false", "true" - unusedBit_486_13 = bits, U32, 2116, [13:13], "false", "true" - unusedBit_486_14 = bits, U32, 2116, [14:14], "false", "true" - unusedBit_486_15 = bits, U32, 2116, [15:15], "false", "true" - unusedBit_486_16 = bits, U32, 2116, [16:16], "false", "true" - unusedBit_486_17 = bits, U32, 2116, [17:17], "false", "true" - unusedBit_486_18 = bits, U32, 2116, [18:18], "false", "true" - unusedBit_486_19 = bits, U32, 2116, [19:19], "false", "true" - unusedBit_486_20 = bits, U32, 2116, [20:20], "false", "true" - unusedBit_486_21 = bits, U32, 2116, [21:21], "false", "true" - unusedBit_486_22 = bits, U32, 2116, [22:22], "false", "true" - unusedBit_486_23 = bits, U32, 2116, [23:23], "false", "true" - unusedBit_486_24 = bits, U32, 2116, [24:24], "false", "true" - unusedBit_486_25 = bits, U32, 2116, [25:25], "false", "true" - unusedBit_486_26 = bits, U32, 2116, [26:26], "false", "true" - unusedBit_486_27 = bits, U32, 2116, [27:27], "false", "true" - unusedBit_486_28 = bits, U32, 2116, [28:28], "false", "true" - unusedBit_486_29 = bits, U32, 2116, [29:29], "false", "true" - unusedBit_486_30 = bits, U32, 2116, [30:30], "false", "true" - unusedBit_486_31 = bits, U32, 2116, [31:31], "false", "true" + unusedBit_488_8 = bits, U32, 2116, [8:8], "false", "true" + unusedBit_488_9 = bits, U32, 2116, [9:9], "false", "true" + unusedBit_488_10 = bits, U32, 2116, [10:10], "false", "true" + unusedBit_488_11 = bits, U32, 2116, [11:11], "false", "true" + unusedBit_488_12 = bits, U32, 2116, [12:12], "false", "true" + unusedBit_488_13 = bits, U32, 2116, [13:13], "false", "true" + unusedBit_488_14 = bits, U32, 2116, [14:14], "false", "true" + unusedBit_488_15 = bits, U32, 2116, [15:15], "false", "true" + unusedBit_488_16 = bits, U32, 2116, [16:16], "false", "true" + unusedBit_488_17 = bits, U32, 2116, [17:17], "false", "true" + unusedBit_488_18 = bits, U32, 2116, [18:18], "false", "true" + unusedBit_488_19 = bits, U32, 2116, [19:19], "false", "true" + unusedBit_488_20 = bits, U32, 2116, [20:20], "false", "true" + unusedBit_488_21 = bits, U32, 2116, [21:21], "false", "true" + unusedBit_488_22 = bits, U32, 2116, [22:22], "false", "true" + unusedBit_488_23 = bits, U32, 2116, [23:23], "false", "true" + unusedBit_488_24 = bits, U32, 2116, [24:24], "false", "true" + unusedBit_488_25 = bits, U32, 2116, [25:25], "false", "true" + unusedBit_488_26 = bits, U32, 2116, [26:26], "false", "true" + unusedBit_488_27 = bits, U32, 2116, [27:27], "false", "true" + unusedBit_488_28 = bits, U32, 2116, [28:28], "false", "true" + unusedBit_488_29 = bits, U32, 2116, [29:29], "false", "true" + unusedBit_488_30 = bits, U32, 2116, [30:30], "false", "true" + unusedBit_488_31 = bits, U32, 2116, [31:31], "false", "true" can2NbcType = bits, U32, 2120, [0:3], "None", "FIAT", "VAG" , "MAZDA RX8", "BMW", "W202", "BMW E90", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2TxPin = bits, U08, 2124, [0:7], "NONE", "INVALID", "P00 (A_0)", "P01 (A_1)", "P02 (A_2)", "P03 (A_3)", "P04 (A_4)", "P05 (A_5)", "P06 (A_6)", "P07 (A_7)", "P08 (A_8)", "P09 (A_9)", "P0A (A_10)", "P0B (A_11)", "P0C (A_12)", "P0D (A_13)", "P0E (A_14)", "P0F (A_15)", "P10 (B_0)", "P11 (B_1)", "P12 (B_2)", "P13 (B_3)", "P14 (B_4)", "P15 (B_5)", "P16 (B_6)", "P17 (B_7)", "P18 (B_8)", "P19 (B_9)", "P1A (B_10)", "P1B (B_11)", "P1C (B_12)", "P1D (B_13)", "P1E (B_14)", "P1F (B_15)", "P20 (C_0)", "P21 (C_1)", "P22 (C_2)", "P23 (C_3)", "P24 (C_4)", "P25 (C_5)", "P26 (C_6)", "P27 (C_7)", "P28 (C_8)", "P29 (C_9)", "P2A (C_10)", "P2B (C_11)", "P2C (C_12)", "P2D (C_13)", "P2E (C_14)", "P2F (C_15)", "P30 (D_0)", "P31 (D_1)", "P32 (D_2)", "P33 (D_3)", "P34 (D_4)", "P35 (D_5)", "P36 (D_6)", "P37 (D_7)", "P38 (D_8)", "P39 (D_9)", "P3A (D_10)", "P3B (D_11)", "P3C (D_12)", "P3D (D_13)", "P3E (D_14)", "P3F (D_15)", "P40 (E_0)", "P41 (E_1)", "P42 (E_2)", "P43 (E_3)", "P44 (E_4)", "P45 (E_5)", "P46 (E_6)", "P47 (E_7)", "P48 (E_8)", "P49 (E_9)", "P4A (E_10)", "P4B (E_11)", "P4C (E_12)", "P4D (E_13)", "P4E (E_14)", "P4F (E_15)", "P50 (F_0)", "P51 (F_1)", "P52 (F_2)", "P53 (F_3)", "P54 (F_4)", "P55 (F_5)", "P56 (F_6)", "P57 (F_7)", "P58 (F_8)", "P59 (F_9)", "P5A (F_10)", "P5B (F_11)", "P5C (F_12)", "P5D (F_13)", "P5E (F_14)", "P5F (F_15)", "P70 (G_0)", "P71 (G_1)", "P72 (G_2)", "P73 (G_3)", "P74 (G_4)", "P75 (G_5)", "P76 (G_6)", "P77 (G_7)", "P78 (G_8)", "P79 (G_9)", "P7A (G_10)", "P7B (G_11)", "P7C (G_12)", "P7D (G_13)", "P7E (G_14)", "P7F (G_15)", "PA0 (H_0)", "PA1 (H_1)", "PA2 (H_2)", "PA3 (H_3)", "PA4 (H_4)", "PA5 (H_5)", "PA6 (H_6)", "PA7 (H_7)", "PA8 (H_8)", "PA9 (H_9)", "PAA (H_10)", "PAB (H_11)", "PAC (H_12)", "PAD (H_13)", "PAE (H_14)", "PAF (H_15)", "PB0 (I_0)", "PB1 (I_1)", "PB2 (I_2)", "PB3 (I_3)", "PB4 (I_4)", "PB5 (I_5)", "PB6 (I_6)", "PB7 (I_7)", "PB8 (I_8)", "PB9 (I_9)", "PBA (I_10)", "PBB (I_11)", "PBC (I_12)", "PBD (I_13)", "PBE (I_14)", "PBF (I_15)", "PC0 (J_0)", "PC1 (J_1)", "PC2 (J_2)", "PC3 (J_3)", "PC4 (J_4)", "PC5 (J_5)", "PC6 (J_6)", "PC7 (J_7)", "PC8 (J_8)", "PC9 (J_9)", "PCA (J_10)", "PCB (J_11)", "PCC (J_12)", "PCD (J_13)", "PCE (J_14)", "PCF (J_15)", "PF0 (K_0)", "PF1 (K_1)", "PF2 (K_2)", "PF3 (K_3)", "PF4 (K_4)", "PF5 (K_5)", "PF6 (K_6)", "PF7 (K_7)", "PF8 (K_8)", "PF9 (K_9)", "PFA (K_10)", "PFB (K_11)", "PFC (K_12)", "PFD (K_13)", "PFE (K_14)", "PFF (K_15)", "DRV8860_1", "DRV8860_2", "DRV8860_3", "DRV8860_4", "DRV8860_5", "DRV8860_6", "DRV8860_7", "DRV8860_8", "DRV8860_9", "DRV8860_10", "DRV8860_11", "DRV8860_12", "DRV8860_13", "DRV8860_14", "DRV8860_15", "DRV8860_16", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2RxPin = bits, U08, 2125, [0:7], "NONE", "INVALID", "P00 (A_0)", "P01 (A_1)", "P02 (A_2)", "P03 (A_3)", "P04 (A_4)", "P05 (A_5)", "P06 (A_6)", "P07 (A_7)", "P08 (A_8)", "P09 (A_9)", "P0A (A_10)", "P0B (A_11)", "P0C (A_12)", "P0D (A_13)", "P0E (A_14)", "P0F (A_15)", "P10 (B_0)", "P11 (B_1)", "P12 (B_2)", "P13 (B_3)", "P14 (B_4)", "P15 (B_5)", "P16 (B_6)", "P17 (B_7)", "P18 (B_8)", "P19 (B_9)", "P1A (B_10)", "P1B (B_11)", "P1C (B_12)", "P1D (B_13)", "P1E (B_14)", "P1F (B_15)", "P20 (C_0)", "P21 (C_1)", "P22 (C_2)", "P23 (C_3)", "P24 (C_4)", "P25 (C_5)", "P26 (C_6)", "P27 (C_7)", "P28 (C_8)", "P29 (C_9)", "P2A (C_10)", "P2B (C_11)", "P2C (C_12)", "P2D (C_13)", "P2E (C_14)", "P2F (C_15)", "P30 (D_0)", "P31 (D_1)", "P32 (D_2)", "P33 (D_3)", "P34 (D_4)", "P35 (D_5)", "P36 (D_6)", "P37 (D_7)", "P38 (D_8)", "P39 (D_9)", "P3A (D_10)", "P3B (D_11)", "P3C (D_12)", "P3D (D_13)", "P3E (D_14)", "P3F (D_15)", "P40 (E_0)", "P41 (E_1)", "P42 (E_2)", "P43 (E_3)", "P44 (E_4)", "P45 (E_5)", "P46 (E_6)", "P47 (E_7)", "P48 (E_8)", "P49 (E_9)", "P4A (E_10)", "P4B (E_11)", "P4C (E_12)", "P4D (E_13)", "P4E (E_14)", "P4F (E_15)", "P50 (F_0)", "P51 (F_1)", "P52 (F_2)", "P53 (F_3)", "P54 (F_4)", "P55 (F_5)", "P56 (F_6)", "P57 (F_7)", "P58 (F_8)", "P59 (F_9)", "P5A (F_10)", "P5B (F_11)", "P5C (F_12)", "P5D (F_13)", "P5E (F_14)", "P5F (F_15)", "P70 (G_0)", "P71 (G_1)", "P72 (G_2)", "P73 (G_3)", "P74 (G_4)", "P75 (G_5)", "P76 (G_6)", "P77 (G_7)", "P78 (G_8)", "P79 (G_9)", "P7A (G_10)", "P7B (G_11)", "P7C (G_12)", "P7D (G_13)", "P7E (G_14)", "P7F (G_15)", "PA0 (H_0)", "PA1 (H_1)", "PA2 (H_2)", "PA3 (H_3)", "PA4 (H_4)", "PA5 (H_5)", "PA6 (H_6)", "PA7 (H_7)", "PA8 (H_8)", "PA9 (H_9)", "PAA (H_10)", "PAB (H_11)", "PAC (H_12)", "PAD (H_13)", "PAE (H_14)", "PAF (H_15)", "PB0 (I_0)", "PB1 (I_1)", "PB2 (I_2)", "PB3 (I_3)", "PB4 (I_4)", "PB5 (I_5)", "PB6 (I_6)", "PB7 (I_7)", "PB8 (I_8)", "PB9 (I_9)", "PBA (I_10)", "PBB (I_11)", "PBC (I_12)", "PBD (I_13)", "PBE (I_14)", "PBF (I_15)", "PC0 (J_0)", "PC1 (J_1)", "PC2 (J_2)", "PC3 (J_3)", "PC4 (J_4)", "PC5 (J_5)", "PC6 (J_6)", "PC7 (J_7)", "PC8 (J_8)", "PC9 (J_9)", "PCA (J_10)", "PCB (J_11)", "PCC (J_12)", "PCD (J_13)", "PCE (J_14)", "PCF (J_15)", "PF0 (K_0)", "PF1 (K_1)", "PF2 (K_2)", "PF3 (K_3)", "PF4 (K_4)", "PF5 (K_5)", "PF6 (K_6)", "PF7 (K_7)", "PF8 (K_8)", "PF9 (K_9)", "PFA (K_10)", "PFB (K_11)", "PFC (K_12)", "PFD (K_13)", "PFE (K_14)", "PFF (K_15)", "DRV8860_1", "DRV8860_2", "DRV8860_3", "DRV8860_4", "DRV8860_5", "DRV8860_6", "DRV8860_7", "DRV8860_8", "DRV8860_9", "DRV8860_10", "DRV8860_11", "DRV8860_12", "DRV8860_13", "DRV8860_14", "DRV8860_15", "DRV8860_16", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -3096,6 +3098,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Number of Cylinders", cylindersCount field = "Engine Displacement", displacement field = "Firing Order", firingOrder + field = "Vehicle Weight", vehicleWeight ; this field is useful for rusEFI online catalog field = "Compression Ratio", compressionRatio ; this field is useful for rusEFI online catalog diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini index 545a2d15f5..3628e77948 100644 --- a/firmware/tunerstudio/generated/rusefi_kinetis.ini +++ b/firmware/tunerstudio/generated/rusefi_kinetis.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.11.22.kin.1843643007" + signature = "rusEFI 2020.11.25.kin.2873613879" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.11.22.kin.1843643007" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.11.25.kin.2873613879" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sun Nov 22 23:32:09 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Wed Nov 25 18:21:20 UTC 2020 pageSize = 20000 page = 1 @@ -639,7 +639,9 @@ page = 1 drv8860_cs = bits, U08, 1201, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PA16", "PA17", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PB16", "PB17", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PD16", "PD17", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PE16", "PE17", "TLE6240_1", "TLE6240_2", "TLE6240_3", "TLE6240_4", "TLE6240_5", "TLE6240_6", "TLE6240_7", "TLE6240_8", "TLE6240_9", "TLE6240_10", "TLE6240_11", "TLE6240_12", "TLE6240_13", "TLE6240_14", "TLE6240_15", "TLE6240_16", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" drv8860_csPinMode = bits, U08, 1202, [0:1], "default", "default inverted", "open collector", "open collector inverted" drv8860_miso = bits, U08, 1203, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PA16", "PA17", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PB16", "PB17", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PD16", "PD17", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PE16", "PE17", "TLE6240_1", "TLE6240_2", "TLE6240_3", "TLE6240_4", "TLE6240_5", "TLE6240_6", "TLE6240_7", "TLE6240_8", "TLE6240_9", "TLE6240_10", "TLE6240_11", "TLE6240_12", "TLE6240_13", "TLE6240_14", "TLE6240_15", "TLE6240_16", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" - unusedAtOldBoardConfigurationEnd = array, S32, 1204, [64], "units", 1.0, 0, -20, 100, 0 + unusedAtOldBoardConfigurationEnd = array, S32, 1204, [63], "units", 1.0, 0, -20, 100, 0 + vehicleWeight = scalar, U16, 1456, "kg", 1.0, 0, 0, 10000, 0 + unusedHereHereHere = scalar, U16, 1458, "ADC", 1.0, 0, 0, 1000, 0 tps2SecondaryMin = scalar, U16, 1460, "ADC", 1.0, 0, 0, 1000, 0 tps2SecondaryMax = scalar, U16, 1462, "ADC", 1.0, 0, 0, 1000, 0 unusedHereWeHave = bits, U32, 1464, [0:0], "false", "true" @@ -839,30 +841,30 @@ page = 1 unused1128 = bits, U32, 2116, [5:5], "false", "true" unused1129 = bits, U32, 2116, [6:6], "false", "true" unused1130 = bits, U32, 2116, [7:7], "false", "true" - unusedBit_486_8 = bits, U32, 2116, [8:8], "false", "true" - unusedBit_486_9 = bits, U32, 2116, [9:9], "false", "true" - unusedBit_486_10 = bits, U32, 2116, [10:10], "false", "true" - unusedBit_486_11 = bits, U32, 2116, [11:11], "false", "true" - unusedBit_486_12 = bits, U32, 2116, [12:12], "false", "true" - unusedBit_486_13 = bits, U32, 2116, [13:13], "false", "true" - unusedBit_486_14 = bits, U32, 2116, [14:14], "false", "true" - unusedBit_486_15 = bits, U32, 2116, [15:15], "false", "true" - unusedBit_486_16 = bits, U32, 2116, [16:16], "false", "true" - unusedBit_486_17 = bits, U32, 2116, [17:17], "false", "true" - unusedBit_486_18 = bits, U32, 2116, [18:18], "false", "true" - unusedBit_486_19 = bits, U32, 2116, [19:19], "false", "true" - unusedBit_486_20 = bits, U32, 2116, [20:20], "false", "true" - unusedBit_486_21 = bits, U32, 2116, [21:21], "false", "true" - unusedBit_486_22 = bits, U32, 2116, [22:22], "false", "true" - unusedBit_486_23 = bits, U32, 2116, [23:23], "false", "true" - unusedBit_486_24 = bits, U32, 2116, [24:24], "false", "true" - unusedBit_486_25 = bits, U32, 2116, [25:25], "false", "true" - unusedBit_486_26 = bits, U32, 2116, [26:26], "false", "true" - unusedBit_486_27 = bits, U32, 2116, [27:27], "false", "true" - unusedBit_486_28 = bits, U32, 2116, [28:28], "false", "true" - unusedBit_486_29 = bits, U32, 2116, [29:29], "false", "true" - unusedBit_486_30 = bits, U32, 2116, [30:30], "false", "true" - unusedBit_486_31 = bits, U32, 2116, [31:31], "false", "true" + unusedBit_488_8 = bits, U32, 2116, [8:8], "false", "true" + unusedBit_488_9 = bits, U32, 2116, [9:9], "false", "true" + unusedBit_488_10 = bits, U32, 2116, [10:10], "false", "true" + unusedBit_488_11 = bits, U32, 2116, [11:11], "false", "true" + unusedBit_488_12 = bits, U32, 2116, [12:12], "false", "true" + unusedBit_488_13 = bits, U32, 2116, [13:13], "false", "true" + unusedBit_488_14 = bits, U32, 2116, [14:14], "false", "true" + unusedBit_488_15 = bits, U32, 2116, [15:15], "false", "true" + unusedBit_488_16 = bits, U32, 2116, [16:16], "false", "true" + unusedBit_488_17 = bits, U32, 2116, [17:17], "false", "true" + unusedBit_488_18 = bits, U32, 2116, [18:18], "false", "true" + unusedBit_488_19 = bits, U32, 2116, [19:19], "false", "true" + unusedBit_488_20 = bits, U32, 2116, [20:20], "false", "true" + unusedBit_488_21 = bits, U32, 2116, [21:21], "false", "true" + unusedBit_488_22 = bits, U32, 2116, [22:22], "false", "true" + unusedBit_488_23 = bits, U32, 2116, [23:23], "false", "true" + unusedBit_488_24 = bits, U32, 2116, [24:24], "false", "true" + unusedBit_488_25 = bits, U32, 2116, [25:25], "false", "true" + unusedBit_488_26 = bits, U32, 2116, [26:26], "false", "true" + unusedBit_488_27 = bits, U32, 2116, [27:27], "false", "true" + unusedBit_488_28 = bits, U32, 2116, [28:28], "false", "true" + unusedBit_488_29 = bits, U32, 2116, [29:29], "false", "true" + unusedBit_488_30 = bits, U32, 2116, [30:30], "false", "true" + unusedBit_488_31 = bits, U32, 2116, [31:31], "false", "true" can2NbcType = bits, U32, 2120, [0:3], "None", "FIAT", "VAG" , "MAZDA RX8", "BMW", "W202", "BMW E90", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2TxPin = bits, U08, 2124, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PA16", "PA17", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PB16", "PB17", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PD16", "PD17", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PE16", "PE17", "TLE6240_1", "TLE6240_2", "TLE6240_3", "TLE6240_4", "TLE6240_5", "TLE6240_6", "TLE6240_7", "TLE6240_8", "TLE6240_9", "TLE6240_10", "TLE6240_11", "TLE6240_12", "TLE6240_13", "TLE6240_14", "TLE6240_15", "TLE6240_16", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2RxPin = bits, U08, 2125, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PA16", "PA17", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PB16", "PB17", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PD16", "PD17", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PE16", "PE17", "TLE6240_1", "TLE6240_2", "TLE6240_3", "TLE6240_4", "TLE6240_5", "TLE6240_6", "TLE6240_7", "TLE6240_8", "TLE6240_9", "TLE6240_10", "TLE6240_11", "TLE6240_12", "TLE6240_13", "TLE6240_14", "TLE6240_15", "TLE6240_16", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -3096,6 +3098,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Number of Cylinders", cylindersCount field = "Engine Displacement", displacement field = "Firing Order", firingOrder + field = "Vehicle Weight", vehicleWeight ; this field is useful for rusEFI online catalog field = "Compression Ratio", compressionRatio ; this field is useful for rusEFI online catalog diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 093bd0dbd2..2e5047b468 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.11.22.mre_f4.3806232639" + signature = "rusEFI 2020.11.25.mre_f4.612015223" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.11.22.mre_f4.3806232639" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.11.25.mre_f4.612015223" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 22 23:31:57 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Nov 25 18:21:03 UTC 2020 pageSize = 20000 page = 1 @@ -639,7 +639,9 @@ page = 1 drv8860_cs = bits, U08, 1201, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" drv8860_csPinMode = bits, U08, 1202, [0:1], "default", "default inverted", "open collector", "open collector inverted" drv8860_miso = bits, U08, 1203, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" - unusedAtOldBoardConfigurationEnd = array, S32, 1204, [64], "units", 1.0, 0, -20, 100, 0 + unusedAtOldBoardConfigurationEnd = array, S32, 1204, [63], "units", 1.0, 0, -20, 100, 0 + vehicleWeight = scalar, U16, 1456, "kg", 1.0, 0, 0, 10000, 0 + unusedHereHereHere = scalar, U16, 1458, "ADC", 1.0, 0, 0, 1000, 0 tps2SecondaryMin = scalar, U16, 1460, "ADC", 1.0, 0, 0, 1000, 0 tps2SecondaryMax = scalar, U16, 1462, "ADC", 1.0, 0, 0, 1000, 0 unusedHereWeHave = bits, U32, 1464, [0:0], "false", "true" @@ -839,30 +841,30 @@ page = 1 unused1128 = bits, U32, 2116, [5:5], "false", "true" unused1129 = bits, U32, 2116, [6:6], "false", "true" unused1130 = bits, U32, 2116, [7:7], "false", "true" - unusedBit_486_8 = bits, U32, 2116, [8:8], "false", "true" - unusedBit_486_9 = bits, U32, 2116, [9:9], "false", "true" - unusedBit_486_10 = bits, U32, 2116, [10:10], "false", "true" - unusedBit_486_11 = bits, U32, 2116, [11:11], "false", "true" - unusedBit_486_12 = bits, U32, 2116, [12:12], "false", "true" - unusedBit_486_13 = bits, U32, 2116, [13:13], "false", "true" - unusedBit_486_14 = bits, U32, 2116, [14:14], "false", "true" - unusedBit_486_15 = bits, U32, 2116, [15:15], "false", "true" - unusedBit_486_16 = bits, U32, 2116, [16:16], "false", "true" - unusedBit_486_17 = bits, U32, 2116, [17:17], "false", "true" - unusedBit_486_18 = bits, U32, 2116, [18:18], "false", "true" - unusedBit_486_19 = bits, U32, 2116, [19:19], "false", "true" - unusedBit_486_20 = bits, U32, 2116, [20:20], "false", "true" - unusedBit_486_21 = bits, U32, 2116, [21:21], "false", "true" - unusedBit_486_22 = bits, U32, 2116, [22:22], "false", "true" - unusedBit_486_23 = bits, U32, 2116, [23:23], "false", "true" - unusedBit_486_24 = bits, U32, 2116, [24:24], "false", "true" - unusedBit_486_25 = bits, U32, 2116, [25:25], "false", "true" - unusedBit_486_26 = bits, U32, 2116, [26:26], "false", "true" - unusedBit_486_27 = bits, U32, 2116, [27:27], "false", "true" - unusedBit_486_28 = bits, U32, 2116, [28:28], "false", "true" - unusedBit_486_29 = bits, U32, 2116, [29:29], "false", "true" - unusedBit_486_30 = bits, U32, 2116, [30:30], "false", "true" - unusedBit_486_31 = bits, U32, 2116, [31:31], "false", "true" + unusedBit_488_8 = bits, U32, 2116, [8:8], "false", "true" + unusedBit_488_9 = bits, U32, 2116, [9:9], "false", "true" + unusedBit_488_10 = bits, U32, 2116, [10:10], "false", "true" + unusedBit_488_11 = bits, U32, 2116, [11:11], "false", "true" + unusedBit_488_12 = bits, U32, 2116, [12:12], "false", "true" + unusedBit_488_13 = bits, U32, 2116, [13:13], "false", "true" + unusedBit_488_14 = bits, U32, 2116, [14:14], "false", "true" + unusedBit_488_15 = bits, U32, 2116, [15:15], "false", "true" + unusedBit_488_16 = bits, U32, 2116, [16:16], "false", "true" + unusedBit_488_17 = bits, U32, 2116, [17:17], "false", "true" + unusedBit_488_18 = bits, U32, 2116, [18:18], "false", "true" + unusedBit_488_19 = bits, U32, 2116, [19:19], "false", "true" + unusedBit_488_20 = bits, U32, 2116, [20:20], "false", "true" + unusedBit_488_21 = bits, U32, 2116, [21:21], "false", "true" + unusedBit_488_22 = bits, U32, 2116, [22:22], "false", "true" + unusedBit_488_23 = bits, U32, 2116, [23:23], "false", "true" + unusedBit_488_24 = bits, U32, 2116, [24:24], "false", "true" + unusedBit_488_25 = bits, U32, 2116, [25:25], "false", "true" + unusedBit_488_26 = bits, U32, 2116, [26:26], "false", "true" + unusedBit_488_27 = bits, U32, 2116, [27:27], "false", "true" + unusedBit_488_28 = bits, U32, 2116, [28:28], "false", "true" + unusedBit_488_29 = bits, U32, 2116, [29:29], "false", "true" + unusedBit_488_30 = bits, U32, 2116, [30:30], "false", "true" + unusedBit_488_31 = bits, U32, 2116, [31:31], "false", "true" can2NbcType = bits, U32, 2120, [0:3], "None", "FIAT", "VAG" , "MAZDA RX8", "BMW", "W202", "BMW E90", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2TxPin = bits, U08, 2124, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2RxPin = bits, U08, 2125, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -3092,6 +3094,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Number of Cylinders", cylindersCount field = "Engine Displacement", displacement field = "Firing Order", firingOrder + field = "Vehicle Weight", vehicleWeight ; this field is useful for rusEFI online catalog field = "Compression Ratio", compressionRatio ; this field is useful for rusEFI online catalog diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index dcc13ad1de..ae960c05e5 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.11.22.mre_f7.3806232639" + signature = "rusEFI 2020.11.25.mre_f7.612015223" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.11.22.mre_f7.3806232639" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.11.25.mre_f7.612015223" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 22 23:31:56 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Nov 25 18:21:01 UTC 2020 pageSize = 20000 page = 1 @@ -639,7 +639,9 @@ page = 1 drv8860_cs = bits, U08, 1201, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" drv8860_csPinMode = bits, U08, 1202, [0:1], "default", "default inverted", "open collector", "open collector inverted" drv8860_miso = bits, U08, 1203, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" - unusedAtOldBoardConfigurationEnd = array, S32, 1204, [64], "units", 1.0, 0, -20, 100, 0 + unusedAtOldBoardConfigurationEnd = array, S32, 1204, [63], "units", 1.0, 0, -20, 100, 0 + vehicleWeight = scalar, U16, 1456, "kg", 1.0, 0, 0, 10000, 0 + unusedHereHereHere = scalar, U16, 1458, "ADC", 1.0, 0, 0, 1000, 0 tps2SecondaryMin = scalar, U16, 1460, "ADC", 1.0, 0, 0, 1000, 0 tps2SecondaryMax = scalar, U16, 1462, "ADC", 1.0, 0, 0, 1000, 0 unusedHereWeHave = bits, U32, 1464, [0:0], "false", "true" @@ -839,30 +841,30 @@ page = 1 unused1128 = bits, U32, 2116, [5:5], "false", "true" unused1129 = bits, U32, 2116, [6:6], "false", "true" unused1130 = bits, U32, 2116, [7:7], "false", "true" - unusedBit_486_8 = bits, U32, 2116, [8:8], "false", "true" - unusedBit_486_9 = bits, U32, 2116, [9:9], "false", "true" - unusedBit_486_10 = bits, U32, 2116, [10:10], "false", "true" - unusedBit_486_11 = bits, U32, 2116, [11:11], "false", "true" - unusedBit_486_12 = bits, U32, 2116, [12:12], "false", "true" - unusedBit_486_13 = bits, U32, 2116, [13:13], "false", "true" - unusedBit_486_14 = bits, U32, 2116, [14:14], "false", "true" - unusedBit_486_15 = bits, U32, 2116, [15:15], "false", "true" - unusedBit_486_16 = bits, U32, 2116, [16:16], "false", "true" - unusedBit_486_17 = bits, U32, 2116, [17:17], "false", "true" - unusedBit_486_18 = bits, U32, 2116, [18:18], "false", "true" - unusedBit_486_19 = bits, U32, 2116, [19:19], "false", "true" - unusedBit_486_20 = bits, U32, 2116, [20:20], "false", "true" - unusedBit_486_21 = bits, U32, 2116, [21:21], "false", "true" - unusedBit_486_22 = bits, U32, 2116, [22:22], "false", "true" - unusedBit_486_23 = bits, U32, 2116, [23:23], "false", "true" - unusedBit_486_24 = bits, U32, 2116, [24:24], "false", "true" - unusedBit_486_25 = bits, U32, 2116, [25:25], "false", "true" - unusedBit_486_26 = bits, U32, 2116, [26:26], "false", "true" - unusedBit_486_27 = bits, U32, 2116, [27:27], "false", "true" - unusedBit_486_28 = bits, U32, 2116, [28:28], "false", "true" - unusedBit_486_29 = bits, U32, 2116, [29:29], "false", "true" - unusedBit_486_30 = bits, U32, 2116, [30:30], "false", "true" - unusedBit_486_31 = bits, U32, 2116, [31:31], "false", "true" + unusedBit_488_8 = bits, U32, 2116, [8:8], "false", "true" + unusedBit_488_9 = bits, U32, 2116, [9:9], "false", "true" + unusedBit_488_10 = bits, U32, 2116, [10:10], "false", "true" + unusedBit_488_11 = bits, U32, 2116, [11:11], "false", "true" + unusedBit_488_12 = bits, U32, 2116, [12:12], "false", "true" + unusedBit_488_13 = bits, U32, 2116, [13:13], "false", "true" + unusedBit_488_14 = bits, U32, 2116, [14:14], "false", "true" + unusedBit_488_15 = bits, U32, 2116, [15:15], "false", "true" + unusedBit_488_16 = bits, U32, 2116, [16:16], "false", "true" + unusedBit_488_17 = bits, U32, 2116, [17:17], "false", "true" + unusedBit_488_18 = bits, U32, 2116, [18:18], "false", "true" + unusedBit_488_19 = bits, U32, 2116, [19:19], "false", "true" + unusedBit_488_20 = bits, U32, 2116, [20:20], "false", "true" + unusedBit_488_21 = bits, U32, 2116, [21:21], "false", "true" + unusedBit_488_22 = bits, U32, 2116, [22:22], "false", "true" + unusedBit_488_23 = bits, U32, 2116, [23:23], "false", "true" + unusedBit_488_24 = bits, U32, 2116, [24:24], "false", "true" + unusedBit_488_25 = bits, U32, 2116, [25:25], "false", "true" + unusedBit_488_26 = bits, U32, 2116, [26:26], "false", "true" + unusedBit_488_27 = bits, U32, 2116, [27:27], "false", "true" + unusedBit_488_28 = bits, U32, 2116, [28:28], "false", "true" + unusedBit_488_29 = bits, U32, 2116, [29:29], "false", "true" + unusedBit_488_30 = bits, U32, 2116, [30:30], "false", "true" + unusedBit_488_31 = bits, U32, 2116, [31:31], "false", "true" can2NbcType = bits, U32, 2120, [0:3], "None", "FIAT", "VAG" , "MAZDA RX8", "BMW", "W202", "BMW E90", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2TxPin = bits, U08, 2124, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2RxPin = bits, U08, 2125, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -3092,6 +3094,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Number of Cylinders", cylindersCount field = "Engine Displacement", displacement field = "Firing Order", firingOrder + field = "Vehicle Weight", vehicleWeight ; this field is useful for rusEFI online catalog field = "Compression Ratio", compressionRatio ; this field is useful for rusEFI online catalog diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index 1e6915c7ae..9bfa47ded8 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.11.22.prometheus_405.3084277783" + signature = "rusEFI 2020.11.25.prometheus_405.1903314015" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.11.22.prometheus_405.3084277783" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.11.25.prometheus_405.1903314015" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 22 23:32:01 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Nov 25 18:21:08 UTC 2020 pageSize = 20000 page = 1 @@ -639,7 +639,9 @@ page = 1 drv8860_cs = bits, U08, 1201, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" drv8860_csPinMode = bits, U08, 1202, [0:1], "default", "default inverted", "open collector", "open collector inverted" drv8860_miso = bits, U08, 1203, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" - unusedAtOldBoardConfigurationEnd = array, S32, 1204, [64], "units", 1.0, 0, -20, 100, 0 + unusedAtOldBoardConfigurationEnd = array, S32, 1204, [63], "units", 1.0, 0, -20, 100, 0 + vehicleWeight = scalar, U16, 1456, "kg", 1.0, 0, 0, 10000, 0 + unusedHereHereHere = scalar, U16, 1458, "ADC", 1.0, 0, 0, 1000, 0 tps2SecondaryMin = scalar, U16, 1460, "ADC", 1.0, 0, 0, 1000, 0 tps2SecondaryMax = scalar, U16, 1462, "ADC", 1.0, 0, 0, 1000, 0 unusedHereWeHave = bits, U32, 1464, [0:0], "false", "true" @@ -839,30 +841,30 @@ page = 1 unused1128 = bits, U32, 2116, [5:5], "false", "true" unused1129 = bits, U32, 2116, [6:6], "false", "true" unused1130 = bits, U32, 2116, [7:7], "false", "true" - unusedBit_486_8 = bits, U32, 2116, [8:8], "false", "true" - unusedBit_486_9 = bits, U32, 2116, [9:9], "false", "true" - unusedBit_486_10 = bits, U32, 2116, [10:10], "false", "true" - unusedBit_486_11 = bits, U32, 2116, [11:11], "false", "true" - unusedBit_486_12 = bits, U32, 2116, [12:12], "false", "true" - unusedBit_486_13 = bits, U32, 2116, [13:13], "false", "true" - unusedBit_486_14 = bits, U32, 2116, [14:14], "false", "true" - unusedBit_486_15 = bits, U32, 2116, [15:15], "false", "true" - unusedBit_486_16 = bits, U32, 2116, [16:16], "false", "true" - unusedBit_486_17 = bits, U32, 2116, [17:17], "false", "true" - unusedBit_486_18 = bits, U32, 2116, [18:18], "false", "true" - unusedBit_486_19 = bits, U32, 2116, [19:19], "false", "true" - unusedBit_486_20 = bits, U32, 2116, [20:20], "false", "true" - unusedBit_486_21 = bits, U32, 2116, [21:21], "false", "true" - unusedBit_486_22 = bits, U32, 2116, [22:22], "false", "true" - unusedBit_486_23 = bits, U32, 2116, [23:23], "false", "true" - unusedBit_486_24 = bits, U32, 2116, [24:24], "false", "true" - unusedBit_486_25 = bits, U32, 2116, [25:25], "false", "true" - unusedBit_486_26 = bits, U32, 2116, [26:26], "false", "true" - unusedBit_486_27 = bits, U32, 2116, [27:27], "false", "true" - unusedBit_486_28 = bits, U32, 2116, [28:28], "false", "true" - unusedBit_486_29 = bits, U32, 2116, [29:29], "false", "true" - unusedBit_486_30 = bits, U32, 2116, [30:30], "false", "true" - unusedBit_486_31 = bits, U32, 2116, [31:31], "false", "true" + unusedBit_488_8 = bits, U32, 2116, [8:8], "false", "true" + unusedBit_488_9 = bits, U32, 2116, [9:9], "false", "true" + unusedBit_488_10 = bits, U32, 2116, [10:10], "false", "true" + unusedBit_488_11 = bits, U32, 2116, [11:11], "false", "true" + unusedBit_488_12 = bits, U32, 2116, [12:12], "false", "true" + unusedBit_488_13 = bits, U32, 2116, [13:13], "false", "true" + unusedBit_488_14 = bits, U32, 2116, [14:14], "false", "true" + unusedBit_488_15 = bits, U32, 2116, [15:15], "false", "true" + unusedBit_488_16 = bits, U32, 2116, [16:16], "false", "true" + unusedBit_488_17 = bits, U32, 2116, [17:17], "false", "true" + unusedBit_488_18 = bits, U32, 2116, [18:18], "false", "true" + unusedBit_488_19 = bits, U32, 2116, [19:19], "false", "true" + unusedBit_488_20 = bits, U32, 2116, [20:20], "false", "true" + unusedBit_488_21 = bits, U32, 2116, [21:21], "false", "true" + unusedBit_488_22 = bits, U32, 2116, [22:22], "false", "true" + unusedBit_488_23 = bits, U32, 2116, [23:23], "false", "true" + unusedBit_488_24 = bits, U32, 2116, [24:24], "false", "true" + unusedBit_488_25 = bits, U32, 2116, [25:25], "false", "true" + unusedBit_488_26 = bits, U32, 2116, [26:26], "false", "true" + unusedBit_488_27 = bits, U32, 2116, [27:27], "false", "true" + unusedBit_488_28 = bits, U32, 2116, [28:28], "false", "true" + unusedBit_488_29 = bits, U32, 2116, [29:29], "false", "true" + unusedBit_488_30 = bits, U32, 2116, [30:30], "false", "true" + unusedBit_488_31 = bits, U32, 2116, [31:31], "false", "true" can2NbcType = bits, U32, 2120, [0:3], "None", "FIAT", "VAG" , "MAZDA RX8", "BMW", "W202", "BMW E90", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2TxPin = bits, U08, 2124, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2RxPin = bits, U08, 2125, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -3092,6 +3094,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Number of Cylinders", cylindersCount field = "Engine Displacement", displacement field = "Firing Order", firingOrder + field = "Vehicle Weight", vehicleWeight ; this field is useful for rusEFI online catalog field = "Compression Ratio", compressionRatio ; this field is useful for rusEFI online catalog diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index 47412fcf90..cf9701886f 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.11.22.prometheus_469.3084277783" + signature = "rusEFI 2020.11.25.prometheus_469.1903314015" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.11.22.prometheus_469.3084277783" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.11.25.prometheus_469.1903314015" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 22 23:32:00 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Nov 25 18:21:07 UTC 2020 pageSize = 20000 page = 1 @@ -639,7 +639,9 @@ page = 1 drv8860_cs = bits, U08, 1201, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" drv8860_csPinMode = bits, U08, 1202, [0:1], "default", "default inverted", "open collector", "open collector inverted" drv8860_miso = bits, U08, 1203, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" - unusedAtOldBoardConfigurationEnd = array, S32, 1204, [64], "units", 1.0, 0, -20, 100, 0 + unusedAtOldBoardConfigurationEnd = array, S32, 1204, [63], "units", 1.0, 0, -20, 100, 0 + vehicleWeight = scalar, U16, 1456, "kg", 1.0, 0, 0, 10000, 0 + unusedHereHereHere = scalar, U16, 1458, "ADC", 1.0, 0, 0, 1000, 0 tps2SecondaryMin = scalar, U16, 1460, "ADC", 1.0, 0, 0, 1000, 0 tps2SecondaryMax = scalar, U16, 1462, "ADC", 1.0, 0, 0, 1000, 0 unusedHereWeHave = bits, U32, 1464, [0:0], "false", "true" @@ -839,30 +841,30 @@ page = 1 unused1128 = bits, U32, 2116, [5:5], "false", "true" unused1129 = bits, U32, 2116, [6:6], "false", "true" unused1130 = bits, U32, 2116, [7:7], "false", "true" - unusedBit_486_8 = bits, U32, 2116, [8:8], "false", "true" - unusedBit_486_9 = bits, U32, 2116, [9:9], "false", "true" - unusedBit_486_10 = bits, U32, 2116, [10:10], "false", "true" - unusedBit_486_11 = bits, U32, 2116, [11:11], "false", "true" - unusedBit_486_12 = bits, U32, 2116, [12:12], "false", "true" - unusedBit_486_13 = bits, U32, 2116, [13:13], "false", "true" - unusedBit_486_14 = bits, U32, 2116, [14:14], "false", "true" - unusedBit_486_15 = bits, U32, 2116, [15:15], "false", "true" - unusedBit_486_16 = bits, U32, 2116, [16:16], "false", "true" - unusedBit_486_17 = bits, U32, 2116, [17:17], "false", "true" - unusedBit_486_18 = bits, U32, 2116, [18:18], "false", "true" - unusedBit_486_19 = bits, U32, 2116, [19:19], "false", "true" - unusedBit_486_20 = bits, U32, 2116, [20:20], "false", "true" - unusedBit_486_21 = bits, U32, 2116, [21:21], "false", "true" - unusedBit_486_22 = bits, U32, 2116, [22:22], "false", "true" - unusedBit_486_23 = bits, U32, 2116, [23:23], "false", "true" - unusedBit_486_24 = bits, U32, 2116, [24:24], "false", "true" - unusedBit_486_25 = bits, U32, 2116, [25:25], "false", "true" - unusedBit_486_26 = bits, U32, 2116, [26:26], "false", "true" - unusedBit_486_27 = bits, U32, 2116, [27:27], "false", "true" - unusedBit_486_28 = bits, U32, 2116, [28:28], "false", "true" - unusedBit_486_29 = bits, U32, 2116, [29:29], "false", "true" - unusedBit_486_30 = bits, U32, 2116, [30:30], "false", "true" - unusedBit_486_31 = bits, U32, 2116, [31:31], "false", "true" + unusedBit_488_8 = bits, U32, 2116, [8:8], "false", "true" + unusedBit_488_9 = bits, U32, 2116, [9:9], "false", "true" + unusedBit_488_10 = bits, U32, 2116, [10:10], "false", "true" + unusedBit_488_11 = bits, U32, 2116, [11:11], "false", "true" + unusedBit_488_12 = bits, U32, 2116, [12:12], "false", "true" + unusedBit_488_13 = bits, U32, 2116, [13:13], "false", "true" + unusedBit_488_14 = bits, U32, 2116, [14:14], "false", "true" + unusedBit_488_15 = bits, U32, 2116, [15:15], "false", "true" + unusedBit_488_16 = bits, U32, 2116, [16:16], "false", "true" + unusedBit_488_17 = bits, U32, 2116, [17:17], "false", "true" + unusedBit_488_18 = bits, U32, 2116, [18:18], "false", "true" + unusedBit_488_19 = bits, U32, 2116, [19:19], "false", "true" + unusedBit_488_20 = bits, U32, 2116, [20:20], "false", "true" + unusedBit_488_21 = bits, U32, 2116, [21:21], "false", "true" + unusedBit_488_22 = bits, U32, 2116, [22:22], "false", "true" + unusedBit_488_23 = bits, U32, 2116, [23:23], "false", "true" + unusedBit_488_24 = bits, U32, 2116, [24:24], "false", "true" + unusedBit_488_25 = bits, U32, 2116, [25:25], "false", "true" + unusedBit_488_26 = bits, U32, 2116, [26:26], "false", "true" + unusedBit_488_27 = bits, U32, 2116, [27:27], "false", "true" + unusedBit_488_28 = bits, U32, 2116, [28:28], "false", "true" + unusedBit_488_29 = bits, U32, 2116, [29:29], "false", "true" + unusedBit_488_30 = bits, U32, 2116, [30:30], "false", "true" + unusedBit_488_31 = bits, U32, 2116, [31:31], "false", "true" can2NbcType = bits, U32, 2120, [0:3], "None", "FIAT", "VAG" , "MAZDA RX8", "BMW", "W202", "BMW E90", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2TxPin = bits, U08, 2124, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2RxPin = bits, U08, 2125, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -3092,6 +3094,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Number of Cylinders", cylindersCount field = "Engine Displacement", displacement field = "Firing Order", firingOrder + field = "Vehicle Weight", vehicleWeight ; this field is useful for rusEFI online catalog field = "Compression Ratio", compressionRatio ; this field is useful for rusEFI online catalog diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index 3e6d2199df..088829c843 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.11.22.proteus_f4.1017386136" + signature = "rusEFI 2020.11.25.proteus_f4.4194306256" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.11.22.proteus_f4.1017386136" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.11.25.proteus_f4.4194306256" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 22 23:32:05 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Nov 25 18:21:13 UTC 2020 pageSize = 20000 page = 1 @@ -639,7 +639,9 @@ page = 1 drv8860_cs = bits, U08, 1201, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" drv8860_csPinMode = bits, U08, 1202, [0:1], "default", "default inverted", "open collector", "open collector inverted" drv8860_miso = bits, U08, 1203, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" - unusedAtOldBoardConfigurationEnd = array, S32, 1204, [64], "units", 1.0, 0, -20, 100, 0 + unusedAtOldBoardConfigurationEnd = array, S32, 1204, [63], "units", 1.0, 0, -20, 100, 0 + vehicleWeight = scalar, U16, 1456, "kg", 1.0, 0, 0, 10000, 0 + unusedHereHereHere = scalar, U16, 1458, "ADC", 1.0, 0, 0, 1000, 0 tps2SecondaryMin = scalar, U16, 1460, "ADC", 1.0, 0, 0, 1000, 0 tps2SecondaryMax = scalar, U16, 1462, "ADC", 1.0, 0, 0, 1000, 0 unusedHereWeHave = bits, U32, 1464, [0:0], "false", "true" @@ -839,30 +841,30 @@ page = 1 unused1128 = bits, U32, 2116, [5:5], "false", "true" unused1129 = bits, U32, 2116, [6:6], "false", "true" unused1130 = bits, U32, 2116, [7:7], "false", "true" - unusedBit_486_8 = bits, U32, 2116, [8:8], "false", "true" - unusedBit_486_9 = bits, U32, 2116, [9:9], "false", "true" - unusedBit_486_10 = bits, U32, 2116, [10:10], "false", "true" - unusedBit_486_11 = bits, U32, 2116, [11:11], "false", "true" - unusedBit_486_12 = bits, U32, 2116, [12:12], "false", "true" - unusedBit_486_13 = bits, U32, 2116, [13:13], "false", "true" - unusedBit_486_14 = bits, U32, 2116, [14:14], "false", "true" - unusedBit_486_15 = bits, U32, 2116, [15:15], "false", "true" - unusedBit_486_16 = bits, U32, 2116, [16:16], "false", "true" - unusedBit_486_17 = bits, U32, 2116, [17:17], "false", "true" - unusedBit_486_18 = bits, U32, 2116, [18:18], "false", "true" - unusedBit_486_19 = bits, U32, 2116, [19:19], "false", "true" - unusedBit_486_20 = bits, U32, 2116, [20:20], "false", "true" - unusedBit_486_21 = bits, U32, 2116, [21:21], "false", "true" - unusedBit_486_22 = bits, U32, 2116, [22:22], "false", "true" - unusedBit_486_23 = bits, U32, 2116, [23:23], "false", "true" - unusedBit_486_24 = bits, U32, 2116, [24:24], "false", "true" - unusedBit_486_25 = bits, U32, 2116, [25:25], "false", "true" - unusedBit_486_26 = bits, U32, 2116, [26:26], "false", "true" - unusedBit_486_27 = bits, U32, 2116, [27:27], "false", "true" - unusedBit_486_28 = bits, U32, 2116, [28:28], "false", "true" - unusedBit_486_29 = bits, U32, 2116, [29:29], "false", "true" - unusedBit_486_30 = bits, U32, 2116, [30:30], "false", "true" - unusedBit_486_31 = bits, U32, 2116, [31:31], "false", "true" + unusedBit_488_8 = bits, U32, 2116, [8:8], "false", "true" + unusedBit_488_9 = bits, U32, 2116, [9:9], "false", "true" + unusedBit_488_10 = bits, U32, 2116, [10:10], "false", "true" + unusedBit_488_11 = bits, U32, 2116, [11:11], "false", "true" + unusedBit_488_12 = bits, U32, 2116, [12:12], "false", "true" + unusedBit_488_13 = bits, U32, 2116, [13:13], "false", "true" + unusedBit_488_14 = bits, U32, 2116, [14:14], "false", "true" + unusedBit_488_15 = bits, U32, 2116, [15:15], "false", "true" + unusedBit_488_16 = bits, U32, 2116, [16:16], "false", "true" + unusedBit_488_17 = bits, U32, 2116, [17:17], "false", "true" + unusedBit_488_18 = bits, U32, 2116, [18:18], "false", "true" + unusedBit_488_19 = bits, U32, 2116, [19:19], "false", "true" + unusedBit_488_20 = bits, U32, 2116, [20:20], "false", "true" + unusedBit_488_21 = bits, U32, 2116, [21:21], "false", "true" + unusedBit_488_22 = bits, U32, 2116, [22:22], "false", "true" + unusedBit_488_23 = bits, U32, 2116, [23:23], "false", "true" + unusedBit_488_24 = bits, U32, 2116, [24:24], "false", "true" + unusedBit_488_25 = bits, U32, 2116, [25:25], "false", "true" + unusedBit_488_26 = bits, U32, 2116, [26:26], "false", "true" + unusedBit_488_27 = bits, U32, 2116, [27:27], "false", "true" + unusedBit_488_28 = bits, U32, 2116, [28:28], "false", "true" + unusedBit_488_29 = bits, U32, 2116, [29:29], "false", "true" + unusedBit_488_30 = bits, U32, 2116, [30:30], "false", "true" + unusedBit_488_31 = bits, U32, 2116, [31:31], "false", "true" can2NbcType = bits, U32, 2120, [0:3], "None", "FIAT", "VAG" , "MAZDA RX8", "BMW", "W202", "BMW E90", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2TxPin = bits, U08, 2124, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2RxPin = bits, U08, 2125, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -3088,6 +3090,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Number of Cylinders", cylindersCount field = "Engine Displacement", displacement field = "Firing Order", firingOrder + field = "Vehicle Weight", vehicleWeight ; this field is useful for rusEFI online catalog field = "Compression Ratio", compressionRatio ; this field is useful for rusEFI online catalog diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index dc3c64b993..d850b02fce 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.11.22.proteus_f7.1017386136" + signature = "rusEFI 2020.11.25.proteus_f7.4194306256" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.11.22.proteus_f7.1017386136" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.11.25.proteus_f7.4194306256" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 22 23:32:03 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Nov 25 18:21:10 UTC 2020 pageSize = 20000 page = 1 @@ -639,7 +639,9 @@ page = 1 drv8860_cs = bits, U08, 1201, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" drv8860_csPinMode = bits, U08, 1202, [0:1], "default", "default inverted", "open collector", "open collector inverted" drv8860_miso = bits, U08, 1203, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" - unusedAtOldBoardConfigurationEnd = array, S32, 1204, [64], "units", 1.0, 0, -20, 100, 0 + unusedAtOldBoardConfigurationEnd = array, S32, 1204, [63], "units", 1.0, 0, -20, 100, 0 + vehicleWeight = scalar, U16, 1456, "kg", 1.0, 0, 0, 10000, 0 + unusedHereHereHere = scalar, U16, 1458, "ADC", 1.0, 0, 0, 1000, 0 tps2SecondaryMin = scalar, U16, 1460, "ADC", 1.0, 0, 0, 1000, 0 tps2SecondaryMax = scalar, U16, 1462, "ADC", 1.0, 0, 0, 1000, 0 unusedHereWeHave = bits, U32, 1464, [0:0], "false", "true" @@ -839,30 +841,30 @@ page = 1 unused1128 = bits, U32, 2116, [5:5], "false", "true" unused1129 = bits, U32, 2116, [6:6], "false", "true" unused1130 = bits, U32, 2116, [7:7], "false", "true" - unusedBit_486_8 = bits, U32, 2116, [8:8], "false", "true" - unusedBit_486_9 = bits, U32, 2116, [9:9], "false", "true" - unusedBit_486_10 = bits, U32, 2116, [10:10], "false", "true" - unusedBit_486_11 = bits, U32, 2116, [11:11], "false", "true" - unusedBit_486_12 = bits, U32, 2116, [12:12], "false", "true" - unusedBit_486_13 = bits, U32, 2116, [13:13], "false", "true" - unusedBit_486_14 = bits, U32, 2116, [14:14], "false", "true" - unusedBit_486_15 = bits, U32, 2116, [15:15], "false", "true" - unusedBit_486_16 = bits, U32, 2116, [16:16], "false", "true" - unusedBit_486_17 = bits, U32, 2116, [17:17], "false", "true" - unusedBit_486_18 = bits, U32, 2116, [18:18], "false", "true" - unusedBit_486_19 = bits, U32, 2116, [19:19], "false", "true" - unusedBit_486_20 = bits, U32, 2116, [20:20], "false", "true" - unusedBit_486_21 = bits, U32, 2116, [21:21], "false", "true" - unusedBit_486_22 = bits, U32, 2116, [22:22], "false", "true" - unusedBit_486_23 = bits, U32, 2116, [23:23], "false", "true" - unusedBit_486_24 = bits, U32, 2116, [24:24], "false", "true" - unusedBit_486_25 = bits, U32, 2116, [25:25], "false", "true" - unusedBit_486_26 = bits, U32, 2116, [26:26], "false", "true" - unusedBit_486_27 = bits, U32, 2116, [27:27], "false", "true" - unusedBit_486_28 = bits, U32, 2116, [28:28], "false", "true" - unusedBit_486_29 = bits, U32, 2116, [29:29], "false", "true" - unusedBit_486_30 = bits, U32, 2116, [30:30], "false", "true" - unusedBit_486_31 = bits, U32, 2116, [31:31], "false", "true" + unusedBit_488_8 = bits, U32, 2116, [8:8], "false", "true" + unusedBit_488_9 = bits, U32, 2116, [9:9], "false", "true" + unusedBit_488_10 = bits, U32, 2116, [10:10], "false", "true" + unusedBit_488_11 = bits, U32, 2116, [11:11], "false", "true" + unusedBit_488_12 = bits, U32, 2116, [12:12], "false", "true" + unusedBit_488_13 = bits, U32, 2116, [13:13], "false", "true" + unusedBit_488_14 = bits, U32, 2116, [14:14], "false", "true" + unusedBit_488_15 = bits, U32, 2116, [15:15], "false", "true" + unusedBit_488_16 = bits, U32, 2116, [16:16], "false", "true" + unusedBit_488_17 = bits, U32, 2116, [17:17], "false", "true" + unusedBit_488_18 = bits, U32, 2116, [18:18], "false", "true" + unusedBit_488_19 = bits, U32, 2116, [19:19], "false", "true" + unusedBit_488_20 = bits, U32, 2116, [20:20], "false", "true" + unusedBit_488_21 = bits, U32, 2116, [21:21], "false", "true" + unusedBit_488_22 = bits, U32, 2116, [22:22], "false", "true" + unusedBit_488_23 = bits, U32, 2116, [23:23], "false", "true" + unusedBit_488_24 = bits, U32, 2116, [24:24], "false", "true" + unusedBit_488_25 = bits, U32, 2116, [25:25], "false", "true" + unusedBit_488_26 = bits, U32, 2116, [26:26], "false", "true" + unusedBit_488_27 = bits, U32, 2116, [27:27], "false", "true" + unusedBit_488_28 = bits, U32, 2116, [28:28], "false", "true" + unusedBit_488_29 = bits, U32, 2116, [29:29], "false", "true" + unusedBit_488_30 = bits, U32, 2116, [30:30], "false", "true" + unusedBit_488_31 = bits, U32, 2116, [31:31], "false", "true" can2NbcType = bits, U32, 2120, [0:3], "None", "FIAT", "VAG" , "MAZDA RX8", "BMW", "W202", "BMW E90", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2TxPin = bits, U08, 2124, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2RxPin = bits, U08, 2125, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -3088,6 +3090,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Number of Cylinders", cylindersCount field = "Engine Displacement", displacement field = "Firing Order", firingOrder + field = "Vehicle Weight", vehicleWeight ; this field is useful for rusEFI online catalog field = "Compression Ratio", compressionRatio ; this field is useful for rusEFI online catalog 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 47e019df17..772b9d8e2a 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 22 23:31:54 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Nov 25 18:20:57 UTC 2020 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -1165,6 +1165,7 @@ 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 = 866796046; public static final int silentTriggerError_offset = 1464; public static final int slowAdcAlpha_offset = 2088; public static final int sparkDwellRpmBins_offset = 332; @@ -1444,7 +1445,7 @@ public class Fields { public static final char TS_SD_R_COMMAND = 'r'; public static final char TS_SD_W_COMMAND = 'w'; public static final char TS_SET_LOGGER_SWITCH = 'l'; - public static final String TS_SIGNATURE = "rusEFI 2020.11.22.all.4111359558"; + public static final String TS_SIGNATURE = "rusEFI 2020.11.25.all.866796046"; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final int TT_TT_60_2_VW = 20; public static final int TT_TT_ONE = 18; @@ -1499,31 +1500,32 @@ public class Fields { public static final int unusedBit_288_30_offset = 976; public static final int unusedBit_288_31_offset = 976; public static final int unusedBit_34_31_offset = 76; - public static final int unusedBit_486_10_offset = 2116; - public static final int unusedBit_486_11_offset = 2116; - public static final int unusedBit_486_12_offset = 2116; - public static final int unusedBit_486_13_offset = 2116; - public static final int unusedBit_486_14_offset = 2116; - public static final int unusedBit_486_15_offset = 2116; - public static final int unusedBit_486_16_offset = 2116; - public static final int unusedBit_486_17_offset = 2116; - public static final int unusedBit_486_18_offset = 2116; - public static final int unusedBit_486_19_offset = 2116; - public static final int unusedBit_486_20_offset = 2116; - public static final int unusedBit_486_21_offset = 2116; - public static final int unusedBit_486_22_offset = 2116; - public static final int unusedBit_486_23_offset = 2116; - public static final int unusedBit_486_24_offset = 2116; - public static final int unusedBit_486_25_offset = 2116; - public static final int unusedBit_486_26_offset = 2116; - public static final int unusedBit_486_27_offset = 2116; - public static final int unusedBit_486_28_offset = 2116; - public static final int unusedBit_486_29_offset = 2116; - public static final int unusedBit_486_30_offset = 2116; - public static final int unusedBit_486_31_offset = 2116; - public static final int unusedBit_486_8_offset = 2116; - public static final int unusedBit_486_9_offset = 2116; + public static final int unusedBit_488_10_offset = 2116; + public static final int unusedBit_488_11_offset = 2116; + public static final int unusedBit_488_12_offset = 2116; + public static final int unusedBit_488_13_offset = 2116; + public static final int unusedBit_488_14_offset = 2116; + public static final int unusedBit_488_15_offset = 2116; + public static final int unusedBit_488_16_offset = 2116; + public static final int unusedBit_488_17_offset = 2116; + public static final int unusedBit_488_18_offset = 2116; + public static final int unusedBit_488_19_offset = 2116; + public static final int unusedBit_488_20_offset = 2116; + public static final int unusedBit_488_21_offset = 2116; + public static final int unusedBit_488_22_offset = 2116; + public static final int unusedBit_488_23_offset = 2116; + public static final int unusedBit_488_24_offset = 2116; + public static final int unusedBit_488_25_offset = 2116; + public static final int unusedBit_488_26_offset = 2116; + public static final int unusedBit_488_27_offset = 2116; + public static final int unusedBit_488_28_offset = 2116; + public static final int unusedBit_488_29_offset = 2116; + public static final int unusedBit_488_30_offset = 2116; + public static final int unusedBit_488_31_offset = 2116; + public static final int unusedBit_488_8_offset = 2116; + public static final int unusedBit_488_9_offset = 2116; public static final int unusedFlexFuelSensor_offset = 3100; + public static final int unusedHereHereHere_offset = 1458; public static final int unusedHereWeHave_offset = 1464; public static final int unusedOldBiquad_offset = 2332; public static final int unusedSpiPadding4_offset = 2593; @@ -1574,6 +1576,7 @@ public class Fields { public static final int vehicleName_offset = 1160; public static final int vehicleSpeedCoef_offset = 476; public static final int vehicleSpeedSensorInputPin_offset = 968; + public static final int vehicleWeight_offset = 1456; public static final int veLoadBins_offset = 18464; public static final int veOverrideMode_offset = 2109; public static final int verboseCan2BaseAddress_offset = 2112; @@ -2157,6 +2160,8 @@ public class Fields { public static final Field DRV8860_CS = Field.create("DRV8860_CS", 1201, FieldType.INT8, brain_pin_e); public static final Field DRV8860_CSPINMODE = Field.create("DRV8860_CSPINMODE", 1202, FieldType.INT8, pin_output_mode_e); public static final Field DRV8860_MISO = Field.create("DRV8860_MISO", 1203, FieldType.INT8, brain_pin_e); + public static final Field VEHICLEWEIGHT = Field.create("VEHICLEWEIGHT", 1456, FieldType.INT16); + public static final Field UNUSEDHEREHEREHERE = Field.create("UNUSEDHEREHEREHERE", 1458, FieldType.INT16); public static final Field TPS2SECONDARYMIN = Field.create("TPS2SECONDARYMIN", 1460, FieldType.INT16); public static final Field TPS2SECONDARYMAX = Field.create("TPS2SECONDARYMAX", 1462, FieldType.INT16); public static final Field UNUSEDHEREWEHAVE = Field.create("UNUSEDHEREWEHAVE", 1464, FieldType.BIT, 0); @@ -2352,30 +2357,30 @@ public class Fields { public static final Field UNUSED1128 = Field.create("UNUSED1128", 2116, FieldType.BIT, 5); public static final Field UNUSED1129 = Field.create("UNUSED1129", 2116, FieldType.BIT, 6); public static final Field UNUSED1130 = Field.create("UNUSED1130", 2116, FieldType.BIT, 7); - public static final Field UNUSEDBIT_486_8 = Field.create("UNUSEDBIT_486_8", 2116, FieldType.BIT, 8); - public static final Field UNUSEDBIT_486_9 = Field.create("UNUSEDBIT_486_9", 2116, FieldType.BIT, 9); - public static final Field UNUSEDBIT_486_10 = Field.create("UNUSEDBIT_486_10", 2116, FieldType.BIT, 10); - public static final Field UNUSEDBIT_486_11 = Field.create("UNUSEDBIT_486_11", 2116, FieldType.BIT, 11); - public static final Field UNUSEDBIT_486_12 = Field.create("UNUSEDBIT_486_12", 2116, FieldType.BIT, 12); - public static final Field UNUSEDBIT_486_13 = Field.create("UNUSEDBIT_486_13", 2116, FieldType.BIT, 13); - public static final Field UNUSEDBIT_486_14 = Field.create("UNUSEDBIT_486_14", 2116, FieldType.BIT, 14); - public static final Field UNUSEDBIT_486_15 = Field.create("UNUSEDBIT_486_15", 2116, FieldType.BIT, 15); - public static final Field UNUSEDBIT_486_16 = Field.create("UNUSEDBIT_486_16", 2116, FieldType.BIT, 16); - public static final Field UNUSEDBIT_486_17 = Field.create("UNUSEDBIT_486_17", 2116, FieldType.BIT, 17); - public static final Field UNUSEDBIT_486_18 = Field.create("UNUSEDBIT_486_18", 2116, FieldType.BIT, 18); - public static final Field UNUSEDBIT_486_19 = Field.create("UNUSEDBIT_486_19", 2116, FieldType.BIT, 19); - public static final Field UNUSEDBIT_486_20 = Field.create("UNUSEDBIT_486_20", 2116, FieldType.BIT, 20); - public static final Field UNUSEDBIT_486_21 = Field.create("UNUSEDBIT_486_21", 2116, FieldType.BIT, 21); - public static final Field UNUSEDBIT_486_22 = Field.create("UNUSEDBIT_486_22", 2116, FieldType.BIT, 22); - public static final Field UNUSEDBIT_486_23 = Field.create("UNUSEDBIT_486_23", 2116, FieldType.BIT, 23); - public static final Field UNUSEDBIT_486_24 = Field.create("UNUSEDBIT_486_24", 2116, FieldType.BIT, 24); - public static final Field UNUSEDBIT_486_25 = Field.create("UNUSEDBIT_486_25", 2116, FieldType.BIT, 25); - public static final Field UNUSEDBIT_486_26 = Field.create("UNUSEDBIT_486_26", 2116, FieldType.BIT, 26); - public static final Field UNUSEDBIT_486_27 = Field.create("UNUSEDBIT_486_27", 2116, FieldType.BIT, 27); - public static final Field UNUSEDBIT_486_28 = Field.create("UNUSEDBIT_486_28", 2116, FieldType.BIT, 28); - public static final Field UNUSEDBIT_486_29 = Field.create("UNUSEDBIT_486_29", 2116, FieldType.BIT, 29); - public static final Field UNUSEDBIT_486_30 = Field.create("UNUSEDBIT_486_30", 2116, FieldType.BIT, 30); - public static final Field UNUSEDBIT_486_31 = Field.create("UNUSEDBIT_486_31", 2116, FieldType.BIT, 31); + public static final Field UNUSEDBIT_488_8 = Field.create("UNUSEDBIT_488_8", 2116, FieldType.BIT, 8); + public static final Field UNUSEDBIT_488_9 = Field.create("UNUSEDBIT_488_9", 2116, FieldType.BIT, 9); + public static final Field UNUSEDBIT_488_10 = Field.create("UNUSEDBIT_488_10", 2116, FieldType.BIT, 10); + public static final Field UNUSEDBIT_488_11 = Field.create("UNUSEDBIT_488_11", 2116, FieldType.BIT, 11); + public static final Field UNUSEDBIT_488_12 = Field.create("UNUSEDBIT_488_12", 2116, FieldType.BIT, 12); + public static final Field UNUSEDBIT_488_13 = Field.create("UNUSEDBIT_488_13", 2116, FieldType.BIT, 13); + public static final Field UNUSEDBIT_488_14 = Field.create("UNUSEDBIT_488_14", 2116, FieldType.BIT, 14); + public static final Field UNUSEDBIT_488_15 = Field.create("UNUSEDBIT_488_15", 2116, FieldType.BIT, 15); + public static final Field UNUSEDBIT_488_16 = Field.create("UNUSEDBIT_488_16", 2116, FieldType.BIT, 16); + public static final Field UNUSEDBIT_488_17 = Field.create("UNUSEDBIT_488_17", 2116, FieldType.BIT, 17); + public static final Field UNUSEDBIT_488_18 = Field.create("UNUSEDBIT_488_18", 2116, FieldType.BIT, 18); + public static final Field UNUSEDBIT_488_19 = Field.create("UNUSEDBIT_488_19", 2116, FieldType.BIT, 19); + public static final Field UNUSEDBIT_488_20 = Field.create("UNUSEDBIT_488_20", 2116, FieldType.BIT, 20); + public static final Field UNUSEDBIT_488_21 = Field.create("UNUSEDBIT_488_21", 2116, FieldType.BIT, 21); + public static final Field UNUSEDBIT_488_22 = Field.create("UNUSEDBIT_488_22", 2116, FieldType.BIT, 22); + public static final Field UNUSEDBIT_488_23 = Field.create("UNUSEDBIT_488_23", 2116, FieldType.BIT, 23); + public static final Field UNUSEDBIT_488_24 = Field.create("UNUSEDBIT_488_24", 2116, FieldType.BIT, 24); + public static final Field UNUSEDBIT_488_25 = Field.create("UNUSEDBIT_488_25", 2116, FieldType.BIT, 25); + public static final Field UNUSEDBIT_488_26 = Field.create("UNUSEDBIT_488_26", 2116, FieldType.BIT, 26); + public static final Field UNUSEDBIT_488_27 = Field.create("UNUSEDBIT_488_27", 2116, FieldType.BIT, 27); + public static final Field UNUSEDBIT_488_28 = Field.create("UNUSEDBIT_488_28", 2116, FieldType.BIT, 28); + public static final Field UNUSEDBIT_488_29 = Field.create("UNUSEDBIT_488_29", 2116, FieldType.BIT, 29); + public static final Field UNUSEDBIT_488_30 = Field.create("UNUSEDBIT_488_30", 2116, FieldType.BIT, 30); + public static final Field UNUSEDBIT_488_31 = Field.create("UNUSEDBIT_488_31", 2116, FieldType.BIT, 31); public static final Field CAN2NBCTYPE = Field.create("CAN2NBCTYPE", 2120, FieldType.INT); public static final Field CAN2TXPIN = Field.create("CAN2TXPIN", 2124, FieldType.INT8, brain_pin_e); public static final Field CAN2RXPIN = Field.create("CAN2RXPIN", 2125, FieldType.INT8, brain_pin_e); @@ -3226,6 +3231,8 @@ public class Fields { DRV8860_CS, DRV8860_CSPINMODE, DRV8860_MISO, + VEHICLEWEIGHT, + UNUSEDHEREHEREHERE, TPS2SECONDARYMIN, TPS2SECONDARYMAX, UNUSEDHEREWEHAVE, @@ -3417,30 +3424,30 @@ public class Fields { UNUSED1128, UNUSED1129, UNUSED1130, - UNUSEDBIT_486_8, - UNUSEDBIT_486_9, - UNUSEDBIT_486_10, - UNUSEDBIT_486_11, - UNUSEDBIT_486_12, - UNUSEDBIT_486_13, - UNUSEDBIT_486_14, - UNUSEDBIT_486_15, - UNUSEDBIT_486_16, - UNUSEDBIT_486_17, - UNUSEDBIT_486_18, - UNUSEDBIT_486_19, - UNUSEDBIT_486_20, - UNUSEDBIT_486_21, - UNUSEDBIT_486_22, - UNUSEDBIT_486_23, - UNUSEDBIT_486_24, - UNUSEDBIT_486_25, - UNUSEDBIT_486_26, - UNUSEDBIT_486_27, - UNUSEDBIT_486_28, - UNUSEDBIT_486_29, - UNUSEDBIT_486_30, - UNUSEDBIT_486_31, + UNUSEDBIT_488_8, + UNUSEDBIT_488_9, + UNUSEDBIT_488_10, + UNUSEDBIT_488_11, + UNUSEDBIT_488_12, + UNUSEDBIT_488_13, + UNUSEDBIT_488_14, + UNUSEDBIT_488_15, + UNUSEDBIT_488_16, + UNUSEDBIT_488_17, + UNUSEDBIT_488_18, + UNUSEDBIT_488_19, + UNUSEDBIT_488_20, + UNUSEDBIT_488_21, + UNUSEDBIT_488_22, + UNUSEDBIT_488_23, + UNUSEDBIT_488_24, + UNUSEDBIT_488_25, + UNUSEDBIT_488_26, + UNUSEDBIT_488_27, + UNUSEDBIT_488_28, + UNUSEDBIT_488_29, + UNUSEDBIT_488_30, + UNUSEDBIT_488_31, CAN2NBCTYPE, CAN2TXPIN, CAN2RXPIN, diff --git a/java_console/rusefi.xml b/java_console/rusefi.xml index be68e2009e..49f20d0d12 100644 --- a/java_console/rusefi.xml +++ b/java_console/rusefi.xml @@ -1,6 +1,6 @@ - +