From dc4f985548978283cd58963f1810bae7cc0c1ec6 Mon Sep 17 00:00:00 2001 From: rheinz Date: Mon, 22 Mar 2021 20:15:23 +0100 Subject: [PATCH 01/12] Fix typo lambada -> lambda in multiple display compoments (#1071) Co-authored-by: rheinz --- components/display/ili9341.rst | 2 +- components/display/ssd1325.rst | 2 +- components/display/ssd1327.rst | 2 +- components/display/st7789v.rst | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/components/display/ili9341.rst b/components/display/ili9341.rst index 536d6c96f..4f84318c2 100644 --- a/components/display/ili9341.rst +++ b/components/display/ili9341.rst @@ -65,7 +65,7 @@ Configuration examples To utilize the color capabilities of this display module, you'll likely want to add a ``color:`` section to your YAML configuration; please see :ref:`color ` for more detail on this configuration section. -To use colors in your lambada: +To use colors in your lambda: .. code-block:: yaml diff --git a/components/display/ssd1325.rst b/components/display/ssd1325.rst index 778b7093a..90b36f699 100644 --- a/components/display/ssd1325.rst +++ b/components/display/ssd1325.rst @@ -71,7 +71,7 @@ To utilize the grayscale capabilities of this display module, add a ``color:`` s please see :ref:`color ` for more details. As this is a grayscale display, it only uses the white color element as shown below. -To use grayscale in your lambada: +To use grayscale in your lambda: .. code-block:: yaml diff --git a/components/display/ssd1327.rst b/components/display/ssd1327.rst index a958e15dc..ebbd2eef2 100644 --- a/components/display/ssd1327.rst +++ b/components/display/ssd1327.rst @@ -129,7 +129,7 @@ To utilize the grayscale capabilities of this display module, add a ``color:`` s please see :ref:`color ` for more details. As this is a grayscale display, it only uses the white color element as shown below. -To use grayscale in your lambada: +To use grayscale in your lambda: .. code-block:: yaml diff --git a/components/display/st7789v.rst b/components/display/st7789v.rst index 224376e95..92a3aee26 100644 --- a/components/display/st7789v.rst +++ b/components/display/st7789v.rst @@ -70,7 +70,7 @@ As of version 1.15, ESPHome supports color displays. To utilize the color capabi module, you'll likely want to add a ``color:`` section to your YAML configuration; please see :ref:`color ` for more detail on this configuration section. -To use colors in your lambada: +To use colors in your lambda: .. code-block:: yaml From d13e363702a93f964f779c37ced0aca3db5228ec Mon Sep 17 00:00:00 2001 From: Philip Allgaier Date: Mon, 22 Mar 2021 20:16:55 +0100 Subject: [PATCH 02/12] Consistent spelling of "ID" (#1068) --- guides/configuration-types.rst | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/guides/configuration-types.rst b/guides/configuration-types.rst index 8a87494bd..32366eec9 100644 --- a/guides/configuration-types.rst +++ b/guides/configuration-types.rst @@ -13,15 +13,15 @@ page describes them. ID -- -Quite an important aspect of ESPHome are “ids”. They are used to +Quite an important aspect of ESPHome are “IDs”. They are used to connect components from different domains. For example, you define an -output component together with an id and then later specify that same id +output component together with an ID and then later specify that same ID in the light component. IDs should always be unique within a configuration and ESPHome will warn you if you try to use the same ID twice. Because ESPHome converts your configuration into C++ code and the -ids are in reality just C++ variable names, they must also adhere to +IDs are in reality just C++ variable names, they must also adhere to C++’s naming conventions. `C++ Variable names `__ … @@ -224,7 +224,7 @@ of nodes inherit: To hide these base files from the dashboard, you can - - Place them in a subdirectory (dashboard only shows files in top-level dir) + - Place them in a subdirectory (dashboard only shows files in top-level directory) - Prepend a dot to the filename, like ``.base.yaml`` .. _command-line-substitutions: @@ -290,8 +290,8 @@ config in the main yaml file. All definitions from packages will be merged with config in non-destructive way so you could always override some bits and pieces of package configuration. -Consider the following example where author put common pieces of configuration like WiFi, -I²C into base files and extends it with some devices specific configurations in the main config. +Consider the following example where the author put common pieces of configuration like WiFi and +I²C into base files and extends it with some device specific configurations in the main config. Note how the piece of configuration describing ``api`` component in ``device_base.yaml`` gets merged with the services definitions from main config file. From a98c278e0d521aa18094f1b2b77405592258be21 Mon Sep 17 00:00:00 2001 From: Adrien Brault Date: Tue, 23 Mar 2021 02:52:06 +0100 Subject: [PATCH 03/12] Change GREYSCALE to GRAYSCALE (#1073) --- components/display/index.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/display/index.rst b/components/display/index.rst index b6c650e57..586a1b517 100644 --- a/components/display/index.rst +++ b/components/display/index.rst @@ -344,10 +344,10 @@ Configuration variables: - ``BINARY``: Two colors, suitable for 1 color displays or 2 color image in color displays. Uses 1 bit per pixel, 8 pixels per byte. - - ``GREYSCALE``: Full scale grey. Uses 8 bits per pixel, 1 pixel per byte. + - ``GRAYSCALE``: Full scale grey. Uses 8 bits per pixel, 1 pixel per byte. - ``RGB24``: Full RGB color stored. Uses 3 bytes per pixel. -- **dither** (*Optional*): Specifies which dither method used to process the image, only used in GREYSCALE and BINARY type image. Defaults to ``NONE``. You can read more about it `here `__ and `here `__. +- **dither** (*Optional*): Specifies which dither method used to process the image, only used in GRAYSCALE and BINARY type image. Defaults to ``NONE``. You can read more about it `here `__ and `here `__. - ``NONE``: Every pixel convert to its nearest color. - ``FLOYDSTEINBERG``: Uses Floyd-Steinberg dither to approximate the original image luminosity levels. From 57a22d67b22dc9b73b1edb207a0ef1c580f568c1 Mon Sep 17 00:00:00 2001 From: Otto winter Date: Tue, 23 Mar 2021 13:12:35 +0100 Subject: [PATCH 04/12] Update contributors page --- guides/supporters.rst | 94 +------------------------------------------ index.rst | 1 - 2 files changed, 2 insertions(+), 93 deletions(-) diff --git a/guides/supporters.rst b/guides/supporters.rst index 99dd38928..db9b5de00 100644 --- a/guides/supporters.rst +++ b/guides/supporters.rst @@ -1,101 +1,10 @@ -Supporters & Contributors -========================= - -**Hi! I'm Otto Winter, the author and main developer of ESPHome.** - -Developing ESPHome takes a lot of time. There's a lot of things that go -into developing and maintaining an open-source project: from developing new features, fixing bugs, -answering questions to maintaining servers, preparing releases and moderating discussions. -And of course all of the hardware for new features has to be bought too. I'm a student -so I really appreciate donations :) - -**You can support ESPHome's development** by becoming a Patron or a one-time contribution -with PayPal. - -.. raw:: html - - -
-
-

Support Regularly 💫

- Become A Patron -

- Become a patron for this project. -

-
-
-

One-Time Donation

- Donate with PayPal -

- Make a one-time donation via PayPal. -

-
-
- -Patrons -------- - -People that support ESPHome's development over `Patreon `__. -You guys are awesome! - -- Alexander Leisentritt -- Anders -- Andrea Donno -- Andrew Tierney -- Book of the Future -- Christer Frostmo -- Christoph -- Clayton -- Daan Damhuis -- Dattas Moonchaser -- David Padbury -- Dennis Münchgesang -- Dmitriy Khazansky -- DrZzs -- fabi -- Franck Nijhof -- Gaiar Baimuratov -- Intermittent Technology -- Jung Ervin -- Kenvase -- Lazar Obradovic -- Magnus Overli -- minsuke -- Nick Rout -- Nigel Michki -- Paul Krischer -- Paul Morley -- Paweł Kawa -- Philippe Penochet -- Radu Tizu -- Roman Priesol -- LMR -- Ryan Bahm -- Ryan Nazaretian -- Sam Absalom -- Sasha Mikhnov -- Saulo Onze -- Starwolf73 -- Thibault Maekelbergh -- Thomas Hermine -- Vincèn PUJOL -- Wojciech Bederski -- Yonatan Adest -- Zoltán Jáki - - Contributors ------------- +============ ESPHome is an open-source project, and everybody can contribute to it to make this project awesome. This list contains a list of people who have submitted patches that have made it into the `ESPHome organization's `__ repositories. -Author & Main Developer -*********************** - -- `Otto Winter (@OttoWinter) `__ - 2356 contributions - Contributors ************ @@ -393,6 +302,7 @@ Contributors - `Kevin Uhlir (@n0bel) `__ - 1 contribution - `Erik Näsström (@Naesstrom) `__ - 1 contribution - `Oskar Napieraj (@napieraj) `__ - 7 contributions +- `Otto Winter (@OttoWinter) `__ - 2356 contributions - `Bergont Nicolas (@nbergont) `__ - 1 contribution - `Nebula (@nebula-it) `__ - 1 contribution - `nepozs (@nepozs) `__ - 1 contribution diff --git a/index.rst b/index.rst index 90e162835..77c39b6b2 100644 --- a/index.rst +++ b/index.rst @@ -19,7 +19,6 @@ ESPHome is a system to control your ESP8266/ESP32 by simple yet powerful configu GitHub Discord Twitter - Donate .. _guides: From dffe2f0a7ce04ea3cf2c21a8061048f759d90533 Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Fri, 26 Mar 2021 11:49:44 -0700 Subject: [PATCH 05/12] Update supporters.rst --- guides/supporters.rst | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/guides/supporters.rst b/guides/supporters.rst index db9b5de00..82fd002dc 100644 --- a/guides/supporters.rst +++ b/guides/supporters.rst @@ -5,6 +5,10 @@ ESPHome is an open-source project, and everybody can contribute to it to make th project awesome. This list contains a list of people who have submitted patches that have made it into the `ESPHome organization's `__ repositories. +ESPHome is lead by `Jesse Hills (@jesserockz) `__, who is funded to work on ESPHome full-time by `Nabu Casa `__. To help fund development of ESPHome, subscribe to `Home Assistant Cloud by Nabu Casa `__. + +ESPHome was originally founded by `Otto Winter (@OttoWinter) `__. + Contributors ************ @@ -200,7 +204,6 @@ Contributors - `Joshua Dadswell (@jdads1) `__ - 1 contribution - `jeff-h (@jeff-h) `__ - 2 contributions - `Jeff Rescignano (@JeffResc) `__ - 11 contributions -- `Jesse Hills (@jesserockz) `__ - 119 contributions - `Jérémy JOURDIN (@JJK801) `__ - 1 contribution - `Jonathan Jefferies (@jjok) `__ - 1 contribution - `Justin Maxwell (@jkmaxwell) `__ - 1 contribution @@ -302,7 +305,6 @@ Contributors - `Kevin Uhlir (@n0bel) `__ - 1 contribution - `Erik Näsström (@Naesstrom) `__ - 1 contribution - `Oskar Napieraj (@napieraj) `__ - 7 contributions -- `Otto Winter (@OttoWinter) `__ - 2356 contributions - `Bergont Nicolas (@nbergont) `__ - 1 contribution - `Nebula (@nebula-it) `__ - 1 contribution - `nepozs (@nepozs) `__ - 1 contribution From 91ad5ee9620c9cfbd2fa5ff2bf640c390989b5c3 Mon Sep 17 00:00:00 2001 From: Christian Ferbar <5595808+ferbar@users.noreply.github.com> Date: Mon, 29 Mar 2021 22:26:24 +0200 Subject: [PATCH 06/12] SPI: fix Example (#1076) The right pins for ESP8266 and ESP32 are GPIO12-GPI14. GPIO21-23 is not available on an ESP8266, on an ESP32 it is I2C, maybe it was copy&paste from I2C? --- components/spi.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/components/spi.rst b/components/spi.rst index 2ca47e4ed..5839b0547 100644 --- a/components/spi.rst +++ b/components/spi.rst @@ -31,9 +31,9 @@ rarely be necessary, as the SPI bus can be shared by the devices). # Example configuration entry spi: - clk_pin: GPIO21 - mosi_pin: GPIO22 - miso_pin: GPIO23 + clk_pin: GPIO14 + mosi_pin: GPIO13 + miso_pin: GPIO12 Configuration variables: ------------------------ From 31d9b8b4714c5f4ad12ebf543aab732b88e9ccf5 Mon Sep 17 00:00:00 2001 From: electrofun-smart <67351352+electrofun-smart@users.noreply.github.com> Date: Wed, 21 Apr 2021 16:01:53 -0300 Subject: [PATCH 07/12] Update diy.rst (#1106) Adding `Display TM1637 with ESPHome and MQTT showing Youtube subscribers count and other info` --- guides/diy.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/guides/diy.rst b/guides/diy.rst index 47fb07b9e..0f37dc9a7 100644 --- a/guides/diy.rst +++ b/guides/diy.rst @@ -47,6 +47,7 @@ Blog Posts & Videos - `4$ Xiaomi mijia thermometer LYWSD03MMC + ESP32 + ESPhome `__ by `Omar GHADER `__ - `Baseboard (Line Voltage) Thermostat from Smart Switch `__ by :ghuser:`rjmurph2241` - `Office Doorbell `__ by :ghuser:`shish` +- _`Display TM1637 with ESPHome and MQTT showing Youtube subscribers count and other info `__ by :ghuser:`electrofun-smart` Custom Components & Code ------------------------ From 120bb346dbbfa0dac7e0a996a70ee15ad844bae4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20D=C3=ADez?= <2961735+manutenfruits@users.noreply.github.com> Date: Fri, 23 Apr 2021 15:17:42 -0400 Subject: [PATCH 08/12] Make changelog banner dismissable (#1113) --- _static/custom.css | 9 ++++++--- _templates/layout.html | 11 ++++++++--- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/_static/custom.css b/_static/custom.css index 6dad41e47..70273f248 100644 --- a/_static/custom.css +++ b/_static/custom.css @@ -62,15 +62,18 @@ table.docutils { z-index: 9999; display: none } -#upgrade-footer-changelog { +.footer-button-container { + margin: 0 60px 0 10px; + float: right; +} +.footer-button { background-color: #b3b3b3; color: #4e4e4e; display: inline-block; border-radius: 5px; padding: 0 20px; + margin-left: 10px; cursor: pointer; - float: right; - margin: 0 60px 0 10px; text-decoration: none; } .not-hidden { diff --git a/_templates/layout.html b/_templates/layout.html index 27e04b79a..c8b9d9a29 100644 --- a/_templates/layout.html +++ b/_templates/layout.html @@ -30,15 +30,20 @@ {% block footer %} From 6a4dd993862d2db7f9e937a47e9081ce1df243ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1nos=20Rusiczki?= Date: Fri, 23 Apr 2021 22:18:20 +0300 Subject: [PATCH 09/12] Correct typo: "between between" -> "between" (#1109) --- components/i2c.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/i2c.rst b/components/i2c.rst index f5e3181e6..771f73f99 100644 --- a/components/i2c.rst +++ b/components/i2c.rst @@ -12,7 +12,7 @@ This component sets up the I²C bus for your ESP32 or ESP8266. In order for thes to work correctly, you need to define the I²C bus in your configuration. Please note the ESP will enable its internal 10kΩ pullup resistors for these pins, so you usually don't need to put on external ones. You can use multiple devices on one I²C bus as each device is given a -unique address for communicating between between it and the ESP. You can do this by hopping +unique address for communicating between it and the ESP. You can do this by hopping wires from the two lines (SDA and SCL) from each device board to the next device board or by connecting the wires from each device back to the two I²C pins on the ESP. From fc2da43b8429cb052b28b26f528387f15ca74db6 Mon Sep 17 00:00:00 2001 From: meijerwynand Date: Sun, 25 Apr 2021 02:37:39 +0200 Subject: [PATCH 10/12] Update canbus.rst (#1115) --- components/canbus.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/components/canbus.rst b/components/canbus.rst index 641c63722..5316d86bd 100644 --- a/components/canbus.rst +++ b/components/canbus.rst @@ -92,7 +92,7 @@ This automation will be triggered when a can frame is received. A variable ``x` .. note:: - Messeges this node sends to te same ID will not show up as reveived messages. + Messages this node sends to the same ID will not show up as received messages. .. code-block:: yaml @@ -144,17 +144,17 @@ Configuration variables: MCP2515 ------- -The MCP2515 is a spi device and therfore you must first add the configuration for the spi bus to your file. +The MCP2515 is a spi device and therefore you must first add the configuration for the spi bus to your file. You need to have an :ref:`SPI bus ` in your configuration with both the **mosi_pin** and **miso_pin** set. -For wireing up the MSP2515 please refer to the section below. +For wiring up the MSP2515 please refer to the section below. - **cs_pin** (**Required**, :ref:`Pin Schema `): Is used to tell the receiving SPI device when it should listen for data on the SPI bus. Each device has an individual ``CS`` line. Sometimes also called ``SS``. - **clock** (*Optional*): One of ``8MHZ``, ``16MHZ`` or ``20MHZ``. Clock crystal used on the MCP2515 device. Defaults to ``8MHZ``. -- **mode** (*Optional*): Operation mode. Default ot ``NORMAL`` +- **mode** (*Optional*): Operation mode. Default to ``NORMAL`` - NORMAL: Normal operation - LOOPBACK: Loopback mode can be used to just test you spi connections to the device @@ -202,7 +202,7 @@ Standard IDs and Extended IDs can coexist on the same segment. .. note:: - It is important to know that for example Standard 0x123 and Extended 0x123 are different addesses. + It is important to know that for example Standard 0x123 and Extended 0x123 are different addresses. This example shows how the different ID types are used in the configuration for transmission and receiving. For the IDs decimal or hexadecimal notation is possible: 0x000 - 0x7ff / 0-2047 for Standard IDs only. From cc7991141d993e70dadad0b9584f719e58db674f Mon Sep 17 00:00:00 2001 From: Murilo Date: Mon, 26 Apr 2021 14:20:31 -0300 Subject: [PATCH 11/12] Update diy.rst (#1114) --- guides/diy.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guides/diy.rst b/guides/diy.rst index 0f37dc9a7..d64c5520c 100644 --- a/guides/diy.rst +++ b/guides/diy.rst @@ -47,7 +47,7 @@ Blog Posts & Videos - `4$ Xiaomi mijia thermometer LYWSD03MMC + ESP32 + ESPhome `__ by `Omar GHADER `__ - `Baseboard (Line Voltage) Thermostat from Smart Switch `__ by :ghuser:`rjmurph2241` - `Office Doorbell `__ by :ghuser:`shish` -- _`Display TM1637 with ESPHome and MQTT showing Youtube subscribers count and other info `__ by :ghuser:`electrofun-smart` +- `Display TM1637 with ESPHome and MQTT showing Youtube subscribers count and other info `__ by :ghuser:`electrofun-smart` Custom Components & Code ------------------------ From 3eb51a24f8cafdd8316e0b127100b6566452eb99 Mon Sep 17 00:00:00 2001 From: Jesse Hills <3060199+jesserockz@users.noreply.github.com> Date: Mon, 3 May 2021 11:51:59 +1200 Subject: [PATCH 12/12] Update email addresses (#1122) --- CODE_OF_CONDUCT.md | 22 +++++++++++----------- misc/privacy.rst | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index c5be22727..b91a3b4f8 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -8,19 +8,19 @@ In the interest of fostering an open and welcoming environment, we as contributo Examples of behavior that contributes to creating a positive environment include: -* Using welcoming and inclusive language -* Being respectful of differing viewpoints and experiences -* Gracefully accepting constructive criticism -* Focusing on what is best for the community -* Showing empathy towards other community members +- Using welcoming and inclusive language +- Being respectful of differing viewpoints and experiences +- Gracefully accepting constructive criticism +- Focusing on what is best for the community +- Showing empathy towards other community members Examples of unacceptable behavior by participants include: -* The use of sexualized language or imagery and unwelcome sexual attention or advances -* Trolling, insulting/derogatory comments, and personal or political attacks -* Public or private harassment -* Publishing others' private information, such as a physical or electronic address, without explicit permission -* Other conduct which could reasonably be considered inappropriate in a professional setting +- The use of sexualized language or imagery and unwelcome sexual attention or advances +- Trolling, insulting/derogatory comments, and personal or political attacks +- Public or private harassment +- Publishing others' private information, such as a physical or electronic address, without explicit permission +- Other conduct which could reasonably be considered inappropriate in a professional setting ## Our Responsibilities @@ -34,7 +34,7 @@ This Code of Conduct applies both within project spaces and in public spaces whe ## Enforcement -Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at contact@otto-winter.com. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately. +Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at esphome@nabucasa.com. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately. Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership. diff --git a/misc/privacy.rst b/misc/privacy.rst index 976fd9a4c..73b4180f6 100644 --- a/misc/privacy.rst +++ b/misc/privacy.rst @@ -126,4 +126,4 @@ when they are posted on this page. Contact Us ---------- -If you have any questions about this Privacy Policy, please contact us by email: contact@otto-winter.com +If you have any questions about this Privacy Policy, please contact us by email: esphome@nabucasa.com