[api] Remove unnecessary intermediate variable in frame helpers (#11668)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: J. Nick Koston <nick@home-assistant.io>

.pre-commit-config.yaml

@@ -11,7 +11,7 @@ ci:
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: v0.14.2
+    rev: v0.14.3
     hooks:
       # Run the linter.
       - id: ruff

esphome/automation.py

@@ -182,7 +182,7 @@ def validate_automation(extra_schema=None, extra_validators=None, single=False):
             value = cv.Schema([extra_validators])(value)
         if single:
             if len(value) != 1:
-                raise cv.Invalid("Cannot have more than 1 automation for templates")
+                raise cv.Invalid("This trigger allows only a single automation")
             return value[0]
         return value
 

esphome/components/api/api_frame_helper_noise.cpp

@@ -434,8 +434,7 @@ APIError APINoiseFrameHelper::write_protobuf_packets(ProtoWriteBuffer buffer, st
     return APIError::OK;
   }
 
-  std::vector<uint8_t> *raw_buffer = buffer.get_buffer();
+  uint8_t *buffer_data = buffer.get_buffer()->data();
-  uint8_t *buffer_data = raw_buffer->data();  // Cache buffer pointer
 
   this->reusable_iovs_.clear();
   this->reusable_iovs_.reserve(packets.size());

esphome/components/api/api_frame_helper_plaintext.cpp

@@ -230,8 +230,7 @@ APIError APIPlaintextFrameHelper::write_protobuf_packets(ProtoWriteBuffer buffer
     return APIError::OK;
   }
 
-  std::vector<uint8_t> *raw_buffer = buffer.get_buffer();
+  uint8_t *buffer_data = buffer.get_buffer()->data();
-  uint8_t *buffer_data = raw_buffer->data();  // Cache buffer pointer
 
   this->reusable_iovs_.clear();
   this->reusable_iovs_.reserve(packets.size());

esphome/components/image/__init__.py

@@ -671,18 +671,33 @@ async def write_image(config, all_frames=False):
     resize = config.get(CONF_RESIZE)
     if is_svg_file(path):
         # Local import so use of non-SVG files needn't require cairosvg installed
+        from pyexpat import ExpatError
+        from xml.etree.ElementTree import ParseError
+
         from cairosvg import svg2png
+        from cairosvg.helpers import PointError
 
         if not resize:
             resize = (None, None)
-        with open(path, "rb") as file:
+        try:
-            image = svg2png(
+            with open(path, "rb") as file:
-                file_obj=file,
+                image = svg2png(
-                output_width=resize[0],
+                    file_obj=file,
-                output_height=resize[1],
+                    output_width=resize[0],
-            )
+                    output_height=resize[1],
-        image = Image.open(io.BytesIO(image))
+                )
-        width, height = image.size
+            image = Image.open(io.BytesIO(image))
+            width, height = image.size
+        except (
+            ValueError,
+            ParseError,
+            IndexError,
+            ExpatError,
+            AttributeError,
+            TypeError,
+            PointError,
+        ) as e:
+            raise core.EsphomeError(f"Could not load SVG image {path}: {e}") from e
     else:
         image = Image.open(path)
         width, height = image.size

esphome/components/lvgl/__init__.py

@@ -58,7 +58,7 @@ from .types import (
     FontEngine,
     IdleTrigger,
     ObjUpdateAction,
-    PauseTrigger,
+    PlainTrigger,
     lv_font_t,
     lv_group_t,
     lv_style_t,
@@ -151,6 +151,13 @@ for w_type in WIDGET_TYPES.values():
         create_modify_schema(w_type),
     )(update_to_code)
 
+SIMPLE_TRIGGERS = (
+    df.CONF_ON_PAUSE,
+    df.CONF_ON_RESUME,
+    df.CONF_ON_DRAW_START,
+    df.CONF_ON_DRAW_END,
+)
+
 
 def as_macro(macro, value):
     if value is None:
@@ -244,9 +251,9 @@ def final_validation(configs):
         for w in refreshed_widgets:
             path = global_config.get_path_for_id(w)
             widget_conf = global_config.get_config_for_path(path[:-1])
-            if not any(isinstance(v, Lambda) for v in widget_conf.values()):
+            if not any(isinstance(v, (Lambda, dict)) for v in widget_conf.values()):
                 raise cv.Invalid(
-                    f"Widget '{w}' does not have any templated properties to refresh",
+                    f"Widget '{w}' does not have any dynamic properties to refresh",
                 )
 
 
@@ -366,16 +373,16 @@ async def to_code(configs):
                     conf[CONF_TRIGGER_ID], lv_component, templ
                 )
                 await build_automation(idle_trigger, [], conf)
-            for conf in config.get(df.CONF_ON_PAUSE, ()):
+            for trigger_name in SIMPLE_TRIGGERS:
-                pause_trigger = cg.new_Pvariable(
+                if conf := config.get(trigger_name):
-                    conf[CONF_TRIGGER_ID], lv_component, True
+                    trigger_var = cg.new_Pvariable(conf[CONF_TRIGGER_ID])
-                )
+                    await build_automation(trigger_var, [], conf)
-                await build_automation(pause_trigger, [], conf)
+                    cg.add(
-            for conf in config.get(df.CONF_ON_RESUME, ()):
+                        getattr(
-                resume_trigger = cg.new_Pvariable(
+                            lv_component,
-                    conf[CONF_TRIGGER_ID], lv_component, False
+                            f"set_{trigger_name.removeprefix('on_')}_trigger",
-                )
+                        )(trigger_var)
-                await build_automation(resume_trigger, [], conf)
+                    )
             await add_on_boot_triggers(config.get(CONF_ON_BOOT, ()))
 
     # This must be done after all widgets are created
