diff --git a/firmware/controllers/algo/engine_types.h b/firmware/controllers/algo/engine_types.h
index 3fd3959440..037a9a2041 100644
--- a/firmware/controllers/algo/engine_types.h
+++ b/firmware/controllers/algo/engine_types.h
@@ -446,7 +446,16 @@ typedef enum {
     TS_14_9 = 9,
 	TS_WRITE_FLASH = 0x0A,
 	TS_ETB_RESET = 0x0B,
-	TS_RESET_MC33810 = 33810
+	TS_ETB_START_AUTOTUNE = 0x0C,
+	TS_TRIGGER_STIMULATOR_ENABLE = 0x0D,
+	TS_ETB_AUTOCAL_0 = 0x0E,
+	TS_TRIGGER_STIMULATOR_DISABLE = 0x0F,
+	TS_ETB_STOP_AUTOTUNE = 0x10,
+	TS_ETB_AUTOCAL_1 = 0x11,
+	TS_WIDEBAND_UPDATE = 0x12,
+	TS_EXTERNAL_TRIGGER_STIMULATOR_ENABLE = 0x13,
+	TS_RESET_MC33810 = 0x14,
+	TS_BURN_WITHOUT_FLASH = 0x15,
 } ts_14_command;
 
 typedef enum {
diff --git a/firmware/controllers/bench_test.cpp b/firmware/controllers/bench_test.cpp
index 673a95afb8..d9252113d3 100644
--- a/firmware/controllers/bench_test.cpp
+++ b/firmware/controllers/bench_test.cpp
@@ -452,65 +452,77 @@ static void handleCommandX14(uint16_t index) {
 		grabPedalIsWideOpen();
 		return;
 	case TS_RESET_TLE8888:
-#if (BOARD_TLE8888_COUNT > 0)
-		tle8888_req_init();
-#endif
+		#if (BOARD_TLE8888_COUNT > 0)
+			tle8888_req_init();
+		#endif
 		return;
 	case TS_RESET_MC33810:
-#if (BOARD_MC33810_COUNT > 0)
-		mc33810_req_init();
-#endif
+		#if (BOARD_MC33810_COUNT > 0)
+			mc33810_req_init();
+		#endif
 		return;
 	case TS_WRITE_FLASH:
 		// cmd_write_config
-#if (EFI_STORAGE_INT_FLASH == TRUE) || (EFI_STORAGE_MFS == TRUE)
-		writeToFlashNow();
-#endif /* (EFI_STORAGE_INT_FLASH == TRUE) || (EFI_STORAGE_MFS == TRUE) */
+		#if (EFI_STORAGE_INT_FLASH == TRUE) || (EFI_STORAGE_MFS == TRUE)
+			writeToFlashNow();
+		#endif /* (EFI_STORAGE_INT_FLASH == TRUE) || (EFI_STORAGE_MFS == TRUE) */
 		return;
-#if EFI_EMULATE_POSITION_SENSORS
-	case 0xD:
-		enableTriggerStimulator();
+	case TS_TRIGGER_STIMULATOR_ENABLE:
+		#if EFI_EMULATE_POSITION_SENSORS == TRUE
+			enableTriggerStimulator();
+		#endif /* EFI_EMULATE_POSITION_SENSORS == TRUE */
 		return;
-	case 0xF:
-		disableTriggerStimulator();
+	case TS_TRIGGER_STIMULATOR_DISABLE:
+		#if EFI_EMULATE_POSITION_SENSORS == TRUE
+			disableTriggerStimulator();
+		#endif /* EFI_EMULATE_POSITION_SENSORS == TRUE */
 		return;
-	case 0x13:
-		enableExternalTriggerStimulator();
+	case TS_EXTERNAL_TRIGGER_STIMULATOR_ENABLE:
+		#if EFI_EMULATE_POSITION_SENSORS == TRUE
+			enableExternalTriggerStimulator();
+		#endif /* EFI_EMULATE_POSITION_SENSORS == TRUE */
 		return;
-#endif // EFI_EMULATE_POSITION_SENSORS
-#if EFI_ELECTRONIC_THROTTLE_BODY
     case TS_ETB_RESET:
-#if EFI_PROD_CODE
-        etbPidReset();
-#endif
+		#if EFI_ELECTRONIC_THROTTLE_BODY == TRUE
+		#if EFI_PROD_CODE
+			etbPidReset();
+		#endif
+		#endif /* EFI_ELECTRONIC_THROTTLE_BODY == TRUE */
 		return;
-	case 0xE:
-		etbAutocal(0);
+	case TS_ETB_AUTOCAL_0:
+		#if EFI_ELECTRONIC_THROTTLE_BODY == TRUE
+			etbAutocal(0);
+		#endif /* EFI_ELECTRONIC_THROTTLE_BODY == TRUE */
 		return;
-	case 0x11:
-		etbAutocal(1);
+	case TS_ETB_AUTOCAL_1:
+		#if EFI_ELECTRONIC_THROTTLE_BODY == TRUE
+			etbAutocal(1);
+		#endif /* EFI_ELECTRONIC_THROTTLE_BODY == TRUE */
 		return;
-	case 0xC:
-		engine->etbAutoTune = true;
+	case TS_ETB_START_AUTOTUNE:
+		#if EFI_ELECTRONIC_THROTTLE_BODY == TRUE
+			engine->etbAutoTune = true;
+		#endif /* EFI_ELECTRONIC_THROTTLE_BODY == TRUE */
 		return;
-	case 0x10:
-		engine->etbAutoTune = false;
-#if EFI_TUNER_STUDIO
-		engine->outputChannels.calibrationMode = (uint8_t)TsCalMode::None;
-#endif // EFI_TUNER_STUDIO
+	case TS_ETB_STOP_AUTOTUNE:
+		#if EFI_ELECTRONIC_THROTTLE_BODY == TRUE
+			engine->etbAutoTune = false;
+			#if EFI_TUNER_STUDIO
+				engine->outputChannels.calibrationMode = (uint8_t)TsCalMode::None;
+			#endif // EFI_TUNER_STUDIO
+		#endif /* EFI_ELECTRONIC_THROTTLE_BODY == TRUE */
 		return;
-#endif
-	case 0x12:
+	case TS_WIDEBAND_UPDATE:
 		widebandUpdatePending = true;
 		benchSemaphore.signal();
 		return;
-	case 0x15:
-#if EFI_PROD_CODE
-#if (EFI_STORAGE_INT_FLASH == TRUE) || (EFI_STORAGE_MFS == TRUE)
-		extern bool burnWithoutFlash;
-		burnWithoutFlash = true;
-#endif /* (EFI_STORAGE_INT_FLASH == TRUE) || (EFI_STORAGE_MFS == TRUE) */
-#endif // EFI_PROD_CODE
+	case TS_BURN_WITHOUT_FLASH:
+		#if EFI_PROD_CODE
+		#if (EFI_STORAGE_INT_FLASH == TRUE) || (EFI_STORAGE_MFS == TRUE)
+			extern bool burnWithoutFlash;
+			burnWithoutFlash = true;
+		#endif /* (EFI_STORAGE_INT_FLASH == TRUE) || (EFI_STORAGE_MFS == TRUE) */
+		#endif // EFI_PROD_CODE
 		return;
 	default:
 		criticalError("Unexpected bench x14 %d", index);
diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input
index 7143837bb0..474b729d0e 100644
--- a/firmware/tunerstudio/rusefi.input
+++ b/firmware/tunerstudio/rusefi.input
@@ -2125,7 +2125,7 @@ cmd_calibrate_tps_2_wot		= "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_X14_16_
 cmd_calibrate_pedal_up		= "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_X14_16_hex@@\x00\x06"
 cmd_calibrate_pedal_down	= "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_X14_16_hex@@\x00\x07"
 cmd_tle8888_init			= "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_X14_16_hex@@\x00\x08"
-cmd_mc33810_init			= "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_X14_16_hex@@\x84\x12"
+cmd_mc33810_init			= "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_X14_16_hex@@\x00\x14"
 cmd_write_config			= "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_X14_16_hex@@@@ts_14_command_TS_WRITE_FLASH_16_hex@@"
 cmd_etb_reset         		= "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_X14_16_hex@@@@ts_14_command_TS_ETB_RESET_16_hex@@"
 cmd_etb_autotune				= "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_X14_16_hex@@\x00\x0C"