Fix FreeRTOS compilation error in Arduino Pico SDK v3.2.1.

mobizt · Jun 7, 2023 · 14c7a02 · 14c7a02
1 parent 95613dd
commit 14c7a02
Show file tree

Hide file tree

Showing 33 changed files with 48 additions and 43 deletions.
diff --git a/library.json b/library.json
@@ -1,6 +1,6 @@
 {
   "name": "Firebase ESP8266 Client",
-  "version": "4.3.10",
+  "version": "4.3.11",
   "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.3.10
+version=4.3.11
 
 author=Mobizt
 

diff --git a/src/FB_Const.h b/src/FB_Const.h
@@ -1,10 +1,10 @@
 #include "Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40310)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40311)
 #error "Mixed versions compilation."
 #endif
 
 /**
- * Created April 5, 2023
+ * Created June 7, 2023
  *
  * This work is a part of Firebase ESP Client library
  * Copyright (c) 2023 K. Suwatchai (Mobizt)
@@ -62,6 +62,12 @@
 #define OTA_UPDATE_ENABLED
 #endif
 
+
+#if defined(MB_ARDUINO_PICO) && defined(INC_FREERTOS_H) && !defined(ENABLE_PICO_FREE_RTOS)
+#define ENABLE_PICO_FREE_RTOS
+#include <task.h>
+#endif
+
 #if defined(ESP32)
 #if defined(ESP_ARDUINO_VERSION)
 #if ESP_ARDUINO_VERSION > ESP_ARDUINO_VERSION_VAL(2, 0, 1)
@@ -1030,12 +1036,15 @@ struct fb_esp_cfg_int_t
     bool stream_loop_task_enable = true;
     bool deploy_loop_task_enable = true;
 #if defined(ESP32) || defined(MB_ARDUINO_PICO)
+
+#if defined(ESP32) || (defined(MB_ARDUINO_PICO) && defined(ENABLE_PICO_FREE_RTOS))
     TaskHandle_t resumable_upload_task_handle = NULL;
     TaskHandle_t functions_check_task_handle = NULL;
     TaskHandle_t functions_deployment_task_handle = NULL;
 
     TaskHandle_t stream_task_handle = NULL;
     TaskHandle_t queue_task_handle = NULL;
+#endif
     size_t stream_task_stack_size = STREAM_TASK_STACK_SIZE;
     uint8_t stream_task_priority = 3;
     uint8_t stream_task_cpu_core = 1;
@@ -2578,7 +2587,6 @@ static const char fb_esp_rtdb_err_pgm_str_2[] PROGMEM = "path not exist";
 static const char fb_esp_rtdb_err_pgm_str_3[] PROGMEM = "data type mismatch";
 static const char fb_esp_rtdb_err_pgm_str_4[] PROGMEM = "security rules is not a valid JSON";
 
-
 // FCM error string
 static const char fb_esp_fcm_err_pgm_str_1[] PROGMEM = "no ID token or registration token provided";
 static const char fb_esp_fcm_err_pgm_str_2[] PROGMEM = "mo server key provided";

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

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

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

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

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

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

diff --git 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.10"
-#define FIREBASE_CLIENT_VERSION_NUM 40310
+#define FIREBASE_CLIENT_VERSION "4.3.11"
+#define FIREBASE_CLIENT_VERSION_NUM 40311
 
 /* 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/rtdb/FB_RTDB.cpp b/src/rtdb/FB_RTDB.cpp
@@ -1,5 +1,5 @@
 #include "Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40310)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40311)
 #error "Mixed versions compilation."
 #endif
 

diff --git 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(40310)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40311)
 #error "Mixed versions compilation."
 #endif
 

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

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

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

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

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

diff --git a/src/rtdb/QueueManager.h b/src/rtdb/QueueManager.h
@@ -1,5 +1,5 @@
 #include "Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40310)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40311)
 #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 "Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40310)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40311)
 #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 "Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40310)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40311)
 #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 "Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40310)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40311)
 #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 "Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40310)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40311)
 #error "Mixed versions compilation."
 #endif
 

diff --git 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(40310)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40311)
 #error "Mixed versions compilation."
 #endif
 

diff --git 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(40310)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40311)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/signer/Signer.cpp b/src/signer/Signer.cpp
@@ -1,14 +1,14 @@
 #include "Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40310)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40311)
 #error "Mixed versions compilation."
 #endif
 
 /**
- * Google's Firebase Token Management class, Signer.cpp version 1.3.12
+ * Google's Firebase Token Management class, Signer.cpp version 1.3.13
  *
  * This library supports Espressif ESP8266, ESP32 and Raspberry Pi Pico
  *
- * Created April 22, 2023
+ * Created June 7, 2023
  *
  * This work is a part of Firebase ESP Client library
  * Copyright (c) 2023 K. Suwatchai (Mobizt)
@@ -1810,9 +1810,6 @@ bool Firebase_Signer::reconnect()
 
     reconnect(tcpClient, nullptr);
 
-    if (noClient)
-        freeClient(&tcpClient);
-
     networkChecking = false;
 
     if (!networkStatus && config->signer.tokens.status == token_status_on_refresh)

diff --git a/src/signer/Signer.h b/src/signer/Signer.h
@@ -1,14 +1,14 @@
 #include "Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40310)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40311)
 #error "Mixed versions compilation."
 #endif
 
 /**
- * Google's Firebase Token Management class, Signer.h version 1.3.12
+ * Google's Firebase Token Management class, Signer.h version 1.3.13
  *
  * This library supports Espressif ESP8266, ESP32 and Raspberry Pi Pico
  *
- * Created April 22, 2023
+ * Created June 7, 2023
  *
  * This work is a part of Firebase ESP Client library
  * Copyright (c) 2023 K. Suwatchai (Mobizt)

diff --git 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(40310)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40311)
 #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
@@ -1,5 +1,5 @@
 #include "Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40310)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40311)
 #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
@@ -1,5 +1,5 @@
 #include "Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40310)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40311)
 #error "Mixed versions compilation."
 #endif
 

diff --git 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(40310)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40311)
 #error "Mixed versions compilation."
 #endif
 

diff --git 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(40310)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40311)
 #error "Mixed versions compilation."
 #endif
 

diff --git 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(40310)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40311)
 #error "Mixed versions compilation."
 #endif
 

diff --git 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(40310)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40311)
 #error "Mixed versions compilation."
 #endif