Merge branch 'current' into next

changelog/2023.4.0.rst

@@ -69,6 +69,11 @@ Release 2023.4.3 - May 2
 - Fix sprinkler switch restore_mode :esphomepr:`4756` by :ghuser:`kbx81`
 - Fix i2s media player on devices with no internal DAC :esphomepr:`4768` by :ghuser:`jesserockz`
 
+Release 2023.4.4 - May 4
+------------------------
+
+- Fixes for Arduino 2.7.4 (for FastLED) :esphomepr:`4777` by :ghuser:`timn`
+
 Breaking Changes
 ----------------
 

components/i2s_audio.rst

@@ -1,3 +1,5 @@
+.. _i2s_audio:
+
 I²S Audio Component
 ===================
 
@@ -18,8 +20,9 @@ This component only works on ESP32 based chips.
 Configuration variables:
 ------------------------
 
-- **i2s_lrclk_pin** (**Required**, :ref:`Pin Schema <config-pin_schema>`): The GPIO pin to use for the I²S LRCLK (Word Select or Left/Right Clock) signal.
+- **i2s_lrclk_pin** (**Required**, :ref:`Pin Schema <config-pin_schema>`): The GPIO pin to use for the I²S ``LRCLK`` *(Left/Right Clock)* signal, also referred to as ``WS`` *(Word Select)* or ``FS`` *(Frame Sync)*.
-- **i2s_bclk_pin** (**Required**, :ref:`Pin Schema <config-pin_schema>`): The GPIO pin to use for the I²S BCLK (Bit Clock) signal.
+- **i2s_bclk_pin** (**Required**, :ref:`Pin Schema <config-pin_schema>`): The GPIO pin to use for the I²S ``BCLK`` *(Bit Clock)* signal, also referred to as ``SCK`` *(Serial Clock)*.
+- **id** (*Optional*, :ref:`config-id`): Manually specify the ID for this I²S bus if you need multiple.
 
 See also
 --------

components/media_player/i2s_audio.rst

@@ -31,8 +31,9 @@ Configuration variables:
 External DAC
 ************
 
-- **i2s_dout_pin** (**Required**, :ref:`Pin Schema <config-pin_schema>`): The GPIO pin to use for the I²S DOUT (Data Out) signal.
+- **i2s_dout_pin** (**Required**, :ref:`Pin Schema <config-pin_schema>`): The GPIO pin to use for the I²S ``DOUT/SDOUT`` *(Data Out)* signal, also referred to as ``SD/SDATA`` *(Serial Data)* or ``DACDAT`` *(Digital to Analog Converter Data)*.
 - **mode** (*Optional*, string): The mode of the I²S bus. Can be ``mono`` or ``stereo``. Defaults to ``mono``.
+- **i2s_audio_id** (*Optional*, :ref:`config-id`): The ID of the :ref:`I²S Audio <i2s_audio>` you wish to use for this media player.
 
 For best results, keep the wires as short as possible.
 

components/microphone/i2s_audio.rst

@@ -31,12 +31,13 @@ Configuration variables:
   - ``external``: Use an external ADC connected to the I²S bus.
   - ``internal``: Use the internal ADC of the ESP32. Only supported on ESP32, no variant support.
 
+- **i2s_audio_id** (*Optional*, :ref:`config-id`): The ID of the :ref:`I²S Audio <i2s_audio>` you wish to use for this microphone.
 - All other options from :ref:`Microphone <config-microphone>`
 
 External ADC
 ------------
 
-- **i2s_din_pin** (**Required**, :ref:`Pin Schema <config-pin_schema>`): The GPIO pin to use for the I²S DIN (Data In) signal.
+- **i2s_din_pin** (**Required**, :ref:`Pin Schema <config-pin_schema>`): The GPIO pin to use for the I²S ``DIN/SDIN`` *(Data In)* signal, also referred to as ``SD/SDATA`` *(Serial Data)* or ``ADCDAT`` *(Analog to Digital Converter Data)*.
 - **pdm** (**Required**, boolean): Set this to ``true`` if your external ADC uses PDM (Pulse Density Modulation) instead of I²S.
 
   .. note::

guides/supporters.rst

@@ -1063,6 +1063,7 @@ Contributors
 - `Tijs-B (@Tijs-B) <https://github.com/Tijs-B>`__
 - `Tim Laurence (@timdaman) <https://github.com/timdaman>`__
 - `Aidan Timson (@timmo001) <https://github.com/timmo001>`__
+- `Tim Niemueller (@timn) <https://github.com/timn>`__
 - `Tim Savage (@timsavage) <https://github.com/timsavage>`__
 - `Tinkerfish (@tinkerfish) <https://github.com/tinkerfish>`__
 - `TJ Horner (@tjhorner) <https://github.com/tjhorner>`__
@@ -1149,4 +1150,4 @@ Contributors
 - `Zack Barett (@zsarnett) <https://github.com/zsarnett>`__
 - `Christian Zufferey (@zuzu59) <https://github.com/zuzu59>`__
 
-*This page was last updated May 2, 2023.*
+*This page was last updated May 4, 2023.*