esphome 2024.10.0b1__py3-none-any.whl → 2024.10.0b2__py3-none-any.whl

esphome/components/cse7766/cse7766.cpp

@@ -244,7 +244,7 @@ void CSE7766Component::dump_config() {
   LOG_SENSOR("  ", "Apparent Power", this->apparent_power_sensor_);
   LOG_SENSOR("  ", "Reactive Power", this->reactive_power_sensor_);
   LOG_SENSOR("  ", "Power Factor", this->power_factor_sensor_);
-  this->check_uart_settings(4800);
+  this->check_uart_settings(4800, 1, uart::UART_CONFIG_PARITY_EVEN);
 }
 
 }  // namespace cse7766

esphome/components/event/__init__.py

@@ -1,6 +1,6 @@
 from esphome import automation
 import esphome.codegen as cg
-from esphome.components import mqtt
+from esphome.components import mqtt, web_server
 import esphome.config_validation as cv
 from esphome.const import (
     CONF_DEVICE_CLASS,
@@ -11,6 +11,7 @@ from esphome.const import (
     CONF_MQTT_ID,
     CONF_ON_EVENT,
     CONF_TRIGGER_ID,
+    CONF_WEB_SERVER,
     DEVICE_CLASS_BUTTON,
     DEVICE_CLASS_DOORBELL,
     DEVICE_CLASS_EMPTY,
@@ -40,17 +41,21 @@ EventTrigger = event_ns.class_("EventTrigger", automation.Trigger.template())
 
 validate_device_class = cv.one_of(*DEVICE_CLASSES, lower=True, space="_")
 
-EVENT_SCHEMA = cv.ENTITY_BASE_SCHEMA.extend(cv.MQTT_COMPONENT_SCHEMA).extend(
-    {
-        cv.OnlyWith(CONF_MQTT_ID, "mqtt"): cv.declare_id(mqtt.MQTTEventComponent),
-        cv.GenerateID(): cv.declare_id(Event),
-        cv.Optional(CONF_DEVICE_CLASS): validate_device_class,
-        cv.Optional(CONF_ON_EVENT): automation.validate_automation(
-            {
-                cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(EventTrigger),
-            }
-        ),
-    }
+EVENT_SCHEMA = (
+    cv.ENTITY_BASE_SCHEMA.extend(web_server.WEBSERVER_SORTING_SCHEMA)
+    .extend(cv.MQTT_COMPONENT_SCHEMA)
+    .extend(
+        {
+            cv.OnlyWith(CONF_MQTT_ID, "mqtt"): cv.declare_id(mqtt.MQTTEventComponent),
+            cv.GenerateID(): cv.declare_id(Event),
+            cv.Optional(CONF_DEVICE_CLASS): validate_device_class,
+            cv.Optional(CONF_ON_EVENT): automation.validate_automation(
+                {
+                    cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(EventTrigger),
+                }
+            ),
+        }
+    )
 )
 
 _UNDEF = object()
@@ -97,6 +102,9 @@ async def setup_event_core_(var, config, *, event_types: list[str]):
         mqtt_ = cg.new_Pvariable(mqtt_id, var)
         await mqtt.register_mqtt_component(mqtt_, config)
 
+    if web_server_config := config.get(CONF_WEB_SERVER):
+        await web_server.add_entity_config(var, web_server_config)
+
 
 async def register_event(var, config, *, event_types: list[str]):
     if not CORE.has_id(config[CONF_ID]):

esphome/components/shelly_dimmer/shelly_dimmer.cpp

@@ -64,46 +64,46 @@ uint16_t shelly_dimmer_checksum(const uint8_t *buf, int len) {
   return std::accumulate<decltype(buf), uint16_t>(buf, buf + len, 0);
 }
 
-void ShellyDimmer::setup() {
-  this->pin_nrst_->setup();
-  this->pin_boot0_->setup();
-
-  ESP_LOGI(TAG, "Initializing Shelly Dimmer...");
+bool ShellyDimmer::is_running_configured_version() const {
+  return this->version_major_ == USE_SHD_FIRMWARE_MAJOR_VERSION &&
+         this->version_minor_ == USE_SHD_FIRMWARE_MINOR_VERSION;
+}
 
+void ShellyDimmer::handle_firmware() {
   // Reset the STM32 and check the firmware version.
-  for (int i = 0; i < 2; i++) {
-    this->reset_normal_boot_();
-    this->send_command_(SHELLY_DIMMER_PROTO_CMD_VERSION, nullptr, 0);
-    ESP_LOGI(TAG, "STM32 current firmware version: %d.%d, desired version: %d.%d", this->version_major_,
-             this->version_minor_, USE_SHD_FIRMWARE_MAJOR_VERSION, USE_SHD_FIRMWARE_MINOR_VERSION);
-    if (this->version_major_ != USE_SHD_FIRMWARE_MAJOR_VERSION ||
-        this->version_minor_ != USE_SHD_FIRMWARE_MINOR_VERSION) {
-#ifdef USE_SHD_FIRMWARE_DATA
-      // Update firmware if needed.
-      ESP_LOGW(TAG, "Unsupported STM32 firmware version, flashing");
-      if (i > 0) {
-        // Upgrade was already performed but the reported version is still not right.
-        ESP_LOGE(TAG, "STM32 firmware upgrade already performed, but version is still incorrect");
-        this->mark_failed();
-        return;
-      }
+  this->reset_normal_boot_();
+  this->send_command_(SHELLY_DIMMER_PROTO_CMD_VERSION, nullptr, 0);
+  ESP_LOGI(TAG, "STM32 current firmware version: %d.%d, desired version: %d.%d", this->version_major_,
+           this->version_minor_, USE_SHD_FIRMWARE_MAJOR_VERSION, USE_SHD_FIRMWARE_MINOR_VERSION);
 
-      if (!this->upgrade_firmware_()) {
-        ESP_LOGW(TAG, "Failed to upgrade firmware");
-        this->mark_failed();
-        return;
-      }
+  if (!is_running_configured_version()) {
+#ifdef USE_SHD_FIRMWARE_DATA
+    if (!this->upgrade_firmware_()) {
+      ESP_LOGW(TAG, "Failed to upgrade firmware");
+      this->mark_failed();
+      return;
+    }
 
-      // Firmware upgrade completed, do the checks again.
-      continue;
-#else
-      ESP_LOGW(TAG, "Firmware version mismatch, put 'update: true' in the yaml to flash an update.");
+    this->reset_normal_boot_();
+    this->send_command_(SHELLY_DIMMER_PROTO_CMD_VERSION, nullptr, 0);
+    if (!is_running_configured_version()) {
+      ESP_LOGE(TAG, "STM32 firmware upgrade already performed, but version is still incorrect");
       this->mark_failed();
       return;
-#endif
     }
-    break;
+#else
+    ESP_LOGW(TAG, "Firmware version mismatch, put 'update: true' in the yaml to flash an update.");
+#endif
   }
+}
+
+void ShellyDimmer::setup() {
+  this->pin_nrst_->setup();
+  this->pin_boot0_->setup();
+
+  ESP_LOGI(TAG, "Initializing Shelly Dimmer...");
+
+  this->handle_firmware();
 
   this->send_settings_();
   // Do an immediate poll to refresh current state.

esphome/components/shelly_dimmer/shelly_dimmer.h

@@ -20,6 +20,8 @@ class ShellyDimmer : public PollingComponent, public light::LightOutput, public
  public:
   float get_setup_priority() const override { return setup_priority::LATE; }
 
+  bool is_running_configured_version() const;
+  void handle_firmware();
   void setup() override;
   void update() override;
   void dump_config() override;

esphome/components/touchscreen/touchscreen.cpp

@@ -18,8 +18,8 @@ void Touchscreen::attach_interrupt_(InternalGPIOPin *irq_pin, esphome::gpio::Int
 
 void Touchscreen::call_setup() {
   if (this->display_ != nullptr) {
-    this->display_width_ = this->display_->get_native_width();
-    this->display_height_ = this->display_->get_native_height();
+    this->display_width_ = this->display_->get_width();
+    this->display_height_ = this->display_->get_height();
   }
   PollingComponent::call_setup();
 }

esphome/components/web_server/web_server.cpp

@@ -1443,7 +1443,7 @@ void WebServer::on_event(event::Event *obj, const std::string &event_type) {
 }
 
 std::string WebServer::event_json(event::Event *obj, const std::string &event_type, JsonDetail start_config) {
-  return json::build_json([obj, event_type, start_config](JsonObject root) {
+  return json::build_json([this, obj, event_type, start_config](JsonObject root) {
     set_json_id(root, obj, "event-" + obj->get_object_id(), start_config);
     if (!event_type.empty()) {
       root["event_type"] = event_type;
@@ -1454,6 +1454,12 @@ std::string WebServer::event_json(event::Event *obj, const std::string &event_ty
         event_types.add(event_type);
       }
       root["device_class"] = obj->get_device_class();
+      if (this->sorting_entitys_.find(obj) != this->sorting_entitys_.end()) {
+        root["sorting_weight"] = this->sorting_entitys_[obj].weight;
+        if (this->sorting_groups_.find(this->sorting_entitys_[obj].group_id) != this->sorting_groups_.end()) {
+          root["sorting_group"] = this->sorting_groups_[this->sorting_entitys_[obj].group_id].name;
+        }
+      }
     }
   });
 }

esphome/const.py

@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2024.10.0b1"
+__version__ = "2024.10.0b2"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 VALID_SUBSTITUTIONS_CHARACTERS = (

{esphome-2024.10.0b1.dist-info → esphome-2024.10.0b2.dist-info}/METADATA

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

{esphome-2024.10.0b1.dist-info → esphome-2024.10.0b2.dist-info}/RECORD

@@ -5,7 +5,7 @@ esphome/codegen.py,sha256=GePHUM7xdXb_Pil59SHVsXg2F4VBPgkH-Fz2PDX8Z54,1873
 esphome/config.py,sha256=ArMupdqCpKqQm-vFWb85HueI88DAfYTjuhR6mA691DI,39614
 esphome/config_helpers.py,sha256=MKf_wzO35nn41FvigXE0iYKDslPgL2ruf8R-EPtTT2I,3256
 esphome/config_validation.py,sha256=MeZcJrTRpe91KV5r18i6U-PeZ_Oaql81m12KW_gzCXU,66221
-esphome/const.py,sha256=txoEIVoFmFH6OkOGtjON_ClzbCOpKdRN8Lom9cy-__Q,40032
+esphome/const.py,sha256=5j2rexALciDIOWlhQ3DGCKi3G1MqnK7dqDT4cts7zRo,40032
 esphome/coroutine.py,sha256=j_14z8dIIzIBeuNO30D4c1RJvMMt1xZFZ58Evd-EvJA,9344
 esphome/cpp_generator.py,sha256=lXPXHYUsFIvBSAoZ93mXYlGcXYg5L18nTtYGHE4_rr8,31203
 esphome/cpp_helpers.py,sha256=6C2vNbOIhZKi43xRVlk5hp9GfshfBn-rc5D_ZFUEYaE,4801
@@ -535,7 +535,7 @@ esphome/components/cse7761/cse7761.cpp,sha256=tsZJZYSmexAqgpxgRgFPDE9x20TmPIWslW
 esphome/components/cse7761/cse7761.h,sha256=GYUBIQqtqnCre8hcwRhLFH9jlbWVvPcaCvtOOdTZfmc,1805
 esphome/components/cse7761/sensor.py,sha256=4_1oWJ_Tg0yfgTpWIvYknppGEN9sdo3PfzVEJNAMhGA,2838
 esphome/components/cse7766/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-esphome/components/cse7766/cse7766.cpp,sha256=krj0TRI21rTRxVQfwGnVyj0KVKoKtLzTHvq-V0mtO90,7806
+esphome/components/cse7766/cse7766.cpp,sha256=1mPxd9PvGrivN4f1MYI_cL_Z1MiLPvpK6EY2mNEk7fk,7840
 esphome/components/cse7766/cse7766.h,sha256=RE_q5Sa2n8PLkQsO3C9Nt11g6PS_5XBIVD1w3yvzP5o,1743
 esphome/components/cse7766/sensor.py,sha256=rHZGEUgTD8j6V9u8kTKSfRWQ67HzqIeHa9YaC5j6K70,4082
 esphome/components/cst226/__init__.py,sha256=Xbt13-GS0lUNexCt3EYip3UvO15P2cdJdepZWoDqBw8,130
@@ -866,7 +866,7 @@ esphome/components/ethernet_info/__init__.py,sha256=LoiZr_nRyJfR5w1ZWOFppOVTQRwl
 esphome/components/ethernet_info/ethernet_info_text_sensor.cpp,sha256=nfP7xeusvbzee1KHfuipELWvF1vmuk_2e4G_NlLeJ3M,564
 esphome/components/ethernet_info/ethernet_info_text_sensor.h,sha256=G0qcvZWT7GlZ_Hz_D5FAXBGnnwRVNd8KJu3E092IE2Q,2307
 esphome/components/ethernet_info/text_sensor.py,sha256=TUZNQiVCiepNin6bisVrUw2-PoAQJCvkLneQNGfCigI,2392
-esphome/components/event/__init__.py,sha256=Qz7HsEflNLtAcAJ9oVhG3lBJQpXLeAQFVy5TiSVzSn8,4001
+esphome/components/event/__init__.py,sha256=fk6W4AjKQXd8h-5rAzyF88C8E87Qs4h6d7-BxPSYhL8,4265
 esphome/components/event/automation.h,sha256=LVrFgWVvg6ewaQFlE5KD57nd2cPx-Iv_OXXsx56GSYk,667
 esphome/components/event/event.cpp,sha256=9OmqhLkMNHEu3pOoZoXqdzvt0ZyU5lLATu6FSl9BJrU,695
 esphome/components/event/event.h,sha256=l5YWXG8Cf5aGmjX1W_lzE5ur_BXqJAJEvgIS6HInWIY,1198
@@ -2444,8 +2444,8 @@ esphome/components/sgp4x/sgp4x.h,sha256=wUlfVIHreIqDNS6rO_QJo91-9xhj6NIEeC1zQ81y
 esphome/components/shelly_dimmer/__init__.py,sha256=eeBqDV3Pg3-RwlArBG37jYjeYuRqLMwZU3D-zLfs0ws,37
 esphome/components/shelly_dimmer/dev_table.h,sha256=ByBoXa1go3FvcbeTCTDza4vGI4EEQuCJoMJeeyL7ex8,8731
 esphome/components/shelly_dimmer/light.py,sha256=XGD_h73CnIMeh8tvqoZ4MQrNarqRkVnBo2CrJ0NQIXo,7385
-esphome/components/shelly_dimmer/shelly_dimmer.cpp,sha256=zoLfn0G8utiCjpfeOiccCR2ku8c4-fZF1GXygX0WBis,15544
-esphome/components/shelly_dimmer/shelly_dimmer.h,sha256=k0NbwOmj5AWbZr53R3rvPxVmnUZlT5anqP19HO3i9vM,3840
+esphome/components/shelly_dimmer/shelly_dimmer.cpp,sha256=DHxDGXG1wptnHOLU6VQHKJkswCBwiMZBWxYqPhbv5eA,15461
+esphome/components/shelly_dimmer/shelly_dimmer.h,sha256=zWAxQ-wvnWFDe_YWv4px9gq_qzjfN3rAI2OMc1YIJFA,3912
 esphome/components/shelly_dimmer/stm32flash.cpp,sha256=1S0uVw5geIHYT9D30xcpfH6Wgm23HNXBmQvmeGQ1I-E,33319
 esphome/components/shelly_dimmer/stm32flash.h,sha256=_2W7HaCS0uHvRtmsF27Dh_3XznqnUyIg9vtqoBeENJQ,4725
 esphome/components/sht3xd/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -2875,7 +2875,7 @@ esphome/components/total_daily_energy/sensor.py,sha256=tzKInzFLBSaVh0555Rh_3bUKF
 esphome/components/total_daily_energy/total_daily_energy.cpp,sha256=q_jsZ1F1rKsN4dOdLH-RHogPH7Hcdbp_42D_lph8SUs,2073
 esphome/components/total_daily_energy/total_daily_energy.h,sha256=HFg_bjSgvlTifRms3D6LziyPX5YrU7aeGnRZ6kIPu94,1307
 esphome/components/touchscreen/__init__.py,sha256=zcKoX8KsWKbktHKaGC5adCzIIJrguQ3ibCYF4EDJSDY,5370
-esphome/components/touchscreen/touchscreen.cpp,sha256=q8Vk61CuMIFtaRmBzEiaB8eJHYg9vfFP3Gvex5YCDzg,4956
+esphome/components/touchscreen/touchscreen.cpp,sha256=FDUM8gzT3oNVRKEdh45zNjnBrH3O7oyZ31BDPltp1d8,4942
 esphome/components/touchscreen/touchscreen.h,sha256=aV7hVA0XxF1QsmbuJYdDwiS_3HP5g5d-BoKQhNdTCDI,3681
 esphome/components/touchscreen/binary_sensor/__init__.py,sha256=9PC8Ko1SXjLaGeMk-BtcubaG2ZgJHoOMwRAnXjc7BBw,2407
 esphome/components/touchscreen/binary_sensor/touchscreen_binary_sensor.cpp,sha256=Iqnt9p2FGsaAhP2-ruoNUc0VV-T8omYhak0b7b6DhP4,800
@@ -3061,7 +3061,7 @@ esphome/components/web_server/list_entities.cpp,sha256=KZPiwuVT17wTxTJ0dwNt8alxF
 esphome/components/web_server/list_entities.h,sha256=y-y1d5Pi_e0o2vHk257KelJY4HoyK7xvL_WdWH6aRaU,2077
 esphome/components/web_server/server_index_v2.h,sha256=klUL1lEbo_YN_Mrx48tFu9LNmunGJfZyzGYO8adEWVo,74318
 esphome/components/web_server/server_index_v3.h,sha256=ISSZbq8VzjfnI3a4D8myDM0iGRQ7LWUVriHVGjz2pVs,473726
-esphome/components/web_server/web_server.cpp,sha256=ykXSMUB-VkVvmFXWBs5vTbQM_Itw9x4zZ7BH349aAw4,64494
+esphome/components/web_server/web_server.cpp,sha256=lx1nIOIxFg6xtRHtXKyrlADJ4-fds-jjdk29mYMaNV4,64876
 esphome/components/web_server/web_server.h,sha256=pUcK_p6ehhVoevr64_YEyyEA3qgxdnsO0PK5gmoXFgg,13767
 esphome/components/web_server/web_server_v1.cpp,sha256=Ri32qveJXRPxCpgWz-0Eo3it2yIdVWb5NkRVzokQJLw,7213
 esphome/components/web_server_base/__init__.py,sha256=mY9m_IS1ifiay-fYqDumRw8QJdhbcONCovAMIh42n2k,1122
@@ -3309,9 +3309,9 @@ esphome/dashboard/util/itertools.py,sha256=8eLrWEWmICLtXNxkKdYPQV0c_N4GEz8m9Npnb
 esphome/dashboard/util/password.py,sha256=cQz3b9B-ijTe7zS6BeCW0hc3pWv6JjC78jmnycYYAh8,321
 esphome/dashboard/util/subprocess.py,sha256=T8EW6dbU4LPd2DG1dRrdh8li71tt6J1isn411poMhkk,1022
 esphome/dashboard/util/text.py,sha256=ENDnfN4O0NdA3CKVJjQYabFbwbrsIhVKrAMQe53qYu4,534
-esphome-2024.10.0b1.dist-info/LICENSE,sha256=HzEjkBInJe44L4WvAOPfhPJJDNj6YbnqFyvGWRzArGM,36664
-esphome-2024.10.0b1.dist-info/METADATA,sha256=k3A39QJWeTnnHTYC0sk4zlUXZKQee5n-vgNWRwHWBWg,3409
-esphome-2024.10.0b1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-esphome-2024.10.0b1.dist-info/entry_points.txt,sha256=mIxVNuWtbYzeEcaWCl-AQ-97aBOWbnYBAK8nbF6P4M0,50
-esphome-2024.10.0b1.dist-info/top_level.txt,sha256=0GSXEW3cnITpgG3qnsSMz0qoqJHAFyfw7Y8MVtEf1Yk,8
-esphome-2024.10.0b1.dist-info/RECORD,,
+esphome-2024.10.0b2.dist-info/LICENSE,sha256=HzEjkBInJe44L4WvAOPfhPJJDNj6YbnqFyvGWRzArGM,36664
+esphome-2024.10.0b2.dist-info/METADATA,sha256=3XcF-m77uFAKDxzRZlmFRVDAIY7AAB1FRsVqzxcaDR4,3409
+esphome-2024.10.0b2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+esphome-2024.10.0b2.dist-info/entry_points.txt,sha256=mIxVNuWtbYzeEcaWCl-AQ-97aBOWbnYBAK8nbF6P4M0,50
+esphome-2024.10.0b2.dist-info/top_level.txt,sha256=0GSXEW3cnITpgG3qnsSMz0qoqJHAFyfw7Y8MVtEf1Yk,8
+esphome-2024.10.0b2.dist-info/RECORD,,