Merge branch 'master' of https://github.com/blakadder/templates into …

…master

_layouts/templates.html

@@ -69,6 +69,7 @@
     {% elsif page.flash == "esp2ino" %}
     <a class="menu" href="https://github.com/elahd/esp2ino" target="_blank">esp2ino</a>
     {% else %}
+    {{ page.flash}}
     {% endif %}
   {% else %}
 
@@ -207,7 +208,6 @@ <h2>This device now comes with a Wi-Fi module incompatible with Tasmota</h2>
   {% if page.title contains 'Athom' %}
   <strong>Use code <code>BLAKADDER4 </code> when buying from Aliexpress links for a 10% discount. Code is valid until end of September.</strong>
   <br><br>
-  As of November 2020 Athom devices are fully compatible with standard Tasmota releases and can be upgraded as any other Tasmota device.
   <p>
   {% endif %}
 

_templates/DS-122

@@ -0,0 +1,21 @@
+---
+date_added: 2021-08-06
+title: Push Button 1/2/3/4 Gang
+model: DS-122
+image: /assets/images/DS-122.jpg
+template: '{"NAME":"DS-122","GPIO":[57,0,0,17,0,0,0,0,0,21,52,0,0],"FLAG":0,"BASE":18}' 
+link: https://www.amazon.com/gp/product/B082YW7HXV
+link2: https://www.aliexpress.com/item/1005003055214111.html
+link3: https://www.amazon.com/gp/product/B08HGWDQ61
+mlink: https://www.atarm.com/product-page/ds-122
+flash: serial
+category: switch
+type: Switch
+standard: us
+---
+# Warning
+The MoesGo version of this device may come with a Tuya WB3S module which cannot be flashed with Tasmota.
+
+The module is a Tuya TYWE3S.
+
+![Back label](/assets/images/DS-122_back.jpg)

_templates/ESP-01S-RGB-LED-v1

@@ -6,13 +6,11 @@ category: light
 type: Addressable LED Controller
 standard: global
 image: /assets/images/ESP-01S-RGB-LED-v1.jpg
-template: '{"NAME":"ESP-01S-RGB-LED-v1.0","GPIO":[255,255,7,255,0,0,0,0,0,0,0,0,0],"FLAG":0,"BASE":18}' 
-mlink: https://github.com/IOT-MCU/ESP-01-01S-DS18B20-v1.0
+template9: '{"NAME":"ESP-01S-RGB-LED-v1.0","GPIO":[1,1,1376,1,0,0,0,0,0,0,0,0,0,0],"FLAG":0,"BASE":18}' 
+mlink: https://github.com/IOT-MCU/ESP-01S-RGB-LED-v1.0
 link: https://www.aliexpress.com/item/1859126994.html
-link2: https://www.amazon.com/ESP8266-Controller-Adpater-Arduino-Christmas/dp/B083JSD5SB/
-link3: https://www.amazon.de/dp/B07ZR8JPQP/
-link4: https://www.banggood.com/Geekcreit-WS2812-Light-Ring-Electronic-Maker-Student-Education-ESP8266-ESP01S-01-RGB-LED-Smart-Wifi-Kit-p-1329204.html
+link2: https://www.banggood.com/2Pcs-Geekcreit-ESP8266-ESP-01-ESP-01S-WS2812-RGB-LED-Lamp-Module-Support-for-IDE-Programming-p-1716944.html?cur_warehouse=CN&rmmds=search
 ---
 How to flash [ESP-01(S)](ESP01)
 
-Only able to control short lengths of addressable LED strips using the board power.
+Only able to control short lengths of addressable LED strips using the board power.

_templates/ESP12F_Relay_X4

@@ -3,7 +3,7 @@ date_added: 2020-12-29
 title: ESP-12F 5V/7-30V/220V 4 Channel
 model: ESP12F_Relay_X4
 image: /assets/images/ESP12F_Relay_X4.jpg
-template9: '{"NAME":"LC-Relay-ESP12-4R-MV","GPIO":[1,1,1,1,1,1,1,1,226,227,225,1,224,1],"FLAG":0,"BASE":18}' 
+template9: '{"NAME":"ESP12F_Relay_X4","GPIO":[1,1,1,1,320,1,1,1,226,227,225,1,224,1],"FLAG":0,"BASE":18}' 
 link: https://www.aliexpress.com/item/1005001644477508.html
 link2: https://www.banggood.com/AC-or-DC-Power-Supply-ESP8266-WIFI-Four-way-Relay-Module-ESP-12F-Development-Board-Secondary-Development-p-1794113.html
 mlink: 
