Merge branch 'integration' into memory_api

esphome/components/api/api_connection.cpp

@@ -1520,19 +1520,18 @@ void APIConnection::execute_service(const ExecuteServiceRequest &msg) {
 #endif
 #ifdef USE_API_NOISE
 bool APIConnection::send_noise_encryption_set_key_response(const NoiseEncryptionSetKeyRequest &msg) {
-  psk_t psk{};
   NoiseEncryptionSetKeyResponse resp;
+  resp.success = false;
+
+  psk_t psk{};
   if (base64_decode(msg.key, psk.data(), msg.key.size()) != psk.size()) {
     ESP_LOGW(TAG, "Invalid encryption key length");
-    resp.success = false;
+  } else if (!this->parent_->save_noise_psk(psk, true)) {
-    return this->send_message(resp, NoiseEncryptionSetKeyResponse::MESSAGE_TYPE);
-  }
-  if (!this->parent_->save_noise_psk(psk, true)) {
     ESP_LOGW(TAG, "Failed to save encryption key");
-    resp.success = false;
+  } else {
-    return this->send_message(resp, NoiseEncryptionSetKeyResponse::MESSAGE_TYPE);
-  }
     resp.success = true;
+  }
+
   return this->send_message(resp, NoiseEncryptionSetKeyResponse::MESSAGE_TYPE);
 }
 #endif

esphome/components/logger/logger.cpp

@@ -8,8 +8,7 @@
 #include "esphome/core/hal.h"
 #include "esphome/core/log.h"
 
