bump version

command out all echos

examples/WebSocketClient/WebSocketClient.ino

@@ -30,26 +30,28 @@ void webSocketEvent(WStype_t type, uint8_t * payload, size_t lenght) {
         case WStype_CONNECTED:
             {
                 USE_SERIAL.printf("[WSc] Connected to url: %s\n",  payload);
+				
+			    // send message to server when Connected
+				webSocket.sendTXT(num, "Connected");
             }
             break;
         case WStype_TEXT:
             USE_SERIAL.printf("[WSc] get text: %s\n", payload);
 
-            // send data to back to Server
-            webSocket.sendTXT(payload, lenght);
+			// send message to server
+			// webSocket.sendTXT("message here");
             break;
         case WStype_BIN:
             USE_SERIAL.printf("[WSc] get binary lenght: %u\n", lenght);
             hexdump(payload, lenght);
 
-            // echo data back to Server
-            webSocket.sendBIN(payload, lenght);
+            // send data to server
+            // webSocket.sendBIN(payload, lenght);
             break;
     }
 
 }
 
-
 void setup() {
     // USE_SERIAL.begin(921600);
     USE_SERIAL.begin(115200);
@@ -79,8 +81,6 @@ void setup() {
 
 }
 
-
-
 void loop() {
     webSocket.loop();
 }

examples/WebSocketServer/WebSocketServer.ino

@@ -28,23 +28,26 @@ void webSocketEvent(uint8_t num, WStype_t type, uint8_t * payload, size_t lenght
             {
                 IPAddress ip = webSocket.remoteIP(num);
                 USE_SERIAL.printf("[%u] Connected from %d.%d.%d.%d url: %s\n", num, ip[0], ip[1], ip[2], ip[3], payload);
+				
+				// send message to client
+				webSocket.sendTXT(num, "Connected");
             }
             break;
         case WStype_TEXT:
             USE_SERIAL.printf("[%u] get Text: %s\n", num, payload);
 
-            // echo data back to browser
-            webSocket.sendTXT(num, payload, lenght);
+            // send message to client
+            // webSocket.sendTXT(num, "message here");
 
             // send data to all connected clients
-            webSocket.broadcastTXT(payload, lenght);
+            // webSocket.broadcastTXT("message here");
             break;
         case WStype_BIN:
             USE_SERIAL.printf("[%u] get binary lenght: %u\n", num, lenght);
             hexdump(payload, lenght);
 
-            // echo data back to browser
-            webSocket.sendBIN(num, payload, lenght);
+            // send message to client
+            // webSocket.sendBIN(num, payload, lenght);
             break;
     }
 

examples/WebSocketServer_LEDcontrol/WebSocketServer_LEDcontrol.ino

@@ -0,0 +1,122 @@
+/*
+ * WebSocketServer_LEDcontrol.ino
+ *
+ *  Created on: 26.11.2015
+ *
+ */
+
+#include <Arduino.h>
+
+#include <ESP8266WiFi.h>
+#include <ESP8266WiFiMulti.h>
+#include <WebSocketsServer.h>
+#include <ESP8266WebServer.h>
+#include <ESP8266mDNS.h>
+#include <Hash.h>
+
+#define LED_RED     15
+#define LED_GREEN   12
+#define LED_BLUE    13
+
+#define USE_SERIAL Serial
+
+
+ESP8266WiFiMulti WiFiMulti;
+
+ESP8266WebServer server = ESP8266WebServer(80);
+WebSocketsServer webSocket = WebSocketsServer(81);
+
+void webSocketEvent(uint8_t num, WStype_t type, uint8_t * payload, size_t lenght) {
+
+    switch(type) {
+        case WStype_DISCONNECTED:
+            USE_SERIAL.printf("[%u] Disconnected!\n", num);
+            break;
+        case WStype_CONNECTED: {
+            IPAddress ip = webSocket.remoteIP(num);
+            USE_SERIAL.printf("[%u] Connected from %d.%d.%d.%d url: %s\n", num, ip[0], ip[1], ip[2], ip[3], payload);
+
+            // send message to client
+            webSocket.sendTXT(num, "Connected");
+        }
+            break;
+        case WStype_TEXT:
+            USE_SERIAL.printf("[%u] get Text: %s\n", num, payload);
+
+            if(payload[0] == '#') {
+                // we get RGB data
+
+                // decode rgb data
+                uint32_t rgb = (uint32_t) strtol((const char *) &payload[1], NULL, 16);
+
+                analogWrite(LED_RED,    ((rgb >> 16) & 0xFF));
+                analogWrite(LED_GREEN,  ((rgb >> 8) & 0xFF));
+                analogWrite(LED_BLUE,   ((rgb >> 0) & 0xFF));
+            }
+
+            break;
+    }
+
+}
+
+void setup() {
+    USE_SERIAL.begin(921600);
+    //USE_SERIAL.begin(115200);
+
+    USE_SERIAL.setDebugOutput(true);
+
+    USE_SERIAL.println();
+    USE_SERIAL.println();
+    USE_SERIAL.println();
+
+    for(uint8_t t = 4; t > 0; t--) {
+        USE_SERIAL.printf("[SETUP] BOOT WAIT %d...\n", t);
+        USE_SERIAL.flush();
+        delay(1000);
+    }
+
+    pinMode(LED_RED, OUTPUT);
+    pinMode(LED_GREEN, OUTPUT);
+    pinMode(LED_BLUE, OUTPUT);
+
+    digitalWrite(LED_RED, 1);
+    digitalWrite(LED_GREEN, 1);
+    digitalWrite(LED_BLUE, 1);
+
+    WiFiMulti.addAP("SSID", "passpasspass");
+
+    while(WiFiMulti.run() != WL_CONNECTED) {
+        delay(100);
+    }
+
+    // start webSocket server
+    webSocket.begin();
+    webSocket.onEvent(webSocketEvent);
+
+    if(MDNS.begin("esp8266")) {
+        Serial.println("MDNS responder started");
+    }
+
+    // handle index
+    server.on("/", []() {
+        // send index.html
+        server.send(200, "text/html", "<html><head><script>var connection = new WebSocket('ws://'+location.hostname+':81/', ['arduino']);connection.onopen = function () {  connection.send('Connect ' + new Date()); }; connection.onerror = function (error) {    console.log('WebSocket Error ', error);};connection.onmessage = function (e) {  console.log('Server: ', e.data);};function sendRGB() {  var r = parseInt(document.getElementById('r').value).toString(16);  var g = parseInt(document.getElementById('g').value).toString(16);  var b = parseInt(document.getElementById('b').value).toString(16);  if(r.length < 2) { r = '0' + r; }   if(g.length < 2) { g = '0' + g; }   if(b.length < 2) { b = '0' + b; }   var rgb = '#'+r+g+b;    console.log('RGB: ' + rgb); connection.send(rgb); }</script></head><body>LED Control:<br/><br/>R: <input id=\"r\" type=\"range\" min=\"0\" max=\"255\" step=\"1\" onchange=\"sendRGB();\" /><br/>G: <input id=\"g\" type=\"range\" min=\"0\" max=\"255\" step=\"1\" onchange=\"sendRGB();\" /><br/>B: <input id=\"b\" type=\"range\" min=\"0\" max=\"255\" step=\"1\" onchange=\"sendRGB();\" /><br/></body></html>");
+    });
+
+    server.begin();
+
+    // Add service to MDNS
+    MDNS.addService("http", "tcp", 80);
+    MDNS.addService("ws", "tcp", 81);
+
+    digitalWrite(LED_RED, 0);
+    digitalWrite(LED_GREEN, 0);
+    digitalWrite(LED_BLUE, 0);
+
+}
+
+void loop() {
+    webSocket.loop();
+    server.handleClient();
+}
+

library.properties

@@ -1,8 +1,9 @@
 name=WebSockets
-version=1.0
+version=1.2
 author=Markus Sattler
 maintainer=Markus Sattler 
 sentence=WebSockets for Arduino (Server + Client)
 paragraph=
+category=Communication
 url=https://github.com/Links2004/arduinoWebSockets
 architectures=*

src/WebSocketsClient.cpp

@@ -180,9 +180,8 @@ void WebSocketsClient::messageRecived(WSclient_t * client, WSopcode_t opcode, ui
             break;
     }
 
-    if(_cbEvent) {
-        _cbEvent(type, payload, lenght);
-    }
+    runCbEvent(type, payload, lenght);
+
 }
 
 /**
@@ -208,9 +207,8 @@ void WebSocketsClient::clientDisconnect(WSclient_t * client) {
 
     DEBUG_WEBSOCKETS("[WS-Client] client disconnected.\n");
 
-    if(_cbEvent) {
-        _cbEvent(WStype_DISCONNECTED, NULL, 0);
-    }
+    runCbEvent(WStype_DISCONNECTED, NULL, 0);
+
 }
 
 /**
@@ -272,33 +270,22 @@ void WebSocketsClient::sendHeader(WSclient_t * client) {
 
     unsigned long start = micros();
 
-    //todo use tcp.write only once
-
-    client->tcp.write("GET ");
-    client->tcp.write(client->cUrl.c_str(), client->cUrl.length());
-    client->tcp.write(" HTTP/1.1\r\n"
-            "Host: ");
-
-    client->tcp.write(_host.c_str(), _host.length());
-    client->tcp.write("\r\n"
-            "Upgrade: websocket\r\n"
-            "Connection: Upgrade\r\n"
-            "User-Agent: arduino-WebSocket-Client\r\n"
-            "Sec-WebSocket-Version: 13\r\n"
-            "Sec-WebSocket-Protocol: arduino\r\n" // todo add api to set Protocol of Server
-            "Sec-WebSocket-Key: ");
-
-    client->tcp.write(client->cKey.c_str(), client->cKey.length());
-    client->tcp.write("\r\n");
+    String handshake =  "GET " + client->cUrl + " HTTP/1.1\r\n"
+                        "Host: " + _host + "\r\n"
+                        "Upgrade: websocket\r\n"
+                        "Connection: Upgrade\r\n"
+                        "User-Agent: arduino-WebSocket-Client\r\n"
+                        "Sec-WebSocket-Version: 13\r\n"
+                        "Sec-WebSocket-Protocol: arduino\r\n"
+                        "Sec-WebSocket-Key: " + client->cKey + "\r\n";
 
     if(client->cExtensions.length() > 0) {
-        client->tcp.write("Sec-WebSocket-Extensions: ");
-        client->tcp.write(client->cExtensions.c_str(), client->cExtensions.length());
-        client->tcp.write("\r\n");
+        handshake += "Sec-WebSocket-Extensions: " + client->cExtensions + "\r\n";
     }
 
-    // Header end wait for Server response
-    client->tcp.write("\r\n");
+    handshake += "\r\n";
+
+    client->tcp.write(handshake.c_str(), handshake.length());
 
     DEBUG_WEBSOCKETS("[WS-Client][sendHeader] sending header... Done (%uus).\n", (micros() - start));
 
@@ -397,9 +384,7 @@ void WebSocketsClient::handleHeader(WSclient_t * client) {
 
             client->status = WSC_CONNECTED;
 
-            if(_cbEvent) {
-                _cbEvent(WStype_CONNECTED, (uint8_t *) client->cUrl.c_str(), client->cUrl.length());
-            }
+            runCbEvent(WStype_CONNECTED, (uint8_t *) client->cUrl.c_str(), client->cUrl.length());
 
         } else {
             DEBUG_WEBSOCKETS("[WS-Client][handleHeader] no Websocket connection close.\n");

src/WebSocketsClient.h

@@ -84,6 +84,18 @@ class WebSocketsClient: private WebSockets {
         void sendHeader(WSclient_t * client);
         void handleHeader(WSclient_t * client);
 
+        /**
+         * called for sending a Event to the app
+         * @param type WStype_t
+         * @param payload uint8_t *
+         * @param length size_t
+         */
+        virtual void runCbEvent(WStype_t type, uint8_t * payload, size_t length) {
+            if(_cbEvent) {
+                _cbEvent(type, payload, length);
+            }
+        }
+
 };
 
 #endif /* WEBSOCKETSCLIENT_H_ */

