diff --git a/firmware/controllers/algo/auto_generated_enginetypes.cpp b/firmware/controllers/algo/auto_generated_enginetypes.cpp
index c0c6f642a9..c2ea3e7ff5 100644
--- a/firmware/controllers/algo/auto_generated_enginetypes.cpp
+++ b/firmware/controllers/algo/auto_generated_enginetypes.cpp
@@ -1,6 +1,6 @@
 #include "global.h"
 #include "engine_types.h"
-// was generated automatically by rusEFI tool  from engine_types.h // by enum2string.jar tool on Thu Oct 28 16:43:25 UTC 2021
+// was generated automatically by rusEFI tool  from engine_types.h // by enum2string.jar tool on Thu Oct 28 13:21:58 EDT 2021
 // see also gen_config_and_enums.bat
 
 
@@ -496,6 +496,8 @@ case TT_VVT_NISSAN_VQ35:
 }
 const char *getTs_command_e(ts_command_e value){
 switch(value) {
+case TS_CLEAR_WARNINGS:
+  return "TS_CLEAR_WARNINGS";
 case TS_COMMAND_1:
   return "TS_COMMAND_1";
 case TS_COMMAND_11:
@@ -510,8 +512,6 @@ case TS_COMMAND_15:
   return "TS_COMMAND_15";
 case TS_COMMAND_16:
   return "TS_COMMAND_16";
-case TS_COMMAND_17:
-  return "TS_COMMAND_17";
 case TS_COMMAND_4:
   return "TS_COMMAND_4";
 case TS_COMMAND_5:
@@ -536,6 +536,8 @@ case TS_RESET_TLE8888:
   return "TS_RESET_TLE8888";
 case TS_WRITE_FLASH:
   return "TS_WRITE_FLASH";
+case TS_X14:
+  return "TS_X14";
   }
  return NULL;
 }
diff --git a/firmware/controllers/algo/engine_types.h b/firmware/controllers/algo/engine_types.h
index 5143648125..101db5b89f 100644
--- a/firmware/controllers/algo/engine_types.h
+++ b/firmware/controllers/algo/engine_types.h
@@ -546,7 +546,8 @@ typedef enum {
 	TS_COMMAND_14 = 14,
 	TS_COMMAND_15 = 15,
 	TS_COMMAND_16 = 16,
-	TS_COMMAND_17 = 17,
+	TS_CLEAR_WARNINGS = 17,
 	TS_IGNITION_CATEGORY = 18,
 	TS_INJECTOR_CATEGORY = 19,
+	TS_X14 = 20,
 } ts_command_e;
diff --git a/firmware/controllers/bench_test.cpp b/firmware/controllers/bench_test.cpp
index fc5e0cf988..24bf770b10 100644
--- a/firmware/controllers/bench_test.cpp
+++ b/firmware/controllers/bench_test.cpp
@@ -323,21 +323,21 @@ static void handleBenchCategory(uint16_t index) {
 
 static void handleCommandX14(uint16_t index) {
 	switch (index) {
-	case 2:
+	case TS_GRAB_TPS_CLOSED:
 		grabTPSIsClosed();
 		return;
-	case 3:
+	case TS_GRAB_TPS_WOT:
 		grabTPSIsWideOpen();
 		return;
 	// case 4: tps2_closed
 	// case 5: tps2_wot
-	case 6:
+	case TS_GRAB_PEDAL_UP:
 		grabPedalIsUp();
 		return;
-	case 7:
+	case TS_GRAB_PEDAL_WOT:
 		grabPedalIsWideOpen();
 		return;
-	case 8:
+	case TS_RESET_TLE8888:
 #if (BOARD_TLE8888_COUNT > 0)
 		tle8888_req_init();
 #endif
@@ -420,17 +420,21 @@ void executeTSCommand(uint16_t subsystem, uint16_t index) {
 	bool running = !ENGINE(rpmCalculator).isStopped();
 
 	switch (subsystem) {
-	case 0x11:
+	case TS_CLEAR_WARNINGS:
 		clearWarnings();
 		break;
 
-	case CMD_TS_IGNITION_CATEGORY:
+	case TS_DEBUG_MODE:
+		engineConfiguration->debugMode = (debug_mode_e)index;
+		break;
+
+	case TS_IGNITION_CATEGORY:
 		if (!running) {
 			doRunSpark(index, "300", "4", "400", "3");
 		}
 		break;
 
-	case CMD_TS_INJECTOR_CATEGORY:
+	case TS_INJECTOR_CATEGORY:
 		if (!running) {
 			doRunFuel(index, "300", "4", "400", "3");
 		}
@@ -448,7 +452,7 @@ void executeTSCommand(uint16_t subsystem, uint16_t index) {
 		}
 		break;
 
-	case CMD_TS_X14:
+	case TS_X14:
 		handleCommandX14(index);
 		break;
 #ifdef EFI_WIDEBAND_FIRMWARE_UPDATE
diff --git a/java_console/io/src/main/java/com/rusefi/enums/ts_command_e.java b/java_console/io/src/main/java/com/rusefi/enums/ts_command_e.java
index d0e43467e2..c3ceaad782 100644
--- a/java_console/io/src/main/java/com/rusefi/enums/ts_command_e.java
+++ b/java_console/io/src/main/java/com/rusefi/enums/ts_command_e.java
@@ -21,7 +21,8 @@ public enum ts_command_e {
 	TS_COMMAND_14,
 	TS_COMMAND_15,
 	TS_COMMAND_16,
-	TS_COMMAND_17,
+	TS_CLEAR_WARNINGS,
 	TS_IGNITION_CATEGORY,
 	TS_INJECTOR_CATEGORY,
+	TS_X14,
 }