Skip to content

Commit 40d392a

Browse files
authored
Merge pull request #4667 from esphome/bump-2025.2.0b3
2025.2.0b3
2 parents 36255c8 + fd3bcc0 commit 40d392a

File tree

7 files changed

+19
-8
lines changed

7 files changed

+19
-8
lines changed

Doxygen

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ PROJECT_NAME = "ESPHome"
3838
# could be handy for archiving the generated documentation or if some version
3939
# control system is used.
4040

41-
PROJECT_NUMBER = 2025.2.0b2
41+
PROJECT_NUMBER = 2025.2.0b3
4242

4343
# Using the PROJECT_BRIEF tag one can provide an optional one line description
4444
# for a project that appears at the top of each page and should give viewer a

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ESPHOME_PATH = ../esphome
2-
ESPHOME_REF = 2025.2.0b2
2+
ESPHOME_REF = 2025.2.0b3
33
PAGEFIND_VERSION=1.1.1
44
PAGEFIND=pagefind
55
NET_PAGEFIND=../pagefindbin/pagefind

_static/version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2025.2.0b2
1+
2025.2.0b3

changelog/2025.2.0.rst

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,10 @@ Beta Changes
135135
- [cse7766] Remove ``stream`` dependency :esphomepr:`7720` by :ghuser:`gabest11`
136136
- [graph] Remove ``stream`` dependency :esphomepr:`8243` by :ghuser:`kbx81`
137137
- [modbus_controller] Remove `stream` dependency :esphomepr:`8244` by :ghuser:`kbx81`
138+
- [online_image]Fix reset if buffer not allocated :esphomepr:`8236` by :ghuser:`guillempages`
139+
- [logger] Fix bug causing global log level to be overwritten :esphomepr:`8248` by :ghuser:`swoboda1337`
140+
- Add support for the DAC on the S2 :esphomepr:`8030` by :ghuser:`maraid`
141+
- Fix crash when storage file doesnt exist yet :esphomepr:`8249` by :ghuser:`jesserockz`
138142

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

325333
Past Changelogs
326334
---------------

components/output/esp32_dac.rst

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@ converter of the ESP32. Unlike the :doc:`/components/output/ledc`, which can sim
1010
signal by using a fast switching frequency, the hardware DAC can output a *real* analog signal with
1111
no need for additional filtering.
1212

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

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

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

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

conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
# The short X.Y version.
7575
version = "2025.2"
7676
# The full version, including alpha/beta/rc tags.
77-
release = "2025.2.0b2"
77+
release = "2025.2.0b3"
7878

7979
# The language for content autogenerated by Sphinx. Refer to documentation
8080
# for a list of supported languages.

guides/supporters.rst

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -863,6 +863,7 @@ Contributors
863863
- `Ivo-tje (@Ivo-tje) <https://github.com/Ivo-tje>`__
864864
- `Jouni Paulus (@j-paulus) <https://github.com/j-paulus>`__
865865
- `J0RD4N300 (@J0RD4N300) <https://github.com/J0RD4N300>`__
866+
- `Jacob Carrell (@JacobCarrell) <https://github.com/JacobCarrell>`__
866867
- `jacobswe (@jacobswe) <https://github.com/jacobswe>`__
867868
- `Fredrik Gustafsson (@jagheterfredrik) <https://github.com/jagheterfredrik>`__
868869
- `Jan Harkes (@jaharkes) <https://github.com/jaharkes>`__
@@ -1749,6 +1750,7 @@ Contributors
17491750
- `Jordan W. Cobb (@skykingjwc) <https://github.com/skykingjwc>`__
17501751
- `slimeinacloak (@slimeinacloak) <https://github.com/slimeinacloak>`__
17511752
- `Sebastian Lövdahl (@slovdahl) <https://github.com/slovdahl>`__
1753+
- `Smartpadza (@Smartpadza) <https://github.com/Smartpadza>`__
17521754
- `smischny (@smischny) <https://github.com/smischny>`__
17531755
- `Jacob Masen-Smith (@smithjacobj) <https://github.com/smithjacobj>`__
17541756
- `John Mueller (@softplus) <https://github.com/softplus>`__
@@ -2075,4 +2077,4 @@ Contributors
20752077
- `Christian Zufferey (@zuzu59) <https://github.com/zuzu59>`__
20762078
- `Zynth-dev (@Zynth-dev) <https://github.com/Zynth-dev>`__
20772079

2078-
*This page was last updated February 13, 2025.*
2080+
*This page was last updated February 14, 2025.*

0 commit comments

Comments
 (0)