:)
Dependencies: MbedJSONValue DebounceIn TextLCD USBDevice mbed WebSocketClient cc3000_hostdriver_mbedsocket Adafruit_LEDBackpack_2
Diff: main.cpp
- Revision:
- 18:f7a00c31ff58
- Parent:
- 17:fcc378db08f4
- Child:
- 19:fea62e9c1ac4
--- a/main.cpp Tue Dec 09 22:27:02 2014 +0000 +++ b/main.cpp Wed Dec 10 01:25:43 2014 +0000 @@ -114,7 +114,8 @@ sprintf(rowvoltage,"%.1f",vddval); add_to_json(rowvoltage,json_str); add_to_json(", \"selected\":",json_str); - sprintf(rowvoltage,"%d",selected); + sprintf(row,"%d",selected); + add_to_json(row,json_str); add_to_json(", \"rows\": [",json_str); int append_comma = 0; for (int i= 0; i < 48; i++) { @@ -286,10 +287,14 @@ } else { pc.printf("IP address: %s \r\n", wifi.getIPAddress()); } - } else { + } + /* + else { Websocket ws("ws://sockets.mbed.org/ws/toastboard/rw"); ws.connect(); } + */ + pc.printf("Okay took care of wifi stuff\r\n"); @@ -307,6 +312,7 @@ rowselect = rowselect-1; moved = 1; written = 0; + pc.printf("moved up\r\n"); wait(0.3); } @@ -314,6 +320,7 @@ rowselect = rowselect+1; moved = 1; written = 0; + pc.printf("moved down\r\n"); wait(0.3); } @@ -322,6 +329,7 @@ ledbar_right.clear(); moved =1; written = 0; + pc.printf("moved left\r\n"); wait(0.3); } @@ -330,6 +338,7 @@ ledbar_left.clear(); moved =1; written = 0; + pc.printf("moved right\r\n"); wait(0.3); } @@ -342,6 +351,7 @@ } selected = (colselect * 24) + (rowselect+1); + pc.printf("selected is %d\r\n",selected); //Implementing scanning @@ -400,13 +410,22 @@ // send data to websocket if (wifi.is_connected()) { + Websocket ws("ws://sockets.mbed.org/ws/toastboard/rw"); + ws.connect(); + pc.printf("create json string with vdd %.1f, selected %d\r\n",vddval,selected); std::string json = build_json(vddval,selected,clientdata); + pc.printf("declare writable\r\n"); char * writable = new char[json.size() + 1]; + pc.printf("copy json string into writable\r\n"); std::copy(json.begin(), json.end(), writable); + pc.printf("add string delimiter to writable\r\n"); writable[json.size()] = '\0'; + pc.printf("send writable to ws\r\n"); + pc.printf(writable); + pc.printf("\r\n"); ws.send(writable); + pc.printf("deallocate writable\r\n"); delete[] writable; - delete[] &json; } @@ -422,7 +441,7 @@ - + pc.printf("end of while loop!\r\n");