Merge branch 'esphome:main' into add/geekbes-ym-ws-1-plug

esphome · Dec 12, 2024 · 599c660 · 599c660
2 parents 5fe784e + ddfef60
commit 599c660
Show file tree

Hide file tree

Showing 4 changed files with 86 additions and 137 deletions.
diff --git a/src/docs/devices/Shelly-1-Mini-Gen3/index.md b/src/docs/devices/Shelly-1-Mini-Gen3/index.md
@@ -11,39 +11,35 @@ Generation 3 of Shelly Mini. With Relay, but no Powermeter.
 
 ## GPIO Pinout
 
-| Pin   | Function     |
-| ----- | ------------ |
-| GPI00 | LED          |
-| GPI01 | Button       |
-| GPI03 | NTC          |
-| GPI07 | Relay        |
-| GPI10 | Switch       |
+| Pin   | Function |
+| ----- | -------- |
+| GPI00 | LED      |
+| GPI01 | Button   |
+| GPI03 | NTC      |
+| GPI07 | Relay    |
+| GPI10 | Switch   |
 
 ## Serial Pinout
 
 The UART Pinout is the same as other Shelly Mini.
 
-| Pin      | Colour       |
-| -------- | ------------ |
-| Reset    | Brown        |
-| 3v3      | Red          |
-| RX       | Blue         |
-| TX       | Yellow       |
-| BootSEL  | Purple       |
-| GND      | Black        |
+| Pin     | Colour |
+| ------- | ------ |
+| Reset   | Brown  |
+| 3v3     | Red    |
+| RX      | Blue   |
+| TX      | Yellow |
+| BootSEL | Purple |
+| GND     | Black  |
 
 ![Shelly 1 Mini Gen3](../Shelly-1-Mini-Gen3/shelly_1_mini_gen3_pcb_a.png "Shelly 1 Mini Gen3")
 
 ## Basic Configuration
 
 ```yaml
-substitutions:
-  device_name: "shelly-1-mini-gen3"
-  friendly_name : "Shelly 1 Mini Gen3"
-
 esphome:
-  name: ${device_name}
-  friendly_name: ${friendly_name}
+  name: "shelly-1-mini-gen3"
+  friendly_name: "Shelly 1 Mini Gen3"
 
 esp32:
   board: esp32-c3-devkitm-1
@@ -53,24 +49,15 @@ esp32:
     version: recommended
     sdkconfig_options:
       COMPILER_OPTIMIZATION_SIZE: y
-    advanced:
-      ignore_efuse_mac_crc: false
 
 wifi:
-  ssid: !secret wifi_ssid
-  password: !secret wifi_password
   ap:
-    ssid: "$(device_name) Fallback Hotspot"
-    password: !secret wifi_password
 
 logger:
 
 api:
-  encryption:
-    key: !secret api_encryption_key
 
 ota:
-  password: !secret ota_password
 
 time:
   - platform: homeassistant

diff --git a/src/docs/devices/Shelly-1PM-Mini-Gen3/index.md b/src/docs/devices/Shelly-1PM-Mini-Gen3/index.md
@@ -11,39 +11,35 @@ Generation 3 of Shelly Mini. With Powermeter, and Relay
 
 ## Serial Pinout
 
-| Pin      | Colour       |
-| -------- | ------------ |
-| Reset    | Brown        |
-| 3v3      | Red          |
-| RX       | Blue         |
-| TX       | Yellow       |
-| BootSEL  | Purple       |
-| GND      | Black        |
+| Pin     | Colour |
+| ------- | ------ |
+| Reset   | Brown  |
+| 3v3     | Red    |
+| RX      | Blue   |
+| TX      | Yellow |
+| BootSEL | Purple |
+| GND     | Black  |
 
 The UART Pinout is the same as other Shelly Plus Mini.
 
 ## GPIO Pinout
 
-| Pin    | Function     |
-| ------ | ------------ |
-| GPIO0  | LED          |
-| GPIO1  | Button       |
-| GPIO3  | NTC          |
-| GPIO5  | Relay        |
-| GPIO6  | BL0942 TX    |
-| GPIO7  | BL0942 RX    |
-| GPIO10 | Switch       |
+| Pin    | Function  |
+| ------ | --------- |
+| GPIO0  | LED       |
+| GPIO1  | Button    |
+| GPIO3  | NTC       |
+| GPIO5  | Relay     |
+| GPIO6  | BL0942 TX |
+| GPIO7  | BL0942 RX |
+| GPIO10 | Switch    |
 
 ## Basic Configuration
 
 ```yaml
-substitutions:
-  device_name: "sehlly-1pm-mini-gen3"
-  friendly_name : "Shelly 1PM Mini Gen3"
-
 esphome:
-  name: ${device_name}
-  friendly_name: ${friendly_name}
+  name: "sehlly-1pm-mini-gen3"
+  friendly_name: "Shelly 1PM Mini Gen3"
 
 esp32:
   board: esp32-c3-devkitm-1
@@ -53,24 +49,15 @@ esp32:
     version: recommended
     sdkconfig_options:
       COMPILER_OPTIMIZATION_SIZE: y
