Merge pull request #600 from blinker-iot/dev_3.0

update codes, fix ESP32 support codes.
blinker-iot · May 10, 2023 · 10ff617 · 10ff617
2 parents c20e2e2 + efde12b
commit 10ff617
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/library.json b/library.json
@@ -13,7 +13,7 @@
         "type": "git",
         "url": "https://github.com/blinker-iot/blinker-library.git"
     },
-    "version": "0.3.10",
+    "version": "0.3.10230510",
     "homepage": "https://diandeng.tech/home",
     "export": {
         "exclude": [

diff --git a/library.properties b/library.properties
@@ -1,5 +1,5 @@
 name=Blinker
-version=0.3.10
+version=0.3.10230510
 author=i3water
 maintainer=i3wawter
 sentence=Build a easy way for your IoT project.

diff --git a/src/Blinker/BlinkerConfig.h b/src/Blinker/BlinkerConfig.h
@@ -5,7 +5,7 @@
 // #include "Blinker/BlinkerUtility.h"
 #include "../Server/BlinkerServer.h"
 
-#define BLINKER_VERSION                 "0.3.10"
+#define BLINKER_VERSION                 "0.3.10230510"
 
 #define BLINKER_CONNECT_TIMEOUT_MS      10000UL
 

diff --git a/src/modules/mqtt/Adafruit_MQTT.cpp b/src/modules/mqtt/Adafruit_MQTT.cpp
@@ -276,16 +276,16 @@ uint16_t Adafruit_MQTT::readFullPacket(uint8_t *buffer, uint16_t maxsize, uint16
 #if defined(ESP32)
 const char* Adafruit_MQTT::connectErrorString(int8_t code) {
    switch (code) {
-      case 1: return F("The Server does not support the level of the MQTT protocol requested");
-      case 2: return F("The Client identifier is correct UTF-8 but not allowed by the Server");
-      case 3: return F("The MQTT service is unavailable");
-      case 4: return F("The data in the user name or password is malformed");
-      case 5: return F("Not authorized to connect");
-      case 6: return F("Exceeded reconnect rate limit. Please try again later.");
-      case 7: return F("You have been banned from connecting. Please contact the MQTT server administrator for more details.");
-      case -1: return F("Connection failed");
-      case -2: return F("Failed to subscribe");
-      default: return F("Unknown error");
+      case 1: return ("The Server does not support the level of the MQTT protocol requested");
+      case 2: return ("The Client identifier is correct UTF-8 but not allowed by the Server");
+      case 3: return ("The MQTT service is unavailable");
+      case 4: return ("The data in the user name or password is malformed");
+      case 5: return ("Not authorized to connect");
+      case 6: return ("Exceeded reconnect rate limit. Please try again later.");
+      case 7: return ("You have been banned from connecting. Please contact the MQTT server administrator for more details.");
+      case -1: return ("Connection failed");
+      case -2: return ("Failed to subscribe");
+      default: return ("Unknown error");
    }
 }
 #else