Merge remote-tracking branch 'upstream/dev' into integration

esphome/components/nrf52/__init__.py

@@ -103,6 +103,7 @@ nrf52_ns = cg.esphome_ns.namespace("nrf52")
 DeviceFirmwareUpdate = nrf52_ns.class_("DeviceFirmwareUpdate", cg.Component)
 
 CONF_DFU = "dfu"
+CONF_DCDC = "dcdc"
 CONF_REG0 = "reg0"
 CONF_UICR_ERASE = "uicr_erase"
 
@@ -121,6 +122,7 @@ CONFIG_SCHEMA = cv.All(
                     cv.Required(CONF_RESET_PIN): pins.gpio_output_pin_schema,
                 }
             ),
+            cv.Optional(CONF_DCDC, default=True): cv.boolean,
             cv.Optional(CONF_REG0): cv.Schema(
                 {
                     cv.Required(CONF_VOLTAGE): cv.All(
@@ -196,6 +198,7 @@ async def to_code(config: ConfigType) -> None:
 
     if dfu_config := config.get(CONF_DFU):
         CORE.add_job(_dfu_to_code, dfu_config)
+    zephyr_add_prj_conf("BOARD_ENABLE_DCDC", config[CONF_DCDC])
 
     if reg0_config := config.get(CONF_REG0):
         value = VOLTAGE_LEVELS.index(reg0_config[CONF_VOLTAGE])

esphome/components/wifi/wifi_component.cpp

@@ -1063,7 +1063,7 @@ void WiFiComponent::check_connecting_finished() {
     this->retry_phase_ = WiFiRetryPhase::INITIAL_CONNECT;
     this->num_retried_ = 0;
     // Ensure next connection attempt does not inherit error state
-    // so when WiFi disconnects later we start fresh we don't see
+    // so when WiFi disconnects later we start fresh and don't see
     // the first connection as a failure.
     this->error_from_callback_ = false;
 

tests/components/nrf52/test.nrf52-adafruit.yaml

@@ -15,6 +15,7 @@ nrf52:
       inverted: true
       mode:
         output: true
+  dcdc: False
   reg0:
     voltage: 2.1V
     uicr_erase: true