@@ -12,8 +12,17 @@ category: relay
 type: Relay Board
 standard: global
 ---
-Headers must be soldered and jumpers needs to be installed for enabling relays. 
+Headers must be soldered and jumpers needs to be installed for enabling relays.
 
 The board uses GPIO16 and so Relay1 is always turned ON when power is applied to the board, causing a brief on/off pulse on the relay as Tasmota loads and turns it off again. Of course, if the last state was ON, then it will stay ON. It's still a very useful board at a bargain price; just a shame the designer was too lazy to route a different GPIO pin. (Although rather than using the provided link pair, you could link to IO0 IO2 or IO15 thru-holes on the side of the board instead of IO16, and change the template to suite.)
 
+Example for when Relay1 is connected to GPIO15:
+![ESP12F Relay X4 board with Relay1 connected to GPIO15](/assets/images/ESP12F_Relay_X4_GPIO15.jpg)
+
+Suitable template:
+
+``` plain
+{"NAME":"ESP12F_Relay_X4","GPIO":[1,1,1,1,1,320,1,1,226,227,225,224,1,1],"FLAG":0,"BASE":18}
+```
+
 [Instructions](/assets/ESP12F_Relay_X4.pdf)

_templates/SWA5

@@ -1,14 +1,16 @@
 ---
-date_added: 2020-01-05
+date_added: 2021-08-07
 title: SWA5
 category: plug
 type: Plug
 standard: us
-flash: tuya-convert
-link: https://www.amazon.com/LINGANZH-Required-Wireless-Remotely-Anywhere/dp/B07FY1WQCN
-image: https://images-na.ssl-images-amazon.com/images/I/41wbjeaQOQL._SX679_.jpg
+flash: serial
 template: '{"NAME":"Lingan SWA5","GPIO":[56,0,0,0,0,0,0,0,0,17,0,21,0],"FLAG":0,"BASE":18}' 
-link2: http://s.click.aliexpress.com/e/FJewjss0
+template9: '{"NAME":"Linganzh SWA5","GPIO":[320,0,321,0,0,0,0,0,0,32,0,224,0,0],"FLAG":0,"BASE":18}' 
+image: https://images-na.ssl-images-amazon.com/images/I/41wbjeaQOQL._SX679_.jpg
+link: https://www.amazon.com/LINGANZH-Required-Wireless-Remotely-Anywhere/dp/B07FY1WQCN
+link2: https://www.aliexpress.com/item/32884245232.html
+link3: https://www.amazon.ca/gp/product/B07D48YSHS
 mlink: https://lingan.en.alibaba.com/search/product?SearchText=swa5
 ---
