From 4e1427d0fe28e287242426634020d89be72251a1 Mon Sep 17 00:00:00 2001 From: Keith Burzinski Date: Sat, 18 Nov 2023 02:01:02 -0600 Subject: [PATCH 1/4] Add 2MB option for partitions.csv generation and restore use of user-defined partitions (#3388) --- components/esp32.rst | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/components/esp32.rst b/components/esp32.rst index 4be16b578..5fae8a97a 100644 --- a/components/esp32.rst +++ b/components/esp32.rst @@ -23,9 +23,11 @@ Configuration variables: choose a generic board from Espressif such as ``esp32dev``. - **framework** (*Optional*): Options for the underlying framework used by ESPHome. See :ref:`esp32-arduino_framework` and :ref:`esp32-espidf_framework`. -- **flash_size** (*Optional*, string): The amount of flash memory available on the ESP32 board/module. One of ``4MB``, - ``8MB``, ``16MB`` or ``32MB``. Defaults to ``4MB``. **Warning: specifying a size larger than that available on your - board will cause the ESP32 to fail to boot.** +- **flash_size** (*Optional*, string): The amount of flash memory available on the ESP32 board/module. One of ``2MB``, + ``4MB``, ``8MB``, ``16MB`` or ``32MB``. Defaults to ``4MB``. **Warning: specifying a size larger than that available + on your board will cause the ESP32 to fail to boot.** +- **partitions** (*Optional*, filename): The name of (optionally including the path to) the file containing the + partitioning scheme to be used. When not specified, partitions are automatically generated based on ``flash_size``. - **variant** (*Optional*, string): The variant of the ESP32 that is used on this board. One of ``esp32``, ``esp32s2``, ``esp32s3``, ``esp32c3`` and ``esp32h2``. Defaults to the variant that is detected from the board; if a board that's unknown to ESPHome is used, this option is mandatory. From 6208e38b23fa587a1394044a1b358f262394f083 Mon Sep 17 00:00:00 2001 From: Jesse Hills <3060199+jesserockz@users.noreply.github.com> Date: Sat, 18 Nov 2023 21:15:59 +1300 Subject: [PATCH 2/4] Bump version to 2023.11.2 --- Doxygen | 2 +- Makefile | 2 +- _static/version | 2 +- conf.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Doxygen b/Doxygen index 7f10882ad..bde9dcb09 100644 --- a/Doxygen +++ b/Doxygen @@ -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 = 2023.11.1 +PROJECT_NUMBER = 2023.11.2 # 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 diff --git a/Makefile b/Makefile index 2db41d373..dbf814b6e 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ ESPHOME_PATH = ../esphome -ESPHOME_REF = 2023.11.1 +ESPHOME_REF = 2023.11.2 .PHONY: html html-strict cleanhtml deploy help live-html Makefile netlify netlify-api api netlify-dependencies svg2png copy-svg2png minify diff --git a/_static/version b/_static/version index 7447c1296..1698e92f8 100644 --- a/_static/version +++ b/_static/version @@ -1 +1 @@ -2023.11.1 \ No newline at end of file +2023.11.2 \ No newline at end of file diff --git a/conf.py b/conf.py index ab2d263d7..455325cb8 100644 --- a/conf.py +++ b/conf.py @@ -69,7 +69,7 @@ author = "ESPHome" # The short X.Y version. version = "2023.11" # The full version, including alpha/beta/rc tags. -release = "2023.11.1" +release = "2023.11.2" # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. From 129171eeb845503a75101916588a49412b9acfaa Mon Sep 17 00:00:00 2001 From: Jesse Hills <3060199+jesserockz@users.noreply.github.com> Date: Sat, 18 Nov 2023 21:16:44 +1300 Subject: [PATCH 3/4] Update changelog for 2023.11.2 --- changelog/2023.11.0.rst | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/changelog/2023.11.0.rst b/changelog/2023.11.0.rst index 8c5794258..3fd14d9a8 100644 --- a/changelog/2023.11.0.rst +++ b/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 -------------------- From ee5a14db5dfcc2d24a14ac08cf89c771d9c1dc31 Mon Sep 17 00:00:00 2001 From: Jesse Hills <3060199+jesserockz@users.noreply.github.com> Date: Sat, 18 Nov 2023 21:17:17 +1300 Subject: [PATCH 4/4] Update supporters for 2023.11.2 --- guides/supporters.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/guides/supporters.rst b/guides/supporters.rst index 0db368e2c..5bd9caa60 100644 --- a/guides/supporters.rst +++ b/guides/supporters.rst @@ -78,6 +78,7 @@ Contributors - `Andreas Mandel (@amandel) `__ - `Amish Vishwakarma (@amishv) `__ - `Amit Keret (@amitkeret) `__ +- `Jason Nader (@ammgws) `__ - `Branden Cash (@ammmze) `__ - `Alexander Momchilov (@amomchilov) `__ - `Oliver King (@AnachronisticPenguin) `__ @@ -1255,4 +1256,4 @@ Contributors - `Zsolt Zsiros (@ZsZs73) `__ - `Christian Zufferey (@zuzu59) `__ -*This page was last updated November 16, 2023.* +*This page was last updated November 18, 2023.*