src/WebSocketsServer.cpp

@@ -265,9 +265,8 @@ void WebSocketsServer::messageRecived(WSclient_t * client, WSopcode_t opcode, ui
             break;
     }
 
-    if(_cbEvent) {
-        _cbEvent(client->num, type, payload, lenght);
-    }
+    runCbEvent(client->num, type, payload, lenght);
+
 }
 
 /**
@@ -292,9 +291,8 @@ void WebSocketsServer::clientDisconnect(WSclient_t * client) {
 
     DEBUG_WEBSOCKETS("[WS-Server][%d] client disconnected.\n", client->num);
 
-    if(_cbEvent) {
-        _cbEvent(client->num, WStype_DISCONNECTED, NULL, 0);
-    }
+    runCbEvent(client->num, WStype_DISCONNECTED, NULL, 0);
+
 }
 
 /**
@@ -488,9 +486,7 @@ void WebSocketsServer::handleHeader(WSclient_t * client) {
             // send ping
             WebSockets::sendFrame(client, WSop_ping);
 
-            if(_cbEvent) {
-                _cbEvent(client->num, WStype_CONNECTED, (uint8_t *) client->cUrl.c_str(), client->cUrl.length());
-            }
+            runCbEvent(client->num, WStype_CONNECTED, (uint8_t *) client->cUrl.c_str(), client->cUrl.length());
 
         } else {
             handleNonWebsocketConnection(client);

src/WebSocketsServer.h

@@ -126,6 +126,19 @@ protected:
             clientDisconnect(client);
         }
 
+        /**
+         * called for sending a Event to the app
+         * @param num uint8_t
+         * @param type WStype_t
+         * @param payload uint8_t *
+         * @param length size_t
+         */
+        virtual void runCbEvent(uint8_t num, WStype_t type, uint8_t * payload, size_t length) {
+            if(_cbEvent) {
+                _cbEvent(num, type, payload, length);
+            }
+        }
+
 };
 
 

