Fix compilation error issue #76

mobizt · May 22, 2024 · 628ed73 · 628ed73
1 parent 489dedd
commit 628ed73
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 10 deletions.
diff --git a/library.json b/library.json
@@ -1,6 +1,6 @@
 {
   "name": "FirebaseClient",
-  "version": "1.2.4",
+  "version": "1.2.5",
   "keywords": "communication, REST, esp32, esp8266, arduino",
   "description": "Async Firebase Client library for Arduino.",
   "repository": {

diff --git a/library.properties b/library.properties
@@ -1,6 +1,6 @@
 name=FirebaseClient
 
-version=1.2.4
+version=1.2.5
 
 author=Mobizt
 

diff --git a/src/core/AsyncClient/AsyncClient.h b/src/core/AsyncClient/AsyncClient.h
@@ -1643,9 +1643,9 @@ class AsyncClientClass : public ResultBase, RTDBResultBase
 
             if (ret)
             {
-                String msg = FPSTR("Connected, IP: ");
-                msg += FIREBASE_ETHERNET_MODULE_CLASS_IMPL.localIP().toString();
-                setDebugBase(app_debug, msg);
+                String debug = FPSTR("Connected, IP: ");
+                debug += FIREBASE_ETHERNET_MODULE_CLASS_IMPL.localIP().toString();
+                setDebugBase(app_debug, debug);
             }
             else
             {
@@ -1663,7 +1663,12 @@ class AsyncClientClass : public ResultBase, RTDBResultBase
     bool ethernetConnected()
     {
 #if defined(FIREBASE_ETHERNET_MODULE_IS_AVAILABLE)
+#if defined(ENABLE_ETHERNET_NETWORK)
+        if (net.ethernet.conn_satatus != network_config_data::ethernet_conn_status_waits)
+            net.network_status = FIREBASE_ETHERNET_MODULE_CLASS_IMPL.linkStatus() == LinkON && validIP(FIREBASE_ETHERNET_MODULE_CLASS_IMPL.localIP());
+#else
         net.network_status = FIREBASE_ETHERNET_MODULE_CLASS_IMPL.linkStatus() == LinkON && validIP(FIREBASE_ETHERNET_MODULE_CLASS_IMPL.localIP());
+#endif
 #endif
         return net.network_status;
     }
@@ -1742,8 +1747,7 @@ class AsyncClientClass : public ResultBase, RTDBResultBase
         }
         else if (net.network_data_type == firebase_network_data_ethernet_network)
         {
-            if (net.ethernet.conn_satatus != network_config_data::ethernet_conn_status_waits)
-                net.network_status = ethernetConnected();
+            net.network_status = ethernetConnected();
         }
         // also check the native network before calling external cb
         else if (net.network_data_type == firebase_network_data_default_network || WiFI_CONNECTED || ethLinkUp())

diff --git a/src/core/AsyncResult/AppDebug.h b/src/core/AsyncResult/AppDebug.h
@@ -72,7 +72,7 @@ namespace firebase
 
         void setDebug(const String &msg)
         {
-            
+
             if (msg.length() == 0 || strcmp(last.c_str(), msg.c_str()) == 0)
                 return;
 

diff --git a/src/core/Core.h b/src/core/Core.h
@@ -7,7 +7,7 @@
 #undef FIREBASE_CLIENT_VERSION
 #endif
 
-#define FIREBASE_CLIENT_VERSION "1.2.4"
+#define FIREBASE_CLIENT_VERSION "1.2.5"
 
 static void sys_idle()
 {

diff --git a/src/core/NetConfig.h b/src/core/NetConfig.h
@@ -104,7 +104,7 @@ struct network_config_data
         ethernet_conn_status_rst_pin_selected,
         ethernet_conn_status_rst_pin_released,
         ethernet_conn_status_begin,
-        ethernet_conn_status_waits,
+        ethernet_conn_status_waits
     };
 
     // SPI Ethernet Module Data
-Original file line number
+Diff line change
@@ Expand Up / @@ -72,7 +72,7 @@ namespace firebase @@
             void setDebug(const String &msg)
             {
                 if (msg.length() == 0 || strcmp(last.c_str(), msg.c_str()) == 0)
                     return;
@@ Expand Down @@