From d1db9d98101f7a78b07d28194bf07bd141dc8cde Mon Sep 17 00:00:00 2001 From: Cristian Maglie Date: Thu, 4 Jul 2013 17:14:33 +0200 Subject: Refactored YunClient and YunServer classes. Added YunClient.connect() methods. --- libraries/Bridge/YunServer.h | 50 +++----------------------------------------- 1 file changed, 3 insertions(+), 47 deletions(-) (limited to 'libraries/Bridge/YunServer.h') diff --git a/libraries/Bridge/YunServer.h b/libraries/Bridge/YunServer.h index 0a04886..7343924 100644 --- a/libraries/Bridge/YunServer.h +++ b/libraries/Bridge/YunServer.h @@ -16,12 +16,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef CONNECTOR_H_ -#define CONNECTOR_H_ +#ifndef _YUN_SERVER_H_ +#define _YUN_SERVER_H_ #include #include -#include class YunClient; @@ -45,47 +44,4 @@ private: BridgeClass &bridge; }; -class YunClient : public Client { -public: - // Constructor with a user provided BridgeClass instance - YunClient(int _h, BridgeClass &_b = Bridge); - YunClient(BridgeClass &_b = Bridge); - ~YunClient(); - - // Stream methods - // (read message) - virtual int available(); - virtual int read(); - virtual int read(uint8_t *buf, size_t size); - virtual int peek(); - // (write response) - virtual size_t write(uint8_t); - virtual size_t write(const uint8_t *buf, size_t size); - virtual void flush(); - // TODO: add optimized function for block write - - virtual operator bool () { return opened; } - - YunClient& operator=(const YunClient &_x); - - virtual void stop(); - virtual uint8_t connected(); - - virtual int connect(IPAddress ip, uint16_t port) { /* TODO */ }; - virtual int connect(const char *host, uint16_t port) { /* TODO */ }; - -private: - BridgeClass &bridge; - unsigned int handle; - boolean opened; - -private: - void doBuffer(); - uint8_t buffered; - uint8_t readPos; - static const int BUFFER_SIZE = 64; - uint8_t buffer[BUFFER_SIZE]; - -}; - -#endif // CONNECTOR_H_ +#endif // _YUN_SERVER_H_ -- cgit v1.2.3-18-g5258