From a4b557022303c2cff338aa6b3dcf2c65d68e4196 Mon Sep 17 00:00:00 2001
From: rusefi <rusefillc@gmail.com>
Date: Thu, 19 Mar 2020 09:22:16 -0400
Subject: [PATCH] "rusefi CAN" config #1198

---
 .../algo/engine_configuration_generated_structures.h |  8 ++++----
 .../config/controllers/algo/rusefi_generated.h       |  8 ++++----
 firmware/controllers/algo/engine_configuration.cpp   |  3 +++
 .../engine_configuration_generated_structures.h      |  8 ++++----
 firmware/controllers/generated/rusefi_generated.h    |  8 ++++----
 firmware/integration/rusefi_config.txt               |  5 +++--
 firmware/tunerstudio/rusefi.ini                      |  8 +++++---
 firmware/tunerstudio/rusefi.input                    |  2 ++
 firmware/tunerstudio/rusefi_frankenso.ini            |  8 +++++---
 firmware/tunerstudio/rusefi_kinetis.ini              |  8 +++++---
 firmware/tunerstudio/rusefi_microrusefi.ini          |  8 +++++---
 firmware/tunerstudio/rusefi_prometheus.ini           |  8 +++++---
 firmware/tunerstudio/rusefi_proteus.ini              |  8 +++++---
 .../src/com/rusefi/config/generated/Fields.java      | 12 +++++++-----
 14 files changed, 61 insertions(+), 41 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 15b859050a..3f2c2104a0 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 integration/rusefi_config.txt Wed Mar 18 15:54:39 EDT 2020
+// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/rusefi_config.txt Thu Mar 19 09:14:30 EDT 2020
 // by class com.rusefi.output.CHeaderConsumer
 // begin
 #ifndef CONFIG_BOARDS_KINETIS_CONFIG_CONTROLLERS_ALGO_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H