-    advanced:
-      ignore_efuse_mac_crc: false
 
 wifi:
-  ssid: !secret wifi_ssid
-  password: !secret wifi_password
   ap:
-    ssid: "$(device_name) Fallback Hotspot"
-    password: !secret wifi_password
 
 logger:
 
 api:
-  encryption:
-    key: !secret api_encryption_key
 
 ota:
-  password: !secret ota_password
 
 time:
   - platform: homeassistant
@@ -101,22 +88,22 @@ sensor:
   - platform: bl0942
     uart_id: uart_0
     voltage:
-      name: 'Voltage'
+      name: "Voltage"
       id: bvoltage
       icon: mdi:alpha-v-circle-outline
       device_class: voltage
     current:
-      name: 'Current'
+      name: "Current"
       id: bcurrent
       icon: mdi:alpha-a-circle-outline
       device_class: current
     power:
-      name: 'Power'
+      name: "Power"
       id: bpower
       icon: mdi:transmission-tower
       device_class: power
     energy:
-      name: 'Energy'
+      name: "Energy"
       id: benergy
       icon: mdi:lightning-bolt
       device_class: energy

diff --git a/src/docs/devices/Shelly-PM-Mini-Gen3/index.md b/src/docs/devices/Shelly-PM-Mini-Gen3/index.md
@@ -6,43 +6,40 @@ standard: uk, us, eu
 board: esp32
 difficulty: 4
 ---
+
 Generation 3 of Shelly Mini. With Powermeter. Flashsize is 8MB.
 
 ## Serial Pinout
 
 The UART Pinout is the same as other Shelly Plus Mini.
 
-| Pin      | Colour       |
-| -------- | ------------ |
-| Reset    | Brown        |
-| 3v3      | Red          |
-| RX       | Blue         |
-| TX       | Yellow       |
-| BootSEL  | Purple       |
-| GND      | Black        |
+| Pin     | Colour |
+| ------- | ------ |
+| Reset   | Brown  |
+| 3v3     | Red    |
+| RX      | Blue   |
+| TX      | Yellow |
+| BootSEL | Purple |
+| GND     | Black  |
 
 ![Shelly PM Mini Gen3](../Shelly-PM-Mini-Gen3/shelly_pm_mini_gen3_pcb_a.png "Shelly PM Mini Gen3")
 
 ## GPIO Pinout
 
-| Pin   | Function     |
-| ----- | ------------ |
-| GPIO3 | NTC          |
-| GPIO6 | BL0942 TX    |
-| GPIO7 | BL0942 RX    |
-| GPIO0 | LED          |
-| GPIO1 | Button       |
+| Pin   | Function  |
+| ----- | --------- |
+| GPIO3 | NTC       |
+| GPIO6 | BL0942 TX |
+| GPIO7 | BL0942 RX |
+| GPIO0 | LED       |
+| GPIO1 | Button    |
 
 ## Basic Configuration
 
 ```yaml
-substitutions:
-  device_name: "pm-mini-gen3"
-  friendly_name : "Shelly PM Mini Gen3"
-
 esphome:
-  name: ${device_name}
-  friendly_name: ${friendly_name}
+  name: "pm-mini-gen3"
+  friendly_name: "Shelly PM Mini Gen3"
   platformio_options:
     board_build.flash_mode: dio
 
@@ -54,24 +51,15 @@ esp32:
     version: recommended
     sdkconfig_options:
       COMPILER_OPTIMIZATION_SIZE: y
-    advanced:
-      ignore_efuse_mac_crc: false
 
 wifi:
-  ssid: !secret wifi_ssid
-  password: !secret wifi_password
   ap:
-    ssid: "$(device_name) Fallback Hotspot"
-    password: !secret wifi_password
 
 logger:
 
 api:
-  encryption:
-    key: !secret api_encryption_key
 
 ota:
-  password: !secret ota_password
 
 time:
   - platform: homeassistant
@@ -102,22 +90,22 @@ sensor:
   - platform: bl0942
     uart_id: uart_0
     voltage:
-      name: 'Voltage'
+      name: "Voltage"
       id: bvoltage
       icon: mdi:alpha-v-circle-outline
       device_class: voltage
     current:
-      name: 'Current'
+      name: "Current"
       id: bcurrent
       icon: mdi:alpha-a-circle-outline
       device_class: current
     power:
-      name: 'Power'
+      name: "Power"
       id: bpower
       icon: mdi:transmission-tower
       device_class: power
     energy:
-      name: 'Energy'
+      name: "Energy"
       id: benergy
       icon: mdi:lightning-bolt
       device_class: energy
@@ -150,17 +138,17 @@ binary_sensor:
       mode:
         input: true
         pullup: true
-
 ```
 
-## Total Daily Energy Seonsor
+## Total Daily Energy Sensor
 
 ```yaml
+sensor:
   - platform: total_daily_energy
-    name: 'Total Daily Energy'
+    name: "Total Daily Energy"
     power_id: bpower
     icon: mdi:meter-electric
-    unit_of_measurement: 'kWh'
+    unit_of_measurement: "kWh"
     state_class: total_increasing
     device_class: energy
     accuracy_decimals: 3