From f7420c857f2eb07eca92267861a7019a79db6aed Mon Sep 17 00:00:00 2001 From: Samuel Sieb Date: Wed, 8 Mar 2023 12:45:56 -0800 Subject: [PATCH 1/6] fix kuntze docs (#2698) Co-authored-by: Samuel Sieb --- components/logger.rst | 2 ++ components/{ => sensor}/kuntze.rst | 10 +++++----- index.rst | 1 + 3 files changed, 8 insertions(+), 5 deletions(-) rename components/{ => sensor}/kuntze.rst (93%) diff --git a/components/logger.rst b/components/logger.rst index b059efbba..27250dab6 100644 --- a/components/logger.rst +++ b/components/logger.rst @@ -1,3 +1,5 @@ +.. _logger: + Logger Component ================ diff --git a/components/kuntze.rst b/components/sensor/kuntze.rst similarity index 93% rename from components/kuntze.rst rename to components/sensor/kuntze.rst index d204b8671..b4727c693 100644 --- a/components/kuntze.rst +++ b/components/sensor/kuntze.rst @@ -11,7 +11,7 @@ instrument in ESPHome. It uses :ref:`UART ` (ModBUS) for communication. Once configured you can use sensors as described below for your projects. -.. figure:: ../images/kuntze.jpg +.. figure:: ../../images/kuntze.jpg :align: center Kuntze Neon® Multi instrument @@ -30,14 +30,14 @@ The device communicates at ``19200`` baud ``8E1``. To connect to ESPHome, an RS4 transceiver is needed. Choose a type which does not need a trigger to send and receive data, for example: -.. figure:: ../images/rs485.jpg +.. figure:: ../../images/rs485.jpg The controller connects to the UART of the MCU. For ESP32 GPIO `16` to `TXD` and `17` to RXD are the default ones but any other pins can be used as well. 3.3V to VCC and GND to GND. .. warning:: - If you are using the :doc:`logger` make sure you are not using the same pins for it or otherwise disable the UART + If you are using the :ref:`logger` make sure you are not using the same pins for it or otherwise disable the UART logging with the ``baud_rate: 0`` option. Component @@ -52,7 +52,7 @@ A configured modbus component is optional. It will be automatically created. - id: uart_bus tx_pin: GPIO16 rx_pin: GPIO17 - baud_rate: 19600 + baud_rate: 19200 parity: EVEN sensor: @@ -81,7 +81,7 @@ See Also -------- - :ref:`uart` -- :doc:`logger` +- :ref:`logger` - :ref:`Sensor ` - `Kuntze manuals `__ - `Communication protocol `__ diff --git a/index.rst b/index.rst index 2ab0cfdfd..ede62c1fa 100644 --- a/index.rst +++ b/index.rst @@ -365,6 +365,7 @@ Miscellaneous uFire ISE sensor, components/sensor/ufire_ise, ufire_ise.png, pH & Temperature Resol VBus, components/vbus, resol_deltasol_bs_plus.jpg Person Sensor (SEN21231), components/sensor/sen21231, sen21231.png + Kuntze pool sensor, components/sensor/kuntze, kuntze.jpg Motion From badc454254c900fcc83c83e6135978e605a9cf01 Mon Sep 17 00:00:00 2001 From: Russell Cloran Date: Wed, 8 Mar 2023 15:25:20 -0800 Subject: [PATCH 2/6] Document NeoPixelBus support on ESP32-S3 (#2491) Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com> --- components/light/neopixelbus.rst | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/components/light/neopixelbus.rst b/components/light/neopixelbus.rst index b136d5ab2..cc5808a11 100644 --- a/components/light/neopixelbus.rst +++ b/components/light/neopixelbus.rst @@ -127,7 +127,8 @@ settings vary by method: - **async** (*Optional*, boolean): Use an asynchronous transfer. Defaults to ``false``. If enabled, the logger must be disabled even if bus 1 is used. -- **esp32_i2s**: The recommended method for ESP32. Available on all output pins. Additional options: +- **esp32_i2s**: The recommended method for ESP32, but not available on the ESP32-S3 or ESP32-C3. + Available on all output pins. Additional options: - **bus** (*Optional*): The I2S bus to use. The ESP32 has bus 0 or 1 available, but the ESP32-S2 only bus 0. One of ``0``, ``1``, ``dynamic``. @@ -135,7 +136,7 @@ settings vary by method: - **esp32_rmt**: An alternative method for ESP32 that uses the RMT peripheral to send data. Available on all output pins. Additional options: - - **channel** (*Optional*): The RMT channel to use. The ESP32 has channels 0-7, ESP32-S2 0-3 and ESP32-C3 0-1. + - **channel** (*Optional*): The RMT channel to use. The ESP32 has channels 0-7, ESP32-S2 0-3, ESP32-S3 0-3, and ESP32-C3 0-1. Defaults to 6 on ESP32, and 1 on other ESP32 variants. The following method is available only for two-wire chips (specify ``data_pin`` and ``clock_pin``): From 5176b16150da490d561d1a4dd71aa79eb83a3c38 Mon Sep 17 00:00:00 2001 From: NP v/d Spek Date: Thu, 9 Mar 2023 01:02:14 +0100 Subject: [PATCH 3/6] Replace ili9341 with ili9xxx documentation (#2729) Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com> --- _redirects | 1 + .../display/{ili9341.rst => ili9xxx.rst} | 44 +++++++++---------- index.rst | 2 +- 3 files changed, 23 insertions(+), 24 deletions(-) rename components/display/{ili9341.rst => ili9xxx.rst} (83%) diff --git a/_redirects b/_redirects index c288519ff..92ca9563f 100644 --- a/_redirects +++ b/_redirects @@ -8,3 +8,4 @@ /devices/esp32.html /components/esp32.html /changelog/2022.12.4.html /changelog/2022.12.0.html 301 +/components/display/ili9341.html /components/display/ili9xxx.html 301 diff --git a/components/display/ili9341.rst b/components/display/ili9xxx.rst similarity index 83% rename from components/display/ili9341.rst rename to components/display/ili9xxx.rst index 58da05c16..030e287cd 100644 --- a/components/display/ili9341.rst +++ b/components/display/ili9xxx.rst @@ -1,21 +1,25 @@ -ILI9341 TFT LCD -=============== + +ILI9xxx TFT LCD Series +====================== .. seo:: - :description: Instructions for setting up ILI9341 TFT LCD display drivers. + :description: Instructions for setting up ILI9xxx TFT LCD display drivers. :image: ili9341.jpg -.. _ili9341: +.. _ili9xxx: Usage ----- +This component is the successor of the ILI9341 component allowing to control more display drivers and use 16bit colors when enough free ram. -The ``ili9341`` display platform allows you to use +The ``ILI9xxx`` display platform allows you to use ILI9341 (`datasheet `__, -`Aliexpress `__) -displays with ESPHome. As this is a somewhat higher resolution display and may require pins +`Aliexpress `__) and other +displays from the same chip family with ESPHome. As this is a somewhat higher resolution display and may require pins beyond the typical SPI connections, it is better suited for use with the ESP32. +**Note:** To use 16bit instead of 8bit colors use a esp32 with enough PSRAM the display. + .. figure:: images/ili9341-full.jpg :align: center :width: 75.0% @@ -27,15 +31,13 @@ beyond the typical SPI connections, it is better suited for use with the ESP32. # Example minimal configuration entry display: - - platform: ili9341 - model: TFT 2.4 + - platform: ili9xxx + model: ili9341 cs_pin: 14 dc_pin: 27 - led_pin: 32 ### see note below ### reset_pin: 33 - lambda: |- - it.fill(Color::BLACK); + it.fill(COLOR_BLACK); it.print(0, 0, id(my_font), id(my_red), TextAlign::TOP_LEFT, "Hello World!"); Configuration variables: @@ -43,15 +45,12 @@ Configuration variables: - **model** (**Required**): The model of the display. Options are: - - ``M5STACK`` - - ``TFT 2.4`` - - ``TFT 2.4R`` (ILI9342) + - ``M5STACK``, ``TFT 2.4``, ``TFT 2.4R`` + - ``ILI9341``, ``ILI9342``, ``ILI9481``, ``ILI9486``, ``ILI9488``, ``ST7796`` - **cs_pin** (*Optional*, :ref:`Pin Schema `): The CS pin. - **dc_pin** (**Required**, :ref:`Pin Schema `): The DC pin. - **reset_pin** (*Optional*, :ref:`Pin Schema `): The RESET pin. -- **led_pin** (*Optional*, :ref:`Pin Schema `): The display's backlight pin. **Note:** Connect to a - PWM-capable pin to switch/dim the display's backlight **or** save a pin by connecting it through a 3.3K resistor to the +3V supply. - **rotation** (*Optional*): Set the rotation of the display. Everything drawn in the ``lambda:`` will be rotated per this option. One of ``0°`` (default), ``90°``, ``180°``, or ``270°``. - **lambda** (*Optional*, :ref:`lambda `): The lambda to use for rendering the content on the display. @@ -62,7 +61,7 @@ Configuration variables: - **pages** (*Optional*, list): Show pages instead of a single lambda. See :ref:`display-pages`. - **id** (*Optional*, :ref:`config-id`): Manually specify the ID used for code generation. - **color_palette** (*Optional*): The type of color pallet that will be used in the ESP's internal 8-bits-per-pixel buffer. This can be used to improve color depth quality of the image. For example if you know that the display will only be showing grayscale images, the clarity of the display can be improved by targeting the available colors to monochrome only. Options are: - + - ``NONE`` (default) - ``GRAYSCALE`` - ``IMAGE_ADAPTIVE`` @@ -124,7 +123,7 @@ To configure a dimmable backlight: light: - platform: monochromatic output: gpio_32_backlight_pwm - name: "ILI9341 Display Backlight" + name: "Display Backlight" id: back_light restore_mode: ALWAYS_ON @@ -139,11 +138,10 @@ To configure an image adaptive color pallet to show greater than 8 bit color dep type: RGB24 display: - - platform: ili9341 - model: TFT 2.4 + - platform: ili9xxx + model: ili9341 cs_pin: 5 dc_pin: 4 - led_pin: 15 reset_pin: 22 rotation: 90 id: tft_ha @@ -158,5 +156,5 @@ See Also -------- - :doc:`index` -- :apiref:`ili9341/ili9341_display.h` +- :apiref:`ili9xxx/ili9xxx_display.h` - :ghedit:`Edit` diff --git a/index.rst b/index.rst index ede62c1fa..18d68bf6b 100644 --- a/index.rst +++ b/index.rst @@ -565,7 +565,7 @@ Display Components ST7735, components/display/st7735, st7735.jpg ST7789V, components/display/st7789v, st7789v.jpg ST7920, components/display/st7920, st7920.jpg - ILI9341, components/display/ili9341, ili9341.jpg + ILI9xxx, components/display/ili9xxx, ili9341.jpg Waveshare E-Paper, components/display/waveshare_epaper, waveshare_epaper.jpg Inkplate, components/display/inkplate6, inkplate6.jpg PCD8544 (Nokia 5110/ 3310), components/display/pcd8544, pcd8544.jpg From c565527180e5e8e66cc1f83857d86c4e7f41921e Mon Sep 17 00:00:00 2001 From: Jesse Hills <3060199+jesserockz@users.noreply.github.com> Date: Thu, 9 Mar 2023 15:48:13 +1300 Subject: [PATCH 4/6] Bump version to 2023.3.0b2 --- Doxygen | 2 +- Makefile | 2 +- _static/version | 2 +- conf.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Doxygen b/Doxygen index c222a4be0..1e38ed565 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.3.0b1 +PROJECT_NUMBER = 2023.3.0b2 # 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 15f31f6ad..a8fb67929 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ ESPHOME_PATH = ../esphome -ESPHOME_REF = 2023.3.0b1 +ESPHOME_REF = 2023.3.0b2 .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 7fd9494fb..ca2ebdb75 100644 --- a/_static/version +++ b/_static/version @@ -1 +1 @@ -2023.3.0b1 \ No newline at end of file +2023.3.0b2 \ No newline at end of file diff --git a/conf.py b/conf.py index bc9729ddf..7b82c30d6 100644 --- a/conf.py +++ b/conf.py @@ -69,7 +69,7 @@ author = "ESPHome" # The short X.Y version. version = "2023.3" # The full version, including alpha/beta/rc tags. -release = "2023.3.0b1" +release = "2023.3.0b2" # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. From 318afe360304dbff4633ce6896175be28b4b8968 Mon Sep 17 00:00:00 2001 From: Jesse Hills <3060199+jesserockz@users.noreply.github.com> Date: Thu, 9 Mar 2023 15:52:45 +1300 Subject: [PATCH 5/6] Update changelog for 2023.3.0b2 --- changelog/2023.3.0.rst | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/changelog/2023.3.0.rst b/changelog/2023.3.0.rst index 82309ed55..294ec7b29 100644 --- a/changelog/2023.3.0.rst +++ b/changelog/2023.3.0.rst @@ -61,6 +61,16 @@ Breaking Changes - Sprinkler "v2" updates :esphomepr:`4159` by :ghuser:`kbx81` (breaking-change) - sn74hc165 fixes :esphomepr:`4457` by :ghuser:`jesserockz` (breaking-change) +Beta Changes +^^^^^^^^^^^^ + +- Fix ethernet clk_mode for GPIO0_OUT :esphomepr:`4307` by :ghuser:`jorticus` +- Add ESP32-S3 support in NeoPixelBus component :esphomepr:`4114` by :ghuser:`rcloran` +- Renaming and extending the ili9341 to the ili9xxx component :esphomepr:`4275` by :ghuser:`nielsnl68` (new-integration) (breaking-change) +- Drop unused, broken logging macros :esphomepr:`4534` by :ghuser:`oxan` +- Revert storing Font glyphs in manually-allocated memory :esphomepr:`4516` by :ghuser:`oxan` +- Correct BME680 gas calculation and heater_off :esphomepr:`4498` by :ghuser:`CarlosGS` + All changes ^^^^^^^^^^^ From 378e6f1ce4a8e4664d56ca60b2a609d443a2b889 Mon Sep 17 00:00:00 2001 From: Jesse Hills <3060199+jesserockz@users.noreply.github.com> Date: Thu, 9 Mar 2023 15:53:24 +1300 Subject: [PATCH 6/6] Update supporters for 2023.3.0b2 --- guides/supporters.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/guides/supporters.rst b/guides/supporters.rst index 8c0442b49..3c3c21b88 100644 --- a/guides/supporters.rst +++ b/guides/supporters.rst @@ -360,7 +360,6 @@ Contributors - `Antoine GRÉA (@grea09) `__ - `Gil Peeters (@grillp) `__ - `George (@grob6000) `__ -- `Stefan Grufman (@GruffyPuffy) `__ - `gsexton (@gsexton) `__ - `Gabriel Sieben (@gsieben) `__ - `Jadson Santos (@gtjadsonsantos) `__ @@ -474,6 +473,7 @@ Contributors - `JonnyaiR (@jonnyair) `__ - `Jonathan V (@jonofmac) `__ - `Joppy (@JoppyFurr) `__ +- `Jared Sanson (@jorticus) `__ - `Joshua Spence (@joshuaspence) `__ - `Joscha Wagner (@jowgn) `__ - `Javier Peletier (@jpeletier) `__ @@ -729,6 +729,7 @@ Contributors - `randomllama (@randomllama) `__ - `rbaron (@rbaron) `__ - `Robert Cambridge (@rcambrj) `__ +- `Russell Cloran (@rcloran) `__ - `Rebbe Pod (@RebbePod) `__ - `Alex (@redwngsrul) `__ - `Regev Brody (@regevbr) `__