Arianna autonomous DAQ firmware

Dependencies:   mbed SDFileSystemFilinfo AriSnProtocol NetServicesMin AriSnComm MODSERIAL PowerControlClkPatch DS1820OW

Revision:
1:e392595b4b76
Parent:
0:664899e0b988
Child:
2:e67f7c158087
--- a/Websocket.h	Sat Jun 30 02:03:51 2012 +0000
+++ b/Websocket.h	Fri Jul 20 19:04:02 2012 +0000
@@ -144,7 +144,7 @@
         *
         *@return true if the connection is established, false otherwise
         */
-        bool connect(Timer* stop=0, const uint32_t timeout=3);
+        bool connect(const uint32_t timeout=3);
         
         /**
         * Send a string according to the websocket format
@@ -164,7 +164,7 @@
         *
         * @return true if a string has been read, false otherwise
         */
-        bool read(char * message, Timer* timer=0, const uint32_t timeout=3);
+        bool read(char * message, const uint32_t timeout=3);
         
         /**
         * To see if there is a websocket connection active