bug fixed for #64.

update connect() method(only 3 pattern).
hirotakaster · Jun 26, 2017 · c469b35 · c469b35
1 parent a820dd9
commit c469b35
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 # MQTT for Photon, Spark Core
-<a href="http://mqtt.org/" target=_blank>MQTT</a> publish/subscribe library for Photon, Spark Core version 0.4.20.
+<a href="http://mqtt.org/" target=_blank>MQTT</a> publish/subscribe library for Photon, Spark Core version 0.4.21.
 
 ## Source Code
 This lightweight library source code are only 2 files. firmware -> MQTT.cpp, MQTT.h.

diff --git a/library.properties b/library.properties
@@ -1,5 +1,5 @@
 name=MQTT
-version=0.4.20
+version=0.4.21
 license=MIT
 author=hirotakaster
 url=https://github.com/hirotakaster/MQTT/

diff --git a/src/MQTT.cpp b/src/MQTT.cpp
@@ -90,20 +90,13 @@ void MQTT::addQosCallback(void (*qoscallback)(unsigned int)) {
  this->qoscallback = qoscallback;
 }
 
+
 bool MQTT::connect(const char *id) {
- return connect(id,NULL,NULL,0,QOS0,0,0);
+ return connect(id, NULL, NULL, 0, QOS0, 0, 0, true);
 }
 
 bool MQTT::connect(const char *id, const char *user, const char *pass) {
- return connect(id,user,pass,0,QOS0,0,0);
-}
-
-bool MQTT::connect(const char *id, const char* willTopic, EMQTT_QOS willQos, uint8_t willRetain, const char* willMessage) {
- return connect(id,NULL,NULL,willTopic,willQos,willRetain,willMessage);
-}
-
-bool MQTT::connect(const char *id, const char *user, const char *pass, const char* willTopic, EMQTT_QOS willQos, uint8_t willRetain, const char* willMessage) {
- return connect(id,NULL,NULL,willTopic,willQos,willRetain,willMessage,true);
+ return connect(id, user, pass, 0, QOS0, 0, 0, true);
 }
 
 bool MQTT::connect(const char *id, const char *user, const char *pass, const char* willTopic, EMQTT_QOS willQos, uint8_t willRetain, const char* willMessage, bool cleanSession) {

diff --git a/src/MQTT.h b/src/MQTT.h
@@ -151,8 +151,6 @@ typedef enum {
 
  bool connect(const char *id);
  bool connect(const char *id, const char *user, const char *pass);
- bool connect(const char *id, const char *user, EMQTT_QOS, uint8_t, const char *pass);
- bool connect(const char *id, const char *user, const char *pass, const char* willTopic, EMQTT_QOS willQos, uint8_t willRetain, const char* willMessage);
  bool connect(const char *id, const char *user, const char *pass, const char* willTopic, EMQTT_QOS willQos, uint8_t willRetain, const char* willMessage, bool cleanSession);
  void disconnect();