Fixed Serial Support

Author: geekbozu

NintendoWiSpy.js

@@ -92,7 +92,7 @@
             canvas = document.getElementById('myCanvas'),
             ctx = canvas.getContext('2d'),
             heartbeatMsg = 'pong',
-            socket = new ReconnectingWebsocket('ws://' + params.websocketserver + ':' + params.websockport, 'arduino');
+            socket = new ReconnectingWebsocket('ws://' + params.websocketserver + ':' + params.websockport);
         var heartbeatInterval = null,
             missedHeartbeats = 0,
             i,

firmware/src/firmware.ino

@@ -74,7 +74,7 @@ SerialCommands serial_commands_(&Serial, serial_command_buffer_, sizeof(serial_c
 
 ESP8266WebServer httpServer(80);
 ESP8266HTTPUpdateServer httpUpdater;
-WebSocketsServer webSocket = WebSocketsServer(18881);
+WebSocketsServer webSocket = WebSocketsServer(18881,"","");
 
 //This is the default handler, and gets called when no other command matches.
 void cmd_unrecognized(SerialCommands* sender, const char* cmd) {

run.py

@@ -1,5 +1,5 @@
 import logging
-import threading,sys,os,webbrowser
+import threading,sys,os,webbrowser,time
 import serial,serial.tools.list_ports
 import SimpleHTTPServer, BaseHTTPServer, SocketServer
 from websocket_server import WebsocketServer
@@ -18,11 +18,15 @@ def serialServerLoop():
         ser = serial.Serial(serialbox.get())
         ser.baudrate = SerialSpinBoxVar.get()
         ser.write('TS 1\n')
+        ctime = time.time()
         while serialServerRunning:
             server.handle_request()
             line = ser.readline()
             server.handle_request()
             server.send_message_to_all(line)
+            if (time.time() - ctime) > 4:
+                ctime = time.time()
+                server.send_message_to_all("pong")
         ser.write('TS 0\n')
         ser.close()
         server.server_close()
@@ -32,6 +36,20 @@ def serialServerLoop():
         serialToggle()
         return
 
+def serialToggle():
+    global serialServerRunning,server
+    if serialServerRunning:
+        SerialButton.configure(bg='#F00')
+        serialServerRunning = False
+    else:
+        server = WebsocketServer(WebSpinBoxVar.get(), host='127.0.0.1', loglevel=logging.INFO)
+        server.set_fn_new_client(new_client)
+        server.timeout = 0
+        serialServerRunning = True
+        serialthread = threading.Thread(target = serialServerLoop)
+        serialthread.daemon = True
+        serialthread.start()
+        SerialButton.configure(bg='#0F0')
 
 def httpToggle():
     global httpServerRunning
@@ -50,21 +68,6 @@ def httpToggle():
         httpthread.start()
         httpServerRunning = True
 
-def serialToggle():
-    global serialServerRunning,server
-    if serialServerRunning:
-        SerialButton.configure(bg='#F00')
-        serialServerRunning = False
-    else:
-        server = WebsocketServer(WebSpinBoxVar.get(), host='127.0.0.1', loglevel=logging.INFO)
-        server.set_fn_new_client(new_client)
-        server.timeout = 0
-        serialServerRunning = True
-        serialthread = threading.Thread(target = serialServerLoop)
-        serialthread.daemon = True
-        serialthread.start()
-        SerialButton.configure(bg='#0F0')
-
 def new_client(client,server):
     print "New client gotten ", client