-namespace esphome {
+namespace esphome::logger {
-namespace logger {
 
 static const char *const TAG = "logger";
 
@@ -283,5 +282,4 @@ void Logger::set_log_level(uint8_t level) {
 
 Logger *global_logger = nullptr;  // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
 
-}  // namespace logger
+}  // namespace esphome::logger
-}  // namespace esphome

esphome/components/logger/logger.h

@@ -34,9 +34,7 @@
 struct device;
 #endif
 
-namespace esphome {
+namespace esphome::logger {
-
-namespace logger {
 
 // Color and letter constants for log levels
 static const char *const LOG_LEVEL_COLORS[] = {
@@ -411,6 +409,4 @@ class LoggerMessageTrigger : public Trigger<uint8_t, const char *, const char *>
   uint8_t level_;
 };
 
-}  // namespace logger
+}  // namespace esphome::logger
-
-}  // namespace esphome

esphome/components/logger/logger_esp32.cpp

@@ -29,8 +29,7 @@
 
 #include "esphome/core/log.h"
 
-namespace esphome {
+namespace esphome::logger {
-namespace logger {
 
 static const char *const TAG = "logger";
 
@@ -206,6 +205,5 @@ const char *const UART_SELECTIONS[] = {
 
 const char *Logger::get_uart_selection_() { return UART_SELECTIONS[this->uart_]; }
 
-}  // namespace logger
+}  // namespace esphome::logger
-}  // namespace esphome
 #endif

esphome/components/logger/logger_esp8266.cpp

@@ -2,8 +2,7 @@
 #include "logger.h"
 #include "esphome/core/log.h"
 
-namespace esphome {
+namespace esphome::logger {
-namespace logger {
 
 static const char *const TAG = "logger";
 
@@ -40,6 +39,5 @@ const char *const UART_SELECTIONS[] = {"UART0", "UART1", "UART0_SWAP"};
 
 const char *Logger::get_uart_selection_() { return UART_SELECTIONS[this->uart_]; }
 
-}  // namespace logger
+}  // namespace esphome::logger
-}  // namespace esphome
 #endif

esphome/components/logger/logger_host.cpp

@@ -1,8 +1,7 @@
 #if defined(USE_HOST)
 #include "logger.h"
 
-namespace esphome {
+namespace esphome::logger {
-namespace logger {
 
 void HOT Logger::write_msg_(const char *msg) {
   time_t rawtime;
@@ -18,7 +17,6 @@ void HOT Logger::write_msg_(const char *msg) {
 
 void Logger::pre_setup() { global_logger = this; }
 
-}  // namespace logger
+}  // namespace esphome::logger
-}  // namespace esphome
 
 #endif

esphome/components/logger/logger_libretiny.cpp

@@ -1,8 +1,7 @@
 #ifdef USE_LIBRETINY
 #include "logger.h"
 
-namespace esphome {
+namespace esphome::logger {
-namespace logger {
 
 static const char *const TAG = "logger";
 
@@ -56,7 +55,6 @@ const char *const UART_SELECTIONS[] = {"DEFAULT", "UART0", "UART1", "UART2"};
 
 const char *Logger::get_uart_selection_() { return UART_SELECTIONS[this->uart_]; }
 
-}  // namespace logger
+}  // namespace esphome::logger
-}  // namespace esphome
 
 #endif  // USE_LIBRETINY

esphome/components/logger/logger_rp2040.cpp

@@ -2,8 +2,7 @@
 #include "logger.h"
 #include "esphome/core/log.h"
 
-namespace esphome {
+namespace esphome::logger {
-namespace logger {
 
 static const char *const TAG = "logger";
 
@@ -34,6 +33,5 @@ const char *const UART_SELECTIONS[] = {"UART0", "UART1", "USB_CDC"};
 
 const char *Logger::get_uart_selection_() { return UART_SELECTIONS[this->uart_]; }
 
-}  // namespace logger
+}  // namespace esphome::logger
-}  // namespace esphome
 #endif  // USE_RP2040

esphome/components/logger/logger_zephyr.cpp

@@ -8,8 +8,7 @@
 #include <zephyr/drivers/uart.h>
 #include <zephyr/usb/usb_device.h>
 
-namespace esphome {
+namespace esphome::logger {
-namespace logger {
 
 static const char *const TAG = "logger";
 
@@ -82,7 +81,6 @@ const char *const UART_SELECTIONS[] = {"UART0", "UART1", "USB_CDC"};
 
 const char *Logger::get_uart_selection_() { return UART_SELECTIONS[this->uart_]; }
 
-}  // namespace logger
+}  // namespace esphome::logger
-}  // namespace esphome
 
 #endif

esphome/components/logger/select/logger_level_select.cpp

@@ -1,7 +1,6 @@
 #include "logger_level_select.h"
 
-namespace esphome {
+namespace esphome::logger {
-namespace logger {
 
 void LoggerLevelSelect::publish_state(int level) {
   auto value = this->at(level);
@@ -23,5 +22,4 @@ void LoggerLevelSelect::control(const std::string &value) {
   this->parent_->set_log_level(level.value());
 }
 
-}  // namespace logger
+}  // namespace esphome::logger
-}  // namespace esphome

esphome/components/logger/select/logger_level_select.h

@@ -3,13 +3,11 @@
 #include "esphome/components/select/select.h"
 #include "esphome/core/component.h"
 #include "esphome/components/logger/logger.h"
-namespace esphome {
+namespace esphome::logger {
-namespace logger {
 class LoggerLevelSelect : public Component, public select::Select, public Parented<Logger> {
  public:
   void publish_state(int level);
   void setup() override;
   void control(const std::string &value) override;
 };
-}  // namespace logger
+}  // namespace esphome::logger
-}  // namespace esphome

esphome/components/logger/task_log_buffer.cpp

@@ -5,8 +5,7 @@
 
 #ifdef USE_ESPHOME_TASK_LOG_BUFFER
 
-namespace esphome {
+namespace esphome::logger {
-namespace logger {
 
 TaskLogBuffer::TaskLogBuffer(size_t total_buffer_size) {
   // Store the buffer size
@@ -132,7 +131,6 @@ bool TaskLogBuffer::send_message_thread_safe(uint8_t level, const char *tag, uin
   return true;
 }
 
-}  // namespace logger
+}  // namespace esphome::logger
-}  // namespace esphome
 
 #endif  // USE_ESPHOME_TASK_LOG_BUFFER

esphome/components/logger/task_log_buffer.h

@@ -11,8 +11,7 @@
 #include <freertos/FreeRTOS.h>
 #include <freertos/ringbuf.h>
 
-namespace esphome {
+namespace esphome::logger {
-namespace logger {
 
 class TaskLogBuffer {
  public:
@@ -63,7 +62,6 @@ class TaskLogBuffer {
   mutable uint16_t last_processed_counter_{0};  // Tracks last processed message
 };
 
-}  // namespace logger
+}  // namespace esphome::logger
-}  // namespace esphome
 
 #endif  // USE_ESPHOME_TASK_LOG_BUFFER

esphome/components/wifi/__init__.py

@@ -1,6 +1,7 @@
 from esphome import automation
 from esphome.automation import Condition
 import esphome.codegen as cg
+from esphome.components.const import CONF_USE_PSRAM
 from esphome.components.esp32 import add_idf_sdkconfig_option, const, get_esp32_variant
 from esphome.components.network import IPAddress
 from esphome.config_helpers import filter_source_files_from_platform
@@ -334,6 +335,9 @@ CONFIG_SCHEMA = cv.All(
             cv.Optional(CONF_ON_DISCONNECT): automation.validate_automation(
                 single=True
             ),
+            cv.Optional(CONF_USE_PSRAM): cv.All(
+                cv.requires_component("psram"), cv.boolean
+            ),
         }
     ),
     _validate,
@@ -454,6 +458,8 @@ async def to_code(config):
         if config[CONF_ENABLE_RRM]:
             cg.add(var.set_rrm(config[CONF_ENABLE_RRM]))
 
+    if config.get(CONF_USE_PSRAM):
+        add_idf_sdkconfig_option("CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP", True)
     cg.add_define("USE_WIFI")
 
     # must register before OTA safe mode check

esphome/core/component.cpp

@@ -159,7 +159,7 @@ void Component::call() {
       this->call_setup();
 #if ESPHOME_LOG_LEVEL >= ESPHOME_LOG_LEVEL_DEBUG
       uint32_t setup_time = millis() - start_time;
-      ESP_LOGD(TAG, "Setup %s took %ums", this->get_component_source(), setup_time);
+      ESP_LOGD(TAG, "Setup %s took %ums", this->get_component_source(), (unsigned) setup_time);
 #endif
       break;
     }

tests/components/wifi/test.esp32-idf.yaml

@@ -1 +1,7 @@
-<<: !include common.yaml
+psram:
+
+wifi:
+  use_psram: true
+
+packages:
+  - !include common.yaml