Fix reference time setting issue.

mobizt · Sep 11, 2023 · 109775e · 109775e
1 parent 369e036
commit 109775e
Show file tree

Hide file tree

Showing 33 changed files with 57 additions and 52 deletions.
diff --git a/examples/ExternalClient/Generic/Basic/Basic.ino b/examples/ExternalClient/Generic/Basic/Basic.ino
@@ -20,19 +20,15 @@
 // Provide the RTDB payload printing info and other helper functions.
 #include <addons/RTDBHelper.h>
 
-/* 1. Define the WiFi credentials */
-#define WIFI_SSID "WIFI_AP"
-#define WIFI_PASSWORD "WIFI_PASSWORD"
-
 // For the following credentials, see examples/Authentications/SignInAsUser/EmailPassword/EmailPassword.ino
 
-/* 2. Define the API Key */
+/* 1. Define the API Key */
 #define API_KEY "API_KEY"
 
-/* 3. Define the RTDB URL */
+/* 2. Define the RTDB URL */
 #define DATABASE_URL "URL" //<databaseName>.firebaseio.com or <databaseName>.<region>.firebasedatabase.app
 
-/* 4. Define the user Email and password that alreadey registerd or added in your project */
+/* 3. Define the user Email and password that alreadey registerd or added in your project */
 #define USER_EMAIL "USER_EMAIL"
 #define USER_PASSWORD "USER_PASSWORD"
 

diff --git a/examples/ExternalClient/Generic/StreamCallback/StreamCallback.ino b/examples/ExternalClient/Generic/StreamCallback/StreamCallback.ino
@@ -19,19 +19,15 @@
 // Provide the RTDB payload printing info and other helper functions.
 #include <addons/RTDBHelper.h>
 
-/* 1. Define the WiFi credentials */
-#define WIFI_SSID "WIFI_AP"
-#define WIFI_PASSWORD "WIFI_PASSWORD"
-
 // For the following credentials, see examples/Authentications/SignInAsUser/EmailPassword/EmailPassword.ino
 
-/* 2. Define the API Key */
+/* 1. Define the API Key */
 #define API_KEY "API_KEY"
 
-/* 3. Define the RTDB URL */
+/* 2. Define the RTDB URL */
 #define DATABASE_URL "URL" //<databaseName>.firebaseio.com or <databaseName>.<region>.firebasedatabase.app
 
-/* 4. Define the user Email and password that alreadey registerd or added in your project */
+/* 3. Define the user Email and password that alreadey registerd or added in your project */
 #define USER_EMAIL "USER_EMAIL"
 #define USER_PASSWORD "USER_PASSWORD"
 

diff --git a/library.json b/library.json
@@ -1,6 +1,6 @@
 {
   "name": "Firebase ESP8266 Client",
-  "version": "4.4.1",
+  "version": "4.4.2",
   "keywords": "communication, REST, esp8266, arduino",
   "description": "The secure, fast and reliable Firebase Realtime database library to read, store, update, delete, listen, backup, and restore data. You can also read and modify the database security rules with this library.",
   "repository": {

diff --git a/library.properties b/library.properties
@@ -1,6 +1,6 @@
 name=Firebase ESP8266 Client
 
-version=4.4.1
+version=4.4.2
 
 author=Mobizt
 

diff --git a/src/FB_Const.h b/src/FB_Const.h
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40401)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40402)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/FB_Error.h b/src/FB_Error.h
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40401)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40402)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/FB_Network.h b/src/FB_Network.h
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40401)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40402)
 #error "Mixed versions compilation."
 #endif
 
@@ -17,6 +17,10 @@
 #include <esp_idf_version.h>
 #endif
 
+#if __has_include(<IPAddress.h>)
+#include <IPAddress.h>
+#endif
+
 #if defined(ESP8266) || defined(MB_ARDUINO_PICO)
 
 #include <string>

diff --git a/src/FB_Utils.h b/src/FB_Utils.h
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40401)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40402)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/Firebase.cpp b/src/Firebase.cpp
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40401)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40402)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/Firebase.h b/src/Firebase.h
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40401)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40402)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/FirebaseFS.h b/src/FirebaseFS.h
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40401)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40402)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/client/FB_TCP_Client.h b/src/client/FB_TCP_Client.h
@@ -1087,14 +1087,6 @@ class Firebase_TCP_Client : public Client
     return _network_status;
   }
 
