diff --git a/Adafruit_MQTT.cpp b/Adafruit_MQTT.cpp index 29169a6..b5836f4 100644 --- a/Adafruit_MQTT.cpp +++ b/Adafruit_MQTT.cpp @@ -232,6 +232,20 @@ int8_t Adafruit_MQTT::connect() { return 0; } +int8_t Adafruit_MQTT::connect(const char *user, const char *pass) +{ + username = user; + password = pass; + return connect(); +} + +int8_t Adafruit_MQTT::connect(const __FlashStringHelper *user, const __FlashStringHelper *pass) +{ + username = (const char*)user; + password = (const char*)pass; + return connect(); +} + uint16_t Adafruit_MQTT::processPacketsUntil(uint8_t *buffer, uint8_t waitforpackettype, uint16_t timeout) { uint16_t len; while (len = readFullPacket(buffer, MAXBUFFERSIZE, timeout)) { diff --git a/Adafruit_MQTT.h b/Adafruit_MQTT.h index 8cfbfa2..dbdecb0 100644 --- a/Adafruit_MQTT.h +++ b/Adafruit_MQTT.h @@ -133,8 +133,8 @@ class Adafruit_MQTT { const __FlashStringHelper *pass); Adafruit_MQTT(const char *server, uint16_t port, - const char *user, - const char *pass); + const char *user = "", + const char *pass = ""); Adafruit_MQTT(const __FlashStringHelper *server, uint16_t port, const __FlashStringHelper *user, @@ -153,6 +153,8 @@ class Adafruit_MQTT { // Use connectErrorString() to get a printable string version of the // error. int8_t connect(); + int8_t connect(const char *user, const char *pass); + int8_t connect(const __FlashStringHelper *user, const __FlashStringHelper *pass); // Return a printable string version of the error code returned by // connect(). This returns a __FlashStringHelper*, which points to a diff --git a/Adafruit_MQTT_CC3000.h b/Adafruit_MQTT_CC3000.h index 2270f06..e460eef 100644 --- a/Adafruit_MQTT_CC3000.h +++ b/Adafruit_MQTT_CC3000.h @@ -44,7 +44,7 @@ class Adafruit_MQTT_CC3000 : public Adafruit_MQTT { {} Adafruit_MQTT_CC3000(Adafruit_CC3000 *cc3k, const char *server, uint16_t port, - const char *user, const char *pass): + const char *user = "", const char *pass = ""): Adafruit_MQTT(server, port, user, pass), cc3000(cc3k) {} diff --git a/Adafruit_MQTT_Client.h b/Adafruit_MQTT_Client.h index f51cb29..12fdac5 100644 --- a/Adafruit_MQTT_Client.h +++ b/Adafruit_MQTT_Client.h @@ -42,7 +42,7 @@ class Adafruit_MQTT_Client : public Adafruit_MQTT { {} Adafruit_MQTT_Client(Client *client, const char *server, uint16_t port, - const char *user, const char *pass): + const char *user="", const char *pass=""): Adafruit_MQTT(server, port, user, pass), client(client) {} diff --git a/Adafruit_MQTT_FONA.h b/Adafruit_MQTT_FONA.h index ac6acda..738b3c5 100644 --- a/Adafruit_MQTT_FONA.h +++ b/Adafruit_MQTT_FONA.h @@ -42,7 +42,7 @@ class Adafruit_MQTT_FONA : public Adafruit_MQTT { {} Adafruit_MQTT_FONA(Adafruit_FONA *f, const char *server, uint16_t port, - const char *user, const char *pass): + const char *user="", const char *pass=""): Adafruit_MQTT(server, port, user, pass), fona(f) {}