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

27
PubSubClient/PubSubClient.cpp
View File

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