Merge pull request #4822 from esphome/bump-2025.4.0b2

jesserockz · web-flow · commit 20fef5b3b5b3 · 2025-04-15T12:12:46.000+12:00
2025.4.0b2
diff --git a/Doxygen b/Doxygen
@@ -38,7 +38,7 @@ PROJECT_NAME           = "ESPHome"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 2025.4.0b1
+PROJECT_NUMBER         = 2025.4.0b2
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 ESPHOME_PATH = ../esphome
-ESPHOME_REF = 2025.4.0b1
+ESPHOME_REF = 2025.4.0b2
 PAGEFIND_VERSION=1.1.1
 PAGEFIND=pagefind
 NET_PAGEFIND=../pagefindbin/pagefind
diff --git a/_static/version b/_static/version
@@ -1 +1 @@
-2025.4.0b1
+2025.4.0b2
diff --git a/changelog/2025.4.0.rst b/changelog/2025.4.0.rst
@@ -30,6 +30,20 @@ Breaking Changes
 
 - Rework max connections for BLE to avoid exceeding the hard limit :esphomepr:`8303` by :ghuser:`bdraco` (breaking-change)
 
+Beta Changes
+^^^^^^^^^^^^
+
+- [lvgl] Fix use of image without canvas (Bugfix) :esphomepr:`8540` by :ghuser:`clydebarrow`
+- Include MAC address in noise hello :esphomepr:`8551` by :ghuser:`bdraco`
+- [axs15231] Don't overwrite manual dimensions :esphomepr:`8553` by :ghuser:`clydebarrow`
+- [lvgl] Fix initial focus on roller :esphomepr:`8547` by :ghuser:`clydebarrow`
+- [lvgl] Add restore_value to select and number :esphomepr:`8494` by :ghuser:`clydebarrow`
+- Speaker-Media-Player: Fix potential deadlock in audio pipeline :esphomepr:`8548` by :ghuser:`gnumpi`
+- [lvgl] Ensure captured lambdas are in correct order :esphomepr:`8560` by :ghuser:`clydebarrow`
+- Bump aioesphomeapi from 29.9.0 to 29.10.0 :esphomepr:`8562` by :ghuser:`dependabot[bot]`
+- Bump zeroconf from 0.146.3 to 0.146.4 :esphomepr:`8563` by :ghuser:`dependabot[bot]`
+- Bump esphome-dashboard to 20250415.0 :esphomepr:`8565` by :ghuser:`swoboda1337`
+
 All changes
 ^^^^^^^^^^^
 
@@ -90,6 +104,16 @@ All changes
 - Bump pytest from 8.2.0 to 8.3.5 :esphomepr:`8528` by :ghuser:`dependabot[bot]`
 - real_time_clock: Apply timezone immediately in set_timezone() :esphomepr:`8531` by :ghuser:`dwmw2`
 - [lvgl] Implement canvas widget :esphomepr:`8504` by :ghuser:`clydebarrow`
+- [lvgl] Fix use of image without canvas (Bugfix) :esphomepr:`8540` by :ghuser:`clydebarrow`
+- Include MAC address in noise hello :esphomepr:`8551` by :ghuser:`bdraco`
+- [axs15231] Don't overwrite manual dimensions :esphomepr:`8553` by :ghuser:`clydebarrow`
+- [lvgl] Fix initial focus on roller :esphomepr:`8547` by :ghuser:`clydebarrow`
+- [lvgl] Add restore_value to select and number :esphomepr:`8494` by :ghuser:`clydebarrow`
+- Speaker-Media-Player: Fix potential deadlock in audio pipeline :esphomepr:`8548` by :ghuser:`gnumpi`
+- [lvgl] Ensure captured lambdas are in correct order :esphomepr:`8560` by :ghuser:`clydebarrow`
+- Bump aioesphomeapi from 29.9.0 to 29.10.0 :esphomepr:`8562` by :ghuser:`dependabot[bot]`
+- Bump zeroconf from 0.146.3 to 0.146.4 :esphomepr:`8563` by :ghuser:`dependabot[bot]`
+- Bump esphome-dashboard to 20250415.0 :esphomepr:`8565` by :ghuser:`swoboda1337`
 
 Past Changelogs
 ---------------
