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

Add single setServer func in place of port/ip/domain

Browse Source
This commit is contained in:
Nick O'Leary 2015-08-26 22:15:19 +01:00
parent 5418f32458
commit 3852808aac
2 changed files with 29 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
PubSubClient/PubSubClient.cpp
View File

@ -11,41 +11,33 @@ PubSubClient::PubSubClient() {
this->_client = NULL; this->_client = NULL;
this->stream = NULL; this->stream = NULL;
setCallback(NULL); setCallback(NULL);
setPort(1883);
setBrokerDomain(NULL);
} }
PubSubClient::PubSubClient(uint8_t *ip, uint16_t port, void (*callback)(char*,uint8_t*,unsigned int), Client& client) { PubSubClient::PubSubClient(uint8_t *ip, uint16_t port, void (*callback)(char*,uint8_t*,unsigned int), Client& client) {
setClient(client); setClient(client);
setCallback(callback); setCallback(callback);
setBrokerIP(ip); setServer(ip, port);
setPort(port);
setBrokerDomain(NULL);
this->stream = NULL; this->stream = NULL;
} }
PubSubClient::PubSubClient(char* domain, uint16_t port, void (*callback)(char*,uint8_t*,unsigned int), Client& client) { PubSubClient::PubSubClient(char* domain, uint16_t port, void (*callback)(char*,uint8_t*,unsigned int), Client& client) {
setClient(client); setClient(client);
setCallback(callback); setCallback(callback);
setBrokerDomain(domain); setServer(domain,port);
setPort(port);
this->stream = NULL; this->stream = NULL;
} }
PubSubClient::PubSubClient(uint8_t *ip, uint16_t port, void (*callback)(char*,uint8_t*,unsigned int), Client& client, Stream& stream) { PubSubClient::PubSubClient(uint8_t *ip, uint16_t port, void (*callback)(char*,uint8_t*,unsigned int), Client& client, Stream& stream) {
setClient(client); setClient(client);
setCallback(callback); setCallback(callback);
setBrokerIP(ip); setServer(ip,port);
setPort(port);
setBrokerDomain(NULL);
setStream(stream); setStream(stream);
} }
PubSubClient::PubSubClient(char* domain, uint16_t port, void (*callback)(char*,uint8_t*,unsigned int), Client& client, Stream& stream) { PubSubClient::PubSubClient(char* domain, uint16_t port, void (*callback)(char*,uint8_t*,unsigned int), Client& client, Stream& stream) {
setClient(client); setClient(client);
setCallback(callback); setCallback(callback);
setBrokerDomain(domain); setServer(domain,port);
setPort(port);
setStream(stream); setStream(stream);
} }
@ -428,23 +420,20 @@ boolean PubSubClient::connected() {
return rc; return rc;
} }
void PubSubClient::setBrokerIP(uint8_t * ip){ void PubSubClient::setServer(uint8_t * ip, uint16_t port) {
this->domain = NULL; this->ip = ip;
this->ip = ip; this->port = port;
} }
void PubSubClient::setBrokerDomain(char * domain){ void PubSubClient::setServer(char * domain, uint16_t port) {
this->domain = domain; this->domain = domain;
this->port = port;
} }
void PubSubClient::setCallback(void(*callback)(char*,uint8_t*,unsigned int)){ void PubSubClient::setCallback(void(*callback)(char*,uint8_t*,unsigned int)){
this->callback = callback; this->callback = callback;
} }
void PubSubClient::setPort(uint16_t port){
this->port = port;
}
void PubSubClient::setClient(Client& client){ void PubSubClient::setClient(Client& client){
this->_client = &client; this->_client = &client;
} }

5
PubSubClient/PubSubClient.h
View File

@ -62,10 +62,9 @@ public:
PubSubClient(char*, uint16_t, void(*)(char*,uint8_t*,unsigned int),Client& client); PubSubClient(char*, uint16_t, void(*)(char*,uint8_t*,unsigned int),Client& client);
PubSubClient(char*, uint16_t, void(*)(char*,uint8_t*,unsigned int),Client& client, Stream&); PubSubClient(char*, uint16_t, void(*)(char*,uint8_t*,unsigned int),Client& client, Stream&);
void setBrokerIP(uint8_t * ip); void setServer(uint8_t * ip, uint16_t port);
void setBrokerDomain(char * domain); void setServer(char * domain, uint16_t port);
void setCallback(void(*callback)(char*,uint8_t*,unsigned int)); void setCallback(void(*callback)(char*,uint8_t*,unsigned int));
void setPort(uint16_t port);
void setClient(Client& client); void setClient(Client& client);
void setStream(Stream& stream); void setStream(Stream& stream);