From cc3c6f1b34e7e5c7d88d28f24c53bc738f7070ec Mon Sep 17 00:00:00 2001 From: rusefi Date: Sun, 19 Apr 2020 18:32:24 -0400 Subject: [PATCH] Fresh generated - auto --- ...ngine_configuration_generated_structures.h | 27 ++++++++---- .../controllers/algo/rusefi_generated.h | 29 +++++++------ ...ngine_configuration_generated_structures.h | 15 ++++--- .../controllers/generated/rusefi_generated.h | 10 +++-- firmware/tunerstudio/rusefi.ini | 22 ++++++---- firmware/tunerstudio/rusefi_frankenso.ini | 22 ++++++---- firmware/tunerstudio/rusefi_kinetis.ini | 42 +++++++++++++------ firmware/tunerstudio/rusefi_microrusefi.ini | 22 ++++++---- firmware/tunerstudio/rusefi_prometheus.ini | 22 ++++++---- firmware/tunerstudio/rusefi_proteus.ini | 22 ++++++---- .../com/rusefi/config/generated/Fields.java | 16 ++++--- 11 files changed, 167 insertions(+), 82 deletions(-) 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 0c3a309a27..521da0851f 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 kineris_gen_config.bat integration/rusefi_config.txt Sat Apr 18 11:22:09 EDT 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Sun Apr 19 18:32:08 EDT 2020 // by class com.rusefi.output.CHeaderConsumer // begin #ifndef CONFIG_BOARDS_KINETIS_CONFIG_CONTROLLERS_ALGO_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H @@ -1672,10 +1672,10 @@ struct engine_configuration_s { bool launchDisableBySpeed : 1; /** offset 976 bit 7 */ - bool unusedBit_251_7 : 1; + bool enableCanVss : 1; /** offset 976 bit 8 */ - bool unusedBit_251_8 : 1; + bool enableInnovateLC2 : 1; /** offset 976 bit 9 */ bool unusedBit_251_9 : 1; @@ -2369,17 +2369,19 @@ struct engine_configuration_s { */ int16_t iacByTpsTaper; /** + * set_aux_tx_pin X * offset 2040 */ - brain_pin_e unusedErrorPin; + brain_pin_e auxSerialTxPin; /** * offset 2041 */ brain_pin_e warningLedPin; /** + * set_aux_rx_pin X * offset 2042 */ - brain_pin_e unused1234234; + brain_pin_e auxSerialRxPin; /** * offset 2043 */ @@ -2447,7 +2449,11 @@ struct engine_configuration_s { /** * offset 2096 */ - uint32_t unused_former_warmup_target_afr[9]; + uint32_t auxSerialSpeed; + /** + * offset 2100 + */ + uint32_t unused_former_warmup_target_afr[8]; /** * kPa value at which we need to cut fuel and spark, 0 if not enabled * offset 2132 @@ -3035,9 +3041,14 @@ struct engine_configuration_s { */ uint8_t iacPidMultRpmBins[IAC_PID_MULT_SIZE]; /** + * set can_vss X * offset 4140 */ - int mainUnusedEnd[465]; + can_vss_nbc_e canVssNbcType; + /** + * offset 4144 + */ + int mainUnusedEnd[464]; /** total size 6000*/ }; @@ -3340,4 +3351,4 @@ typedef struct persistent_config_s persistent_config_s; #endif // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Sat Apr 18 11:22:09 EDT 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Sun Apr 19 18:32:08 EDT 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 f6a2e07e6b..526fe94ce0 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -201,6 +201,12 @@ #define auxPidPins3_offset_hex 8ae #define auxPidPins4_offset 2223 #define auxPidPins4_offset_hex 8af +#define auxSerialRxPin_offset 2042 +#define auxSerialRxPin_offset_hex 7fa +#define auxSerialSpeed_offset 2096 +#define auxSerialSpeed_offset_hex 830 +#define auxSerialTxPin_offset 2040 +#define auxSerialTxPin_offset_hex 7f8 #define auxTempSensor1_adcChannel_offset 2472 #define auxTempSensor1_adcChannel_offset_hex 9a8 #define auxTempSensor1_alignmentFill_at_29_offset 2473 @@ -339,6 +345,8 @@ #define canSleepPeriodMs_offset_hex 1e4 #define canTxPin_offset 708 #define canTxPin_offset_hex 2c4 +#define canVssNbcType_offset 4140 +#define canVssNbcType_offset_hex 102c #define canWriteEnabled_offset 1464 #define canWriteEnabled_offset_hex 5b8 #define cdmInputPin_offset 937 @@ -542,8 +550,12 @@ #define electronicThrottlePin1Mode_offset_hex 2a0 #define enableAemXSeries_offset 744 #define enableAemXSeries_offset_hex 2e8 +#define enableCanVss_offset 976 +#define enableCanVss_offset_hex 3d0 #define enabledStep1Limiter_offset 744 #define enabledStep1Limiter_offset_hex 2e8 +#define enableInnovateLC2_offset 976 +#define enableInnovateLC2_offset_hex 3d0 #define enableLaunchBoost_offset 976 #define enableLaunchBoost_offset_hex 3d0 #define enableLaunchRetard_offset 976 @@ -1511,8 +1523,8 @@ #define mainRelayPin_offset_hex 2c2 #define mainRelayPinMode_offset 752 #define mainRelayPinMode_offset_hex 2f0 -#define mainUnusedEnd_offset 4140 -#define mainUnusedEnd_offset_hex 102c +#define mainUnusedEnd_offset 4144 +#define mainUnusedEnd_offset_hex 1030 #define malfunctionIndicatorPin_offset 660 #define malfunctionIndicatorPin_offset_hex 294 #define malfunctionIndicatorPinMode_offset 661 @@ -2127,6 +2139,7 @@ #define TS_FILE_VERSION 20200310 #define TS_OUTPUT_SIZE 240 #define ts_show_analog_divider true +#define ts_show_auxserial_pins true #define ts_show_can_pins true #define ts_show_cj125 true #define ts_show_egt true @@ -2152,8 +2165,6 @@ #define uartConsoleSerialSpeed_offset_hex 81c #define unused1059_offset 3964 #define unused1059_offset_hex f7c -#define unused1234234_offset 2042 -#define unused1234234_offset_hex 7fa #define unused2432_offset 2432 #define unused2432_offset_hex 980 #define unused_1484_bit_24_offset 1476 @@ -2172,8 +2183,8 @@ #define unused_1484_bit_30_offset_hex 5c4 #define unused_1484_bit_31_offset 1476 #define unused_1484_bit_31_offset_hex 5c4 -#define unused_former_warmup_target_afr_offset 2096 -#define unused_former_warmup_target_afr_offset_hex 830 +#define unused_former_warmup_target_afr_offset 2100 +#define unused_former_warmup_target_afr_offset_hex 834 #define unusedAntilagTimeout_offset 820 #define unusedAntilagTimeout_offset_hex 334 #define unusedAtOldBoardConfigurationEnd_offset 1088 @@ -2220,10 +2231,6 @@ #define unusedBit_251_28_offset_hex 3d0 #define unusedBit_251_29_offset 976 #define unusedBit_251_29_offset_hex 3d0 -#define unusedBit_251_7_offset 976 -#define unusedBit_251_7_offset_hex 3d0 -#define unusedBit_251_8_offset 976 -#define unusedBit_251_8_offset_hex 3d0 #define unusedBit_251_9_offset 976 #define unusedBit_251_9_offset_hex 3d0 #define unusedBit_282_30_offset 976 @@ -2232,8 +2239,6 @@ #define unusedBit_282_31_offset_hex 3d0 #define unusedBit_34_31_offset 76 #define unusedBit_34_31_offset_hex 4c -#define unusedErrorPin_offset 2040 -#define unusedErrorPin_offset_hex 7f8 #define unusedFlexFuelSensor_offset 3100 #define unusedFlexFuelSensor_offset_hex c1c #define unusedHere_offset 761 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index 6eb6ade95e..7532d657d3 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.bat integration\rusefi_config.txt Sun Apr 19 15:46:36 EDT 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sun Apr 19 18:31:50 EDT 2020 // by class com.rusefi.output.CHeaderConsumer // begin #ifndef CONTROLLERS_GENERATED_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H @@ -1672,10 +1672,10 @@ struct engine_configuration_s { bool launchDisableBySpeed : 1; /** offset 976 bit 7 */ - bool enableInnovateLC2 : 1; + bool enableCanVss : 1; /** offset 976 bit 8 */ - bool unusedBit_251_8 : 1; + bool enableInnovateLC2 : 1; /** offset 976 bit 9 */ bool unusedBit_251_9 : 1; @@ -3041,9 +3041,14 @@ struct engine_configuration_s { */ uint8_t iacPidMultRpmBins[IAC_PID_MULT_SIZE]; /** + * set can_vss X * offset 4140 */ - int mainUnusedEnd[465]; + can_vss_nbc_e canVssNbcType; + /** + * offset 4144 + */ + int mainUnusedEnd[464]; /** total size 6000*/ }; @@ -3346,4 +3351,4 @@ typedef struct persistent_config_s persistent_config_s; #endif // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sun Apr 19 15:46:36 EDT 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sun Apr 19 18:31:50 EDT 2020 diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index 4523a4dbef..6513332086 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -345,6 +345,8 @@ #define canSleepPeriodMs_offset_hex 1e4 #define canTxPin_offset 708 #define canTxPin_offset_hex 2c4 +#define canVssNbcType_offset 4140 +#define canVssNbcType_offset_hex 102c #define canWriteEnabled_offset 1464 #define canWriteEnabled_offset_hex 5b8 #define cdmInputPin_offset 937 @@ -548,6 +550,8 @@ #define electronicThrottlePin1Mode_offset_hex 2a0 #define enableAemXSeries_offset 744 #define enableAemXSeries_offset_hex 2e8 +#define enableCanVss_offset 976 +#define enableCanVss_offset_hex 3d0 #define enabledStep1Limiter_offset 744 #define enabledStep1Limiter_offset_hex 2e8 #define enableInnovateLC2_offset 976 @@ -1519,8 +1523,8 @@ #define mainRelayPin_offset_hex 2c2 #define mainRelayPinMode_offset 752 #define mainRelayPinMode_offset_hex 2f0 -#define mainUnusedEnd_offset 4140 -#define mainUnusedEnd_offset_hex 102c +#define mainUnusedEnd_offset 4144 +#define mainUnusedEnd_offset_hex 1030 #define malfunctionIndicatorPin_offset 660 #define malfunctionIndicatorPin_offset_hex 294 #define malfunctionIndicatorPinMode_offset 661 @@ -2227,8 +2231,6 @@ #define unusedBit_251_28_offset_hex 3d0 #define unusedBit_251_29_offset 976 #define unusedBit_251_29_offset_hex 3d0 -#define unusedBit_251_8_offset 976 -#define unusedBit_251_8_offset_hex 3d0 #define unusedBit_251_9_offset 976 #define unusedBit_251_9_offset_hex 3d0 #define unusedBit_282_30_offset 976 diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index 809e1b2f4a..e2dc4f5658 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.ini @@ -89,7 +89,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.bat integration\rusefi_config.txt Sun Apr 19 15:46:36 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sun Apr 19 18:31:50 EDT 2020 pageSize = 20000 page = 1 @@ -548,8 +548,8 @@ page = 1 enableLaunchRetard = bits, U32, 976, [4:4], "false", "true" enableLaunchBoost = bits, U32, 976, [5:5], "false", "true" launchDisableBySpeed = bits, U32, 976, [6:6], "false", "true" - enableInnovateLC2 = bits, U32, 976, [7:7], "false", "true" - unusedBit_251_8 = bits, U32, 976, [8:8], "false", "true" + enableCanVss = bits, U32, 976, [7:7], "false", "true" + enableInnovateLC2 = bits, U32, 976, [8:8], "false", "true" unusedBit_251_9 = bits, U32, 976, [9:9], "false", "true" unusedBit_251_10 = bits, U32, 976, [10:10], "false", "true" unusedBit_251_11 = bits, U32, 976, [11:11], "false", "true" @@ -1036,7 +1036,8 @@ page = 1 iacPidMultTable = array, U08, 4060, [8x8],"%", 1, 0, 0, 999, 2 iacPidMultLoadBins = array, U08, 4124, [8], "Load", 1, 0.0, 0, 500.0, 2 iacPidMultRpmBins = array, U08, 4132, [8], "RPM", 50, 0, 0.0, 12000.0, 0 -;no TS info - skipping mainUnusedEnd offset 4140 + canVssNbcType = bits, U32, 4140, [0:7], "BMW_e46", "W202" +;no TS info - skipping mainUnusedEnd offset 4144 critical_error_message = string, ASCII, 6000, 120 afterstartCoolantBins = array, F32, 6120, [8], "C", 1, 0, -100.0, 250.0, 0 afterstartHoldTime = array, F32, 6152, [8], "Seconds", 1, 0, 0, 100, 1 @@ -3529,15 +3530,22 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" panel = alternator panel = startStopDialog - - dialog = speedSensorLeft + dialog = speedSensorAnalog field = "Input pin", vehicleSpeedSensorInputPin field = "revolution to speed mult", vehicleSpeedCoef + dialog = speedSensorCan + field = "Vss Car Type", canVssNbcType, { enableCanVss } + + dialog = speedSensorLeft, "Speed sensor config", yAxis + panel = speedSensorCan, { enableCanVss } + panel = speedSensorAnalog, { enableCanVss == 0 } + field = "Enable CANbus VSS values", enableCanVss, { canReadEnabled } + dialog = speedSensor, "Speed sensor", xAxis panel = speedSensorLeft gauge = VSSGauge - + ; Engine->Other inputs dialog = analogInputSettings, "Analog Input Settings" field = "!ECU reboot needed to apply these settings" diff --git a/firmware/tunerstudio/rusefi_frankenso.ini b/firmware/tunerstudio/rusefi_frankenso.ini index 6ae780c881..fb5e0f8d52 100644 --- a/firmware/tunerstudio/rusefi_frankenso.ini +++ b/firmware/tunerstudio/rusefi_frankenso.ini @@ -89,7 +89,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.bat integration\rusefi_config.txt Sun Apr 19 15:46:47 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sun Apr 19 18:32:00 EDT 2020 pageSize = 20000 page = 1 @@ -548,8 +548,8 @@ page = 1 enableLaunchRetard = bits, U32, 976, [4:4], "false", "true" enableLaunchBoost = bits, U32, 976, [5:5], "false", "true" launchDisableBySpeed = bits, U32, 976, [6:6], "false", "true" - enableInnovateLC2 = bits, U32, 976, [7:7], "false", "true" - unusedBit_251_8 = bits, U32, 976, [8:8], "false", "true" + enableCanVss = bits, U32, 976, [7:7], "false", "true" + enableInnovateLC2 = bits, U32, 976, [8:8], "false", "true" unusedBit_251_9 = bits, U32, 976, [9:9], "false", "true" unusedBit_251_10 = bits, U32, 976, [10:10], "false", "true" unusedBit_251_11 = bits, U32, 976, [11:11], "false", "true" @@ -1036,7 +1036,8 @@ page = 1 iacPidMultTable = array, U08, 4060, [8x8],"%", 1, 0, 0, 999, 2 iacPidMultLoadBins = array, U08, 4124, [8], "Load", 1, 0.0, 0, 500.0, 2 iacPidMultRpmBins = array, U08, 4132, [8], "RPM", 50, 0, 0.0, 12000.0, 0 -;no TS info - skipping mainUnusedEnd offset 4140 + canVssNbcType = bits, U32, 4140, [0:7], "BMW_e46", "W202" +;no TS info - skipping mainUnusedEnd offset 4144 critical_error_message = string, ASCII, 6000, 120 afterstartCoolantBins = array, F32, 6120, [8], "C", 1, 0, -100.0, 250.0, 0 afterstartHoldTime = array, F32, 6152, [8], "Seconds", 1, 0, 0, 100, 1 @@ -3529,15 +3530,22 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" panel = alternator panel = startStopDialog - - dialog = speedSensorLeft + dialog = speedSensorAnalog field = "Input pin", vehicleSpeedSensorInputPin field = "revolution to speed mult", vehicleSpeedCoef + dialog = speedSensorCan + field = "Vss Car Type", canVssNbcType, { enableCanVss } + + dialog = speedSensorLeft, "Speed sensor config", yAxis + panel = speedSensorCan, { enableCanVss } + panel = speedSensorAnalog, { enableCanVss == 0 } + field = "Enable CANbus VSS values", enableCanVss, { canReadEnabled } + dialog = speedSensor, "Speed sensor", xAxis panel = speedSensorLeft gauge = VSSGauge - + ; Engine->Other inputs dialog = analogInputSettings, "Analog Input Settings" field = "!ECU reboot needed to apply these settings" diff --git a/firmware/tunerstudio/rusefi_kinetis.ini b/firmware/tunerstudio/rusefi_kinetis.ini index 284a7e89a5..a46bef6188 100644 --- a/firmware/tunerstudio/rusefi_kinetis.ini +++ b/firmware/tunerstudio/rusefi_kinetis.ini @@ -89,7 +89,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 kineris_gen_config.bat integration/rusefi_config.txt Sun Apr 19 10:01:30 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Sun Apr 19 18:32:08 EDT 2020 pageSize = 20000 page = 1 @@ -548,8 +548,8 @@ page = 1 enableLaunchRetard = bits, U32, 976, [4:4], "false", "true" enableLaunchBoost = bits, U32, 976, [5:5], "false", "true" launchDisableBySpeed = bits, U32, 976, [6:6], "false", "true" - unusedBit_251_7 = bits, U32, 976, [7:7], "false", "true" - unusedBit_251_8 = bits, U32, 976, [8:8], "false", "true" + enableCanVss = bits, U32, 976, [7:7], "false", "true" + enableInnovateLC2 = bits, U32, 976, [8:8], "false", "true" unusedBit_251_9 = bits, U32, 976, [9:9], "false", "true" unusedBit_251_10 = bits, U32, 976, [10:10], "false", "true" unusedBit_251_11 = bits, U32, 976, [11:11], "false", "true" @@ -790,9 +790,9 @@ page = 1 startOfCrankingPrimingPulse = scalar, F32, 2032, "ms", 1, 0, 0, 200, 1 afterCrankingIACtaperDuration = scalar, S16, 2036, "cycles", 1, 0, 0, 5000, 0 iacByTpsTaper = scalar, S16, 2038, "percent", 1, 0, 0, 500, 0 - unusedErrorPin = bits, U08, 2040, [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" + auxSerialTxPin = bits, U08, 2040, [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" warningLedPin = bits, U08, 2041, [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" - unused1234234 = bits, U08, 2042, [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" + auxSerialRxPin = bits, U08, 2042, [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" LIS302DLCsPin = bits, U08, 2043, [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" tpsAccelLength = scalar, S32, 2044, "cycles", 1, 0, 1, 200, 0 tpsAccelEnrichmentThreshold = scalar, F32, 2048, "roc", 1, 0, 0, 200, 3 @@ -807,7 +807,8 @@ page = 1 tpsDecelEnleanmentMultiplier = scalar, F32, 2084, "coeff", 1, 0, 0, 200, 3 slowAdcAlpha = scalar, F32, 2088, "coeff", 1, 0, 0, 200, 3 debugMode = bits, U32, 2092, [0:7], "Alternator PID", "TPS acceleration enrichment", "INVALID", "Idle Control", "Engine Load accl enrich", "Trigger Counters", "FSIO_ADC", "AUX_PID_1", "VVT input", "Cranking", "Timing", "Closed-loop fuel corr PID", "VSS", "SD card", "sr5", "Knock", "mode16", "Electronic Throttle", "Executor", "Bench Test / TS commands", "Aux Valves", "Analog inputs #1", "INSTANT_RPM", "FSIO_EXPRESSION", "Status", "CJ125", "CAN", "MAP", "Metrics", "ETB#2", "Ion Sense", "TLE8888", "Analog inputs #2", "Dwell Metric", "INVALID", "ETB Logic", "Boost Control", "Start/Stop", "Launch", "ETB Autotune", "Mode40" -;no TS info - skipping unused_former_warmup_target_afr offset 2096 + auxSerialSpeed = scalar, U32, 2096, "BPs", 1, 0, 0,1000000, 0 +;no TS info - skipping unused_former_warmup_target_afr offset 2100 boostCutPressure = scalar, F32, 2132, "kPa", 1, 0, 0, 500, 0 mapAccelTaperBins = array, F32, 2136, [8], "counter", 1, 0, 0.0, 300, 0 mapAccelTaperMult = array, F32, 2168, [8], "mult", 1, 0, 0.0, 300, 2 @@ -1035,7 +1036,8 @@ page = 1 iacPidMultTable = array, U08, 4060, [8x8],"%", 1, 0, 0, 999, 2 iacPidMultLoadBins = array, U08, 4124, [8], "Load", 1, 0.0, 0, 500.0, 2 iacPidMultRpmBins = array, U08, 4132, [8], "RPM", 50, 0, 0.0, 12000.0, 0 -;no TS info - skipping mainUnusedEnd offset 4140 + canVssNbcType = bits, U32, 4140, [0:7], "BMW_e46", "W202" +;no TS info - skipping mainUnusedEnd offset 4144 critical_error_message = string, ASCII, 6000, 120 afterstartCoolantBins = array, F32, 6120, [8], "C", 1, 0, -100.0, 250.0, 0 afterstartHoldTime = array, F32, 6152, [8], "Seconds", 1, 0, 0, 100, 1 @@ -3111,6 +3113,8 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "servo#3", servoOutputPins3 field = "servo#4", servoOutputPins4 field = "servo#5", servoOutputPins5 + field = "AUX Serial TX", auxSerialTxPin + field = "AUX Serial RX", auxSerialRxPin dialog = allPins1_1_and_2, "", xAxis @@ -3244,9 +3248,10 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Heater pin", o2heaterPin dialog = egoSettings, "", yAxis - panel = egoSettings_IO, {enableAemXSeries == 0} - panel = egoSettings_sensor, {afr_hwChannel != 16 && enableAemXSeries == 0} + panel = egoSettings_IO + panel = egoSettings_sensor, {afr_hwChannel != 16 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin} field = "Enable AEM X-Series CANbus", enableAemXSeries, { canReadEnabled } + field = "Enable Innovate LC-2 Serial", enableInnovateLC2, { auxSerialRxPin && auxSerialTxPin } ; Engine->EGT inputs dialog = egtInputs, "EGT inputs" @@ -3526,15 +3531,22 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" panel = alternator panel = startStopDialog - - dialog = speedSensorLeft + dialog = speedSensorAnalog field = "Input pin", vehicleSpeedSensorInputPin field = "revolution to speed mult", vehicleSpeedCoef + dialog = speedSensorCan + field = "Vss Car Type", canVssNbcType, { enableCanVss } + + dialog = speedSensorLeft, "Speed sensor config", yAxis + panel = speedSensorCan, { enableCanVss } + panel = speedSensorAnalog, { enableCanVss == 0 } + field = "Enable CANbus VSS values", enableCanVss, { canReadEnabled } + dialog = speedSensor, "Speed sensor", xAxis panel = speedSensorLeft gauge = VSSGauge - + ; Engine->Other inputs dialog = analogInputSettings, "Analog Input Settings" field = "!ECU reboot needed to apply these settings" @@ -3570,6 +3582,11 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Can Sleep Period", canSleepPeriodMs field = "RX pin", canRxPin field = "TX pin", canTxPin + + dialog = auxSerial, "AUX Serial" + field = "RX pin", auxSerialRxPin + field = "TX pin", auxSerialTxPin + field = "Serial Baud Rate", auxSerialSpeed dialog = sdCard, "SD Card Logger" field = "SdCard", isSdCardEnabled @@ -3606,6 +3623,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "ADC vRef voltage", adcVcc panel = tsPort panel = canBus + panel = auxSerial panel = sdCard panel = gpsReceiver panel = tle8888 diff --git a/firmware/tunerstudio/rusefi_microrusefi.ini b/firmware/tunerstudio/rusefi_microrusefi.ini index f19cd54365..5b9ba3e945 100644 --- a/firmware/tunerstudio/rusefi_microrusefi.ini +++ b/firmware/tunerstudio/rusefi_microrusefi.ini @@ -89,7 +89,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.bat integration\rusefi_config.txt Sun Apr 19 15:46:46 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sun Apr 19 18:31:57 EDT 2020 pageSize = 20000 page = 1 @@ -548,8 +548,8 @@ page = 1 enableLaunchRetard = bits, U32, 976, [4:4], "false", "true" enableLaunchBoost = bits, U32, 976, [5:5], "false", "true" launchDisableBySpeed = bits, U32, 976, [6:6], "false", "true" - enableInnovateLC2 = bits, U32, 976, [7:7], "false", "true" - unusedBit_251_8 = bits, U32, 976, [8:8], "false", "true" + enableCanVss = bits, U32, 976, [7:7], "false", "true" + enableInnovateLC2 = bits, U32, 976, [8:8], "false", "true" unusedBit_251_9 = bits, U32, 976, [9:9], "false", "true" unusedBit_251_10 = bits, U32, 976, [10:10], "false", "true" unusedBit_251_11 = bits, U32, 976, [11:11], "false", "true" @@ -1036,7 +1036,8 @@ page = 1 iacPidMultTable = array, U08, 4060, [8x8],"%", 1, 0, 0, 999, 2 iacPidMultLoadBins = array, U08, 4124, [8], "Load", 1, 0.0, 0, 500.0, 2 iacPidMultRpmBins = array, U08, 4132, [8], "RPM", 50, 0, 0.0, 12000.0, 0 -;no TS info - skipping mainUnusedEnd offset 4140 + canVssNbcType = bits, U32, 4140, [0:7], "BMW_e46", "W202" +;no TS info - skipping mainUnusedEnd offset 4144 critical_error_message = string, ASCII, 6000, 120 afterstartCoolantBins = array, F32, 6120, [8], "C", 1, 0, -100.0, 250.0, 0 afterstartHoldTime = array, F32, 6152, [8], "Seconds", 1, 0, 0, 100, 1 @@ -3497,15 +3498,22 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" panel = alternator panel = startStopDialog - - dialog = speedSensorLeft + dialog = speedSensorAnalog field = "Input pin", vehicleSpeedSensorInputPin field = "revolution to speed mult", vehicleSpeedCoef + dialog = speedSensorCan + field = "Vss Car Type", canVssNbcType, { enableCanVss } + + dialog = speedSensorLeft, "Speed sensor config", yAxis + panel = speedSensorCan, { enableCanVss } + panel = speedSensorAnalog, { enableCanVss == 0 } + field = "Enable CANbus VSS values", enableCanVss, { canReadEnabled } + dialog = speedSensor, "Speed sensor", xAxis panel = speedSensorLeft gauge = VSSGauge - + ; Engine->Other inputs dialog = analogInputSettings, "Analog Input Settings" field = "!ECU reboot needed to apply these settings" diff --git a/firmware/tunerstudio/rusefi_prometheus.ini b/firmware/tunerstudio/rusefi_prometheus.ini index 39c53eb293..b39b32933c 100644 --- a/firmware/tunerstudio/rusefi_prometheus.ini +++ b/firmware/tunerstudio/rusefi_prometheus.ini @@ -89,7 +89,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.bat integration\rusefi_config.txt Sun Apr 19 15:46:53 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sun Apr 19 18:32:02 EDT 2020 pageSize = 20000 page = 1 @@ -548,8 +548,8 @@ page = 1 enableLaunchRetard = bits, U32, 976, [4:4], "false", "true" enableLaunchBoost = bits, U32, 976, [5:5], "false", "true" launchDisableBySpeed = bits, U32, 976, [6:6], "false", "true" - enableInnovateLC2 = bits, U32, 976, [7:7], "false", "true" - unusedBit_251_8 = bits, U32, 976, [8:8], "false", "true" + enableCanVss = bits, U32, 976, [7:7], "false", "true" + enableInnovateLC2 = bits, U32, 976, [8:8], "false", "true" unusedBit_251_9 = bits, U32, 976, [9:9], "false", "true" unusedBit_251_10 = bits, U32, 976, [10:10], "false", "true" unusedBit_251_11 = bits, U32, 976, [11:11], "false", "true" @@ -1036,7 +1036,8 @@ page = 1 iacPidMultTable = array, U08, 4060, [8x8],"%", 1, 0, 0, 999, 2 iacPidMultLoadBins = array, U08, 4124, [8], "Load", 1, 0.0, 0, 500.0, 2 iacPidMultRpmBins = array, U08, 4132, [8], "RPM", 50, 0, 0.0, 12000.0, 0 -;no TS info - skipping mainUnusedEnd offset 4140 + canVssNbcType = bits, U32, 4140, [0:7], "BMW_e46", "W202" +;no TS info - skipping mainUnusedEnd offset 4144 critical_error_message = string, ASCII, 6000, 120 afterstartCoolantBins = array, F32, 6120, [8], "C", 1, 0, -100.0, 250.0, 0 afterstartHoldTime = array, F32, 6152, [8], "Seconds", 1, 0, 0, 100, 1 @@ -3525,15 +3526,22 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" panel = alternator panel = startStopDialog - - dialog = speedSensorLeft + dialog = speedSensorAnalog field = "Input pin", vehicleSpeedSensorInputPin field = "revolution to speed mult", vehicleSpeedCoef + dialog = speedSensorCan + field = "Vss Car Type", canVssNbcType, { enableCanVss } + + dialog = speedSensorLeft, "Speed sensor config", yAxis + panel = speedSensorCan, { enableCanVss } + panel = speedSensorAnalog, { enableCanVss == 0 } + field = "Enable CANbus VSS values", enableCanVss, { canReadEnabled } + dialog = speedSensor, "Speed sensor", xAxis panel = speedSensorLeft gauge = VSSGauge - + ; Engine->Other inputs dialog = analogInputSettings, "Analog Input Settings" field = "!ECU reboot needed to apply these settings" diff --git a/firmware/tunerstudio/rusefi_proteus.ini b/firmware/tunerstudio/rusefi_proteus.ini index 76fc5595b1..9d1aec3570 100644 --- a/firmware/tunerstudio/rusefi_proteus.ini +++ b/firmware/tunerstudio/rusefi_proteus.ini @@ -89,7 +89,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.bat integration\rusefi_config.txt Sun Apr 19 15:46:54 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sun Apr 19 18:32:06 EDT 2020 pageSize = 20000 page = 1 @@ -548,8 +548,8 @@ page = 1 enableLaunchRetard = bits, U32, 976, [4:4], "false", "true" enableLaunchBoost = bits, U32, 976, [5:5], "false", "true" launchDisableBySpeed = bits, U32, 976, [6:6], "false", "true" - enableInnovateLC2 = bits, U32, 976, [7:7], "false", "true" - unusedBit_251_8 = bits, U32, 976, [8:8], "false", "true" + enableCanVss = bits, U32, 976, [7:7], "false", "true" + enableInnovateLC2 = bits, U32, 976, [8:8], "false", "true" unusedBit_251_9 = bits, U32, 976, [9:9], "false", "true" unusedBit_251_10 = bits, U32, 976, [10:10], "false", "true" unusedBit_251_11 = bits, U32, 976, [11:11], "false", "true" @@ -1036,7 +1036,8 @@ page = 1 iacPidMultTable = array, U08, 4060, [8x8],"%", 1, 0, 0, 999, 2 iacPidMultLoadBins = array, U08, 4124, [8], "Load", 1, 0.0, 0, 500.0, 2 iacPidMultRpmBins = array, U08, 4132, [8], "RPM", 50, 0, 0.0, 12000.0, 0 -;no TS info - skipping mainUnusedEnd offset 4140 + canVssNbcType = bits, U32, 4140, [0:7], "BMW_e46", "W202" +;no TS info - skipping mainUnusedEnd offset 4144 critical_error_message = string, ASCII, 6000, 120 afterstartCoolantBins = array, F32, 6120, [8], "C", 1, 0, -100.0, 250.0, 0 afterstartHoldTime = array, F32, 6152, [8], "Seconds", 1, 0, 0, 100, 1 @@ -3505,15 +3506,22 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" panel = alternator panel = startStopDialog - - dialog = speedSensorLeft + dialog = speedSensorAnalog field = "Input pin", vehicleSpeedSensorInputPin field = "revolution to speed mult", vehicleSpeedCoef + dialog = speedSensorCan + field = "Vss Car Type", canVssNbcType, { enableCanVss } + + dialog = speedSensorLeft, "Speed sensor config", yAxis + panel = speedSensorCan, { enableCanVss } + panel = speedSensorAnalog, { enableCanVss == 0 } + field = "Enable CANbus VSS values", enableCanVss, { canReadEnabled } + dialog = speedSensor, "Speed sensor", xAxis panel = speedSensorLeft gauge = VSSGauge - + ; Engine->Other inputs dialog = analogInputSettings, "Analog Input Settings" field = "!ECU reboot needed to apply these settings" diff --git a/java_console/models/src/com/rusefi/config/generated/Fields.java b/java_console/models/src/com/rusefi/config/generated/Fields.java index 54183346d3..e486382a47 100644 --- a/java_console/models/src/com/rusefi/config/generated/Fields.java +++ b/java_console/models/src/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.bat integration\rusefi_config.txt Sun Apr 19 15:46:36 EDT 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sun Apr 19 18:31:50 EDT 2020 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -213,6 +213,7 @@ public class Fields { public static final int canRxPin_offset = 709; public static final int canSleepPeriodMs_offset = 484; public static final int canTxPin_offset = 708; + public static final int canVssNbcType_offset = 4140; public static final int canWriteEnabled_offset = 1464; public static final int cdmInputPin_offset = 937; public static final int cj125CsPin_offset = 674; @@ -358,6 +359,7 @@ public class Fields { public static final int EGT_CHANNEL_COUNT = 8; public static final int electronicThrottlePin1Mode_offset = 672; public static final int enableAemXSeries_offset = 744; + public static final int enableCanVss_offset = 976; public static final int enabledStep1Limiter_offset = 744; public static final int enableInnovateLC2_offset = 976; public static final int enableLaunchBoost_offset = 976; @@ -1004,7 +1006,8 @@ public class Fields { public static final int mafSensorType_offset = 948; public static final int mainRelayPin_offset = 706; public static final int mainRelayPinMode_offset = 752; - public static final int mainUnusedEnd_offset = 4140; + public static final int mainUnusedEnd_offset = 4144; + public static final int mainUnusedEnd_offset_hex = 1030; public static final int malfunctionIndicatorPin_offset = 660; public static final int malfunctionIndicatorPin_offset_hex = 294; public static final int malfunctionIndicatorPinMode_offset = 661; @@ -1471,7 +1474,6 @@ public class Fields { public static final int unusedBit_251_27_offset = 976; public static final int unusedBit_251_28_offset = 976; public static final int unusedBit_251_29_offset = 976; - public static final int unusedBit_251_8_offset = 976; public static final int unusedBit_251_9_offset = 976; public static final int unusedBit_282_30_offset = 976; public static final int unusedBit_282_31_offset = 976; @@ -2003,8 +2005,8 @@ public class Fields { public static final Field ENABLELAUNCHRETARD = Field.create("ENABLELAUNCHRETARD", 976, FieldType.BIT, 4); public static final Field ENABLELAUNCHBOOST = Field.create("ENABLELAUNCHBOOST", 976, FieldType.BIT, 5); public static final Field LAUNCHDISABLEBYSPEED = Field.create("LAUNCHDISABLEBYSPEED", 976, FieldType.BIT, 6); - public static final Field ENABLEINNOVATELC2 = Field.create("ENABLEINNOVATELC2", 976, FieldType.BIT, 7); - public static final Field UNUSEDBIT_251_8 = Field.create("UNUSEDBIT_251_8", 976, FieldType.BIT, 8); + public static final Field ENABLECANVSS = Field.create("ENABLECANVSS", 976, FieldType.BIT, 7); + public static final Field ENABLEINNOVATELC2 = Field.create("ENABLEINNOVATELC2", 976, FieldType.BIT, 8); public static final Field UNUSEDBIT_251_9 = Field.create("UNUSEDBIT_251_9", 976, FieldType.BIT, 9); public static final Field UNUSEDBIT_251_10 = Field.create("UNUSEDBIT_251_10", 976, FieldType.BIT, 10); public static final Field UNUSEDBIT_251_11 = Field.create("UNUSEDBIT_251_11", 976, FieldType.BIT, 11); @@ -2454,6 +2456,7 @@ public class Fields { public static final Field IDLERPMPID2_MINVALUE = Field.create("IDLERPMPID2_MINVALUE", 4056, FieldType.INT16); public static final Field IDLERPMPID2_MAXVALUE = Field.create("IDLERPMPID2_MAXVALUE", 4058, FieldType.INT16); public static final Field IACPIDMULTTABLE = Field.create("IACPIDMULTTABLE", 4060, FieldType.INT); + public static final Field CANVSSNBCTYPE = Field.create("CANVSSNBCTYPE", 4140, FieldType.INT); public static final Field CRITICAL_ERROR_MESSAGE = Field.create("CRITICAL_ERROR_MESSAGE", 6000, FieldType.INT); public static final Field BOOSTTABLEOPENLOOP = Field.create("BOOSTTABLEOPENLOOP", 6248, FieldType.INT); public static final Field BOOSTTABLECLOSEDLOOP = Field.create("BOOSTTABLECLOSEDLOOP", 6328, FieldType.INT); @@ -2928,8 +2931,8 @@ public class Fields { ENABLELAUNCHRETARD, ENABLELAUNCHBOOST, LAUNCHDISABLEBYSPEED, + ENABLECANVSS, ENABLEINNOVATELC2, - UNUSEDBIT_251_8, UNUSEDBIT_251_9, UNUSEDBIT_251_10, UNUSEDBIT_251_11, @@ -3372,6 +3375,7 @@ public class Fields { IDLERPMPID2_MINVALUE, IDLERPMPID2_MAXVALUE, IACPIDMULTTABLE, + CANVSSNBCTYPE, CRITICAL_ERROR_MESSAGE, BOOSTTABLEOPENLOOP, BOOSTTABLECLOSEDLOOP,