diff --git a/components/lvgl/images/canvas.png b/components/lvgl/images/canvas.png
diff --git a/components/lvgl/widgets.rst b/components/lvgl/widgets.rst
@@ -607,6 +607,146 @@ The button matrix widget is a lightweight way to display multiple buttons in row
 
     The Button Matrix widget supports the :ref:`key_collector` to collect the button presses as key press sequences for further automations. Check out :ref:`lvgl-cookbook-keypad` for an example.
 
+``canvas``
+-------------
+
+The canvas widget provides a surface for custom drawing operations. It allows you to draw shapes, text, images and perform pixel-level manipulations.
+All options are templatable.
+Where a list of points is required, this can be provided in the form of a list of dictionaries, each with templatable ``x`` and ``y`` keys, or as a shorthand ``x,y`` pair (constant integers only.)
+
+.. figure:: /components/lvgl/images/canvas.png
+    :align: center
+
+**Configuration variables:**
+
+- **width** (**Required**, int): Width of the canvas in pixels.
+- **height** (**Required**, int): Height of the canvas in pixels.
+- **transparent** (*Optional*, boolean): Enable alpha channel support. Defaults to ``false``.
+
+**Actions:**
+
+- ``lvgl.canvas.fill`` fills the entire canvas with a color:
+    - **id** (**Required**): The ID of the canvas widget.
+    - **color** (**Required**, :ref:`color <lvgl-color>`): Fill color.
+    - **opa** (*Optional*, :ref:`opacity <lvgl-opacity>`): Opacity of the fill. Defaults to ``COVER``.
+
+- ``lvgl.canvas.set_pixels`` sets individual pixels:
+    - **id** (**Required**): The ID of the canvas widget.
+    - **color** (**Required**, :ref:`color <lvgl-color>`): Pixel color.
+    - **opa** (*Optional*, :ref:`opacity <lvgl-opacity>`): Opacity of the pixels. Defaults to ``COVER``.
+    - **points** (**Required**, list): List of points to set, each with:
+        - **x** (**Required**, int): X coordinate.
+        - **y** (**Required**, int): Y coordinate.
+
+- ``lvgl.canvas.draw_rectangle`` draws a rectangle:
+    - **id** (**Required**): The ID of the canvas widget.
+    - **x** (**Required**, int): X coordinate.
+    - **y** (**Required**, int): Y coordinate.
+    - **width** (**Required**, int): Width in pixels
+    - **height** (**Required**, int): Height in pixels
+    - **radius** (*Optional*, int): Corner radius.
+    - **bg_color** (*Optional*, :ref:`color <lvgl-color>`): Background color.
+    - **bg_opa** (*Optional*, :ref:`opacity <lvgl-opacity>`): Background opacity. Defaults to ``COVER``.
+    - **border_color** (*Optional*, :ref:`color <lvgl-color>`): Border color.
+    - **border_width** (*Optional*, int): Border width.
+    - **border_opa** (*Optional*, :ref:`opacity <lvgl-opacity>`): Border opacity. Defaults to ``COVER``.
+    - **outline_color** (*Optional*, :ref:`color <lvgl-color>`): Outline color.
+    - **outline_width** (*Optional*, int): Outline width.
+    - **outline_opa** (*Optional*, :ref:`opacity <lvgl-opacity>`): Opacity of the outline. Defaults to ``COVER``.
+    - **outline_pad** (*Optional*, int): Padding of the outline. Defaults to ``0``.
+    - **shadow_color** (*Optional*, :ref:`color <lvgl-color>`): Shadow color.
+    - **shadow_width** (*Optional*, int): Shadow width.
+    - **shadow_opa** (*Optional*, :ref:`opacity <lvgl-opacity>`): Opacity of the shadow. Defaults to ``COVER``.
+    - **shadow_offset_x** (*Optional*, int): Shadow offset X.
+    - **shadow_offset_y** (*Optional*, int): Shadow offset Y.
+    - **shadow_spread** (*Optional*, int): Shadow spread.
+
+- ``lvgl.canvas.draw_polygon`` draws a polygon:
+    - **id** (**Required**): The ID of the canvas widget.
+    - **points** (**Required**, list): List of points forming the polygon vertices.
+    - Other options as for ``lvgl.canvas.draw_rectangle``.
+
+- ``lvgl.canvas.draw_text`` draws text:
+    - **id** (**Required**): The ID of the canvas widget.
+    - **x** (**Required**, int): X coordinate.
+    - **y** (**Required**, int): Y coordinate.
+    - **text** (**Required**, string): Text to draw.
+    - **max_width** (**Required**, int): Max width in pixels.
+    - **align** (*Optional*, enum): Alignment of the text relative to ``x`` and ``max_width``. One of ``LEFT``, ``CENTER``, ``RIGHT``, ``AUTO``.
+    - **color** (*Optional*, :ref:`color <lvgl-color>`): Text color.
+    - **opa** (*Optional*, :ref:`opacity <lvgl-opacity>`): Text opacity. Defaults to ``COVER``.
+    - **font** (*Optional*, string): Font to use.
+    - **decor** (*Optional*, list): Choose decorations for the text: ``NONE``, ``UNDERLINE``, ``STRIKETHROUGH`` (multiple can be specified as YAML list). Defaults to ``NONE``.
+    - **letter_space** (*Optional*, int16): Extra character spacing of the text. Defaults to ``0``.
+    - **line_space** (*Optional*, int16): Line spacing of the text. Defaults to ``0``.
+
+- ``lvgl.canvas.draw_line`` draws a line:
+    - **id** (**Required**): The ID of the canvas widget.
+    - **points** (**Required**, list): List of points forming the line, each with:
+        - **x** (**Required**, int): X coordinate.
+        - **y** (**Required**, int): Y coordinate.
+    - **color** (*Optional*, :ref:`color <lvgl-color>`): Line color.
+    - **width** (*Optional*, int): Line width.
+    - **opa** (*Optional*, :ref:`opacity <lvgl-opacity>`): Line opacity. Defaults to ``COVER``.
+    - **round_start** (*Optional*, boolean): Round the start of the line. Defaults to ``false``.
+    - **round_end** (*Optional*, boolean): Round the end of the line. Defaults to ``false``.
+
+- ``lvgl.canvas.draw_arc`` draws an arc:
+    - **id** (**Required**): The ID of the canvas widget.
+    - **x** (**Required**, int): Center X coordinate.
+    - **y** (**Required**, int): Center Y coordinate.
+    - **radius** (**Required**, int): Arc radius.
+    - **start_angle** (**Required**, 0-360): Start angle.
+    - **end_angle** (**Required**, 0-360): End angle.
+    - **color** (*Optional*, :ref:`color <lvgl-color>`): Arc color.
+    - **width** (*Optional*, int): Arc line width.
+    - **opa** (*Optional*, :ref:`opacity <lvgl-opacity>`): Arc opacity. Defaults to ``COVER``.
+    - **rounded** (*Optional*, boolean): Round the start/end of the arc.
+
+- ``lvgl.canvas.draw_image`` draws an image:
+    - **id** (**Required**): The ID of the canvas widget.
+    - **x** (**Required**, int): X coordinate.
+    - **y** (**Required**, int): Y coordinate.
+    - **src** (**Required**, string): Image source.
+    - **angle** (*Optional*, 0-360): Rotation angle.
+    - **zoom** (*Optional*, float): Zoom factor 0.1-10.0 (default 1.0)
+    - **pivot_x** (*Optional*, int): X pivot point for rotation.
+    - **pivot_y** (*Optional*, int): Y pivot point for rotation.
+
+.. code-block:: yaml
+
+    # Example widget:
+    - canvas:
+        id: my_canvas
+        width: 240
+        height: 240
+        transparent: false
+
+    # Example drawing actions, executed at startup:
+        on_boot:
+          then:
+            # Fill canvas with white
+            - lvgl.canvas.fill:
+                id: my_canvas
+                color: white
+            # Draw a blue rectangle
+            - lvgl.canvas.draw_rectangle:
+                id: my_canvas
+                x: 10
+                y: 10
+                width: 100
+                height: 50
+                bg_color: blue
+            # Draw some red text
+            - lvgl.canvas.draw_text:
+                id: my_canvas
+                x: 20
+                y: 20
+                text: "Hello World"
+                max_width: 100
+                color: red
+
+
 .. _lvgl-widget-checkbox:
 
 ``checkbox``