@@ -1299,7 +1299,7 @@ struct engine_configuration_s {
 	bool verboseTLE8888 : 1;
 	/**
 	offset 744 bit 14 */
-	bool unusedOldWarmupAfr : 1;
+	bool enableVerboseCanTx : 1;
 	/**
 	 *  +This will cause the alternator to be operated in a basic on or off mode, this is the simplest alternator control.
 	offset 744 bit 15 */
@@ -1382,7 +1382,7 @@ struct engine_configuration_s {
 	/**
 	 * offset 756
 	 */
-	uint8_t unusedHereWeHave[4];
+	uint32_t verboseCanBaseAddress;
 	/**
 	 * offset 760
 	 */
@@ -3236,4 +3236,4 @@ typedef struct persistent_config_s persistent_config_s;
 
 #endif
 // end
-// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/rusefi_config.txt Wed Mar 18 15:54:39 EDT 2020
+// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/rusefi_config.txt Thu Mar 19 09:14:30 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 5bdae91d54..54e5fb2607 100644
--- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h
+++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h
@@ -535,6 +535,8 @@
 #define enableAemXSeries_offset_hex 2e8
 #define enabledStep1Limiter_offset 744
 #define enabledStep1Limiter_offset_hex 2e8
+#define enableVerboseCanTx_offset 744
+#define enableVerboseCanTx_offset_hex 2e8
 #define engine_load_mode_e_enum "MAF", "Alpha-N/TPS", "MAP", "SPEED DENSITY", "MAF Air Charge"
 #define ENGINE_NOISE_CURVE_SIZE 8
 #define engineChartSize_offset 1480
@@ -2150,14 +2152,10 @@
 #define unusedFlexFuelSensor_offset_hex c1c
 #define unusedFormerWarmupAfrPid_offset 1773
 #define unusedFormerWarmupAfrPid_offset_hex 6ed
-#define unusedHereWeHave_offset 756
-#define unusedHereWeHave_offset_hex 2f4
 #define unusedmiataNb2VVTRatioFrom_offset 820
 #define unusedmiataNb2VVTRatioFrom_offset_hex 334
 #define unusedmiataNb2VVTRatioTo_offset 824
 #define unusedmiataNb2VVTRatioTo_offset_hex 338
-#define unusedOldWarmupAfr_offset 744
-#define unusedOldWarmupAfr_offset_hex 2e8
 #define unusedSpiPadding4_offset 2593
 #define unusedSpiPadding4_offset_hex a21
 #define unusedSpiPadding5_offset 2713
@@ -2257,6 +2255,8 @@
 #define vehicleSpeedSensorInputPin_offset_hex 3c8
 #define veLoadBins_offset 18464
 #define veLoadBins_offset_hex 4820
+#define verboseCanBaseAddress_offset 756
+#define verboseCanBaseAddress_offset_hex 2f4
 #define verboseTLE8888_offset 744
 #define verboseTLE8888_offset_hex 2e8
 #define verboseTriggerSynchDetails_offset 1476
diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp
index 5e05565f73..cef3c5a18b 100644
--- a/firmware/controllers/algo/engine_configuration.cpp
+++ b/firmware/controllers/algo/engine_configuration.cpp
@@ -667,6 +667,9 @@ static void setDefaultEngineConfiguration(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
 	engineConfiguration->canWriteEnabled = true;
 	engineConfiguration->canNbcType = CAN_BUS_MAZDA_RX8;
 
+	// Don't enable, but set default address
+	engineConfiguration->verboseCanBaseAddress = 0x200;
+
 	engineConfiguration->sdCardPeriodMs = 50;
 
 	for (int i = 0; i < FSIO_COMMAND_COUNT; i++) {
diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h
index b830d81ac7..4a03128b9f 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 integration\rusefi_config.txt Wed Mar 18 15:54:25 EDT 2020
+// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Thu Mar 19 09:14:14 EDT 2020
 // by class com.rusefi.output.CHeaderConsumer
 // begin
 #ifndef CONTROLLERS_GENERATED_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H
@@ -1299,7 +1299,7 @@ struct engine_configuration_s {
 	bool verboseTLE8888 : 1;
 	/**
 	offset 744 bit 14 */
-	bool unusedOldWarmupAfr : 1;
+	bool enableVerboseCanTx : 1;
 	/**
 	 *  +This will cause the alternator to be operated in a basic on or off mode, this is the simplest alternator control.
 	offset 744 bit 15 */
@@ -1382,7 +1382,7 @@ struct engine_configuration_s {
 	/**
 	 * offset 756
 	 */
-	uint8_t unusedHereWeHave[4];
+	uint32_t verboseCanBaseAddress;
 	/**
 	 * offset 760
 	 */
@@ -3236,4 +3236,4 @@ typedef struct persistent_config_s persistent_config_s;
 
 #endif
 // end
-// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Wed Mar 18 15:54:25 EDT 2020
+// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Thu Mar 19 09:14:14 EDT 2020
diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h
index 9258f505d0..ed8467614a 100644
--- a/firmware/controllers/generated/rusefi_generated.h
+++ b/firmware/controllers/generated/rusefi_generated.h
@@ -535,6 +535,8 @@
 #define enableAemXSeries_offset_hex 2e8
 #define enabledStep1Limiter_offset 744
 #define enabledStep1Limiter_offset_hex 2e8
+#define enableVerboseCanTx_offset 744
+#define enableVerboseCanTx_offset_hex 2e8
 #define engine_load_mode_e_enum "MAF", "Alpha-N/TPS", "MAP", "SPEED DENSITY", "MAF Air Charge"
 #define ENGINE_NOISE_CURVE_SIZE 8
 #define engineChartSize_offset 1480
@@ -2150,14 +2152,10 @@
 #define unusedFlexFuelSensor_offset_hex c1c
 #define unusedFormerWarmupAfrPid_offset 1773
 #define unusedFormerWarmupAfrPid_offset_hex 6ed
-#define unusedHereWeHave_offset 756
-#define unusedHereWeHave_offset_hex 2f4
 #define unusedmiataNb2VVTRatioFrom_offset 820
 #define unusedmiataNb2VVTRatioFrom_offset_hex 334
 #define unusedmiataNb2VVTRatioTo_offset 824
 #define unusedmiataNb2VVTRatioTo_offset_hex 338
-#define unusedOldWarmupAfr_offset 744
-#define unusedOldWarmupAfr_offset_hex 2e8
 #define unusedSpiPadding4_offset 2593
 #define unusedSpiPadding4_offset_hex a21
 #define unusedSpiPadding5_offset 2713
@@ -2257,6 +2255,8 @@
 #define vehicleSpeedSensorInputPin_offset_hex 3c8
 #define veLoadBins_offset 18464
 #define veLoadBins_offset_hex 4820
+#define verboseCanBaseAddress_offset 756
+#define verboseCanBaseAddress_offset_hex 2f4
 #define verboseTLE8888_offset 744
 #define verboseTLE8888_offset_hex 2e8
 #define verboseTriggerSynchDetails_offset 1476
diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt
index 0d48bbd614..72581d3cc2 100644
--- a/firmware/integration/rusefi_config.txt
+++ b/firmware/integration/rusefi_config.txt
@@ -643,7 +643,7 @@ bit is_enabled_spi_2
 	bit useTpicAdvancedMode;
 	bit useLcdScreen;
 	bit verboseTLE8888;
-	bit unusedOldWarmupAfr;
+	bit enableVerboseCanTx;
 	bit onOffAlternatorLogic; +This will cause the alternator to be operated in a basic on or off mode, this is the simplest alternator control.
 	bit isCJ125Enabled
 	bit vvtCamSensorUseRise;+Use rise or fall signal front
@@ -669,7 +669,8 @@ bit is_enabled_spi_2
 	brain_pin_e hip9011IntHoldPin;
 pin_output_mode_e hip9011IntHoldPinMode;
 
-	uint8_t[4] unusedHereWeHave
+	! 536870911 = 2^29-1, the maximum valid extended ID
+	uint32_t verboseCanBaseAddress;;"", 1, 0, 0, 536870911, 0
 
 	int unrealisticRpmThreashold;
 
diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini
index c355f512dc..ace55572ec 100644
--- a/firmware/tunerstudio/rusefi.ini
+++ b/firmware/tunerstudio/rusefi.ini
@@ -85,7 +85,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 integration\rusefi_config.txt Wed Mar 18 15:54:25 EDT 2020
+; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Thu Mar 19 09:14:14 EDT 2020
 
 pageSize            = 20000
 page = 1
@@ -378,7 +378,7 @@ page = 1
 	useTpicAdvancedMode		= bits,    U32,   	744, [11:11], "false", "true"
 	useLcdScreen			= bits,    U32,   	744, [12:12], "false", "true"
 	verboseTLE8888			= bits,    U32,   	744, [13:13], "false", "true"
-	unusedOldWarmupAfr		= bits,    U32,   	744, [14:14], "false", "true"
+	enableVerboseCanTx		= bits,    U32,   	744, [14:14], "false", "true"
 	onOffAlternatorLogic	= bits,    U32,   	744, [15:15], "false", "true"
 	isCJ125Enabled			= bits,    U32,   	744, [16:16], "false", "true"
 	vvtCamSensorUseRise		= bits,    U32,   	744, [17:17], "false", "true"
@@ -404,7 +404,7 @@ page = 1
 	hip9011CsPin				 = bits, U08, 753, [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"
 	hip9011IntHoldPin			 = bits, U08, 754, [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"
 	hip9011IntHoldPinMode		 = bits, U08, 755, [0:7], "default", "default inverted", "open collector", "open collector inverted"
-;no TS info - skipping unusedHereWeHave offset 756
+	verboseCanBaseAddress			= scalar, U32,	756,	"", 1, 0, 0, 536870911, 0
 ;no TS info - skipping unrealisticRpmThreashold offset 760
 	gpioPinModes1				 = bits, U08, 764, [0:7], "default", "default inverted", "open collector", "open collector inverted"
 	gpioPinModes2				 = bits, U08, 765, [0:7], "default", "default inverted", "open collector", "open collector inverted"
@@ -3453,6 +3453,8 @@ cmd_set_engine_type_default					= "w\x00\x31\x00\x00"
 		field = "Can Read Enabled",						canReadEnabled
 		field = "Can Write Enabled",					canWriteEnabled
 		field = "Can Nbc Type",							canNbcType
+		field = "Enable rusEfi CAN data",				enableVerboseCanTx
+		field = "rusEfi CAN data base address",			verboseCanBaseAddress
 		field = "Can Sleep Period",						canSleepPeriodMs
 		field = "RX pin",								canRxPin
 		field = "TX pin",								canTxPin
diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input
index e5c51e569f..aced0d4f78 100644
--- a/firmware/tunerstudio/rusefi.input
+++ b/firmware/tunerstudio/rusefi.input
@@ -2322,6 +2322,8 @@ cmd_set_engine_type_default					= "w\x00\x31\x00\x00"
 		field = "Can Read Enabled",						canReadEnabled
 		field = "Can Write Enabled",					canWriteEnabled
 		field = "Can Nbc Type",							canNbcType
+		field = "Enable rusEfi CAN data",				enableVerboseCanTx
+		field = "rusEfi CAN data base address",			verboseCanBaseAddress
 		field = "Can Sleep Period",						canSleepPeriodMs
 		field = "RX pin",								canRxPin
 		field = "TX pin",								canTxPin
diff --git a/firmware/tunerstudio/rusefi_frankenso.ini b/firmware/tunerstudio/rusefi_frankenso.ini
index e99467b4ed..c6e91a0090 100644
--- a/firmware/tunerstudio/rusefi_frankenso.ini
+++ b/firmware/tunerstudio/rusefi_frankenso.ini
@@ -85,7 +85,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 integration\rusefi_config.txt Wed Mar 18 15:54:30 EDT 2020
+; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Thu Mar 19 09:14:21 EDT 2020
 
 pageSize            = 20000
 page = 1
@@ -378,7 +378,7 @@ page = 1
 	useTpicAdvancedMode		= bits,    U32,   	744, [11:11], "false", "true"
 	useLcdScreen			= bits,    U32,   	744, [12:12], "false", "true"
 	verboseTLE8888			= bits,    U32,   	744, [13:13], "false", "true"
-	unusedOldWarmupAfr		= bits,    U32,   	744, [14:14], "false", "true"
+	enableVerboseCanTx		= bits,    U32,   	744, [14:14], "false", "true"
 	onOffAlternatorLogic	= bits,    U32,   	744, [15:15], "false", "true"
 	isCJ125Enabled			= bits,    U32,   	744, [16:16], "false", "true"
 	vvtCamSensorUseRise		= bits,    U32,   	744, [17:17], "false", "true"
@@ -404,7 +404,7 @@ page = 1
 	hip9011CsPin				 = bits, U08, 753, [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"
 	hip9011IntHoldPin			 = bits, U08, 754, [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"
 	hip9011IntHoldPinMode		 = bits, U08, 755, [0:7], "default", "default inverted", "open collector", "open collector inverted"
-;no TS info - skipping unusedHereWeHave offset 756
+	verboseCanBaseAddress			= scalar, U32,	756,	"", 1, 0, 0, 536870911, 0
 ;no TS info - skipping unrealisticRpmThreashold offset 760
 	gpioPinModes1				 = bits, U08, 764, [0:7], "default", "default inverted", "open collector", "open collector inverted"
 	gpioPinModes2				 = bits, U08, 765, [0:7], "default", "default inverted", "open collector", "open collector inverted"
@@ -3453,6 +3453,8 @@ cmd_set_engine_type_default					= "w\x00\x31\x00\x00"
 		field = "Can Read Enabled",						canReadEnabled
 		field = "Can Write Enabled",					canWriteEnabled
 		field = "Can Nbc Type",							canNbcType
+		field = "Enable rusEfi CAN data",				enableVerboseCanTx
+		field = "rusEfi CAN data base address",			verboseCanBaseAddress
 		field = "Can Sleep Period",						canSleepPeriodMs
 		field = "RX pin",								canRxPin
 		field = "TX pin",								canTxPin
diff --git a/firmware/tunerstudio/rusefi_kinetis.ini b/firmware/tunerstudio/rusefi_kinetis.ini
index 2dc9d9178b..4046e748c1 100644
--- a/firmware/tunerstudio/rusefi_kinetis.ini
+++ b/firmware/tunerstudio/rusefi_kinetis.ini
@@ -85,7 +85,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 integration/rusefi_config.txt Wed Mar 18 15:54:39 EDT 2020
+; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/rusefi_config.txt Thu Mar 19 09:14:30 EDT 2020
 
 pageSize            = 20000
 page = 1
@@ -378,7 +378,7 @@ page = 1
 	useTpicAdvancedMode		= bits,    U32,   	744, [11:11], "false", "true"
 	useLcdScreen			= bits,    U32,   	744, [12:12], "false", "true"
 	verboseTLE8888			= bits,    U32,   	744, [13:13], "false", "true"
-	unusedOldWarmupAfr		= bits,    U32,   	744, [14:14], "false", "true"
+	enableVerboseCanTx		= bits,    U32,   	744, [14:14], "false", "true"
 	onOffAlternatorLogic	= bits,    U32,   	744, [15:15], "false", "true"
 	isCJ125Enabled			= bits,    U32,   	744, [16:16], "false", "true"
 	vvtCamSensorUseRise		= bits,    U32,   	744, [17:17], "false", "true"
@@ -404,7 +404,7 @@ page = 1
 	hip9011CsPin				 = bits, U08, 753, [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"
 	hip9011IntHoldPin			 = bits, U08, 754, [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"
 	hip9011IntHoldPinMode		 = bits, U08, 755, [0:7], "default", "default inverted", "open collector", "open collector inverted"
-;no TS info - skipping unusedHereWeHave offset 756
+	verboseCanBaseAddress			= scalar, U32,	756,	"", 1, 0, 0, 536870911, 0
 ;no TS info - skipping unrealisticRpmThreashold offset 760
 	gpioPinModes1				 = bits, U08, 764, [0:7], "default", "default inverted", "open collector", "open collector inverted"
 	gpioPinModes2				 = bits, U08, 765, [0:7], "default", "default inverted", "open collector", "open collector inverted"
@@ -3453,6 +3453,8 @@ cmd_set_engine_type_default					= "w\x00\x31\x00\x00"
 		field = "Can Read Enabled",						canReadEnabled
 		field = "Can Write Enabled",					canWriteEnabled
 		field = "Can Nbc Type",							canNbcType
+		field = "Enable rusEfi CAN data",				enableVerboseCanTx
+		field = "rusEfi CAN data base address",			verboseCanBaseAddress
 		field = "Can Sleep Period",						canSleepPeriodMs
 		field = "RX pin",								canRxPin
 		field = "TX pin",								canTxPin
diff --git a/firmware/tunerstudio/rusefi_microrusefi.ini b/firmware/tunerstudio/rusefi_microrusefi.ini
index 920ed7a1d9..0c51a9a17e 100644
--- a/firmware/tunerstudio/rusefi_microrusefi.ini
+++ b/firmware/tunerstudio/rusefi_microrusefi.ini
@@ -85,7 +85,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 integration\rusefi_config.txt Wed Mar 18 15:54:27 EDT 2020
+; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Thu Mar 19 09:14:18 EDT 2020
 
 pageSize            = 20000
 page = 1
@@ -378,7 +378,7 @@ page = 1
 	useTpicAdvancedMode		= bits,    U32,   	744, [11:11], "false", "true"
 	useLcdScreen			= bits,    U32,   	744, [12:12], "false", "true"
 	verboseTLE8888			= bits,    U32,   	744, [13:13], "false", "true"
-	unusedOldWarmupAfr		= bits,    U32,   	744, [14:14], "false", "true"
+	enableVerboseCanTx		= bits,    U32,   	744, [14:14], "false", "true"
 	onOffAlternatorLogic	= bits,    U32,   	744, [15:15], "false", "true"
 	isCJ125Enabled			= bits,    U32,   	744, [16:16], "false", "true"
 	vvtCamSensorUseRise		= bits,    U32,   	744, [17:17], "false", "true"
@@ -404,7 +404,7 @@ page = 1
 	hip9011CsPin				 = bits, U08, 753, [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"
 	hip9011IntHoldPin			 = bits, U08, 754, [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"
 	hip9011IntHoldPinMode		 = bits, U08, 755, [0:7], "default", "default inverted", "open collector", "open collector inverted"
-;no TS info - skipping unusedHereWeHave offset 756
+	verboseCanBaseAddress			= scalar, U32,	756,	"", 1, 0, 0, 536870911, 0
 ;no TS info - skipping unrealisticRpmThreashold offset 760
 	gpioPinModes1				 = bits, U08, 764, [0:7], "default", "default inverted", "open collector", "open collector inverted"
 	gpioPinModes2				 = bits, U08, 765, [0:7], "default", "default inverted", "open collector", "open collector inverted"
@@ -3435,6 +3435,8 @@ cmd_set_engine_type_default					= "w\x00\x31\x00\x00"
 		field = "Can Read Enabled",						canReadEnabled
 		field = "Can Write Enabled",					canWriteEnabled
 		field = "Can Nbc Type",							canNbcType
+		field = "Enable rusEfi CAN data",				enableVerboseCanTx
+		field = "rusEfi CAN data base address",			verboseCanBaseAddress
 		field = "Can Sleep Period",						canSleepPeriodMs
 		field = "RX pin",								canRxPin
 		field = "TX pin",								canTxPin
diff --git a/firmware/tunerstudio/rusefi_prometheus.ini b/firmware/tunerstudio/rusefi_prometheus.ini
index 9ebbdcd9df..8ace7d3b8f 100644
--- a/firmware/tunerstudio/rusefi_prometheus.ini
+++ b/firmware/tunerstudio/rusefi_prometheus.ini
@@ -85,7 +85,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 integration\rusefi_config.txt Wed Mar 18 15:54:33 EDT 2020
+; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Thu Mar 19 09:14:24 EDT 2020
 
 pageSize            = 20000
 page = 1
@@ -378,7 +378,7 @@ page = 1
 	useTpicAdvancedMode		= bits,    U32,   	744, [11:11], "false", "true"
 	useLcdScreen			= bits,    U32,   	744, [12:12], "false", "true"
 	verboseTLE8888			= bits,    U32,   	744, [13:13], "false", "true"
-	unusedOldWarmupAfr		= bits,    U32,   	744, [14:14], "false", "true"
+	enableVerboseCanTx		= bits,    U32,   	744, [14:14], "false", "true"
 	onOffAlternatorLogic	= bits,    U32,   	744, [15:15], "false", "true"
 	isCJ125Enabled			= bits,    U32,   	744, [16:16], "false", "true"
 	vvtCamSensorUseRise		= bits,    U32,   	744, [17:17], "false", "true"
@@ -404,7 +404,7 @@ page = 1
 	hip9011CsPin				 = bits, U08, 753, [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"
 	hip9011IntHoldPin			 = bits, U08, 754, [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"
 	hip9011IntHoldPinMode		 = bits, U08, 755, [0:7], "default", "default inverted", "open collector", "open collector inverted"
-;no TS info - skipping unusedHereWeHave offset 756
+	verboseCanBaseAddress			= scalar, U32,	756,	"", 1, 0, 0, 536870911, 0
 ;no TS info - skipping unrealisticRpmThreashold offset 760
 	gpioPinModes1				 = bits, U08, 764, [0:7], "default", "default inverted", "open collector", "open collector inverted"
 	gpioPinModes2				 = bits, U08, 765, [0:7], "default", "default inverted", "open collector", "open collector inverted"
@@ -3449,6 +3449,8 @@ cmd_set_engine_type_default					= "w\x00\x31\x00\x00"
 		field = "Can Read Enabled",						canReadEnabled
 		field = "Can Write Enabled",					canWriteEnabled
 		field = "Can Nbc Type",							canNbcType
+		field = "Enable rusEfi CAN data",				enableVerboseCanTx
+		field = "rusEfi CAN data base address",			verboseCanBaseAddress
 		field = "Can Sleep Period",						canSleepPeriodMs
 		field = "RX pin",								canRxPin
 		field = "TX pin",								canTxPin
diff --git a/firmware/tunerstudio/rusefi_proteus.ini b/firmware/tunerstudio/rusefi_proteus.ini
index a7bfcd1190..052808c88a 100644
--- a/firmware/tunerstudio/rusefi_proteus.ini
+++ b/firmware/tunerstudio/rusefi_proteus.ini
@@ -85,7 +85,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 integration\rusefi_config.txt Wed Mar 18 15:54:36 EDT 2020
+; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Thu Mar 19 09:14:27 EDT 2020
 
 pageSize            = 20000
 page = 1
@@ -378,7 +378,7 @@ page = 1
 	useTpicAdvancedMode		= bits,    U32,   	744, [11:11], "false", "true"
 	useLcdScreen			= bits,    U32,   	744, [12:12], "false", "true"
 	verboseTLE8888			= bits,    U32,   	744, [13:13], "false", "true"
-	unusedOldWarmupAfr		= bits,    U32,   	744, [14:14], "false", "true"
+	enableVerboseCanTx		= bits,    U32,   	744, [14:14], "false", "true"
 	onOffAlternatorLogic	= bits,    U32,   	744, [15:15], "false", "true"
 	isCJ125Enabled			= bits,    U32,   	744, [16:16], "false", "true"
 	vvtCamSensorUseRise		= bits,    U32,   	744, [17:17], "false", "true"
@@ -404,7 +404,7 @@ page = 1
 	hip9011CsPin				 = bits, U08, 753, [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"
 	hip9011IntHoldPin			 = bits, U08, 754, [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"
 	hip9011IntHoldPinMode		 = bits, U08, 755, [0:7], "default", "default inverted", "open collector", "open collector inverted"
-;no TS info - skipping unusedHereWeHave offset 756
+	verboseCanBaseAddress			= scalar, U32,	756,	"", 1, 0, 0, 536870911, 0
 ;no TS info - skipping unrealisticRpmThreashold offset 760
 	gpioPinModes1				 = bits, U08, 764, [0:7], "default", "default inverted", "open collector", "open collector inverted"
 	gpioPinModes2				 = bits, U08, 765, [0:7], "default", "default inverted", "open collector", "open collector inverted"
@@ -3443,6 +3443,8 @@ cmd_set_engine_type_default					= "w\x00\x31\x00\x00"
 		field = "Can Read Enabled",						canReadEnabled
 		field = "Can Write Enabled",					canWriteEnabled
 		field = "Can Nbc Type",							canNbcType
+		field = "Enable rusEfi CAN data",				enableVerboseCanTx
+		field = "rusEfi CAN data base address",			verboseCanBaseAddress
 		field = "Can Sleep Period",						canSleepPeriodMs
 		field = "RX pin",								canRxPin
 		field = "TX pin",								canTxPin
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 9afe19eaaa..33d5c0efcf 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 integration\rusefi_config.txt Wed Mar 18 15:54:25 EDT 2020
+// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Thu Mar 19 09:14:14 EDT 2020
 
 // by class com.rusefi.output.FileJavaFieldsConsumer
 import com.rusefi.config.*;
@@ -345,6 +345,7 @@ public class Fields {
 	public static final int electronicThrottlePin1Mode_offset = 672;
 	public static final int enableAemXSeries_offset = 744;
 	public static final int enabledStep1Limiter_offset = 744;
+	public static final int enableVerboseCanTx_offset = 744;
 	public static final int ENGINE_NOISE_CURVE_SIZE = 8;
 	public static final int engineChartSize_offset = 1480;
 	public static final int engineConfiguration_offset = 0;
@@ -1406,12 +1407,10 @@ public class Fields {
 	public static final int unusedErrorPin_offset = 2040;
 	public static final int unusedFlexFuelSensor_offset = 3100;
 	public static final int unusedFormerWarmupAfrPid_offset = 1773;
-	public static final int unusedHereWeHave_offset = 756;
 	public static final int unusedmiataNb2VVTRatioFrom_offset = 820;
 	public static final int unusedmiataNb2VVTRatioFrom_offset_hex = 334;
 	public static final int unusedmiataNb2VVTRatioTo_offset = 824;
 	public static final int unusedmiataNb2VVTRatioTo_offset_hex = 338;
-	public static final int unusedOldWarmupAfr_offset = 744;
 	public static final int unusedSpiPadding4_offset = 2593;
 	public static final int unusedSpiPadding5_offset = 2713;
 	public static final int unusedSpiPadding7_offset = 4005;
@@ -1464,6 +1463,7 @@ public class Fields {
 	public static final int vehicleSpeedSensorInputPin_offset = 968;
 	public static final int veLoadBins_offset = 18464;
 	public static final int veLoadBins_offset_hex = 4820;
+	public static final int verboseCanBaseAddress_offset = 756;
 	public static final int verboseTLE8888_offset = 744;
 	public static final int verboseTriggerSynchDetails_offset = 1476;
 	public static final int veRpmBins_offset = 18528;
@@ -1768,7 +1768,7 @@ public class Fields {
 	public static final Field USETPICADVANCEDMODE = Field.create("USETPICADVANCEDMODE", 744, FieldType.BIT, 11);
 	public static final Field USELCDSCREEN = Field.create("USELCDSCREEN", 744, FieldType.BIT, 12);
 	public static final Field VERBOSETLE8888 = Field.create("VERBOSETLE8888", 744, FieldType.BIT, 13);
-	public static final Field UNUSEDOLDWARMUPAFR = Field.create("UNUSEDOLDWARMUPAFR", 744, FieldType.BIT, 14);
+	public static final Field ENABLEVERBOSECANTX = Field.create("ENABLEVERBOSECANTX", 744, FieldType.BIT, 14);
 	public static final Field ONOFFALTERNATORLOGIC = Field.create("ONOFFALTERNATORLOGIC", 744, FieldType.BIT, 15);
 	public static final Field ISCJ125ENABLED = Field.create("ISCJ125ENABLED", 744, FieldType.BIT, 16);
 	public static final Field VVTCAMSENSORUSERISE = Field.create("VVTCAMSENSORUSERISE", 744, FieldType.BIT, 17);
@@ -1794,6 +1794,7 @@ public class Fields {
 	public static final Field HIP9011CSPIN = Field.create("HIP9011CSPIN", 753, FieldType.INT8, brain_pin_e);
 	public static final Field HIP9011INTHOLDPIN = Field.create("HIP9011INTHOLDPIN", 754, FieldType.INT8, brain_pin_e);
 	public static final Field HIP9011INTHOLDPINMODE = Field.create("HIP9011INTHOLDPINMODE", 755, FieldType.INT8, pin_output_mode_e);
+	public static final Field VERBOSECANBASEADDRESS = Field.create("VERBOSECANBASEADDRESS", 756, FieldType.INT);
 	public static final Field UNREALISTICRPMTHREASHOLD = Field.create("UNREALISTICRPMTHREASHOLD", 760, FieldType.INT);
 	public static final Field GPIOPINMODES1 = Field.create("GPIOPINMODES1", 764, FieldType.INT8, pin_output_mode_e);
 	public static final Field GPIOPINMODES2 = Field.create("GPIOPINMODES2", 765, FieldType.INT8, pin_output_mode_e);
@@ -2671,7 +2672,7 @@ public class Fields {
 	USETPICADVANCEDMODE,
 	USELCDSCREEN,
 	VERBOSETLE8888,
-	UNUSEDOLDWARMUPAFR,
+	ENABLEVERBOSECANTX,
 	ONOFFALTERNATORLOGIC,
 	ISCJ125ENABLED,
 	VVTCAMSENSORUSERISE,
@@ -2697,6 +2698,7 @@ public class Fields {
 	HIP9011CSPIN,
 	HIP9011INTHOLDPIN,
 	HIP9011INTHOLDPINMODE,
+	VERBOSECANBASEADDRESS,
 	UNREALISTICRPMTHREASHOLD,
 	GPIOPINMODES1,
 	GPIOPINMODES2,