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 193b064339..1b48bfe57d 100644
--- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h
+++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h
@@ -1271,16 +1271,25 @@
 #define triggerSimulatorPins1_offset 736
 #define triggerSimulatorPins2_offset 737
 #define triggerSimulatorPins3_offset 738
+#define TS_BURN_COMMAND 'B'
+#define TS_CHUNK_WRITE_COMMAND 'C'
+#define TS_COMMAND_F 'F'
 #define TS_CRC_CHECK_COMMAND 'k'
 #define TS_EXECUTE 'E'
 #define TS_FILE_VERSION 20200310
 #define TS_GET_COMPOSITE_BUFFER_DONE_DIFFERENTLY '8'
+#define TS_GET_CONFIG_ERROR 'e'
+#define TS_GET_FIRMWARE_VERSION 'V'
 #define TS_GET_LOGGER_GET_BUFFER 'L'
 #define TS_GET_STRUCT '9'
 #define TS_GET_TEXT 'G'
 #define TS_HELLO_COMMAND 'S'
+#define TS_IO_TEST_COMMAND 'w'
 #define TS_OUTPUT_COMMAND 'O'
 #define TS_OUTPUT_SIZE 244
+#define TS_PAGE_COMMAND 'P'
+#define TS_PERF_TRACE_BEGIN 'r'
+#define TS_PERF_TRACE_GET_BUFFER 'b'
 #define TS_READ_COMMAND 'R'
 #define TS_SET_LOGGER_SWITCH 'l'
 #define ts_show_analog_divider true
@@ -1302,6 +1311,7 @@
 #define ts_show_trigger_comparator true
 #define ts_show_tunerstudio_port true
 #define TS_SIGNATURE "rusEFI v1.2020.4"
+#define TS_SINGLE_WRITE_COMMAND 'W'
 #define tunerStudioSerialSpeed_offset 728
 #define twoWireBatchIgnition_offset 1476
 #define twoWireBatchInjection_offset 1476
diff --git a/firmware/console/binary/tunerstudio_io.h b/firmware/console/binary/tunerstudio_io.h
index fff7b410cd..2a744060df 100644
--- a/firmware/console/binary/tunerstudio_io.h
+++ b/firmware/console/binary/tunerstudio_io.h
@@ -62,21 +62,6 @@ typedef struct {
 // many commands are now defined in rusefi_config.txt see TS_* constants
 // this way we reuse between firmware and java code
 
-#define TS_PAGE_COMMAND 'P' // 0x50
-#define TS_COMMAND_F 'F' // 0x46
-#define TS_GET_FIRMWARE_VERSION 'V' // versionInfo
-#define TS_GET_CONFIG_ERROR 'e' // returns getFirmwareError(), works together with ind_hasFatalError
-
-
-// Performance tracing
-#define TS_PERF_TRACE_BEGIN 'r'
-#define TS_PERF_TRACE_GET_BUFFER 'b'
-
-#define TS_SINGLE_WRITE_COMMAND 'W' // 0x57 pageValueWrite
-#define TS_CHUNK_WRITE_COMMAND 'C' // 0x43 pageChunkWrite
-#define TS_BURN_COMMAND 'B' // 0x42 burnCommand
-#define TS_IO_TEST_COMMAND 'w' // 0x77
-
 
 #define CRC_VALUE_SIZE 4
 // todo: double-check this
diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h
index 90ad59b9eb..ca47f5eb86 100644
--- a/firmware/controllers/generated/rusefi_generated.h
+++ b/firmware/controllers/generated/rusefi_generated.h
@@ -1271,16 +1271,25 @@
 #define triggerSimulatorPins1_offset 736
 #define triggerSimulatorPins2_offset 737
 #define triggerSimulatorPins3_offset 738
+#define TS_BURN_COMMAND 'B'
+#define TS_CHUNK_WRITE_COMMAND 'C'
+#define TS_COMMAND_F 'F'
 #define TS_CRC_CHECK_COMMAND 'k'
 #define TS_EXECUTE 'E'
 #define TS_FILE_VERSION 20200310
 #define TS_GET_COMPOSITE_BUFFER_DONE_DIFFERENTLY '8'
+#define TS_GET_CONFIG_ERROR 'e'
+#define TS_GET_FIRMWARE_VERSION 'V'
 #define TS_GET_LOGGER_GET_BUFFER 'L'
 #define TS_GET_STRUCT '9'
 #define TS_GET_TEXT 'G'
 #define TS_HELLO_COMMAND 'S'
+#define TS_IO_TEST_COMMAND 'w'
 #define TS_OUTPUT_COMMAND 'O'
 #define TS_OUTPUT_SIZE 244
+#define TS_PAGE_COMMAND 'P'
+#define TS_PERF_TRACE_BEGIN 'r'
+#define TS_PERF_TRACE_GET_BUFFER 'b'
 #define TS_READ_COMMAND 'R'
 #define TS_SET_LOGGER_SWITCH 'l'
 #define ts_show_analog_divider true
@@ -1302,6 +1311,7 @@
 #define ts_show_trigger_comparator false
 #define ts_show_tunerstudio_port true
 #define TS_SIGNATURE "rusEFI v1.2020.4"
+#define TS_SINGLE_WRITE_COMMAND 'W'
 #define tunerStudioSerialSpeed_offset 728
 #define twoWireBatchIgnition_offset 1476
 #define twoWireBatchInjection_offset 1476
diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt
index 2886c78f43..f75febd367 100644
--- a/firmware/integration/rusefi_config.txt
+++ b/firmware/integration/rusefi_config.txt
@@ -1580,6 +1580,30 @@ end_struct
 #define TS_GET_STRUCT '9'
 #define TS_GET_COMPOSITE_BUFFER_DONE_DIFFERENTLY '8'
 
+// Performance tracing
+#define TS_PERF_TRACE_BEGIN 'r'
+#define TS_PERF_TRACE_GET_BUFFER 'b'
+
+// 0x50
+#define TS_PAGE_COMMAND 'P'
+// 0x46
+#define TS_COMMAND_F 'F'
+// versionInfo
+#define TS_GET_FIRMWARE_VERSION 'V'
+// returns getFirmwareError(), works together with ind_hasFatalError
+#define TS_GET_CONFIG_ERROR 'e'
+
+
+// 0x57 pageValueWrite
+#define TS_SINGLE_WRITE_COMMAND 'W' 
+// 0x43 pageChunkWrite
+#define TS_CHUNK_WRITE_COMMAND 'C' 
+// 0x42 burnCommand
+#define TS_BURN_COMMAND 'B' 
+// 0x77
+#define TS_IO_TEST_COMMAND 'w'
+
+
 // Engine Sniffer time stamp unit, in microseconds
 #define ENGINE_SNIFFER_UNIT_US 10