From ff8b3a4507e86a076eeda95788a8e6f101b34b63 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 20 Jul 2023 16:02:54 +0700 Subject: [PATCH] Fix time issue for ESP devices when using external client with OAuth2 authentication. --- .../ESP32/HTTPv1/SendMessage/SendMessage.ino | 235 ++++++++++++++++++ library.json | 2 +- library.properties | 2 +- src/FB_Const.h | 2 +- src/FB_Error.h | 2 +- src/FB_Network.h | 2 +- src/FB_Utils.h | 6 +- src/Firebase.cpp | 2 +- src/Firebase.h | 2 +- src/FirebaseFS.h | 2 +- src/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/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/signer/Signer.cpp | 2 +- src/signer/Signer.h | 2 +- src/storage/FCS.cpp | 2 +- src/storage/FCS.h | 2 +- src/wcs/FB_Clients.h | 2 +- src/wcs/base/FB_TCP_Client_Base.h | 2 +- src/wcs/custom/FB_Custom_TCP_Client.h | 2 +- src/wcs/esp32/FB_TCP_Client.cpp | 2 +- src/wcs/esp32/FB_TCP_Client.h | 2 +- src/wcs/esp8266/FB_TCP_Client.cpp | 2 +- src/wcs/esp8266/FB_TCP_Client.h | 2 +- 48 files changed, 285 insertions(+), 50 deletions(-) create mode 100644 examples/ExternalClient/FCM/Ethernet/ESP32/HTTPv1/SendMessage/SendMessage.ino diff --git a/examples/ExternalClient/FCM/Ethernet/ESP32/HTTPv1/SendMessage/SendMessage.ino b/examples/ExternalClient/FCM/Ethernet/ESP32/HTTPv1/SendMessage/SendMessage.ino new file mode 100644 index 000000000..adf2b32e9 --- /dev/null +++ b/examples/ExternalClient/FCM/Ethernet/ESP32/HTTPv1/SendMessage/SendMessage.ino @@ -0,0 +1,235 @@ +/** + * Created by K. Suwatchai (Mobizt) + * + * Email: k_suwatchai@hotmail.com + * + * Github: https://github.com/mobizt/Firebase-ESP-Client + * + * Copyright (c) 2023 mobizt + * + */ + +/** This example shows the basic FCM HTTPv1 send message with external Client. + * This example used ESP32 and WIZnet W5500 (Etherner) devices which ESP_SSLClient will be used as the external Client. + * + * Don't gorget to define this in FirebaseFS.h + * #define FB_ENABLE_EXTERNAL_CLIENT + */ + +#include + +// Provide the token generation process info. +#include + +// Provide the RTDB payload printing info and other helper functions. +#include + +// https://github.com/arduino-libraries/Ethernet +#include + +// https://github.com/mobizt/ESP_SSLClient +#include + +// For NTP time client +#include "MB_NTP.h" + +/* 1. Define the API Key */ +#define API_KEY "API_KEY" + +/** 2. Define the Service Account credentials (required for token generation) + * + * This information can be taken from the service account JSON file. + * + * To download service account file, from the Firebase console, goto project settings, + * select "Service accounts" tab and click at "Generate new private key" button + */ +#define FIREBASE_PROJECT_ID "PROJECT_ID" +#define FIREBASE_CLIENT_EMAIL "CLIENT_EMAIL" +const char PRIVATE_KEY[] PROGMEM = "-----BEGIN PRIVATE KEY-----XXXXXXXXXXXX-----END PRIVATE KEY-----\n"; + +/* 3. Define the ID token for client or device to send the message */ +#define DEVICE_REGISTRATION_ID_TOKEN "DEVICE_TOKEN" + +/* 4. Defined the Ethernet module connection */ +#define WIZNET_RESET_PIN 26 // Connect W5500 Reset pin to GPIO 26 of ESP32 +#define WIZNET_CS_PIN 5 // Connect W5500 CS pin to GPIO 5 of ESP32 +#define WIZNET_MISO_PIN 19 // Connect W5500 MISO pin to GPIO 19 of ESP32 +#define WIZNET_MOSI_PIN 23 // Connect W5500 MOSI pin to GPIO 23 of ESP32 +#define WIZNET_SCLK_PIN 18 // Connect W5500 SCLK pin to GPIO 18 of ESP32 + +/* 5. Define MAC */ +uint8_t Eth_MAC[] = {0x02, 0xF0, 0x0D, 0xBE, 0xEF, 0x01}; + +/* 6. Define IP (Optional) */ +IPAddress Eth_IP(192, 168, 1, 104); + +/* 7. Define the RTDB URL (only if RTDB was used)*/ +#define DATABASE_URL "URL" //.firebaseio.com or ..firebasedatabase.app + +// Define Firebase Data object +FirebaseData fbdo; + +FirebaseAuth auth; +FirebaseConfig config; + +unsigned long sendDataPrevMillis = 0; + +int count = 0; + +volatile bool dataChanged = false; + +// Define the basic client +// The network interface devices that can be used to handle SSL data should +// have large memory buffer up to 1k - 2k or more, otherwise the SSL/TLS handshake +// will fail. +EthernetClient basic_client; + +// This is the wrapper client that utilized the basic client for io and +// provides the mean for the data encryption and decryption before sending to or after read from the io. +// The most probable failures are related to the basic client itself that may not provide the buffer +// that large enough for SSL data. +// The SSL client can do nothing for this case, you should increase the basic client buffer memory. +ESP_SSLClient ssl_client; + +EthernetUDP udp_client; + +unsigned long lastTime = 0; + +void sendMessage(); + +void ResetEthernet() +{ + Serial.println("Resetting WIZnet W5500 Ethernet Board... "); + pinMode(WIZNET_RESET_PIN, OUTPUT); + digitalWrite(WIZNET_RESET_PIN, HIGH); + delay(200); + digitalWrite(WIZNET_RESET_PIN, LOW); + delay(50); + digitalWrite(WIZNET_RESET_PIN, HIGH); + delay(200); +} + +void networkConnection() +{ + Ethernet.init(WIZNET_CS_PIN); + + ResetEthernet(); + + Serial.println("Starting Ethernet connection..."); + Ethernet.begin(Eth_MAC); + + unsigned long to = millis(); + + while (Ethernet.linkStatus() == LinkOFF || millis() - to < 2000) + { + delay(100); + } + + if (Ethernet.linkStatus() == LinkON) + { + Serial.print("Connected with IP "); + Serial.println(Ethernet.localIP()); + } + else + { + Serial.println("Can't connect"); + } +} + +// Define the callback function to handle server status acknowledgement +void networkStatusRequestCallback() +{ + // Set the network status + fbdo.setNetworkStatus(Ethernet.linkStatus() == LinkON); +} + +void setup() +{ + + Serial.begin(115200); + + networkConnection(); + + Serial_Printf("Firebase Client v%s\n\n", FIREBASE_CLIENT_VERSION); + + /* Assign the basic Client (Ethernet) pointer to the basic Client */ + ssl_client.setClient(&basic_client); + + /* Similar to WiFiClientSecure */ + ssl_client.setInsecure(); + + /* For NTP */ + Firebase.setUDPClient(&udp_client, 0); + + /* Assign the api key (required) */ + config.api_key = API_KEY; + + /* Assign the sevice account credentials and private key (required) */ + config.service_account.data.client_email = FIREBASE_CLIENT_EMAIL; + config.service_account.data.project_id = FIREBASE_PROJECT_ID; + config.service_account.data.private_key = PRIVATE_KEY; + + /* Assign the RTDB URL (if only RTDB was used) */ + config.database_url = DATABASE_URL; + + /* Assign the callback function for the long running token generation task */ + config.token_status_callback = tokenStatusCallback; // see addons/TokenHelper.h + + /* fbdo.setExternalClient and fbdo.setExternalClientCallbacks must be called before Firebase.begin */ + + /* Assign the pointer to global defined external SSL Client object */ + fbdo.setExternalClient(&ssl_client); + + /* Assign the required callback functions */ + fbdo.setExternalClientCallbacks(networkConnection, networkStatusRequestCallback); + + // Comment or pass false value when WiFi reconnection will control by your code or third party library + Firebase.reconnectWiFi(true); + + Firebase.setDoubleDigits(5); + + Firebase.begin(&config, &auth); +} + +void loop() +{ + + // Firebase.ready() should be called repeatedly to handle authentication tasks. + + if (Firebase.ready() && (millis() - lastTime > 60 * 1000 || lastTime == 0)) + { + lastTime = millis(); + + sendMessage(); + } +} + +void sendMessage() +{ + + Serial.print("Send Firebase Cloud Messaging... "); + + // Read more details about HTTP v1 API here https://firebase.google.com/docs/reference/fcm/rest/v1/projects.messages + FCM_HTTPv1_JSON_Message msg; + + msg.token = DEVICE_REGISTRATION_ID_TOKEN; + + msg.notification.body = "Notification body"; + msg.notification.title = "Notification title"; + + // For the usage of FirebaseJson, see examples/FirebaseJson/BasicUsage/Create.ino + FirebaseJson payload; + + // all data key-values should be string + payload.add("temp", "28"); + payload.add("unit", "celsius"); + payload.add("timestamp", "1609815454"); + msg.data = payload.raw(); + + if (Firebase.FCM.send(&fbdo, &msg)) // send message to recipient + Serial.printf("ok\n%s\n\n", Firebase.FCM.payload(&fbdo).c_str()); + else + Serial.println(fbdo.errorReason()); + + count++; +} diff --git a/library.json b/library.json index 744d4a263..0b384c793 100644 --- a/library.json +++ b/library.json @@ -1,6 +1,6 @@ { "name": "Firebase Arduino Client Library for ESP8266 and ESP32", - "version": "4.3.17", + "version": "4.3.18", "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 449f8b82f..31bb9bed3 100644 --- a/library.properties +++ b/library.properties @@ -1,6 +1,6 @@ name=Firebase Arduino Client Library for ESP8266 and ESP32 -version=4.3.17 +version=4.3.18 author=Mobizt diff --git a/src/FB_Const.h b/src/FB_Const.h index 893ac294e..4a3ee3d1b 100644 --- a/src/FB_Const.h +++ b/src/FB_Const.h @@ -1,5 +1,5 @@ #include "Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40317) +#if !FIREBASE_CLIENT_VERSION_CHECK(40318) #error "Mixed versions compilation." #endif diff --git a/src/FB_Error.h b/src/FB_Error.h index ea258858b..8635d34b4 100644 --- a/src/FB_Error.h +++ b/src/FB_Error.h @@ -1,5 +1,5 @@ #include "Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40317) +#if !FIREBASE_CLIENT_VERSION_CHECK(40318) #error "Mixed versions compilation." #endif diff --git a/src/FB_Network.h b/src/FB_Network.h index 5f08bb487..7af5e98d4 100644 --- a/src/FB_Network.h +++ b/src/FB_Network.h @@ -1,5 +1,5 @@ #include "Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40317) +#if !FIREBASE_CLIENT_VERSION_CHECK(40318) #error "Mixed versions compilation." #endif diff --git a/src/FB_Utils.h b/src/FB_Utils.h index 4b286eb50..53de5a520 100644 --- a/src/FB_Utils.h +++ b/src/FB_Utils.h @@ -1,5 +1,5 @@ #include "Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40317) +#if !FIREBASE_CLIENT_VERSION_CHECK(40318) #error "Mixed versions compilation." #endif @@ -7,7 +7,7 @@ * * This library supports Espressif ESP8266, ESP32 and Raspberry Pi Pico (RP2040) * - * Created July 7, 2023 + * Created July 20, 2023 * * This work is a part of Firebase ESP Client library * Copyright (c) 2023 K. Suwatchai (Mobizt) @@ -1730,7 +1730,7 @@ namespace TimeHelper #if defined(FB_ENABLE_EXTERNAL_CLIENT) || defined(MB_ARDUINO_PICO) tm = *mb_ts_offset + millis() / 1000; -#if defined(MB_ARDUINO_PICO) +#if defined(MB_ARDUINO_PICO) || defined(ESP32) || defined(ESP8266) if (tm < time(nullptr)) tm = time(nullptr); #endif diff --git a/src/Firebase.cpp b/src/Firebase.cpp index a1db0ca58..cf5ebf443 100644 --- a/src/Firebase.cpp +++ b/src/Firebase.cpp @@ -1,5 +1,5 @@ #include "Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40317) +#if !FIREBASE_CLIENT_VERSION_CHECK(40318) #error "Mixed versions compilation." #endif diff --git a/src/Firebase.h b/src/Firebase.h index c166267fc..a3769a370 100644 --- a/src/Firebase.h +++ b/src/Firebase.h @@ -1,5 +1,5 @@ #include "Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40317) +#if !FIREBASE_CLIENT_VERSION_CHECK(40318) #error "Mixed versions compilation." #endif diff --git a/src/FirebaseFS.h b/src/FirebaseFS.h index dc0023884..c0862d841 100644 --- a/src/FirebaseFS.h +++ b/src/FirebaseFS.h @@ -1,5 +1,5 @@ #include "Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40317) +#if !FIREBASE_CLIENT_VERSION_CHECK(40318) #error "Mixed versions compilation." #endif diff --git a/src/Firebase_Client_Version.h b/src/Firebase_Client_Version.h index bd0dc3f38..5b43fd83c 100644 --- a/src/Firebase_Client_Version.h +++ b/src/Firebase_Client_Version.h @@ -1,6 +1,6 @@ #ifndef FIREBASE_CLIENT_VERSION -#define FIREBASE_CLIENT_VERSION "4.3.17" -#define FIREBASE_CLIENT_VERSION_NUM 40317 +#define FIREBASE_CLIENT_VERSION "4.3.18" +#define FIREBASE_CLIENT_VERSION_NUM 40318 /* 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 c9bf0fa60..d01c640c7 100644 --- a/src/firestore/FB_Firestore.cpp +++ b/src/firestore/FB_Firestore.cpp @@ -1,5 +1,5 @@ #include "Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40317) +#if !FIREBASE_CLIENT_VERSION_CHECK(40318) #error "Mixed versions compilation." #endif diff --git a/src/firestore/FB_Firestore.h b/src/firestore/FB_Firestore.h index 2b8c089c6..c3d182414 100644 --- a/src/firestore/FB_Firestore.h +++ b/src/firestore/FB_Firestore.h @@ -1,5 +1,5 @@ #include "Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40317) +#if !FIREBASE_CLIENT_VERSION_CHECK(40318) #error "Mixed versions compilation." #endif diff --git a/src/functions/FB_Functions.cpp b/src/functions/FB_Functions.cpp index 592e2dc6d..aea76c4bd 100644 --- a/src/functions/FB_Functions.cpp +++ b/src/functions/FB_Functions.cpp @@ -1,5 +1,5 @@ #include "Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40317) +#if !FIREBASE_CLIENT_VERSION_CHECK(40318) #error "Mixed versions compilation." #endif diff --git a/src/functions/FB_Functions.h b/src/functions/FB_Functions.h index e3fc5f99a..e3105e774 100644 --- a/src/functions/FB_Functions.h +++ b/src/functions/FB_Functions.h @@ -1,5 +1,5 @@ #include "Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40317) +#if !FIREBASE_CLIENT_VERSION_CHECK(40318) #error "Mixed versions compilation." #endif diff --git a/src/functions/FunctionsConfig.cpp b/src/functions/FunctionsConfig.cpp index 21008e80e..a71643c8e 100644 --- a/src/functions/FunctionsConfig.cpp +++ b/src/functions/FunctionsConfig.cpp @@ -1,5 +1,5 @@ #include "Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40317) +#if !FIREBASE_CLIENT_VERSION_CHECK(40318) #error "Mixed versions compilation." #endif diff --git a/src/functions/FunctionsConfig.h b/src/functions/FunctionsConfig.h index 4d5ed11f9..638130775 100644 --- a/src/functions/FunctionsConfig.h +++ b/src/functions/FunctionsConfig.h @@ -1,5 +1,5 @@ #include "Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40317) +#if !FIREBASE_CLIENT_VERSION_CHECK(40318) #error "Mixed versions compilation." #endif diff --git a/src/functions/PocicyBuilder.cpp b/src/functions/PocicyBuilder.cpp index d60b494ee..782ea175a 100644 --- a/src/functions/PocicyBuilder.cpp +++ b/src/functions/PocicyBuilder.cpp @@ -1,5 +1,5 @@ #include "Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40317) +#if !FIREBASE_CLIENT_VERSION_CHECK(40318) #error "Mixed versions compilation." #endif diff --git a/src/functions/PolicyBuilder.h b/src/functions/PolicyBuilder.h index d75344f22..02fc248de 100644 --- a/src/functions/PolicyBuilder.h +++ b/src/functions/PolicyBuilder.h @@ -1,5 +1,5 @@ #include "Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40317) +#if !FIREBASE_CLIENT_VERSION_CHECK(40318) #error "Mixed versions compilation." #endif diff --git a/src/gcs/GCS.cpp b/src/gcs/GCS.cpp index d1795f2c0..82bd9a0a1 100644 --- a/src/gcs/GCS.cpp +++ b/src/gcs/GCS.cpp @@ -1,5 +1,5 @@ #include "Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40317) +#if !FIREBASE_CLIENT_VERSION_CHECK(40318) #error "Mixed versions compilation." #endif diff --git a/src/gcs/GCS.h b/src/gcs/GCS.h index cb0c01b6b..f48fece57 100644 --- a/src/gcs/GCS.h +++ b/src/gcs/GCS.h @@ -1,5 +1,5 @@ #include "Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40317) +#if !FIREBASE_CLIENT_VERSION_CHECK(40318) #error "Mixed versions compilation." #endif diff --git a/src/message/FCM.cpp b/src/message/FCM.cpp index 6c03eee11..4b9e11144 100644 --- a/src/message/FCM.cpp +++ b/src/message/FCM.cpp @@ -1,5 +1,5 @@ #include "Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40317) +#if !FIREBASE_CLIENT_VERSION_CHECK(40318) #error "Mixed versions compilation." #endif diff --git a/src/message/FCM.h b/src/message/FCM.h index 6164b44b3..8aad038a2 100644 --- a/src/message/FCM.h +++ b/src/message/FCM.h @@ -1,5 +1,5 @@ #include "Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40317) +#if !FIREBASE_CLIENT_VERSION_CHECK(40318) #error "Mixed versions compilation." #endif diff --git a/src/rtdb/FB_RTDB.cpp b/src/rtdb/FB_RTDB.cpp index f9e5f4b9b..61598e4a7 100644 --- a/src/rtdb/FB_RTDB.cpp +++ b/src/rtdb/FB_RTDB.cpp @@ -1,5 +1,5 @@ #include "Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40317) +#if !FIREBASE_CLIENT_VERSION_CHECK(40318) #error "Mixed versions compilation." #endif diff --git a/src/rtdb/FB_RTDB.h b/src/rtdb/FB_RTDB.h index 69a9b3824..e26a99e2d 100644 --- a/src/rtdb/FB_RTDB.h +++ b/src/rtdb/FB_RTDB.h @@ -1,5 +1,5 @@ #include "Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40317) +#if !FIREBASE_CLIENT_VERSION_CHECK(40318) #error "Mixed versions compilation." #endif diff --git a/src/rtdb/QueryFilter.cpp b/src/rtdb/QueryFilter.cpp index da8a15d06..1885feee8 100644 --- a/src/rtdb/QueryFilter.cpp +++ b/src/rtdb/QueryFilter.cpp @@ -1,5 +1,5 @@ #include "Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40317) +#if !FIREBASE_CLIENT_VERSION_CHECK(40318) #error "Mixed versions compilation." #endif diff --git a/src/rtdb/QueryFilter.h b/src/rtdb/QueryFilter.h index fd7514b93..a32059870 100644 --- a/src/rtdb/QueryFilter.h +++ b/src/rtdb/QueryFilter.h @@ -1,5 +1,5 @@ #include "Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40317) +#if !FIREBASE_CLIENT_VERSION_CHECK(40318) #error "Mixed versions compilation." #endif diff --git a/src/rtdb/QueueInfo.cpp b/src/rtdb/QueueInfo.cpp index 63787d0d2..0480b7107 100644 --- a/src/rtdb/QueueInfo.cpp +++ b/src/rtdb/QueueInfo.cpp @@ -1,5 +1,5 @@ #include "Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40317) +#if !FIREBASE_CLIENT_VERSION_CHECK(40318) #error "Mixed versions compilation." #endif diff --git a/src/rtdb/QueueInfo.h b/src/rtdb/QueueInfo.h index 0af8df888..5dbcbfd06 100644 --- a/src/rtdb/QueueInfo.h +++ b/src/rtdb/QueueInfo.h @@ -1,5 +1,5 @@ #include "Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40317) +#if !FIREBASE_CLIENT_VERSION_CHECK(40318) #error "Mixed versions compilation." #endif diff --git a/src/rtdb/QueueManager.cpp b/src/rtdb/QueueManager.cpp index d7efe5f46..86ad9b2ab 100644 --- a/src/rtdb/QueueManager.cpp +++ b/src/rtdb/QueueManager.cpp @@ -1,5 +1,5 @@ #include "Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40317) +#if !FIREBASE_CLIENT_VERSION_CHECK(40318) #error "Mixed versions compilation." #endif diff --git a/src/rtdb/QueueManager.h b/src/rtdb/QueueManager.h index c3ef960b9..930dc577b 100644 --- a/src/rtdb/QueueManager.h +++ b/src/rtdb/QueueManager.h @@ -1,5 +1,5 @@ #include "Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40317) +#if !FIREBASE_CLIENT_VERSION_CHECK(40318) #error "Mixed versions compilation." #endif diff --git a/src/rtdb/stream/FB_MP_Stream.cpp b/src/rtdb/stream/FB_MP_Stream.cpp index 62da48d17..507936302 100644 --- a/src/rtdb/stream/FB_MP_Stream.cpp +++ b/src/rtdb/stream/FB_MP_Stream.cpp @@ -1,5 +1,5 @@ #include "Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40317) +#if !FIREBASE_CLIENT_VERSION_CHECK(40318) #error "Mixed versions compilation." #endif diff --git a/src/rtdb/stream/FB_MP_Stream.h b/src/rtdb/stream/FB_MP_Stream.h index e60fc36bf..7a476d263 100644 --- a/src/rtdb/stream/FB_MP_Stream.h +++ b/src/rtdb/stream/FB_MP_Stream.h @@ -1,5 +1,5 @@ #include "Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40317) +#if !FIREBASE_CLIENT_VERSION_CHECK(40318) #error "Mixed versions compilation." #endif diff --git a/src/rtdb/stream/FB_Stream.cpp b/src/rtdb/stream/FB_Stream.cpp index 99fa77d7e..85a7f86da 100644 --- a/src/rtdb/stream/FB_Stream.cpp +++ b/src/rtdb/stream/FB_Stream.cpp @@ -1,5 +1,5 @@ #include "Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40317) +#if !FIREBASE_CLIENT_VERSION_CHECK(40318) #error "Mixed versions compilation." #endif diff --git a/src/rtdb/stream/FB_Stream.h b/src/rtdb/stream/FB_Stream.h index ab5e76416..2f311ec36 100644 --- a/src/rtdb/stream/FB_Stream.h +++ b/src/rtdb/stream/FB_Stream.h @@ -1,5 +1,5 @@ #include "Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40317) +#if !FIREBASE_CLIENT_VERSION_CHECK(40318) #error "Mixed versions compilation." #endif diff --git a/src/session/FB_Session.cpp b/src/session/FB_Session.cpp index 3b0ddd557..897446469 100644 --- a/src/session/FB_Session.cpp +++ b/src/session/FB_Session.cpp @@ -1,5 +1,5 @@ #include "Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40317) +#if !FIREBASE_CLIENT_VERSION_CHECK(40318) #error "Mixed versions compilation." #endif diff --git a/src/session/FB_Session.h b/src/session/FB_Session.h index ca281042c..ef52b5996 100644 --- a/src/session/FB_Session.h +++ b/src/session/FB_Session.h @@ -1,5 +1,5 @@ #include "Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40317) +#if !FIREBASE_CLIENT_VERSION_CHECK(40318) #error "Mixed versions compilation." #endif diff --git a/src/signer/Signer.cpp b/src/signer/Signer.cpp index 3b4ab9a5c..51405105c 100644 --- a/src/signer/Signer.cpp +++ b/src/signer/Signer.cpp @@ -1,5 +1,5 @@ #include "Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40317) +#if !FIREBASE_CLIENT_VERSION_CHECK(40318) #error "Mixed versions compilation." #endif diff --git a/src/signer/Signer.h b/src/signer/Signer.h index 74c811e4e..349965a4c 100644 --- a/src/signer/Signer.h +++ b/src/signer/Signer.h @@ -1,5 +1,5 @@ #include "Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40317) +#if !FIREBASE_CLIENT_VERSION_CHECK(40318) #error "Mixed versions compilation." #endif diff --git a/src/storage/FCS.cpp b/src/storage/FCS.cpp index 13ea74ad6..3be388c10 100644 --- a/src/storage/FCS.cpp +++ b/src/storage/FCS.cpp @@ -1,5 +1,5 @@ #include "Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40317) +#if !FIREBASE_CLIENT_VERSION_CHECK(40318) #error "Mixed versions compilation." #endif diff --git a/src/storage/FCS.h b/src/storage/FCS.h index 6d9c2ee0a..f1a0f16e8 100644 --- a/src/storage/FCS.h +++ b/src/storage/FCS.h @@ -1,5 +1,5 @@ #include "Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40317) +#if !FIREBASE_CLIENT_VERSION_CHECK(40318) #error "Mixed versions compilation." #endif diff --git a/src/wcs/FB_Clients.h b/src/wcs/FB_Clients.h index bb97d9070..7851bdb7f 100644 --- a/src/wcs/FB_Clients.h +++ b/src/wcs/FB_Clients.h @@ -1,5 +1,5 @@ #include "Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40317) +#if !FIREBASE_CLIENT_VERSION_CHECK(40318) #error "Mixed versions compilation." #endif diff --git a/src/wcs/base/FB_TCP_Client_Base.h b/src/wcs/base/FB_TCP_Client_Base.h index c0533d71d..8b66f180d 100644 --- a/src/wcs/base/FB_TCP_Client_Base.h +++ b/src/wcs/base/FB_TCP_Client_Base.h @@ -1,5 +1,5 @@ #include "Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40317) +#if !FIREBASE_CLIENT_VERSION_CHECK(40318) #error "Mixed versions compilation." #endif diff --git a/src/wcs/custom/FB_Custom_TCP_Client.h b/src/wcs/custom/FB_Custom_TCP_Client.h index 5fdfc20a3..085179b0b 100644 --- a/src/wcs/custom/FB_Custom_TCP_Client.h +++ b/src/wcs/custom/FB_Custom_TCP_Client.h @@ -1,5 +1,5 @@ #include "Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40317) +#if !FIREBASE_CLIENT_VERSION_CHECK(40318) #error "Mixed versions compilation." #endif diff --git a/src/wcs/esp32/FB_TCP_Client.cpp b/src/wcs/esp32/FB_TCP_Client.cpp index 39af7cdca..73cf87029 100644 --- a/src/wcs/esp32/FB_TCP_Client.cpp +++ b/src/wcs/esp32/FB_TCP_Client.cpp @@ -1,5 +1,5 @@ #include "Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40317) +#if !FIREBASE_CLIENT_VERSION_CHECK(40318) #error "Mixed versions compilation." #endif diff --git a/src/wcs/esp32/FB_TCP_Client.h b/src/wcs/esp32/FB_TCP_Client.h index 3a20578c4..94ec6f77c 100644 --- a/src/wcs/esp32/FB_TCP_Client.h +++ b/src/wcs/esp32/FB_TCP_Client.h @@ -1,5 +1,5 @@ #include "Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40317) +#if !FIREBASE_CLIENT_VERSION_CHECK(40318) #error "Mixed versions compilation." #endif diff --git a/src/wcs/esp8266/FB_TCP_Client.cpp b/src/wcs/esp8266/FB_TCP_Client.cpp index bc546a14e..d24c4bb40 100644 --- a/src/wcs/esp8266/FB_TCP_Client.cpp +++ b/src/wcs/esp8266/FB_TCP_Client.cpp @@ -1,5 +1,5 @@ #include "Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40317) +#if !FIREBASE_CLIENT_VERSION_CHECK(40318) #error "Mixed versions compilation." #endif diff --git a/src/wcs/esp8266/FB_TCP_Client.h b/src/wcs/esp8266/FB_TCP_Client.h index 5b30e5701..0e5d3b2f0 100644 --- a/src/wcs/esp8266/FB_TCP_Client.h +++ b/src/wcs/esp8266/FB_TCP_Client.h @@ -1,5 +1,5 @@ #include "Firebase_Client_Version.h" -#if !FIREBASE_CLIENT_VERSION_CHECK(40317) +#if !FIREBASE_CLIENT_VERSION_CHECK(40318) #error "Mixed versions compilation." #endif