Arianna autonomous DAQ firmware

Dependencies:   mbed SDFileSystemFilinfo AriSnProtocol NetServicesMin AriSnComm MODSERIAL PowerControlClkPatch DS1820OW

Revision:
2:e67f7c158087
Parent:
1:e392595b4b76
Child:
3:24c5f0f50bf1
--- a/Websocket.h	Fri Jul 20 19:04:02 2012 +0000
+++ b/Websocket.h	Tue Jul 24 02:07:23 2012 +0000
@@ -154,8 +154,8 @@
         void send(char * str);
         
         // CJR: add ones for binary data
-        bool sendBinary(char* str, const uint32_t len);
-        bool sendBinary(FILE* f, const uint32_t nbytes);
+        bool sendBinary(const char* hbuf, const uint32_t hlen, char* str, const uint32_t len);
+        bool sendBinary(const char* hbuf, const uint32_t hlen, FILE* f, const uint32_t nbytes);
         
         /**
         * Read a websocket message
@@ -164,7 +164,7 @@
         *
         * @return true if a string has been read, false otherwise
         */
-        bool read(char * message, const uint32_t timeout=3);
+        bool read(char * message, uint32_t& len_msg, const uint32_t timeout=3);
         
         /**
         * To see if there is a websocket connection active