esphome 2024.6.6__py3-none-any.whl → 2024.7.0b1__py3-none-any.whl

esphome/components/uart/uart_component_host.h

@@ -0,0 +1,38 @@
+#pragma once
+
+#ifdef USE_HOST
+
+#include "esphome/core/component.h"
+#include "esphome/core/log.h"
+#include "uart_component.h"
+
+namespace esphome {
+namespace uart {
+
+class HostUartComponent : public UARTComponent, public Component {
+ public:
+  virtual ~HostUartComponent();
+  void setup() override;
+  void dump_config() override;
+  float get_setup_priority() const override { return setup_priority::BUS; }
+  void write_array(const uint8_t *data, size_t len) override;
+  bool peek_byte(uint8_t *data) override;
+  bool read_array(uint8_t *data, size_t len) override;
+  int available() override;
+  void flush() override;
+  void set_name(std::string port_name) { port_name_ = port_name; };
+
+ protected:
+  void update_error_(const std::string &error);
+  void check_logger_conflict() override {}
+  std::string port_name_;
+  std::string first_error_{""};
+  int file_descriptor_ = -1;
+  bool has_peek_{false};
+  uint8_t peek_byte_;
+};
+
+}  // namespace uart
+}  // namespace esphome
+
+#endif  // USE_HOST

esphome/components/uptime/sensor.py

