remove page TS command (#509)

FOME-Tech · Nov 8, 2024 · de4b157 · de4b157
1 parent ed9420d
commit de4b157
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 23 deletions.
diff --git a/firmware/console/binary/tunerstudio.cpp b/firmware/console/binary/tunerstudio.cpp
@@ -130,14 +130,6 @@ void TunerStudio::sendErrorCode(TsChannelBase* tsChannel, uint8_t code) {
 	::sendErrorCode(tsChannel, code);
 }
 
-void TunerStudio::handlePageSelectCommand(TsChannelBase *tsChannel) {
-	tsState.pageCommandCounter++;
-
-	efiPrintf("TS -> Set page (no-op)");
-
-	sendOkResponse(tsChannel);
-}
-
 bool validateOffsetCount(size_t offset, size_t count, TsChannelBase* tsChannel);
 
 extern bool rebootForPresetPending;
@@ -276,7 +268,7 @@ static void handleBurnCommand(TsChannelBase* tsChannel) {
 
 static bool isKnownCommand(char command) {
 	return command == TS_HELLO_COMMAND || command == TS_READ_COMMAND || command == TS_OUTPUT_COMMAND
-			|| command == TS_PAGE_COMMAND || command == TS_BURN_COMMAND || command == TS_SINGLE_WRITE_COMMAND
+			|| command == TS_BURN_COMMAND || command == TS_SINGLE_WRITE_COMMAND
 			|| command == TS_CHUNK_WRITE_COMMAND || command == TS_EXECUTE
 			|| command == TS_IO_TEST_COMMAND
 			|| command == TS_SET_LOGGER_SWITCH
@@ -585,9 +577,6 @@ int TunerStudio::handleCrcCommand(TsChannelBase* tsChannel, uint8_t* data, int i
 	case TS_EXECUTE:
 		handleExecuteCommand(tsChannel, reinterpret_cast<char*>(data), incomingPacketSize - 1);
 		break;
-	case TS_PAGE_COMMAND:
-		handlePageSelectCommand(tsChannel);
-		break;
 	case TS_CHUNK_WRITE_COMMAND:
 		handleWriteChunkCommand(tsChannel, offset, count, data + sizeof(TunerStudioWriteChunkRequest));
 		break;

diff --git a/firmware/console/binary/tunerstudio_impl.h b/firmware/console/binary/tunerstudio_impl.h
@@ -31,8 +31,6 @@ class TunerStudio : public TunerStudioBase {
 	 */
 	void handleQueryCommand(TsChannelBase* tsChannel, ts_response_format_e mode);
 	void handleExecuteCommand(TsChannelBase* tsChannel, char *data, int incomingPacketSize);
-	// does more or less nothing, we only handle the command to make frontend application happy
-	void handlePageSelectCommand(TsChannelBase *tsChannel);
 	void handleWriteChunkCommand(TsChannelBase* tsChannel, uint16_t offset, uint16_t count,
 			void *content);
 	void handleCrc32Check(TsChannelBase *tsChannel, uint16_t offset, uint16_t count);

diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt
@@ -1869,8 +1869,6 @@ end_struct
 #define TS_PERF_TRACE_BEGIN '_'
 #define TS_PERF_TRACE_GET_BUFFER 'b'
 
-! 0x50 80
-#define TS_PAGE_COMMAND 'P'
 ! 0x46
 #define TS_COMMAND_F 'F'
 #define TS_GET_PROTOCOL_VERSION_COMMAND_F 'F'

diff --git a/firmware/tunerstudio/tunerstudio.template.ini b/firmware/tunerstudio/tunerstudio.template.ini
@@ -63,7 +63,6 @@ enable2ndByteCanID = false
 	pageIdentifier		= "\x00\x00"
 	pageReadCommand		= "@@TS_READ_COMMAND_char@@%2o%2c"
 	burnCommand			= "@@TS_BURN_COMMAND_char@@"
-	pageActivate		= "@@TS_PAGE_COMMAND_char@@"
 	pageValueWrite		= "@@TS_SINGLE_WRITE_COMMAND_char@@%2o%v"
 	pageChunkWrite		= "@@TS_CHUNK_WRITE_COMMAND_char@@%2o%2c%v"
 	crc32CheckCommand	= "@@TS_CRC_CHECK_COMMAND_char@@%2o%2c"

diff --git a/java_console/io/src/main/java/com/rusefi/binaryprotocol/BinaryProtocol.java b/java_console/io/src/main/java/com/rusefi/binaryprotocol/BinaryProtocol.java
@@ -59,8 +59,6 @@ public class BinaryProtocol {
 
     public static String findCommand(byte command) {
         switch (command) {
-            case Fields.TS_PAGE_COMMAND:
-                return "PAGE";
             case Fields.TS_COMMAND_F:
                 return "PROTOCOL";
             case Fields.TS_CRC_CHECK_COMMAND:

diff --git a/java_console/io/src/main/java/com/rusefi/io/tcp/BinaryProtocolServer.java b/java_console/io/src/main/java/com/rusefi/io/tcp/BinaryProtocolServer.java
@@ -161,8 +161,6 @@ private void runProxy(LinkManager linkManager, Socket clientSocket, Context cont
                 stream.sendPacket((TS_OK + "rusEFI proxy").getBytes());
             } else if (command == Fields.TS_CRC_CHECK_COMMAND) {
                 handleCrc(linkManager, stream);
-            } else if (command == Fields.TS_PAGE_COMMAND) {
-                stream.sendPacket(TS_OK.getBytes());
             } else if (command == Fields.TS_READ_COMMAND) {
                 ByteRange byteRange = ByteRange.valueOf(payload);
                 handleRead(linkManager, byteRange, stream);

diff --git a/java_console/io/src/test/java/com/rusefi/binaryprotocol/test/TcpServerSandbox.java b/java_console/io/src/test/java/com/rusefi/binaryprotocol/test/TcpServerSandbox.java
@@ -94,8 +94,6 @@ private static void handleCommand(EcuState ecuState, IoStream stream, IncomingDa
             new HelloCommand(Fields.TS_SIGNATURE).handle(stream);
         } else if (command == Fields.TS_GET_PROTOCOL_VERSION_COMMAND_F) {
             stream.sendPacket((TS_OK + TS_PROTOCOL).getBytes());
-        } else if (command == Fields.TS_PAGE_COMMAND) {
-            stream.sendPacket(TS_OK.getBytes());
         } else if (command == Fields.TS_CRC_CHECK_COMMAND) {
             stream.sendPacket(BinaryProtocolServer.createCrcResponse(TOTALLY_EMPTY_CONFIGURATION));
         } else if (command == Fields.TS_SET_LOGGER_SWITCH) {