wn/pubsubclient
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	PubSubClient/PubSubClient.cpp
	PubSubClient/PubSubClient.h
This commit is contained in:
Nicholas O'Leary 2012-03-08 22:11:28 +00:00
commit ee378802a9
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
PubSubClient/PubSubClient.cpp
View File

@ -5,8 +5,8 @@
*/
#include "PubSubClient.h"
#include "EthernetClient.h"
#include "string.h"
#include <EthernetClient.h>
#include <string.h>
PubSubClient::PubSubClient() : _client() {
}
@ -16,13 +16,28 @@ PubSubClient::PubSubClient(uint8_t *ip, uint16_t port, void (*callback)(char*,ui
this->ip = ip;
this->port = port;
}
PubSubClient::PubSubClient(char* domain, uint16_t port, void (*callback)(char*,uint8_t*,unsigned int)) : _client() {
this->callback = callback;
this->domain = domain;
this->port = port;
}
boolean PubSubClient::connect(char *id) {
return connect(id,0,0,0,0);
}
boolean PubSubClient::connect(char *id, char* willTopic, uint8_t willQos, uint8_t willRetain, char* willMessage) {
if (!connected()) {
if (_client.connect(this->ip, this->port)) {
int result = 0;
if (domain != NULL) {
result = _client.connect(this->domain, this->port);
} else {
result = _client.connect(this->ip, this->port);
}
if (result) {
nextMsgId = 1;
uint8_t d[9] = {0x00,0x06,'M','Q','I','s','d','p',MQTTPROTOCOLVERSION};
uint8_t length = 0;

2
PubSubClient/PubSubClient.h
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();