Skip to content

Commit

Permalink
Merge pull request #4667 from esphome/bump-2025.2.0b3
Browse files Browse the repository at this point in the history
2025.2.0b3
  • Loading branch information
jesserockz authored Feb 14, 2025
2 parents 36255c8 + fd3bcc0 commit 40d392a
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 8 deletions.
2 changes: 1 addition & 1 deletion Doxygen
Original file line number Diff line number Diff line change
Expand Up @@ -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.2.0b2
PROJECT_NUMBER = 2025.2.0b3

# 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
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ESPHOME_PATH = ../esphome
ESPHOME_REF = 2025.2.0b2
ESPHOME_REF = 2025.2.0b3
PAGEFIND_VERSION=1.1.1
PAGEFIND=pagefind
NET_PAGEFIND=../pagefindbin/pagefind
Expand Down
2 changes: 1 addition & 1 deletion _static/version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2025.2.0b2
2025.2.0b3
8 changes: 8 additions & 0 deletions changelog/2025.2.0.rst
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,10 @@ Beta Changes
- [cse7766] Remove ``stream`` dependency :esphomepr:`7720` by :ghuser:`gabest11`
- [graph] Remove ``stream`` dependency :esphomepr:`8243` by :ghuser:`kbx81`
- [modbus_controller] Remove `stream` dependency :esphomepr:`8244` by :ghuser:`kbx81`
- [online_image]Fix reset if buffer not allocated :esphomepr:`8236` by :ghuser:`guillempages`
- [logger] Fix bug causing global log level to be overwritten :esphomepr:`8248` by :ghuser:`swoboda1337`
- Add support for the DAC on the S2 :esphomepr:`8030` by :ghuser:`maraid`
- Fix crash when storage file doesnt exist yet :esphomepr:`8249` by :ghuser:`jesserockz`

All changes
^^^^^^^^^^^
Expand Down Expand Up @@ -321,6 +325,10 @@ All changes
- [cse7766] Remove ``stream`` dependency :esphomepr:`7720` by :ghuser:`gabest11`
- [graph] Remove ``stream`` dependency :esphomepr:`8243` by :ghuser:`kbx81`
- [modbus_controller] Remove `stream` dependency :esphomepr:`8244` by :ghuser:`kbx81`
- [online_image]Fix reset if buffer not allocated :esphomepr:`8236` by :ghuser:`guillempages`
- [logger] Fix bug causing global log level to be overwritten :esphomepr:`8248` by :ghuser:`swoboda1337`
- Add support for the DAC on the S2 :esphomepr:`8030` by :ghuser:`maraid`
- Fix crash when storage file doesnt exist yet :esphomepr:`8249` by :ghuser:`jesserockz`

Past Changelogs
---------------
Expand Down
7 changes: 4 additions & 3 deletions components/output/esp32_dac.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ converter of the ESP32. Unlike the :doc:`/components/output/ledc`, which can sim
signal by using a fast switching frequency, the hardware DAC can output a *real* analog signal with
no need for additional filtering.

The DAC spans across two pins, each on its own channel: GPIO25 (Channel 1) and GPIO26 (Channel 2).
The DAC spans across two pins, each on its own channel:
- ESP32: GPIO25 (Channel 0) and GPIO26 (Channel 1).
- ESP32 S2: GPIO17 (Channel 0) and GPIO18 (Channel 1).

The output level is a percentage of the board supply voltage (VDD_A) - generally this will be 3.3 V.

Expand Down Expand Up @@ -41,8 +43,7 @@ The output level is a percentage of the board supply voltage (VDD_A) - generally
Configuration variables:
------------------------

- **pin** (**Required**, :ref:`Pin Schema <config-pin_schema>`): The pin to use DAC on. Only GPIO25
and GPIO26 are supported.
- **pin** (**Required**, :ref:`Pin Schema <config-pin_schema>`): The pin to use DAC on. See above for valid pin numbers.
- **id** (**Required**, :ref:`config-id`): The id to use for this output component.
- All other options from :ref:`Output <config-output>`.

Expand Down
2 changes: 1 addition & 1 deletion conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
# The short X.Y version.
version = "2025.2"
# The full version, including alpha/beta/rc tags.
release = "2025.2.0b2"
release = "2025.2.0b3"

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
4 changes: 3 additions & 1 deletion guides/supporters.rst
Original file line number Diff line number Diff line change
Expand Up @@ -863,6 +863,7 @@ Contributors
- `Ivo-tje (@Ivo-tje) <https://github.com/Ivo-tje>`__
- `Jouni Paulus (@j-paulus) <https://github.com/j-paulus>`__
- `J0RD4N300 (@J0RD4N300) <https://github.com/J0RD4N300>`__
- `Jacob Carrell (@JacobCarrell) <https://github.com/JacobCarrell>`__
- `jacobswe (@jacobswe) <https://github.com/jacobswe>`__
- `Fredrik Gustafsson (@jagheterfredrik) <https://github.com/jagheterfredrik>`__
- `Jan Harkes (@jaharkes) <https://github.com/jaharkes>`__
Expand Down Expand Up @@ -1749,6 +1750,7 @@ Contributors
- `Jordan W. Cobb (@skykingjwc) <https://github.com/skykingjwc>`__
- `slimeinacloak (@slimeinacloak) <https://github.com/slimeinacloak>`__
- `Sebastian Lövdahl (@slovdahl) <https://github.com/slovdahl>`__
- `Smartpadza (@Smartpadza) <https://github.com/Smartpadza>`__
- `smischny (@smischny) <https://github.com/smischny>`__
- `Jacob Masen-Smith (@smithjacobj) <https://github.com/smithjacobj>`__
- `John Mueller (@softplus) <https://github.com/softplus>`__
Expand Down Expand Up @@ -2075,4 +2077,4 @@ Contributors
- `Christian Zufferey (@zuzu59) <https://github.com/zuzu59>`__
- `Zynth-dev (@Zynth-dev) <https://github.com/Zynth-dev>`__

*This page was last updated February 13, 2025.*
*This page was last updated February 14, 2025.*

0 comments on commit 40d392a

Please sign in to comment.