Merge branch 'master' into master

espressif · Oct 3, 2024 · bca1f9b · bca1f9b
2 parents 805324a + 733373a
commit bca1f9b
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 7 deletions.
diff --git a/cores/esp32/esp32-hal-misc.c b/cores/esp32/esp32-hal-misc.c
@@ -251,13 +251,11 @@ extern bool btInUse();
 #endif
 
 #if CONFIG_SPIRAM_SUPPORT || CONFIG_SPIRAM
-#ifndef CONFIG_SPIRAM_BOOT_INIT
 ESP_SYSTEM_INIT_FN(init_psram_new, BIT(0), 99) {
   psramInit();
   return ESP_OK;
 }
 #endif
-#endif
 
 void initArduino() {
   //init proper ref tick value for PLL (uncomment if REF_TICK is different than 1MHz)

diff --git a/libraries/OpenThread/README.md b/libraries/OpenThread/README.md
@@ -19,7 +19,7 @@ Below are the details of the class:
 ```cpp
 class OpenThreadCLI : public Stream {
 private:
-  static size_t setBuffer(xQueueHandle &queue, size_t len);
+  static size_t setBuffer(QueueHandle_t &queue, size_t len);
   bool otStarted = false;
 
 public:

diff --git a/libraries/OpenThread/src/OThreadCLI.cpp b/libraries/OpenThread/src/OThreadCLI.cpp
@@ -21,8 +21,8 @@
 
 static TaskHandle_t s_cli_task = NULL;
 static TaskHandle_t s_console_cli_task = NULL;
-static xQueueHandle rx_queue = NULL;
-static xQueueHandle tx_queue = NULL;
+static QueueHandle_t rx_queue = NULL;
+static QueueHandle_t tx_queue = NULL;
 
 static esp_openthread_platform_config_t ot_native_config;
 static TaskHandle_t s_ot_task = NULL;
@@ -389,7 +389,7 @@ size_t OpenThreadCLI::write(uint8_t c) {
   return 1;
 }
 
-size_t OpenThreadCLI::setBuffer(xQueueHandle &queue, size_t queue_len) {
+size_t OpenThreadCLI::setBuffer(QueueHandle_t &queue, size_t queue_len) {
   if (queue) {
     vQueueDelete(queue);
     queue = NULL;

diff --git a/libraries/OpenThread/src/OThreadCLI.h b/libraries/OpenThread/src/OThreadCLI.h
@@ -22,7 +22,7 @@ typedef std::function<void(void)> OnReceiveCb_t;
 
 class OpenThreadCLI : public Stream {
 private:
-  static size_t setBuffer(xQueueHandle &queue, size_t len);
+  static size_t setBuffer(QueueHandle_t &queue, size_t len);
   bool otStarted = false;
 
 public: