Merge branch 'master' of github.com:knolleary/pubsubclient

Conflicts:
	PubSubClient/PubSubClient.cpp
	PubSubClient/PubSubClient.h
This commit is contained in:
Nicholas O'Leary
2012-03-08 22:11:28 +00:00
2 changed files with 20 additions and 3 deletions

View File

@ -51,10 +51,12 @@ private:
boolean write(uint8_t header, uint8_t* buf, uint16_t length);
uint16_t writeString(char* string, uint8_t* buf, uint16_t pos);
uint8_t *ip;
char* domain;
uint16_t port;
public:
PubSubClient();
PubSubClient(uint8_t *, uint16_t, void(*)(char*,uint8_t*,unsigned int));
PubSubClient(char*, uint16_t, void(*)(char*,uint8_t*,unsigned int));
boolean connect(char *);
boolean connect(char*, char*, uint8_t, uint8_t, char*);
void disconnect();