@@ -443,16 +450,15 @@ LVGL_SCHEMA = cv.All(
                         ),
                     }
                 ),
-                cv.Optional(df.CONF_ON_PAUSE): validate_automation(
+                **{
-                    {
+                    cv.Optional(x): validate_automation(
-                        cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(PauseTrigger),
+                        {
-                    }
+                            cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(PlainTrigger),
-                ),
+                        },
-                cv.Optional(df.CONF_ON_RESUME): validate_automation(
+                        single=True,
-                    {
+                    )
-                        cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(PauseTrigger),
+                    for x in SIMPLE_TRIGGERS
-                    }
+                },
-                ),
                 cv.Exclusive(df.CONF_WIDGETS, CONF_PAGES): cv.ensure_list(
                     WIDGET_SCHEMA
                 ),

esphome/components/lvgl/automation.py

@@ -400,7 +400,8 @@ async def obj_refresh_to_code(config, action_id, template_arg, args):
         # must pass all widget-specific options here, even if not templated, but only do so if at least one is
         # templated. First filter out common style properties.
         config = {k: v for k, v in widget.config.items() if k not in ALL_STYLES}
-        if any(isinstance(v, Lambda) for v in config.values()):
+        # Check if v is a Lambda or a dict, implying it is dynamic
+        if any(isinstance(v, (Lambda, dict)) for v in config.values()):
             await widget.type.to_code(widget, config)
             if (
                 widget.type.w_type.value_property is not None

esphome/components/lvgl/binary_sensor/__init__.py

@@ -31,7 +31,7 @@ async def to_code(config):
             lvgl_static.add_event_cb(
                 widget.obj,
                 await pressed_ctx.get_lambda(),
-                LV_EVENT.PRESSING,
+                LV_EVENT.PRESSED,
                 LV_EVENT.RELEASED,
             )
         )

esphome/components/lvgl/defines.py

@@ -483,6 +483,8 @@ CONF_MSGBOXES = "msgboxes"
 CONF_OBJ = "obj"
 CONF_ONE_CHECKED = "one_checked"
 CONF_ONE_LINE = "one_line"
+CONF_ON_DRAW_START = "on_draw_start"
+CONF_ON_DRAW_END = "on_draw_end"
 CONF_ON_PAUSE = "on_pause"
 CONF_ON_RESUME = "on_resume"
 CONF_ON_SELECT = "on_select"

esphome/components/lvgl/lvgl_esphome.cpp

@@ -82,6 +82,18 @@ static void rounder_cb(lv_disp_drv_t *disp_drv, lv_area_t *area) {
   area->y2 = (area->y2 + draw_rounding) / draw_rounding * draw_rounding - 1;
 }
 
+void LvglComponent::monitor_cb(lv_disp_drv_t *disp_drv, uint32_t time, uint32_t px) {
+  ESP_LOGVV(TAG, "Draw end: %" PRIu32 " pixels in %" PRIu32 " ms", px, time);
+  auto *comp = static_cast<LvglComponent *>(disp_drv->user_data);
+  comp->draw_end_();
+}
+
+void LvglComponent::render_start_cb(lv_disp_drv_t *disp_drv) {
+  ESP_LOGVV(TAG, "Draw start");
+  auto *comp = static_cast<LvglComponent *>(disp_drv->user_data);
+  comp->draw_start_();
+}
+
 lv_event_code_t lv_api_event;     // NOLINT
 lv_event_code_t lv_update_event;  // NOLINT
 void LvglComponent::dump_config() {
@@ -101,7 +113,10 @@ void LvglComponent::set_paused(bool paused, bool show_snow) {
     lv_disp_trig_activity(this->disp_);  // resets the inactivity time
     lv_obj_invalidate(lv_scr_act());
   }
-  this->pause_callbacks_.call(paused);
+  if (paused && this->pause_callback_ != nullptr)
+    this->pause_callback_->trigger();
+  if (!paused && this->resume_callback_ != nullptr)
+    this->resume_callback_->trigger();
 }
 
 void LvglComponent::esphome_lvgl_init() {
@@ -225,13 +240,6 @@ IdleTrigger::IdleTrigger(LvglComponent *parent, TemplatableValue<uint32_t> timeo
   });
 }
 
-PauseTrigger::PauseTrigger(LvglComponent *parent, TemplatableValue<bool> paused) : paused_(std::move(paused)) {
-  parent->add_on_pause_callback([this](bool pausing) {
-    if (this->paused_.value() == pausing)
-      this->trigger();
-  });
-}
-
 #ifdef USE_LVGL_TOUCHSCREEN
 LVTouchListener::LVTouchListener(uint16_t long_press_time, uint16_t long_press_repeat_time, LvglComponent *parent) {
   this->set_parent(parent);
@@ -474,6 +482,12 @@ void LvglComponent::setup() {
       return;
     }
   }