@@ -1,7 +1,9 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
-from esphome.components import sensor
+from esphome.components import sensor, time
 from esphome.const import (
+    CONF_TIME_ID,
+    DEVICE_CLASS_TIMESTAMP,
     ENTITY_CATEGORY_DIAGNOSTIC,
     STATE_CLASS_TOTAL_INCREASING,
     UNIT_SECOND,
@@ -10,19 +12,50 @@ from esphome.const import (
 )
 
 uptime_ns = cg.esphome_ns.namespace("uptime")
-UptimeSensor = uptime_ns.class_("UptimeSensor", sensor.Sensor, cg.PollingComponent)
+UptimeSecondsSensor = uptime_ns.class_(
+    "UptimeSecondsSensor", sensor.Sensor, cg.PollingComponent
+)
+UptimeTimestampSensor = uptime_ns.class_(
+    "UptimeTimestampSensor", sensor.Sensor, cg.Component
+)
 
-CONFIG_SCHEMA = sensor.sensor_schema(
-    UptimeSensor,
-    unit_of_measurement=UNIT_SECOND,
-    icon=ICON_TIMER,
-    accuracy_decimals=0,
-    state_class=STATE_CLASS_TOTAL_INCREASING,
-    device_class=DEVICE_CLASS_DURATION,
-    entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
-).extend(cv.polling_component_schema("60s"))
+
+CONFIG_SCHEMA = cv.typed_schema(
+    {
+        "seconds": sensor.sensor_schema(
+            UptimeSecondsSensor,
+            unit_of_measurement=UNIT_SECOND,
+            icon=ICON_TIMER,
+            accuracy_decimals=0,
+            state_class=STATE_CLASS_TOTAL_INCREASING,
+            device_class=DEVICE_CLASS_DURATION,
+            entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
+        ).extend(cv.polling_component_schema("60s")),
+        "timestamp": sensor.sensor_schema(
+            UptimeTimestampSensor,
+            icon=ICON_TIMER,
+            accuracy_decimals=0,
+            device_class=DEVICE_CLASS_TIMESTAMP,
+            entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
+        )
+        .extend(
+            cv.Schema(
+                {
+                    cv.GenerateID(CONF_TIME_ID): cv.All(
+                        cv.requires_component("time"), cv.use_id(time.RealTimeClock)
+                    ),
+                }
+            )
+        )
+        .extend(cv.COMPONENT_SCHEMA),
+    },
+    default_type="seconds",
+)
 
 
 async def to_code(config):
     var = await sensor.new_sensor(config)
     await cg.register_component(var, config)
+    if time_id_config := config.get(CONF_TIME_ID):
+        time_id = await cg.get_variable(time_id_config)
+        cg.add(var.set_time(time_id))

esphome/components/uptime/{uptime_sensor.cpp → uptime_seconds_sensor.cpp}

@@ -1,14 +1,15 @@
-#include "uptime_sensor.h"
-#include "esphome/core/log.h"
-#include "esphome/core/helpers.h"
+#include "uptime_seconds_sensor.h"
+
 #include "esphome/core/hal.h"
+#include "esphome/core/helpers.h"
+#include "esphome/core/log.h"
 
 namespace esphome {
 namespace uptime {
 
 static const char *const TAG = "uptime.sensor";
 
-void UptimeSensor::update() {
+void UptimeSecondsSensor::update() {
   const uint32_t ms = millis();
   const uint64_t ms_mask = (1ULL << 32) - 1ULL;
   const uint32_t last_ms = this->uptime_ & ms_mask;
@@ -26,9 +27,12 @@ void UptimeSensor::update() {
   const float seconds = float(seconds_int) + (this->uptime_ % 1000ULL) / 1000.0f;
   this->publish_state(seconds);
 }
-std::string UptimeSensor::unique_id() { return get_mac_address() + "-uptime"; }
-float UptimeSensor::get_setup_priority() const { return setup_priority::HARDWARE; }
-void UptimeSensor::dump_config() { LOG_SENSOR("", "Uptime Sensor", this); }
+std::string UptimeSecondsSensor::unique_id() { return get_mac_address() + "-uptime"; }
+float UptimeSecondsSensor::get_setup_priority() const { return setup_priority::HARDWARE; }
+void UptimeSecondsSensor::dump_config() {
+  LOG_SENSOR("", "Uptime Sensor", this);
+  ESP_LOGCONFIG(TAG, "  Type: Seconds");
+}
 
 }  // namespace uptime
 }  // namespace esphome

esphome/components/uptime/{uptime_sensor.h → uptime_seconds_sensor.h}

@@ -1,12 +1,12 @@
 #pragma once
 
-#include "esphome/core/component.h"
 #include "esphome/components/sensor/sensor.h"
+#include "esphome/core/component.h"
 
 namespace esphome {
 namespace uptime {
 
-class UptimeSensor : public sensor::Sensor, public PollingComponent {
+class UptimeSecondsSensor : public sensor::Sensor, public PollingComponent {
  public:
   void update() override;
   void dump_config() override;

esphome/components/uptime/uptime_timestamp_sensor.cpp

@@ -0,0 +1,39 @@
+#include "uptime_timestamp_sensor.h"
+
+#ifdef USE_TIME
+
+#include "esphome/core/hal.h"
+#include "esphome/core/helpers.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace uptime {
+
+static const char *const TAG = "uptime.sensor";
+
+void UptimeTimestampSensor::setup() {
+  this->time_->add_on_time_sync_callback([this]() {
+    if (this->has_state_)
+      return;  // No need to update the timestamp if it's already set
+
+    auto now = this->time_->now();
+    const uint32_t ms = millis();
+    if (!now.is_valid())
+      return;  // No need to update the timestamp if the time is not valid
+
+    time_t timestamp = now.timestamp;
+    uint32_t seconds = ms / 1000;
+    timestamp -= seconds;
+    this->publish_state(timestamp);
+  });
+}
+float UptimeTimestampSensor::get_setup_priority() const { return setup_priority::HARDWARE; }
+void UptimeTimestampSensor::dump_config() {
+  LOG_SENSOR("", "Uptime Sensor", this);
+  ESP_LOGCONFIG(TAG, "  Type: Timestamp");
+}
+
+}  // namespace uptime
+}  // namespace esphome
+
+#endif  // USE_TIME

esphome/components/uptime/uptime_timestamp_sensor.h

@@ -0,0 +1,30 @@
+#pragma once
+
+#include "esphome/core/defines.h"
+
+#ifdef USE_TIME
+
+#include "esphome/components/sensor/sensor.h"
+#include "esphome/components/time/real_time_clock.h"
+#include "esphome/core/component.h"
+
+namespace esphome {
+namespace uptime {
+
+class UptimeTimestampSensor : public sensor::Sensor, public Component {
+ public:
+  void setup() override;
+  void dump_config() override;
+
+  float get_setup_priority() const override;
+
+  void set_time(time::RealTimeClock *time) { this->time_ = time; }
+
+ protected:
+  time::RealTimeClock *time_;
+};
+
+}  // namespace uptime
+}  // namespace esphome
+
+#endif  // USE_TIME

esphome/components/veml7700/veml7700.cpp

@@ -243,7 +243,7 @@ ErrorCode VEML7700Component::configure_() {
   }
 
   PSMRegister psm{0};
-  psm.PSM = PSM::PSM_MODE_1;
+  psm.PSM = PSMMode::PSM_MODE_1;
   psm.PSM_EN = false;
   ESP_LOGV(TAG, "Setting PSM to 0x%04X", psm.raw);
   err = this->write_register((uint8_t) CommandRegisters::PWR_SAVING, psm.raw_bytes, VEML_REG_SIZE);

esphome/components/veml7700/veml7700.h

@@ -24,7 +24,7 @@ enum class CommandRegisters : uint8_t {
   ALS_INT = 0x06      // R: ALS INT trigger event
 };
 
-enum Gain : uint8_t {
+enum Gain : uint16_t {
   X_1 = 0,
   X_2 = 1,
   X_1_8 = 2,
@@ -32,7 +32,7 @@ enum Gain : uint8_t {
 };
 const uint8_t GAINS_COUNT = 4;
 
-enum IntegrationTime : uint8_t {
+enum IntegrationTime : uint16_t {
   INTEGRATION_TIME_25MS = 0b1100,
   INTEGRATION_TIME_50MS = 0b1000,
   INTEGRATION_TIME_100MS = 0b0000,
@@ -42,14 +42,14 @@ enum IntegrationTime : uint8_t {
 };
 const uint8_t INTEGRATION_TIMES_COUNT = 6;
 
-enum Persistence : uint8_t {
+enum Persistence : uint16_t {
   PERSISTENCE_1 = 0,
   PERSISTENCE_2 = 1,
   PERSISTENCE_4 = 2,
   PERSISTENCE_8 = 3,
 };
 
-enum PSM : uint8_t {
+enum PSMMode : uint16_t {
   PSM_MODE_1 = 0,
   PSM_MODE_2 = 1,
   PSM_MODE_3 = 2,
@@ -92,7 +92,7 @@ union PSMRegister {
   uint8_t raw_bytes[2];
   struct {
     bool PSM_EN : 1;
-    uint8_t PSM : 2;
+    PSMMode PSM : 2;
     uint16_t reserved : 13;
   } __attribute__((packed));
 };

esphome/components/voice_assistant/voice_assistant.cpp

@@ -799,7 +799,7 @@ void VoiceAssistant::on_audio(const api::VoiceAssistantAudio &msg) {
     this->speaker_buffer_index_ += msg.data.length();
     this->speaker_buffer_size_ += msg.data.length();
     this->speaker_bytes_received_ += msg.data.length();
-    ESP_LOGV(TAG, "Received audio: %" PRId32 " bytes from API", msg.data.length());
+    ESP_LOGV(TAG, "Received audio: %u bytes from API", msg.data.length());
   } else {
     ESP_LOGE(TAG, "Cannot receive audio, buffer is full");
   }

esphome/components/wifi/wifi_component_esp_idf.cpp

@@ -757,7 +757,7 @@ void WiFiComponent::wifi_process_event_(IDFWiFiEvent *data) {
 
 WiFiSTAConnectStatus WiFiComponent::wifi_sta_connect_status_() {
   if (s_sta_connected && this->got_ipv4_address_) {
-#if USE_NETWORK_IPV6
+#if USE_NETWORK_IPV6 && (USE_NETWORK_MIN_IPV6_ADDR_COUNT > 0)
     if (this->num_ipv6_addresses_ >= USE_NETWORK_MIN_IPV6_ADDR_COUNT) {
       return WiFiSTAConnectStatus::CONNECTED;
     }

esphome/components/wifi/wifi_component_pico_w.cpp

@@ -141,13 +141,29 @@ bool WiFiComponent::wifi_scan_start_(bool passive) {
 
 #ifdef USE_WIFI_AP
 bool WiFiComponent::wifi_ap_ip_config_(optional<ManualIP> manual_ip) {
-  // TODO:
-  return false;
+  esphome::network::IPAddress ip_address, gateway, subnet, dns;
+  if (manual_ip.has_value()) {
+    ip_address = manual_ip->static_ip;
+    gateway = manual_ip->gateway;
+    subnet = manual_ip->subnet;
+    dns = manual_ip->static_ip;
+  } else {
+    ip_address = network::IPAddress(192, 168, 4, 1);
+    gateway = network::IPAddress(192, 168, 4, 1);
+    subnet = network::IPAddress(255, 255, 255, 0);
+    dns = network::IPAddress(192, 168, 4, 1);
+  }
+  WiFi.config(ip_address, dns, gateway, subnet);
+  return true;
 }
 
 bool WiFiComponent::wifi_start_ap_(const WiFiAP &ap) {
   if (!this->wifi_mode_({}, true))
     return false;
+  if (!this->wifi_ap_ip_config_(ap.get_manual_ip())) {
+    ESP_LOGV(TAG, "wifi_ap_ip_config_ failed!");
+    return false;
+  }
 
   WiFi.beginAP(ap.get_ssid().c_str(), ap.get_password().c_str(), ap.get_channel().value_or(1));
 

esphome/components/wireguard/__init__.py

@@ -132,7 +132,7 @@ async def to_code(config):
     # the '+1' modifier is relative to the device's own address that will
     # be automatically added to the provided list.
     cg.add_build_flag(f"-DCONFIG_WIREGUARD_MAX_SRC_IPS={len(allowed_ips) + 1}")
-    cg.add_library("droscy/esp_wireguard", "0.4.1")
+    cg.add_library("droscy/esp_wireguard", "0.4.2")
 
     await cg.register_component(var, config)
 

esphome/components/x9c/output.py

@@ -27,7 +27,13 @@ CONFIG_SCHEMA = cv.All(
             cv.Optional(CONF_INITIAL_VALUE, default=1.0): cv.float_range(
                 min=0.01, max=1.0
             ),
-            cv.Optional(CONF_STEP_DELAY, default=1): cv.int_range(min=1, max=100),
+            cv.Optional(CONF_STEP_DELAY, default="1us"): cv.All(
+                cv.positive_time_period_microseconds,
+                cv.Range(
+                    min=cv.TimePeriod(microseconds=1),
+                    max=cv.TimePeriod(microseconds=100),
+                ),
+            ),
         }
     )
 )

esphome/const.py

@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2024.6.6"
+__version__ = "2024.7.0b1"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 VALID_SUBSTITUTIONS_CHARACTERS = (
@@ -1072,6 +1072,7 @@ DEVICE_CLASS_BUTTON = "button"
 DEVICE_CLASS_CARBON_DIOXIDE = "carbon_dioxide"
 DEVICE_CLASS_CARBON_MONOXIDE = "carbon_monoxide"
 DEVICE_CLASS_COLD = "cold"
+DEVICE_CLASS_CONDUCTIVITY = "conductivity"
 DEVICE_CLASS_CONNECTIVITY = "connectivity"
 DEVICE_CLASS_CURRENT = "current"
 DEVICE_CLASS_CURTAIN = "curtain"

esphome/core/defines.h

@@ -86,6 +86,7 @@
 #define USE_ESP32_BLE_SERVER
 #define USE_ESP32_CAMERA
 #define USE_IMPROV
+#define USE_MICRO_WAKE_WORD_VAD
 #define USE_MICROPHONE
 #define USE_PSRAM
 #define USE_SOCKET_IMPL_BSD_SOCKETS

esphome/core/helpers.cpp

@@ -93,7 +93,7 @@ std::string to_string(long double value) { return str_snprintf("%Lf", 32, value)
 // Mathematics
 
 float lerp(float completion, float start, float end) { return start + (end - start) * completion; }
-uint8_t crc8(uint8_t *data, uint8_t len) {
+uint8_t crc8(const uint8_t *data, uint8_t len) {
   uint8_t crc = 0;
 
   while ((len--) != 0u) {

esphome/core/helpers.h

@@ -155,7 +155,7 @@ template<typename T, typename U> T remap(U value, U min, U max, T min_out, T max
 }
 
 /// Calculate a CRC-8 checksum of \p data with size \p len.
-uint8_t crc8(uint8_t *data, uint8_t len);
+uint8_t crc8(const uint8_t *data, uint8_t len);
 
 /// Calculate a CRC-16 checksum of \p data with size \p len.
 uint16_t crc16(const uint8_t *data, uint16_t len, uint16_t crc = 0xffff, uint16_t reverse_poly = 0xa001,

esphome/external_files.py

@@ -7,6 +7,7 @@ from datetime import datetime
 import requests
 import esphome.config_validation as cv
 from esphome.core import CORE, TimePeriodSeconds
+from esphome.const import __version__
 
 _LOGGER = logging.getLogger(__name__)
 CODEOWNERS = ["@landonr"]
@@ -75,3 +76,28 @@ def compute_local_file_dir(domain: str) -> Path:
     base_directory.mkdir(parents=True, exist_ok=True)
 
     return base_directory
+
+
+def download_content(url: str, path: Path, timeout=NETWORK_TIMEOUT) -> None:
+    if not has_remote_file_changed(url, path):
+        _LOGGER.debug("Remote file has not changed %s", url)
+        return
+
+    _LOGGER.debug(
+        "Remote file has changed, downloading from %s to %s",
+        url,
+        path,
+    )
+
+    try:
+        req = requests.get(
+            url,
+            timeout=timeout,
+            headers={"User-agent": f"ESPHome/{__version__} (https://esphome.io)"},
+        )
+        req.raise_for_status()
+    except requests.exceptions.RequestException as e:
+        raise cv.Invalid(f"Could not download from {url}: {e}")
+
+    path.parent.mkdir(parents=True, exist_ok=True)
+    path.write_bytes(req.content)

{esphome-2024.6.6.dist-info → esphome-2024.7.0b1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: esphome
-Version: 2024.6.6
+Version: 2024.7.0b1
 Summary: Make creating custom firmwares for ESP32/ESP8266 super easy.
 Author-email: The ESPHome Authors <esphome@nabucasa.com>
 License: MIT