-  bool wifiConnected()
-  {
-#if defined(FIREBASE_WIFI_MODULE_IS_AVAILABLE)
-    _network_status = Ethernet.linkStatus() == LinkON;
-#endif
-    return _network_status;
-  }
-
   int setOption(int option, int *value)
   {
 #if defined(ESP32) && defined(FIREBASE_WIFI_IS_AVAILABLE)

diff --git a/src/client/SSLClient/client/stm32_time_fix.c b/src/client/SSLClient/client/stm32_time_fix.c
@@ -0,0 +1,16 @@
+
+// _gettimeofday link missing in STM32 
+
+#if defined(ARDUINO_ARCH_STM32)
+
+#include <sys/time.h>
+
+__attribute__((weak)) int _gettimeofday(struct timeval *tv, void *ignore __attribute__((unused)))
+{
+    uint64_t t = 0;
+    tv->tv_sec = t / 1000000000;
+    tv->tv_usec = (t % 1000000000) / 1000;
+    return 0;
+}
+
+#endif
diff --git a/src/core/FirebaseCore.cpp b/src/core/FirebaseCore.cpp
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40401)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40402)
 #error "Mixed versions compilation."
 #endif
 
@@ -683,6 +683,7 @@ void FirebaseCore::tokenProcessingTask()
     {
 
         FBUtils::idle();
+        internal.fb_clock_rdy = timeReady();
 
         if (!internal.fb_clock_rdy && (config->cert.data != NULL || config->cert.file.length() > 0 || config->signer.tokens.token_type == token_type_oauth2_access_token || config->signer.tokens.token_type == token_type_custom_token))
         {

diff --git a/src/core/FirebaseCore.h b/src/core/FirebaseCore.h
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40401)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40402)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/core/Firebase_Client_Version.h b/src/core/Firebase_Client_Version.h
@@ -1,6 +1,6 @@
 #ifndef FIREBASE_CLIENT_VERSION
-#define FIREBASE_CLIENT_VERSION "4.4.1"
-#define FIREBASE_CLIENT_VERSION_NUM 40401
+#define FIREBASE_CLIENT_VERSION "4.4.2"
+#define FIREBASE_CLIENT_VERSION_NUM 40402
 
 /* The inconsistent file version checking to prevent mixed versions compilation. */
 #define FIREBASE_CLIENT_VERSION_CHECK(ver) (ver == FIREBASE_CLIENT_VERSION_NUM)

diff --git a/src/message/FCM.cpp b/src/message/FCM.cpp
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40401)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40402)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/message/FCM.h b/src/message/FCM.h
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40401)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40402)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/message/LFCM.h b/src/message/LFCM.h
@@ -1,6 +1,6 @@
 
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40401)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40402)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/rtdb/FB_RTDB.cpp b/src/rtdb/FB_RTDB.cpp
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40401)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40402)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/rtdb/FB_RTDB.h b/src/rtdb/FB_RTDB.h
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40401)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40402)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/rtdb/QueryFilter.cpp b/src/rtdb/QueryFilter.cpp
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40401)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40402)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/rtdb/QueryFilter.h b/src/rtdb/QueryFilter.h
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40401)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40402)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/rtdb/QueueInfo.cpp b/src/rtdb/QueueInfo.cpp
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40401)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40402)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/rtdb/QueueInfo.h b/src/rtdb/QueueInfo.h
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40401)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40402)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/rtdb/QueueManager.cpp b/src/rtdb/QueueManager.cpp
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40401)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40402)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/rtdb/QueueManager.h b/src/rtdb/QueueManager.h
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40401)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40402)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/rtdb/stream/FB_MP_Stream.cpp b/src/rtdb/stream/FB_MP_Stream.cpp
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40401)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40402)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/rtdb/stream/FB_MP_Stream.h b/src/rtdb/stream/FB_MP_Stream.h
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40401)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40402)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/rtdb/stream/FB_Stream.cpp b/src/rtdb/stream/FB_Stream.cpp
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40401)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40402)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/rtdb/stream/FB_Stream.h b/src/rtdb/stream/FB_Stream.h
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40401)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40402)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/session/FB_Session.cpp b/src/session/FB_Session.cpp
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40401)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40402)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/session/FB_Session.h b/src/session/FB_Session.h
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40401)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40402)
 #error "Mixed versions compilation."
 #endif