@@ -1444,6 +1584,7 @@ The ``slider`` can be also integrated as :doc:`Number </components/number/lvgl>`
 
 See :ref:`lvgl-cookbook-bright` and :ref:`lvgl-cookbook-volume` for examples which demonstrate how to use a slider to control entities in Home Assistant.
 
+.. _lvgl-widget-canvas:
 .. _lvgl-widget-spinbox:
 
 ``spinbox``
diff --git a/conf.py b/conf.py
@@ -74,7 +74,7 @@
 # The short X.Y version.
 version = "2025.4"
 # The full version, including alpha/beta/rc tags.
-release = "2025.4.0b1"
+release = "2025.4.0b2"
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/guides/supporters.rst b/guides/supporters.rst
@@ -172,6 +172,7 @@ Contributors
 - `august huber (@augs) <https://github.com/augs>`__
 - `aus (@aus) <https://github.com/aus>`__
 - `AustinMorris (@AustinMorris) <https://github.com/AustinMorris>`__
+- `Aviad Raviv (@aviadra) <https://github.com/aviadra>`__
 - `Avirsaam (@Avirsaam) <https://github.com/Avirsaam>`__
 - `Arsène von Wyss (@avonwyss) <https://github.com/avonwyss>`__
 - `Andrew Weddle (@aweddle2) <https://github.com/aweddle2>`__
