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 486a24b2de..94a4c0f1c5 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 Wed Dec 22 16:07:30 UTC 2021
+// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Sat Dec 25 04:39:41 UTC 2021
 // by class com.rusefi.output.CHeaderConsumer
 // begin
 #pragma once
@@ -1532,11 +1532,10 @@ struct engine_configuration_s {
 	 */
 	uint8_t acIdleExtraOffset;
 	/**
-	 * CANbus thread period, ms
 	ms
 	 * offset 720
 	 */
-	int can2SleepPeriodMs;
+	int unused720;
 	/**
 	 * Voltage when the wastegate is closed.
 	 * You probably don't have one of these!
@@ -2933,20 +2932,16 @@ struct engine_configuration_s {
 	/**
 	 * offset 1736
 	 */
-	uint32_t verboseCan2BaseAddress;
+	uint32_t unused1736;
 	/**
-	 * CAN broadcast using custom rusEFI protocol
-	 * enable can_broadcast/disable can_broadcast
 	offset 1740 bit 0 */
-	bool enableVerboseCan2Tx : 1 {};
+	bool unused1740b0 : 1 {};
 	/**
-	 * enable can_read/disable can_read
 	offset 1740 bit 1 */
-	bool can2ReadEnabled : 1 {};
+	bool unused1740b1 : 1 {};
 	/**
-	 * enable can_write/disable can_write
 	offset 1740 bit 2 */
-	bool can2WriteEnabled : 1 {};
+	bool unused1740b2 : 1 {};
 	/**
 	 * Enable if DC-motor driver (H-bridge) inverts the signals (eg. RZ7899 on Hellen boards)
 	offset 1740 bit 3 */
@@ -3036,10 +3031,9 @@ struct engine_configuration_s {
 	offset 1740 bit 31 */
 	bool unusedBit_498_31 : 1 {};
 	/**
-	 * set can_mode X
 	 * offset 1744
 	 */
-	can_nbc_e can2NbcType;
+	uint32_t unused1744;
 	/**
 	 * set_can2_tx_pin X
 	 * offset 1748
@@ -4417,4 +4411,4 @@ struct persistent_config_s {
 };
 
 // end
-// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Wed Dec 22 16:07:30 UTC 2021
+// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Sat Dec 25 04:39:41 UTC 2021
diff --git a/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h
index 42bc8e6dc4..a42e86bada 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
@@ -444,12 +444,8 @@
 #define CAMS_PER_BANK 2
 #define CAMS_PER_BANK_padding 0
 #define can2BaudRate_offset 1734
-#define can2NbcType_offset 1744
-#define can2ReadEnabled_offset 1740
 #define can2RxPin_offset 1749
-#define can2SleepPeriodMs_offset 720
 #define can2TxPin_offset 1748
-#define can2WriteEnabled_offset 1740
 #define can_baudrate_e_auto_enum "B100KBPS", "B250KBPS", "B500KBPS", "B1MBPS"
 #define can_baudrate_e_B100KBPS 0
 #define can_baudrate_e_B1MBPS 3
@@ -744,7 +740,6 @@
 #define enableMapEstimationTableFallback_offset 164
 #define enableSoftwareKnock_offset 896
 #define enableTrailingSparks_offset 164
-#define enableVerboseCan2Tx_offset 1740
 #define enableVerboseCanTx_offset 748
 #define engine_configuration_s_size 5020
 #define engine_load_mode_e_auto_enum "INVALID", "INVALID", "INVALID", "LM_SPEED_DENSITY", "LM_REAL_MAF", "LM_ALPHA_N", "LM_LUA", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "LM_MOCK"
@@ -1875,7 +1870,7 @@
 #define show_test_presets true
 #define showHumanReadableWarning_offset 896
 #define showSdCardWarning_offset 164
-#define SIGNATURE_HASH 3258499318
+#define SIGNATURE_HASH 3414881066
 #define silentTriggerError_offset 1260
 #define slowAdcAlpha_offset 1712
 #define sparkDwellRpmBins_offset 54
@@ -2395,7 +2390,7 @@
 #define ts_show_spi true
 #define ts_show_trigger_comparator false
 #define ts_show_tunerstudio_port true
-#define TS_SIGNATURE "rusEFI 2021.12.24.hellen_cypress.3258499318"
+#define TS_SIGNATURE "rusEFI 2021.12.25.hellen_cypress.3414881066"
 #define TS_SINGLE_WRITE_COMMAND 'W'
 #define TS_SINGLE_WRITE_COMMAND_char W
 #define TS_TEST_COMMAND 't'
@@ -2426,6 +2421,12 @@
 #define unused1476b20_offset 1272
 #define unused1476b3_offset 1272
 #define unused1476b8_offset 1272
+#define unused1736_offset 1736
+#define unused1740b0_offset 1740
+#define unused1740b1_offset 1740
+#define unused1740b2_offset 1740
+#define unused1744_offset 1744
+#define unused720_offset 720
 #define unused_1484_bit_24_offset 1272
 #define unused_1484_bit_25_offset 1272
 #define unused_1484_bit_26_offset 1272
@@ -2515,7 +2516,6 @@
 #define vehicleWeight_offset 786
 #define veLoadBins_offset 19300
 #define veOverrideMode_offset 1733
-#define verboseCan2BaseAddress_offset 1736
 #define verboseCan_offset 164
 #define verboseCanBaseAddress_offset 760
 #define verboseTLE8888_offset 748
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 63d593636e..2b45ebf268 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 Wed Dec 22 16:07:28 UTC 2021
+// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sat Dec 25 04:39:39 UTC 2021
 // by class com.rusefi.output.CHeaderConsumer
 // begin
 #pragma once
@@ -1532,11 +1532,10 @@ struct engine_configuration_s {
 	 */
 	uint8_t acIdleExtraOffset;
 	/**
-	 * CANbus thread period, ms
 	ms
 	 * offset 720
 	 */
-	int can2SleepPeriodMs;
+	int unused720;
 	/**
 	 * Voltage when the wastegate is closed.
 	 * You probably don't have one of these!
@@ -2933,20 +2932,16 @@ struct engine_configuration_s {
 	/**
 	 * offset 1736
 	 */
-	uint32_t verboseCan2BaseAddress;
+	uint32_t unused1736;
 	/**
-	 * CAN broadcast using custom rusEFI protocol
-	 * enable can_broadcast/disable can_broadcast
 	offset 1740 bit 0 */
-	bool enableVerboseCan2Tx : 1 {};
+	bool unused1740b0 : 1 {};
 	/**
-	 * enable can_read/disable can_read
 	offset 1740 bit 1 */
-	bool can2ReadEnabled : 1 {};
+	bool unused1740b1 : 1 {};
 	/**
-	 * enable can_write/disable can_write
 	offset 1740 bit 2 */
-	bool can2WriteEnabled : 1 {};
+	bool unused1740b2 : 1 {};
 	/**
 	 * Enable if DC-motor driver (H-bridge) inverts the signals (eg. RZ7899 on Hellen boards)
 	offset 1740 bit 3 */
@@ -3036,10 +3031,9 @@ struct engine_configuration_s {
 	offset 1740 bit 31 */
 	bool unusedBit_498_31 : 1 {};
 	/**
-	 * set can_mode X
 	 * offset 1744
 	 */
-	can_nbc_e can2NbcType;
+	uint32_t unused1744;
 	/**
 	 * set_can2_tx_pin X
 	 * offset 1748
@@ -4411,4 +4405,4 @@ struct persistent_config_s {
 };
 
 // end
-// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Wed Dec 22 16:07:28 UTC 2021
+// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sat Dec 25 04:39:39 UTC 2021
diff --git a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h
index 96c857c611..4d367df5a5 100644
--- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h
+++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h
@@ -429,12 +429,8 @@
 #define CAMS_PER_BANK 1
 #define CAMS_PER_BANK_padding 1
 #define can2BaudRate_offset 1734
-#define can2NbcType_offset 1744
-#define can2ReadEnabled_offset 1740
 #define can2RxPin_offset 1749
-#define can2SleepPeriodMs_offset 720
 #define can2TxPin_offset 1748
-#define can2WriteEnabled_offset 1740
 #define can_baudrate_e_auto_enum "B100KBPS", "B250KBPS", "B500KBPS", "B1MBPS"
 #define can_baudrate_e_B100KBPS 0
 #define can_baudrate_e_B1MBPS 3
@@ -729,7 +725,6 @@
 #define enableMapEstimationTableFallback_offset 164
 #define enableSoftwareKnock_offset 896
 #define enableTrailingSparks_offset 164
-#define enableVerboseCan2Tx_offset 1740
 #define enableVerboseCanTx_offset 748
 #define engine_configuration_s_size 4992
 #define engine_load_mode_e_auto_enum "INVALID", "INVALID", "INVALID", "LM_SPEED_DENSITY", "LM_REAL_MAF", "LM_ALPHA_N", "LM_LUA", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "LM_MOCK"
@@ -1860,7 +1855,7 @@
 #define show_test_presets true
 #define showHumanReadableWarning_offset 896
 #define showSdCardWarning_offset 164
-#define SIGNATURE_HASH 1033702410
+#define SIGNATURE_HASH 875511766
 #define silentTriggerError_offset 1260
 #define slowAdcAlpha_offset 1712
 #define sparkDwellRpmBins_offset 54
@@ -2380,7 +2375,7 @@
 #define ts_show_spi true
 #define ts_show_trigger_comparator true
 #define ts_show_tunerstudio_port true
-#define TS_SIGNATURE "rusEFI 2021.12.24.kin.1033702410"
+#define TS_SIGNATURE "rusEFI 2021.12.25.kin.875511766"
 #define TS_SINGLE_WRITE_COMMAND 'W'
 #define TS_SINGLE_WRITE_COMMAND_char W
 #define TS_TEST_COMMAND 't'
@@ -2411,6 +2406,12 @@
 #define unused1476b20_offset 1272
 #define unused1476b3_offset 1272
 #define unused1476b8_offset 1272
+#define unused1736_offset 1736
+#define unused1740b0_offset 1740
+#define unused1740b1_offset 1740
+#define unused1740b2_offset 1740
+#define unused1744_offset 1744
+#define unused720_offset 720
 #define unused_1484_bit_24_offset 1272
 #define unused_1484_bit_25_offset 1272
 #define unused_1484_bit_26_offset 1272
@@ -2500,7 +2501,6 @@
 #define vehicleWeight_offset 786
 #define veLoadBins_offset 19272
 #define veOverrideMode_offset 1733
-#define verboseCan2BaseAddress_offset 1736
 #define verboseCan_offset 164
 #define verboseCanBaseAddress_offset 760
 #define verboseTLE8888_offset 748
diff --git a/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h b/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h
index 63cb6d5c62..a270434c12 100644
--- a/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h
+++ b/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h
@@ -1,4 +1,4 @@
-// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Wed Dec 22 16:07:33 UTC 2021
+// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Sat Dec 25 04:39:43 UTC 2021
 // by class com.rusefi.output.CHeaderConsumer
 // begin
 #pragma once
@@ -1532,11 +1532,10 @@ struct engine_configuration_s {
 	 */
 	uint8_t acIdleExtraOffset;
 	/**
-	 * CANbus thread period, ms
 	ms
 	 * offset 720
 	 */
-	int can2SleepPeriodMs;
+	int unused720;
 	/**
 	 * Voltage when the wastegate is closed.
 	 * You probably don't have one of these!
@@ -2933,20 +2932,16 @@ struct engine_configuration_s {
 	/**
 	 * offset 1736
 	 */
-	uint32_t verboseCan2BaseAddress;
+	uint32_t unused1736;
 	/**
-	 * CAN broadcast using custom rusEFI protocol
-	 * enable can_broadcast/disable can_broadcast
 	offset 1740 bit 0 */
-	bool enableVerboseCan2Tx : 1 {};
+	bool unused1740b0 : 1 {};
 	/**
-	 * enable can_read/disable can_read
 	offset 1740 bit 1 */
-	bool can2ReadEnabled : 1 {};
+	bool unused1740b1 : 1 {};
 	/**
-	 * enable can_write/disable can_write
 	offset 1740 bit 2 */
-	bool can2WriteEnabled : 1 {};
+	bool unused1740b2 : 1 {};
 	/**
 	 * Enable if DC-motor driver (H-bridge) inverts the signals (eg. RZ7899 on Hellen boards)
 	offset 1740 bit 3 */
@@ -3036,10 +3031,9 @@ struct engine_configuration_s {
 	offset 1740 bit 31 */
 	bool unusedBit_498_31 : 1 {};
 	/**
-	 * set can_mode X
 	 * offset 1744
 	 */
-	can_nbc_e can2NbcType;
+	uint32_t unused1744;
 	/**
 	 * set_can2_tx_pin X
 	 * offset 1748
@@ -4417,4 +4411,4 @@ struct persistent_config_s {
 };
 
 // end
-// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Wed Dec 22 16:07:33 UTC 2021
+// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Sat Dec 25 04:39:43 UTC 2021
diff --git a/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h
index 2281f97fac..4ee371ac3f 100644
--- a/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h
+++ b/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h
@@ -456,12 +456,8 @@
 #define CAMS_PER_BANK 2
 #define CAMS_PER_BANK_padding 0
 #define can2BaudRate_offset 1734
-#define can2NbcType_offset 1744
-#define can2ReadEnabled_offset 1740
 #define can2RxPin_offset 1749
-#define can2SleepPeriodMs_offset 720
 #define can2TxPin_offset 1748
-#define can2WriteEnabled_offset 1740
 #define can_baudrate_e_auto_enum "B100KBPS", "B250KBPS", "B500KBPS", "B1MBPS"
 #define can_baudrate_e_B100KBPS 0
 #define can_baudrate_e_B1MBPS 3
@@ -756,7 +752,6 @@
 #define enableMapEstimationTableFallback_offset 164
 #define enableSoftwareKnock_offset 896
 #define enableTrailingSparks_offset 164
-#define enableVerboseCan2Tx_offset 1740
 #define enableVerboseCanTx_offset 748
 #define engine_configuration_s_size 5020
 #define engine_load_mode_e_auto_enum "INVALID", "INVALID", "INVALID", "LM_SPEED_DENSITY", "LM_REAL_MAF", "LM_ALPHA_N", "LM_LUA", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "LM_MOCK"
@@ -1888,7 +1883,7 @@
 #define show_test_presets false
 #define showHumanReadableWarning_offset 896
 #define showSdCardWarning_offset 164
-#define SIGNATURE_HASH 997667098
+#define SIGNATURE_HASH 851772102
 #define silentTriggerError_offset 1260
 #define slowAdcAlpha_offset 1712
 #define sparkDwellRpmBins_offset 54
@@ -2408,7 +2403,7 @@
 #define ts_show_spi true
 #define ts_show_trigger_comparator false
 #define ts_show_tunerstudio_port false
-#define TS_SIGNATURE "rusEFI 2021.12.24.subaru_eg33_f7.997667098"
+#define TS_SIGNATURE "rusEFI 2021.12.25.subaru_eg33_f7.851772102"
 #define TS_SINGLE_WRITE_COMMAND 'W'
 #define TS_SINGLE_WRITE_COMMAND_char W
 #define TS_TEST_COMMAND 't'
@@ -2439,6 +2434,12 @@
 #define unused1476b20_offset 1272
 #define unused1476b3_offset 1272
 #define unused1476b8_offset 1272
+#define unused1736_offset 1736
+#define unused1740b0_offset 1740
+#define unused1740b1_offset 1740
+#define unused1740b2_offset 1740
+#define unused1744_offset 1744
+#define unused720_offset 720
 #define unused_1484_bit_24_offset 1272
 #define unused_1484_bit_25_offset 1272
 #define unused_1484_bit_26_offset 1272
@@ -2528,7 +2529,6 @@
 #define vehicleWeight_offset 786
 #define veLoadBins_offset 19300
 #define veOverrideMode_offset 1733
-#define verboseCan2BaseAddress_offset 1736
 #define verboseCan_offset 164
 #define verboseCanBaseAddress_offset 760
 #define verboseTLE8888_offset 748
diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h
index 345d4a55a2..c911cff9d2 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 Wed Dec 22 16:07:37 UTC 2021
+// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Dec 25 04:39:46 UTC 2021
 // by class com.rusefi.output.CHeaderConsumer
 // begin
 #pragma once
@@ -1532,11 +1532,10 @@ struct engine_configuration_s {
 	 */
 	uint8_t acIdleExtraOffset;
 	/**
-	 * CANbus thread period, ms
 	ms
 	 * offset 720
 	 */
-	int can2SleepPeriodMs;
+	int unused720;
 	/**
 	 * Voltage when the wastegate is closed.
 	 * You probably don't have one of these!
@@ -2933,20 +2932,16 @@ struct engine_configuration_s {
 	/**
 	 * offset 1736
 	 */
-	uint32_t verboseCan2BaseAddress;
+	uint32_t unused1736;
 	/**
-	 * CAN broadcast using custom rusEFI protocol
-	 * enable can_broadcast/disable can_broadcast
 	offset 1740 bit 0 */
-	bool enableVerboseCan2Tx : 1 {};
+	bool unused1740b0 : 1 {};
 	/**
-	 * enable can_read/disable can_read
 	offset 1740 bit 1 */
-	bool can2ReadEnabled : 1 {};
+	bool unused1740b1 : 1 {};
 	/**
-	 * enable can_write/disable can_write
 	offset 1740 bit 2 */
-	bool can2WriteEnabled : 1 {};
+	bool unused1740b2 : 1 {};
 	/**
 	 * Enable if DC-motor driver (H-bridge) inverts the signals (eg. RZ7899 on Hellen boards)
 	offset 1740 bit 3 */
@@ -3036,10 +3031,9 @@ struct engine_configuration_s {
 	offset 1740 bit 31 */
 	bool unusedBit_498_31 : 1 {};
 	/**
-	 * set can_mode X
 	 * offset 1744
 	 */
-	can_nbc_e can2NbcType;
+	uint32_t unused1744;
 	/**
 	 * set_can2_tx_pin X
 	 * offset 1748
@@ -4417,4 +4411,4 @@ struct persistent_config_s {
 };
 
 // end
-// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Dec 22 16:07:37 UTC 2021
+// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Dec 25 04:39:46 UTC 2021
diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h
index 331c91bf3e..2e254e7a50 100644
--- a/firmware/controllers/generated/rusefi_generated.h
+++ b/firmware/controllers/generated/rusefi_generated.h
@@ -444,12 +444,8 @@
 #define CAMS_PER_BANK 2
 #define CAMS_PER_BANK_padding 0
 #define can2BaudRate_offset 1734
-#define can2NbcType_offset 1744
-#define can2ReadEnabled_offset 1740
 #define can2RxPin_offset 1749
-#define can2SleepPeriodMs_offset 720
 #define can2TxPin_offset 1748
-#define can2WriteEnabled_offset 1740
 #define can_baudrate_e_auto_enum "B100KBPS", "B250KBPS", "B500KBPS", "B1MBPS"
 #define can_baudrate_e_B100KBPS 0
 #define can_baudrate_e_B1MBPS 3
@@ -744,7 +740,6 @@
 #define enableMapEstimationTableFallback_offset 164
 #define enableSoftwareKnock_offset 896
 #define enableTrailingSparks_offset 164
-#define enableVerboseCan2Tx_offset 1740
 #define enableVerboseCanTx_offset 748
 #define engine_configuration_s_size 5020
 #define engine_load_mode_e_auto_enum "INVALID", "INVALID", "INVALID", "LM_SPEED_DENSITY", "LM_REAL_MAF", "LM_ALPHA_N", "LM_LUA", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "LM_MOCK"
@@ -1875,7 +1870,7 @@
 #define show_test_presets true
 #define showHumanReadableWarning_offset 896
 #define showSdCardWarning_offset 164
-#define SIGNATURE_HASH 4174194506
+#define SIGNATURE_HASH 4051637398
 #define silentTriggerError_offset 1260
 #define slowAdcAlpha_offset 1712
 #define sparkDwellRpmBins_offset 54
@@ -2395,7 +2390,7 @@
 #define ts_show_spi true
 #define ts_show_trigger_comparator false
 #define ts_show_tunerstudio_port true
-#define TS_SIGNATURE "rusEFI 2021.12.24.all.4174194506"
+#define TS_SIGNATURE "rusEFI 2021.12.25.all.4051637398"
 #define TS_SINGLE_WRITE_COMMAND 'W'
 #define TS_SINGLE_WRITE_COMMAND_char W
 #define TS_TEST_COMMAND 't'
@@ -2426,6 +2421,12 @@
 #define unused1476b20_offset 1272
 #define unused1476b3_offset 1272
 #define unused1476b8_offset 1272
+#define unused1736_offset 1736
+#define unused1740b0_offset 1740
+#define unused1740b1_offset 1740
+#define unused1740b2_offset 1740
+#define unused1744_offset 1744
+#define unused720_offset 720
 #define unused_1484_bit_24_offset 1272
 #define unused_1484_bit_25_offset 1272
 #define unused_1484_bit_26_offset 1272
@@ -2515,7 +2516,6 @@
 #define vehicleWeight_offset 786
 #define veLoadBins_offset 19300
 #define veOverrideMode_offset 1733
-#define verboseCan2BaseAddress_offset 1736
 #define verboseCan_offset 164
 #define verboseCanBaseAddress_offset 760
 #define verboseTLE8888_offset 748
diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h
index 1f110971d5..af5fc0bf94 100644
--- a/firmware/controllers/generated/signature_all.h
+++ b/firmware/controllers/generated/signature_all.h
@@ -2,5 +2,5 @@
 // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt
 //
 
-#define SIGNATURE_HASH 4174194506
-#define TS_SIGNATURE "rusEFI 2021.12.24.all.4174194506"
+#define SIGNATURE_HASH 4051637398
+#define TS_SIGNATURE "rusEFI 2021.12.25.all.4051637398"
diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h
index b5f03c3ab5..4e7cdf6ba8 100644
--- a/firmware/controllers/generated/signature_atlas.h
+++ b/firmware/controllers/generated/signature_atlas.h
@@ -2,5 +2,5 @@
 // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt
 //
 
-#define SIGNATURE_HASH 3825717869
-#define TS_SIGNATURE "rusEFI 2021.12.24.atlas.3825717869"
+#define SIGNATURE_HASH 3988119985
+#define TS_SIGNATURE "rusEFI 2021.12.25.atlas.3988119985"
diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h
index ae38b7c707..7869b5e23a 100644
--- a/firmware/controllers/generated/signature_f429-discovery.h
+++ b/firmware/controllers/generated/signature_f429-discovery.h
@@ -2,5 +2,5 @@
 // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt
 //
 
-#define SIGNATURE_HASH 4174194506
-#define TS_SIGNATURE "rusEFI 2021.12.24.f429-discovery.4174194506"
+#define SIGNATURE_HASH 4051637398
+#define TS_SIGNATURE "rusEFI 2021.12.25.f429-discovery.4051637398"
diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h
index 788f89123c..bc2abae078 100644
--- a/firmware/controllers/generated/signature_frankenso_na6.h
+++ b/firmware/controllers/generated/signature_frankenso_na6.h
@@ -2,5 +2,5 @@
 // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt
 //
 
-#define SIGNATURE_HASH 2197779107
-#define TS_SIGNATURE "rusEFI 2021.12.24.frankenso_na6.2197779107"
+#define SIGNATURE_HASH 2337096063
+#define TS_SIGNATURE "rusEFI 2021.12.25.frankenso_na6.2337096063"
diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h
index e21d0f1359..a38a4ef8bc 100644
--- a/firmware/controllers/generated/signature_hellen-nb1.h
+++ b/firmware/controllers/generated/signature_hellen-nb1.h
@@ -2,5 +2,5 @@
 // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt
 //
 
-#define SIGNATURE_HASH 1562318787
-#define TS_SIGNATURE "rusEFI 2021.12.24.hellen-nb1.1562318787"
+#define SIGNATURE_HASH 1420633119
+#define TS_SIGNATURE "rusEFI 2021.12.25.hellen-nb1.1420633119"
diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h
index 12dc981433..e748c609c2 100644
--- a/firmware/controllers/generated/signature_hellen121nissan.h
+++ b/firmware/controllers/generated/signature_hellen121nissan.h
@@ -2,5 +2,5 @@
 // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt
 //
 
-#define SIGNATURE_HASH 1128875499
-#define TS_SIGNATURE "rusEFI 2021.12.24.hellen121nissan.1128875499"
+#define SIGNATURE_HASH 1257993783
+#define TS_SIGNATURE "rusEFI 2021.12.25.hellen121nissan.1257993783"
diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h
index d24936c9bf..e1edcd1c70 100644
--- a/firmware/controllers/generated/signature_hellen121vag.h
+++ b/firmware/controllers/generated/signature_hellen121vag.h
@@ -2,5 +2,5 @@
 // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt
 //
 
-#define SIGNATURE_HASH 2809004864
-#define TS_SIGNATURE "rusEFI 2021.12.24.hellen121vag.2809004864"
+#define SIGNATURE_HASH 2933665948
+#define TS_SIGNATURE "rusEFI 2021.12.25.hellen121vag.2933665948"
diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h
index 5f06d12509..826329fcb0 100644
--- a/firmware/controllers/generated/signature_hellen128.h
+++ b/firmware/controllers/generated/signature_hellen128.h
@@ -2,5 +2,5 @@
 // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt
 //
 
-#define SIGNATURE_HASH 1644907757
-#define TS_SIGNATURE "rusEFI 2021.12.24.hellen128.1644907757"
+#define SIGNATURE_HASH 1807318833
+#define TS_SIGNATURE "rusEFI 2021.12.25.hellen128.1807318833"
diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h
index ec757ef2d9..6165dac757 100644
--- a/firmware/controllers/generated/signature_hellen154hyundai.h
+++ b/firmware/controllers/generated/signature_hellen154hyundai.h
@@ -2,5 +2,5 @@
 // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt
 //
 
-#define SIGNATURE_HASH 886127590
-#define TS_SIGNATURE "rusEFI 2021.12.24.hellen154hyundai.886127590"
+#define SIGNATURE_HASH 1029900346
+#define TS_SIGNATURE "rusEFI 2021.12.25.hellen154hyundai.1029900346"
diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h
index 17443015d1..f7935e50ae 100644
--- a/firmware/controllers/generated/signature_hellen72.h
+++ b/firmware/controllers/generated/signature_hellen72.h
@@ -2,5 +2,5 @@
 // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt
 //
 
-#define SIGNATURE_HASH 208707834
-#define TS_SIGNATURE "rusEFI 2021.12.24.hellen72.208707834"
+#define SIGNATURE_HASH 96637734
+#define TS_SIGNATURE "rusEFI 2021.12.25.hellen72.96637734"
diff --git a/firmware/controllers/generated/signature_hellen81.h b/firmware/controllers/generated/signature_hellen81.h
index 453fdf891d..e95bea49c6 100644
--- a/firmware/controllers/generated/signature_hellen81.h
+++ b/firmware/controllers/generated/signature_hellen81.h
@@ -2,5 +2,5 @@
 // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt
 //
 
-#define SIGNATURE_HASH 3095215369
-#define TS_SIGNATURE "rusEFI 2021.12.24.hellen81.3095215369"
+#define SIGNATURE_HASH 2983136981
+#define TS_SIGNATURE "rusEFI 2021.12.25.hellen81.2983136981"
diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h
index ef1fa6a5d9..042ce76f02 100644
--- a/firmware/controllers/generated/signature_hellen88bmw.h
+++ b/firmware/controllers/generated/signature_hellen88bmw.h
@@ -2,5 +2,5 @@
 // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt
 //
 
-#define SIGNATURE_HASH 1494070805
-#define TS_SIGNATURE "rusEFI 2021.12.24.hellen88bmw.1494070805"
+#define SIGNATURE_HASH 1354728905
+#define TS_SIGNATURE "rusEFI 2021.12.25.hellen88bmw.1354728905"
diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h
index 57e6b0dd8f..f646084346 100644
--- a/firmware/controllers/generated/signature_hellenNA6.h
+++ b/firmware/controllers/generated/signature_hellenNA6.h
@@ -2,5 +2,5 @@
 // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt
 //
 
-#define SIGNATURE_HASH 2398118370
-#define TS_SIGNATURE "rusEFI 2021.12.24.hellenNA6.2398118370"
+#define SIGNATURE_HASH 2269270590
+#define TS_SIGNATURE "rusEFI 2021.12.25.hellenNA6.2269270590"
diff --git a/firmware/controllers/generated/signature_hellen_cypress.h b/firmware/controllers/generated/signature_hellen_cypress.h
index d28e50fad3..0a70b027b5 100644
--- a/firmware/controllers/generated/signature_hellen_cypress.h
+++ b/firmware/controllers/generated/signature_hellen_cypress.h
@@ -2,5 +2,5 @@
 // was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt
 //
 
-#define SIGNATURE_HASH 3258499318
-#define TS_SIGNATURE "rusEFI 2021.12.24.hellen_cypress.3258499318"
+#define SIGNATURE_HASH 3414881066
+#define TS_SIGNATURE "rusEFI 2021.12.25.hellen_cypress.3414881066"
diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h
index e27bbb7ab5..fdfe971625 100644
--- a/firmware/controllers/generated/signature_kin.h
+++ b/firmware/controllers/generated/signature_kin.h
@@ -2,5 +2,5 @@
 // was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt
 //
 
-#define SIGNATURE_HASH 1033702410
-#define TS_SIGNATURE "rusEFI 2021.12.24.kin.1033702410"
+#define SIGNATURE_HASH 875511766
+#define TS_SIGNATURE "rusEFI 2021.12.25.kin.875511766"
diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h
index 294ff2d6ea..f8b1f7b5f5 100644
--- a/firmware/controllers/generated/signature_mre_f4.h
+++ b/firmware/controllers/generated/signature_mre_f4.h
@@ -2,5 +2,5 @@
 // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt
 //
 
-#define SIGNATURE_HASH 1273650686
-#define TS_SIGNATURE "rusEFI 2021.12.24.mre_f4.1273650686"
+#define SIGNATURE_HASH 1113091618
+#define TS_SIGNATURE "rusEFI 2021.12.25.mre_f4.1113091618"
diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h
index a4897542b0..4c03d450c3 100644
--- a/firmware/controllers/generated/signature_mre_f7.h
+++ b/firmware/controllers/generated/signature_mre_f7.h
@@ -2,5 +2,5 @@
 // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt
 //
 
-#define SIGNATURE_HASH 1273650686
-#define TS_SIGNATURE "rusEFI 2021.12.24.mre_f7.1273650686"
+#define SIGNATURE_HASH 1113091618
+#define TS_SIGNATURE "rusEFI 2021.12.25.mre_f7.1113091618"
diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h
index 050db6e977..5310cc5fd4 100644
--- a/firmware/controllers/generated/signature_prometheus_405.h
+++ b/firmware/controllers/generated/signature_prometheus_405.h
@@ -2,5 +2,5 @@
 // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt
 //
 
-#define SIGNATURE_HASH 2821193388
-#define TS_SIGNATURE "rusEFI 2021.12.24.prometheus_405.2821193388"
+#define SIGNATURE_HASH 2710949232
+#define TS_SIGNATURE "rusEFI 2021.12.25.prometheus_405.2710949232"
diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h
index 10dfa081db..78cafced6a 100644
--- a/firmware/controllers/generated/signature_prometheus_469.h
+++ b/firmware/controllers/generated/signature_prometheus_469.h
@@ -2,5 +2,5 @@
 // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt
 //
 
-#define SIGNATURE_HASH 2821193388
-#define TS_SIGNATURE "rusEFI 2021.12.24.prometheus_469.2821193388"
+#define SIGNATURE_HASH 2710949232
+#define TS_SIGNATURE "rusEFI 2021.12.25.prometheus_469.2710949232"
diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h
index 18b5528b4f..bc9d5a0227 100644
--- a/firmware/controllers/generated/signature_proteus_f4.h
+++ b/firmware/controllers/generated/signature_proteus_f4.h
@@ -2,5 +2,5 @@
 // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt
 //
 
-#define SIGNATURE_HASH 976273814
-#define TS_SIGNATURE "rusEFI 2021.12.24.proteus_f4.976273814"
+#define SIGNATURE_HASH 864219722
+#define TS_SIGNATURE "rusEFI 2021.12.25.proteus_f4.864219722"
diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h
index a370c7f9f1..e016612f07 100644
--- a/firmware/controllers/generated/signature_proteus_f7.h
+++ b/firmware/controllers/generated/signature_proteus_f7.h
@@ -2,5 +2,5 @@
 // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt
 //
 
-#define SIGNATURE_HASH 976273814
-#define TS_SIGNATURE "rusEFI 2021.12.24.proteus_f7.976273814"
+#define SIGNATURE_HASH 864219722
+#define TS_SIGNATURE "rusEFI 2021.12.25.proteus_f7.864219722"
diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h
index 7408dac250..dead2d4ebb 100644
--- a/firmware/controllers/generated/signature_subaru_eg33_f7.h
+++ b/firmware/controllers/generated/signature_subaru_eg33_f7.h
@@ -2,5 +2,5 @@
 // was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt
 //
 
-#define SIGNATURE_HASH 997667098
-#define TS_SIGNATURE "rusEFI 2021.12.24.subaru_eg33_f7.997667098"
+#define SIGNATURE_HASH 851772102
+#define TS_SIGNATURE "rusEFI 2021.12.25.subaru_eg33_f7.851772102"
diff --git a/firmware/controllers/lua/generated/value_lookup_generated.cpp b/firmware/controllers/lua/generated/value_lookup_generated.cpp
index ed49345d10..1b52de75a3 100644
--- a/firmware/controllers/lua/generated/value_lookup_generated.cpp
+++ b/firmware/controllers/lua/generated/value_lookup_generated.cpp
@@ -240,8 +240,6 @@ float getConfigValueByName(const char *name) {
 		return engineConfiguration->idle_antiwindupFreq;
 	if (strEqualCaseInsensitive(name, "acIdleExtraOffset"))
 		return engineConfiguration->acIdleExtraOffset;
-	if (strEqualCaseInsensitive(name, "can2SleepPeriodMs"))
-		return engineConfiguration->can2SleepPeriodMs;
 	if (strEqualCaseInsensitive(name, "wastegatePositionMin"))
 		return engineConfiguration->wastegatePositionMin;
 	if (strEqualCaseInsensitive(name, "wastegatePositionMax"))
@@ -658,14 +656,6 @@ float getConfigValueByName(const char *name) {
 		return engineConfiguration->throttlePedalSecondaryUpVoltage;
 	if (strEqualCaseInsensitive(name, "throttlePedalSecondaryWOTVoltage"))
 		return engineConfiguration->throttlePedalSecondaryWOTVoltage;
-	if (strEqualCaseInsensitive(name, "verboseCan2BaseAddress"))
-		return engineConfiguration->verboseCan2BaseAddress;
-	if (strEqualCaseInsensitive(name, "enableVerboseCan2Tx"))
-		return engineConfiguration->enableVerboseCan2Tx;
-	if (strEqualCaseInsensitive(name, "can2ReadEnabled"))
-		return engineConfiguration->can2ReadEnabled;
-	if (strEqualCaseInsensitive(name, "can2WriteEnabled"))
-		return engineConfiguration->can2WriteEnabled;
 	if (strEqualCaseInsensitive(name, "stepperDcInvertedPins"))
 		return engineConfiguration->stepperDcInvertedPins;
 	if (strEqualCaseInsensitive(name, "boostCutPressure"))
@@ -1499,11 +1489,6 @@ void setConfigValueByName(const char *name, float value) {
 		engineConfiguration->acIdleExtraOffset = (int)value;
 		return;
 	}
-	if (strEqualCaseInsensitive(name, "can2SleepPeriodMs"))
-	{
-		engineConfiguration->can2SleepPeriodMs = (int)value;
-		return;
-	}
 	if (strEqualCaseInsensitive(name, "wastegatePositionMin"))
 	{
 		engineConfiguration->wastegatePositionMin = (int)value;
@@ -2544,26 +2529,6 @@ void setConfigValueByName(const char *name, float value) {
 		engineConfiguration->throttlePedalSecondaryWOTVoltage = value;
 		return;
 	}
-	if (strEqualCaseInsensitive(name, "verboseCan2BaseAddress"))
-	{
-		engineConfiguration->verboseCan2BaseAddress = (int)value;
-		return;
-	}
-	if (strEqualCaseInsensitive(name, "enableVerboseCan2Tx"))
-	{
-		engineConfiguration->enableVerboseCan2Tx = (int)value;
-		return;
-	}
-	if (strEqualCaseInsensitive(name, "can2ReadEnabled"))
-	{
-		engineConfiguration->can2ReadEnabled = (int)value;
-		return;
-	}
-	if (strEqualCaseInsensitive(name, "can2WriteEnabled"))
-	{
-		engineConfiguration->can2WriteEnabled = (int)value;
-		return;
-	}
 	if (strEqualCaseInsensitive(name, "stepperDcInvertedPins"))
 	{
 		engineConfiguration->stepperDcInvertedPins = (int)value;
diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini
index 1313f8ad59..a664c82d3f 100644
--- a/firmware/tunerstudio/generated/rusefi.ini
+++ b/firmware/tunerstudio/generated/rusefi.ini
@@ -32,12 +32,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
- 	signature    = "rusEFI 2021.12.24.all.4174194506"
+ 	signature    = "rusEFI 2021.12.25.all.4051637398"
 
 [TunerStudio]
    queryCommand   = "S"
    versionInfo    = "V"  ; firmwave version for title bar.
-   signature    = "rusEFI 2021.12.24.all.4174194506" ; signature is expected to be 7 or more characters.
+   signature    = "rusEFI 2021.12.25.all.4051637398" ; signature is expected to be 7 or more characters.
 
    ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
    useLegacyFTempUnits = false
@@ -84,7 +84,7 @@ enable2ndByteCanID = false
    ;  name       			= scalar, type, offset,         units,     scale, translate,    lo,      hi, digits
 
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Dec 24 04:14:15 UTC 2021
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Dec 25 04:39:37 UTC 2021
 
 pageSize            = 20996
 page = 1
@@ -365,7 +365,7 @@ canTxPin = bits, U08, 716, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3",
 canRxPin = bits, U08, 717, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 throttlePedalUpPinMode = bits, U08, 718, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID"
 acIdleExtraOffset = scalar, U08, 719, "%", 1, 0, 0, 100, 0
-can2SleepPeriodMs = scalar, S32, 720, "ms", 1, 0, 0, 1000, 2
+unused720 = scalar, S32, 720, "ms", 1, 0, 0, 1000, 2
 wastegatePositionMin = scalar, U16, 724, "mv", 1, 0, 0, 5000, 0
 wastegatePositionMax = scalar, U16, 726, "mv", 1, 0, 0, 5000, 0
 idlePositionMin = scalar, U16, 728, "mv", 1, 0, 0, 5000, 0
@@ -794,10 +794,10 @@ canBaudRate = bits, U08, 1732, [0:1], "100kbps", "250kbps", "500kbps", "1Mbps"
 veOverrideMode = bits, U08, 1733, [0:1], "None", "MAP", "TPS", "INVALID"
 can2BaudRate = bits, U08, 1734, [0:1], "100kbps", "250kbps", "500kbps", "1Mbps"
 afrOverrideMode = bits, U08, 1735, [0:2], "None", "MAP", "TPS", "Acc Pedal", "Cyl Filling %", "INVALID", "INVALID", "INVALID"
-verboseCan2BaseAddress = scalar, U32, 1736, "", 1, 0, 0, 536870911, 0
-enableVerboseCan2Tx = bits, U32, 1740, [0:0], "false", "true"
-can2ReadEnabled = bits, U32, 1740, [1:1], "false", "true"
-can2WriteEnabled = bits, U32, 1740, [2:2], "false", "true"
+unused1736 = scalar, U32, 1736, "", 1, 0, 0, 536870911, 0
+unused1740b0 = bits, U32, 1740, [0:0], "false", "true"
+unused1740b1 = bits, U32, 1740, [1:1], "false", "true"
+unused1740b2 = bits, U32, 1740, [2:2], "false", "true"
 stepperDcInvertedPins = bits, U32, 1740, [3:3], "false", "true"
 unused1127 = bits, U32, 1740, [4:4], "false", "true"
 unused1128 = bits, U32, 1740, [5:5], "false", "true"
@@ -827,7 +827,7 @@ unusedBit_498_28 = bits, U32, 1740, [28:28], "false", "true"
 unusedBit_498_29 = bits, U32, 1740, [29:29], "false", "true"
 unusedBit_498_30 = bits, U32, 1740, [30:30], "false", "true"
 unusedBit_498_31 = bits, U32, 1740, [31:31], "false", "true"
-can2NbcType = bits, U32, 1744, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "Nissan VQ35", "Genesis Coupe", "Honda K", "AiM", "type 13", "type 14", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
+unused1744 = scalar, U32, 1744, "", 1,0,0,0,0
 can2TxPin = bits, U08, 1748, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 can2RxPin = bits, U08, 1749, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 starterControlPinMode = bits, U08, 1750, [0:1], "default", "default inverted", "open collector", "open collector inverted"
@@ -1471,7 +1471,6 @@ fuelTrims12_table = array, S08, 20980, [4x4], "", 0.2, 0, -25, 25, 1
 	canTxPin = "set_can_tx_pin X"
 	canRxPin = "set_can_rx_pin X"
 	acIdleExtraOffset = "Additional idle % while A/C is active"
-	can2SleepPeriodMs = "CANbus thread period, ms"
 	wastegatePositionMin = "Voltage when the wastegate is closed.\nYou probably don't have one of these!"
 	wastegatePositionMax = "Voltage when the wastegate is fully open.\nYou probably don't have one of these!\n1 volt = 1000 units"
 	idlePositionMin = "Voltage when the idle valve is closed.\nYou probably don't have one of these!"
@@ -1637,11 +1636,7 @@ fuelTrims12_table = array, S08, 20980, [4x4], "", 0.2, 0, -25, 25, 1
 	canBaudRate = "set can_baudrate"
 	veOverrideMode = "Override the Y axis (load) value used for the VE table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this."
 	afrOverrideMode = "Override the Y axis (load) value used for the AFR table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this."
-	enableVerboseCan2Tx = "CAN broadcast using custom rusEFI protocol\nenable can_broadcast/disable can_broadcast"
-	can2ReadEnabled = "enable can_read/disable can_read"
-	can2WriteEnabled = "enable can_write/disable can_write"
 	stepperDcInvertedPins = "Enable if DC-motor driver (H-bridge) inverts the signals (eg. RZ7899 on Hellen boards)"
-	can2NbcType = "set can_mode X"
 	can2TxPin = "set_can2_tx_pin X"
 	can2RxPin = "set_can2_rx_pin X"
 	ignOverrideMode = "Override the Y axis (load) value used for the ignition table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this."
@@ -5438,35 +5433,35 @@ cmd_set_engine_type_default					= "Z\x00\x31\x00\x00"
 		field = "TX pin",                               binarySerialTxPin, {useSerialPort == 1}
 		field = "RX pin",                               binarySerialRxPin, {useSerialPort == 1}
 
+	dialog = canHw1, "Primary CAN"
+		field = "Bitrate",		canBaudRate
+		field = "RX pin",		canRxPin 
+		field = "TX pin",		canTxPin 
+
+	dialog = canHw2, "Secondary CAN"
+		field = "Bitrate",	can2BaudRate
+		field = "RX pin",		can2RxPin 
+		field = "TX pin",		can2TxPin 
+
 	dialog = canBus, "CAN Bus"
 		field = "CAN read enabled",						canReadEnabled
 		field = "CAN write enabled",					canWriteEnabled
-		field = "CAN bitrate",							canBaudRate
 		field = "CAN dash type",						canNbcType
 		field = "Verbose Can",                          verboseCan
 		field = "inertia measurement unit",             imuType
 		field = "Enable rusEFI CAN broadcast",			enableVerboseCanTx
-		field = "Which CAN channel to broadcast on",    canBroadcastUseChannelTwo
+		field = "rusEFI CAN data bus",    canBroadcastUseChannelTwo
 		field = "rusEFI CAN data base address",			verboseCanBaseAddress
 		field = "rusEFI CAN data address type",			rusefiVerbose29b
 		field = "rusEFI CAN data period",				canSleepPeriodMs
-		field = "RX pin",								canRxPin 
-		field = "TX pin",								canTxPin 
 
 	dialog = canBus2, "Secondary CAN Bus"
-		field = "CAN read enabled",						can2ReadEnabled
-		field = "CAN write enabled",					can2WriteEnabled
-		field = "CAN bitrate",							can2BaudRate
-		field = "CAN dash type",						can2NbcType
-		field = "Enable rusEFI CAN broadcast",			enableVerboseCan2Tx
-		field = "rusEFI CAN data base address",			verboseCan2BaseAddress
-		field = "rusEFI CAN data period",				can2SleepPeriodMs
-		field = "RX pin",								can2RxPin 
-		field = "TX pin",								can2TxPin 
 
 	dialog = canBusMain, "CAN Bus Communication", yAxis
 		panel = canBus
-		panel = canBus2							
+
+		panel = canHw1
+		panel = canHw2	
 
 	dialog = auxSerial, "AUX Sensor Serial"
 		field = "RX pin",								auxSerialRxPin 
diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini
index 9ec8409388..50ec5ee200 100644
--- a/firmware/tunerstudio/generated/rusefi_atlas.ini
+++ b/firmware/tunerstudio/generated/rusefi_atlas.ini
@@ -32,12 +32,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
- 	signature    = "rusEFI 2021.12.24.atlas.3825717869"
+ 	signature    = "rusEFI 2021.12.25.atlas.3988119985"
 
 [TunerStudio]
    queryCommand   = "S"
    versionInfo    = "V"  ; firmwave version for title bar.
-   signature    = "rusEFI 2021.12.24.atlas.3825717869" ; signature is expected to be 7 or more characters.
+   signature    = "rusEFI 2021.12.25.atlas.3988119985" ; signature is expected to be 7 or more characters.
 
    ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
    useLegacyFTempUnits = false
@@ -84,7 +84,7 @@ enable2ndByteCanID = false
    ;  name       			= scalar, type, offset,         units,     scale, translate,    lo,      hi, digits
 
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Dec 24 04:14:12 UTC 2021
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Dec 25 04:39:34 UTC 2021
 
 pageSize            = 20996
 page = 1
@@ -365,7 +365,7 @@ canTxPin = bits, U08, 716, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3",
 canRxPin = bits, U08, 717, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 throttlePedalUpPinMode = bits, U08, 718, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID"
 acIdleExtraOffset = scalar, U08, 719, "%", 1, 0, 0, 100, 0
-can2SleepPeriodMs = scalar, S32, 720, "ms", 1, 0, 0, 1000, 2
+unused720 = scalar, S32, 720, "ms", 1, 0, 0, 1000, 2
 wastegatePositionMin = scalar, U16, 724, "mv", 1, 0, 0, 5000, 0
 wastegatePositionMax = scalar, U16, 726, "mv", 1, 0, 0, 5000, 0
 idlePositionMin = scalar, U16, 728, "mv", 1, 0, 0, 5000, 0
@@ -794,10 +794,10 @@ canBaudRate = bits, U08, 1732, [0:1], "100kbps", "250kbps", "500kbps", "1Mbps"
 veOverrideMode = bits, U08, 1733, [0:1], "None", "MAP", "TPS", "INVALID"
 can2BaudRate = bits, U08, 1734, [0:1], "100kbps", "250kbps", "500kbps", "1Mbps"
 afrOverrideMode = bits, U08, 1735, [0:2], "None", "MAP", "TPS", "Acc Pedal", "Cyl Filling %", "INVALID", "INVALID", "INVALID"
-verboseCan2BaseAddress = scalar, U32, 1736, "", 1, 0, 0, 536870911, 0
-enableVerboseCan2Tx = bits, U32, 1740, [0:0], "false", "true"
-can2ReadEnabled = bits, U32, 1740, [1:1], "false", "true"
-can2WriteEnabled = bits, U32, 1740, [2:2], "false", "true"
+unused1736 = scalar, U32, 1736, "", 1, 0, 0, 536870911, 0
+unused1740b0 = bits, U32, 1740, [0:0], "false", "true"
+unused1740b1 = bits, U32, 1740, [1:1], "false", "true"
+unused1740b2 = bits, U32, 1740, [2:2], "false", "true"
 stepperDcInvertedPins = bits, U32, 1740, [3:3], "false", "true"
 unused1127 = bits, U32, 1740, [4:4], "false", "true"
 unused1128 = bits, U32, 1740, [5:5], "false", "true"
@@ -827,7 +827,7 @@ unusedBit_498_28 = bits, U32, 1740, [28:28], "false", "true"
 unusedBit_498_29 = bits, U32, 1740, [29:29], "false", "true"
 unusedBit_498_30 = bits, U32, 1740, [30:30], "false", "true"
 unusedBit_498_31 = bits, U32, 1740, [31:31], "false", "true"
-can2NbcType = bits, U32, 1744, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "Nissan VQ35", "Genesis Coupe", "Honda K", "AiM", "type 13", "type 14", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
+unused1744 = scalar, U32, 1744, "", 1,0,0,0,0
 can2TxPin = bits, U08, 1748, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 can2RxPin = bits, U08, 1749, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 starterControlPinMode = bits, U08, 1750, [0:1], "default", "default inverted", "open collector", "open collector inverted"
@@ -1471,7 +1471,6 @@ fuelTrims12_table = array, S08, 20980, [4x4], "", 0.2, 0, -25, 25, 1
 	canTxPin = "set_can_tx_pin X"
 	canRxPin = "set_can_rx_pin X"
 	acIdleExtraOffset = "Additional idle % while A/C is active"
-	can2SleepPeriodMs = "CANbus thread period, ms"
 	wastegatePositionMin = "Voltage when the wastegate is closed.\nYou probably don't have one of these!"
 	wastegatePositionMax = "Voltage when the wastegate is fully open.\nYou probably don't have one of these!\n1 volt = 1000 units"
 	idlePositionMin = "Voltage when the idle valve is closed.\nYou probably don't have one of these!"
@@ -1637,11 +1636,7 @@ fuelTrims12_table = array, S08, 20980, [4x4], "", 0.2, 0, -25, 25, 1
 	canBaudRate = "set can_baudrate"
 	veOverrideMode = "Override the Y axis (load) value used for the VE table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this."
 	afrOverrideMode = "Override the Y axis (load) value used for the AFR table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this."
-	enableVerboseCan2Tx = "CAN broadcast using custom rusEFI protocol\nenable can_broadcast/disable can_broadcast"
-	can2ReadEnabled = "enable can_read/disable can_read"
-	can2WriteEnabled = "enable can_write/disable can_write"
 	stepperDcInvertedPins = "Enable if DC-motor driver (H-bridge) inverts the signals (eg. RZ7899 on Hellen boards)"
-	can2NbcType = "set can_mode X"
 	can2TxPin = "set_can2_tx_pin X"
 	can2RxPin = "set_can2_rx_pin X"
 	ignOverrideMode = "Override the Y axis (load) value used for the ignition table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this."
@@ -5430,35 +5425,35 @@ cmd_set_engine_type_default					= "Z\x00\x31\x00\x00"
 		field = "TX pin",                               binarySerialTxPin, {useSerialPort == 1}
 		field = "RX pin",                               binarySerialRxPin, {useSerialPort == 1}
 
+	dialog = canHw1, "Primary CAN"
+		field = "Bitrate",		canBaudRate
+		field = "RX pin",		canRxPin 
+		field = "TX pin",		canTxPin 
+
+	dialog = canHw2, "Secondary CAN"
+		field = "Bitrate",	can2BaudRate
+		field = "RX pin",		can2RxPin 
+		field = "TX pin",		can2TxPin 
+
 	dialog = canBus, "CAN Bus"
 		field = "CAN read enabled",						canReadEnabled
 		field = "CAN write enabled",					canWriteEnabled
-		field = "CAN bitrate",							canBaudRate
 		field = "CAN dash type",						canNbcType
 		field = "Verbose Can",                          verboseCan
 		field = "inertia measurement unit",             imuType
 		field = "Enable rusEFI CAN broadcast",			enableVerboseCanTx
-		field = "Which CAN channel to broadcast on",    canBroadcastUseChannelTwo
+		field = "rusEFI CAN data bus",    canBroadcastUseChannelTwo
 		field = "rusEFI CAN data base address",			verboseCanBaseAddress
 		field = "rusEFI CAN data address type",			rusefiVerbose29b
 		field = "rusEFI CAN data period",				canSleepPeriodMs
-		field = "RX pin",								canRxPin 
-		field = "TX pin",								canTxPin 
 
 	dialog = canBus2, "Secondary CAN Bus"
-		field = "CAN read enabled",						can2ReadEnabled
-		field = "CAN write enabled",					can2WriteEnabled
-		field = "CAN bitrate",							can2BaudRate
-		field = "CAN dash type",						can2NbcType
-		field = "Enable rusEFI CAN broadcast",			enableVerboseCan2Tx
-		field = "rusEFI CAN data base address",			verboseCan2BaseAddress
-		field = "rusEFI CAN data period",				can2SleepPeriodMs
-		field = "RX pin",								can2RxPin 
-		field = "TX pin",								can2TxPin 
 
 	dialog = canBusMain, "CAN Bus Communication", yAxis
 		panel = canBus
-		panel = canBus2							
+
+		panel = canHw1
+		panel = canHw2	
 
 	dialog = auxSerial, "AUX Sensor Serial"
 		field = "RX pin",								auxSerialRxPin 
diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini
index bd3898dbbd..bd993c7706 100644
--- a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini
+++ b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini
@@ -32,12 +32,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
- 	signature    = "rusEFI 2021.12.24.f429-discovery.4174194506"
+ 	signature    = "rusEFI 2021.12.25.f429-discovery.4051637398"
 
 [TunerStudio]
    queryCommand   = "S"
    versionInfo    = "V"  ; firmwave version for title bar.
-   signature    = "rusEFI 2021.12.24.f429-discovery.4174194506" ; signature is expected to be 7 or more characters.
+   signature    = "rusEFI 2021.12.25.f429-discovery.4051637398" ; signature is expected to be 7 or more characters.
 
    ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
    useLegacyFTempUnits = false
@@ -84,7 +84,7 @@ enable2ndByteCanID = false
    ;  name       			= scalar, type, offset,         units,     scale, translate,    lo,      hi, digits
 
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Dec 24 04:13:22 UTC 2021
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Dec 25 04:38:52 UTC 2021
 
 pageSize            = 20996
 page = 1
@@ -365,7 +365,7 @@ canTxPin = bits, U08, 716, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3",
 canRxPin = bits, U08, 717, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 throttlePedalUpPinMode = bits, U08, 718, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID"
 acIdleExtraOffset = scalar, U08, 719, "%", 1, 0, 0, 100, 0
-can2SleepPeriodMs = scalar, S32, 720, "ms", 1, 0, 0, 1000, 2
+unused720 = scalar, S32, 720, "ms", 1, 0, 0, 1000, 2
 wastegatePositionMin = scalar, U16, 724, "mv", 1, 0, 0, 5000, 0
 wastegatePositionMax = scalar, U16, 726, "mv", 1, 0, 0, 5000, 0
 idlePositionMin = scalar, U16, 728, "mv", 1, 0, 0, 5000, 0
@@ -794,10 +794,10 @@ canBaudRate = bits, U08, 1732, [0:1], "100kbps", "250kbps", "500kbps", "1Mbps"
 veOverrideMode = bits, U08, 1733, [0:1], "None", "MAP", "TPS", "INVALID"
 can2BaudRate = bits, U08, 1734, [0:1], "100kbps", "250kbps", "500kbps", "1Mbps"
 afrOverrideMode = bits, U08, 1735, [0:2], "None", "MAP", "TPS", "Acc Pedal", "Cyl Filling %", "INVALID", "INVALID", "INVALID"
-verboseCan2BaseAddress = scalar, U32, 1736, "", 1, 0, 0, 536870911, 0
-enableVerboseCan2Tx = bits, U32, 1740, [0:0], "false", "true"
-can2ReadEnabled = bits, U32, 1740, [1:1], "false", "true"
-can2WriteEnabled = bits, U32, 1740, [2:2], "false", "true"
+unused1736 = scalar, U32, 1736, "", 1, 0, 0, 536870911, 0
+unused1740b0 = bits, U32, 1740, [0:0], "false", "true"
+unused1740b1 = bits, U32, 1740, [1:1], "false", "true"
+unused1740b2 = bits, U32, 1740, [2:2], "false", "true"
 stepperDcInvertedPins = bits, U32, 1740, [3:3], "false", "true"
 unused1127 = bits, U32, 1740, [4:4], "false", "true"
 unused1128 = bits, U32, 1740, [5:5], "false", "true"
@@ -827,7 +827,7 @@ unusedBit_498_28 = bits, U32, 1740, [28:28], "false", "true"
 unusedBit_498_29 = bits, U32, 1740, [29:29], "false", "true"
 unusedBit_498_30 = bits, U32, 1740, [30:30], "false", "true"
 unusedBit_498_31 = bits, U32, 1740, [31:31], "false", "true"
-can2NbcType = bits, U32, 1744, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "Nissan VQ35", "Genesis Coupe", "Honda K", "AiM", "type 13", "type 14", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
+unused1744 = scalar, U32, 1744, "", 1,0,0,0,0
 can2TxPin = bits, U08, 1748, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 can2RxPin = bits, U08, 1749, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 starterControlPinMode = bits, U08, 1750, [0:1], "default", "default inverted", "open collector", "open collector inverted"
@@ -1471,7 +1471,6 @@ fuelTrims12_table = array, S08, 20980, [4x4], "", 0.2, 0, -25, 25, 1
 	canTxPin = "set_can_tx_pin X"
 	canRxPin = "set_can_rx_pin X"
 	acIdleExtraOffset = "Additional idle % while A/C is active"
-	can2SleepPeriodMs = "CANbus thread period, ms"
 	wastegatePositionMin = "Voltage when the wastegate is closed.\nYou probably don't have one of these!"
 	wastegatePositionMax = "Voltage when the wastegate is fully open.\nYou probably don't have one of these!\n1 volt = 1000 units"
 	idlePositionMin = "Voltage when the idle valve is closed.\nYou probably don't have one of these!"
@@ -1637,11 +1636,7 @@ fuelTrims12_table = array, S08, 20980, [4x4], "", 0.2, 0, -25, 25, 1
 	canBaudRate = "set can_baudrate"
 	veOverrideMode = "Override the Y axis (load) value used for the VE table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this."
 	afrOverrideMode = "Override the Y axis (load) value used for the AFR table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this."
-	enableVerboseCan2Tx = "CAN broadcast using custom rusEFI protocol\nenable can_broadcast/disable can_broadcast"
-	can2ReadEnabled = "enable can_read/disable can_read"
-	can2WriteEnabled = "enable can_write/disable can_write"
 	stepperDcInvertedPins = "Enable if DC-motor driver (H-bridge) inverts the signals (eg. RZ7899 on Hellen boards)"
-	can2NbcType = "set can_mode X"
 	can2TxPin = "set_can2_tx_pin X"
 	can2RxPin = "set_can2_rx_pin X"
 	ignOverrideMode = "Override the Y axis (load) value used for the ignition table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this."
@@ -5438,35 +5433,35 @@ cmd_set_engine_type_default					= "Z\x00\x31\x00\x00"
 		field = "TX pin",                               binarySerialTxPin, {useSerialPort == 1}
 		field = "RX pin",                               binarySerialRxPin, {useSerialPort == 1}
 
+	dialog = canHw1, "Primary CAN"
+		field = "Bitrate",		canBaudRate
+		field = "RX pin",		canRxPin 
+		field = "TX pin",		canTxPin 
+
+	dialog = canHw2, "Secondary CAN"
+		field = "Bitrate",	can2BaudRate
+		field = "RX pin",		can2RxPin 
+		field = "TX pin",		can2TxPin 
+
 	dialog = canBus, "CAN Bus"
 		field = "CAN read enabled",						canReadEnabled
 		field = "CAN write enabled",					canWriteEnabled
-		field = "CAN bitrate",							canBaudRate
 		field = "CAN dash type",						canNbcType
 		field = "Verbose Can",                          verboseCan
 		field = "inertia measurement unit",             imuType
 		field = "Enable rusEFI CAN broadcast",			enableVerboseCanTx
-		field = "Which CAN channel to broadcast on",    canBroadcastUseChannelTwo
+		field = "rusEFI CAN data bus",    canBroadcastUseChannelTwo
 		field = "rusEFI CAN data base address",			verboseCanBaseAddress
 		field = "rusEFI CAN data address type",			rusefiVerbose29b
 		field = "rusEFI CAN data period",				canSleepPeriodMs
-		field = "RX pin",								canRxPin 
-		field = "TX pin",								canTxPin 
 
 	dialog = canBus2, "Secondary CAN Bus"
-		field = "CAN read enabled",						can2ReadEnabled
-		field = "CAN write enabled",					can2WriteEnabled
-		field = "CAN bitrate",							can2BaudRate
-		field = "CAN dash type",						can2NbcType
-		field = "Enable rusEFI CAN broadcast",			enableVerboseCan2Tx
-		field = "rusEFI CAN data base address",			verboseCan2BaseAddress
-		field = "rusEFI CAN data period",				can2SleepPeriodMs
-		field = "RX pin",								can2RxPin 
-		field = "TX pin",								can2TxPin 
 
 	dialog = canBusMain, "CAN Bus Communication", yAxis
 		panel = canBus
-		panel = canBus2							
+
+		panel = canHw1
+		panel = canHw2	
 
 	dialog = auxSerial, "AUX Sensor Serial"
 		field = "RX pin",								auxSerialRxPin 
diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini
index 07330a0af2..7aa5f19812 100644
--- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini
+++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini
@@ -32,12 +32,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
- 	signature    = "rusEFI 2021.12.24.frankenso_na6.2197779107"
+ 	signature    = "rusEFI 2021.12.25.frankenso_na6.2337096063"
 
 [TunerStudio]
    queryCommand   = "S"
    versionInfo    = "V"  ; firmwave version for title bar.
-   signature    = "rusEFI 2021.12.24.frankenso_na6.2197779107" ; signature is expected to be 7 or more characters.
+   signature    = "rusEFI 2021.12.25.frankenso_na6.2337096063" ; signature is expected to be 7 or more characters.
 
    ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
    useLegacyFTempUnits = false
@@ -84,7 +84,7 @@ enable2ndByteCanID = false
    ;  name       			= scalar, type, offset,         units,     scale, translate,    lo,      hi, digits
 
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Dec 24 04:13:57 UTC 2021
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Dec 25 04:39:22 UTC 2021
 
 pageSize            = 20996
 page = 1
@@ -365,7 +365,7 @@ canTxPin = bits, U08, 716, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3",
 canRxPin = bits, U08, 717, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 throttlePedalUpPinMode = bits, U08, 718, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID"
 acIdleExtraOffset = scalar, U08, 719, "%", 1, 0, 0, 100, 0
-can2SleepPeriodMs = scalar, S32, 720, "ms", 1, 0, 0, 1000, 2
+unused720 = scalar, S32, 720, "ms", 1, 0, 0, 1000, 2
 wastegatePositionMin = scalar, U16, 724, "mv", 1, 0, 0, 5000, 0
 wastegatePositionMax = scalar, U16, 726, "mv", 1, 0, 0, 5000, 0
 idlePositionMin = scalar, U16, 728, "mv", 1, 0, 0, 5000, 0
@@ -794,10 +794,10 @@ canBaudRate = bits, U08, 1732, [0:1], "100kbps", "250kbps", "500kbps", "1Mbps"
 veOverrideMode = bits, U08, 1733, [0:1], "None", "MAP", "TPS", "INVALID"
 can2BaudRate = bits, U08, 1734, [0:1], "100kbps", "250kbps", "500kbps", "1Mbps"
 afrOverrideMode = bits, U08, 1735, [0:2], "None", "MAP", "TPS", "Acc Pedal", "Cyl Filling %", "INVALID", "INVALID", "INVALID"
-verboseCan2BaseAddress = scalar, U32, 1736, "", 1, 0, 0, 536870911, 0
-enableVerboseCan2Tx = bits, U32, 1740, [0:0], "false", "true"
-can2ReadEnabled = bits, U32, 1740, [1:1], "false", "true"
-can2WriteEnabled = bits, U32, 1740, [2:2], "false", "true"
+unused1736 = scalar, U32, 1736, "", 1, 0, 0, 536870911, 0
+unused1740b0 = bits, U32, 1740, [0:0], "false", "true"
+unused1740b1 = bits, U32, 1740, [1:1], "false", "true"
+unused1740b2 = bits, U32, 1740, [2:2], "false", "true"
 stepperDcInvertedPins = bits, U32, 1740, [3:3], "false", "true"
 unused1127 = bits, U32, 1740, [4:4], "false", "true"
 unused1128 = bits, U32, 1740, [5:5], "false", "true"
@@ -827,7 +827,7 @@ unusedBit_498_28 = bits, U32, 1740, [28:28], "false", "true"
 unusedBit_498_29 = bits, U32, 1740, [29:29], "false", "true"
 unusedBit_498_30 = bits, U32, 1740, [30:30], "false", "true"
 unusedBit_498_31 = bits, U32, 1740, [31:31], "false", "true"
-can2NbcType = bits, U32, 1744, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "Nissan VQ35", "Genesis Coupe", "Honda K", "AiM", "type 13", "type 14", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
+unused1744 = scalar, U32, 1744, "", 1,0,0,0,0
 can2TxPin = bits, U08, 1748, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 can2RxPin = bits, U08, 1749, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 starterControlPinMode = bits, U08, 1750, [0:1], "default", "default inverted", "open collector", "open collector inverted"
@@ -1471,7 +1471,6 @@ fuelTrims12_table = array, S08, 20980, [4x4], "", 0.2, 0, -25, 25, 1
 	canTxPin = "set_can_tx_pin X"
 	canRxPin = "set_can_rx_pin X"
 	acIdleExtraOffset = "Additional idle % while A/C is active"
-	can2SleepPeriodMs = "CANbus thread period, ms"
 	wastegatePositionMin = "Voltage when the wastegate is closed.\nYou probably don't have one of these!"
 	wastegatePositionMax = "Voltage when the wastegate is fully open.\nYou probably don't have one of these!\n1 volt = 1000 units"
 	idlePositionMin = "Voltage when the idle valve is closed.\nYou probably don't have one of these!"
@@ -1637,11 +1636,7 @@ fuelTrims12_table = array, S08, 20980, [4x4], "", 0.2, 0, -25, 25, 1
 	canBaudRate = "set can_baudrate"
 	veOverrideMode = "Override the Y axis (load) value used for the VE table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this."
 	afrOverrideMode = "Override the Y axis (load) value used for the AFR table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this."
-	enableVerboseCan2Tx = "CAN broadcast using custom rusEFI protocol\nenable can_broadcast/disable can_broadcast"
-	can2ReadEnabled = "enable can_read/disable can_read"
-	can2WriteEnabled = "enable can_write/disable can_write"
 	stepperDcInvertedPins = "Enable if DC-motor driver (H-bridge) inverts the signals (eg. RZ7899 on Hellen boards)"
-	can2NbcType = "set can_mode X"
 	can2TxPin = "set_can2_tx_pin X"
 	can2RxPin = "set_can2_rx_pin X"
 	ignOverrideMode = "Override the Y axis (load) value used for the ignition table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this."
@@ -5438,35 +5433,35 @@ cmd_set_engine_type_default					= "Z\x00\x31\x00\x00"
 		field = "TX pin",                               binarySerialTxPin, {useSerialPort == 1}
 		field = "RX pin",                               binarySerialRxPin, {useSerialPort == 1}
 
+	dialog = canHw1, "Primary CAN"
+		field = "Bitrate",		canBaudRate
+		field = "RX pin",		canRxPin 
+		field = "TX pin",		canTxPin 
+
+	dialog = canHw2, "Secondary CAN"
+		field = "Bitrate",	can2BaudRate
+		field = "RX pin",		can2RxPin 
+		field = "TX pin",		can2TxPin 
+
 	dialog = canBus, "CAN Bus"
 		field = "CAN read enabled",						canReadEnabled
 		field = "CAN write enabled",					canWriteEnabled
-		field = "CAN bitrate",							canBaudRate
 		field = "CAN dash type",						canNbcType
 		field = "Verbose Can",                          verboseCan
 		field = "inertia measurement unit",             imuType
 		field = "Enable rusEFI CAN broadcast",			enableVerboseCanTx
-		field = "Which CAN channel to broadcast on",    canBroadcastUseChannelTwo
+		field = "rusEFI CAN data bus",    canBroadcastUseChannelTwo
 		field = "rusEFI CAN data base address",			verboseCanBaseAddress
 		field = "rusEFI CAN data address type",			rusefiVerbose29b
 		field = "rusEFI CAN data period",				canSleepPeriodMs
-		field = "RX pin",								canRxPin 
-		field = "TX pin",								canTxPin 
 
 	dialog = canBus2, "Secondary CAN Bus"
-		field = "CAN read enabled",						can2ReadEnabled
-		field = "CAN write enabled",					can2WriteEnabled
-		field = "CAN bitrate",							can2BaudRate
-		field = "CAN dash type",						can2NbcType
-		field = "Enable rusEFI CAN broadcast",			enableVerboseCan2Tx
-		field = "rusEFI CAN data base address",			verboseCan2BaseAddress
-		field = "rusEFI CAN data period",				can2SleepPeriodMs
-		field = "RX pin",								can2RxPin 
-		field = "TX pin",								can2TxPin 
 
 	dialog = canBusMain, "CAN Bus Communication", yAxis
 		panel = canBus
-		panel = canBus2							
+
+		panel = canHw1
+		panel = canHw2	
 
 	dialog = auxSerial, "AUX Sensor Serial"
 		field = "RX pin",								auxSerialRxPin 
diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini
index 7b71f4f70f..079654fa3f 100644
--- a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini
+++ b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini
@@ -32,12 +32,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
- 	signature    = "rusEFI 2021.12.24.hellen-nb1.1562318787"
+ 	signature    = "rusEFI 2021.12.25.hellen-nb1.1420633119"
 
 [TunerStudio]
    queryCommand   = "S"
    versionInfo    = "V"  ; firmwave version for title bar.
-   signature    = "rusEFI 2021.12.24.hellen-nb1.1562318787" ; signature is expected to be 7 or more characters.
+   signature    = "rusEFI 2021.12.25.hellen-nb1.1420633119" ; signature is expected to be 7 or more characters.
 
    ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
    useLegacyFTempUnits = false
@@ -84,7 +84,7 @@ enable2ndByteCanID = false
    ;  name       			= scalar, type, offset,         units,     scale, translate,    lo,      hi, digits
 
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Dec 24 04:13:45 UTC 2021
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Dec 25 04:39:11 UTC 2021
 
 pageSize            = 20996
 page = 1
@@ -365,7 +365,7 @@ canTxPin = bits, U08, 716, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3",
 canRxPin = bits, U08, 717, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 throttlePedalUpPinMode = bits, U08, 718, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID"
 acIdleExtraOffset = scalar, U08, 719, "%", 1, 0, 0, 100, 0
-can2SleepPeriodMs = scalar, S32, 720, "ms", 1, 0, 0, 1000, 2
+unused720 = scalar, S32, 720, "ms", 1, 0, 0, 1000, 2
 wastegatePositionMin = scalar, U16, 724, "mv", 1, 0, 0, 5000, 0
 wastegatePositionMax = scalar, U16, 726, "mv", 1, 0, 0, 5000, 0
 idlePositionMin = scalar, U16, 728, "mv", 1, 0, 0, 5000, 0
@@ -794,10 +794,10 @@ canBaudRate = bits, U08, 1732, [0:1], "100kbps", "250kbps", "500kbps", "1Mbps"
 veOverrideMode = bits, U08, 1733, [0:1], "None", "MAP", "TPS", "INVALID"
 can2BaudRate = bits, U08, 1734, [0:1], "100kbps", "250kbps", "500kbps", "1Mbps"
 afrOverrideMode = bits, U08, 1735, [0:2], "None", "MAP", "TPS", "Acc Pedal", "Cyl Filling %", "INVALID", "INVALID", "INVALID"
-verboseCan2BaseAddress = scalar, U32, 1736, "", 1, 0, 0, 536870911, 0
-enableVerboseCan2Tx = bits, U32, 1740, [0:0], "false", "true"
-can2ReadEnabled = bits, U32, 1740, [1:1], "false", "true"
-can2WriteEnabled = bits, U32, 1740, [2:2], "false", "true"
+unused1736 = scalar, U32, 1736, "", 1, 0, 0, 536870911, 0
+unused1740b0 = bits, U32, 1740, [0:0], "false", "true"
+unused1740b1 = bits, U32, 1740, [1:1], "false", "true"
+unused1740b2 = bits, U32, 1740, [2:2], "false", "true"
 stepperDcInvertedPins = bits, U32, 1740, [3:3], "false", "true"
 unused1127 = bits, U32, 1740, [4:4], "false", "true"
 unused1128 = bits, U32, 1740, [5:5], "false", "true"
@@ -827,7 +827,7 @@ unusedBit_498_28 = bits, U32, 1740, [28:28], "false", "true"
 unusedBit_498_29 = bits, U32, 1740, [29:29], "false", "true"
 unusedBit_498_30 = bits, U32, 1740, [30:30], "false", "true"
 unusedBit_498_31 = bits, U32, 1740, [31:31], "false", "true"
-can2NbcType = bits, U32, 1744, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "Nissan VQ35", "Genesis Coupe", "Honda K", "AiM", "type 13", "type 14", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
+unused1744 = scalar, U32, 1744, "", 1,0,0,0,0
 can2TxPin = bits, U08, 1748, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 can2RxPin = bits, U08, 1749, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 starterControlPinMode = bits, U08, 1750, [0:1], "default", "default inverted", "open collector", "open collector inverted"
@@ -1471,7 +1471,6 @@ fuelTrims12_table = array, S08, 20980, [4x4], "", 0.2, 0, -25, 25, 1
 	canTxPin = "set_can_tx_pin X"
 	canRxPin = "set_can_rx_pin X"
 	acIdleExtraOffset = "Additional idle % while A/C is active"
-	can2SleepPeriodMs = "CANbus thread period, ms"
 	wastegatePositionMin = "Voltage when the wastegate is closed.\nYou probably don't have one of these!"
 	wastegatePositionMax = "Voltage when the wastegate is fully open.\nYou probably don't have one of these!\n1 volt = 1000 units"
 	idlePositionMin = "Voltage when the idle valve is closed.\nYou probably don't have one of these!"
@@ -1637,11 +1636,7 @@ fuelTrims12_table = array, S08, 20980, [4x4], "", 0.2, 0, -25, 25, 1
 	canBaudRate = "set can_baudrate"
 	veOverrideMode = "Override the Y axis (load) value used for the VE table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this."
 	afrOverrideMode = "Override the Y axis (load) value used for the AFR table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this."
-	enableVerboseCan2Tx = "CAN broadcast using custom rusEFI protocol\nenable can_broadcast/disable can_broadcast"
-	can2ReadEnabled = "enable can_read/disable can_read"
-	can2WriteEnabled = "enable can_write/disable can_write"
 	stepperDcInvertedPins = "Enable if DC-motor driver (H-bridge) inverts the signals (eg. RZ7899 on Hellen boards)"
-	can2NbcType = "set can_mode X"
 	can2TxPin = "set_can2_tx_pin X"
 	can2RxPin = "set_can2_rx_pin X"
 	ignOverrideMode = "Override the Y axis (load) value used for the ignition table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this."
@@ -5421,31 +5416,31 @@ cmd_set_engine_type_default					= "Z\x00\x31\x00\x00"
 		field = "TX pin",                               binarySerialTxPin, {useSerialPort == 1}
 		field = "RX pin",                               binarySerialRxPin, {useSerialPort == 1}
 
+	dialog = canHw1, "Primary CAN"
+		field = "Bitrate",		canBaudRate
+
+	dialog = canHw2, "Secondary CAN"
+		field = "Bitrate",	can2BaudRate
+
 	dialog = canBus, "CAN Bus"
 		field = "CAN read enabled",						canReadEnabled
 		field = "CAN write enabled",					canWriteEnabled
-		field = "CAN bitrate",							canBaudRate
 		field = "CAN dash type",						canNbcType
 		field = "Verbose Can",                          verboseCan
 		field = "inertia measurement unit",             imuType
 		field = "Enable rusEFI CAN broadcast",			enableVerboseCanTx
-		field = "Which CAN channel to broadcast on",    canBroadcastUseChannelTwo
+		field = "rusEFI CAN data bus",    canBroadcastUseChannelTwo
 		field = "rusEFI CAN data base address",			verboseCanBaseAddress
 		field = "rusEFI CAN data address type",			rusefiVerbose29b
 		field = "rusEFI CAN data period",				canSleepPeriodMs
 
 	dialog = canBus2, "Secondary CAN Bus"
-		field = "CAN read enabled",						can2ReadEnabled
-		field = "CAN write enabled",					can2WriteEnabled
-		field = "CAN bitrate",							can2BaudRate
-		field = "CAN dash type",						can2NbcType
-		field = "Enable rusEFI CAN broadcast",			enableVerboseCan2Tx
-		field = "rusEFI CAN data base address",			verboseCan2BaseAddress
-		field = "rusEFI CAN data period",				can2SleepPeriodMs
 
 	dialog = canBusMain, "CAN Bus Communication", yAxis
 		panel = canBus
 
+		panel = canHw1
+
 	dialog = auxSerial, "AUX Sensor Serial"
 		field = "RX pin",								auxSerialRxPin 
 		field = "TX pin",								auxSerialTxPin 
diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini
index 50a1de9eac..bfd8b15256 100644
--- a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini
+++ b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini
@@ -32,12 +32,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
- 	signature    = "rusEFI 2021.12.24.hellen121nissan.1128875499"
+ 	signature    = "rusEFI 2021.12.25.hellen121nissan.1257993783"
 
 [TunerStudio]
    queryCommand   = "S"
    versionInfo    = "V"  ; firmwave version for title bar.
-   signature    = "rusEFI 2021.12.24.hellen121nissan.1128875499" ; signature is expected to be 7 or more characters.
+   signature    = "rusEFI 2021.12.25.hellen121nissan.1257993783" ; signature is expected to be 7 or more characters.
 
    ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
    useLegacyFTempUnits = false
@@ -84,7 +84,7 @@ enable2ndByteCanID = false
    ;  name       			= scalar, type, offset,         units,     scale, translate,    lo,      hi, digits
 
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Dec 24 04:13:30 UTC 2021
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Dec 25 04:38:59 UTC 2021
 
 pageSize            = 20996
 page = 1
@@ -365,7 +365,7 @@ canTxPin = bits, U08, 716, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3",
 canRxPin = bits, U08, 717, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 throttlePedalUpPinMode = bits, U08, 718, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID"
 acIdleExtraOffset = scalar, U08, 719, "%", 1, 0, 0, 100, 0
-can2SleepPeriodMs = scalar, S32, 720, "ms", 1, 0, 0, 1000, 2
+unused720 = scalar, S32, 720, "ms", 1, 0, 0, 1000, 2
 wastegatePositionMin = scalar, U16, 724, "mv", 1, 0, 0, 5000, 0
 wastegatePositionMax = scalar, U16, 726, "mv", 1, 0, 0, 5000, 0
 idlePositionMin = scalar, U16, 728, "mv", 1, 0, 0, 5000, 0
@@ -794,10 +794,10 @@ canBaudRate = bits, U08, 1732, [0:1], "100kbps", "250kbps", "500kbps", "1Mbps"
 veOverrideMode = bits, U08, 1733, [0:1], "None", "MAP", "TPS", "INVALID"
 can2BaudRate = bits, U08, 1734, [0:1], "100kbps", "250kbps", "500kbps", "1Mbps"
 afrOverrideMode = bits, U08, 1735, [0:2], "None", "MAP", "TPS", "Acc Pedal", "Cyl Filling %", "INVALID", "INVALID", "INVALID"
-verboseCan2BaseAddress = scalar, U32, 1736, "", 1, 0, 0, 536870911, 0
-enableVerboseCan2Tx = bits, U32, 1740, [0:0], "false", "true"
-can2ReadEnabled = bits, U32, 1740, [1:1], "false", "true"
-can2WriteEnabled = bits, U32, 1740, [2:2], "false", "true"
+unused1736 = scalar, U32, 1736, "", 1, 0, 0, 536870911, 0
+unused1740b0 = bits, U32, 1740, [0:0], "false", "true"
+unused1740b1 = bits, U32, 1740, [1:1], "false", "true"
+unused1740b2 = bits, U32, 1740, [2:2], "false", "true"
 stepperDcInvertedPins = bits, U32, 1740, [3:3], "false", "true"
 unused1127 = bits, U32, 1740, [4:4], "false", "true"
 unused1128 = bits, U32, 1740, [5:5], "false", "true"
@@ -827,7 +827,7 @@ unusedBit_498_28 = bits, U32, 1740, [28:28], "false", "true"
 unusedBit_498_29 = bits, U32, 1740, [29:29], "false", "true"
 unusedBit_498_30 = bits, U32, 1740, [30:30], "false", "true"
 unusedBit_498_31 = bits, U32, 1740, [31:31], "false", "true"
-can2NbcType = bits, U32, 1744, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "Nissan VQ35", "Genesis Coupe", "Honda K", "AiM", "type 13", "type 14", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
+unused1744 = scalar, U32, 1744, "", 1,0,0,0,0
 can2TxPin = bits, U08, 1748, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 can2RxPin = bits, U08, 1749, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 starterControlPinMode = bits, U08, 1750, [0:1], "default", "default inverted", "open collector", "open collector inverted"
@@ -1471,7 +1471,6 @@ fuelTrims12_table = array, S08, 20980, [4x4], "", 0.2, 0, -25, 25, 1
 	canTxPin = "set_can_tx_pin X"
 	canRxPin = "set_can_rx_pin X"
 	acIdleExtraOffset = "Additional idle % while A/C is active"
-	can2SleepPeriodMs = "CANbus thread period, ms"
 	wastegatePositionMin = "Voltage when the wastegate is closed.\nYou probably don't have one of these!"
 	wastegatePositionMax = "Voltage when the wastegate is fully open.\nYou probably don't have one of these!\n1 volt = 1000 units"
 	idlePositionMin = "Voltage when the idle valve is closed.\nYou probably don't have one of these!"
@@ -1637,11 +1636,7 @@ fuelTrims12_table = array, S08, 20980, [4x4], "", 0.2, 0, -25, 25, 1
 	canBaudRate = "set can_baudrate"
 	veOverrideMode = "Override the Y axis (load) value used for the VE table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this."
 	afrOverrideMode = "Override the Y axis (load) value used for the AFR table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this."
-	enableVerboseCan2Tx = "CAN broadcast using custom rusEFI protocol\nenable can_broadcast/disable can_broadcast"
-	can2ReadEnabled = "enable can_read/disable can_read"
-	can2WriteEnabled = "enable can_write/disable can_write"
 	stepperDcInvertedPins = "Enable if DC-motor driver (H-bridge) inverts the signals (eg. RZ7899 on Hellen boards)"
-	can2NbcType = "set can_mode X"
 	can2TxPin = "set_can2_tx_pin X"
 	can2RxPin = "set_can2_rx_pin X"
 	ignOverrideMode = "Override the Y axis (load) value used for the ignition table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this."
@@ -5421,31 +5416,31 @@ cmd_set_engine_type_default					= "Z\x00\x31\x00\x00"
 		field = "TX pin",                               binarySerialTxPin, {useSerialPort == 1}
 		field = "RX pin",                               binarySerialRxPin, {useSerialPort == 1}
 
+	dialog = canHw1, "Primary CAN"
+		field = "Bitrate",		canBaudRate
+
+	dialog = canHw2, "Secondary CAN"
+		field = "Bitrate",	can2BaudRate
+
 	dialog = canBus, "CAN Bus"
 		field = "CAN read enabled",						canReadEnabled
 		field = "CAN write enabled",					canWriteEnabled
-		field = "CAN bitrate",							canBaudRate
 		field = "CAN dash type",						canNbcType
 		field = "Verbose Can",                          verboseCan
 		field = "inertia measurement unit",             imuType
 		field = "Enable rusEFI CAN broadcast",			enableVerboseCanTx
-		field = "Which CAN channel to broadcast on",    canBroadcastUseChannelTwo
+		field = "rusEFI CAN data bus",    canBroadcastUseChannelTwo
 		field = "rusEFI CAN data base address",			verboseCanBaseAddress
 		field = "rusEFI CAN data address type",			rusefiVerbose29b
 		field = "rusEFI CAN data period",				canSleepPeriodMs
 
 	dialog = canBus2, "Secondary CAN Bus"
-		field = "CAN read enabled",						can2ReadEnabled
-		field = "CAN write enabled",					can2WriteEnabled
-		field = "CAN bitrate",							can2BaudRate
-		field = "CAN dash type",						can2NbcType
-		field = "Enable rusEFI CAN broadcast",			enableVerboseCan2Tx
-		field = "rusEFI CAN data base address",			verboseCan2BaseAddress
-		field = "rusEFI CAN data period",				can2SleepPeriodMs
 
 	dialog = canBusMain, "CAN Bus Communication", yAxis
 		panel = canBus
 
+		panel = canHw1
+
 	dialog = auxSerial, "AUX Sensor Serial"
 		field = "RX pin",								auxSerialRxPin 
 		field = "TX pin",								auxSerialTxPin 
diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini
index 696152992f..54318c29f8 100644
--- a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini
+++ b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini
@@ -32,12 +32,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
- 	signature    = "rusEFI 2021.12.24.hellen121vag.2809004864"
+ 	signature    = "rusEFI 2021.12.25.hellen121vag.2933665948"
 
 [TunerStudio]
    queryCommand   = "S"
    versionInfo    = "V"  ; firmwave version for title bar.
-   signature    = "rusEFI 2021.12.24.hellen121vag.2809004864" ; signature is expected to be 7 or more characters.
+   signature    = "rusEFI 2021.12.25.hellen121vag.2933665948" ; signature is expected to be 7 or more characters.
 
    ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
    useLegacyFTempUnits = false
@@ -84,7 +84,7 @@ enable2ndByteCanID = false
    ;  name       			= scalar, type, offset,         units,     scale, translate,    lo,      hi, digits
 
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Dec 24 04:13:28 UTC 2021
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Dec 25 04:38:56 UTC 2021
 
 pageSize            = 20996
 page = 1
@@ -365,7 +365,7 @@ canTxPin = bits, U08, 716, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3",
 canRxPin = bits, U08, 717, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 throttlePedalUpPinMode = bits, U08, 718, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID"
 acIdleExtraOffset = scalar, U08, 719, "%", 1, 0, 0, 100, 0
-can2SleepPeriodMs = scalar, S32, 720, "ms", 1, 0, 0, 1000, 2
+unused720 = scalar, S32, 720, "ms", 1, 0, 0, 1000, 2
 wastegatePositionMin = scalar, U16, 724, "mv", 1, 0, 0, 5000, 0
 wastegatePositionMax = scalar, U16, 726, "mv", 1, 0, 0, 5000, 0
 idlePositionMin = scalar, U16, 728, "mv", 1, 0, 0, 5000, 0
@@ -794,10 +794,10 @@ canBaudRate = bits, U08, 1732, [0:1], "100kbps", "250kbps", "500kbps", "1Mbps"
 veOverrideMode = bits, U08, 1733, [0:1], "None", "MAP", "TPS", "INVALID"
 can2BaudRate = bits, U08, 1734, [0:1], "100kbps", "250kbps", "500kbps", "1Mbps"
 afrOverrideMode = bits, U08, 1735, [0:2], "None", "MAP", "TPS", "Acc Pedal", "Cyl Filling %", "INVALID", "INVALID", "INVALID"
-verboseCan2BaseAddress = scalar, U32, 1736, "", 1, 0, 0, 536870911, 0
-enableVerboseCan2Tx = bits, U32, 1740, [0:0], "false", "true"
-can2ReadEnabled = bits, U32, 1740, [1:1], "false", "true"
-can2WriteEnabled = bits, U32, 1740, [2:2], "false", "true"
+unused1736 = scalar, U32, 1736, "", 1, 0, 0, 536870911, 0
+unused1740b0 = bits, U32, 1740, [0:0], "false", "true"
+unused1740b1 = bits, U32, 1740, [1:1], "false", "true"
+unused1740b2 = bits, U32, 1740, [2:2], "false", "true"
 stepperDcInvertedPins = bits, U32, 1740, [3:3], "false", "true"
 unused1127 = bits, U32, 1740, [4:4], "false", "true"
 unused1128 = bits, U32, 1740, [5:5], "false", "true"
@@ -827,7 +827,7 @@ unusedBit_498_28 = bits, U32, 1740, [28:28], "false", "true"
 unusedBit_498_29 = bits, U32, 1740, [29:29], "false", "true"
 unusedBit_498_30 = bits, U32, 1740, [30:30], "false", "true"
 unusedBit_498_31 = bits, U32, 1740, [31:31], "false", "true"
-can2NbcType = bits, U32, 1744, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "Nissan VQ35", "Genesis Coupe", "Honda K", "AiM", "type 13", "type 14", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
+unused1744 = scalar, U32, 1744, "", 1,0,0,0,0
 can2TxPin = bits, U08, 1748, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 can2RxPin = bits, U08, 1749, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 starterControlPinMode = bits, U08, 1750, [0:1], "default", "default inverted", "open collector", "open collector inverted"
@@ -1471,7 +1471,6 @@ fuelTrims12_table = array, S08, 20980, [4x4], "", 0.2, 0, -25, 25, 1
 	canTxPin = "set_can_tx_pin X"
 	canRxPin = "set_can_rx_pin X"
 	acIdleExtraOffset = "Additional idle % while A/C is active"
-	can2SleepPeriodMs = "CANbus thread period, ms"
 	wastegatePositionMin = "Voltage when the wastegate is closed.\nYou probably don't have one of these!"
 	wastegatePositionMax = "Voltage when the wastegate is fully open.\nYou probably don't have one of these!\n1 volt = 1000 units"
 	idlePositionMin = "Voltage when the idle valve is closed.\nYou probably don't have one of these!"
@@ -1637,11 +1636,7 @@ fuelTrims12_table = array, S08, 20980, [4x4], "", 0.2, 0, -25, 25, 1
 	canBaudRate = "set can_baudrate"
 	veOverrideMode = "Override the Y axis (load) value used for the VE table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this."
 	afrOverrideMode = "Override the Y axis (load) value used for the AFR table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this."
-	enableVerboseCan2Tx = "CAN broadcast using custom rusEFI protocol\nenable can_broadcast/disable can_broadcast"
-	can2ReadEnabled = "enable can_read/disable can_read"
-	can2WriteEnabled = "enable can_write/disable can_write"
 	stepperDcInvertedPins = "Enable if DC-motor driver (H-bridge) inverts the signals (eg. RZ7899 on Hellen boards)"
-	can2NbcType = "set can_mode X"
 	can2TxPin = "set_can2_tx_pin X"
 	can2RxPin = "set_can2_rx_pin X"
 	ignOverrideMode = "Override the Y axis (load) value used for the ignition table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this."
@@ -5421,31 +5416,31 @@ cmd_set_engine_type_default					= "Z\x00\x31\x00\x00"
 		field = "TX pin",                               binarySerialTxPin, {useSerialPort == 1}
 		field = "RX pin",                               binarySerialRxPin, {useSerialPort == 1}
 
+	dialog = canHw1, "Primary CAN"
+		field = "Bitrate",		canBaudRate
+
+	dialog = canHw2, "Secondary CAN"
+		field = "Bitrate",	can2BaudRate
+
 	dialog = canBus, "CAN Bus"
 		field = "CAN read enabled",						canReadEnabled
 		field = "CAN write enabled",					canWriteEnabled
-		field = "CAN bitrate",							canBaudRate
 		field = "CAN dash type",						canNbcType
 		field = "Verbose Can",                          verboseCan
 		field = "inertia measurement unit",             imuType
 		field = "Enable rusEFI CAN broadcast",			enableVerboseCanTx
-		field = "Which CAN channel to broadcast on",    canBroadcastUseChannelTwo
+		field = "rusEFI CAN data bus",    canBroadcastUseChannelTwo
 		field = "rusEFI CAN data base address",			verboseCanBaseAddress
 		field = "rusEFI CAN data address type",			rusefiVerbose29b
 		field = "rusEFI CAN data period",				canSleepPeriodMs
 
 	dialog = canBus2, "Secondary CAN Bus"
-		field = "CAN read enabled",						can2ReadEnabled
-		field = "CAN write enabled",					can2WriteEnabled
-		field = "CAN bitrate",							can2BaudRate
-		field = "CAN dash type",						can2NbcType
-		field = "Enable rusEFI CAN broadcast",			enableVerboseCan2Tx
-		field = "rusEFI CAN data base address",			verboseCan2BaseAddress
-		field = "rusEFI CAN data period",				can2SleepPeriodMs
 
 	dialog = canBusMain, "CAN Bus Communication", yAxis
 		panel = canBus
 
+		panel = canHw1
+
 	dialog = auxSerial, "AUX Sensor Serial"
 		field = "RX pin",								auxSerialRxPin 
 		field = "TX pin",								auxSerialTxPin 
diff --git a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini
index c58aabb562..f8c417c7e1 100644
--- a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini
+++ b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini
@@ -32,12 +32,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
- 	signature    = "rusEFI 2021.12.24.hellen128.1644907757"
+ 	signature    = "rusEFI 2021.12.25.hellen128.1807318833"
 
 [TunerStudio]
    queryCommand   = "S"
    versionInfo    = "V"  ; firmwave version for title bar.
-   signature    = "rusEFI 2021.12.24.hellen128.1644907757" ; signature is expected to be 7 or more characters.
+   signature    = "rusEFI 2021.12.25.hellen128.1807318833" ; signature is expected to be 7 or more characters.
 
    ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
    useLegacyFTempUnits = false
@@ -84,7 +84,7 @@ enable2ndByteCanID = false
    ;  name       			= scalar, type, offset,         units,     scale, translate,    lo,      hi, digits
 
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Dec 24 04:13:24 UTC 2021
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Dec 25 04:38:54 UTC 2021
 
 pageSize            = 20996
 page = 1
@@ -365,7 +365,7 @@ canTxPin = bits, U08, 716, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3",
 canRxPin = bits, U08, 717, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 throttlePedalUpPinMode = bits, U08, 718, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID"
 acIdleExtraOffset = scalar, U08, 719, "%", 1, 0, 0, 100, 0
-can2SleepPeriodMs = scalar, S32, 720, "ms", 1, 0, 0, 1000, 2
+unused720 = scalar, S32, 720, "ms", 1, 0, 0, 1000, 2
 wastegatePositionMin = scalar, U16, 724, "mv", 1, 0, 0, 5000, 0
 wastegatePositionMax = scalar, U16, 726, "mv", 1, 0, 0, 5000, 0
 idlePositionMin = scalar, U16, 728, "mv", 1, 0, 0, 5000, 0
@@ -794,10 +794,10 @@ canBaudRate = bits, U08, 1732, [0:1], "100kbps", "250kbps", "500kbps", "1Mbps"
 veOverrideMode = bits, U08, 1733, [0:1], "None", "MAP", "TPS", "INVALID"
 can2BaudRate = bits, U08, 1734, [0:1], "100kbps", "250kbps", "500kbps", "1Mbps"
 afrOverrideMode = bits, U08, 1735, [0:2], "None", "MAP", "TPS", "Acc Pedal", "Cyl Filling %", "INVALID", "INVALID", "INVALID"
-verboseCan2BaseAddress = scalar, U32, 1736, "", 1, 0, 0, 536870911, 0
-enableVerboseCan2Tx = bits, U32, 1740, [0:0], "false", "true"
-can2ReadEnabled = bits, U32, 1740, [1:1], "false", "true"
-can2WriteEnabled = bits, U32, 1740, [2:2], "false", "true"
+unused1736 = scalar, U32, 1736, "", 1, 0, 0, 536870911, 0
+unused1740b0 = bits, U32, 1740, [0:0], "false", "true"
+unused1740b1 = bits, U32, 1740, [1:1], "false", "true"
+unused1740b2 = bits, U32, 1740, [2:2], "false", "true"
 stepperDcInvertedPins = bits, U32, 1740, [3:3], "false", "true"
 unused1127 = bits, U32, 1740, [4:4], "false", "true"
 unused1128 = bits, U32, 1740, [5:5], "false", "true"
@@ -827,7 +827,7 @@ unusedBit_498_28 = bits, U32, 1740, [28:28], "false", "true"
 unusedBit_498_29 = bits, U32, 1740, [29:29], "false", "true"
 unusedBit_498_30 = bits, U32, 1740, [30:30], "false", "true"
 unusedBit_498_31 = bits, U32, 1740, [31:31], "false", "true"
-can2NbcType = bits, U32, 1744, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "Nissan VQ35", "Genesis Coupe", "Honda K", "AiM", "type 13", "type 14", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
+unused1744 = scalar, U32, 1744, "", 1,0,0,0,0
 can2TxPin = bits, U08, 1748, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 can2RxPin = bits, U08, 1749, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 starterControlPinMode = bits, U08, 1750, [0:1], "default", "default inverted", "open collector", "open collector inverted"
@@ -1471,7 +1471,6 @@ fuelTrims12_table = array, S08, 20980, [4x4], "", 0.2, 0, -25, 25, 1
 	canTxPin = "set_can_tx_pin X"
 	canRxPin = "set_can_rx_pin X"
 	acIdleExtraOffset = "Additional idle % while A/C is active"
-	can2SleepPeriodMs = "CANbus thread period, ms"
 	wastegatePositionMin = "Voltage when the wastegate is closed.\nYou probably don't have one of these!"
 	wastegatePositionMax = "Voltage when the wastegate is fully open.\nYou probably don't have one of these!\n1 volt = 1000 units"
 	idlePositionMin = "Voltage when the idle valve is closed.\nYou probably don't have one of these!"
@@ -1637,11 +1636,7 @@ fuelTrims12_table = array, S08, 20980, [4x4], "", 0.2, 0, -25, 25, 1
 	canBaudRate = "set can_baudrate"
 	veOverrideMode = "Override the Y axis (load) value used for the VE table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this."
 	afrOverrideMode = "Override the Y axis (load) value used for the AFR table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this."
-	enableVerboseCan2Tx = "CAN broadcast using custom rusEFI protocol\nenable can_broadcast/disable can_broadcast"
-	can2ReadEnabled = "enable can_read/disable can_read"
-	can2WriteEnabled = "enable can_write/disable can_write"
 	stepperDcInvertedPins = "Enable if DC-motor driver (H-bridge) inverts the signals (eg. RZ7899 on Hellen boards)"
-	can2NbcType = "set can_mode X"
 	can2TxPin = "set_can2_tx_pin X"
 	can2RxPin = "set_can2_rx_pin X"
 	ignOverrideMode = "Override the Y axis (load) value used for the ignition table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this."
@@ -5421,31 +5416,31 @@ cmd_set_engine_type_default					= "Z\x00\x31\x00\x00"
 		field = "TX pin",                               binarySerialTxPin, {useSerialPort == 1}
 		field = "RX pin",                               binarySerialRxPin, {useSerialPort == 1}
 
+	dialog = canHw1, "Primary CAN"
+		field = "Bitrate",		canBaudRate
+
+	dialog = canHw2, "Secondary CAN"
+		field = "Bitrate",	can2BaudRate
+
 	dialog = canBus, "CAN Bus"
 		field = "CAN read enabled",						canReadEnabled
 		field = "CAN write enabled",					canWriteEnabled
-		field = "CAN bitrate",							canBaudRate
 		field = "CAN dash type",						canNbcType
 		field = "Verbose Can",                          verboseCan
 		field = "inertia measurement unit",             imuType
 		field = "Enable rusEFI CAN broadcast",			enableVerboseCanTx
-		field = "Which CAN channel to broadcast on",    canBroadcastUseChannelTwo
+		field = "rusEFI CAN data bus",    canBroadcastUseChannelTwo
 		field = "rusEFI CAN data base address",			verboseCanBaseAddress
 		field = "rusEFI CAN data address type",			rusefiVerbose29b
 		field = "rusEFI CAN data period",				canSleepPeriodMs
 
 	dialog = canBus2, "Secondary CAN Bus"
-		field = "CAN read enabled",						can2ReadEnabled
-		field = "CAN write enabled",					can2WriteEnabled
-		field = "CAN bitrate",							can2BaudRate
-		field = "CAN dash type",						can2NbcType
-		field = "Enable rusEFI CAN broadcast",			enableVerboseCan2Tx
-		field = "rusEFI CAN data base address",			verboseCan2BaseAddress
-		field = "rusEFI CAN data period",				can2SleepPeriodMs
 
 	dialog = canBusMain, "CAN Bus Communication", yAxis
 		panel = canBus
 
+		panel = canHw1
+
 	dialog = auxSerial, "AUX Sensor Serial"
 		field = "RX pin",								auxSerialRxPin 
 		field = "TX pin",								auxSerialTxPin 
diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini
index a11dc4675d..6ddf2d69d7 100644
--- a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini
+++ b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini
@@ -32,12 +32,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
- 	signature    = "rusEFI 2021.12.24.hellen154hyundai.886127590"
+ 	signature    = "rusEFI 2021.12.25.hellen154hyundai.1029900346"
 
 [TunerStudio]
    queryCommand   = "S"
    versionInfo    = "V"  ; firmwave version for title bar.
-   signature    = "rusEFI 2021.12.24.hellen154hyundai.886127590" ; signature is expected to be 7 or more characters.
+   signature    = "rusEFI 2021.12.25.hellen154hyundai.1029900346" ; signature is expected to be 7 or more characters.
 
    ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
    useLegacyFTempUnits = false
@@ -84,7 +84,7 @@ enable2ndByteCanID = false
    ;  name       			= scalar, type, offset,         units,     scale, translate,    lo,      hi, digits
 
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Dec 24 04:13:33 UTC 2021
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Dec 25 04:39:01 UTC 2021
 
 pageSize            = 20996
 page = 1
@@ -365,7 +365,7 @@ canTxPin = bits, U08, 716, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3",
 canRxPin = bits, U08, 717, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 throttlePedalUpPinMode = bits, U08, 718, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID"
 acIdleExtraOffset = scalar, U08, 719, "%", 1, 0, 0, 100, 0
-can2SleepPeriodMs = scalar, S32, 720, "ms", 1, 0, 0, 1000, 2
+unused720 = scalar, S32, 720, "ms", 1, 0, 0, 1000, 2
 wastegatePositionMin = scalar, U16, 724, "mv", 1, 0, 0, 5000, 0
 wastegatePositionMax = scalar, U16, 726, "mv", 1, 0, 0, 5000, 0
 idlePositionMin = scalar, U16, 728, "mv", 1, 0, 0, 5000, 0
@@ -794,10 +794,10 @@ canBaudRate = bits, U08, 1732, [0:1], "100kbps", "250kbps", "500kbps", "1Mbps"
 veOverrideMode = bits, U08, 1733, [0:1], "None", "MAP", "TPS", "INVALID"
 can2BaudRate = bits, U08, 1734, [0:1], "100kbps", "250kbps", "500kbps", "1Mbps"
 afrOverrideMode = bits, U08, 1735, [0:2], "None", "MAP", "TPS", "Acc Pedal", "Cyl Filling %", "INVALID", "INVALID", "INVALID"
-verboseCan2BaseAddress = scalar, U32, 1736, "", 1, 0, 0, 536870911, 0
-enableVerboseCan2Tx = bits, U32, 1740, [0:0], "false", "true"
-can2ReadEnabled = bits, U32, 1740, [1:1], "false", "true"
-can2WriteEnabled = bits, U32, 1740, [2:2], "false", "true"
+unused1736 = scalar, U32, 1736, "", 1, 0, 0, 536870911, 0
+unused1740b0 = bits, U32, 1740, [0:0], "false", "true"
+unused1740b1 = bits, U32, 1740, [1:1], "false", "true"
+unused1740b2 = bits, U32, 1740, [2:2], "false", "true"
 stepperDcInvertedPins = bits, U32, 1740, [3:3], "false", "true"
 unused1127 = bits, U32, 1740, [4:4], "false", "true"
 unused1128 = bits, U32, 1740, [5:5], "false", "true"
@@ -827,7 +827,7 @@ unusedBit_498_28 = bits, U32, 1740, [28:28], "false", "true"
 unusedBit_498_29 = bits, U32, 1740, [29:29], "false", "true"
 unusedBit_498_30 = bits, U32, 1740, [30:30], "false", "true"
 unusedBit_498_31 = bits, U32, 1740, [31:31], "false", "true"
-can2NbcType = bits, U32, 1744, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "Nissan VQ35", "Genesis Coupe", "Honda K", "AiM", "type 13", "type 14", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
+unused1744 = scalar, U32, 1744, "", 1,0,0,0,0
 can2TxPin = bits, U08, 1748, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 can2RxPin = bits, U08, 1749, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 starterControlPinMode = bits, U08, 1750, [0:1], "default", "default inverted", "open collector", "open collector inverted"
@@ -1471,7 +1471,6 @@ fuelTrims12_table = array, S08, 20980, [4x4], "", 0.2, 0, -25, 25, 1
 	canTxPin = "set_can_tx_pin X"
 	canRxPin = "set_can_rx_pin X"
 	acIdleExtraOffset = "Additional idle % while A/C is active"
-	can2SleepPeriodMs = "CANbus thread period, ms"
 	wastegatePositionMin = "Voltage when the wastegate is closed.\nYou probably don't have one of these!"
 	wastegatePositionMax = "Voltage when the wastegate is fully open.\nYou probably don't have one of these!\n1 volt = 1000 units"
 	idlePositionMin = "Voltage when the idle valve is closed.\nYou probably don't have one of these!"
@@ -1637,11 +1636,7 @@ fuelTrims12_table = array, S08, 20980, [4x4], "", 0.2, 0, -25, 25, 1
 	canBaudRate = "set can_baudrate"
 	veOverrideMode = "Override the Y axis (load) value used for the VE table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this."
 	afrOverrideMode = "Override the Y axis (load) value used for the AFR table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this."
-	enableVerboseCan2Tx = "CAN broadcast using custom rusEFI protocol\nenable can_broadcast/disable can_broadcast"
-	can2ReadEnabled = "enable can_read/disable can_read"
-	can2WriteEnabled = "enable can_write/disable can_write"
 	stepperDcInvertedPins = "Enable if DC-motor driver (H-bridge) inverts the signals (eg. RZ7899 on Hellen boards)"
-	can2NbcType = "set can_mode X"
 	can2TxPin = "set_can2_tx_pin X"
 	can2RxPin = "set_can2_rx_pin X"
 	ignOverrideMode = "Override the Y axis (load) value used for the ignition table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this."
@@ -5421,31 +5416,31 @@ cmd_set_engine_type_default					= "Z\x00\x31\x00\x00"
 		field = "TX pin",                               binarySerialTxPin, {useSerialPort == 1}
 		field = "RX pin",                               binarySerialRxPin, {useSerialPort == 1}
 
+	dialog = canHw1, "Primary CAN"
+		field = "Bitrate",		canBaudRate
+
+	dialog = canHw2, "Secondary CAN"
+		field = "Bitrate",	can2BaudRate
+
 	dialog = canBus, "CAN Bus"
 		field = "CAN read enabled",						canReadEnabled
 		field = "CAN write enabled",					canWriteEnabled
-		field = "CAN bitrate",							canBaudRate
 		field = "CAN dash type",						canNbcType
 		field = "Verbose Can",                          verboseCan
 		field = "inertia measurement unit",             imuType
 		field = "Enable rusEFI CAN broadcast",			enableVerboseCanTx
-		field = "Which CAN channel to broadcast on",    canBroadcastUseChannelTwo
+		field = "rusEFI CAN data bus",    canBroadcastUseChannelTwo
 		field = "rusEFI CAN data base address",			verboseCanBaseAddress
 		field = "rusEFI CAN data address type",			rusefiVerbose29b
 		field = "rusEFI CAN data period",				canSleepPeriodMs
 
 	dialog = canBus2, "Secondary CAN Bus"
-		field = "CAN read enabled",						can2ReadEnabled
-		field = "CAN write enabled",					can2WriteEnabled
-		field = "CAN bitrate",							can2BaudRate
-		field = "CAN dash type",						can2NbcType
-		field = "Enable rusEFI CAN broadcast",			enableVerboseCan2Tx
-		field = "rusEFI CAN data base address",			verboseCan2BaseAddress
-		field = "rusEFI CAN data period",				can2SleepPeriodMs
 
 	dialog = canBusMain, "CAN Bus Communication", yAxis
 		panel = canBus
 
+		panel = canHw1
+
 	dialog = auxSerial, "AUX Sensor Serial"
 		field = "RX pin",								auxSerialRxPin 
 		field = "TX pin",								auxSerialTxPin 
diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini
index d7e82a9b8b..b5687e1241 100644
--- a/firmware/tunerstudio/generated/rusefi_hellen72.ini
+++ b/firmware/tunerstudio/generated/rusefi_hellen72.ini
@@ -32,12 +32,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
- 	signature    = "rusEFI 2021.12.24.hellen72.208707834"
+ 	signature    = "rusEFI 2021.12.25.hellen72.96637734"
 
 [TunerStudio]
    queryCommand   = "S"
    versionInfo    = "V"  ; firmwave version for title bar.
-   signature    = "rusEFI 2021.12.24.hellen72.208707834" ; signature is expected to be 7 or more characters.
+   signature    = "rusEFI 2021.12.25.hellen72.96637734" ; signature is expected to be 7 or more characters.
 
    ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
    useLegacyFTempUnits = false
@@ -84,7 +84,7 @@ enable2ndByteCanID = false
    ;  name       			= scalar, type, offset,         units,     scale, translate,    lo,      hi, digits
 
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Dec 24 04:13:39 UTC 2021
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Dec 25 04:39:07 UTC 2021
 
 pageSize            = 20996
 page = 1
@@ -365,7 +365,7 @@ canTxPin = bits, U08, 716, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3",
 canRxPin = bits, U08, 717, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 throttlePedalUpPinMode = bits, U08, 718, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID"
 acIdleExtraOffset = scalar, U08, 719, "%", 1, 0, 0, 100, 0
-can2SleepPeriodMs = scalar, S32, 720, "ms", 1, 0, 0, 1000, 2
+unused720 = scalar, S32, 720, "ms", 1, 0, 0, 1000, 2
 wastegatePositionMin = scalar, U16, 724, "mv", 1, 0, 0, 5000, 0
 wastegatePositionMax = scalar, U16, 726, "mv", 1, 0, 0, 5000, 0
 idlePositionMin = scalar, U16, 728, "mv", 1, 0, 0, 5000, 0
@@ -794,10 +794,10 @@ canBaudRate = bits, U08, 1732, [0:1], "100kbps", "250kbps", "500kbps", "1Mbps"
 veOverrideMode = bits, U08, 1733, [0:1], "None", "MAP", "TPS", "INVALID"
 can2BaudRate = bits, U08, 1734, [0:1], "100kbps", "250kbps", "500kbps", "1Mbps"
 afrOverrideMode = bits, U08, 1735, [0:2], "None", "MAP", "TPS", "Acc Pedal", "Cyl Filling %", "INVALID", "INVALID", "INVALID"
-verboseCan2BaseAddress = scalar, U32, 1736, "", 1, 0, 0, 536870911, 0
-enableVerboseCan2Tx = bits, U32, 1740, [0:0], "false", "true"
-can2ReadEnabled = bits, U32, 1740, [1:1], "false", "true"
-can2WriteEnabled = bits, U32, 1740, [2:2], "false", "true"
+unused1736 = scalar, U32, 1736, "", 1, 0, 0, 536870911, 0
+unused1740b0 = bits, U32, 1740, [0:0], "false", "true"
+unused1740b1 = bits, U32, 1740, [1:1], "false", "true"
+unused1740b2 = bits, U32, 1740, [2:2], "false", "true"
 stepperDcInvertedPins = bits, U32, 1740, [3:3], "false", "true"
 unused1127 = bits, U32, 1740, [4:4], "false", "true"
 unused1128 = bits, U32, 1740, [5:5], "false", "true"
@@ -827,7 +827,7 @@ unusedBit_498_28 = bits, U32, 1740, [28:28], "false", "true"
 unusedBit_498_29 = bits, U32, 1740, [29:29], "false", "true"
 unusedBit_498_30 = bits, U32, 1740, [30:30], "false", "true"
 unusedBit_498_31 = bits, U32, 1740, [31:31], "false", "true"
-can2NbcType = bits, U32, 1744, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "Nissan VQ35", "Genesis Coupe", "Honda K", "AiM", "type 13", "type 14", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
+unused1744 = scalar, U32, 1744, "", 1,0,0,0,0
 can2TxPin = bits, U08, 1748, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 can2RxPin = bits, U08, 1749, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 starterControlPinMode = bits, U08, 1750, [0:1], "default", "default inverted", "open collector", "open collector inverted"
@@ -1471,7 +1471,6 @@ fuelTrims12_table = array, S08, 20980, [4x4], "", 0.2, 0, -25, 25, 1
 	canTxPin = "set_can_tx_pin X"
 	canRxPin = "set_can_rx_pin X"
 	acIdleExtraOffset = "Additional idle % while A/C is active"
-	can2SleepPeriodMs = "CANbus thread period, ms"
 	wastegatePositionMin = "Voltage when the wastegate is closed.\nYou probably don't have one of these!"
 	wastegatePositionMax = "Voltage when the wastegate is fully open.\nYou probably don't have one of these!\n1 volt = 1000 units"
 	idlePositionMin = "Voltage when the idle valve is closed.\nYou probably don't have one of these!"
@@ -1637,11 +1636,7 @@ fuelTrims12_table = array, S08, 20980, [4x4], "", 0.2, 0, -25, 25, 1
 	canBaudRate = "set can_baudrate"
 	veOverrideMode = "Override the Y axis (load) value used for the VE table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this."
 	afrOverrideMode = "Override the Y axis (load) value used for the AFR table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this."
-	enableVerboseCan2Tx = "CAN broadcast using custom rusEFI protocol\nenable can_broadcast/disable can_broadcast"
-	can2ReadEnabled = "enable can_read/disable can_read"
-	can2WriteEnabled = "enable can_write/disable can_write"
 	stepperDcInvertedPins = "Enable if DC-motor driver (H-bridge) inverts the signals (eg. RZ7899 on Hellen boards)"
-	can2NbcType = "set can_mode X"
 	can2TxPin = "set_can2_tx_pin X"
 	can2RxPin = "set_can2_rx_pin X"
 	ignOverrideMode = "Override the Y axis (load) value used for the ignition table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this."
@@ -5421,31 +5416,31 @@ cmd_set_engine_type_default					= "Z\x00\x31\x00\x00"
 		field = "TX pin",                               binarySerialTxPin, {useSerialPort == 1}
 		field = "RX pin",                               binarySerialRxPin, {useSerialPort == 1}
 
+	dialog = canHw1, "Primary CAN"
+		field = "Bitrate",		canBaudRate
+
+	dialog = canHw2, "Secondary CAN"
+		field = "Bitrate",	can2BaudRate
+
 	dialog = canBus, "CAN Bus"
 		field = "CAN read enabled",						canReadEnabled
 		field = "CAN write enabled",					canWriteEnabled
-		field = "CAN bitrate",							canBaudRate
 		field = "CAN dash type",						canNbcType
 		field = "Verbose Can",                          verboseCan
 		field = "inertia measurement unit",             imuType
 		field = "Enable rusEFI CAN broadcast",			enableVerboseCanTx
-		field = "Which CAN channel to broadcast on",    canBroadcastUseChannelTwo
+		field = "rusEFI CAN data bus",    canBroadcastUseChannelTwo
 		field = "rusEFI CAN data base address",			verboseCanBaseAddress
 		field = "rusEFI CAN data address type",			rusefiVerbose29b
 		field = "rusEFI CAN data period",				canSleepPeriodMs
 
 	dialog = canBus2, "Secondary CAN Bus"
-		field = "CAN read enabled",						can2ReadEnabled
-		field = "CAN write enabled",					can2WriteEnabled
-		field = "CAN bitrate",							can2BaudRate
-		field = "CAN dash type",						can2NbcType
-		field = "Enable rusEFI CAN broadcast",			enableVerboseCan2Tx
-		field = "rusEFI CAN data base address",			verboseCan2BaseAddress
-		field = "rusEFI CAN data period",				can2SleepPeriodMs
 
 	dialog = canBusMain, "CAN Bus Communication", yAxis
 		panel = canBus
 
+		panel = canHw1
+
 	dialog = auxSerial, "AUX Sensor Serial"
 		field = "RX pin",								auxSerialRxPin 
 		field = "TX pin",								auxSerialTxPin 
diff --git a/firmware/tunerstudio/generated/rusefi_hellen81.ini b/firmware/tunerstudio/generated/rusefi_hellen81.ini
index 6fe1c5a73b..172c3f5d9d 100644
--- a/firmware/tunerstudio/generated/rusefi_hellen81.ini
+++ b/firmware/tunerstudio/generated/rusefi_hellen81.ini
@@ -32,12 +32,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
- 	signature    = "rusEFI 2021.12.24.hellen81.3095215369"
+ 	signature    = "rusEFI 2021.12.25.hellen81.2983136981"
 
 [TunerStudio]
    queryCommand   = "S"
    versionInfo    = "V"  ; firmwave version for title bar.
-   signature    = "rusEFI 2021.12.24.hellen81.3095215369" ; signature is expected to be 7 or more characters.
+   signature    = "rusEFI 2021.12.25.hellen81.2983136981" ; signature is expected to be 7 or more characters.
 
    ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
    useLegacyFTempUnits = false
@@ -84,7 +84,7 @@ enable2ndByteCanID = false
    ;  name       			= scalar, type, offset,         units,     scale, translate,    lo,      hi, digits
 
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Dec 24 04:13:42 UTC 2021
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Dec 25 04:39:09 UTC 2021
 
 pageSize            = 20996
 page = 1
@@ -365,7 +365,7 @@ canTxPin = bits, U08, 716, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3",
 canRxPin = bits, U08, 717, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 throttlePedalUpPinMode = bits, U08, 718, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID"
 acIdleExtraOffset = scalar, U08, 719, "%", 1, 0, 0, 100, 0
-can2SleepPeriodMs = scalar, S32, 720, "ms", 1, 0, 0, 1000, 2
+unused720 = scalar, S32, 720, "ms", 1, 0, 0, 1000, 2
 wastegatePositionMin = scalar, U16, 724, "mv", 1, 0, 0, 5000, 0
 wastegatePositionMax = scalar, U16, 726, "mv", 1, 0, 0, 5000, 0
 idlePositionMin = scalar, U16, 728, "mv", 1, 0, 0, 5000, 0
@@ -794,10 +794,10 @@ canBaudRate = bits, U08, 1732, [0:1], "100kbps", "250kbps", "500kbps", "1Mbps"
 veOverrideMode = bits, U08, 1733, [0:1], "None", "MAP", "TPS", "INVALID"
 can2BaudRate = bits, U08, 1734, [0:1], "100kbps", "250kbps", "500kbps", "1Mbps"
 afrOverrideMode = bits, U08, 1735, [0:2], "None", "MAP", "TPS", "Acc Pedal", "Cyl Filling %", "INVALID", "INVALID", "INVALID"
-verboseCan2BaseAddress = scalar, U32, 1736, "", 1, 0, 0, 536870911, 0
-enableVerboseCan2Tx = bits, U32, 1740, [0:0], "false", "true"
-can2ReadEnabled = bits, U32, 1740, [1:1], "false", "true"
-can2WriteEnabled = bits, U32, 1740, [2:2], "false", "true"
+unused1736 = scalar, U32, 1736, "", 1, 0, 0, 536870911, 0
+unused1740b0 = bits, U32, 1740, [0:0], "false", "true"
+unused1740b1 = bits, U32, 1740, [1:1], "false", "true"
+unused1740b2 = bits, U32, 1740, [2:2], "false", "true"
 stepperDcInvertedPins = bits, U32, 1740, [3:3], "false", "true"
 unused1127 = bits, U32, 1740, [4:4], "false", "true"
 unused1128 = bits, U32, 1740, [5:5], "false", "true"
@@ -827,7 +827,7 @@ unusedBit_498_28 = bits, U32, 1740, [28:28], "false", "true"
 unusedBit_498_29 = bits, U32, 1740, [29:29], "false", "true"
 unusedBit_498_30 = bits, U32, 1740, [30:30], "false", "true"
 unusedBit_498_31 = bits, U32, 1740, [31:31], "false", "true"
-can2NbcType = bits, U32, 1744, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "Nissan VQ35", "Genesis Coupe", "Honda K", "AiM", "type 13", "type 14", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
+unused1744 = scalar, U32, 1744, "", 1,0,0,0,0
 can2TxPin = bits, U08, 1748, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 can2RxPin = bits, U08, 1749, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 starterControlPinMode = bits, U08, 1750, [0:1], "default", "default inverted", "open collector", "open collector inverted"
@@ -1471,7 +1471,6 @@ fuelTrims12_table = array, S08, 20980, [4x4], "", 0.2, 0, -25, 25, 1
 	canTxPin = "set_can_tx_pin X"
 	canRxPin = "set_can_rx_pin X"
 	acIdleExtraOffset = "Additional idle % while A/C is active"
-	can2SleepPeriodMs = "CANbus thread period, ms"
 	wastegatePositionMin = "Voltage when the wastegate is closed.\nYou probably don't have one of these!"
 	wastegatePositionMax = "Voltage when the wastegate is fully open.\nYou probably don't have one of these!\n1 volt = 1000 units"
 	idlePositionMin = "Voltage when the idle valve is closed.\nYou probably don't have one of these!"
@@ -1637,11 +1636,7 @@ fuelTrims12_table = array, S08, 20980, [4x4], "", 0.2, 0, -25, 25, 1
 	canBaudRate = "set can_baudrate"
 	veOverrideMode = "Override the Y axis (load) value used for the VE table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this."
 	afrOverrideMode = "Override the Y axis (load) value used for the AFR table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this."
-	enableVerboseCan2Tx = "CAN broadcast using custom rusEFI protocol\nenable can_broadcast/disable can_broadcast"
-	can2ReadEnabled = "enable can_read/disable can_read"
-	can2WriteEnabled = "enable can_write/disable can_write"
 	stepperDcInvertedPins = "Enable if DC-motor driver (H-bridge) inverts the signals (eg. RZ7899 on Hellen boards)"
-	can2NbcType = "set can_mode X"
 	can2TxPin = "set_can2_tx_pin X"
 	can2RxPin = "set_can2_rx_pin X"
 	ignOverrideMode = "Override the Y axis (load) value used for the ignition table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this."
@@ -5420,31 +5415,31 @@ cmd_set_engine_type_default					= "Z\x00\x31\x00\x00"
 		field = "TX pin",                               binarySerialTxPin, {useSerialPort == 1}
 		field = "RX pin",                               binarySerialRxPin, {useSerialPort == 1}
 
+	dialog = canHw1, "Primary CAN"
+		field = "Bitrate",		canBaudRate
+
+	dialog = canHw2, "Secondary CAN"
+		field = "Bitrate",	can2BaudRate
+
 	dialog = canBus, "CAN Bus"
 		field = "CAN read enabled",						canReadEnabled
 		field = "CAN write enabled",					canWriteEnabled
-		field = "CAN bitrate",							canBaudRate
 		field = "CAN dash type",						canNbcType
 		field = "Verbose Can",                          verboseCan
 		field = "inertia measurement unit",             imuType
 		field = "Enable rusEFI CAN broadcast",			enableVerboseCanTx
-		field = "Which CAN channel to broadcast on",    canBroadcastUseChannelTwo
+		field = "rusEFI CAN data bus",    canBroadcastUseChannelTwo
 		field = "rusEFI CAN data base address",			verboseCanBaseAddress
 		field = "rusEFI CAN data address type",			rusefiVerbose29b
 		field = "rusEFI CAN data period",				canSleepPeriodMs
 
 	dialog = canBus2, "Secondary CAN Bus"
-		field = "CAN read enabled",						can2ReadEnabled
-		field = "CAN write enabled",					can2WriteEnabled
-		field = "CAN bitrate",							can2BaudRate
-		field = "CAN dash type",						can2NbcType
-		field = "Enable rusEFI CAN broadcast",			enableVerboseCan2Tx
-		field = "rusEFI CAN data base address",			verboseCan2BaseAddress
-		field = "rusEFI CAN data period",				can2SleepPeriodMs
 
 	dialog = canBusMain, "CAN Bus Communication", yAxis
 		panel = canBus
 
+		panel = canHw1
+
 	dialog = auxSerial, "AUX Sensor Serial"
 		field = "RX pin",								auxSerialRxPin 
 		field = "TX pin",								auxSerialTxPin 
diff --git a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini
index 42f5db7f40..d8cfbf8333 100644
--- a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini
+++ b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini
@@ -32,12 +32,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
- 	signature    = "rusEFI 2021.12.24.hellen88bmw.1494070805"
+ 	signature    = "rusEFI 2021.12.25.hellen88bmw.1354728905"
 
 [TunerStudio]
    queryCommand   = "S"
    versionInfo    = "V"  ; firmwave version for title bar.
-   signature    = "rusEFI 2021.12.24.hellen88bmw.1494070805" ; signature is expected to be 7 or more characters.
+   signature    = "rusEFI 2021.12.25.hellen88bmw.1354728905" ; signature is expected to be 7 or more characters.
 
    ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
    useLegacyFTempUnits = false
@@ -84,7 +84,7 @@ enable2ndByteCanID = false
    ;  name       			= scalar, type, offset,         units,     scale, translate,    lo,      hi, digits
 
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Dec 24 04:13:36 UTC 2021
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Dec 25 04:39:04 UTC 2021
 
 pageSize            = 20996
 page = 1
@@ -365,7 +365,7 @@ canTxPin = bits, U08, 716, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3",
 canRxPin = bits, U08, 717, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 throttlePedalUpPinMode = bits, U08, 718, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID"
 acIdleExtraOffset = scalar, U08, 719, "%", 1, 0, 0, 100, 0
-can2SleepPeriodMs = scalar, S32, 720, "ms", 1, 0, 0, 1000, 2
+unused720 = scalar, S32, 720, "ms", 1, 0, 0, 1000, 2
 wastegatePositionMin = scalar, U16, 724, "mv", 1, 0, 0, 5000, 0
 wastegatePositionMax = scalar, U16, 726, "mv", 1, 0, 0, 5000, 0
 idlePositionMin = scalar, U16, 728, "mv", 1, 0, 0, 5000, 0
@@ -794,10 +794,10 @@ canBaudRate = bits, U08, 1732, [0:1], "100kbps", "250kbps", "500kbps", "1Mbps"
 veOverrideMode = bits, U08, 1733, [0:1], "None", "MAP", "TPS", "INVALID"
 can2BaudRate = bits, U08, 1734, [0:1], "100kbps", "250kbps", "500kbps", "1Mbps"
 afrOverrideMode = bits, U08, 1735, [0:2], "None", "MAP", "TPS", "Acc Pedal", "Cyl Filling %", "INVALID", "INVALID", "INVALID"
-verboseCan2BaseAddress = scalar, U32, 1736, "", 1, 0, 0, 536870911, 0
-enableVerboseCan2Tx = bits, U32, 1740, [0:0], "false", "true"
-can2ReadEnabled = bits, U32, 1740, [1:1], "false", "true"
-can2WriteEnabled = bits, U32, 1740, [2:2], "false", "true"
+unused1736 = scalar, U32, 1736, "", 1, 0, 0, 536870911, 0
+unused1740b0 = bits, U32, 1740, [0:0], "false", "true"
+unused1740b1 = bits, U32, 1740, [1:1], "false", "true"
+unused1740b2 = bits, U32, 1740, [2:2], "false", "true"
 stepperDcInvertedPins = bits, U32, 1740, [3:3], "false", "true"
 unused1127 = bits, U32, 1740, [4:4], "false", "true"
 unused1128 = bits, U32, 1740, [5:5], "false", "true"
@@ -827,7 +827,7 @@ unusedBit_498_28 = bits, U32, 1740, [28:28], "false", "true"
 unusedBit_498_29 = bits, U32, 1740, [29:29], "false", "true"
 unusedBit_498_30 = bits, U32, 1740, [30:30], "false", "true"
 unusedBit_498_31 = bits, U32, 1740, [31:31], "false", "true"
-can2NbcType = bits, U32, 1744, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "Nissan VQ35", "Genesis Coupe", "Honda K", "AiM", "type 13", "type 14", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
+unused1744 = scalar, U32, 1744, "", 1,0,0,0,0
 can2TxPin = bits, U08, 1748, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 can2RxPin = bits, U08, 1749, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 starterControlPinMode = bits, U08, 1750, [0:1], "default", "default inverted", "open collector", "open collector inverted"
@@ -1471,7 +1471,6 @@ fuelTrims12_table = array, S08, 20980, [4x4], "", 0.2, 0, -25, 25, 1
 	canTxPin = "set_can_tx_pin X"
 	canRxPin = "set_can_rx_pin X"
 	acIdleExtraOffset = "Additional idle % while A/C is active"
-	can2SleepPeriodMs = "CANbus thread period, ms"
 	wastegatePositionMin = "Voltage when the wastegate is closed.\nYou probably don't have one of these!"
 	wastegatePositionMax = "Voltage when the wastegate is fully open.\nYou probably don't have one of these!\n1 volt = 1000 units"
 	idlePositionMin = "Voltage when the idle valve is closed.\nYou probably don't have one of these!"
@@ -1637,11 +1636,7 @@ fuelTrims12_table = array, S08, 20980, [4x4], "", 0.2, 0, -25, 25, 1
 	canBaudRate = "set can_baudrate"
 	veOverrideMode = "Override the Y axis (load) value used for the VE table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this."
 	afrOverrideMode = "Override the Y axis (load) value used for the AFR table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this."
-	enableVerboseCan2Tx = "CAN broadcast using custom rusEFI protocol\nenable can_broadcast/disable can_broadcast"
-	can2ReadEnabled = "enable can_read/disable can_read"
-	can2WriteEnabled = "enable can_write/disable can_write"
 	stepperDcInvertedPins = "Enable if DC-motor driver (H-bridge) inverts the signals (eg. RZ7899 on Hellen boards)"
-	can2NbcType = "set can_mode X"
 	can2TxPin = "set_can2_tx_pin X"
 	can2RxPin = "set_can2_rx_pin X"
 	ignOverrideMode = "Override the Y axis (load) value used for the ignition table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this."
@@ -5421,31 +5416,31 @@ cmd_set_engine_type_default					= "Z\x00\x31\x00\x00"
 		field = "TX pin",                               binarySerialTxPin, {useSerialPort == 1}
 		field = "RX pin",                               binarySerialRxPin, {useSerialPort == 1}
 
+	dialog = canHw1, "Primary CAN"
+		field = "Bitrate",		canBaudRate
+
+	dialog = canHw2, "Secondary CAN"
+		field = "Bitrate",	can2BaudRate
+
 	dialog = canBus, "CAN Bus"
 		field = "CAN read enabled",						canReadEnabled
 		field = "CAN write enabled",					canWriteEnabled
-		field = "CAN bitrate",							canBaudRate
 		field = "CAN dash type",						canNbcType
 		field = "Verbose Can",                          verboseCan
 		field = "inertia measurement unit",             imuType
 		field = "Enable rusEFI CAN broadcast",			enableVerboseCanTx
-		field = "Which CAN channel to broadcast on",    canBroadcastUseChannelTwo
+		field = "rusEFI CAN data bus",    canBroadcastUseChannelTwo
 		field = "rusEFI CAN data base address",			verboseCanBaseAddress
 		field = "rusEFI CAN data address type",			rusefiVerbose29b
 		field = "rusEFI CAN data period",				canSleepPeriodMs
 
 	dialog = canBus2, "Secondary CAN Bus"
-		field = "CAN read enabled",						can2ReadEnabled
-		field = "CAN write enabled",					can2WriteEnabled
-		field = "CAN bitrate",							can2BaudRate
-		field = "CAN dash type",						can2NbcType
-		field = "Enable rusEFI CAN broadcast",			enableVerboseCan2Tx
-		field = "rusEFI CAN data base address",			verboseCan2BaseAddress
-		field = "rusEFI CAN data period",				can2SleepPeriodMs
 
 	dialog = canBusMain, "CAN Bus Communication", yAxis
 		panel = canBus
 
+		panel = canHw1
+
 	dialog = auxSerial, "AUX Sensor Serial"
 		field = "RX pin",								auxSerialRxPin 
 		field = "TX pin",								auxSerialTxPin 
diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini
index ddc2f5c735..f9bf331136 100644
--- a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini
+++ b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini
@@ -32,12 +32,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
- 	signature    = "rusEFI 2021.12.24.hellenNA6.2398118370"
+ 	signature    = "rusEFI 2021.12.25.hellenNA6.2269270590"
 
 [TunerStudio]
    queryCommand   = "S"
    versionInfo    = "V"  ; firmwave version for title bar.
-   signature    = "rusEFI 2021.12.24.hellenNA6.2398118370" ; signature is expected to be 7 or more characters.
+   signature    = "rusEFI 2021.12.25.hellenNA6.2269270590" ; signature is expected to be 7 or more characters.
 
    ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
    useLegacyFTempUnits = false
@@ -84,7 +84,7 @@ enable2ndByteCanID = false
    ;  name       			= scalar, type, offset,         units,     scale, translate,    lo,      hi, digits
 
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Dec 24 04:13:49 UTC 2021
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Dec 25 04:39:14 UTC 2021
 
 pageSize            = 20996
 page = 1
@@ -365,7 +365,7 @@ canTxPin = bits, U08, 716, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3",
 canRxPin = bits, U08, 717, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 throttlePedalUpPinMode = bits, U08, 718, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID"
 acIdleExtraOffset = scalar, U08, 719, "%", 1, 0, 0, 100, 0
-can2SleepPeriodMs = scalar, S32, 720, "ms", 1, 0, 0, 1000, 2
+unused720 = scalar, S32, 720, "ms", 1, 0, 0, 1000, 2
 wastegatePositionMin = scalar, U16, 724, "mv", 1, 0, 0, 5000, 0
 wastegatePositionMax = scalar, U16, 726, "mv", 1, 0, 0, 5000, 0
 idlePositionMin = scalar, U16, 728, "mv", 1, 0, 0, 5000, 0
@@ -794,10 +794,10 @@ canBaudRate = bits, U08, 1732, [0:1], "100kbps", "250kbps", "500kbps", "1Mbps"
 veOverrideMode = bits, U08, 1733, [0:1], "None", "MAP", "TPS", "INVALID"
 can2BaudRate = bits, U08, 1734, [0:1], "100kbps", "250kbps", "500kbps", "1Mbps"
 afrOverrideMode = bits, U08, 1735, [0:2], "None", "MAP", "TPS", "Acc Pedal", "Cyl Filling %", "INVALID", "INVALID", "INVALID"
-verboseCan2BaseAddress = scalar, U32, 1736, "", 1, 0, 0, 536870911, 0
-enableVerboseCan2Tx = bits, U32, 1740, [0:0], "false", "true"
-can2ReadEnabled = bits, U32, 1740, [1:1], "false", "true"
-can2WriteEnabled = bits, U32, 1740, [2:2], "false", "true"
+unused1736 = scalar, U32, 1736, "", 1, 0, 0, 536870911, 0
+unused1740b0 = bits, U32, 1740, [0:0], "false", "true"
+unused1740b1 = bits, U32, 1740, [1:1], "false", "true"
+unused1740b2 = bits, U32, 1740, [2:2], "false", "true"
 stepperDcInvertedPins = bits, U32, 1740, [3:3], "false", "true"
 unused1127 = bits, U32, 1740, [4:4], "false", "true"
 unused1128 = bits, U32, 1740, [5:5], "false", "true"
@@ -827,7 +827,7 @@ unusedBit_498_28 = bits, U32, 1740, [28:28], "false", "true"
 unusedBit_498_29 = bits, U32, 1740, [29:29], "false", "true"
 unusedBit_498_30 = bits, U32, 1740, [30:30], "false", "true"
 unusedBit_498_31 = bits, U32, 1740, [31:31], "false", "true"
-can2NbcType = bits, U32, 1744, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "Nissan VQ35", "Genesis Coupe", "Honda K", "AiM", "type 13", "type 14", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
+unused1744 = scalar, U32, 1744, "", 1,0,0,0,0
 can2TxPin = bits, U08, 1748, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 can2RxPin = bits, U08, 1749, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 starterControlPinMode = bits, U08, 1750, [0:1], "default", "default inverted", "open collector", "open collector inverted"
@@ -1471,7 +1471,6 @@ fuelTrims12_table = array, S08, 20980, [4x4], "", 0.2, 0, -25, 25, 1
 	canTxPin = "set_can_tx_pin X"
 	canRxPin = "set_can_rx_pin X"
 	acIdleExtraOffset = "Additional idle % while A/C is active"
-	can2SleepPeriodMs = "CANbus thread period, ms"
 	wastegatePositionMin = "Voltage when the wastegate is closed.\nYou probably don't have one of these!"
 	wastegatePositionMax = "Voltage when the wastegate is fully open.\nYou probably don't have one of these!\n1 volt = 1000 units"
 	idlePositionMin = "Voltage when the idle valve is closed.\nYou probably don't have one of these!"
@@ -1637,11 +1636,7 @@ fuelTrims12_table = array, S08, 20980, [4x4], "", 0.2, 0, -25, 25, 1
 	canBaudRate = "set can_baudrate"
 	veOverrideMode = "Override the Y axis (load) value used for the VE table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this."
 	afrOverrideMode = "Override the Y axis (load) value used for the AFR table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this."
-	enableVerboseCan2Tx = "CAN broadcast using custom rusEFI protocol\nenable can_broadcast/disable can_broadcast"
-	can2ReadEnabled = "enable can_read/disable can_read"
-	can2WriteEnabled = "enable can_write/disable can_write"
 	stepperDcInvertedPins = "Enable if DC-motor driver (H-bridge) inverts the signals (eg. RZ7899 on Hellen boards)"
-	can2NbcType = "set can_mode X"
 	can2TxPin = "set_can2_tx_pin X"
 	can2RxPin = "set_can2_rx_pin X"
 	ignOverrideMode = "Override the Y axis (load) value used for the ignition table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this."
@@ -5421,31 +5416,31 @@ cmd_set_engine_type_default					= "Z\x00\x31\x00\x00"
 		field = "TX pin",                               binarySerialTxPin, {useSerialPort == 1}
 		field = "RX pin",                               binarySerialRxPin, {useSerialPort == 1}
 
+	dialog = canHw1, "Primary CAN"
+		field = "Bitrate",		canBaudRate
+
+	dialog = canHw2, "Secondary CAN"
+		field = "Bitrate",	can2BaudRate
+
 	dialog = canBus, "CAN Bus"
 		field = "CAN read enabled",						canReadEnabled
 		field = "CAN write enabled",					canWriteEnabled
-		field = "CAN bitrate",							canBaudRate
 		field = "CAN dash type",						canNbcType
 		field = "Verbose Can",                          verboseCan
 		field = "inertia measurement unit",             imuType
 		field = "Enable rusEFI CAN broadcast",			enableVerboseCanTx
-		field = "Which CAN channel to broadcast on",    canBroadcastUseChannelTwo
+		field = "rusEFI CAN data bus",    canBroadcastUseChannelTwo
 		field = "rusEFI CAN data base address",			verboseCanBaseAddress
 		field = "rusEFI CAN data address type",			rusefiVerbose29b
 		field = "rusEFI CAN data period",				canSleepPeriodMs
 
 	dialog = canBus2, "Secondary CAN Bus"
-		field = "CAN read enabled",						can2ReadEnabled
-		field = "CAN write enabled",					can2WriteEnabled
-		field = "CAN bitrate",							can2BaudRate
-		field = "CAN dash type",						can2NbcType
-		field = "Enable rusEFI CAN broadcast",			enableVerboseCan2Tx
-		field = "rusEFI CAN data base address",			verboseCan2BaseAddress
-		field = "rusEFI CAN data period",				can2SleepPeriodMs
 
 	dialog = canBusMain, "CAN Bus Communication", yAxis
 		panel = canBus
 
+		panel = canHw1
+
 	dialog = auxSerial, "AUX Sensor Serial"
 		field = "RX pin",								auxSerialRxPin 
 		field = "TX pin",								auxSerialTxPin 
diff --git a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini
index caa7d9a2bc..a8e5e6412d 100644
--- a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini
+++ b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini
@@ -32,12 +32,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
- 	signature    = "rusEFI 2021.12.24.hellen_cypress.3258499318"
+ 	signature    = "rusEFI 2021.12.25.hellen_cypress.3414881066"
 
 [TunerStudio]
    queryCommand   = "S"
    versionInfo    = "V"  ; firmwave version for title bar.
-   signature    = "rusEFI 2021.12.24.hellen_cypress.3258499318" ; signature is expected to be 7 or more characters.
+   signature    = "rusEFI 2021.12.25.hellen_cypress.3414881066" ; signature is expected to be 7 or more characters.
 
    ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
    useLegacyFTempUnits = false
@@ -84,7 +84,7 @@ enable2ndByteCanID = false
    ;  name       			= scalar, type, offset,         units,     scale, translate,    lo,      hi, digits
 
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Fri Dec 24 04:14:20 UTC 2021
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Sat Dec 25 04:39:41 UTC 2021
 
 pageSize            = 20996
 page = 1
@@ -365,7 +365,7 @@ canTxPin = bits, U08, 716, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3",
 canRxPin = bits, U08, 717, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 throttlePedalUpPinMode = bits, U08, 718, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID"
 acIdleExtraOffset = scalar, U08, 719, "%", 1, 0, 0, 100, 0
-can2SleepPeriodMs = scalar, S32, 720, "ms", 1, 0, 0, 1000, 2
+unused720 = scalar, S32, 720, "ms", 1, 0, 0, 1000, 2
 wastegatePositionMin = scalar, U16, 724, "mv", 1, 0, 0, 5000, 0
 wastegatePositionMax = scalar, U16, 726, "mv", 1, 0, 0, 5000, 0
 idlePositionMin = scalar, U16, 728, "mv", 1, 0, 0, 5000, 0
@@ -794,10 +794,10 @@ canBaudRate = bits, U08, 1732, [0:1], "100kbps", "250kbps", "500kbps", "1Mbps"
 veOverrideMode = bits, U08, 1733, [0:1], "None", "MAP", "TPS", "INVALID"
 can2BaudRate = bits, U08, 1734, [0:1], "100kbps", "250kbps", "500kbps", "1Mbps"
 afrOverrideMode = bits, U08, 1735, [0:2], "None", "MAP", "TPS", "Acc Pedal", "Cyl Filling %", "INVALID", "INVALID", "INVALID"
-verboseCan2BaseAddress = scalar, U32, 1736, "", 1, 0, 0, 536870911, 0
-enableVerboseCan2Tx = bits, U32, 1740, [0:0], "false", "true"
-can2ReadEnabled = bits, U32, 1740, [1:1], "false", "true"
-can2WriteEnabled = bits, U32, 1740, [2:2], "false", "true"
+unused1736 = scalar, U32, 1736, "", 1, 0, 0, 536870911, 0
+unused1740b0 = bits, U32, 1740, [0:0], "false", "true"
+unused1740b1 = bits, U32, 1740, [1:1], "false", "true"
+unused1740b2 = bits, U32, 1740, [2:2], "false", "true"
 stepperDcInvertedPins = bits, U32, 1740, [3:3], "false", "true"
 unused1127 = bits, U32, 1740, [4:4], "false", "true"
 unused1128 = bits, U32, 1740, [5:5], "false", "true"
@@ -827,7 +827,7 @@ unusedBit_498_28 = bits, U32, 1740, [28:28], "false", "true"
 unusedBit_498_29 = bits, U32, 1740, [29:29], "false", "true"
 unusedBit_498_30 = bits, U32, 1740, [30:30], "false", "true"
 unusedBit_498_31 = bits, U32, 1740, [31:31], "false", "true"
-can2NbcType = bits, U32, 1744, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "Nissan VQ35", "Genesis Coupe", "Honda K", "AiM", "type 13", "type 14", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
+unused1744 = scalar, U32, 1744, "", 1,0,0,0,0
 can2TxPin = bits, U08, 1748, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 can2RxPin = bits, U08, 1749, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 starterControlPinMode = bits, U08, 1750, [0:1], "default", "default inverted", "open collector", "open collector inverted"
@@ -1471,7 +1471,6 @@ fuelTrims12_table = array, S08, 20980, [4x4], "", 0.2, 0, -25, 25, 1
 	canTxPin = "set_can_tx_pin X"
 	canRxPin = "set_can_rx_pin X"
 	acIdleExtraOffset = "Additional idle % while A/C is active"
-	can2SleepPeriodMs = "CANbus thread period, ms"
 	wastegatePositionMin = "Voltage when the wastegate is closed.\nYou probably don't have one of these!"
 	wastegatePositionMax = "Voltage when the wastegate is fully open.\nYou probably don't have one of these!\n1 volt = 1000 units"
 	idlePositionMin = "Voltage when the idle valve is closed.\nYou probably don't have one of these!"
@@ -1637,11 +1636,7 @@ fuelTrims12_table = array, S08, 20980, [4x4], "", 0.2, 0, -25, 25, 1
 	canBaudRate = "set can_baudrate"
 	veOverrideMode = "Override the Y axis (load) value used for the VE table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this."
 	afrOverrideMode = "Override the Y axis (load) value used for the AFR table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this."
-	enableVerboseCan2Tx = "CAN broadcast using custom rusEFI protocol\nenable can_broadcast/disable can_broadcast"
-	can2ReadEnabled = "enable can_read/disable can_read"
-	can2WriteEnabled = "enable can_write/disable can_write"
 	stepperDcInvertedPins = "Enable if DC-motor driver (H-bridge) inverts the signals (eg. RZ7899 on Hellen boards)"
-	can2NbcType = "set can_mode X"
 	can2TxPin = "set_can2_tx_pin X"
 	can2RxPin = "set_can2_rx_pin X"
 	ignOverrideMode = "Override the Y axis (load) value used for the ignition table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this."
@@ -5438,35 +5433,35 @@ cmd_set_engine_type_default					= "Z\x00\x31\x00\x00"
 		field = "TX pin",                               binarySerialTxPin, {useSerialPort == 1}
 		field = "RX pin",                               binarySerialRxPin, {useSerialPort == 1}
 
+	dialog = canHw1, "Primary CAN"
+		field = "Bitrate",		canBaudRate
+		field = "RX pin",		canRxPin 
+		field = "TX pin",		canTxPin 
+
+	dialog = canHw2, "Secondary CAN"
+		field = "Bitrate",	can2BaudRate
+		field = "RX pin",		can2RxPin 
+		field = "TX pin",		can2TxPin 
+
 	dialog = canBus, "CAN Bus"
 		field = "CAN read enabled",						canReadEnabled
 		field = "CAN write enabled",					canWriteEnabled
-		field = "CAN bitrate",							canBaudRate
 		field = "CAN dash type",						canNbcType
 		field = "Verbose Can",                          verboseCan
 		field = "inertia measurement unit",             imuType
 		field = "Enable rusEFI CAN broadcast",			enableVerboseCanTx
-		field = "Which CAN channel to broadcast on",    canBroadcastUseChannelTwo
+		field = "rusEFI CAN data bus",    canBroadcastUseChannelTwo
 		field = "rusEFI CAN data base address",			verboseCanBaseAddress
 		field = "rusEFI CAN data address type",			rusefiVerbose29b
 		field = "rusEFI CAN data period",				canSleepPeriodMs
-		field = "RX pin",								canRxPin 
-		field = "TX pin",								canTxPin 
 
 	dialog = canBus2, "Secondary CAN Bus"
-		field = "CAN read enabled",						can2ReadEnabled
-		field = "CAN write enabled",					can2WriteEnabled
-		field = "CAN bitrate",							can2BaudRate
-		field = "CAN dash type",						can2NbcType
-		field = "Enable rusEFI CAN broadcast",			enableVerboseCan2Tx
-		field = "rusEFI CAN data base address",			verboseCan2BaseAddress
-		field = "rusEFI CAN data period",				can2SleepPeriodMs
-		field = "RX pin",								can2RxPin 
-		field = "TX pin",								can2TxPin 
 
 	dialog = canBusMain, "CAN Bus Communication", yAxis
 		panel = canBus
-		panel = canBus2							
+
+		panel = canHw1
+		panel = canHw2	
 
 	dialog = auxSerial, "AUX Sensor Serial"
 		field = "RX pin",								auxSerialRxPin 
diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini
index 076ba0ce4d..12644fd2c2 100644
--- a/firmware/tunerstudio/generated/rusefi_kinetis.ini
+++ b/firmware/tunerstudio/generated/rusefi_kinetis.ini
@@ -32,12 +32,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
- 	signature    = "rusEFI 2021.12.24.kin.1033702410"
+ 	signature    = "rusEFI 2021.12.25.kin.875511766"
 
 [TunerStudio]
    queryCommand   = "S"
    versionInfo    = "V"  ; firmwave version for title bar.
-   signature    = "rusEFI 2021.12.24.kin.1033702410" ; signature is expected to be 7 or more characters.
+   signature    = "rusEFI 2021.12.25.kin.875511766" ; signature is expected to be 7 or more characters.
 
    ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
    useLegacyFTempUnits = false
@@ -84,7 +84,7 @@ enable2ndByteCanID = false
    ;  name       			= scalar, type, offset,         units,     scale, translate,    lo,      hi, digits
 
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Fri Dec 24 04:14:18 UTC 2021
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sat Dec 25 04:39:39 UTC 2021
 
 pageSize            = 20968
 page = 1
@@ -362,7 +362,7 @@ canTxPin = bits, U08, 716, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3",
 canRxPin = bits, U08, 717, [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"
 throttlePedalUpPinMode = bits, U08, 718, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID"
 acIdleExtraOffset = scalar, U08, 719, "%", 1, 0, 0, 100, 0
-can2SleepPeriodMs = scalar, S32, 720, "ms", 1, 0, 0, 1000, 2
+unused720 = scalar, S32, 720, "ms", 1, 0, 0, 1000, 2
 wastegatePositionMin = scalar, U16, 724, "mv", 1, 0, 0, 5000, 0
 wastegatePositionMax = scalar, U16, 726, "mv", 1, 0, 0, 5000, 0
 idlePositionMin = scalar, U16, 728, "mv", 1, 0, 0, 5000, 0
@@ -785,10 +785,10 @@ canBaudRate = bits, U08, 1732, [0:1], "100kbps", "250kbps", "500kbps", "1Mbps"
 veOverrideMode = bits, U08, 1733, [0:1], "None", "MAP", "TPS", "INVALID"
 can2BaudRate = bits, U08, 1734, [0:1], "100kbps", "250kbps", "500kbps", "1Mbps"
 afrOverrideMode = bits, U08, 1735, [0:2], "None", "MAP", "TPS", "Acc Pedal", "Cyl Filling %", "INVALID", "INVALID", "INVALID"
-verboseCan2BaseAddress = scalar, U32, 1736, "", 1, 0, 0, 536870911, 0
-enableVerboseCan2Tx = bits, U32, 1740, [0:0], "false", "true"
-can2ReadEnabled = bits, U32, 1740, [1:1], "false", "true"
-can2WriteEnabled = bits, U32, 1740, [2:2], "false", "true"
+unused1736 = scalar, U32, 1736, "", 1, 0, 0, 536870911, 0
+unused1740b0 = bits, U32, 1740, [0:0], "false", "true"
+unused1740b1 = bits, U32, 1740, [1:1], "false", "true"
+unused1740b2 = bits, U32, 1740, [2:2], "false", "true"
 stepperDcInvertedPins = bits, U32, 1740, [3:3], "false", "true"
 unused1127 = bits, U32, 1740, [4:4], "false", "true"
 unused1128 = bits, U32, 1740, [5:5], "false", "true"
@@ -818,7 +818,7 @@ unusedBit_498_28 = bits, U32, 1740, [28:28], "false", "true"
 unusedBit_498_29 = bits, U32, 1740, [29:29], "false", "true"
 unusedBit_498_30 = bits, U32, 1740, [30:30], "false", "true"
 unusedBit_498_31 = bits, U32, 1740, [31:31], "false", "true"
-can2NbcType = bits, U32, 1744, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "Nissan VQ35", "Genesis Coupe", "Honda K", "AiM", "type 13", "type 14", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
+unused1744 = scalar, U32, 1744, "", 1,0,0,0,0
 can2TxPin = bits, U08, 1748, [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, 1749, [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"
 starterControlPinMode = bits, U08, 1750, [0:1], "default", "default inverted", "open collector", "open collector inverted"
@@ -1446,7 +1446,6 @@ fuelTrims12_table = array, S08, 20952, [4x4], "", 0.2, 0, -25, 25, 1
 	canTxPin = "set_can_tx_pin X"
 	canRxPin = "set_can_rx_pin X"
 	acIdleExtraOffset = "Additional idle % while A/C is active"
-	can2SleepPeriodMs = "CANbus thread period, ms"
 	wastegatePositionMin = "Voltage when the wastegate is closed.\nYou probably don't have one of these!"
 	wastegatePositionMax = "Voltage when the wastegate is fully open.\nYou probably don't have one of these!\n1 volt = 1000 units"
 	idlePositionMin = "Voltage when the idle valve is closed.\nYou probably don't have one of these!"
@@ -1609,11 +1608,7 @@ fuelTrims12_table = array, S08, 20952, [4x4], "", 0.2, 0, -25, 25, 1
 	canBaudRate = "set can_baudrate"
 	veOverrideMode = "Override the Y axis (load) value used for the VE table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this."
 	afrOverrideMode = "Override the Y axis (load) value used for the AFR table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this."
-	enableVerboseCan2Tx = "CAN broadcast using custom rusEFI protocol\nenable can_broadcast/disable can_broadcast"
-	can2ReadEnabled = "enable can_read/disable can_read"
-	can2WriteEnabled = "enable can_write/disable can_write"
 	stepperDcInvertedPins = "Enable if DC-motor driver (H-bridge) inverts the signals (eg. RZ7899 on Hellen boards)"
-	can2NbcType = "set can_mode X"
 	can2TxPin = "set_can2_tx_pin X"
 	can2RxPin = "set_can2_rx_pin X"
 	ignOverrideMode = "Override the Y axis (load) value used for the ignition table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this."
@@ -5405,35 +5400,35 @@ cmd_set_engine_type_default					= "Z\x00\x31\x00\x00"
 		field = "TX pin",                               binarySerialTxPin, {useSerialPort == 1}
 		field = "RX pin",                               binarySerialRxPin, {useSerialPort == 1}
 
+	dialog = canHw1, "Primary CAN"
+		field = "Bitrate",		canBaudRate
+		field = "RX pin",		canRxPin 
+		field = "TX pin",		canTxPin 
+
+	dialog = canHw2, "Secondary CAN"
+		field = "Bitrate",	can2BaudRate
+		field = "RX pin",		can2RxPin 
+		field = "TX pin",		can2TxPin 
+
 	dialog = canBus, "CAN Bus"
 		field = "CAN read enabled",						canReadEnabled
 		field = "CAN write enabled",					canWriteEnabled
-		field = "CAN bitrate",							canBaudRate
 		field = "CAN dash type",						canNbcType
 		field = "Verbose Can",                          verboseCan
 		field = "inertia measurement unit",             imuType
 		field = "Enable rusEFI CAN broadcast",			enableVerboseCanTx
-		field = "Which CAN channel to broadcast on",    canBroadcastUseChannelTwo
+		field = "rusEFI CAN data bus",    canBroadcastUseChannelTwo
 		field = "rusEFI CAN data base address",			verboseCanBaseAddress
 		field = "rusEFI CAN data address type",			rusefiVerbose29b
 		field = "rusEFI CAN data period",				canSleepPeriodMs
-		field = "RX pin",								canRxPin 
-		field = "TX pin",								canTxPin 
 
 	dialog = canBus2, "Secondary CAN Bus"
-		field = "CAN read enabled",						can2ReadEnabled
-		field = "CAN write enabled",					can2WriteEnabled
-		field = "CAN bitrate",							can2BaudRate
-		field = "CAN dash type",						can2NbcType
-		field = "Enable rusEFI CAN broadcast",			enableVerboseCan2Tx
-		field = "rusEFI CAN data base address",			verboseCan2BaseAddress
-		field = "rusEFI CAN data period",				can2SleepPeriodMs
-		field = "RX pin",								can2RxPin 
-		field = "TX pin",								can2TxPin 
 
 	dialog = canBusMain, "CAN Bus Communication", yAxis
 		panel = canBus
-		panel = canBus2							
+
+		panel = canHw1
+		panel = canHw2	
 
 	dialog = auxSerial, "AUX Sensor Serial"
 		field = "RX pin",								auxSerialRxPin 
diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini
index b4864a07b8..6eca5e6028 100644
--- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini
+++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini
@@ -32,12 +32,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
- 	signature    = "rusEFI 2021.12.24.mre_f4.1273650686"
+ 	signature    = "rusEFI 2021.12.25.mre_f4.1113091618"
 
 [TunerStudio]
    queryCommand   = "S"
    versionInfo    = "V"  ; firmwave version for title bar.
-   signature    = "rusEFI 2021.12.24.mre_f4.1273650686" ; signature is expected to be 7 or more characters.
+   signature    = "rusEFI 2021.12.25.mre_f4.1113091618" ; signature is expected to be 7 or more characters.
 
    ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
    useLegacyFTempUnits = false
@@ -84,7 +84,7 @@ enable2ndByteCanID = false
    ;  name       			= scalar, type, offset,         units,     scale, translate,    lo,      hi, digits
 
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Dec 24 04:13:54 UTC 2021
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Dec 25 04:39:19 UTC 2021
 
 pageSize            = 20996
 page = 1
@@ -365,7 +365,7 @@ canTxPin = bits, U08, 716, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3",
 canRxPin = bits, U08, 717, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 throttlePedalUpPinMode = bits, U08, 718, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID"
 acIdleExtraOffset = scalar, U08, 719, "%", 1, 0, 0, 100, 0
-can2SleepPeriodMs = scalar, S32, 720, "ms", 1, 0, 0, 1000, 2
+unused720 = scalar, S32, 720, "ms", 1, 0, 0, 1000, 2
 wastegatePositionMin = scalar, U16, 724, "mv", 1, 0, 0, 5000, 0
 wastegatePositionMax = scalar, U16, 726, "mv", 1, 0, 0, 5000, 0
 idlePositionMin = scalar, U16, 728, "mv", 1, 0, 0, 5000, 0
@@ -794,10 +794,10 @@ canBaudRate = bits, U08, 1732, [0:1], "100kbps", "250kbps", "500kbps", "1Mbps"
 veOverrideMode = bits, U08, 1733, [0:1], "None", "MAP", "TPS", "INVALID"
 can2BaudRate = bits, U08, 1734, [0:1], "100kbps", "250kbps", "500kbps", "1Mbps"
 afrOverrideMode = bits, U08, 1735, [0:2], "None", "MAP", "TPS", "Acc Pedal", "Cyl Filling %", "INVALID", "INVALID", "INVALID"
-verboseCan2BaseAddress = scalar, U32, 1736, "", 1, 0, 0, 536870911, 0
-enableVerboseCan2Tx = bits, U32, 1740, [0:0], "false", "true"
-can2ReadEnabled = bits, U32, 1740, [1:1], "false", "true"
-can2WriteEnabled = bits, U32, 1740, [2:2], "false", "true"
+unused1736 = scalar, U32, 1736, "", 1, 0, 0, 536870911, 0
+unused1740b0 = bits, U32, 1740, [0:0], "false", "true"
+unused1740b1 = bits, U32, 1740, [1:1], "false", "true"
+unused1740b2 = bits, U32, 1740, [2:2], "false", "true"
 stepperDcInvertedPins = bits, U32, 1740, [3:3], "false", "true"
 unused1127 = bits, U32, 1740, [4:4], "false", "true"
 unused1128 = bits, U32, 1740, [5:5], "false", "true"
@@ -827,7 +827,7 @@ unusedBit_498_28 = bits, U32, 1740, [28:28], "false", "true"
 unusedBit_498_29 = bits, U32, 1740, [29:29], "false", "true"
 unusedBit_498_30 = bits, U32, 1740, [30:30], "false", "true"
 unusedBit_498_31 = bits, U32, 1740, [31:31], "false", "true"
-can2NbcType = bits, U32, 1744, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "Nissan VQ35", "Genesis Coupe", "Honda K", "AiM", "type 13", "type 14", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
+unused1744 = scalar, U32, 1744, "", 1,0,0,0,0
 can2TxPin = bits, U08, 1748, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 can2RxPin = bits, U08, 1749, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 starterControlPinMode = bits, U08, 1750, [0:1], "default", "default inverted", "open collector", "open collector inverted"
@@ -1471,7 +1471,6 @@ fuelTrims12_table = array, S08, 20980, [4x4], "", 0.2, 0, -25, 25, 1
 	canTxPin = "set_can_tx_pin X"
 	canRxPin = "set_can_rx_pin X"
 	acIdleExtraOffset = "Additional idle % while A/C is active"
-	can2SleepPeriodMs = "CANbus thread period, ms"
 	wastegatePositionMin = "Voltage when the wastegate is closed.\nYou probably don't have one of these!"
 	wastegatePositionMax = "Voltage when the wastegate is fully open.\nYou probably don't have one of these!\n1 volt = 1000 units"
 	idlePositionMin = "Voltage when the idle valve is closed.\nYou probably don't have one of these!"
@@ -1637,11 +1636,7 @@ fuelTrims12_table = array, S08, 20980, [4x4], "", 0.2, 0, -25, 25, 1
 	canBaudRate = "set can_baudrate"
 	veOverrideMode = "Override the Y axis (load) value used for the VE table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this."
 	afrOverrideMode = "Override the Y axis (load) value used for the AFR table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this."
-	enableVerboseCan2Tx = "CAN broadcast using custom rusEFI protocol\nenable can_broadcast/disable can_broadcast"
-	can2ReadEnabled = "enable can_read/disable can_read"
-	can2WriteEnabled = "enable can_write/disable can_write"
 	stepperDcInvertedPins = "Enable if DC-motor driver (H-bridge) inverts the signals (eg. RZ7899 on Hellen boards)"
-	can2NbcType = "set can_mode X"
 	can2TxPin = "set_can2_tx_pin X"
 	can2RxPin = "set_can2_rx_pin X"
 	ignOverrideMode = "Override the Y axis (load) value used for the ignition table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this."
@@ -5421,31 +5416,31 @@ cmd_set_engine_type_default					= "Z\x00\x31\x00\x00"
 		field = "TX pin",                               binarySerialTxPin, {useSerialPort == 1}
 		field = "RX pin",                               binarySerialRxPin, {useSerialPort == 1}
 
+	dialog = canHw1, "Primary CAN"
+		field = "Bitrate",		canBaudRate
+
+	dialog = canHw2, "Secondary CAN"
+		field = "Bitrate",	can2BaudRate
+
 	dialog = canBus, "CAN Bus"
 		field = "CAN read enabled",						canReadEnabled
 		field = "CAN write enabled",					canWriteEnabled
-		field = "CAN bitrate",							canBaudRate
 		field = "CAN dash type",						canNbcType
 		field = "Verbose Can",                          verboseCan
 		field = "inertia measurement unit",             imuType
 		field = "Enable rusEFI CAN broadcast",			enableVerboseCanTx
-		field = "Which CAN channel to broadcast on",    canBroadcastUseChannelTwo
+		field = "rusEFI CAN data bus",    canBroadcastUseChannelTwo
 		field = "rusEFI CAN data base address",			verboseCanBaseAddress
 		field = "rusEFI CAN data address type",			rusefiVerbose29b
 		field = "rusEFI CAN data period",				canSleepPeriodMs
 
 	dialog = canBus2, "Secondary CAN Bus"
-		field = "CAN read enabled",						can2ReadEnabled
-		field = "CAN write enabled",					can2WriteEnabled
-		field = "CAN bitrate",							can2BaudRate
-		field = "CAN dash type",						can2NbcType
-		field = "Enable rusEFI CAN broadcast",			enableVerboseCan2Tx
-		field = "rusEFI CAN data base address",			verboseCan2BaseAddress
-		field = "rusEFI CAN data period",				can2SleepPeriodMs
 
 	dialog = canBusMain, "CAN Bus Communication", yAxis
 		panel = canBus
 
+		panel = canHw1
+
 	dialog = auxSerial, "AUX Sensor Serial"
 		field = "RX pin",								auxSerialRxPin 
 		field = "TX pin",								auxSerialTxPin 
diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini
index 75dd56d5ae..70ac00e95b 100644
--- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini
+++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini
@@ -32,12 +32,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
- 	signature    = "rusEFI 2021.12.24.mre_f7.1273650686"
+ 	signature    = "rusEFI 2021.12.25.mre_f7.1113091618"
 
 [TunerStudio]
    queryCommand   = "S"
    versionInfo    = "V"  ; firmwave version for title bar.
-   signature    = "rusEFI 2021.12.24.mre_f7.1273650686" ; signature is expected to be 7 or more characters.
+   signature    = "rusEFI 2021.12.25.mre_f7.1113091618" ; signature is expected to be 7 or more characters.
 
    ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
    useLegacyFTempUnits = false
@@ -84,7 +84,7 @@ enable2ndByteCanID = false
    ;  name       			= scalar, type, offset,         units,     scale, translate,    lo,      hi, digits
 
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Dec 24 04:13:51 UTC 2021
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Dec 25 04:39:16 UTC 2021
 
 pageSize            = 20996
 page = 1
@@ -365,7 +365,7 @@ canTxPin = bits, U08, 716, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3",
 canRxPin = bits, U08, 717, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 throttlePedalUpPinMode = bits, U08, 718, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID"
 acIdleExtraOffset = scalar, U08, 719, "%", 1, 0, 0, 100, 0
-can2SleepPeriodMs = scalar, S32, 720, "ms", 1, 0, 0, 1000, 2
+unused720 = scalar, S32, 720, "ms", 1, 0, 0, 1000, 2
 wastegatePositionMin = scalar, U16, 724, "mv", 1, 0, 0, 5000, 0
 wastegatePositionMax = scalar, U16, 726, "mv", 1, 0, 0, 5000, 0
 idlePositionMin = scalar, U16, 728, "mv", 1, 0, 0, 5000, 0
@@ -794,10 +794,10 @@ canBaudRate = bits, U08, 1732, [0:1], "100kbps", "250kbps", "500kbps", "1Mbps"
 veOverrideMode = bits, U08, 1733, [0:1], "None", "MAP", "TPS", "INVALID"
 can2BaudRate = bits, U08, 1734, [0:1], "100kbps", "250kbps", "500kbps", "1Mbps"
 afrOverrideMode = bits, U08, 1735, [0:2], "None", "MAP", "TPS", "Acc Pedal", "Cyl Filling %", "INVALID", "INVALID", "INVALID"
-verboseCan2BaseAddress = scalar, U32, 1736, "", 1, 0, 0, 536870911, 0
-enableVerboseCan2Tx = bits, U32, 1740, [0:0], "false", "true"
-can2ReadEnabled = bits, U32, 1740, [1:1], "false", "true"
-can2WriteEnabled = bits, U32, 1740, [2:2], "false", "true"
+unused1736 = scalar, U32, 1736, "", 1, 0, 0, 536870911, 0
+unused1740b0 = bits, U32, 1740, [0:0], "false", "true"
+unused1740b1 = bits, U32, 1740, [1:1], "false", "true"
+unused1740b2 = bits, U32, 1740, [2:2], "false", "true"
 stepperDcInvertedPins = bits, U32, 1740, [3:3], "false", "true"
 unused1127 = bits, U32, 1740, [4:4], "false", "true"
 unused1128 = bits, U32, 1740, [5:5], "false", "true"
@@ -827,7 +827,7 @@ unusedBit_498_28 = bits, U32, 1740, [28:28], "false", "true"
 unusedBit_498_29 = bits, U32, 1740, [29:29], "false", "true"
 unusedBit_498_30 = bits, U32, 1740, [30:30], "false", "true"
 unusedBit_498_31 = bits, U32, 1740, [31:31], "false", "true"
-can2NbcType = bits, U32, 1744, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "Nissan VQ35", "Genesis Coupe", "Honda K", "AiM", "type 13", "type 14", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
+unused1744 = scalar, U32, 1744, "", 1,0,0,0,0
 can2TxPin = bits, U08, 1748, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 can2RxPin = bits, U08, 1749, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 starterControlPinMode = bits, U08, 1750, [0:1], "default", "default inverted", "open collector", "open collector inverted"
@@ -1471,7 +1471,6 @@ fuelTrims12_table = array, S08, 20980, [4x4], "", 0.2, 0, -25, 25, 1
 	canTxPin = "set_can_tx_pin X"
 	canRxPin = "set_can_rx_pin X"
 	acIdleExtraOffset = "Additional idle % while A/C is active"
-	can2SleepPeriodMs = "CANbus thread period, ms"
 	wastegatePositionMin = "Voltage when the wastegate is closed.\nYou probably don't have one of these!"
 	wastegatePositionMax = "Voltage when the wastegate is fully open.\nYou probably don't have one of these!\n1 volt = 1000 units"
 	idlePositionMin = "Voltage when the idle valve is closed.\nYou probably don't have one of these!"
@@ -1637,11 +1636,7 @@ fuelTrims12_table = array, S08, 20980, [4x4], "", 0.2, 0, -25, 25, 1
 	canBaudRate = "set can_baudrate"
 	veOverrideMode = "Override the Y axis (load) value used for the VE table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this."
 	afrOverrideMode = "Override the Y axis (load) value used for the AFR table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this."
-	enableVerboseCan2Tx = "CAN broadcast using custom rusEFI protocol\nenable can_broadcast/disable can_broadcast"
-	can2ReadEnabled = "enable can_read/disable can_read"
-	can2WriteEnabled = "enable can_write/disable can_write"
 	stepperDcInvertedPins = "Enable if DC-motor driver (H-bridge) inverts the signals (eg. RZ7899 on Hellen boards)"
-	can2NbcType = "set can_mode X"
 	can2TxPin = "set_can2_tx_pin X"
 	can2RxPin = "set_can2_rx_pin X"
 	ignOverrideMode = "Override the Y axis (load) value used for the ignition table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this."
@@ -5421,31 +5416,31 @@ cmd_set_engine_type_default					= "Z\x00\x31\x00\x00"
 		field = "TX pin",                               binarySerialTxPin, {useSerialPort == 1}
 		field = "RX pin",                               binarySerialRxPin, {useSerialPort == 1}
 
+	dialog = canHw1, "Primary CAN"
+		field = "Bitrate",		canBaudRate
+
+	dialog = canHw2, "Secondary CAN"
+		field = "Bitrate",	can2BaudRate
+
 	dialog = canBus, "CAN Bus"
 		field = "CAN read enabled",						canReadEnabled
 		field = "CAN write enabled",					canWriteEnabled
-		field = "CAN bitrate",							canBaudRate
 		field = "CAN dash type",						canNbcType
 		field = "Verbose Can",                          verboseCan
 		field = "inertia measurement unit",             imuType
 		field = "Enable rusEFI CAN broadcast",			enableVerboseCanTx
-		field = "Which CAN channel to broadcast on",    canBroadcastUseChannelTwo
+		field = "rusEFI CAN data bus",    canBroadcastUseChannelTwo
 		field = "rusEFI CAN data base address",			verboseCanBaseAddress
 		field = "rusEFI CAN data address type",			rusefiVerbose29b
 		field = "rusEFI CAN data period",				canSleepPeriodMs
 
 	dialog = canBus2, "Secondary CAN Bus"
-		field = "CAN read enabled",						can2ReadEnabled
-		field = "CAN write enabled",					can2WriteEnabled
-		field = "CAN bitrate",							can2BaudRate
-		field = "CAN dash type",						can2NbcType
-		field = "Enable rusEFI CAN broadcast",			enableVerboseCan2Tx
-		field = "rusEFI CAN data base address",			verboseCan2BaseAddress
-		field = "rusEFI CAN data period",				can2SleepPeriodMs
 
 	dialog = canBusMain, "CAN Bus Communication", yAxis
 		panel = canBus
 
+		panel = canHw1
+
 	dialog = auxSerial, "AUX Sensor Serial"
 		field = "RX pin",								auxSerialRxPin 
 		field = "TX pin",								auxSerialTxPin 
diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini
index 61eed4303c..f60632ff2b 100644
--- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini
+++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini
@@ -32,12 +32,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
- 	signature    = "rusEFI 2021.12.24.prometheus_405.2821193388"
+ 	signature    = "rusEFI 2021.12.25.prometheus_405.2710949232"
 
 [TunerStudio]
    queryCommand   = "S"
    versionInfo    = "V"  ; firmwave version for title bar.
-   signature    = "rusEFI 2021.12.24.prometheus_405.2821193388" ; signature is expected to be 7 or more characters.
+   signature    = "rusEFI 2021.12.25.prometheus_405.2710949232" ; signature is expected to be 7 or more characters.
 
    ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
    useLegacyFTempUnits = false
@@ -84,7 +84,7 @@ enable2ndByteCanID = false
    ;  name       			= scalar, type, offset,         units,     scale, translate,    lo,      hi, digits
 
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Dec 24 04:14:03 UTC 2021
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Dec 25 04:39:27 UTC 2021
 
 pageSize            = 20996
 page = 1
@@ -365,7 +365,7 @@ canTxPin = bits, U08, 716, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3",
 canRxPin = bits, U08, 717, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 throttlePedalUpPinMode = bits, U08, 718, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID"
 acIdleExtraOffset = scalar, U08, 719, "%", 1, 0, 0, 100, 0
-can2SleepPeriodMs = scalar, S32, 720, "ms", 1, 0, 0, 1000, 2
+unused720 = scalar, S32, 720, "ms", 1, 0, 0, 1000, 2
 wastegatePositionMin = scalar, U16, 724, "mv", 1, 0, 0, 5000, 0
 wastegatePositionMax = scalar, U16, 726, "mv", 1, 0, 0, 5000, 0
 idlePositionMin = scalar, U16, 728, "mv", 1, 0, 0, 5000, 0
@@ -794,10 +794,10 @@ canBaudRate = bits, U08, 1732, [0:1], "100kbps", "250kbps", "500kbps", "1Mbps"
 veOverrideMode = bits, U08, 1733, [0:1], "None", "MAP", "TPS", "INVALID"
 can2BaudRate = bits, U08, 1734, [0:1], "100kbps", "250kbps", "500kbps", "1Mbps"
 afrOverrideMode = bits, U08, 1735, [0:2], "None", "MAP", "TPS", "Acc Pedal", "Cyl Filling %", "INVALID", "INVALID", "INVALID"
-verboseCan2BaseAddress = scalar, U32, 1736, "", 1, 0, 0, 536870911, 0
-enableVerboseCan2Tx = bits, U32, 1740, [0:0], "false", "true"
-can2ReadEnabled = bits, U32, 1740, [1:1], "false", "true"
-can2WriteEnabled = bits, U32, 1740, [2:2], "false", "true"
+unused1736 = scalar, U32, 1736, "", 1, 0, 0, 536870911, 0
+unused1740b0 = bits, U32, 1740, [0:0], "false", "true"
+unused1740b1 = bits, U32, 1740, [1:1], "false", "true"
+unused1740b2 = bits, U32, 1740, [2:2], "false", "true"
 stepperDcInvertedPins = bits, U32, 1740, [3:3], "false", "true"
 unused1127 = bits, U32, 1740, [4:4], "false", "true"
 unused1128 = bits, U32, 1740, [5:5], "false", "true"
@@ -827,7 +827,7 @@ unusedBit_498_28 = bits, U32, 1740, [28:28], "false", "true"
 unusedBit_498_29 = bits, U32, 1740, [29:29], "false", "true"
 unusedBit_498_30 = bits, U32, 1740, [30:30], "false", "true"
 unusedBit_498_31 = bits, U32, 1740, [31:31], "false", "true"
-can2NbcType = bits, U32, 1744, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "Nissan VQ35", "Genesis Coupe", "Honda K", "AiM", "type 13", "type 14", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
+unused1744 = scalar, U32, 1744, "", 1,0,0,0,0
 can2TxPin = bits, U08, 1748, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 can2RxPin = bits, U08, 1749, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 starterControlPinMode = bits, U08, 1750, [0:1], "default", "default inverted", "open collector", "open collector inverted"
@@ -1471,7 +1471,6 @@ fuelTrims12_table = array, S08, 20980, [4x4], "", 0.2, 0, -25, 25, 1
 	canTxPin = "set_can_tx_pin X"
 	canRxPin = "set_can_rx_pin X"
 	acIdleExtraOffset = "Additional idle % while A/C is active"
-	can2SleepPeriodMs = "CANbus thread period, ms"
 	wastegatePositionMin = "Voltage when the wastegate is closed.\nYou probably don't have one of these!"
 	wastegatePositionMax = "Voltage when the wastegate is fully open.\nYou probably don't have one of these!\n1 volt = 1000 units"
 	idlePositionMin = "Voltage when the idle valve is closed.\nYou probably don't have one of these!"
@@ -1637,11 +1636,7 @@ fuelTrims12_table = array, S08, 20980, [4x4], "", 0.2, 0, -25, 25, 1
 	canBaudRate = "set can_baudrate"
 	veOverrideMode = "Override the Y axis (load) value used for the VE table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this."
 	afrOverrideMode = "Override the Y axis (load) value used for the AFR table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this."
-	enableVerboseCan2Tx = "CAN broadcast using custom rusEFI protocol\nenable can_broadcast/disable can_broadcast"
-	can2ReadEnabled = "enable can_read/disable can_read"
-	can2WriteEnabled = "enable can_write/disable can_write"
 	stepperDcInvertedPins = "Enable if DC-motor driver (H-bridge) inverts the signals (eg. RZ7899 on Hellen boards)"
-	can2NbcType = "set can_mode X"
 	can2TxPin = "set_can2_tx_pin X"
 	can2RxPin = "set_can2_rx_pin X"
 	ignOverrideMode = "Override the Y axis (load) value used for the ignition table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this."
@@ -5433,35 +5428,35 @@ cmd_set_engine_type_default					= "Z\x00\x31\x00\x00"
 		field = "TX pin",                               binarySerialTxPin, {useSerialPort == 1}
 		field = "RX pin",                               binarySerialRxPin, {useSerialPort == 1}
 
+	dialog = canHw1, "Primary CAN"
+		field = "Bitrate",		canBaudRate
+		field = "RX pin",		canRxPin 
+		field = "TX pin",		canTxPin 
+
+	dialog = canHw2, "Secondary CAN"
+		field = "Bitrate",	can2BaudRate
+		field = "RX pin",		can2RxPin 
+		field = "TX pin",		can2TxPin 
+
 	dialog = canBus, "CAN Bus"
 		field = "CAN read enabled",						canReadEnabled
 		field = "CAN write enabled",					canWriteEnabled
-		field = "CAN bitrate",							canBaudRate
 		field = "CAN dash type",						canNbcType
 		field = "Verbose Can",                          verboseCan
 		field = "inertia measurement unit",             imuType
 		field = "Enable rusEFI CAN broadcast",			enableVerboseCanTx
-		field = "Which CAN channel to broadcast on",    canBroadcastUseChannelTwo
+		field = "rusEFI CAN data bus",    canBroadcastUseChannelTwo
 		field = "rusEFI CAN data base address",			verboseCanBaseAddress
 		field = "rusEFI CAN data address type",			rusefiVerbose29b
 		field = "rusEFI CAN data period",				canSleepPeriodMs
-		field = "RX pin",								canRxPin 
-		field = "TX pin",								canTxPin 
 
 	dialog = canBus2, "Secondary CAN Bus"
-		field = "CAN read enabled",						can2ReadEnabled
-		field = "CAN write enabled",					can2WriteEnabled
-		field = "CAN bitrate",							can2BaudRate
-		field = "CAN dash type",						can2NbcType
-		field = "Enable rusEFI CAN broadcast",			enableVerboseCan2Tx
-		field = "rusEFI CAN data base address",			verboseCan2BaseAddress
-		field = "rusEFI CAN data period",				can2SleepPeriodMs
-		field = "RX pin",								can2RxPin 
-		field = "TX pin",								can2TxPin 
 
 	dialog = canBusMain, "CAN Bus Communication", yAxis
 		panel = canBus
-		panel = canBus2							
+
+		panel = canHw1
+		panel = canHw2	
 
 	dialog = auxSerial, "AUX Sensor Serial"
 		field = "RX pin",								auxSerialRxPin 
diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini
index c717643bfc..b26a80d975 100644
--- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini
+++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini
@@ -32,12 +32,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
- 	signature    = "rusEFI 2021.12.24.prometheus_469.2821193388"
+ 	signature    = "rusEFI 2021.12.25.prometheus_469.2710949232"
 
 [TunerStudio]
    queryCommand   = "S"
    versionInfo    = "V"  ; firmwave version for title bar.
-   signature    = "rusEFI 2021.12.24.prometheus_469.2821193388" ; signature is expected to be 7 or more characters.
+   signature    = "rusEFI 2021.12.25.prometheus_469.2710949232" ; signature is expected to be 7 or more characters.
 
    ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
    useLegacyFTempUnits = false
@@ -84,7 +84,7 @@ enable2ndByteCanID = false
    ;  name       			= scalar, type, offset,         units,     scale, translate,    lo,      hi, digits
 
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Dec 24 04:14:00 UTC 2021
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Dec 25 04:39:24 UTC 2021
 
 pageSize            = 20996
 page = 1
@@ -365,7 +365,7 @@ canTxPin = bits, U08, 716, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3",
 canRxPin = bits, U08, 717, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 throttlePedalUpPinMode = bits, U08, 718, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID"
 acIdleExtraOffset = scalar, U08, 719, "%", 1, 0, 0, 100, 0
-can2SleepPeriodMs = scalar, S32, 720, "ms", 1, 0, 0, 1000, 2
+unused720 = scalar, S32, 720, "ms", 1, 0, 0, 1000, 2
 wastegatePositionMin = scalar, U16, 724, "mv", 1, 0, 0, 5000, 0
 wastegatePositionMax = scalar, U16, 726, "mv", 1, 0, 0, 5000, 0
 idlePositionMin = scalar, U16, 728, "mv", 1, 0, 0, 5000, 0
@@ -794,10 +794,10 @@ canBaudRate = bits, U08, 1732, [0:1], "100kbps", "250kbps", "500kbps", "1Mbps"
 veOverrideMode = bits, U08, 1733, [0:1], "None", "MAP", "TPS", "INVALID"
 can2BaudRate = bits, U08, 1734, [0:1], "100kbps", "250kbps", "500kbps", "1Mbps"
 afrOverrideMode = bits, U08, 1735, [0:2], "None", "MAP", "TPS", "Acc Pedal", "Cyl Filling %", "INVALID", "INVALID", "INVALID"
-verboseCan2BaseAddress = scalar, U32, 1736, "", 1, 0, 0, 536870911, 0
-enableVerboseCan2Tx = bits, U32, 1740, [0:0], "false", "true"
-can2ReadEnabled = bits, U32, 1740, [1:1], "false", "true"
-can2WriteEnabled = bits, U32, 1740, [2:2], "false", "true"
+unused1736 = scalar, U32, 1736, "", 1, 0, 0, 536870911, 0
+unused1740b0 = bits, U32, 1740, [0:0], "false", "true"
+unused1740b1 = bits, U32, 1740, [1:1], "false", "true"
+unused1740b2 = bits, U32, 1740, [2:2], "false", "true"
 stepperDcInvertedPins = bits, U32, 1740, [3:3], "false", "true"
 unused1127 = bits, U32, 1740, [4:4], "false", "true"
 unused1128 = bits, U32, 1740, [5:5], "false", "true"
@@ -827,7 +827,7 @@ unusedBit_498_28 = bits, U32, 1740, [28:28], "false", "true"
 unusedBit_498_29 = bits, U32, 1740, [29:29], "false", "true"
 unusedBit_498_30 = bits, U32, 1740, [30:30], "false", "true"
 unusedBit_498_31 = bits, U32, 1740, [31:31], "false", "true"
-can2NbcType = bits, U32, 1744, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "Nissan VQ35", "Genesis Coupe", "Honda K", "AiM", "type 13", "type 14", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
+unused1744 = scalar, U32, 1744, "", 1,0,0,0,0
 can2TxPin = bits, U08, 1748, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 can2RxPin = bits, U08, 1749, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 starterControlPinMode = bits, U08, 1750, [0:1], "default", "default inverted", "open collector", "open collector inverted"
@@ -1471,7 +1471,6 @@ fuelTrims12_table = array, S08, 20980, [4x4], "", 0.2, 0, -25, 25, 1
 	canTxPin = "set_can_tx_pin X"
 	canRxPin = "set_can_rx_pin X"
 	acIdleExtraOffset = "Additional idle % while A/C is active"
-	can2SleepPeriodMs = "CANbus thread period, ms"
 	wastegatePositionMin = "Voltage when the wastegate is closed.\nYou probably don't have one of these!"
 	wastegatePositionMax = "Voltage when the wastegate is fully open.\nYou probably don't have one of these!\n1 volt = 1000 units"
 	idlePositionMin = "Voltage when the idle valve is closed.\nYou probably don't have one of these!"
@@ -1637,11 +1636,7 @@ fuelTrims12_table = array, S08, 20980, [4x4], "", 0.2, 0, -25, 25, 1
 	canBaudRate = "set can_baudrate"
 	veOverrideMode = "Override the Y axis (load) value used for the VE table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this."
 	afrOverrideMode = "Override the Y axis (load) value used for the AFR table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this."
-	enableVerboseCan2Tx = "CAN broadcast using custom rusEFI protocol\nenable can_broadcast/disable can_broadcast"
-	can2ReadEnabled = "enable can_read/disable can_read"
-	can2WriteEnabled = "enable can_write/disable can_write"
 	stepperDcInvertedPins = "Enable if DC-motor driver (H-bridge) inverts the signals (eg. RZ7899 on Hellen boards)"
-	can2NbcType = "set can_mode X"
 	can2TxPin = "set_can2_tx_pin X"
 	can2RxPin = "set_can2_rx_pin X"
 	ignOverrideMode = "Override the Y axis (load) value used for the ignition table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this."
@@ -5433,35 +5428,35 @@ cmd_set_engine_type_default					= "Z\x00\x31\x00\x00"
 		field = "TX pin",                               binarySerialTxPin, {useSerialPort == 1}
 		field = "RX pin",                               binarySerialRxPin, {useSerialPort == 1}
 
+	dialog = canHw1, "Primary CAN"
+		field = "Bitrate",		canBaudRate
+		field = "RX pin",		canRxPin 
+		field = "TX pin",		canTxPin 
+
+	dialog = canHw2, "Secondary CAN"
+		field = "Bitrate",	can2BaudRate
+		field = "RX pin",		can2RxPin 
+		field = "TX pin",		can2TxPin 
+
 	dialog = canBus, "CAN Bus"
 		field = "CAN read enabled",						canReadEnabled
 		field = "CAN write enabled",					canWriteEnabled
-		field = "CAN bitrate",							canBaudRate
 		field = "CAN dash type",						canNbcType
 		field = "Verbose Can",                          verboseCan
 		field = "inertia measurement unit",             imuType
 		field = "Enable rusEFI CAN broadcast",			enableVerboseCanTx
-		field = "Which CAN channel to broadcast on",    canBroadcastUseChannelTwo
+		field = "rusEFI CAN data bus",    canBroadcastUseChannelTwo
 		field = "rusEFI CAN data base address",			verboseCanBaseAddress
 		field = "rusEFI CAN data address type",			rusefiVerbose29b
 		field = "rusEFI CAN data period",				canSleepPeriodMs
-		field = "RX pin",								canRxPin 
-		field = "TX pin",								canTxPin 
 
 	dialog = canBus2, "Secondary CAN Bus"
-		field = "CAN read enabled",						can2ReadEnabled
-		field = "CAN write enabled",					can2WriteEnabled
-		field = "CAN bitrate",							can2BaudRate
-		field = "CAN dash type",						can2NbcType
-		field = "Enable rusEFI CAN broadcast",			enableVerboseCan2Tx
-		field = "rusEFI CAN data base address",			verboseCan2BaseAddress
-		field = "rusEFI CAN data period",				can2SleepPeriodMs
-		field = "RX pin",								can2RxPin 
-		field = "TX pin",								can2TxPin 
 
 	dialog = canBusMain, "CAN Bus Communication", yAxis
 		panel = canBus
-		panel = canBus2							
+
+		panel = canHw1
+		panel = canHw2	
 
 	dialog = auxSerial, "AUX Sensor Serial"
 		field = "RX pin",								auxSerialRxPin 
diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini
index ecab1eed77..c965735024 100644
--- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini
+++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini
@@ -32,12 +32,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
- 	signature    = "rusEFI 2021.12.24.proteus_f4.976273814"
+ 	signature    = "rusEFI 2021.12.25.proteus_f4.864219722"
 
 [TunerStudio]
    queryCommand   = "S"
    versionInfo    = "V"  ; firmwave version for title bar.
-   signature    = "rusEFI 2021.12.24.proteus_f4.976273814" ; signature is expected to be 7 or more characters.
+   signature    = "rusEFI 2021.12.25.proteus_f4.864219722" ; signature is expected to be 7 or more characters.
 
    ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
    useLegacyFTempUnits = false
@@ -84,7 +84,7 @@ enable2ndByteCanID = false
    ;  name       			= scalar, type, offset,         units,     scale, translate,    lo,      hi, digits
 
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Dec 24 04:14:09 UTC 2021
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Dec 25 04:39:32 UTC 2021
 
 pageSize            = 20996
 page = 1
@@ -365,7 +365,7 @@ canTxPin = bits, U08, 716, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3",
 canRxPin = bits, U08, 717, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 throttlePedalUpPinMode = bits, U08, 718, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID"
 acIdleExtraOffset = scalar, U08, 719, "%", 1, 0, 0, 100, 0
-can2SleepPeriodMs = scalar, S32, 720, "ms", 1, 0, 0, 1000, 2
+unused720 = scalar, S32, 720, "ms", 1, 0, 0, 1000, 2
 wastegatePositionMin = scalar, U16, 724, "mv", 1, 0, 0, 5000, 0
 wastegatePositionMax = scalar, U16, 726, "mv", 1, 0, 0, 5000, 0
 idlePositionMin = scalar, U16, 728, "mv", 1, 0, 0, 5000, 0
@@ -794,10 +794,10 @@ canBaudRate = bits, U08, 1732, [0:1], "100kbps", "250kbps", "500kbps", "1Mbps"
 veOverrideMode = bits, U08, 1733, [0:1], "None", "MAP", "TPS", "INVALID"
 can2BaudRate = bits, U08, 1734, [0:1], "100kbps", "250kbps", "500kbps", "1Mbps"
 afrOverrideMode = bits, U08, 1735, [0:2], "None", "MAP", "TPS", "Acc Pedal", "Cyl Filling %", "INVALID", "INVALID", "INVALID"
-verboseCan2BaseAddress = scalar, U32, 1736, "", 1, 0, 0, 536870911, 0
-enableVerboseCan2Tx = bits, U32, 1740, [0:0], "false", "true"
-can2ReadEnabled = bits, U32, 1740, [1:1], "false", "true"
-can2WriteEnabled = bits, U32, 1740, [2:2], "false", "true"
+unused1736 = scalar, U32, 1736, "", 1, 0, 0, 536870911, 0
+unused1740b0 = bits, U32, 1740, [0:0], "false", "true"
+unused1740b1 = bits, U32, 1740, [1:1], "false", "true"
+unused1740b2 = bits, U32, 1740, [2:2], "false", "true"
 stepperDcInvertedPins = bits, U32, 1740, [3:3], "false", "true"
 unused1127 = bits, U32, 1740, [4:4], "false", "true"
 unused1128 = bits, U32, 1740, [5:5], "false", "true"
@@ -827,7 +827,7 @@ unusedBit_498_28 = bits, U32, 1740, [28:28], "false", "true"
 unusedBit_498_29 = bits, U32, 1740, [29:29], "false", "true"
 unusedBit_498_30 = bits, U32, 1740, [30:30], "false", "true"
 unusedBit_498_31 = bits, U32, 1740, [31:31], "false", "true"
-can2NbcType = bits, U32, 1744, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "Nissan VQ35", "Genesis Coupe", "Honda K", "AiM", "type 13", "type 14", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
+unused1744 = scalar, U32, 1744, "", 1,0,0,0,0
 can2TxPin = bits, U08, 1748, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 can2RxPin = bits, U08, 1749, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 starterControlPinMode = bits, U08, 1750, [0:1], "default", "default inverted", "open collector", "open collector inverted"
@@ -1471,7 +1471,6 @@ fuelTrims12_table = array, S08, 20980, [4x4], "", 0.2, 0, -25, 25, 1
 	canTxPin = "set_can_tx_pin X"
 	canRxPin = "set_can_rx_pin X"
 	acIdleExtraOffset = "Additional idle % while A/C is active"
-	can2SleepPeriodMs = "CANbus thread period, ms"
 	wastegatePositionMin = "Voltage when the wastegate is closed.\nYou probably don't have one of these!"
 	wastegatePositionMax = "Voltage when the wastegate is fully open.\nYou probably don't have one of these!\n1 volt = 1000 units"
 	idlePositionMin = "Voltage when the idle valve is closed.\nYou probably don't have one of these!"
@@ -1637,11 +1636,7 @@ fuelTrims12_table = array, S08, 20980, [4x4], "", 0.2, 0, -25, 25, 1
 	canBaudRate = "set can_baudrate"
 	veOverrideMode = "Override the Y axis (load) value used for the VE table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this."
 	afrOverrideMode = "Override the Y axis (load) value used for the AFR table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this."
-	enableVerboseCan2Tx = "CAN broadcast using custom rusEFI protocol\nenable can_broadcast/disable can_broadcast"
-	can2ReadEnabled = "enable can_read/disable can_read"
-	can2WriteEnabled = "enable can_write/disable can_write"
 	stepperDcInvertedPins = "Enable if DC-motor driver (H-bridge) inverts the signals (eg. RZ7899 on Hellen boards)"
-	can2NbcType = "set can_mode X"
 	can2TxPin = "set_can2_tx_pin X"
 	can2RxPin = "set_can2_rx_pin X"
 	ignOverrideMode = "Override the Y axis (load) value used for the ignition table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this."
@@ -5415,31 +5410,31 @@ cmd_set_engine_type_default					= "Z\x00\x31\x00\x00"
 		field = "TX pin",                               binarySerialTxPin, {useSerialPort == 1}
 		field = "RX pin",                               binarySerialRxPin, {useSerialPort == 1}
 
+	dialog = canHw1, "Primary CAN"
+		field = "Bitrate",		canBaudRate
+
+	dialog = canHw2, "Secondary CAN"
+		field = "Bitrate",	can2BaudRate
+
 	dialog = canBus, "CAN Bus"
 		field = "CAN read enabled",						canReadEnabled
 		field = "CAN write enabled",					canWriteEnabled
-		field = "CAN bitrate",							canBaudRate
 		field = "CAN dash type",						canNbcType
 		field = "Verbose Can",                          verboseCan
 		field = "inertia measurement unit",             imuType
 		field = "Enable rusEFI CAN broadcast",			enableVerboseCanTx
-		field = "Which CAN channel to broadcast on",    canBroadcastUseChannelTwo
+		field = "rusEFI CAN data bus",    canBroadcastUseChannelTwo
 		field = "rusEFI CAN data base address",			verboseCanBaseAddress
 		field = "rusEFI CAN data address type",			rusefiVerbose29b
 		field = "rusEFI CAN data period",				canSleepPeriodMs
 
 	dialog = canBus2, "Secondary CAN Bus"
-		field = "CAN read enabled",						can2ReadEnabled
-		field = "CAN write enabled",					can2WriteEnabled
-		field = "CAN bitrate",							can2BaudRate
-		field = "CAN dash type",						can2NbcType
-		field = "Enable rusEFI CAN broadcast",			enableVerboseCan2Tx
-		field = "rusEFI CAN data base address",			verboseCan2BaseAddress
-		field = "rusEFI CAN data period",				can2SleepPeriodMs
 
 	dialog = canBusMain, "CAN Bus Communication", yAxis
 		panel = canBus
 
+		panel = canHw1
+
 	dialog = auxSerial, "AUX Sensor Serial"
 		field = "RX pin",								auxSerialRxPin 
 		field = "TX pin",								auxSerialTxPin 
diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini
index 7277e41570..90ebf4cf0d 100644
--- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini
+++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini
@@ -32,12 +32,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
- 	signature    = "rusEFI 2021.12.24.proteus_f7.976273814"
+ 	signature    = "rusEFI 2021.12.25.proteus_f7.864219722"
 
 [TunerStudio]
    queryCommand   = "S"
    versionInfo    = "V"  ; firmwave version for title bar.
-   signature    = "rusEFI 2021.12.24.proteus_f7.976273814" ; signature is expected to be 7 or more characters.
+   signature    = "rusEFI 2021.12.25.proteus_f7.864219722" ; signature is expected to be 7 or more characters.
 
    ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
    useLegacyFTempUnits = false
@@ -84,7 +84,7 @@ enable2ndByteCanID = false
    ;  name       			= scalar, type, offset,         units,     scale, translate,    lo,      hi, digits
 
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Dec 24 04:14:06 UTC 2021
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Dec 25 04:39:29 UTC 2021
 
 pageSize            = 20996
 page = 1
@@ -365,7 +365,7 @@ canTxPin = bits, U08, 716, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3",
 canRxPin = bits, U08, 717, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 throttlePedalUpPinMode = bits, U08, 718, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID"
 acIdleExtraOffset = scalar, U08, 719, "%", 1, 0, 0, 100, 0
-can2SleepPeriodMs = scalar, S32, 720, "ms", 1, 0, 0, 1000, 2
+unused720 = scalar, S32, 720, "ms", 1, 0, 0, 1000, 2
 wastegatePositionMin = scalar, U16, 724, "mv", 1, 0, 0, 5000, 0
 wastegatePositionMax = scalar, U16, 726, "mv", 1, 0, 0, 5000, 0
 idlePositionMin = scalar, U16, 728, "mv", 1, 0, 0, 5000, 0
@@ -794,10 +794,10 @@ canBaudRate = bits, U08, 1732, [0:1], "100kbps", "250kbps", "500kbps", "1Mbps"
 veOverrideMode = bits, U08, 1733, [0:1], "None", "MAP", "TPS", "INVALID"
 can2BaudRate = bits, U08, 1734, [0:1], "100kbps", "250kbps", "500kbps", "1Mbps"
 afrOverrideMode = bits, U08, 1735, [0:2], "None", "MAP", "TPS", "Acc Pedal", "Cyl Filling %", "INVALID", "INVALID", "INVALID"
-verboseCan2BaseAddress = scalar, U32, 1736, "", 1, 0, 0, 536870911, 0
-enableVerboseCan2Tx = bits, U32, 1740, [0:0], "false", "true"
-can2ReadEnabled = bits, U32, 1740, [1:1], "false", "true"
-can2WriteEnabled = bits, U32, 1740, [2:2], "false", "true"
+unused1736 = scalar, U32, 1736, "", 1, 0, 0, 536870911, 0
+unused1740b0 = bits, U32, 1740, [0:0], "false", "true"
+unused1740b1 = bits, U32, 1740, [1:1], "false", "true"
+unused1740b2 = bits, U32, 1740, [2:2], "false", "true"
 stepperDcInvertedPins = bits, U32, 1740, [3:3], "false", "true"
 unused1127 = bits, U32, 1740, [4:4], "false", "true"
 unused1128 = bits, U32, 1740, [5:5], "false", "true"
@@ -827,7 +827,7 @@ unusedBit_498_28 = bits, U32, 1740, [28:28], "false", "true"
 unusedBit_498_29 = bits, U32, 1740, [29:29], "false", "true"
 unusedBit_498_30 = bits, U32, 1740, [30:30], "false", "true"
 unusedBit_498_31 = bits, U32, 1740, [31:31], "false", "true"
-can2NbcType = bits, U32, 1744, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "Nissan VQ35", "Genesis Coupe", "Honda K", "AiM", "type 13", "type 14", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
+unused1744 = scalar, U32, 1744, "", 1,0,0,0,0
 can2TxPin = bits, U08, 1748, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 can2RxPin = bits, U08, 1749, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 starterControlPinMode = bits, U08, 1750, [0:1], "default", "default inverted", "open collector", "open collector inverted"
@@ -1471,7 +1471,6 @@ fuelTrims12_table = array, S08, 20980, [4x4], "", 0.2, 0, -25, 25, 1
 	canTxPin = "set_can_tx_pin X"
 	canRxPin = "set_can_rx_pin X"
 	acIdleExtraOffset = "Additional idle % while A/C is active"
-	can2SleepPeriodMs = "CANbus thread period, ms"
 	wastegatePositionMin = "Voltage when the wastegate is closed.\nYou probably don't have one of these!"
 	wastegatePositionMax = "Voltage when the wastegate is fully open.\nYou probably don't have one of these!\n1 volt = 1000 units"
 	idlePositionMin = "Voltage when the idle valve is closed.\nYou probably don't have one of these!"
@@ -1637,11 +1636,7 @@ fuelTrims12_table = array, S08, 20980, [4x4], "", 0.2, 0, -25, 25, 1
 	canBaudRate = "set can_baudrate"
 	veOverrideMode = "Override the Y axis (load) value used for the VE table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this."
 	afrOverrideMode = "Override the Y axis (load) value used for the AFR table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this."
-	enableVerboseCan2Tx = "CAN broadcast using custom rusEFI protocol\nenable can_broadcast/disable can_broadcast"
-	can2ReadEnabled = "enable can_read/disable can_read"
-	can2WriteEnabled = "enable can_write/disable can_write"
 	stepperDcInvertedPins = "Enable if DC-motor driver (H-bridge) inverts the signals (eg. RZ7899 on Hellen boards)"
-	can2NbcType = "set can_mode X"
 	can2TxPin = "set_can2_tx_pin X"
 	can2RxPin = "set_can2_rx_pin X"
 	ignOverrideMode = "Override the Y axis (load) value used for the ignition table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this."
@@ -5415,31 +5410,31 @@ cmd_set_engine_type_default					= "Z\x00\x31\x00\x00"
 		field = "TX pin",                               binarySerialTxPin, {useSerialPort == 1}
 		field = "RX pin",                               binarySerialRxPin, {useSerialPort == 1}
 
+	dialog = canHw1, "Primary CAN"
+		field = "Bitrate",		canBaudRate
+
+	dialog = canHw2, "Secondary CAN"
+		field = "Bitrate",	can2BaudRate
+
 	dialog = canBus, "CAN Bus"
 		field = "CAN read enabled",						canReadEnabled
 		field = "CAN write enabled",					canWriteEnabled
-		field = "CAN bitrate",							canBaudRate
 		field = "CAN dash type",						canNbcType
 		field = "Verbose Can",                          verboseCan
 		field = "inertia measurement unit",             imuType
 		field = "Enable rusEFI CAN broadcast",			enableVerboseCanTx
-		field = "Which CAN channel to broadcast on",    canBroadcastUseChannelTwo
+		field = "rusEFI CAN data bus",    canBroadcastUseChannelTwo
 		field = "rusEFI CAN data base address",			verboseCanBaseAddress
 		field = "rusEFI CAN data address type",			rusefiVerbose29b
 		field = "rusEFI CAN data period",				canSleepPeriodMs
 
 	dialog = canBus2, "Secondary CAN Bus"
-		field = "CAN read enabled",						can2ReadEnabled
-		field = "CAN write enabled",					can2WriteEnabled
-		field = "CAN bitrate",							can2BaudRate
-		field = "CAN dash type",						can2NbcType
-		field = "Enable rusEFI CAN broadcast",			enableVerboseCan2Tx
-		field = "rusEFI CAN data base address",			verboseCan2BaseAddress
-		field = "rusEFI CAN data period",				can2SleepPeriodMs
 
 	dialog = canBusMain, "CAN Bus Communication", yAxis
 		panel = canBus
 
+		panel = canHw1
+
 	dialog = auxSerial, "AUX Sensor Serial"
 		field = "RX pin",								auxSerialRxPin 
 		field = "TX pin",								auxSerialTxPin 
diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini
index 3e2c2ceb79..8c9dd7b4df 100644
--- a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini
+++ b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini
@@ -32,12 +32,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
- 	signature    = "rusEFI 2021.12.24.subaru_eg33_f7.997667098"
+ 	signature    = "rusEFI 2021.12.25.subaru_eg33_f7.851772102"
 
 [TunerStudio]
    queryCommand   = "S"
    versionInfo    = "V"  ; firmwave version for title bar.
-   signature    = "rusEFI 2021.12.24.subaru_eg33_f7.997667098" ; signature is expected to be 7 or more characters.
+   signature    = "rusEFI 2021.12.25.subaru_eg33_f7.851772102" ; signature is expected to be 7 or more characters.
 
    ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
    useLegacyFTempUnits = false
@@ -84,7 +84,7 @@ enable2ndByteCanID = false
    ;  name       			= scalar, type, offset,         units,     scale, translate,    lo,      hi, digits
 
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Fri Dec 24 04:14:23 UTC 2021
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Sat Dec 25 04:39:43 UTC 2021
 
 pageSize            = 20996
 page = 1
@@ -365,7 +365,7 @@ canTxPin = bits, U08, 716, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3",
 canRxPin = bits, U08, 717, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 throttlePedalUpPinMode = bits, U08, 718, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID"
 acIdleExtraOffset = scalar, U08, 719, "%", 1, 0, 0, 100, 0
-can2SleepPeriodMs = scalar, S32, 720, "ms", 1, 0, 0, 1000, 2
+unused720 = scalar, S32, 720, "ms", 1, 0, 0, 1000, 2
 wastegatePositionMin = scalar, U16, 724, "mv", 1, 0, 0, 5000, 0
 wastegatePositionMax = scalar, U16, 726, "mv", 1, 0, 0, 5000, 0
 idlePositionMin = scalar, U16, 728, "mv", 1, 0, 0, 5000, 0
@@ -794,10 +794,10 @@ canBaudRate = bits, U08, 1732, [0:1], "100kbps", "250kbps", "500kbps", "1Mbps"
 veOverrideMode = bits, U08, 1733, [0:1], "None", "MAP", "TPS", "INVALID"
 can2BaudRate = bits, U08, 1734, [0:1], "100kbps", "250kbps", "500kbps", "1Mbps"
 afrOverrideMode = bits, U08, 1735, [0:2], "None", "MAP", "TPS", "Acc Pedal", "Cyl Filling %", "INVALID", "INVALID", "INVALID"
-verboseCan2BaseAddress = scalar, U32, 1736, "", 1, 0, 0, 536870911, 0
-enableVerboseCan2Tx = bits, U32, 1740, [0:0], "false", "true"
-can2ReadEnabled = bits, U32, 1740, [1:1], "false", "true"
-can2WriteEnabled = bits, U32, 1740, [2:2], "false", "true"
+unused1736 = scalar, U32, 1736, "", 1, 0, 0, 536870911, 0
+unused1740b0 = bits, U32, 1740, [0:0], "false", "true"
+unused1740b1 = bits, U32, 1740, [1:1], "false", "true"
+unused1740b2 = bits, U32, 1740, [2:2], "false", "true"
 stepperDcInvertedPins = bits, U32, 1740, [3:3], "false", "true"
 unused1127 = bits, U32, 1740, [4:4], "false", "true"
 unused1128 = bits, U32, 1740, [5:5], "false", "true"
@@ -827,7 +827,7 @@ unusedBit_498_28 = bits, U32, 1740, [28:28], "false", "true"
 unusedBit_498_29 = bits, U32, 1740, [29:29], "false", "true"
 unusedBit_498_30 = bits, U32, 1740, [30:30], "false", "true"
 unusedBit_498_31 = bits, U32, 1740, [31:31], "false", "true"
-can2NbcType = bits, U32, 1744, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "Nissan VQ35", "Genesis Coupe", "Honda K", "AiM", "type 13", "type 14", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
+unused1744 = scalar, U32, 1744, "", 1,0,0,0,0
 can2TxPin = bits, U08, 1748, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 can2RxPin = bits, U08, 1749, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 starterControlPinMode = bits, U08, 1750, [0:1], "default", "default inverted", "open collector", "open collector inverted"
@@ -1471,7 +1471,6 @@ fuelTrims12_table = array, S08, 20980, [4x4], "", 0.2, 0, -25, 25, 1
 	canTxPin = "set_can_tx_pin X"
 	canRxPin = "set_can_rx_pin X"
 	acIdleExtraOffset = "Additional idle % while A/C is active"
-	can2SleepPeriodMs = "CANbus thread period, ms"
 	wastegatePositionMin = "Voltage when the wastegate is closed.\nYou probably don't have one of these!"
 	wastegatePositionMax = "Voltage when the wastegate is fully open.\nYou probably don't have one of these!\n1 volt = 1000 units"
 	idlePositionMin = "Voltage when the idle valve is closed.\nYou probably don't have one of these!"
@@ -1637,11 +1636,7 @@ fuelTrims12_table = array, S08, 20980, [4x4], "", 0.2, 0, -25, 25, 1
 	canBaudRate = "set can_baudrate"
 	veOverrideMode = "Override the Y axis (load) value used for the VE table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this."
 	afrOverrideMode = "Override the Y axis (load) value used for the AFR table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this."
-	enableVerboseCan2Tx = "CAN broadcast using custom rusEFI protocol\nenable can_broadcast/disable can_broadcast"
-	can2ReadEnabled = "enable can_read/disable can_read"
-	can2WriteEnabled = "enable can_write/disable can_write"
 	stepperDcInvertedPins = "Enable if DC-motor driver (H-bridge) inverts the signals (eg. RZ7899 on Hellen boards)"
-	can2NbcType = "set can_mode X"
 	can2TxPin = "set_can2_tx_pin X"
 	can2RxPin = "set_can2_rx_pin X"
 	ignOverrideMode = "Override the Y axis (load) value used for the ignition table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this."
@@ -5431,35 +5426,35 @@ cmd_set_engine_type_default					= "Z\x00\x31\x00\x00"
 		field = "TX pin",                               binarySerialTxPin, {useSerialPort == 1}
 		field = "RX pin",                               binarySerialRxPin, {useSerialPort == 1}
 
+	dialog = canHw1, "Primary CAN"
+		field = "Bitrate",		canBaudRate
+		field = "RX pin",		canRxPin 
+		field = "TX pin",		canTxPin 
+
+	dialog = canHw2, "Secondary CAN"
+		field = "Bitrate",	can2BaudRate
+		field = "RX pin",		can2RxPin 
+		field = "TX pin",		can2TxPin 
+
 	dialog = canBus, "CAN Bus"
 		field = "CAN read enabled",						canReadEnabled
 		field = "CAN write enabled",					canWriteEnabled
-		field = "CAN bitrate",							canBaudRate
 		field = "CAN dash type",						canNbcType
 		field = "Verbose Can",                          verboseCan
 		field = "inertia measurement unit",             imuType
 		field = "Enable rusEFI CAN broadcast",			enableVerboseCanTx
-		field = "Which CAN channel to broadcast on",    canBroadcastUseChannelTwo
+		field = "rusEFI CAN data bus",    canBroadcastUseChannelTwo
 		field = "rusEFI CAN data base address",			verboseCanBaseAddress
 		field = "rusEFI CAN data address type",			rusefiVerbose29b
 		field = "rusEFI CAN data period",				canSleepPeriodMs
-		field = "RX pin",								canRxPin 
-		field = "TX pin",								canTxPin 
 
 	dialog = canBus2, "Secondary CAN Bus"
-		field = "CAN read enabled",						can2ReadEnabled
-		field = "CAN write enabled",					can2WriteEnabled
-		field = "CAN bitrate",							can2BaudRate
-		field = "CAN dash type",						can2NbcType
-		field = "Enable rusEFI CAN broadcast",			enableVerboseCan2Tx
-		field = "rusEFI CAN data base address",			verboseCan2BaseAddress
-		field = "rusEFI CAN data period",				can2SleepPeriodMs
-		field = "RX pin",								can2RxPin 
-		field = "TX pin",								can2TxPin 
 
 	dialog = canBusMain, "CAN Bus Communication", yAxis
 		panel = canBus
-		panel = canBus2							
+
+		panel = canHw1
+		panel = canHw2	
 
 	dialog = auxSerial, "AUX Sensor Serial"
 		field = "RX pin",								auxSerialRxPin 
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 dc48c2cfce..cd53160803 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 Fri Dec 24 04:14:26 UTC 2021
+// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Dec 25 04:39:46 UTC 2021
 
 // by class com.rusefi.output.FileJavaFieldsConsumer
 import com.rusefi.config.*;
@@ -432,12 +432,8 @@ public class Fields {
 	public static final int CAMS_PER_BANK = 2;
 	public static final int CAMS_PER_BANK_padding = 0;
 	public static final int can2BaudRate_offset = 1734;
-	public static final int can2NbcType_offset = 1744;
-	public static final int can2ReadEnabled_offset = 1740;
 	public static final int can2RxPin_offset = 1749;
-	public static final int can2SleepPeriodMs_offset = 720;
 	public static final int can2TxPin_offset = 1748;
-	public static final int can2WriteEnabled_offset = 1740;
 	public static final int can_baudrate_e_B100KBPS = 0;
 	public static final int can_baudrate_e_B1MBPS = 3;
 	public static final int can_baudrate_e_B250KBPS = 1;
@@ -716,7 +712,6 @@ public class Fields {
 	public static final int enableMapEstimationTableFallback_offset = 164;
 	public static final int enableSoftwareKnock_offset = 896;
 	public static final int enableTrailingSparks_offset = 164;
-	public static final int enableVerboseCan2Tx_offset = 1740;
 	public static final int enableVerboseCanTx_offset = 748;
 	public static final int engine_configuration_s_size = 5020;
 	public static final int engine_load_mode_e_LM_ALPHA_N = 5;
@@ -2267,7 +2262,7 @@ public class Fields {
 	public static final int TS_RESPONSE_UNDERRUN = 0x80;
 	public static final int TS_RESPONSE_UNRECOGNIZED_COMMAND = 0x83;
 	public static final char TS_SET_LOGGER_SWITCH = 'l';
-	public static final String TS_SIGNATURE = "rusEFI 2021.12.24.all.4174194506";
+	public static final String TS_SIGNATURE = "rusEFI 2021.12.25.all.4051637398";
 	public static final char TS_SINGLE_WRITE_COMMAND = 'W';
 	public static final char TS_TEST_COMMAND = 't';
 	public static final int tunerStudioSerialSpeed_offset = 732;
@@ -2295,6 +2290,12 @@ public class Fields {
 	public static final int unused1476b20_offset = 1272;
 	public static final int unused1476b3_offset = 1272;
 	public static final int unused1476b8_offset = 1272;
+	public static final int unused1736_offset = 1736;
+	public static final int unused1740b0_offset = 1740;
+	public static final int unused1740b1_offset = 1740;
+	public static final int unused1740b2_offset = 1740;
+	public static final int unused1744_offset = 1744;
+	public static final int unused720_offset = 720;
 	public static final int unused_1484_bit_24_offset = 1272;
 	public static final int unused_1484_bit_25_offset = 1272;
 	public static final int unused_1484_bit_26_offset = 1272;
@@ -2382,7 +2383,6 @@ public class Fields {
 	public static final int vehicleWeight_offset = 786;
 	public static final int veLoadBins_offset = 19300;
 	public static final int veOverrideMode_offset = 1733;
-	public static final int verboseCan2BaseAddress_offset = 1736;
 	public static final int verboseCan_offset = 164;
 	public static final int verboseCanBaseAddress_offset = 760;
 	public static final int verboseTLE8888_offset = 748;
@@ -2738,7 +2738,7 @@ public class Fields {
 	public static final Field CANRXPIN = Field.create("CANRXPIN", 717, FieldType.INT8, brain_pin_e);
 	public static final Field THROTTLEPEDALUPPINMODE = Field.create("THROTTLEPEDALUPPINMODE", 718, FieldType.INT8, pin_input_mode_e);
 	public static final Field ACIDLEEXTRAOFFSET = Field.create("ACIDLEEXTRAOFFSET", 719, FieldType.INT8);
-	public static final Field CAN2SLEEPPERIODMS = Field.create("CAN2SLEEPPERIODMS", 720, FieldType.INT);
+	public static final Field UNUSED720 = Field.create("UNUSED720", 720, FieldType.INT);
 	public static final Field WASTEGATEPOSITIONMIN = Field.create("WASTEGATEPOSITIONMIN", 724, FieldType.INT16);
 	public static final Field WASTEGATEPOSITIONMAX = Field.create("WASTEGATEPOSITIONMAX", 726, FieldType.INT16);
 	public static final Field IDLEPOSITIONMIN = Field.create("IDLEPOSITIONMIN", 728, FieldType.INT16);
@@ -3175,10 +3175,10 @@ public class Fields {
 	public static final Field CAN2BAUDRATE = Field.create("CAN2BAUDRATE", 1734, FieldType.INT8, can_baudrate_e);
 	public static final String[] afr_override_e = {"None", "MAP", "TPS", "Acc Pedal", "Cyl Filling %"};
 	public static final Field AFROVERRIDEMODE = Field.create("AFROVERRIDEMODE", 1735, FieldType.INT8, afr_override_e);
-	public static final Field VERBOSECAN2BASEADDRESS = Field.create("VERBOSECAN2BASEADDRESS", 1736, FieldType.INT);
-	public static final Field ENABLEVERBOSECAN2TX = Field.create("ENABLEVERBOSECAN2TX", 1740, FieldType.BIT, 0);
-	public static final Field CAN2READENABLED = Field.create("CAN2READENABLED", 1740, FieldType.BIT, 1);
-	public static final Field CAN2WRITEENABLED = Field.create("CAN2WRITEENABLED", 1740, FieldType.BIT, 2);
+	public static final Field UNUSED1736 = Field.create("UNUSED1736", 1736, FieldType.INT);
+	public static final Field UNUSED1740B0 = Field.create("UNUSED1740B0", 1740, FieldType.BIT, 0);
+	public static final Field UNUSED1740B1 = Field.create("UNUSED1740B1", 1740, FieldType.BIT, 1);
+	public static final Field UNUSED1740B2 = Field.create("UNUSED1740B2", 1740, FieldType.BIT, 2);
 	public static final Field STEPPERDCINVERTEDPINS = Field.create("STEPPERDCINVERTEDPINS", 1740, FieldType.BIT, 3);
 	public static final Field UNUSED1127 = Field.create("UNUSED1127", 1740, FieldType.BIT, 4);
 	public static final Field UNUSED1128 = Field.create("UNUSED1128", 1740, FieldType.BIT, 5);
@@ -3208,7 +3208,7 @@ public class Fields {
 	public static final Field UNUSEDBIT_498_29 = Field.create("UNUSEDBIT_498_29", 1740, FieldType.BIT, 29);
 	public static final Field UNUSEDBIT_498_30 = Field.create("UNUSEDBIT_498_30", 1740, FieldType.BIT, 30);
 	public static final Field UNUSEDBIT_498_31 = Field.create("UNUSEDBIT_498_31", 1740, FieldType.BIT, 31);
-	public static final Field CAN2NBCTYPE = Field.create("CAN2NBCTYPE", 1744, FieldType.INT);
+	public static final Field UNUSED1744 = Field.create("UNUSED1744", 1744, FieldType.INT);
 	public static final Field CAN2TXPIN = Field.create("CAN2TXPIN", 1748, FieldType.INT8, brain_pin_e);
 	public static final Field CAN2RXPIN = Field.create("CAN2RXPIN", 1749, FieldType.INT8, brain_pin_e);
 	public static final Field STARTERCONTROLPINMODE = Field.create("STARTERCONTROLPINMODE", 1750, FieldType.INT8, pin_output_mode_e);
@@ -4009,7 +4009,7 @@ public class Fields {
 	CANRXPIN,
 	THROTTLEPEDALUPPINMODE,
 	ACIDLEEXTRAOFFSET,
-	CAN2SLEEPPERIODMS,
+	UNUSED720,
 	WASTEGATEPOSITIONMIN,
 	WASTEGATEPOSITIONMAX,
 	IDLEPOSITIONMIN,
@@ -4438,10 +4438,10 @@ public class Fields {
 	VEOVERRIDEMODE,
 	CAN2BAUDRATE,
 	AFROVERRIDEMODE,
-	VERBOSECAN2BASEADDRESS,
-	ENABLEVERBOSECAN2TX,
-	CAN2READENABLED,
-	CAN2WRITEENABLED,
+	UNUSED1736,
+	UNUSED1740B0,
+	UNUSED1740B1,
+	UNUSED1740B2,
 	STEPPERDCINVERTEDPINS,
 	UNUSED1127,
 	UNUSED1128,
@@ -4471,7 +4471,7 @@ public class Fields {
 	UNUSEDBIT_498_29,
 	UNUSEDBIT_498_30,
 	UNUSEDBIT_498_31,
-	CAN2NBCTYPE,
+	UNUSED1744,
 	CAN2TXPIN,
 	CAN2RXPIN,
 	STARTERCONTROLPINMODE,