More tidying

ejeklint · Sep 11, 2010 · dae1fdb · dae1fdb
1 parent 1ff2c27
commit dae1fdb
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/WebSocket.h b/WebSocket.h
@@ -273,7 +273,9 @@ void WebSocket::executeActions(String socketString) {
 			Serial.print(i);
 			Serial.print("\n");
 		#endif
-		socket_actions[i].socketAction(*this, socketString);
+		//trim data from before start of message
+		String substring = socketString.substring(2);
+		socket_actions[i].socketAction(*this, substring);
 	}
 }
 

diff --git a/examples/Websocket_Actions/Websocket_Actions.pde b/examples/Websocket_Actions/Websocket_Actions.pde
@@ -12,14 +12,14 @@ byte ip[] = { 192, 168, 1, 170 };
 WebSocket websocket(PREFIX, PORT);
 
 void helloAction(WebSocket &socket, String &socketString) {
-	//32 is temp fix while I fix the reciving bit
-	if(socketString.contains("32Hello")) {
+
+	if(socketString.substring(0)=="Hello") {
 		socket.actionWrite("Hi!");
 	}
 }
 void clackAction(WebSocket &socket, String &socketString) {
-	//32 is temp fix while I fix the reciving bit
-	if(socketString.contains("32Click!")) {
+
+	if(socketString.substring(0)=="Click!") {
 		socket.actionWrite("Clack!");
 	}
 }

diff --git a/examples/Websocket_Demo/Websocket_Demo.pde b/examples/Websocket_Demo/Websocket_Demo.pde
@@ -13,7 +13,7 @@ byte ip[] = { 192, 168, 1, 170 };
 WebSocket websocket(PREFIX, PORT);
 
 void echoAction(WebSocket &socket, String &socketString) {
-	socket.actionWrite(&socketString[2]);
+	socket.actionWrite(&socketString[0]);
 }
 
 void setup() {