Merge branch 'current' into next

This commit is contained in:
Jesse Hills 2023-11-14 14:32:27 +13:00
commit 2e77a2f31f
No known key found for this signature in database
GPG Key ID: BEAAE804EFD8E83A
3 changed files with 17 additions and 5 deletions

View File

@ -46,8 +46,6 @@ Configuration variables:
- **update_interval** (*Optional*, :ref:`config-time`): The interval to re-draw the screen. Defaults to ``1s``. - **update_interval** (*Optional*, :ref:`config-time`): The interval to re-draw the screen. Defaults to ``1s``.
- **id** (*Optional*, :ref:`config-id`): Manually specify the ID used for code generation. - **id** (*Optional*, :ref:`config-id`): Manually specify the ID used for code generation.
.. _display-tm1637_lambda:
Binary Sensor Binary Sensor
------------- -------------
@ -79,6 +77,8 @@ Configuration variables:
0 to 15. 0 to 15.
- All other options from :ref:`Binary Sensor <config-binary_sensor>`. - All other options from :ref:`Binary Sensor <config-binary_sensor>`.
.. _display-tm1637_lambda:
Rendering Lambda Rendering Lambda
---------------- ----------------

View File

@ -614,7 +614,7 @@ loader. These are:
create the necessary C++ source code. create the necessary C++ source code.
- ``DEPENDENCIES``: Mark the component to depend on other components. If the user hasn't explicitly - ``DEPENDENCIES``: Mark the component to depend on other components. If the user hasn't explicitly
added these components in their configuration, a validation error will be generated. added these components in their configuration, a validation error will be generated.
- ``AUTO_LOAD``: Automatically load an integration if the user hasn't added it manually. - ``AUTO_LOAD``: Automatically load a component if the user hasn't added it manually.
- ``MULTI_CONF``: Mark this component to accept an array of configurations. If this is an - ``MULTI_CONF``: Mark this component to accept an array of configurations. If this is an
integer instead of a boolean, validation will only permit the given number of entries. integer instead of a boolean, validation will only permit the given number of entries.
- ``CONFLICTS_WITH``: Mark a list of components as conflicting with this integration. If the user - ``CONFLICTS_WITH``: Mark a list of components as conflicting with this integration. If the user

View File

@ -229,9 +229,15 @@
<div class="hidden info esp32-s3-box-3"> <div class="hidden info esp32-s3-box-3">
<h3>ESP32-S3-BOX-3</h3> <h3>ESP32-S3-BOX-3</h3>
<p>The open-source reference design for voice assistants by Espressif.</p> <p>
<p>Buy</p> The open-source reference design for voice assistants by Espressif. The
non-3 and lite variant are older versions that are no longer for sale.
</p>
<p>Buy ESP32-S3-BOX-3</p>
<ul> <ul>
<li>
<a href="https://amzn.to/3u9HIUW">Amazon</a>
</li>
<li> <li>
<a <a
href="https://www.aliexpress.us/item/3256805733893224.html?gatewayAdapt=glo2usa4itemAdapt" href="https://www.aliexpress.us/item/3256805733893224.html?gatewayAdapt=glo2usa4itemAdapt"
@ -246,6 +252,9 @@
<p>Tiny ESP32 board with a built-in speaker.</p> <p>Tiny ESP32 board with a built-in speaker.</p>
<p>Buy</p> <p>Buy</p>
<ul> <ul>
<li>
<a href="https://amzn.to/47wcAx2">Amazon</a>
</li>
<li> <li>
<a <a
href="https://shop.m5stack.com/collections/m5-controllers/products/atom-echo-smart-speaker-dev-kit?ref=NabuCasa" href="https://shop.m5stack.com/collections/m5-controllers/products/atom-echo-smart-speaker-dev-kit?ref=NabuCasa"
@ -676,6 +685,9 @@
<p>Tiny ESP32 board with a built-in speaker.</p> <p>Tiny ESP32 board with a built-in speaker.</p>
<p>Buy</p> <p>Buy</p>
<ul> <ul>
<li>
<a href="https://amzn.to/47wcAx2">Amazon</a>
</li>
<li> <li>
<a <a
href="https://shop.m5stack.com/collections/m5-controllers/products/atom-echo-smart-speaker-dev-kit?ref=NabuCasa" href="https://shop.m5stack.com/collections/m5-controllers/products/atom-echo-smart-speaker-dev-kit?ref=NabuCasa"