Coordinator v2

Dependencies:   NerfUSXbee PinDetect EthernetInterface JSON MFRC522 WebSocketClient mbed-rtos mbed

Revision:
2:019d8848cf7e
Parent:
1:e1c5259b7d9a
--- a/includes/serverEvents.hpp	Mon Apr 10 15:02:24 2017 -0400
+++ b/includes/serverEvents.hpp	Tue Apr 11 12:40:05 2017 -0400
@@ -31,7 +31,7 @@
     toPc("Connecting to websocket url: \"ws://1.0.0.1:8080/\"");
     ws.connect();
     if (ws.is_connected()) {
-        ws.send("{\"event\":\"mbed\",\"data\":\"{\"state\": \"connected\"}\"}");
+        ws.send("{\"event\":\"mbed\",\"data\":{\"state\": \"connected\"}}");
     }
 }
 
@@ -91,16 +91,13 @@
         sprintf(msgBuffer, "{"
             "\"event\":\"%s\","
             "\"data\":{"
-                "\"allies\": %i,"
-                "\"enemies\": %i,"
                 "\"targets\": %i,"
                 "\"averageReflexTime\": %i,"
                 "\"gameLength\": %i,"
                 "\"score\": %i"
             "}"
-        "}", event->event, event->data.allies, event->data.enemies, 
-        event->data.targets, event->data.averageReflexTime, event->data.gameLength, 
-        event->data.score);
+        "}", event->event, event->data.targets, event->data.averageReflexTime, 
+        event->data.gameLength, event->data.score);
     }
 
     //toPc("Sending msg to websocket: %s", msgBuffer);