-![Label](https://sc01.alicdn.com/kf/H076735dee85941bf986f9fe860b960ebR/ETL-smart-plug-US-wifi-smart-switch.jpg)
+Once you open the device, the pins are soldered on and hard to remove. Once you do do it, PCB has nice pads to solder.

_templates/athom_RS01

@@ -0,0 +1,14 @@
+---
+date_added: 2021-08-06
+title: Athom 3-Way Mini Relay
+model: RS01
+image: /assets/images/athom_RS01.jpg
+template9: '{"NAME":"RS01-TAS-1","GPIO":[0,0,0,32,576,0,0,0,0,224,160,0,0,0],"FLAG":0,"BASE":18}' 
+mlink: https://www.athom.tech/blank-1/3-way-relay
+link: https://www.aliexpress.com/item/1005003091529604.html
+link2: 
+flash: preflashed
+category: relay
+type: Switch Module
+standard: global
+---

_templates/atom_AT9012

@@ -0,0 +1,15 @@
+---
+date_added: 2021-08-03
+title: Atom 11W RGBCCT
+model: AT9012
+image: /assets/images/atom_AT9012.jpg
+template32: '{"NAME":"Atom AT9012/WH/WIZ","GPIO":[0,0,420,0,419,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,416,417,418,0,0,0,0,0,0,0,0,0,0,0,0],"FLAG":0,"BASE":1}' 
+link: https://www.jdlighting.com.au/atom-at9012-wiz-smart-wifi-rgb-white-11w-led-downlight.html
+link2: 
+mlink: https://atomlighting.com.au/product/at9012-wiz/
+flash: serial
+category: light
+type: Downlight
+standard: au
+---
+Requires tasmota32solo1.bin because it is using the single core version of ESP32

_templates/blitzwolf_SHP7

@@ -1,16 +1,32 @@
 ---
-date_added: 2019-10-31
-title: BlitzWolf BW-SHP7
+date_added: 2021-08-09
+title: BlitzWolf 16A Dual
+model: BW-SHP7
 category: plug
 type: Plug
 standard: eu
+template: '{"NAME":"SHP7 v2","GPIO":[18,158,56,131,134,132,0,0,17,57,21,0,22],"FLAG":0,"BASE":45}' 
+image: /assets/images/blitzwolf_SHP7.jpg
 link: https://www.banggood.com/BlitzWolf-BW-SHP7-16A-2-IN-1-Dual-EU-Plug-Smart-WIFI-Socket-Independent-Remote-Controller-Electricity-Statistics-Home-Light-Switch-Timer-p-1553614.html
-image: https://www.blitzwolf.com/bg_os/other/upload_temp/products/original/201908/1566443922_26.jpg
-template: '{"NAME":"SHP7","GPIO":[17,158,57,131,134,132,0,0,18,56,21,0,22],"FLAG":0,"BASE":45}' 
 link2: https://www.aliexpress.com/item/4000210681347.html
 mlink: https://www.blitzwolf.com/3680W-EU-Dual-WiFi-Smart-Socket-p-380.html
 ---
 
-Alternative template (assignments according to factory firmware):
+## Serial Flashing
 
-template: '{"NAME":"SHP7 v2","GPIO":[18,158,56,131,134,132,0,0,17,57,21,0,22],"FLAG":0,"BASE":45}' 
+1. Remove the two stickers on the front.
+2. Undo 2 screws. **PH1** screwdriver required.
+  ![Two PH1 screws](assets/images/bw-shp7-front.jpg)
+3. Remove back with screwdriver
+  ![Remove back](assets/images/bw-shp7-back.jpg)
+4. Undo 2 screws at the back. **PH1** screwdriver required.
+  ![Two PH1 screws](assets/images/bw-shp7-back-screws.jpg)
+5. Remove PCB from casing for easier soldering.
+6. Solder cables to the ESP pins.
+  ![Solder points 1](assets/images/bw-shp7-pins1.jpg ":size=400")
+  Because GND is hard to solder/access, I recommend to use the other side for GND:    
+  ![Solder points 2](assets/images/bw-shp7-pins2.jpg ":size=400")
+  Result:    
+  ![Soldered cables](assets/images/bw-shp7-soldered.jpg ":size=400")
+7. Connect serial adapter and make a shortwire between Pin IO0 and GND during startup (for entering flash mode).
+8. Flash!

_templates/eco4life-DPS1101S

@@ -2,10 +2,10 @@
 date_added: 2020-01-02
 title: eco4life DPS1101S
 link: https://www.amazon.com/ECO4LIFE-Outlet-Assistant-Required-Control/dp/B07D8514NV
-image: https://cdn.shopify.com/s/files/1/0075/5197/5491/products/plug_with_box_600x600.jpg
+image: /assets/images/eco4life-DPS1101S.jpg
 template: '{"NAME":"Eco4Life Plug","GPIO":[0,0,0,0,52,57,0,0,21,17,0,0,0],"FLAG":0,"BASE":18}' 
 link2: https://www.amazon.com/ECO4LIFE-Outlet-Assistant-Required-Control/dp/B07D8514NV
-mlink: https://eco4lifehome.com/collections/smart-switches/products/smart-wifi-outlet-plug?variant=19432334524483
+mlink: https://expo.tuya.com/product/337695
 flash: tuya-convert
 category: plug
 type: Plug

_templates/electriq_IQOOL-SMART12HP

@@ -9,7 +9,7 @@ link2: https://www.appliancesdirect.co.uk/p/iqool-smart12hp/electriq-iqoolsmart1
 mlink: https://www.electriq.co.uk/p/iqool-smart12hp/electriq-iqoolsmart12hp
 flash: tuya-convert
 category: misc
-type: Other
+type: Miscellaneous
 standard: uk
 ---
 This is a Tuya 10000 BTU Wall Mounted Heat Pump Air Conditioner with Smart App.

_templates/eufy_robovac_30C

@@ -31,13 +31,13 @@ After flashing, I used the following MCU config:
 Backlog TuyaMCU 11,2; TuyaMCU 12,101; TuyaMCU 13,103;
 ```
 
-- This maps start/stop to `POWER1`, go home to `POWER2`, and find to `POWER3`.
+This maps start/stop to `POWER1`, go home to `POWER2`, and find to `POWER3`.
 
-- Manual control can be performed on dp 3, enum 0 - 3, ie: `tuyasend4 3,{0-3}`
+Manual control can be performed on dpId 3, enum 0-3, ie: `tuyasend4 3,{0-3}`
 
-- Operating mode is on dp 5, enum 0 - 4.
+Operating mode is on dpId 5, enum 0-4.
 
-- Fan speed is on dp 102, enum 0 - 3.
+Fan speed is on dpId 102, enum 0-3.
 
 And added rules for easy access to feedback data:
 ```

_templates/feit_electric_ST1960FILAG

@@ -0,0 +1,16 @@
+---
+date_added: 2021-08-03
+title: Feit Electric ST19 Soft White 
+model: ST1960/FIL/AG
+image: /assets/images/feit_electric_ST1960FILAG.jpg
+template9: '{"NAME":"FEIT A1960FILAG","GPIO":[0,0,0,0,0,0,0,0,0,0,416,0,0,0],"FLAG":0,"BASE":18}' 
+link: https://www.amazon.com/Feit-Electric-ST1960-FIL-AG/dp/B07ZWT9JTL
+link2: https://www.lowes.com/pd/Feit-Electric-Feit-Smart-WiFi-60-Watt-EQ-ST19-Soft-White-Dimmable-Smart-LED-Light-Bulb/1002576070
+link2: 
+mlink: https://www.feit.com/product/60-watt-equivalent-dimmable-soft-white-st19-alexa-google-smart-bulb/
+flash: tuya-convert
+category: bulb
+type: Dimmable
+standard: e26
+---
+Flashed tuya-convert and updated to 9.5.0. 

_templates/geeni-GN-WW108-199

@@ -6,8 +6,7 @@ category: plug
 type: Plug
 standard: us
 link: https://www.amazon.com/Geeni-GN-WW108-199/dp/B07DB3L9SN
-image: https://cdn.shopify.com/s/files/1/2612/6532/products/GN-WW108-199_600x600.jpg
+image: /assets/images/geeni-GN-WW108-199.jpg
 template: '{"NAME":"Geeni Glo","GPIO":[0,0,0,0,56,0,0,0,21,17,22,0,0],"FLAG":0,"BASE":18}' 
-link2: https://www.bimart.com
 mlink: https://mygeeni.com/collections/power/products/spot-glo
 ---

_templates/geeni-GN-WW110-199

@@ -5,9 +5,8 @@ model: GN-WW110-199
 category: plug
 type: Plug
 standard: us
-link: https://www.amazon.com/Geeni-GN-WW110-199-required-Assistant-Microsoft/dp/B07FLXG64M
-image: https://cdn.shopify.com/s/files/1/2612/6532/products/GN-WW110_1-199_600x600.jpg
+link: https://www.amazon.com/dp/B07FLXG64M
+image: /assets/images/geeni-GN-WW110-199.jpg
 template: '{"NAME":"Geeni Duo","GPIO":[0,0,0,0,18,22,0,0,17,52,21,0,53],"FLAG":0,"BASE":18}' 
-link2: http://www.bimart.com
 mlink: https://mygeeni.com/collections/power/products/geeni-switch-duo-2-port
 ---

_templates/hugoai_HG02

@@ -1,19 +1,27 @@
 ---
-date_added: 2020-07-28
+date_added: 2021-08-03
 title: Hugoai Table Lamp 
 model: HG02 
 image: /assets/images/hugoai_HG02.jpg
-template: '{"NAME":"HG02","GPIO":[255,107,255,108,255,255,0,0,255,255,255,255,255],"FLAG":0,"BASE":54}' 
+template9: '{"NAME":"Generic","GPIO":[1,1,1,1,1,1,1,1,1,1,1,1,1,1],"FLAG":0,"BASE":18}' 
 link: https://www.amazon.com/dp/B07Q8SMG8R/
-link2: https://www.amazon.com/HUGOAI-Dimmable-Bedside-Nursery-Required/dp/B07QK9LG1H
+link2: https://www.amazon.com/dp/B07QK9LG1H
 mlink: https://www.hugo-ai.com/copy-of-basic-table-lamp-grey-1
-flash: tuya-convert
+flash: module replacement
 category: light
 type: Light
 standard: global
+unsupported: true
 ---
-Flash Tasmota via Tuya-Convert or follow the guide for manual tywe3s flashing (https://tasmota.github.io/docs/devices/TYWE3S)
-Complete the initial wifi configuration and enter the WebGUI.
+New version of the device shipped with a WB3S module and had to be remounted with an ESP-12 module. Ground GPIO15 pin. Set module as TuyaMCU and issue the following commands.
+
+'''console
+Backlog TuyaMCU 11,20; TuyaMCU 26,21; TuyaMCU 21,22; TuyaMCU 23,23; TuyaMCU 24,24; DimmerRange 34,1000
+'''
+
+## Older Revision
+Flash Tasmota via Tuya-Convert or follow the guide for manual TYWE3S flashing (https://tasmota.github.io/docs/devices/TYWE3S)
+Complete the initial Wi-Fi configuration and enter the WebUI.
 
 Set `Module 54` or apply the template. Save the configuration and wait for reboot.
 

_unsupported/liectroux_C30B.md → _templates/liectroux_C30B.md

@@ -1,23 +1,25 @@
 ---
-date_added: 2020-08-26
-title: Liectroux C30B
-category: unsupported
-type: Vacuum
-link: https://www.aliexpress.com/item/32967651955.html
-image: https://ae01.alicdn.com/kf/HTB1nme8aDHuK1RkSndVq6xVwpXa2/LIECTROUX-C30B-Robot-Vacuum-Cleaner-Map-navigation-3000Pa-Suction-Smart-Memory-Map-Display-on-Wifi-APP.jpg
-link2: 
-link3: 
-flash: WR3
+date_added: 2021-08-04
+title: Liectroux C30B Robot Vacuum
+model: 
+template9: '{"NAME":"Liectroux C30B","GPIO":[1,1,1,1,1,1,0,0,1,1,1,1,1,0],"FLAG":0,"BASE":54}' 
+image: /assets/images/liectroux_C30B.jpg
+link: https://s.click.aliexpress.com/e/_A5nBhg
+link2: https://www.amazon.com/LIECTROUX-Robotic-Cleaner-Navigation-Electric/dp/B07MGJKTZ1
+link3: https://www.gearbest.com/vacuum-cleaners/pp_3003276593845595.html
+flash: module replacement
+category: other
+type: Miscellaneous
 ---
 
 WR3 module is connected to the main PCB with a long cable that can be cut down and connected to an ESP8266.
-A Wemos or an ESP-M3 without the pins soldered is preferable. You will also need some double tape to mount it in place
+A D1 Mini or an [ESP-M3](https://s.click.aliexpress.com/e/_9zAd0m) without the pins soldered is preferable. You will also need some double tape to mount it in place
 
 ![WR3 Pinout](https://raw.githubusercontent.com/Sthopeless/trvc/master/IMG_20200823_153621%20(2).jpg)
 
 Once the ESP8266 is installed and flashed with Tasmota, select TuyaMCU module and activate publishing TuyaReceived to MQTT:
 ```console
-Backlog module 54; SetOption66 1
+Backlog Module 54; SetOption66 1
 ``` 
 
 ```json
@@ -48,11 +50,16 @@ MCU Product ID: {"p":"imk0pcrtmyx9cbfg","v":"1.2.2","m":1}
 - DpType2Id32: Cleaned Area (useless)
 - DpType2Id33: Cleaned Time
 
-I've added the Vacuum to Home Assistant, the configuration can be downloaded here https://github.com/Sthopeless/trvc/blob/master/vacuum_black.yaml
-It is added to [Home Assistant as a Package](https://www.home-assistant.io/docs/configuration/packages/)
+## Home Assistant
+I've added the Vacuum to Home Assistant, the configuration can be downloaded here [https://github.com/Sthopeless/trvc/blob/master/vacuum_black.yaml](https://github.com/Sthopeless/trvc/blob/master/vacuum_black.yaml)
+
+It is added to Home Assistant as a [Package](https://www.home-assistant.io/docs/configuration/packages/)
+
 I am using the [Lovelace Vacuum Card](https://github.com/denysdovhan/vacuum-card)
-![](https://github.com/Sthopeless/trvc/blob/master/Screenshot%20(42).png?raw=true)
+
+![Screenshot](https://raw.githubusercontent.com/Sthopeless/trvc/master/Screenshot%20(42).png)
 
 The icon without background:
-![](https://github.com/Sthopeless/trvc/blob/master/liectroux_c30b.png)
+
+![Icon](https://raw.githubusercontent.com/Sthopeless/trvc/master/liectroux_c30b.png)