diff --git a/esphome/components/display/__init__.py b/esphome/components/display/__init__.py index 2cc4a4e8951..6367f88acc4 100644 --- a/esphome/components/display/__init__.py +++ b/esphome/components/display/__init__.py @@ -63,13 +63,11 @@ def validate_auto_clear(value): return cv.boolean(value) -def basic_display_schema(default_update_interval: str = "1s") -> cv.Schema: - """Create a basic display schema with configurable default update interval.""" - return cv.Schema( - { - cv.Exclusive(CONF_LAMBDA, CONF_LAMBDA): cv.lambda_, - } - ).extend(cv.polling_component_schema(default_update_interval)) +BASIC_DISPLAY_SCHEMA = cv.Schema( + { + cv.Exclusive(CONF_LAMBDA, CONF_LAMBDA): cv.lambda_, + } +).extend(cv.polling_component_schema("1s")) def _validate_test_card(config): @@ -83,41 +81,34 @@ def _validate_test_card(config): return config -def full_display_schema(default_update_interval: str = "1s") -> cv.Schema: - """Create a full display schema with configurable default update interval.""" - schema = basic_display_schema(default_update_interval).extend( - { - cv.Optional(CONF_ROTATION): validate_rotation, - cv.Exclusive(CONF_PAGES, CONF_LAMBDA): cv.All( - cv.ensure_list( - { - cv.GenerateID(): cv.declare_id(DisplayPage), - cv.Required(CONF_LAMBDA): cv.lambda_, - } - ), - cv.Length(min=1), - ), - cv.Optional(CONF_ON_PAGE_CHANGE): automation.validate_automation( +FULL_DISPLAY_SCHEMA = BASIC_DISPLAY_SCHEMA.extend( + { + cv.Optional(CONF_ROTATION): validate_rotation, + cv.Exclusive(CONF_PAGES, CONF_LAMBDA): cv.All( + cv.ensure_list( { - cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id( - DisplayOnPageChangeTrigger - ), - cv.Optional(CONF_FROM): cv.use_id(DisplayPage), - cv.Optional(CONF_TO): cv.use_id(DisplayPage), + cv.GenerateID(): cv.declare_id(DisplayPage), + cv.Required(CONF_LAMBDA): cv.lambda_, } ), - cv.Optional( - CONF_AUTO_CLEAR_ENABLED, default=CONF_UNSPECIFIED - ): validate_auto_clear, - cv.Optional(CONF_SHOW_TEST_CARD): cv.boolean, - } - ) - schema.add_extra(_validate_test_card) - return schema - - -BASIC_DISPLAY_SCHEMA = basic_display_schema("1s") -FULL_DISPLAY_SCHEMA = full_display_schema("1s") + cv.Length(min=1), + ), + cv.Optional(CONF_ON_PAGE_CHANGE): automation.validate_automation( + { + cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id( + DisplayOnPageChangeTrigger + ), + cv.Optional(CONF_FROM): cv.use_id(DisplayPage), + cv.Optional(CONF_TO): cv.use_id(DisplayPage), + } + ), + cv.Optional( + CONF_AUTO_CLEAR_ENABLED, default=CONF_UNSPECIFIED + ): validate_auto_clear, + cv.Optional(CONF_SHOW_TEST_CARD): cv.boolean, + } +) +FULL_DISPLAY_SCHEMA.add_extra(_validate_test_card) async def setup_display_core_(var, config): diff --git a/esphome/components/esp32_ble/ble.cpp b/esphome/components/esp32_ble/ble.cpp index ef8f74b8188..317f8fd11b0 100644 --- a/esphome/components/esp32_ble/ble.cpp +++ b/esphome/components/esp32_ble/ble.cpp @@ -96,10 +96,6 @@ void ESP32BLE::advertising_set_service_data(const std::vector &data) { } void ESP32BLE::advertising_set_manufacturer_data(const std::vector &data) { - this->advertising_set_manufacturer_data(std::span(data)); -} - -void ESP32BLE::advertising_set_manufacturer_data(std::span data) { this->advertising_init_(); this->advertising_->set_manufacturer_data(data); this->advertising_start(); diff --git a/esphome/components/esp32_ble/ble.h b/esphome/components/esp32_ble/ble.h index 3c2b0442568..82b27894611 100644 --- a/esphome/components/esp32_ble/ble.h +++ b/esphome/components/esp32_ble/ble.h @@ -146,7 +146,6 @@ class ESP32BLE : public Component { void advertising_start(); void advertising_set_service_data(const std::vector &data); void advertising_set_manufacturer_data(const std::vector &data); - void advertising_set_manufacturer_data(std::span data); void advertising_set_appearance(uint16_t appearance) { this->appearance_ = appearance; } void advertising_set_service_data_and_name(std::span data, bool include_name); void advertising_add_service_uuid(ESPBTUUID uuid); diff --git a/esphome/components/esp32_ble/ble_advertising.cpp b/esphome/components/esp32_ble/ble_advertising.cpp index da105051ebe..68704e49e2e 100644 --- a/esphome/components/esp32_ble/ble_advertising.cpp +++ b/esphome/components/esp32_ble/ble_advertising.cpp @@ -59,10 +59,6 @@ void BLEAdvertising::set_service_data(const std::vector &data) { } void BLEAdvertising::set_manufacturer_data(const std::vector &data) { - this->set_manufacturer_data(std::span(data)); -} - -void BLEAdvertising::set_manufacturer_data(std::span data) { delete[] this->advertising_data_.p_manufacturer_data; this->advertising_data_.p_manufacturer_data = nullptr; this->advertising_data_.manufacturer_len = data.size(); diff --git a/esphome/components/esp32_ble/ble_advertising.h b/esphome/components/esp32_ble/ble_advertising.h index 8a67212d3a3..3cfa6f548a7 100644 --- a/esphome/components/esp32_ble/ble_advertising.h +++ b/esphome/components/esp32_ble/ble_advertising.h @@ -28,7 +28,6 @@ class BLEAdvertising { void set_scan_response(bool scan_response) { this->scan_response_ = scan_response; } void set_min_preferred_interval(uint16_t interval) { this->advertising_data_.min_interval = interval; } void set_manufacturer_data(const std::vector &data); - void set_manufacturer_data(std::span data); void set_appearance(uint16_t appearance) { this->advertising_data_.appearance = appearance; } void set_service_data(const std::vector &data); void set_service_data(std::span data);