From 28241b1d9d6bd48d5d8d7ed3cb7cd7b1064903d5 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 15 Sep 2023 09:58:42 +0700 Subject: [PATCH] Fix native Ethernet and Ethernet integration issues. --- README.md | 33 ++++++++++---------------- library.json | 2 +- library.properties | 2 +- src/FB_Const.h | 2 +- src/FB_Error.h | 2 +- src/FB_Network.h | 38 ++++++++++++++---------------- src/FB_Utils.h | 2 +- src/Firebase.cpp | 2 +- src/Firebase.h | 2 +- src/FirebaseFS.h | 4 +++- src/client/FB_TCP_Client.h | 13 ++++++---- src/core/FirebaseCore.cpp | 2 +- src/core/FirebaseCore.h | 2 +- src/core/Firebase_Client_Version.h | 4 ++-- src/firestore/FB_Firestore.cpp | 2 +- src/firestore/FB_Firestore.h | 2 +- src/functions/FB_Functions.cpp | 2 +- src/functions/FB_Functions.h | 2 +- src/functions/FunctionsConfig.cpp | 2 +- src/functions/FunctionsConfig.h | 2 +- src/functions/PocicyBuilder.cpp | 2 +- src/functions/PolicyBuilder.h | 2 +- src/gcs/GCS.cpp | 2 +- src/gcs/GCS.h | 2 +- src/message/FCM.cpp | 2 +- src/message/FCM.h | 2 +- src/message/LFCM.h | 2 +- src/rtdb/FB_RTDB.cpp | 2 +- src/rtdb/FB_RTDB.h | 2 +- src/rtdb/QueryFilter.cpp | 2 +- src/rtdb/QueryFilter.h | 2 +- src/rtdb/QueueInfo.cpp | 2 +- src/rtdb/QueueInfo.h | 2 +- src/rtdb/QueueManager.cpp | 2 +- src/rtdb/QueueManager.h | 2 +- src/rtdb/stream/FB_MP_Stream.cpp | 2 +- src/rtdb/stream/FB_MP_Stream.h | 2 +- src/rtdb/stream/FB_Stream.cpp | 2 +- src/rtdb/stream/FB_Stream.h | 2 +- src/session/FB_Session.cpp | 2 +- src/session/FB_Session.h | 2 +- src/storage/FCS.cpp | 2 +- src/storage/FCS.h | 2 +- 43 files changed, 82 insertions(+), 86 deletions(-) diff --git a/README.md b/README.md index 50319e86a..dfb20fc3d 100644 --- a/README.md +++ b/README.md @@ -5,13 +5,13 @@ ![arduino-library-badge](https://www.ardu-badge.com/badge/Firebase%20Arduino%20Client%20Library%20for%20ESP8266%20and%20ESP32.svg) ![PlatformIO](https://badges.registry.platformio.org/packages/mobizt/library/Firebase%20Arduino%20Client%20Library%20for%20ESP8266%20and%20ESP32.svg) -The managed, complete, fast and secure Firebase Client Library that supports most Arduino devices except for AVR. The following are platforms in which the libraries are also available (RTDB only). +This library provides Firebase Realtime database, Firebase Cloud Messaging, Cloud Firestore database, Firebase Storage, Google Cloud Storage and Cloud Functions for Firebase functions and supports most Arduino devices except for AVR devices that have resources and compiler limit. +This library can work with on-chip/on-board network (WiFi/Ethernet) and External network module via Client library. -* [Arduino MKR WiFi 1010, Arduino MKR VIDOR 4000 and Arduino UNO WiFi Rev.2](https://github.com/mobizt/Firebase-Arduino-WiFiNINA) - -* [Arduino WiFi Shield 101 and Arduino MKR1000 WIFI](https://github.com/mobizt/Firebase-Arduino-WiFi101) +The features can be configurable to add and exclude some unused features, see [Library Build Options](#library-build-options). +The [ESP8266 and Raspberry Pi Pico](https://github.com/mobizt/Firebase-ESP8266) and [ESP32](https://github.com/mobizt/Firebase-ESP32) versions are available which provide only Firebase Realtime database and Firebase Cloud Messaging functions. ## Contents @@ -115,31 +115,20 @@ The managed, complete, fast and secure Firebase Client Library that supports mos ## Features -* Supports most Arduino devices (except for AVR) +* Supports most Arduino devices (except for AVR) with or without external neywork module. + +* Supports most Firebase Services included Google Cloud Storage. -* Supports external Heap via SRAM/PSRAM in ESP8266 and ESP32. +* Supports external Heap using SRAM/PSRAM in ESP8266 and ESP32. * TinyGSMClient and Ethernet Client integration. * Faster server reconnection with SSL Session Resumption. -* Supports external network module. - -* Supports Firebase Realtime database. - -* Supports Cloud Firestore database. - -* Supports Firebase Storage. - -* Supports Google Cloud Storage. - -* Supports Firebase Cloud Messaging. - -* Supports Test Mode (No Auth). +* Supports Authentications and Test Mode (No Auth for some services). -* Supports Firmware OTA updates via RTDB, Firebase Storage and Google Cloud Storage. +* Supports Firmware OTA updates. -* Supports Cloud Functions for Firebase. ## Supported Devices. @@ -632,6 +621,7 @@ The following options are not yet defined in [**FirebaseFS.h**](src/FirebaseFS.h ```cpp FIREBASE_ETHERNET_MODULE_LIB `"EthernetLibrary.h"` // For the Ethernet library to work with external Ethernet module FIREBASE_ETHERNET_MODULE_CLASS EthernetClass // For the Ethernet class object of Ethernet library to work with external Ethernet module +FIREBASE_ETHERNET_MODULE_TIMEOUT 2000 // For the time out in milliseconds to wait external Ethernet module to connect to network ENABLE_ESP8266_ENC28J60_ETH // For native core library ENC28J60 Ethernet module support in ESP8266 ENABLE_ESP8266_W5500_ETH // For native core library W5500 Ethernet module support in ESP8266 ENABLE_ESP8266_W5100_ETH // For native core library W5100 Ethernet module support in ESP8266 @@ -659,6 +649,7 @@ For external Ethernet module integation used with function `setEthernetClient`, `FIREBASE_ETHERNET_MODULE_CLASS` is the name of static object defined from class e.g. `Ethernet`. +`FIREBASE_ETHERNET_MODULE_TIMEOUT` is the time out in milliseconds to wait network connection. For disabling predefined options instead of editing the [**FirebaseFS.h**](src/FirebaseFS.h) or using `#undef` in `CustomFirebaseFS.h`, you can define these build flags with these names or macros in `CustomFirebaseFS.h`. diff --git a/library.json b/library.json index 871cf8754..5a0d76223 100644 --- a/library.json +++ b/library.json @@ -1,6 +1,6 @@ { "name": "Firebase Arduino Client Library for ESP8266 and ESP32", - "version": "4.4.7", + "version": "4.4.8", "keywords": "communication, REST, esp32, esp8266, arduino", "description": "The library supports Firebase products e.g. Realtime database, Cloud Firestore database, Firebase Storage and Google Cloud Storage, Cloud Functions for Firebase and Cloud Messaging. The library also supported other Arduino devices using Clients interfaces e.g. WiFiClient, EthernetClient, and GSMClient.", "repository": { diff --git a/library.properties b/library.properties index ab31caaac..d2451923d 100644 --- a/library.properties +++ b/library.properties @@ -1,6 +1,6 @@ name=Firebase Arduino Client Library for ESP8266 and ESP32 -version=4.4.7 +version=4.4.8 author=Mobizt diff --git a/src/FB_Const.h b/src/FB_Const.h index fd6e367ff..2c6478e42 100644 --- 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(40407) +#if !FIREBASE_CLIENT_VERSION_CHECK(40408) #error "Mixed versions compilation." #endif diff --git a/src/FB_Error.h b/src/FB_Error.h index 81f3c5fe9..16933705d 100644 --- 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(40407) +#if !FIREBASE_CLIENT_VERSION_CHECK(40408) #error "Mixed versions compilation." #endif diff --git a/src/FB_Network.h b/src/FB_Network.h index 2d875230c..d23d360d4 100644 --- a/src/FB_Network.h +++ b/src/FB_Network.h @@ -1,10 +1,10 @@ #include "./core/Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40407) +#if !FIREBASE_CLIENT_VERSION_CHECK(40408) #error "Mixed versions compilation." #endif /** - * Created September 5, 2023 + * Created September 14, 2023 */ #ifndef FIREBASE_NETWORK_H #define FIREBASE_NETWORK_H @@ -71,7 +71,7 @@ #endif -#if defined(INC_ENC28J60_LWIP) && defined(INC_W5100_LWIP) && defined(INC_W5500_LWIP) +#if defined(INC_ENC28J60_LWIP) || defined(INC_W5100_LWIP) || defined(INC_W5500_LWIP) #define FIREBASE_ETH_IS_AVAILABLE #endif @@ -79,12 +79,15 @@ #endif + #if __has_include() || (defined(FIREBASE_ETHERNET_MODULE_LIB) && defined(FIREBASE_ETHERNET_MODULE_CLASS)) #if defined(ESP8266) #undef MAX_SOCK_NUM +#endif + +#if (defined(ESP8266) && defined(FIREBASE_DISABLE_NATIVE_ETHERNET)) || (!defined(ESP8266) && !defined(ARDUINO_NANO_RP2040_CONNECT)) -#if defined(FIREBASE_DISABLE_NATIVE_ETHERNET) #if defined(FIREBASE_ETHERNET_MODULE_LIB) && defined(FIREBASE_ETHERNET_MODULE_CLASS) #if __has_include(FIREBASE_ETHERNET_MODULE_LIB) @@ -100,33 +103,28 @@ #endif #if defined(ETH_MODULE_CLASS) + #define FIREBASE_ETHERNET_MODULE_IS_AVAILABLE -#endif +#if !defined(FIREBASE_ETHERNET_MODULE_TIMEOUT) +#define FIREBASE_ETHERNET_MODULE_TIMEOUT 2000 +#elif FIREBASE_ETHERNET_MODULE_TIMEOUT <= 0 || FIREBASE_ETHERNET_MODULE_TIMEOUT > 120 * 1000 +#undef FIREBASE_ETHERNET_MODULE_TIMEOUT +#define FIREBASE_ETHERNET_MODULE_TIMEOUT 2000 #endif -#undef MAX_SOCK_NUM -#elif !defined(ARDUINO_NANO_RP2040_CONNECT) -#if defined(FIREBASE_ETHERNET_MODULE_LIB) && defined(FIREBASE_ETHERNET_MODULE_CLASS) -#if __has_include(FIREBASE_ETHERNET_MODULE_LIB) -#include FIREBASE_ETHERNET_MODULE_LIB -#define ETH_MODULE_CLASS FIREBASE_ETHERNET_MODULE_CLASS -#elif __has_include() -#include -#define ETH_MODULE_CLASS Ethernet -#endif -#else -#include -#define ETH_MODULE_CLASS Ethernet #endif -#if defined(ETH_MODULE_CLASS) -#define FIREBASE_ETHERNET_MODULE_IS_AVAILABLE + #endif + +#if defined(ESP8266) +#undef MAX_SOCK_NUM #endif + #endif #if defined(ESP32) || defined(ESP8266) || defined(ARDUINO_RASPBERRY_PI_PICO_W) || \ diff --git a/src/FB_Utils.h b/src/FB_Utils.h index 709b4cfde..e5cecc944 100644 --- 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(40407) +#if !FIREBASE_CLIENT_VERSION_CHECK(40408) #error "Mixed versions compilation." #endif diff --git a/src/Firebase.cpp b/src/Firebase.cpp index 655d40061..228a283a0 100644 --- a/src/Firebase.cpp +++ b/src/Firebase.cpp @@ -1,5 +1,5 @@ #include "./core/Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40407) +#if !FIREBASE_CLIENT_VERSION_CHECK(40408) #error "Mixed versions compilation." #endif diff --git a/src/Firebase.h b/src/Firebase.h index e42fa6c06..998b8029c 100644 --- a/src/Firebase.h +++ b/src/Firebase.h @@ -1,5 +1,5 @@ #include "./core/Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40407) +#if !FIREBASE_CLIENT_VERSION_CHECK(40408) #error "Mixed versions compilation." #endif diff --git a/src/FirebaseFS.h b/src/FirebaseFS.h index 959d37df9..50047f660 100644 --- a/src/FirebaseFS.h +++ b/src/FirebaseFS.h @@ -1,5 +1,5 @@ #include "./core/Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40407) +#if !FIREBASE_CLIENT_VERSION_CHECK(40408) #error "Mixed versions compilation." #endif @@ -180,9 +180,11 @@ * - FIREBASE_ETHERNET_MODULE_LIB is the Ethernet library name with extension (.h) and * should be inside "" or <> e.g. "Ethernet.h". * - FIREBASE_ETHERNET_MODULE_CLASS is the name of static object defined from class e.g. Ethernet. + * - FIREBASE_ETHERNET_MODULE_TIMEOUT is the time out in milliseconds to wait network connection. * * #define FIREBASE_ETHERNET_MODULE_LIB "EthernetLib.h" * #define FIREBASE_ETHERNET_MODULE_CLASS EthernetClass + * #define FIREBASE_ETHERNET_MODULE_TIMEOUT 2000 * * 🏷️ For native core library ENC28J60 Ethernet module support in ESP8266 * #define ENABLE_ESP8266_ENC28J60_ETH diff --git a/src/client/FB_TCP_Client.h b/src/client/FB_TCP_Client.h index ebd3bfe33..15c2b585c 100644 --- a/src/client/FB_TCP_Client.h +++ b/src/client/FB_TCP_Client.h @@ -1,7 +1,7 @@ /** - * Firebase TCP Client v1.0.1 + * Firebase TCP Client v1.0.2 * - * Created September 11, 2023 + * Created September 14, 2023 * * The MIT License (MIT) * Copyright (c) 2022 K. Suwatchai (Mobizt) @@ -1055,7 +1055,7 @@ class Firebase_TCP_Client : public Client unsigned long to = millis(); - while (ETH_MODULE_CLASS.linkStatus() == LinkOFF && millis() - to < 2000) + while (ETH_MODULE_CLASS.linkStatus() == LinkOFF && millis() - to < FIREBASE_ETHERNET_MODULE_TIMEOUT) { delay(100); } @@ -1082,7 +1082,12 @@ class Firebase_TCP_Client : public Client bool ethernetConnected() { #if defined(FIREBASE_ETHERNET_MODULE_IS_AVAILABLE) - _network_status = ETH_MODULE_CLASS.linkStatus() == LinkON; + _network_status = ETH_MODULE_CLASS.linkStatus() == LinkON && validIP(ETH_MODULE_CLASS.localIP()); + if (!_network_status) + { + delay(FIREBASE_ETHERNET_MODULE_TIMEOUT); + _network_status = ETH_MODULE_CLASS.linkStatus() == LinkON && validIP(ETH_MODULE_CLASS.localIP()); + } #endif return _network_status; } diff --git a/src/core/FirebaseCore.cpp b/src/core/FirebaseCore.cpp index 1bdbe7efd..37dd55033 100644 --- 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(40407) +#if !FIREBASE_CLIENT_VERSION_CHECK(40408) #error "Mixed versions compilation." #endif diff --git a/src/core/FirebaseCore.h b/src/core/FirebaseCore.h index fa092fc56..3765a1774 100644 --- 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(40407) +#if !FIREBASE_CLIENT_VERSION_CHECK(40408) #error "Mixed versions compilation." #endif diff --git a/src/core/Firebase_Client_Version.h b/src/core/Firebase_Client_Version.h index a8c7be60c..3cf7333c0 100644 --- 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.7" -#define FIREBASE_CLIENT_VERSION_NUM 40407 +#define FIREBASE_CLIENT_VERSION "4.4.8" +#define FIREBASE_CLIENT_VERSION_NUM 40408 /* 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/firestore/FB_Firestore.cpp b/src/firestore/FB_Firestore.cpp index c215cedfc..cb7e200fd 100644 --- a/src/firestore/FB_Firestore.cpp +++ b/src/firestore/FB_Firestore.cpp @@ -1,5 +1,5 @@ #include "./core/Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40407) +#if !FIREBASE_CLIENT_VERSION_CHECK(40408) #error "Mixed versions compilation." #endif diff --git a/src/firestore/FB_Firestore.h b/src/firestore/FB_Firestore.h index fa6b61177..22faf2f82 100644 --- a/src/firestore/FB_Firestore.h +++ b/src/firestore/FB_Firestore.h @@ -1,5 +1,5 @@ #include "./core/Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40407) +#if !FIREBASE_CLIENT_VERSION_CHECK(40408) #error "Mixed versions compilation." #endif diff --git a/src/functions/FB_Functions.cpp b/src/functions/FB_Functions.cpp index 3ca565f80..7ae040357 100644 --- a/src/functions/FB_Functions.cpp +++ b/src/functions/FB_Functions.cpp @@ -1,5 +1,5 @@ #include "./core/Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40407) +#if !FIREBASE_CLIENT_VERSION_CHECK(40408) #error "Mixed versions compilation." #endif diff --git a/src/functions/FB_Functions.h b/src/functions/FB_Functions.h index df95c5144..b80ddf0d4 100644 --- a/src/functions/FB_Functions.h +++ b/src/functions/FB_Functions.h @@ -1,5 +1,5 @@ #include "./core/Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40407) +#if !FIREBASE_CLIENT_VERSION_CHECK(40408) #error "Mixed versions compilation." #endif diff --git a/src/functions/FunctionsConfig.cpp b/src/functions/FunctionsConfig.cpp index 3554b323c..cb9db9555 100644 --- a/src/functions/FunctionsConfig.cpp +++ b/src/functions/FunctionsConfig.cpp @@ -1,5 +1,5 @@ #include "./core/Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40407) +#if !FIREBASE_CLIENT_VERSION_CHECK(40408) #error "Mixed versions compilation." #endif diff --git a/src/functions/FunctionsConfig.h b/src/functions/FunctionsConfig.h index 5d256c514..7231fb751 100644 --- a/src/functions/FunctionsConfig.h +++ b/src/functions/FunctionsConfig.h @@ -1,5 +1,5 @@ #include "./core/Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40407) +#if !FIREBASE_CLIENT_VERSION_CHECK(40408) #error "Mixed versions compilation." #endif diff --git a/src/functions/PocicyBuilder.cpp b/src/functions/PocicyBuilder.cpp index f335f52bc..110109461 100644 --- a/src/functions/PocicyBuilder.cpp +++ b/src/functions/PocicyBuilder.cpp @@ -1,5 +1,5 @@ #include "./core/Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40407) +#if !FIREBASE_CLIENT_VERSION_CHECK(40408) #error "Mixed versions compilation." #endif diff --git a/src/functions/PolicyBuilder.h b/src/functions/PolicyBuilder.h index 04652407c..8396d1b63 100644 --- a/src/functions/PolicyBuilder.h +++ b/src/functions/PolicyBuilder.h @@ -1,5 +1,5 @@ #include "./core/Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40407) +#if !FIREBASE_CLIENT_VERSION_CHECK(40408) #error "Mixed versions compilation." #endif diff --git a/src/gcs/GCS.cpp b/src/gcs/GCS.cpp index 35eedfaee..fe6c6e604 100644 --- a/src/gcs/GCS.cpp +++ b/src/gcs/GCS.cpp @@ -1,5 +1,5 @@ #include "./core/Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40407) +#if !FIREBASE_CLIENT_VERSION_CHECK(40408) #error "Mixed versions compilation." #endif diff --git a/src/gcs/GCS.h b/src/gcs/GCS.h index 3a1584df7..d281de85a 100644 --- a/src/gcs/GCS.h +++ b/src/gcs/GCS.h @@ -1,5 +1,5 @@ #include "./core/Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40407) +#if !FIREBASE_CLIENT_VERSION_CHECK(40408) #error "Mixed versions compilation." #endif diff --git a/src/message/FCM.cpp b/src/message/FCM.cpp index 487fea324..96132f10a 100644 --- 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(40407) +#if !FIREBASE_CLIENT_VERSION_CHECK(40408) #error "Mixed versions compilation." #endif diff --git a/src/message/FCM.h b/src/message/FCM.h index 094c3ba40..172d023ef 100644 --- 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(40407) +#if !FIREBASE_CLIENT_VERSION_CHECK(40408) #error "Mixed versions compilation." #endif diff --git a/src/message/LFCM.h b/src/message/LFCM.h index f3112f04c..3321a5793 100644 --- 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(40407) +#if !FIREBASE_CLIENT_VERSION_CHECK(40408) #error "Mixed versions compilation." #endif diff --git a/src/rtdb/FB_RTDB.cpp b/src/rtdb/FB_RTDB.cpp index 8484afc45..e73b4a4d9 100644 --- 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(40407) +#if !FIREBASE_CLIENT_VERSION_CHECK(40408) #error "Mixed versions compilation." #endif diff --git a/src/rtdb/FB_RTDB.h b/src/rtdb/FB_RTDB.h index b4ce50e82..554300212 100644 --- 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(40407) +#if !FIREBASE_CLIENT_VERSION_CHECK(40408) #error "Mixed versions compilation." #endif diff --git a/src/rtdb/QueryFilter.cpp b/src/rtdb/QueryFilter.cpp index cee1c89c1..bffa36e57 100644 --- 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(40407) +#if !FIREBASE_CLIENT_VERSION_CHECK(40408) #error "Mixed versions compilation." #endif diff --git a/src/rtdb/QueryFilter.h b/src/rtdb/QueryFilter.h index c8f9751e7..0901c5cbc 100644 --- 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(40407) +#if !FIREBASE_CLIENT_VERSION_CHECK(40408) #error "Mixed versions compilation." #endif diff --git a/src/rtdb/QueueInfo.cpp b/src/rtdb/QueueInfo.cpp index 526ef6d72..a19d410f5 100644 --- 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(40407) +#if !FIREBASE_CLIENT_VERSION_CHECK(40408) #error "Mixed versions compilation." #endif diff --git a/src/rtdb/QueueInfo.h b/src/rtdb/QueueInfo.h index 460abf13e..5646e4ce9 100644 --- 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(40407) +#if !FIREBASE_CLIENT_VERSION_CHECK(40408) #error "Mixed versions compilation." #endif diff --git a/src/rtdb/QueueManager.cpp b/src/rtdb/QueueManager.cpp index 0594cd625..ec7ef1d06 100644 --- 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(40407) +#if !FIREBASE_CLIENT_VERSION_CHECK(40408) #error "Mixed versions compilation." #endif diff --git a/src/rtdb/QueueManager.h b/src/rtdb/QueueManager.h index 2f83101c1..7fdd9c92d 100644 --- 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(40407) +#if !FIREBASE_CLIENT_VERSION_CHECK(40408) #error "Mixed versions compilation." #endif diff --git a/src/rtdb/stream/FB_MP_Stream.cpp b/src/rtdb/stream/FB_MP_Stream.cpp index 000e0e4d4..944a4779f 100644 --- 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(40407) +#if !FIREBASE_CLIENT_VERSION_CHECK(40408) #error "Mixed versions compilation." #endif diff --git a/src/rtdb/stream/FB_MP_Stream.h b/src/rtdb/stream/FB_MP_Stream.h index d807a7deb..85d8a38da 100644 --- 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(40407) +#if !FIREBASE_CLIENT_VERSION_CHECK(40408) #error "Mixed versions compilation." #endif diff --git a/src/rtdb/stream/FB_Stream.cpp b/src/rtdb/stream/FB_Stream.cpp index b0379348a..fc3763705 100644 --- 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(40407) +#if !FIREBASE_CLIENT_VERSION_CHECK(40408) #error "Mixed versions compilation." #endif diff --git a/src/rtdb/stream/FB_Stream.h b/src/rtdb/stream/FB_Stream.h index 97c7beab3..db74c5e29 100644 --- 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(40407) +#if !FIREBASE_CLIENT_VERSION_CHECK(40408) #error "Mixed versions compilation." #endif diff --git a/src/session/FB_Session.cpp b/src/session/FB_Session.cpp index 91ea51d45..77f766527 100644 --- 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(40407) +#if !FIREBASE_CLIENT_VERSION_CHECK(40408) #error "Mixed versions compilation." #endif diff --git a/src/session/FB_Session.h b/src/session/FB_Session.h index 82d9e7ce4..c659bafc8 100644 --- 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(40407) +#if !FIREBASE_CLIENT_VERSION_CHECK(40408) #error "Mixed versions compilation." #endif diff --git a/src/storage/FCS.cpp b/src/storage/FCS.cpp index 74908f5d7..114b8d345 100644 --- a/src/storage/FCS.cpp +++ b/src/storage/FCS.cpp @@ -1,5 +1,5 @@ #include "./core/Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40407) +#if !FIREBASE_CLIENT_VERSION_CHECK(40408) #error "Mixed versions compilation." #endif diff --git a/src/storage/FCS.h b/src/storage/FCS.h index be95d5b07..44685ade1 100644 --- a/src/storage/FCS.h +++ b/src/storage/FCS.h @@ -1,5 +1,5 @@ #include "./core/Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40407) +#if !FIREBASE_CLIENT_VERSION_CHECK(40408) #error "Mixed versions compilation." #endif