Updated example esphttpd

Signed-off-by: Mikhail Grigorev <sleuthhound@gmail.com>
CHERTS · Dec 1, 2015 · b578081 · b578081
1 parent c451902
commit b578081
Show file tree

Hide file tree

Showing 35 changed files with 715 additions and 4,324 deletions.
diff --git a/Espressif/examples/esphttpd/Makefile b/Espressif/examples/esphttpd/Makefile
@@ -121,7 +121,7 @@ MODULES		= user
 EXTRA_INCDIR	= include libesphttpd/include
 
 # libraries used in this project, mainly provided by the SDK
-LIBS		= c gcc hal phy pp net80211 wpa main lwip crypto
+LIBS		= c gcc hal phy pp net80211 wpa main lwip
 #Add in esphttpd lib
 LIBS += esphttpd
 

diff --git a/Espressif/examples/esphttpd/html/cats/junge-katze-iv.jpg b/Espressif/examples/esphttpd/html/cats/junge-katze-iv.jpg
diff --git a/Espressif/examples/esphttpd/html/cats/kitten-loves-toy.jpg b/Espressif/examples/esphttpd/html/cats/kitten-loves-toy.jpg
diff --git a/Espressif/examples/esphttpd/html/index.tpl b/Espressif/examples/esphttpd/html/index.tpl
@@ -12,12 +12,15 @@ been loaded <b>%counter%</b> times.
 <li>If you haven't connected this device to your WLAN network now, you can <a href="/wifi">do so.</a></li>
 <li>You can also control the <a href="led.tpl">LED</a>.</li>
 <li>You can download the raw <a href="flash.bin">contents</a> of the SPI flash rom</li>
+<li>Esphttpd now also supports <a href="websocket/index.html">websockets</a>.</li>
 <li>And because I can, here's a link to my <a href="http://spritesmods.com/?f=esphttpd">website</a></ul>
 </ul>
 </p>
 
 <p>And because we're on the Internets now, here are the required pictures of cats:<br />
 <img src="cats/cross-eyed-cat.jpg"><br />
+<img src="cats/junge-katze-iv.jpg"><br />
+<img src="cats/kitten-loves-toy.jpg"><br />
 </p>
 </div>
 </body></html>
diff --git a/Espressif/examples/esphttpd/html/websocket/index.html b/Espressif/examples/esphttpd/html/websocket/index.html
@@ -0,0 +1,69 @@
+<!DOCTYPE html>
+
+<meta charset="utf-8" />
+
+<title>WebSocket Test</title>
+
+<script language="javascript" type="text/javascript">
+
+  var wsUri = "ws://"+window.location.host+"/websocket/ws.cgi";
+  var output;
+
+  function init()
+  {
+    output = document.getElementById("output");
+    testWebSocket();
+  }
+
+  function testWebSocket()
+  {
+    websocket = new WebSocket(wsUri);
+    websocket.onopen = function(evt) { onOpen(evt) };
+    websocket.onclose = function(evt) { onClose(evt) };
+    websocket.onmessage = function(evt) { onMessage(evt) };
+    websocket.onerror = function(evt) { onError(evt) };
+  }
+
+  function onOpen(evt)
+  {
+    writeToScreen("CONNECTED");
+    doSend("WebSocket rocks");
+  }
+
+  function onClose(evt)
+  {
+    writeToScreen("DISCONNECTED");
+  }
+
+  function onMessage(evt)
+  {
+    writeToScreen('<span style="color: blue;">RECEIVED: ' + evt.data+'</span>');
+//    websocket.close();
+  }
+
+  function onError(evt)
+  {
+    writeToScreen('<span style="color: red;">ERROR:</span> ' + evt.data);
+  }
+
+  function doSend(message)
+  {
+    writeToScreen("SENT: " + message); 
+    websocket.send(message);
+  }
+
+  function writeToScreen(message)
+  {
+    var pre = document.createElement("p");
+    pre.style.wordWrap = "break-word";
+    pre.innerHTML = message;
+    output.appendChild(pre);
+  }
+
+  window.addEventListener("load", init, false);
+
+</script>
+
+<h2>WebSocket Test</h2>
+
+<div id="output"></div>
diff --git a/Espressif/examples/esphttpd/include/user_config.h b/Espressif/examples/esphttpd/include/user_config.h
@@ -1,11 +1 @@
-#ifndef __USER_CONFIG_H__
-#define __USER_CONFIG_H__
 
-#define USE_WIFI_MODE		STATIONAP_MODE
-#define WIFI_CLIENTSSID		"MYAP"
-#define WIFI_CLIENTPASSWORD	"00000000"
-#define WIFI_AP_NAME		"ESP8266"
-#define WIFI_AP_PASSWORD	"00000000"
-#define PLATFORM_DEBUG		true
-
-#endif
diff --git a/Espressif/examples/esphttpd/lib/heatshrink/LICENSE b/Espressif/examples/esphttpd/lib/heatshrink/LICENSE
diff --git a/Espressif/examples/esphttpd/lib/heatshrink/Makefile b/Espressif/examples/esphttpd/lib/heatshrink/Makefile
diff --git a/Espressif/examples/esphttpd/lib/heatshrink/README.md b/Espressif/examples/esphttpd/lib/heatshrink/README.md
diff --git a/Espressif/examples/esphttpd/lib/heatshrink/dec_sm.dot b/Espressif/examples/esphttpd/lib/heatshrink/dec_sm.dot
diff --git a/Espressif/examples/esphttpd/lib/heatshrink/enc_sm.dot b/Espressif/examples/esphttpd/lib/heatshrink/enc_sm.dot