Merge branch 'current' into next

changelog/2023.11.0.rst

@@ -73,6 +73,15 @@ Release 2023.11.1 - November 16
 - Fix MY9231 flicker :esphomepr:`5765` by :ghuser:`Mat931`
 
 
+Release 2023.11.2 - November 18
+-------------------------------
+
+- Bump aioesphomeapi from 18.4.0 to 18.4.1 :esphomepr:`5767` by :ghuser:`dependabot[bot]`
+- Bump aioesphomeapi from 18.4.1 to 18.5.2 :esphomepr:`5780` by :ghuser:`dependabot[bot]`
+- fix 32-bit arm :esphomepr:`5781` by :ghuser:`ssieb`
+- Add 2MB option for partitions.csv generation and restore use of user-defined partitions :esphomepr:`5779` by :ghuser:`kbx81`
+
+
 Full list of changes
 --------------------
 

components/esp32_ble_tracker.rst

@@ -147,7 +147,7 @@ Configuration variables:
 ``on_ble_manufacturer_data_advertise`` Trigger
 ************************************************
 
-This automation will be triggered when a Bluetooth advertising with manufcaturer data is received. A
+This automation will be triggered when a Bluetooth advertising with manufacturer data is received. A
 variable ``x`` of type ``std::vector<uint8_t>`` is passed to the automation for use in lambdas.
 
 .. code-block:: yaml

cookbook/lambda_magic.rst

@@ -365,6 +365,41 @@ In this example a :doc:`/components/cover/time_based` is used with the GPIO conf
         - switch.turn_off: open_cover
         - switch.turn_off: close_cover
 
+Update numeric values from text input
+-------------------------------------
+
+Sometimes it may be more confortable to use a :doc:`/components/text/template` to change some numeric values from the user interface.
+ESPHome has some nice `helper functions <https://github.com/esphome/esphome/blob/dev/esphome/core/helpers.h>`__ among which
+theres's one to convert text to numbers.
+
+In the example below we have a text input and a template sensor which can be updated from the text input field. What the lambda
+does, is to parse and convert the text string to a number - which only succeedes if the entered string contains characters
+represesenting a float number (such as digits, ``-`` and ``.``). If the entered string contains any other characters, the lambda
+will return ``NaN``, which corresponds to ``unknown`` sensor state.
+
+.. code-block:: yaml
+
+    text:
+      - platform: template
+        name: "Number type in"
+        optimistic: true
+        min_length: 0
+        max_length: 16
+        mode: text
+        on_value:
+          then:
+            - sensor.template.publish:
+                id: num_from_text
+                state: !lambda |-
+                  auto n = parse_number<float>(x);
+                  return n.has_value() ? n.value() : NAN;
+
+    sensor:
+      - platform: template
+        id: num_from_text
+        name: "Number from text"
+
+
 See Also
 --------
 

guides/configuration-types.rst

@@ -331,20 +331,6 @@ your configuration file. This can be used to create generic 'template' configura
 files (like the ``example.yaml`` above) which can be used for multiple devices,
 using substitutions which are provided on the command line.
 
-Extend
-------
-
-To make changes or add additional configuration to included configurations ``!extend config_id`` can be used, where ``config_id`` is the ID of the configuration to modify.
-For example to set a specific update interval on a common uptime sensor that is shared between configurations:
-
-.. code-block:: yaml
-
-    <<: !include common.yaml
-
-    sensor:
-    - id: !extend uptime_sensor
-      update_interval: 10s
-
 .. _config-packages:
 
 Packages
@@ -543,6 +529,21 @@ platform, it could be constructed like this:
           - switch.turn_off: open_${door_location}_door_switch
           - switch.turn_off: close_${door_location}_door_switch
 
+Extend
+------
+
+To make changes or add additional configuration to included configurations ``!extend config_id`` can be used, where ``config_id`` is the ID of the configuration to modify.
+For example to set a specific update interval on a common uptime sensor that is shared between configurations:
+
+.. code-block:: yaml
+
+    packages:
+      common: !include common.yaml
+
+    sensor:
+    - id: !extend uptime_sensor
+      update_interval: 10s
+
 
 See Also
 --------

guides/supporters.rst

@@ -78,6 +78,7 @@ Contributors
 - `Andreas Mandel (@amandel) <https://github.com/amandel>`__
 - `Amish Vishwakarma (@amishv) <https://github.com/amishv>`__
 - `Amit Keret (@amitkeret) <https://github.com/amitkeret>`__
+- `Jason Nader (@ammgws) <https://github.com/ammgws>`__
 - `Branden Cash (@ammmze) <https://github.com/ammmze>`__
 - `Alexander Momchilov (@amomchilov) <https://github.com/amomchilov>`__
 - `Oliver King (@AnachronisticPenguin) <https://github.com/AnachronisticPenguin>`__
@@ -1255,4 +1256,4 @@ Contributors
 - `Zsolt Zsiros (@ZsZs73) <https://github.com/ZsZs73>`__
 - `Christian Zufferey (@zuzu59) <https://github.com/zuzu59>`__
 
-*This page was last updated November 16, 2023.*
+*This page was last updated November 18, 2023.*