@@ -281,6 +282,7 @@ Contributors
 - `Brian Hanifin (@brianhanifin) <https://github.com/brianhanifin>`__
 - `brianrjones69 (@brianrjones69) <https://github.com/brianrjones69>`__
 - `brickets (@brickets) <https://github.com/brickets>`__
+- `Ruben Brites (@Brites89) <https://github.com/Brites89>`__
 - `Ben Brooks (@brooksben11) <https://github.com/brooksben11>`__
 - `brtchip-tuannguyen (@brtchip-tuannguyen) <https://github.com/brtchip-tuannguyen>`__
 - `Vaclav (@bruxy70) <https://github.com/bruxy70>`__
@@ -1088,6 +1090,7 @@ Contributors
 - `Kuba Szczodrzyński (@kuba2k2) <https://github.com/kuba2k2>`__
 - `Jakub Šimo (@kubik369) <https://github.com/kubik369>`__
 - `Mark Kuchel (@kuchel77) <https://github.com/kuchel77>`__
+- `Kurt Fuchs (@KurtFuchs) <https://github.com/KurtFuchs>`__
 - `kvvoff (@kvvoff) <https://github.com/kvvoff>`__
 - `Ken Davidson (@kwdavidson) <https://github.com/kwdavidson>`__
 - `Kyle Hendricks (@kylehendricks) <https://github.com/kylehendricks>`__
@@ -2108,4 +2111,4 @@ Contributors
 - `Christian Zufferey (@zuzu59) <https://github.com/zuzu59>`__
 - `Zynth-dev (@Zynth-dev) <https://github.com/Zynth-dev>`__
 
-*This page was last updated April 9, 2025.*
+*This page was last updated April 15, 2025.*