tests/webSocket.html

@@ -2,11 +2,16 @@
 <head>
 
 <script>
-var connection = new WebSocket('ws://10.11.2.2:81/test', ['arduino']);
+var connection = new WebSocket('ws://10.11.2.1:81/', ['arduino']);
 
 connection.onopen = function () {
 	connection.send('Message from Browser to ESP8266 yay its Working!! ' + new Date()); 
 	connection.send('ping');
+	
+	setInterval(function() {
+		connection.send('Time: ' + new Date()); 
+	}, 20);
+
 };
 
 connection.onerror = function (error) {
@@ -17,14 +22,26 @@ connection.onmessage = function (e) {
 	console.log('Server: ', e.data);
 };
 
-setInterval(function() {
-	connection.send('Time: ' + new Date()); 
-}, 1000);
+function sendRGB() {
+	var r = parseInt(document.getElementById('r').value).toString(16);
+	var g = parseInt(document.getElementById('g').value).toString(16);
+	var b = parseInt(document.getElementById('b').value).toString(16);
+	if(r.length < 2) { r = '0' + r; }
+	if(g.length < 2) { g = '0' + g; }
+	if(b.length < 2) { b = '0' + b; }
+	var rgb = '#'+r+g+b;
+	console.log('RGB: ' + rgb);
+	connection.send(rgb); 
+}
 
 </script>
 
 </head>
 <body>
-Test Websocket.
+LED Control:<br/>
+<br/>
+R: <input id="r" type="range" min="0" max="255" step="1" onchange="sendRGB();" /><br/>
+G: <input id="g" type="range" min="0" max="255" step="1" onchange="sendRGB();" /><br/>
+B: <input id="b" type="range" min="0" max="255" step="1" onchange="sendRGB();" /><br/>
 </body>
 </html>