+  if (this->draw_start_callback_ != nullptr) {
+    this->disp_drv_.render_start_cb = render_start_cb;
+  }
+  if (this->draw_end_callback_ != nullptr) {
+    this->disp_drv_.monitor_cb = monitor_cb;
+  }
 #if LV_USE_LOG
   lv_log_register_print_cb([](const char *buf) {
     auto next = strchr(buf, ')');
@@ -502,8 +516,9 @@ void LvglComponent::loop() {
   if (this->paused_) {
     if (this->show_snow_)
       this->write_random_();
+  } else {
+    lv_timer_handler_run_in_period(5);
   }
-  lv_timer_handler_run_in_period(5);
 }
 
 #ifdef USE_LVGL_ANIMIMG

esphome/components/lvgl/lvgl_esphome.h

@@ -171,7 +171,9 @@ class LvglComponent : public PollingComponent {
   void add_on_idle_callback(std::function<void(uint32_t)> &&callback) {
     this->idle_callbacks_.add(std::move(callback));
   }
-  void add_on_pause_callback(std::function<void(bool)> &&callback) { this->pause_callbacks_.add(std::move(callback)); }
+
+  static void monitor_cb(lv_disp_drv_t *disp_drv, uint32_t time, uint32_t px);
+  static void render_start_cb(lv_disp_drv_t *disp_drv);
   void dump_config() override;
   bool is_idle(uint32_t idle_ms) { return lv_disp_get_inactive_time(this->disp_) > idle_ms; }
   lv_disp_t *get_disp() { return this->disp_; }
@@ -213,12 +215,20 @@ class LvglComponent : public PollingComponent {
   size_t draw_rounding{2};
 
   display::DisplayRotation rotation{display::DISPLAY_ROTATION_0_DEGREES};
+  void set_pause_trigger(Trigger<> *trigger) { this->pause_callback_ = trigger; }
+  void set_resume_trigger(Trigger<> *trigger) { this->resume_callback_ = trigger; }
+  void set_draw_start_trigger(Trigger<> *trigger) { this->draw_start_callback_ = trigger; }
+  void set_draw_end_trigger(Trigger<> *trigger) { this->draw_end_callback_ = trigger; }
 
  protected:
+  // these functions are never called unless the callbacks are non-null since the
+  // LVGL callbacks that call them are not set unless the start/end callbacks are non-null
+  void draw_start_() const { this->draw_start_callback_->trigger(); }
+  void draw_end_() const { this->draw_end_callback_->trigger(); }
+
   void write_random_();
   void draw_buffer_(const lv_area_t *area, lv_color_t *ptr);
   void flush_cb_(lv_disp_drv_t *disp_drv, const lv_area_t *area, lv_color_t *color_p);
-
   std::vector<display::Display *> displays_{};
   size_t buffer_frac_{1};
   bool full_refresh_{};
@@ -235,7 +245,10 @@ class LvglComponent : public PollingComponent {
   std::map<lv_group_t *, lv_obj_t *> focus_marks_{};
 
   CallbackManager<void(uint32_t)> idle_callbacks_{};
-  CallbackManager<void(bool)> pause_callbacks_{};
+  Trigger<> *pause_callback_{};
+  Trigger<> *resume_callback_{};
+  Trigger<> *draw_start_callback_{};
+  Trigger<> *draw_end_callback_{};
   lv_color_t *rotate_buf_{};
 };
 
@@ -248,14 +261,6 @@ class IdleTrigger : public Trigger<> {
   bool is_idle_{};
 };
 
-class PauseTrigger : public Trigger<> {
- public:
-  explicit PauseTrigger(LvglComponent *parent, TemplatableValue<bool> paused);
-
- protected:
-  TemplatableValue<bool> paused_;
-};
-
 template<typename... Ts> class LvglAction : public Action<Ts...>, public Parented<LvglComponent> {
  public:
   explicit LvglAction(std::function<void(LvglComponent *)> &&lamb) : action_(std::move(lamb)) {}

esphome/components/lvgl/types.py

@@ -3,6 +3,7 @@ import sys
 from esphome import automation, codegen as cg
 from esphome.const import CONF_MAX_VALUE, CONF_MIN_VALUE, CONF_TEXT, CONF_VALUE
 from esphome.cpp_generator import MockObj, MockObjClass
+from esphome.cpp_types import esphome_ns
 
 from .defines import lvgl_ns
 from .lvcode import lv_expr
@@ -42,8 +43,11 @@ lv_event_code_t = cg.global_ns.enum("lv_event_code_t")
 lv_indev_type_t = cg.global_ns.enum("lv_indev_type_t")
 lv_key_t = cg.global_ns.enum("lv_key_t")
 FontEngine = lvgl_ns.class_("FontEngine")
+PlainTrigger = esphome_ns.class_("Trigger<>", automation.Trigger.template())
+DrawEndTrigger = esphome_ns.class_(
+    "Trigger<uint32_t, uint32_t>", automation.Trigger.template(cg.uint32, cg.uint32)
+)
 IdleTrigger = lvgl_ns.class_("IdleTrigger", automation.Trigger.template())
-PauseTrigger = lvgl_ns.class_("PauseTrigger", automation.Trigger.template())
 ObjUpdateAction = lvgl_ns.class_("ObjUpdateAction", automation.Action)
 LvglCondition = lvgl_ns.class_("LvglCondition", automation.Condition)
 LvglAction = lvgl_ns.class_("LvglAction", automation.Action)

esphome/components/sdl/binary_sensor.py

@@ -12,241 +12,256 @@ CODEOWNERS = ["@bdm310"]
 
 STATE_ARG = "state"
 
-SDL_KEYMAP = {
+SDL_KeyCode = cg.global_ns.enum("SDL_KeyCode")
-    "SDLK_UNKNOWN": 0,
+
-    "SDLK_FIRST": 0,
+SDL_KEYS = (
-    "SDLK_BACKSPACE": 8,
+    "SDLK_UNKNOWN",
-    "SDLK_TAB": 9,
+    "SDLK_RETURN",
-    "SDLK_CLEAR": 12,
+    "SDLK_ESCAPE",
-    "SDLK_RETURN": 13,
+    "SDLK_BACKSPACE",
-    "SDLK_PAUSE": 19,
+    "SDLK_TAB",
-    "SDLK_ESCAPE": 27,
+    "SDLK_SPACE",
-    "SDLK_SPACE": 32,
+    "SDLK_EXCLAIM",
-    "SDLK_EXCLAIM": 33,
+    "SDLK_QUOTEDBL",
-    "SDLK_QUOTEDBL": 34,
+    "SDLK_HASH",
-    "SDLK_HASH": 35,
+    "SDLK_PERCENT",
-    "SDLK_DOLLAR": 36,
+    "SDLK_DOLLAR",
-    "SDLK_AMPERSAND": 38,
+    "SDLK_AMPERSAND",
-    "SDLK_QUOTE": 39,
+    "SDLK_QUOTE",
-    "SDLK_LEFTPAREN": 40,
+    "SDLK_LEFTPAREN",
-    "SDLK_RIGHTPAREN": 41,
+    "SDLK_RIGHTPAREN",
-    "SDLK_ASTERISK": 42,
+    "SDLK_ASTERISK",
-    "SDLK_PLUS": 43,
+    "SDLK_PLUS",
-    "SDLK_COMMA": 44,
+    "SDLK_COMMA",
-    "SDLK_MINUS": 45,
+    "SDLK_MINUS",
-    "SDLK_PERIOD": 46,
+    "SDLK_PERIOD",
-    "SDLK_SLASH": 47,
+    "SDLK_SLASH",
-    "SDLK_0": 48,
+    "SDLK_0",
-    "SDLK_1": 49,
+    "SDLK_1",
-    "SDLK_2": 50,
+    "SDLK_2",
-    "SDLK_3": 51,
+    "SDLK_3",
-    "SDLK_4": 52,
+    "SDLK_4",
-    "SDLK_5": 53,
+    "SDLK_5",
-    "SDLK_6": 54,
+    "SDLK_6",
-    "SDLK_7": 55,
+    "SDLK_7",
-    "SDLK_8": 56,
+    "SDLK_8",
-    "SDLK_9": 57,
+    "SDLK_9",
-    "SDLK_COLON": 58,
+    "SDLK_COLON",
-    "SDLK_SEMICOLON": 59,
+    "SDLK_SEMICOLON",
-    "SDLK_LESS": 60,
+    "SDLK_LESS",
-    "SDLK_EQUALS": 61,
+    "SDLK_EQUALS",
-    "SDLK_GREATER": 62,
+    "SDLK_GREATER",
-    "SDLK_QUESTION": 63,
+    "SDLK_QUESTION",
-    "SDLK_AT": 64,
+    "SDLK_AT",
-    "SDLK_LEFTBRACKET": 91,
+    "SDLK_LEFTBRACKET",
-    "SDLK_BACKSLASH": 92,
+    "SDLK_BACKSLASH",
-    "SDLK_RIGHTBRACKET": 93,
+    "SDLK_RIGHTBRACKET",
-    "SDLK_CARET": 94,
+    "SDLK_CARET",
-    "SDLK_UNDERSCORE": 95,
+    "SDLK_UNDERSCORE",
-    "SDLK_BACKQUOTE": 96,
+    "SDLK_BACKQUOTE",
-    "SDLK_a": 97,
+    "SDLK_a",
-    "SDLK_b": 98,
+    "SDLK_b",
-    "SDLK_c": 99,
+    "SDLK_c",
-    "SDLK_d": 100,
+    "SDLK_d",
-    "SDLK_e": 101,
+    "SDLK_e",
-    "SDLK_f": 102,
+    "SDLK_f",
-    "SDLK_g": 103,
+    "SDLK_g",
-    "SDLK_h": 104,
+    "SDLK_h",
-    "SDLK_i": 105,
+    "SDLK_i",
-    "SDLK_j": 106,
+    "SDLK_j",
-    "SDLK_k": 107,
+    "SDLK_k",
-    "SDLK_l": 108,
+    "SDLK_l",
-    "SDLK_m": 109,
+    "SDLK_m",
-    "SDLK_n": 110,
+    "SDLK_n",
-    "SDLK_o": 111,
+    "SDLK_o",
-    "SDLK_p": 112,
+    "SDLK_p",
-    "SDLK_q": 113,
+    "SDLK_q",
-    "SDLK_r": 114,
+    "SDLK_r",
-    "SDLK_s": 115,
+    "SDLK_s",
-    "SDLK_t": 116,
+    "SDLK_t",
-    "SDLK_u": 117,
+    "SDLK_u",
-    "SDLK_v": 118,
+    "SDLK_v",
-    "SDLK_w": 119,
+    "SDLK_w",
-    "SDLK_x": 120,
+    "SDLK_x",
-    "SDLK_y": 121,
+    "SDLK_y",
-    "SDLK_z": 122,
+    "SDLK_z",
-    "SDLK_DELETE": 127,
+    "SDLK_CAPSLOCK",
-    "SDLK_WORLD_0": 160,
+    "SDLK_F1",
-    "SDLK_WORLD_1": 161,
+    "SDLK_F2",
-    "SDLK_WORLD_2": 162,
+    "SDLK_F3",
-    "SDLK_WORLD_3": 163,
+    "SDLK_F4",
-    "SDLK_WORLD_4": 164,
+    "SDLK_F5",
-    "SDLK_WORLD_5": 165,
+    "SDLK_F6",
-    "SDLK_WORLD_6": 166,
+    "SDLK_F7",
-    "SDLK_WORLD_7": 167,
+    "SDLK_F8",
-    "SDLK_WORLD_8": 168,
+    "SDLK_F9",
-    "SDLK_WORLD_9": 169,
+    "SDLK_F10",
-    "SDLK_WORLD_10": 170,
+    "SDLK_F11",
-    "SDLK_WORLD_11": 171,
+    "SDLK_F12",
-    "SDLK_WORLD_12": 172,
+    "SDLK_PRINTSCREEN",
-    "SDLK_WORLD_13": 173,
+    "SDLK_SCROLLLOCK",
-    "SDLK_WORLD_14": 174,
+    "SDLK_PAUSE",
-    "SDLK_WORLD_15": 175,
+    "SDLK_INSERT",
-    "SDLK_WORLD_16": 176,
+    "SDLK_HOME",
-    "SDLK_WORLD_17": 177,
+    "SDLK_PAGEUP",
-    "SDLK_WORLD_18": 178,
+    "SDLK_DELETE",
-    "SDLK_WORLD_19": 179,
+    "SDLK_END",
-    "SDLK_WORLD_20": 180,
+    "SDLK_PAGEDOWN",
-    "SDLK_WORLD_21": 181,
+    "SDLK_RIGHT",
-    "SDLK_WORLD_22": 182,
+    "SDLK_LEFT",
-    "SDLK_WORLD_23": 183,
+    "SDLK_DOWN",
-    "SDLK_WORLD_24": 184,
+    "SDLK_UP",
-    "SDLK_WORLD_25": 185,
+    "SDLK_NUMLOCKCLEAR",
-    "SDLK_WORLD_26": 186,
+    "SDLK_KP_DIVIDE",
-    "SDLK_WORLD_27": 187,
+    "SDLK_KP_MULTIPLY",
-    "SDLK_WORLD_28": 188,
+    "SDLK_KP_MINUS",
-    "SDLK_WORLD_29": 189,
+    "SDLK_KP_PLUS",
-    "SDLK_WORLD_30": 190,
+    "SDLK_KP_ENTER",
-    "SDLK_WORLD_31": 191,
+    "SDLK_KP_1",
-    "SDLK_WORLD_32": 192,
+    "SDLK_KP_2",
-    "SDLK_WORLD_33": 193,
+    "SDLK_KP_3",
-    "SDLK_WORLD_34": 194,
+    "SDLK_KP_4",
-    "SDLK_WORLD_35": 195,
+    "SDLK_KP_5",
-    "SDLK_WORLD_36": 196,
+    "SDLK_KP_6",
-    "SDLK_WORLD_37": 197,
+    "SDLK_KP_7",
-    "SDLK_WORLD_38": 198,
+    "SDLK_KP_8",
-    "SDLK_WORLD_39": 199,
+    "SDLK_KP_9",
-    "SDLK_WORLD_40": 200,
+    "SDLK_KP_0",
-    "SDLK_WORLD_41": 201,
+    "SDLK_KP_PERIOD",
-    "SDLK_WORLD_42": 202,
+    "SDLK_APPLICATION",
-    "SDLK_WORLD_43": 203,
+    "SDLK_POWER",
-    "SDLK_WORLD_44": 204,
+    "SDLK_KP_EQUALS",
-    "SDLK_WORLD_45": 205,
+    "SDLK_F13",
-    "SDLK_WORLD_46": 206,
+    "SDLK_F14",
-    "SDLK_WORLD_47": 207,
+    "SDLK_F15",
-    "SDLK_WORLD_48": 208,
+    "SDLK_F16",
-    "SDLK_WORLD_49": 209,
+    "SDLK_F17",
-    "SDLK_WORLD_50": 210,
+    "SDLK_F18",
-    "SDLK_WORLD_51": 211,
+    "SDLK_F19",
-    "SDLK_WORLD_52": 212,
+    "SDLK_F20",
-    "SDLK_WORLD_53": 213,
+    "SDLK_F21",
-    "SDLK_WORLD_54": 214,
+    "SDLK_F22",
-    "SDLK_WORLD_55": 215,
+    "SDLK_F23",
-    "SDLK_WORLD_56": 216,
+    "SDLK_F24",
-    "SDLK_WORLD_57": 217,
+    "SDLK_EXECUTE",
-    "SDLK_WORLD_58": 218,
+    "SDLK_HELP",
-    "SDLK_WORLD_59": 219,
+    "SDLK_MENU",
-    "SDLK_WORLD_60": 220,
+    "SDLK_SELECT",
-    "SDLK_WORLD_61": 221,
+    "SDLK_STOP",
-    "SDLK_WORLD_62": 222,
+    "SDLK_AGAIN",
-    "SDLK_WORLD_63": 223,
+    "SDLK_UNDO",
-    "SDLK_WORLD_64": 224,
+    "SDLK_CUT",
-    "SDLK_WORLD_65": 225,
+    "SDLK_COPY",
-    "SDLK_WORLD_66": 226,
+    "SDLK_PASTE",
-    "SDLK_WORLD_67": 227,
+    "SDLK_FIND",
-    "SDLK_WORLD_68": 228,
+    "SDLK_MUTE",
-    "SDLK_WORLD_69": 229,
+    "SDLK_VOLUMEUP",
-    "SDLK_WORLD_70": 230,
+    "SDLK_VOLUMEDOWN",
-    "SDLK_WORLD_71": 231,
+    "SDLK_KP_COMMA",
-    "SDLK_WORLD_72": 232,
+    "SDLK_KP_EQUALSAS400",
-    "SDLK_WORLD_73": 233,
+    "SDLK_ALTERASE",
-    "SDLK_WORLD_74": 234,
+    "SDLK_SYSREQ",
-    "SDLK_WORLD_75": 235,
+    "SDLK_CANCEL",
-    "SDLK_WORLD_76": 236,
+    "SDLK_CLEAR",
-    "SDLK_WORLD_77": 237,
+    "SDLK_PRIOR",
-    "SDLK_WORLD_78": 238,
+    "SDLK_RETURN2",
-    "SDLK_WORLD_79": 239,
+    "SDLK_SEPARATOR",
-    "SDLK_WORLD_80": 240,
+    "SDLK_OUT",
-    "SDLK_WORLD_81": 241,
+    "SDLK_OPER",
-    "SDLK_WORLD_82": 242,
+    "SDLK_CLEARAGAIN",
-    "SDLK_WORLD_83": 243,
+    "SDLK_CRSEL",
-    "SDLK_WORLD_84": 244,
+    "SDLK_EXSEL",
-    "SDLK_WORLD_85": 245,
+    "SDLK_KP_00",
-    "SDLK_WORLD_86": 246,
+    "SDLK_KP_000",
-    "SDLK_WORLD_87": 247,
+    "SDLK_THOUSANDSSEPARATOR",
-    "SDLK_WORLD_88": 248,
+    "SDLK_DECIMALSEPARATOR",
-    "SDLK_WORLD_89": 249,
+    "SDLK_CURRENCYUNIT",
-    "SDLK_WORLD_90": 250,
+    "SDLK_CURRENCYSUBUNIT",
-    "SDLK_WORLD_91": 251,
+    "SDLK_KP_LEFTPAREN",
-    "SDLK_WORLD_92": 252,
+    "SDLK_KP_RIGHTPAREN",
-    "SDLK_WORLD_93": 253,
+    "SDLK_KP_LEFTBRACE",
-    "SDLK_WORLD_94": 254,
+    "SDLK_KP_RIGHTBRACE",
-    "SDLK_WORLD_95": 255,
+    "SDLK_KP_TAB",
-    "SDLK_KP0": 256,
+    "SDLK_KP_BACKSPACE",
-    "SDLK_KP1": 257,
+    "SDLK_KP_A",
-    "SDLK_KP2": 258,
+    "SDLK_KP_B",
-    "SDLK_KP3": 259,
+    "SDLK_KP_C",
-    "SDLK_KP4": 260,
+    "SDLK_KP_D",
-    "SDLK_KP5": 261,
+    "SDLK_KP_E",
-    "SDLK_KP6": 262,
+    "SDLK_KP_F",
-    "SDLK_KP7": 263,
+    "SDLK_KP_XOR",
-    "SDLK_KP8": 264,
+    "SDLK_KP_POWER",
-    "SDLK_KP9": 265,
+    "SDLK_KP_PERCENT",
-    "SDLK_KP_PERIOD": 266,
+    "SDLK_KP_LESS",
-    "SDLK_KP_DIVIDE": 267,
+    "SDLK_KP_GREATER",
-    "SDLK_KP_MULTIPLY": 268,
+    "SDLK_KP_AMPERSAND",
-    "SDLK_KP_MINUS": 269,
+    "SDLK_KP_DBLAMPERSAND",
-    "SDLK_KP_PLUS": 270,
+    "SDLK_KP_VERTICALBAR",
-    "SDLK_KP_ENTER": 271,
+    "SDLK_KP_DBLVERTICALBAR",
-    "SDLK_KP_EQUALS": 272,
+    "SDLK_KP_COLON",
-    "SDLK_UP": 273,
+    "SDLK_KP_HASH",
-    "SDLK_DOWN": 274,
+    "SDLK_KP_SPACE",
-    "SDLK_RIGHT": 275,
+    "SDLK_KP_AT",
-    "SDLK_LEFT": 276,
+    "SDLK_KP_EXCLAM",
-    "SDLK_INSERT": 277,
+    "SDLK_KP_MEMSTORE",
-    "SDLK_HOME": 278,
+    "SDLK_KP_MEMRECALL",
-    "SDLK_END": 279,
+    "SDLK_KP_MEMCLEAR",
-    "SDLK_PAGEUP": 280,
+    "SDLK_KP_MEMADD",
-    "SDLK_PAGEDOWN": 281,
+    "SDLK_KP_MEMSUBTRACT",
-    "SDLK_F1": 282,
+    "SDLK_KP_MEMMULTIPLY",
-    "SDLK_F2": 283,
+    "SDLK_KP_MEMDIVIDE",
-    "SDLK_F3": 284,
+    "SDLK_KP_PLUSMINUS",
-    "SDLK_F4": 285,
+    "SDLK_KP_CLEAR",
-    "SDLK_F5": 286,
+    "SDLK_KP_CLEARENTRY",
-    "SDLK_F6": 287,
+    "SDLK_KP_BINARY",
-    "SDLK_F7": 288,
+    "SDLK_KP_OCTAL",
-    "SDLK_F8": 289,
+    "SDLK_KP_DECIMAL",
-    "SDLK_F9": 290,
+    "SDLK_KP_HEXADECIMAL",
-    "SDLK_F10": 291,
+    "SDLK_LCTRL",
-    "SDLK_F11": 292,
+    "SDLK_LSHIFT",
-    "SDLK_F12": 293,
+    "SDLK_LALT",
-    "SDLK_F13": 294,
+    "SDLK_LGUI",
-    "SDLK_F14": 295,
+    "SDLK_RCTRL",
-    "SDLK_F15": 296,
+    "SDLK_RSHIFT",
-    "SDLK_NUMLOCK": 300,
+    "SDLK_RALT",
-    "SDLK_CAPSLOCK": 301,
+    "SDLK_RGUI",
-    "SDLK_SCROLLOCK": 302,
+    "SDLK_MODE",
-    "SDLK_RSHIFT": 303,
+    "SDLK_AUDIONEXT",
-    "SDLK_LSHIFT": 304,
+    "SDLK_AUDIOPREV",
-    "SDLK_RCTRL": 305,
+    "SDLK_AUDIOSTOP",
-    "SDLK_LCTRL": 306,
+    "SDLK_AUDIOPLAY",
-    "SDLK_RALT": 307,
+    "SDLK_AUDIOMUTE",
-    "SDLK_LALT": 308,
+    "SDLK_MEDIASELECT",
-    "SDLK_RMETA": 309,
+    "SDLK_WWW",
-    "SDLK_LMETA": 310,
+    "SDLK_MAIL",
-    "SDLK_LSUPER": 311,
+    "SDLK_CALCULATOR",
-    "SDLK_RSUPER": 312,
+    "SDLK_COMPUTER",
-    "SDLK_MODE": 313,
+    "SDLK_AC_SEARCH",
-    "SDLK_COMPOSE": 314,
+    "SDLK_AC_HOME",
-    "SDLK_HELP": 315,
+    "SDLK_AC_BACK",
-    "SDLK_PRINT": 316,
+    "SDLK_AC_FORWARD",
-    "SDLK_SYSREQ": 317,
+    "SDLK_AC_STOP",
-    "SDLK_BREAK": 318,
+    "SDLK_AC_REFRESH",
-    "SDLK_MENU": 319,
+    "SDLK_AC_BOOKMARKS",
-    "SDLK_POWER": 320,
+    "SDLK_BRIGHTNESSDOWN",
-    "SDLK_EURO": 321,
+    "SDLK_BRIGHTNESSUP",
-    "SDLK_UNDO": 322,
+    "SDLK_DISPLAYSWITCH",
-}
+    "SDLK_KBDILLUMTOGGLE",
+    "SDLK_KBDILLUMDOWN",
+    "SDLK_KBDILLUMUP",
+    "SDLK_EJECT",
+    "SDLK_SLEEP",
+    "SDLK_APP1",
+    "SDLK_APP2",
+    "SDLK_AUDIOREWIND",
+    "SDLK_AUDIOFASTFORWARD",
+    "SDLK_SOFTLEFT",
+    "SDLK_SOFTRIGHT",
+    "SDLK_CALL",
+    "SDLK_ENDCALL",
+)
+
+SDL_KEYMAP = {key: getattr(SDL_KeyCode, key) for key in SDL_KEYS}
 
 CONFIG_SCHEMA = (
     binary_sensor.binary_sensor_schema(BinarySensor)

esphome/components/substitutions/jinja.py

@@ -138,6 +138,7 @@ def _concat_nodes_override(values: Iterator[Any]) -> Any:
             values = chain(head, values)
         raw = "".join([str(v) for v in values])
 
+    result = None
     try:
         # Attempt to parse the concatenated string into a Python literal.
         # This allows expressions like "1 + 2" to be evaluated to the integer 3.
@@ -145,11 +146,16 @@ def _concat_nodes_override(values: Iterator[Any]) -> Any:
         # fall back to returning the raw string. This is consistent with
         #  Home Assistant's behavior when evaluating templates
         result = literal_eval(raw)
+    except (ValueError, SyntaxError, MemoryError, TypeError):
+        pass
+    else:
+        if isinstance(result, set):
+            # Sets are not supported, return raw string
+            return raw
+
         if not isinstance(result, str):
             return result
 
-    except (ValueError, SyntaxError, MemoryError, TypeError):
-        pass
     return raw
 
 

esphome/components/zephyr/core.cpp

@@ -3,7 +3,7 @@
 #include <zephyr/kernel.h>
 #include <zephyr/drivers/watchdog.h>
 #include <zephyr/sys/reboot.h>
-#include <zephyr/random/rand32.h>
+#include <zephyr/random/random.h>
 #include "esphome/core/hal.h"
 #include "esphome/core/helpers.h"
 

esphome/core/application.cpp

@@ -576,10 +576,11 @@ void Application::yield_with_select_(uint32_t delay_ms) {
     // Update fd_set if socket list has changed
     if (this->socket_fds_changed_) {
       FD_ZERO(&this->base_read_fds_);
+      // fd bounds are already validated in register_socket_fd() or guaranteed by platform design:
+      // - ESP32: LwIP guarantees fd < FD_SETSIZE by design (LWIP_SOCKET_OFFSET = FD_SETSIZE - CONFIG_LWIP_MAX_SOCKETS)
+      // - Other platforms: register_socket_fd() validates fd < FD_SETSIZE
       for (int fd : this->socket_fds_) {
-        if (fd >= 0 && fd < FD_SETSIZE) {
+        FD_SET(fd, &this->base_read_fds_);
-          FD_SET(fd, &this->base_read_fds_);
-        }
       }
       this->socket_fds_changed_ = false;
     }

esphome/cpp_generator.py

@@ -350,7 +350,7 @@ def safe_exp(obj: SafeExpType) -> Expression:
         return IntLiteral(int(obj.total_seconds))
     if isinstance(obj, TimePeriodMinutes):
         return IntLiteral(int(obj.total_minutes))
-    if isinstance(obj, tuple | list):
+    if isinstance(obj, (tuple, list)):
         return ArrayInitializer(*[safe_exp(o) for o in obj])
     if obj is bool:
         return bool_

pyproject.toml

@@ -133,7 +133,6 @@ ignore = [
   "PLW1641", # Object does not implement `__hash__` method
   "PLR2004", # Magic value used in comparison, consider replacing {value} with a constant variable
   "PLW2901", # Outer {outer_kind} variable {name} overwritten by inner {inner_kind} target
-  "UP038", # https://github.com/astral-sh/ruff/issues/7871 https://github.com/astral-sh/ruff/pull/16681
 ]
 
 [tool.ruff.lint.isort]

requirements_test.txt

@@ -1,6 +1,6 @@
 pylint==4.0.2
 flake8==7.3.0  # also change in .pre-commit-config.yaml when updating
-ruff==0.14.2  # also change in .pre-commit-config.yaml when updating
+ruff==0.14.3  # also change in .pre-commit-config.yaml when updating
 pyupgrade==3.21.0  # also change in .pre-commit-config.yaml when updating
 pre-commit
 

tests/components/json/common.yaml

@@ -14,12 +14,14 @@ interval:
 
           // Test parse_json
           bool parse_ok = esphome::json::parse_json(json_str, [](JsonObject root) {
-            if (root.containsKey("sensor") && root.containsKey("value")) {
+            if (root["sensor"].is<const char*>() && root["value"].is<float>()) {
               const char* sensor = root["sensor"];
               float value = root["value"];
               ESP_LOGD("test", "Parsed: sensor=%s, value=%.1f", sensor, value);
+              return true;
             } else {
               ESP_LOGD("test", "Parsed JSON missing required keys");
+              return false;
             }
           });
           ESP_LOGD("test", "Parse result (JSON syntax only): %s", parse_ok ? "success" : "failed");

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

@@ -68,5 +68,13 @@ lvgl:
     enter_button: pushbutton
     group: general
     initial_focus: lv_roller
+  on_draw_start:
+    - logger.log: draw started
+  on_draw_end:
+    - logger.log: draw ended
+    - lvgl.pause:
+    - component.update: tft_display
+    - delay: 60s
+    - lvgl.resume:
 
 <<: !include common.yaml

tests/components/sdl/common.yaml

@@ -14,10 +14,10 @@ display:
 binary_sensor:
   - platform: sdl
     id: key_up
-    key: SDLK_a
+    key: SDLK_UP
   - platform: sdl
     id: key_down
-    key: SDLK_d
+    key: SDLK_DOWN
   - platform: sdl
     id: key_enter
-    key: SDLK_s
+    key: SDLK_RETURN

tests/unit_tests/fixtures/substitutions/00-simple_var.approved.yaml

@@ -33,3 +33,4 @@ test_list:
     {{{ "x", "79"}, { "y", "82"}}}
   - '{{{"AA"}}}'
   - '"HELLO"'
+  - '{ 79, 82 }'

tests/unit_tests/fixtures/substitutions/00-simple_var.input.yaml

@@ -34,3 +34,4 @@ test_list:
     {{{ "x", "${ position.x }"}, { "y", "${ position.y }"}}}
   - ${ '{{{"AA"}}}' }
   - ${ '"HELLO"' }
+  - '{ ${position.x}, ${position.y} }'