{{ page.title }}
Template
-
- {{ page.template | jsonify }}
+
+ {{ page.template | jsonify }}
{% if page.template contains '131' or page.template contains '132' or page.template contains '133' or page.template contains '134' or page.template contains '135' or page.template contains '136' or page.template contains '137' or page.template contains '145' or page.template contains '146' or page.template contains '156'%}
diff --git a/_templates/3a_HGZB-043 b/_templates/3a_HGZB-043
index d292b7f28..f80ab42b2 100644
--- a/_templates/3a_HGZB-043
+++ b/_templates/3a_HGZB-043
@@ -6,7 +6,7 @@ type: Switch
standard: anzac
link: https://www.ebay.com.au/itm/Smart-WiFi-Desk-Lamp-Light-Switch-Dimmer-GPO-4-Google-Home-Alexa-Voice-Control/183336271514
image: https://user-images.githubusercontent.com/816454/60634686-2f076a00-9e53-11e9-8590-b08a82c41be5.jpg
-template: '{"NAME":"3A Smart Home ","GPIO":[52,0,55,18,22,19,0,0,17,21,54,23,53],"FLAG":0,"BASE":18}'
+template: {"NAME":"3A Smart Home ","GPIO":[52,0,55,18,22,19,0,0,17,21,54,23,53],"FLAG":0,"BASE":18}
link_alt: https://3asmarthome.com/
---
diff --git a/_templates/3stone_10W_A21_RGBW b/_templates/3stone_10W_A21_RGBW
index 3bf9448b9..ce8db05ac 100644
--- a/_templates/3stone_10W_A21_RGBW
+++ b/_templates/3stone_10W_A21_RGBW
@@ -1,12 +1,12 @@
---
date_added: 2019-11-10
-title: 3Stone A21 10W RGBW
-category: light
-type: Bulb
-standard: ['us','E26']
+title: 3Stone A21 10W
+type: RGBW
+category: bulb
+standard: E26
link: https://www.amazon.com/gp/product/B07HR8GT12
image: https://images-na.ssl-images-amazon.com/images/I/51J0DCf8MSL._AC_SL1000_.jpg
-template: '{"NAME":"3STONE","GPIO":[0,0,0,0,141,140,0,0,37,142,0,0,0],"FLAG":15,"BASE":18}'
+template: {"NAME":"3STONE","GPIO":[0,0,0,0,141,140,0,0,37,142,0,0,0],"FLAG":15,"BASE":18}
link_alt:
---
diff --git a/_templates/3stone_2019 b/_templates/3stone_2019
index 312ca0e80..34192352d 100644
--- a/_templates/3stone_2019
+++ b/_templates/3stone_2019
@@ -6,7 +6,7 @@ type: Power Strip
standard: us
link: https://www.amazon.com/gp/product/B07QLR7Y7D/ref=ppx_yo_dt_b_asin_title_o02_s00?ie=UTF8&psc=1
image: https://images-na.ssl-images-amazon.com/images/I/51Eg2rwHglL._AC_SL1000_.jpg
-template: '{"NAME":"3Stone-2019","GPIO":[0,0,56,0,25,22,0,0,24,17,23,21,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"3Stone-2019","GPIO":[0,0,56,0,25,22,0,0,24,17,23,21,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/3stone_mini b/_templates/3stone_mini
index 65f950b0b..5f9faa75c 100644
--- a/_templates/3stone_mini
+++ b/_templates/3stone_mini
@@ -6,7 +6,7 @@ type: Plug
standard: us
link: https://www.amazon.com/gp/product/B072K7KRYP
image: https://images-na.ssl-images-amazon.com/images/I/51oLtZQHp5L._AC_SL1500_.jpg
-template: '{"NAME":"3Stone Smart P","GPIO":[0,17,0,0,0,0,0,0,0,57,21,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"3Stone Smart P","GPIO":[0,17,0,0,0,0,0,0,0,57,21,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/ACL12HA b/_templates/ACL12HA
index 1b36767de..edd322548 100644
--- a/_templates/ACL12HA
+++ b/_templates/ACL12HA
@@ -6,7 +6,7 @@ type: Light
standard: anzac
link: https://www.bunnings.com.au/verve-design-18w-smart-led-angie-ceiling-light-with-rgb-ring-grid-connect_p0119808
image: https://media.bunnings.com.au/Product-800x800/6fa32c74-6f58-4346-b5ec-76028e350238.jpg
-template: '{"NAME":"ACL12HA Light","GPIO":[0,0,0,0,38,37,0,0,41,39,40,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"ACL12HA Light","GPIO":[0,0,0,0,38,37,0,0,41,39,40,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/AWP07L b/_templates/AWP07L
index 97861772d..a44bace05 100644
--- a/_templates/AWP07L
+++ b/_templates/AWP07L
@@ -6,7 +6,7 @@ type: Plug
standard: eu
link: https://www.amazon.de/gp/product/B079JXN1VV
image: https://user-images.githubusercontent.com/5904370/66906978-df673b80-f008-11e9-8997-eba70d868af1.png
-template: '{"NAME":"AISIRER AWP07L","GPIO":[0,0,0,0,56,21,0,0,0,17,0,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"AISIRER AWP07L","GPIO":[0,0,0,0,56,21,0,0,0,17,0,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/AWP08L b/_templates/AWP08L
index 4225688dc..95179b0e6 100644
--- a/_templates/AWP08L
+++ b/_templates/AWP08L
@@ -6,7 +6,7 @@ type: Plug
standard: eu
link: https://www.amazon.fr/gp/product/B078S6S33S/
image: https://images-na.ssl-images-amazon.com/images/I/5188D2hboyL._SX679_.jpg
-template: '{"NAME":"AWP08L","GPIO":[0,0,56,0,0,0,0,0,0,17,0,21,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"AWP08L","GPIO":[0,0,56,0,0,0,0,0,0,17,0,21,0],"FLAG":0,"BASE":18}
link_alt: https://avatarcontrols.en.alibaba.com/product/60814727153-806017022/Wifi_control_Smart_Home_Multi_Plug_16A_wifi_smart_power_plug_socket.html
---
diff --git a/_templates/B10_6W_E14E27_RGBWW b/_templates/B10_6W_E14E27_RGBWW
index d7b949b25..2e4c212d7 100644
--- a/_templates/B10_6W_E14E27_RGBWW
+++ b/_templates/B10_6W_E14E27_RGBWW
@@ -1,12 +1,14 @@
---
date_added: 2019-10-23
-title: ZZHXON 6W RGB+CCT
-category: light
-type: Bulb
-standard: E14
+title: ZZHXON 6W
+type: RGBCCT
+category: bulb
+standard:
+ - E14
+ - E27
link: https://www.aliexpress.com/item/33047013453.html
image: https://user-images.githubusercontent.com/5904370/69925135-e52cb980-14ae-11ea-844a-e90089f5e609.png
-template: '{"NAME":"E14_RGBWW_6W","GPIO":[0,0,0,0,40,41,0,0,38,39,37,0,0],"FLAG":0,"BASE":20}'
+template: {"NAME":"E14_RGBWW_6W","GPIO":[0,0,0,0,40,41,0,0,38,39,37,0,0],"FLAG":0,"BASE":20}
link_alt:
---
diff --git a/_templates/BSD34 b/_templates/BSD34
index d55f479da..38e3249fc 100644
--- a/_templates/BSD34
+++ b/_templates/BSD34
@@ -6,7 +6,7 @@ type: Plug
standard: eu
link: https://www.aliexpress.com/item/4000037118300.html
image: https://ae01.alicdn.com/kf/H78e70230d8d149cdb0312ed2ae0ffa6em.jpg?width=1000&height=1000&hash=2000
-template: '{"NAME":"BSD34 Plug","GPIO":[0,0,0,0,0,0,0,0,21,17,56,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"BSD34 Plug","GPIO":[0,0,0,0,0,0,0,0,21,17,56,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/CRST_LTS-4G-W b/_templates/CRST_LTS-4G-W
index 36bb93e26..13d40f2fc 100644
--- a/_templates/CRST_LTS-4G-W
+++ b/_templates/CRST_LTS-4G-W
@@ -6,7 +6,7 @@ type: Power Strip
standard: us
link: https://www.amazon.com/CRST-Protector-Control-Independent-Extension/dp/B07C1XGKSY
image: https://images-na.ssl-images-amazon.com/images/I/61KdAvGEJZL._AC_SL1500_.jpg
-template: '{"NAME":"CRST LTS-4G-W","GPIO":[0,0,0,0,24,0,0,0,22,23,21,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"CRST LTS-4G-W","GPIO":[0,0,0,0,24,0,0,0,22,23,21,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/DE-1_16A b/_templates/DE-1_16A
index b34441270..c0bcbb26b 100644
--- a/_templates/DE-1_16A
+++ b/_templates/DE-1_16A
@@ -6,7 +6,7 @@ type: Plug
standard: eu
link: https://www.banggood.com/Smart-WiFi-Socket-Voice-Remote-Control-Electricity-Statistics-Timing-Electric-Plug-Socket-European-Socket-Compatible-with-Amazon-Alexa-IFTT-Google-Home-Assistance-p-1558952.html?cur_warehouse=CN
image: https://images-na.ssl-images-amazon.com/images/I/417tedX91hL._AC_SL1000_.jpg
-template: '{"NAME":"DE-1","GPIO":[0,17,0,0,133,0,0,0,0,52,21,0,0],"FLAG":1,"BASE":18}'
+template: {"NAME":"DE-1","GPIO":[0,17,0,0,133,0,0,0,0,52,21,0,0],"FLAG":1,"BASE":18}
link_alt:
---
diff --git a/_templates/DS-102_1 b/_templates/DS-102_1
index cda5b04f1..527775016 100644
--- a/_templates/DS-102_1
+++ b/_templates/DS-102_1
@@ -6,7 +6,7 @@ type: Switch
standard: eu
link: https://www.aliexpress.com/item/Tuya-Smart-life-app-Control-WiFi-Light-86-EU-Button-Switch-Support-Alexa-Google-Home/32996551323.html
image: http://EvertDekker.com/wp/wp-content/uploads/2019/04/TgethDs102.jpg
-template: '{"NAME":"DS-102 1 Gang","GPIO":[57,0,0,17,0,0,0,0,0,21,56,0,0],"FLAG":1,"BASE":18}'
+template: {"NAME":"DS-102 1 Gang","GPIO":[57,0,0,17,0,0,0,0,0,21,56,0,0],"FLAG":1,"BASE":18}
link_alt:
---
diff --git a/_templates/DS-102_2 b/_templates/DS-102_2
index a107480f7..81310ee95 100644
--- a/_templates/DS-102_2
+++ b/_templates/DS-102_2
@@ -6,7 +6,7 @@ type: Switch
standard: eu
link: https://www.aliexpress.com/item/Tuya-Smart-life-app-Control-WiFi-Light-86-EU-Button-Switch-Support-Alexa-Google-Home/32996551323.html?spm=a2g0s.9042311.0.0.52144c4dtswhIp
image: https://ae01.alicdn.com/kf/HTB18axGNY2pK1RjSZFsq6yNlXXaQ/Tuya-Smart-life-app-Control-WiFi-Light-86-EU-Button-Switch-Support-Alexa-Google-Home.jpg
-template: '{"NAME":"DS-102 2 Gang","GPIO":[158,57,0,17,22,18,0,0,0,21,56,255,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"DS-102 2 Gang","GPIO":[158,57,0,17,22,18,0,0,0,21,56,255,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/DS-102_3 b/_templates/DS-102_3
index 742f4849a..81bc3a0c5 100644
--- a/_templates/DS-102_3
+++ b/_templates/DS-102_3
@@ -6,7 +6,7 @@ type: Switch
standard: eu
link: https://www.aliexpress.com/item/Tuya-Smart-life-app-Control-WiFi-Light-86-EU-Button-Switch-Support-Alexa-Google-Home/32996551323.html
image: https://user-images.githubusercontent.com/5904370/56752390-6fc67100-6788-11e9-926b-8afd519cef61.png
-template: '{"NAME":"DS-102 3 Gang","GPIO":[158,58,0,18,22,19,0,0,17,21,57,23,56],"FLAG":0,"BASE":18}'
+template: {"NAME":"DS-102 3 Gang","GPIO":[158,58,0,18,22,19,0,0,17,21,57,23,56],"FLAG":0,"BASE":18}
link_alt:
---
This device template requires Tasmota 6.5.0.12 which has support for LEDs linked to Relays.
diff --git a/_templates/DS18B20_ESP01 b/_templates/DS18B20_ESP01
index fbf2746d6..8c4d56955 100644
--- a/_templates/DS18B20_ESP01
+++ b/_templates/DS18B20_ESP01
@@ -6,7 +6,7 @@ type: Sensor
standard: global
link: https://www.aliexpress.com/item/32967933988.html
image: https://user-images.githubusercontent.com/5904370/69268583-b6b9ff00-0bcf-11ea-8259-2ef0b4d22970.png
-template: '{"NAME":"ESP01S ds18b20","GPIO":[255,255,4,255,255,255,0,0,255,255,255,255,255],"FLAG":15,"BASE":18}'
+template: {"NAME":"ESP01S ds18b20","GPIO":[255,255,4,255,255,255,0,0,255,255,255,255,255],"FLAG":15,"BASE":18}
link_alt: https://ru.aliexpress.com/item/32887522816.html?spm=a2g0o.productlist.0.0.676162adwhwgCN&algo_pvid=701af86c-9226-493d-89cd-eb9dbca32e2a&algo_expid=701af86c-9226-493d-89cd-eb9dbca32e2a-10&btsid=06af70d6-b0e8-4eac-bab4-49e562a7a042&ws_ab_test=searchweb0_0,searchweb201602_4,searchweb201603_52
---
diff --git a/_templates/ECF-SOP03 b/_templates/ECF-SOP03
index d018beaca..92832a9d2 100644
--- a/_templates/ECF-SOP03
+++ b/_templates/ECF-SOP03
@@ -6,7 +6,7 @@ type: Outdoor Plug
standard: us
link: https://www.amazon.com/Outdoor-Wireless-Compatible-Required-Waterproof/dp/B07FTJ15D4
image: https://images-na.ssl-images-amazon.com/images/I/61cpj%2Ba6kzL._SL1200_.jpg
-template: '{"NAME":"Outdoor3Outlet","GPIO":[0,0,0,23,56,0,0,0,21,17,22,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"Outdoor3Outlet","GPIO":[0,0,0,23,56,0,0,0,21,17,22,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/EFUN_SH331W b/_templates/EFUN_SH331W
index 17af5635e..8c8d242cd 100644
--- a/_templates/EFUN_SH331W
+++ b/_templates/EFUN_SH331W
@@ -6,7 +6,7 @@ type: Plug
standard: us
link: https://www.amazon.com/gp/product/B07DCJ7TDR
image: https://images-na.ssl-images-amazon.com/images/I/61zOjWC8t5L._SX679_.jpg
-template: '{"NAME":"Efun-Plug","GPIO":[56,0,158,0,0,134,0,0,131,17,132,21,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"Efun-Plug","GPIO":[56,0,158,0,0,134,0,0,131,17,132,21,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/ERC309 b/_templates/ERC309
index 8fba066c6..d8dacd1fe 100644
--- a/_templates/ERC309
+++ b/_templates/ERC309
@@ -1,12 +1,12 @@
---
date_added: 2019-07-13
title: Zemismart ERC309 Kinetic Switch
-category: relay
+category: switch
type: Relay
standard: global
link: https://www.aliexpress.com/item/32873133693.html
image: https://user-images.githubusercontent.com/25117255/61148426-0e888100-a4df-11e9-92c5-43453afcc6c5.png
-template: '{"NAME":"Kinetic Switch","GPIO":[255,255,255,255,255,255,0,0,255,108,255,107,255],"FLAG":0,"BASE":54}'
+template: {"NAME":"Kinetic Switch","GPIO":[255,255,255,255,255,255,0,0,255,108,255,107,255],"FLAG":0,"BASE":54}
link_alt:
---
#### Configuration (post Tasmota v6.6.0.10)
diff --git a/_templates/Ecoolbuy_4_socket b/_templates/Ecoolbuy_4_socket
index e0f1137ab..b181ea63f 100644
--- a/_templates/Ecoolbuy_4_socket
+++ b/_templates/Ecoolbuy_4_socket
@@ -6,7 +6,7 @@ type: Outdoor Plug
standard: us
link: https://www.amazon.com/gp/product/B07JW66S37
image: https://images-na.ssl-images-amazon.com/images/I/41lJ3hmh0BL._SL500_AC_SS350_.jpg
-template: '{"NAME":"ECCOLBUY 4","GPIO":[0,0,0,0,22,23,0,0,21,57,17,0,24],"FLAG":0,"BASE":18}'
+template: {"NAME":"ECCOLBUY 4","GPIO":[0,0,0,0,22,23,0,0,21,57,17,0,24],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/FK-PW901U b/_templates/FK-PW901U
index 170995f3d..97f186321 100644
--- a/_templates/FK-PW901U
+++ b/_templates/FK-PW901U
@@ -6,7 +6,7 @@ type: Plug
standard: us
link: https://www.amazon.com/Plug-JACKYLED-Control-Compatible-Schedule-Portable/dp/B07DCN4C1M/
image: https://images-na.ssl-images-amazon.com/images/I/61q17rfS1tL._AC_SL1500_.jpg
-template: '{"NAME":"FK-PW901U","GPIO":[56,255,255,255,255,23,0,0,21,17,24,22,255],"FLAG":0,"BASE":18}'
+template: {"NAME":"FK-PW901U","GPIO":[56,255,255,255,255,23,0,0,21,17,24,22,255],"FLAG":0,"BASE":18}
link_alt: https://www.amazon.com/Smart-Power-Outlets-Charging-Ports/dp/B07GNS6XF6
---
diff --git a/_templates/GD-30W b/_templates/GD-30W
index e4b33af83..2e1b5a766 100644
--- a/_templates/GD-30W
+++ b/_templates/GD-30W
@@ -6,7 +6,7 @@ type: Aromatherapy Diffuser
standard: global
link: https://www.aliexpress.com/item/32949472628.html
image: https://user-images.githubusercontent.com/5904370/67516743-73887100-f6a1-11e9-9563-3a529fad3b1d.png
-template: '{"NAME":"GD-30W","GPIO":[255,255,255,255,255,255,0,0,255,255,255,255,255],"FLAG":0,"BASE":54}'
+template: {"NAME":"GD-30W","GPIO":[255,255,255,255,255,255,0,0,255,255,255,255,255],"FLAG":0,"BASE":54}
link_alt: https://www.alibaba.com/product-detail/300ML-WiFi-Aroma-Diffuser-Ultrasonic-Humidifier_60781628200.html
---
**Configuration for this device uses features not yet in official Tasmota release(TuyaSend and TuyaReceived). Use the [latest development branch](http://thehackbox.org/tasmota/) binary.**
diff --git a/_templates/Hama_176531 b/_templates/Hama_176531
index a3599c6c1..5347206eb 100644
--- a/_templates/Hama_176531
+++ b/_templates/Hama_176531
@@ -1,12 +1,12 @@
---
date_added: 2019-11-27
-title: Hama 176531 10W RGB+WW
-category: light
-type: Bulb
+title: Hama 176531 10W
+type: RGBW
+category: bulb
standard: E27
link: https://www.amazon.de/Hama-LED-Lampe-gesteuert-Farbwechsel-kompatibel/dp/B0761ZJHF7
image: https://images-na.ssl-images-amazon.com/images/I/41552SdiWVL._SL1100_.jpg
-template: '{"NAME":"Hama Bulb RGBW","GPIO":[0,0,0,0,140,37,0,0,0,142,141,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"Hama Bulb RGBW","GPIO":[0,0,0,0,140,37,0,0,0,142,141,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/IOT4SH01DS b/_templates/IOT4SH01DS
index a614d7847..3c75e1937 100644
--- a/_templates/IOT4SH01DS
+++ b/_templates/IOT4SH01DS
@@ -6,7 +6,7 @@ type: Sensor
standard: global
link: https://www.iot4.eu/?product=iot4sh01ds
image: https://www.iot4.eu/wp-content/uploads/2017/03/IMG_0694_hatter.png
-template: '{"NAME":"IOT4SH01DS","GPIO":[255,255,255,255,255,255,0,0,255,4,255,255,255],"FLAG":15,"BASE":18}'
+template: {"NAME":"IOT4SH01DS","GPIO":[255,255,255,255,255,255,0,0,255,4,255,255,255],"FLAG":15,"BASE":18}
link_alt:
---
diff --git a/_templates/LE_A19_RGBCT_9W_E26 b/_templates/LE_A19_RGBCT_9W_E26
index 6b56e1eb2..cdfc4681f 100644
--- a/_templates/LE_A19_RGBCT_9W_E26
+++ b/_templates/LE_A19_RGBCT_9W_E26
@@ -1,12 +1,12 @@
---
date_added: 2019-05-27
-title: LE A19 RGBCT 9W E26
-category: light
-type: Bulb
-standard: us
+title: LE A19 9W
+type: RGBCCT
+category: bulb
+standard: E26
link: https://www.amazon.ca/gp/product/B07R5W3PQL
image: https://images-na.ssl-images-amazon.com/images/I/61LnzZWi7RL._SL1200_.jpg
-template: '{"NAME":"LE RGBWW 60W","GPIO":[0,0,0,0,140,37,0,0,38,142,141,0,0],"FLAG":1,"BASE":18}'
+template: {"NAME":"LE RGBWW 60W","GPIO":[0,0,0,0,140,37,0,0,38,142,141,0,0],"FLAG":1,"BASE":18}
link_alt:
---
diff --git a/_templates/Neo_Coolcam_10A_NAS-WR01W b/_templates/Neo_Coolcam_10A_NAS-WR01W
index 1c3238a2d..c1d6cf5fa 100644
--- a/_templates/Neo_Coolcam_10A_NAS-WR01W
+++ b/_templates/Neo_Coolcam_10A_NAS-WR01W
@@ -6,7 +6,7 @@ type: Plug
standard: eu
link: https://www.tomtop.com/p-s2503eu.html
image: https://img.tttcdn.com/product/xy/2000/2000/p/gu1/S/U/S2503EU/S2503EU-1-7326-chF0.jpg
-template: '{"NAME":"Neo Coolcam 10","GPIO":[0,0,0,0,52,0,0,0,21,17,0,0,0],"FLAG":0,"BASE":49}'
+template: {"NAME":"Neo Coolcam 10","GPIO":[0,0,0,0,52,0,0,0,21,17,0,0,0],"FLAG":0,"BASE":49}
link_alt: https://www.szneo.com/en/products/show.php?id=215
---
diff --git a/_templates/PS-16-DZ b/_templates/PS-16-DZ
index ba32c8163..78e88ecd9 100644
--- a/_templates/PS-16-DZ
+++ b/_templates/PS-16-DZ
@@ -5,7 +5,7 @@ type: Dimmer
standard: us
link: https://www.amazon.ca/Switch-Dimmer-Electrical-Control-Twharf/dp/B07DZX5685
image: https://user-images.githubusercontent.com/5904370/57955818-2389cf00-78f7-11e9-99ef-2fecf3a18fc7.png
-template: '{"NAME":"PS-16-DZ","GPIO":[255,148,255,149,255,255,0,0,255,52,255,255,255],"FLAG":0,"BASE":58}'
+template: {"NAME":"PS-16-DZ","GPIO":[255,148,255,149,255,255,0,0,255,52,255,255,255],"FLAG":0,"BASE":58}
link_alt:
---
The [PS-16-DZ](http://www.ihome-s.com/productinfo/448320.html) dimmer uses eWeLink app same as Sonoff devices.
diff --git a/_templates/QS-QIFI-S03 b/_templates/QS-QIFI-S03
index 67cbdbb6d..4c0598b9e 100644
--- a/_templates/QS-QIFI-S03
+++ b/_templates/QS-QIFI-S03
@@ -1,12 +1,12 @@
---
date_added: 2019-07-14
title: QS-WIFI-S03
-category: relay
+category: switch
type: Relay
standard: eu
link: https://es.aliexpress.com/item/33012114855.html?spm=a2g0s.9042311.0.0.274263c0c3kalL
image: https://ae01.alicdn.com/kf/HTB1pyy_UmrqK1RjSZK9q6xyypXam.jpg?width=1001&height=1001&hash=2002
-template: '{"NAME":"Generic","GPIO":[17,255,255,255,255,0,0,0,82,21,0,0,0],"FLAG":0,"BASE":1}'
+template: {"NAME":"Generic","GPIO":[17,255,255,255,255,0,0,0,82,21,0,0,0],"FLAG":0,"BASE":1}
link_alt:
---
diff --git a/_templates/RSH-WS007-EU b/_templates/RSH-WS007-EU
index 3503237fa..5add12fc5 100644
--- a/_templates/RSH-WS007-EU
+++ b/_templates/RSH-WS007-EU
@@ -6,7 +6,7 @@ type: Plug
standard: eu
link: https://www.aliexpress.com/item/Tuya-EU-WiFi-socket-wireless-plug-smart-home-switch-compatible-with-Google-home-IFTTT-and-Alexa/32952219190.html
image: https://user-images.githubusercontent.com/5904370/66717120-e1958400-edd5-11e9-931c-abc59f86ed3d.png
-template: '{"NAME":"RSH-WS007","GPIO":[0,0,56,0,0,134,0,0,131,17,132,21,0],"FLAG":1,"BASE":18}'
+template: {"NAME":"RSH-WS007","GPIO":[0,0,56,0,0,134,0,0,131,17,132,21,0],"FLAG":1,"BASE":18}
link_alt:
---
diff --git a/_templates/SK03_outdoor b/_templates/SK03_outdoor
index 344b5cced..759878fde 100644
--- a/_templates/SK03_outdoor
+++ b/_templates/SK03_outdoor
@@ -5,7 +5,7 @@ type: Outdoor Plug
standard: us
link: https://www.amazon.com/Benuo-Wireless-Waterproof-Smartphone-Anywhere/dp/B07CG7MBPV
image: https://user-images.githubusercontent.com/5904370/57955597-99416b00-78f6-11e9-8838-7da9498c6a30.png
-template: '{"NAME":"SK03 Outdoor","GPIO":[17,0,0,0,133,132,0,0,131,57,56,21,0],"FLAG":0,"BASE":57}'
+template: {"NAME":"SK03 Outdoor","GPIO":[17,0,0,0,133,132,0,0,131,57,56,21,0],"FLAG":0,"BASE":57}
link_alt:
---
diff --git a/_templates/SM-SW202 b/_templates/SM-SW202
index 7ac567289..f23148ed6 100644
--- a/_templates/SM-SW202
+++ b/_templates/SM-SW202
@@ -6,7 +6,7 @@ type: Switch
standard: us
link: https://www.amazon.com/gp/product/B07RR3JPKQ
image: https://images-na.ssl-images-amazon.com/images/I/61PQzoUs8YL._AC_SL1500_.jpg
-template: '{"NAME":"SM-SW202","GPIO":[0,0,0,17,21,0,0,0,0,0,52,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"SM-SW202","GPIO":[0,0,0,17,21,0,0,0,0,0,52,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/SS01 b/_templates/SS01
index 49660c06b..c32d03997 100644
--- a/_templates/SS01
+++ b/_templates/SS01
@@ -6,7 +6,7 @@ type: Plug
standard: us
link: https://www.amazon.com/gp/product/B07KC14T4K/ref=ppx_yo_dt_b_search_asin_title?
image: https://images-na.ssl-images-amazon.com/images/I/71g5aflk9-L._SL1500_.jpg
-template: '{"NAME":"Smart Plug SS0","GPIO":[255,255,255,255,255,255,0,0,21,17,255,255,255],"FLAG":1,"BASE":18}'
+template: {"NAME":"Smart Plug SS0","GPIO":[255,255,255,255,255,255,0,0,21,17,255,255,255],"FLAG":1,"BASE":18}
link_alt:
---
diff --git a/_templates/SWA11 b/_templates/SWA11
index 9e936b45c..0bce45ba3 100644
--- a/_templates/SWA11
+++ b/_templates/SWA11
@@ -6,7 +6,7 @@ type: Plug
standard: eu
link: https://www.amazon.fr/gp/product/B07SRSDJ1K/
image: https://images-na.ssl-images-amazon.com/images/I/51DRF8LE9dL._SL1001_.jpg
-template: '{"NAME":"SWA1","GPIO":[0,0,0,0,52,21,0,0,0,17,0,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"SWA1","GPIO":[0,0,0,0,52,21,0,0,0,17,0,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/SWA1_eu b/_templates/SWA1_eu
index d89f652f0..fdacf3fec 100644
--- a/_templates/SWA1_eu
+++ b/_templates/SWA1_eu
@@ -6,7 +6,7 @@ type: Plug
standard: eu
link: https://www.gearbest.com/power-strips/pp_717166.html
image: https://gloimg.gbtcdn.com/soa/gb/pdm-product-pic/Electronic/2019/01/14/goods_img_big-v1/20190114091443_23823.jpg
-template: '{"NAME":"SWA1","GPIO":[0,0,0,0,52,21,0,0,0,17,0,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"SWA1","GPIO":[0,0,0,0,52,21,0,0,0,17,0,0,0],"FLAG":0,"BASE":18}
link_alt:
---
Found branded as: Lingan, Houzetek, Nozdom
diff --git a/_templates/SWA9 b/_templates/SWA9
index 3efe9eb08..65d54137c 100644
--- a/_templates/SWA9
+++ b/_templates/SWA9
@@ -6,7 +6,7 @@ type: Plug
standard: uk
link: https://shopee.sg/product/130118966/2146995126
image: https://cf.shopee.sg/file/d09204cc9c3d81c295db6c96b8bfcfec
-template: '{"NAME":"SWA9","GPIO":[0,0,0,0,52,21,0,0,0,17,0,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"SWA9","GPIO":[0,0,0,0,52,21,0,0,0,17,0,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/TCP_B22_RGBW b/_templates/TCP_B22_RGBW
index 7011ca1ae..ff55f3597 100644
--- a/_templates/TCP_B22_RGBW
+++ b/_templates/TCP_B22_RGBW
@@ -1,12 +1,12 @@
---
date_added: 2019-08-15
-title: TCP B22 RGBW
-category: light
-type: Bulb
-standard: uk
+title: TCP Smart
+type: RGBW
+category: bulb
+standard: B22
link: https://www.wilko.com/en-uk/tcp-1-pack-bayonet-b22bc-led-806-lumens-rgb-w-a-shape-smart-wifi-light-bulb/p/0475358
-image: https://www.wilko.com/assets/bWFzdGVyfHJvb3R8NTIyNjN8aW1hZ2UvanBlZ3xoYjYvaGRjLzg5NTYzMzY5NjM2MTQuanBnfDAxY2FiNzJlM2YzMTBjOTBiODc5MmEzZTQ5NTgxYTBlMDQ1ZDMwYzRjZTc4NzJhYjc5ZTE0ZmRhNmViZDU1MDE=/0475358-1.jpg
-template: '{"NAME":"TCP Smart RGBW","GPIO":[0,0,0,0,140,37,0,0,38,142,141,0,0],"FLAG":0,"BASE":18}'
+image: https://www.wilko.com/assets/bWFzdGVyfHJvb3R8NzY1NDZ8aW1hZ2UvanBlZ3xoMTkvaDk0Lzg5ODM2ODc5MjE2OTQuanBnfDZhODFjZGZhY2VkMmU2NWI5NGVlNDNkMWM2NjI4M2JjNzg5YzkzZjg5MjMzMTA1MzAyM2IwZjA0MmU4Yjk1Yjc=/0475358-2.jpg
+template: {"NAME":"TCP Smart RGBW","GPIO":[0,0,0,0,140,37,0,0,38,142,141,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/TP24 b/_templates/TP24
index 30f9b9b82..9010dab12 100644
--- a/_templates/TP24
+++ b/_templates/TP24
@@ -6,7 +6,7 @@ type: Plug
standard: uk
link: https://www.ebay.co.uk/itm/Smart-WIFI-Plug-Socket-Power-Switch-APP-Remote-Control-Timer-UK-Home-Automation-/392329706261
image: http://www.sowye.com/wp-content/uploads/2018/11/TP24.png
-template: '{"NAME":"SmartLifeTP24","GPIO":[0,0,0,17,0,0,0,0,0,56,21,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"SmartLifeTP24","GPIO":[0,0,0,17,0,0,0,0,0,56,21,0,0],"FLAG":0,"BASE":18}
link_alt: http://www.sowye.com/smart-plug-tp24/
---
diff --git a/_templates/US101_US102_US103_X6 b/_templates/US101_US102_US103_X6
index 094d1843c..b8e032c56 100644
--- a/_templates/US101_US102_US103_X6
+++ b/_templates/US101_US102_US103_X6
@@ -6,6 +6,6 @@ type: Plug
standard: us
link: https://www.amazon.com/gp/product/B07KBCYTQS/
image: https://images-na.ssl-images-amazon.com/images/I/41Vi-SqxwLL._AC_SL1000_.jpg
-template: '{"NAME":"X6 Smart Plug","GPIO":[0,0,56,0,0,0,0,0,0,17,0,21,0],"FLAG":1,"BASE":18}'
+template: {"NAME":"X6 Smart Plug","GPIO":[0,0,56,0,0,0,0,0,0,17,0,21,0],"FLAG":1,"BASE":18}
link_alt: https://www.amazon.com/gp/product/B079L52X1S/
---
diff --git a/_templates/WF-CS01_EU b/_templates/WF-CS01_EU
index 6de87823f..edf7e2a7d 100644
--- a/_templates/WF-CS01_EU
+++ b/_templates/WF-CS01_EU
@@ -6,7 +6,7 @@ type: Curtain Switch
standard: eu
link: https://www.aliexpress.com/item/32983943702.html?spm=a2g0s.9042311.0.0.74a54c4dHFYFSC
image: https://ae01.alicdn.com/kf/HTB1s85oKAvoK1RjSZFNq6AxMVXaE.jpg?width=788&height=704&hash=1492
-template: '{"NAME":"Tuya Shutter","GPIO":[157,0,54,10,22,19,0,0,17,21,53,23,52],"FLAG":0,"BASE":18}'
+template: {"NAME":"Tuya Shutter","GPIO":[157,0,54,10,22,19,0,0,17,21,53,23,52],"FLAG":0,"BASE":18}
link_alt: https://www.aliexpress.com/item/32929793650.html?spm=a2g0s.9042311.0.0.74a54c4dHFYFSC
---
diff --git a/_templates/WL-SC01 b/_templates/WL-SC01
index d474ea670..5dcb99225 100644
--- a/_templates/WL-SC01
+++ b/_templates/WL-SC01
@@ -6,7 +6,7 @@ type: Plug
standard: eu
link: https://www.amazon.de/gp/product/B07G4SMF7C/
image: https://user-images.githubusercontent.com/5904370/66717435-47cfd600-edd9-11e9-9406-7059bc04e2a9.png
-template: '{"NAME":"WL-SC01","GPIO":[0,0,0,0,56,0,0,0,21,0,17,0,0],"FLAG":0,"BASE":1}'
+template: {"NAME":"WL-SC01","GPIO":[0,0,0,0,56,0,0,0,21,0,17,0,0],"FLAG":0,"BASE":1}
link_alt: https://www.aliexpress.com/item/EU-European-Wi-Fi-WiFi-Smart-AC-Power-Electrical-Socket-Outlet-Plug-Adaptor-For-Amazon-Alexa/32973375300.html
---
diff --git a/_templates/WS-US-03 b/_templates/WS-US-03
index f650a757b..c0c636acf 100644
--- a/_templates/WS-US-03
+++ b/_templates/WS-US-03
@@ -6,7 +6,7 @@ type: Switch
standard: us
link: https://www.aliexpress.com/item/Ewelink-WS-EU-UK-US-WiFi-Wireless-APP-Touch-Control-Wall-Light-Timing-Switch-86-120/32920260509.html
image: https://ae01.alicdn.com/kf/HTB1i0T5h7voK1RjSZFDq6xY3pXa2/Ewelink-WS-120-US-Wifi-Smart-Wall-Touch-Switch-Glass-Panel-APP-Remote-Control-No-Hub.jpg
-template: '{"NAME":"WS-US-03","GPIO":[17,255,255,255,23,22,18,19,21,56,0,0,0],"FLAG":0,"BASE":30}'
+template: {"NAME":"WS-US-03","GPIO":[17,255,255,255,23,22,18,19,21,56,0,0,0],"FLAG":0,"BASE":30}
link_alt:
---
diff --git a/_templates/WWK-UN-W b/_templates/WWK-UN-W
index 5dad064ef..2add58f71 100644
--- a/_templates/WWK-UN-W
+++ b/_templates/WWK-UN-W
@@ -9,7 +9,7 @@ standard:
- anzac
link: https://www.aliexpress.com/item/33001149822.html
image: https://user-images.githubusercontent.com/5904370/58311134-94098200-7e08-11e9-846d-1bf06b2cac02.png
-template: '{"NAME":"tuya wall sock","GPIO":[255,255,255,255,52,53,0,0,21,17,255,255,255],"FLAG":0,"BASE":18}'
+template: {"NAME":"tuya wall sock","GPIO":[255,255,255,255,52,53,0,0,21,17,255,255,255],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/XS-A23 b/_templates/XS-A23
index 14d5db62d..bfd1a89f4 100644
--- a/_templates/XS-A23
+++ b/_templates/XS-A23
@@ -6,7 +6,7 @@ type: Plug
standard: us
link: https://www.banggood.com/MoesHouse-16A-Mini-WiFi-Smart-Socket-US-Standard-Dual-Outlet-Wall-Switch-Plug-Independent-Control-with-Power-Monitoring-Work-with-Amazon-Alexa-and-Google-Home-p-1536504.html?rmmds=myorder&cur_warehouse=CN
image: https://user-images.githubusercontent.com/5904370/68243746-7412f700-0013-11ea-9976-ed57dc55ba14.png
-template: '{"NAME":"XS-A23","GPIO":[56,255,0,131,17,134,0,0,0,18,132,21,22],"FLAG":0,"BASE":45}'
+template: {"NAME":"XS-A23","GPIO":[56,255,0,131,17,134,0,0,0,18,132,21,22],"FLAG":0,"BASE":45}
link_alt:
---
diff --git a/_templates/XS-A25 b/_templates/XS-A25
index 512f26a10..a2f195295 100644
--- a/_templates/XS-A25
+++ b/_templates/XS-A25
@@ -6,7 +6,7 @@ type: Power Strip
standard: uk
link: https://shopee.sg/product/90339497/1728178861
image: https://cf.shopee.sg/file/b837bb8b840bf6e7ae671bfc83b64daf
-template: '{"NAME":"XS-A25","GPIO":[52,0,53,0,25,22,0,0,24,17,23,21,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"XS-A25","GPIO":[52,0,53,0,25,22,0,0,24,17,23,21,0],"FLAG":0,"BASE":18}
link_alt: https://www.lazada.sg/products/niceeshop-smart-wifi-power-strip-app-remote-voice-individual-control-with-tmall-genie-amazon-alexa-google-home-assistant-4-ac-4-usb-extension-lead-cord-timer-via-android-ios-smartphone-tablets-i289054066-s468891476.html
---
diff --git a/_templates/XS-SSA01 b/_templates/XS-SSA01
index f8164591a..60f35aecc 100644
--- a/_templates/XS-SSA01
+++ b/_templates/XS-SSA01
@@ -6,7 +6,7 @@ type: Plug
standard: us
link: https://www.amazon.com/gp/product/B075GWQSYH
image: https://images-na.ssl-images-amazon.com/images/I/61rzRHYOV6L._SL1500_.jpg
-template: '{"NAME":"XS-SSA01","GPIO":[255,17,255,255,255,255,0,0,255,56,21,255,255],"FLAG":0,"BASE":18}'
+template: {"NAME":"XS-SSA01","GPIO":[255,17,255,255,255,255,0,0,255,56,21,255,255],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/XS-SSA01_alt b/_templates/XS-SSA01_alt
index 62108ed2c..29e51238f 100644
--- a/_templates/XS-SSA01_alt
+++ b/_templates/XS-SSA01_alt
@@ -6,7 +6,7 @@ type: Plug
standard: us
link: https://www.amazon.com/gp/product/B075GWQSYH/ref=ppx_yo_dt_b_search_asin_title?ie=UTF8&psc=1
image: https://images-na.ssl-images-amazon.com/images/I/61rzRHYOV6L._SL1500_.jpg
-template: '{"NAME":"XS-SSA01","GPIO":[255,17,255,255,255,255,0,0,56,255,255,21,255],"FLAG":0,"BASE":18}'
+template: {"NAME":"XS-SSA01","GPIO":[255,17,255,255,255,255,0,0,56,255,255,21,255],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/XS-SSA06 b/_templates/XS-SSA06
index 6fb3ce96b..319bcacff 100644
--- a/_templates/XS-SSA06
+++ b/_templates/XS-SSA06
@@ -6,7 +6,7 @@ type: Plug
standard: us
link: https://www.amazon.com/gp/product/B07P8KGPH5/ref=ppx_yo_dt_b_search_asin_title?ie=UTF8&psc=1
image: https://user-images.githubusercontent.com/5904370/66565694-60cf5180-eb63-11e9-98c4-91ee43d142d8.png
-template: '{"NAME":"RGB Light","GPIO":[37,0,38,0,0,39,0,0,0,90,0,21,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"RGB Light","GPIO":[37,0,38,0,0,39,0,0,0,90,0,21,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/XSA26-EU b/_templates/XSA26-EU
index 2f544509e..acb224fc9 100644
--- a/_templates/XSA26-EU
+++ b/_templates/XSA26-EU
@@ -6,7 +6,7 @@ type: Power Strip
standard: eu
link: https://www.aliexpress.com/item/32980585427.html
image: https://ae01.alicdn.com/kf/HTB1KbnlKxYaK1RjSZFnq6y80pXaX/Wifi-Smart-Power-Strip-Surge-Protector-EU-Plug-Multiple-Power-Socket-4-USB-Port-Voice-Control.jpg
-template: '{"NAME":"XSA26-EU","GPIO":[52,0,53,0,25,22,0,0,24,17,23,21,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"XSA26-EU","GPIO":[52,0,53,0,25,22,0,0,24,17,23,21,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/YT-E003 b/_templates/YT-E003
index 38adfb0b9..241e485b7 100644
--- a/_templates/YT-E003
+++ b/_templates/YT-E003
@@ -6,7 +6,7 @@ type: Plug
standard: eu
link: https://www.aliexpress.com/item/4000207312375.html
image: https://user-images.githubusercontent.com/5904370/67377332-c8cf6000-f585-11e9-9de7-e7ce43a277d9.png
-template: '{"NAME":"YT-E003-SP202","GPIO":[17,0,0,0,134,132,0,0,131,52,22,21,91],"FLAG":0,"BASE":64}'
+template: {"NAME":"YT-E003-SP202","GPIO":[17,0,0,0,134,132,0,0,131,52,22,21,91],"FLAG":0,"BASE":64}
link_alt: https://www.aliexpress.com/i/4000134411073.html
---
diff --git a/_templates/YX-WS02 b/_templates/YX-WS02
index 850a8352e..4c73468a9 100644
--- a/_templates/YX-WS02
+++ b/_templates/YX-WS02
@@ -6,7 +6,7 @@ type: Plug
standard: us
link: https://www.amazon.ca/Compatible-AlexaGoogle-Enabled-Function-Required/dp/B07QDQMPHK
image: https://images-na.ssl-images-amazon.com/images/I/711vIBBtXwL._SL1500_.jpg
-template: '{"NAME":"Amysen YX-WS02","GPIO":[255,17,255,255,255,255,0,0,255,56,21,255,255],"FLAG":1,"BASE":18}'
+template: {"NAME":"Amysen YX-WS02","GPIO":[255,17,255,255,255,255,0,0,255,56,21,255,255],"FLAG":1,"BASE":18}
link_alt:
---
diff --git a/_templates/ZBR-001 b/_templates/ZBR-001
index 521388761..75ec4049d 100644
--- a/_templates/ZBR-001
+++ b/_templates/ZBR-001
@@ -6,7 +6,7 @@ type: Plug
standard: br
link: https://www.aliexpress.com/item/33008274983.html
image: https://user-images.githubusercontent.com/5904370/68044798-59b9e000-fcd8-11e9-9ef4-ce3773fce4fc.png
-template: '{"NAME":"ZBR-001","GPIO":[17,255,255,255,133,132,0,0,130,56,21,255,57],"FLAG":1,"BASE":18}'
+template: {"NAME":"ZBR-001","GPIO":[17,255,255,255,133,132,0,0,130,56,21,255,57],"FLAG":1,"BASE":18}
link_alt:
---
diff --git a/_templates/ZLD-44USA-W b/_templates/ZLD-44USA-W
index 3104b6458..0a1406d27 100644
--- a/_templates/ZLD-44USA-W
+++ b/_templates/ZLD-44USA-W
@@ -6,7 +6,7 @@ type: Power Strip
standard: us
link: https://www.amazon.com/gp/product/B07JYYJYGS
image: https://images-na.ssl-images-amazon.com/images/I/61tajVfgFdL._SL1500_.jpg
-template: '{"NAME":"ZLD-44USA-W","GPIO":[0,56,0,17,22,21,0,0,23,24,25,0,0],"FLAG":1,"BASE":18}'
+template: {"NAME":"ZLD-44USA-W","GPIO":[0,56,0,17,22,21,0,0,23,24,25,0,0],"FLAG":1,"BASE":18}
link_alt:
---
diff --git a/_templates/ZLD64-EU-W b/_templates/ZLD64-EU-W
index 08fd59653..809e1c14a 100644
--- a/_templates/ZLD64-EU-W
+++ b/_templates/ZLD64-EU-W
@@ -6,7 +6,7 @@ type: Power Strip
standard: eu
link: https://www.amazon.de/gp/product/B07LF6KK3Q
image: https://images-na.ssl-images-amazon.com/images/I/619zJy7ArDL._SL1500_.jpg
-template: '{"NAME":"ZLD64-EU-W","GPIO":[0,56,0,17,22,21,0,0,0,0,23,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"ZLD64-EU-W","GPIO":[0,56,0,17,22,21,0,0,0,0,23,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/ZSP-001 b/_templates/ZSP-001
index b8c9ae7a5..c28d29667 100644
--- a/_templates/ZSP-001
+++ b/_templates/ZSP-001
@@ -6,7 +6,7 @@ type: Plug
standard: ch
link: https://www.aliexpress.com/item/33006588699.html
image: https://ae01.alicdn.com/kf/HTB1BPLCSIbpK1RjSZFyq6x_qFXa6/Smart-Swiss-Plug-16A-Switzerland-Wifi-Socket-Voice-Control-Works-With-Google-Home-Alexa-IFTTT-Tuya.jpg
-template: '{"NAME":"ZSP-001","GPIO":[17,255,255,255,133,132,0,0,130,57,21,255,56],"FLAG":1,"BASE":18}'
+template: {"NAME":"ZSP-001","GPIO":[17,255,255,255,133,132,0,0,130,57,21,255,56],"FLAG":1,"BASE":18}
link_alt:
---
diff --git a/_templates/ablue_WP1 b/_templates/ablue_WP1
index b28abe60b..53ae7466d 100644
--- a/_templates/ablue_WP1
+++ b/_templates/ablue_WP1
@@ -6,7 +6,7 @@ type: Plug
standard: us
link: https://www.amazon.com/gp/product/B075YQD53N/ref=ppx_yo_dt_b_search_asin_title?ie=UTF8&psc=1
image: https://images-na.ssl-images-amazon.com/images/I/61-ldBv4gmL._SX569_.jpg
-template: '{"NAME":"Ablue","GPIO":[57,0,56,0,0,0,0,0,0,17,0,21,0],"FLAG":1,"BASE":18}'
+template: {"NAME":"Ablue","GPIO":[57,0,56,0,0,0,0,0,0,17,0,21,0],"FLAG":1,"BASE":18}
link_alt:
---
diff --git a/_templates/acashna_hs108 b/_templates/acashna_hs108
index cb45045e4..08bbcb1de 100644
--- a/_templates/acashna_hs108
+++ b/_templates/acashna_hs108
@@ -6,7 +6,7 @@ type: Plug
standard: us
link: https://www.amazon.com/gp/product/B078KQS97D
image: https://user-images.githubusercontent.com/5904370/55259330-aaaab700-5265-11e9-8e74-43dd04845ac9.png
-template: '{"NAME":"HS108","GPIO":[0,17,0,0,0,0,0,0,0,56,21,0,0],"FLAG":1,"BASE":18}'
+template: {"NAME":"HS108","GPIO":[0,17,0,0,0,0,0,0,0,56,21,0,0],"FLAG":1,"BASE":18}
link_alt:
---
diff --git a/_templates/acenx_3AC+3USB b/_templates/acenx_3AC+3USB
index 8de924a0d..800ca1f14 100644
--- a/_templates/acenx_3AC+3USB
+++ b/_templates/acenx_3AC+3USB
@@ -6,7 +6,7 @@ type: Power Strip
standard: us
link: https://www.amazon.com/Outlets-Compatible-Control-Schedule-Extension/dp/B07QGTZQR7
image: https://images-na.ssl-images-amazon.com/images/I/51aSkuxphUL._SL1000_.jpg
-template: '{"NAME":"ACENX 3-Outlet","GPIO":[56,55,54,53,0,21,0,0,23,24,22,0,17],"FLAG":0,"BASE":18}'
+template: {"NAME":"ACENX 3-Outlet","GPIO":[56,55,54,53,0,21,0,0,23,24,22,0,17],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/acenx_SOP04 b/_templates/acenx_SOP04
index d1b973bc6..2409adcb4 100644
--- a/_templates/acenx_SOP04
+++ b/_templates/acenx_SOP04
@@ -6,7 +6,7 @@ type: Outdoor Plug
standard: us
link: https://www.amazon.com/Waterproof-Compatible-Wireless-Smartphone-Required/dp/B07H7ZML4W
image: https://images-na.ssl-images-amazon.com/images/I/51U4XUPwg0L._SL1000_.jpg
-template: '{"NAME":"SOP04-US Dual","GPIO":[255,255,255,255,56,57,0,0,21,17,22,255,255],"FLAG":0,"BASE":18}'
+template: {"NAME":"SOP04-US Dual","GPIO":[255,255,255,255,56,57,0,0,21,17,22,255,255],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/adafruit_HUZZAH b/_templates/adafruit_HUZZAH
index 609237e5d..64e81b43f 100644
--- a/_templates/adafruit_HUZZAH
+++ b/_templates/adafruit_HUZZAH
@@ -6,7 +6,7 @@ type: DIY
standard: global
link: https://www.adafruit.com/product/2471
image: https://user-images.githubusercontent.com/5904370/68545564-894ea380-03ce-11ea-8031-7e4659723921.png
-template: '{"NAME":"Huzzah","GPIO":[17,0,56,0,255,255,0,0,255,255,255,255,255],"FLAG":0,"BASE":18}'
+template: {"NAME":"Huzzah","GPIO":[17,0,56,0,255,255,0,0,255,255,255,255,255],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/aicliv_SOP03-US b/_templates/aicliv_SOP03-US
index 6cab3f4c1..7d40229b0 100644
--- a/_templates/aicliv_SOP03-US
+++ b/_templates/aicliv_SOP03-US
@@ -6,7 +6,7 @@ type: Outdoor Plug
standard: us
link: https://www.amazon.com/gp/product/B07CXRRKTQ
image: https://images-na.ssl-images-amazon.com/images/I/71Ny%2B8hwy2L._SL1500_.jpg
-template: '{"NAME":"AICLIV SOP03US","GPIO":[0,0,0,23,57,0,0,0,21,18,22,0,0],"FLAG":15,"BASE":18}'
+template: {"NAME":"AICLIV SOP03US","GPIO":[0,0,0,23,57,0,0,0,21,18,22,0,0],"FLAG":15,"BASE":18}
link_alt:
---
diff --git a/_templates/aigoss_16A b/_templates/aigoss_16A
index dc9b74240..72f2cc4cd 100644
--- a/_templates/aigoss_16A
+++ b/_templates/aigoss_16A
@@ -6,7 +6,7 @@ type: Plug
standard: eu
link: https://www.amazon.de/gp/product/B07RGVBPBV
image: https://images-na.ssl-images-amazon.com/images/I/31PVFTEKL6L._AC_.jpg
-template: '{"NAME":"Aigoss Plug","GPIO":[255,255,0,255,52,21,0,0,54,255,17,0,255],"FLAG":15,"BASE":51}'
+template: {"NAME":"Aigoss Plug","GPIO":[255,255,0,255,52,21,0,0,54,255,17,0,255],"FLAG":15,"BASE":51}
link_alt:
---
diff --git a/_templates/aisirer_9W_A19_E26 b/_templates/aisirer_9W_A19_E26
index e39b88f89..f5395a470 100644
--- a/_templates/aisirer_9W_A19_E26
+++ b/_templates/aisirer_9W_A19_E26
@@ -1,14 +1,12 @@
---
date_added: 2019-10-17
-title: Aisirer A19 9W WW
-category: light
-type: Bulb
-standard:
- - us
- - E26
+title: Aisirer A19 9W
+type: WW
+category: bulb
+standard: E26
link: https://www.amazon.com/gp/product/B07Q3SGYCL/
image: https://images-na.ssl-images-amazon.com/images/I/61qHMqhwcgL._SL1500_.jpg
-template: '{"NAME":"AISIRER E26","GPIO":[0,0,0,0,0,37,0,0,0,0,0,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"AISIRER E26","GPIO":[0,0,0,0,0,37,0,0,0,0,0,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/aisirer_UK1 b/_templates/aisirer_UK1
index cbef9a4e4..d690ac7c1 100644
--- a/_templates/aisirer_UK1
+++ b/_templates/aisirer_UK1
@@ -6,7 +6,7 @@ type: Plug
standard: uk
link: https://www.amazon.co.uk/AISIRER-Compatible-Monitoring-Function-Required/dp/B07N1GD2Q1
image: https://images-na.ssl-images-amazon.com/images/I/51q6upbpWVL._SY355_.jpg
-template: '{"NAME":"AISIRER","GPIO":[255,255,255,255,56,255,0,0,21,17,255,255,255],"FLAG":1,"BASE":18}'
+template: {"NAME":"AISIRER","GPIO":[255,255,255,255,56,255,0,0,21,17,255,255,255],"FLAG":1,"BASE":18}
link_alt:
---
diff --git a/_templates/ajax_online_4_5W_GU10_CCT b/_templates/ajax_online_4_5W_GU10_CCT
index ee2828470..98607cdb8 100644
--- a/_templates/ajax_online_4_5W_GU10_CCT
+++ b/_templates/ajax_online_4_5W_GU10_CCT
@@ -1,14 +1,12 @@
---
date_added: 2019-11-19
-title: Ajax Online 4.5W CCT
-category: light
-type: Bulb
-standard:
- - uk
- - GU10
+title: Ajax Online 4.5W
+type: CCT
+category: bulb
+standard: GU10
link: https://www.amazon.co.uk/Google-Tunable-Dimmable-Ambiance-Lighting/dp/B07M6R3ZLG
image: https://images-na.ssl-images-amazon.com/images/I/71Fduk5nEuL._SX679_.jpg
-template: '{"NAME":"AjaxOnline","GPIO":[17,0,0,0,0,37,0,0,38,0,0,0,0],"FLAG":0,"BASE":38}'
+template: {"NAME":"AjaxOnline","GPIO":[17,0,0,0,0,37,0,0,38,0,0,0,0],"FLAG":0,"BASE":38}
link_alt:
---
diff --git a/_templates/al_above_lights_9W_E26_rgbw b/_templates/al_above_lights_9W_E26_rgbw
index 08a07c939..8c8daba8b 100644
--- a/_templates/al_above_lights_9W_E26_rgbw
+++ b/_templates/al_above_lights_9W_E26_rgbw
@@ -1,14 +1,12 @@
---
date_added: 2019-11-17
-title: AL Above Lights 9W RGB+W
-category: light
-type: Bulb
-standard:
- - us
- - E26
+title: AL Above Lights 9W
+type: RGBW
+category: bulb
+standard: E26
link: https://www.amazon.com/dp/B07SNRSWNY
image: https://images-na.ssl-images-amazon.com/images/I/51HEffp%2BfvL._AC_SL1500_.jpg
-template: '{"NAME":"AL 810LM","GPIO":[0,0,0,0,37,40,0,0,38,0,39,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"AL 810LM","GPIO":[0,0,0,0,37,40,0,0,38,0,39,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/albohes-pc-1606 b/_templates/albohes-pc-1606
index 8ec71996c..bba505504 100644
--- a/_templates/albohes-pc-1606
+++ b/_templates/albohes-pc-1606
@@ -6,7 +6,7 @@ type: Outdoor Plug
standard: eu
link: https://www.amazon.de/albohes-Intelligente-Wasserdicht-Unterstützt-WifiVerbindung/dp/B07CVHJJ4Z
image: https://images-na.ssl-images-amazon.com/images/I/511NUQcKK-L._SL1000_.jpg
-template: '{"NAME":"Albohes PC1606","GPIO":[17,0,0,0,0,22,18,0,21,0,0,0,0],"FLAG":1,"BASE":39}'
+template: {"NAME":"Albohes PC1606","GPIO":[17,0,0,0,0,22,18,0,21,0,0,0,0],"FLAG":1,"BASE":39}
link_alt:
---
diff --git a/_templates/albohes_PS-1602 b/_templates/albohes_PS-1602
index df05e1a4f..6d6d825b5 100644
--- a/_templates/albohes_PS-1602
+++ b/_templates/albohes_PS-1602
@@ -6,7 +6,7 @@ type: Outdoor Plug
standard: us
link: https://www.amazon.ca/gp/product/B07CN768WZ/
image: https://images-na.ssl-images-amazon.com/images/I/51vW3z7WLlL._SL1000_.jpg
-template: '{"NAME":"Albohes PC1606","GPIO":[17,0,0,0,0,22,18,0,21,0,0,0,0],"FLAG":1,"BASE":39}'
+template: {"NAME":"Albohes PC1606","GPIO":[17,0,0,0,0,22,18,0,21,0,0,0,0],"FLAG":1,"BASE":39}
link_alt:
---
diff --git a/_templates/alexfirst_TV-ASP801EU b/_templates/alexfirst_TV-ASP801EU
index a68649733..473b3657b 100644
--- a/_templates/alexfirst_TV-ASP801EU
+++ b/_templates/alexfirst_TV-ASP801EU
@@ -6,7 +6,7 @@ type: Plug
standard: eu
link: https://www.amazon.de/gp/product/B073R91TWH
image: https://images-na.ssl-images-amazon.com/images/I/51pNHVbdydL._SL1200_.jpg
-template: '{"NAME":"Alexfirst","GPIO":[17,0,0,0,54,56,0,0,21,0,0,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"Alexfirst","GPIO":[17,0,0,0,54,56,0,0,21,0,0,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/alfawise-pe1004 b/_templates/alfawise-pe1004
index f5ff007e3..73aecb4de 100644
--- a/_templates/alfawise-pe1004
+++ b/_templates/alfawise-pe1004
@@ -6,6 +6,6 @@ type: Plug
standard: eu
link: https://www.gearbest.com/smart-power-socket-plug/pp_009471124266.html
image: https://gloimg.gbtcdn.com/soa/gb/pdm-product-pic/Electronic/2018/10/19/goods_img_big-v1/20181019171926_11300.jpg
-template: '{"NAME":"PE1004T","GPIO":[255,255,255,255,56,57,0,0,21,17,255,255,255],"FLAG":0,"BASE":18}'
+template: {"NAME":"PE1004T","GPIO":[255,255,255,255,56,57,0,0,21,17,255,255,255],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/alfawise_KS1 b/_templates/alfawise_KS1
index 04de600dc..707745069 100644
--- a/_templates/alfawise_KS1
+++ b/_templates/alfawise_KS1
@@ -6,7 +6,7 @@ type: IR Bridge
standard: global
link: https://www.alfawise.com/products/alfawise-ks1-smart-home-universal-remote-controller
image: https://cdn.shopify.com/s/files/1/0016/9617/0043/products/1_2_fbfc7682-2b71-4c03-afd0-51c3fbc79e31_1000x1000.jpg?v=1550550184
-template: '{"NAME":"KS1","GPIO":[255,71,17,72,17,51,0,0,56,0,8,0,0],"FLAG":1,"BASE":62}'
+template: {"NAME":"KS1","GPIO":[255,71,17,72,17,51,0,0,56,0,8,0,0],"FLAG":1,"BASE":62}
link_alt:
---
diff --git a/_templates/amysen_YS-WS01 b/_templates/amysen_YS-WS01
index 0932f6864..d8c929e2a 100644
--- a/_templates/amysen_YS-WS01
+++ b/_templates/amysen_YS-WS01
@@ -6,7 +6,7 @@ type: Plug
standard: us
link: https://www.amazon.com/gp/product/B078K432TK
image: https://images-na.ssl-images-amazon.com/images/I/61bC32VlbEL._SL1200_.jpg
-template: '{"NAME":"Amyse YX WS01","GPIO":[255,17,255,255,255,255,0,0,255,56,21,255,255],"FLAG":1,"BASE":18}'
+template: {"NAME":"Amyse YX WS01","GPIO":[255,17,255,255,255,255,0,0,255,56,21,255,255],"FLAG":1,"BASE":18}
link_alt:
---
diff --git a/_templates/anbes_ABS-CZ004 b/_templates/anbes_ABS-CZ004
index 6bb4b7f85..d4d5c10da 100644
--- a/_templates/anbes_ABS-CZ004
+++ b/_templates/anbes_ABS-CZ004
@@ -6,7 +6,7 @@ type: Plug
standard: us
link: https://www.amazon.com/gp/product/B07DC641FH
image: https://images-na.ssl-images-amazon.com/images/I/61EVgigpiqL._SL1500_.jpg
-template: '{"NAME":"ANBES ABS-CZ00","GPIO":[0,0,0,0,21,133,0,0,131,17,132,22,18],"FLAG":0,"BASE":18}'
+template: {"NAME":"ANBES ABS-CZ00","GPIO":[0,0,0,0,21,133,0,0,131,17,132,22,18],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/annhome_3ac-2usb b/_templates/annhome_3ac-2usb
index 49fcf63f9..c7836066b 100644
--- a/_templates/annhome_3ac-2usb
+++ b/_templates/annhome_3ac-2usb
@@ -6,7 +6,7 @@ type: Power Strip
standard: us
link: https://www.banggood.com/1200W-WiFi-Smart-Power-Strip-Switch-Socket-Outlet-Remote-Work-With-Alexa-Echo-Google-Home-p-1285519.html
image: https://i.imgur.com/Qc7WYWm.png
-template: '{"NAME":"1200W WiFi SPS","GPIO":[32,0,0,0,57,52,0,0,21,17,22,23,33],"FLAG":0,"BASE":18}'
+template: {"NAME":"1200W WiFi SPS","GPIO":[32,0,0,0,57,52,0,0,21,17,22,23,33],"FLAG":0,"BASE":18}
link_alt: https://www.ebay.com/itm/WiFi-Power-Strip-3-Plug-2-USB-Charging-Port-Socket-Supply-US-Plug-Cord-Protector-/264254818324
---
diff --git a/_templates/anoopsyche_9W_E26 b/_templates/anoopsyche_9W_E26
index cd43bb700..1f43d86f0 100644
--- a/_templates/anoopsyche_9W_E26
+++ b/_templates/anoopsyche_9W_E26
@@ -1,14 +1,12 @@
---
date_added: 2019-03-10
-title: Anoopsyche 9W CCT
-category: light
-type: Bulb
-standard:
- - us
- - E26
+title: Anoopsyche 9W
+type: CCT
+category: bulb
+standard: E26
link: https://www.amazon.com/ANOOPSYCHE-2700K-6500K-Equivalent-Compatible-Assistant/dp/B07DPMC5DF
image: https://user-images.githubusercontent.com/5904370/69924698-ff659800-14ac-11ea-8a66-c1e372bc2645.png
-template: '{"NAME":"Anoop-CW-WW","GPIO":[0,0,0,0,0,37,0,0,0,38,0,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"Anoop-CW-WW","GPIO":[0,0,0,0,0,37,0,0,0,38,0,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/anoopsyche_AWP07L b/_templates/anoopsyche_AWP07L
index 20232050e..0ee450d94 100644
--- a/_templates/anoopsyche_AWP07L
+++ b/_templates/anoopsyche_AWP07L
@@ -6,7 +6,7 @@ type: Plug
standard: eu
link: https://www.amazon.it/dp/B079JXN1VV
image: https://i.postimg.cc/W1QhkMbt/plug1.jpg
-template: '{"NAME":"Anoopsyche AWP","GPIO":[0,0,0,0,56,21,0,0,0,17,0,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"Anoopsyche AWP","GPIO":[0,0,0,0,56,21,0,0,0,17,0,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/anoopsyche_AWP08L b/_templates/anoopsyche_AWP08L
index 26d3edd98..09c30c370 100644
--- a/_templates/anoopsyche_AWP08L
+++ b/_templates/anoopsyche_AWP08L
@@ -6,7 +6,7 @@ type: Plug
standard: eu
link: https://www.amazon.de/gp/product/B07PMQKH2X
image: https://images-na.ssl-images-amazon.com/images/I/61WY7viI5eL._AC_SL1500_.jpg
-template: '{"NAME":"AWP08L-Annopsy","GPIO":[0,0,0,0,17,56,0,0,21,0,0,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"AWP08L-Annopsy","GPIO":[0,0,0,0,17,56,0,0,21,0,0,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/anoopsyche_JH-G01B1 b/_templates/anoopsyche_JH-G01B1
index 1eb5c2367..2d4a6782f 100644
--- a/_templates/anoopsyche_JH-G01B1
+++ b/_templates/anoopsyche_JH-G01B1
@@ -6,7 +6,7 @@ type: Plug
standard: uk
link: https://www.amazon.co.uk/ANOOPSYCHE-Monitoring-Required-Compatible-Assistant/dp/B07K24QZHN
image: https://user-images.githubusercontent.com/5904370/54646076-48e89100-4a9e-11e9-87fb-54b27ae024ab.png
-template: '{"NAME":"JH-G01B1","GPIO":[0,145,0,146,0,0,0,0,17,56,21,0,0],"FLAG":0,"BASE":41}'
+template: {"NAME":"JH-G01B1","GPIO":[0,145,0,146,0,0,0,0,17,56,21,0,0],"FLAG":0,"BASE":41}
link_alt:
---
diff --git a/_templates/anoopsyche_UK1D b/_templates/anoopsyche_UK1D
index 0d543758b..b9b569c81 100644
--- a/_templates/anoopsyche_UK1D
+++ b/_templates/anoopsyche_UK1D
@@ -6,7 +6,7 @@ type: Plug
standard: uk
link: https://www.amazon.co.uk/gp/product/B07PH28N1D
image: https://images-na.ssl-images-amazon.com/images/I/51q6upbpWVL._SL1001_.jpg
-template: '{"NAME":"UK1D","GPIO":[0,17,0,0,133,132,0,0,130,52,21,0,0],"FLAG":0,"BASE":6}'
+template: {"NAME":"UK1D","GPIO":[0,17,0,0,133,132,0,0,130,52,21,0,0],"FLAG":0,"BASE":6}
link_alt: https://www.amazon.co.uk/AISIRER-Compatible-Monitoring-Function-Required/dp/B07N1GD2Q1
---
diff --git a/_templates/aofo_3AC4USB b/_templates/aofo_3AC4USB
index 2fbd63c42..f50ccee53 100644
--- a/_templates/aofo_3AC4USB
+++ b/_templates/aofo_3AC4USB
@@ -6,7 +6,7 @@ type: Power Strip
standard: eu
link: https://www.amazon.de/Steckdosenleiste-AOFO-Intelligente-Fernbedienung-USB-Anschl%C3%BCssen/dp/B0796SL41M
image: https://images-na.ssl-images-amazon.com/images/I/61azZIgE6iL._SL1500_.jpg
-template: '{"NAME":"AOFO","GPIO":[0,56,0,17,22,21,0,0,0,23,24,0,0],"FLAG":1,"BASE":18}'
+template: {"NAME":"AOFO","GPIO":[0,56,0,17,22,21,0,0,0,23,24,0,0],"FLAG":1,"BASE":18}
link_alt:
---
diff --git a/_templates/aofo_4AC+4USB_tuya b/_templates/aofo_4AC+4USB_tuya
index 20c1ebf1f..dbeacf6e0 100644
--- a/_templates/aofo_4AC+4USB_tuya
+++ b/_templates/aofo_4AC+4USB_tuya
@@ -6,7 +6,7 @@ type: Power Strip
standard: eu
link: https://www.amazon.de/AOFO-Steckdosenleiste-Fernsteuerung-Mehrfachsteckdose-%C3%9Cberspannungsschutz/dp/B07X1H3NWF
image: https://images-na.ssl-images-amazon.com/images/I/816DuO0a4WL._SL1500_.jpg
-template: '{"NAME":"AOFO-4AC-4USB","GPIO":[255,255,255,255,255,255,0,0,255,255,255,255,255],"FLAG":1,"BASE":54}'
+template: {"NAME":"AOFO-4AC-4USB","GPIO":[255,255,255,255,255,255,0,0,255,255,255,255,255],"FLAG":1,"BASE":54}
link_alt:
---
diff --git a/_templates/aofo_4AC4USB b/_templates/aofo_4AC4USB
index be6c219d5..82eef46e4 100644
--- a/_templates/aofo_4AC4USB
+++ b/_templates/aofo_4AC4USB
@@ -6,12 +6,12 @@ type: Power Strip
standard: eu
link: https://www.amazon.de/Steckdosenleiste-AOFO-Mehrfachsteckdose-%C3%9Cberspannungsschutz-Sprachsteuerung/dp/B07GBSD11P
image: https://images-na.ssl-images-amazon.com/images/I/51Vw8MUHMrL._SL1000_.jpg
-template: '{"NAME":"AOFO4AC4USB","GPIO":[0,56,0,17,22,21,0,0,23,24,25,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"AOFO4AC4USB","GPIO":[0,56,0,17,22,21,0,0,23,24,25,0,0],"FLAG":0,"BASE":18}
link_alt:
---
In some cases Relay5 (USB) ON/OFF is inverted. You can use this configuration:
-template: '{"NAME":"AOFO4AC4USB","GPIO":[0,56,0,17,22,21,0,0,23,24,33,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"AOFO4AC4USB","GPIO":[0,56,0,17,22,21,0,0,23,24,33,0,0],"FLAG":0,"BASE":18}
diff --git a/_templates/aofo_power_strip b/_templates/aofo_power_strip
index 35f50e9b7..5337435ee 100644
--- a/_templates/aofo_power_strip
+++ b/_templates/aofo_power_strip
@@ -6,7 +6,7 @@ type: Power Strip
standard: uk
link: https://www.amazon.co.uk/gp/product/B07MZSH3CF/ref=ppx_yo_dt_b_asin_title_o02_s01?ie=UTF8&psc=1
image: https://images-na.ssl-images-amazon.com/images/I/41Y%2BIh-KVdL._SL1000_.jpg
-template: '{"NAME":"AOFO4AC4USB-UK","GPIO":[0,56,0,17,23,24,0,0,22,21,33,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"AOFO4AC4USB-UK","GPIO":[0,56,0,17,23,24,0,0,22,21,33,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/aoycocr_5W_GU10_RGBW b/_templates/aoycocr_5W_GU10_RGBW
index 49d7e6f46..def56e66d 100644
--- a/_templates/aoycocr_5W_GU10_RGBW
+++ b/_templates/aoycocr_5W_GU10_RGBW
@@ -1,14 +1,12 @@
---
date_added: 2019-11-27
-title: Aoycocr 5W RGB+W
-category: light
-type: Bulb
-standard:
- - eu
- - GU10
+title: Aoycocr 5W
+type: RGBW
+category: bulb
+standard: GU10
link: https://www.amazon.de/Doppelpack-Aoycocr-Mehrfarbige-Intelligente-Kompatibel/dp/B07V45F2X4
image: https://images-na.ssl-images-amazon.com/images/I/51vIFOlCpHL._SL1000_.jpg
-template: '{"NAME":"Aoycocr_GU10","GPIO":[0,0,0,0,0,0,0,0,143,0,144,0,0],"FLAG":0,"BASE":27}'
+template: {"NAME":"Aoycocr_GU10","GPIO":[0,0,0,0,0,0,0,0,143,0,144,0,0],"FLAG":0,"BASE":27}
link_alt:
---
diff --git a/_templates/aoycocr_A19_9W_E26 b/_templates/aoycocr_A19_9W_E26
index af587aa96..008ce2add 100644
--- a/_templates/aoycocr_A19_9W_E26
+++ b/_templates/aoycocr_A19_9W_E26
@@ -1,14 +1,12 @@
---
date_added: 2019-10-01
-title: Aoycocr A19 9W RGB+CT
-category: light
-type: Bulb
-standard:
- - us
- - E26
+title: Aoycocr A19 9W
+type: RGBCCT
+category: bulb
+standard: E26
link: https://www.amazon.com/Compatible-Assitant-Required-Dimmable-Equivalent/dp/B07NXR61Y2
image: https://user-images.githubusercontent.com/5904370/67769581-071cc180-fa55-11e9-90d2-5d1108d9dc81.png
-template: '{"NAME":"AoycocrA19","GPIO":[0,0,0,0,0,39,0,0,38,0,37,40,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"AoycocrA19","GPIO":[0,0,0,0,0,39,0,0,38,0,37,40,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/aoycocr_EU5-16A b/_templates/aoycocr_EU5-16A
index cab06e1a7..3cdf6c089 100644
--- a/_templates/aoycocr_EU5-16A
+++ b/_templates/aoycocr_EU5-16A
@@ -6,7 +6,7 @@ type: Plug
standard: eu
link: https://www.amazon.de/gp/product/B07PRFGRLC
image: https://user-images.githubusercontent.com/5904370/66717175-536dcd80-edd6-11e9-8e3e-da3e76cc3e43.png
-template: '{"NAME":"Aoycocr","GPIO":[255,0,56,0,0,0,0,0,255,17,0,21,0],"FLAG":0,"BASE":17}'
+template: {"NAME":"Aoycocr","GPIO":[255,0,56,0,0,0,0,0,255,17,0,21,0],"FLAG":0,"BASE":17}
link_alt:
---
diff --git a/_templates/aoycocr_U3S b/_templates/aoycocr_U3S
index 10c3d1db9..47bc66905 100644
--- a/_templates/aoycocr_U3S
+++ b/_templates/aoycocr_U3S
@@ -6,7 +6,7 @@ type: Plug
standard: uk
link: https://www.amazon.co.uk/Aoycocr-Monitoring-Compatible-Function-Required%EF%BC%884pack%EF%BC%89/dp/B07RYPJTJX
image: https://images-na.ssl-images-amazon.com/images/I/51KqgLVWuAL._SL1000_.jpg
-template: '{"NAME":"Teckin SP23","GPIO":[56,0,57,255,0,0,0,0,0,17,0,21,0],"FLAG":0,"BASE":45}'
+template: {"NAME":"Teckin SP23","GPIO":[56,0,57,255,0,0,0,0,0,17,0,21,0],"FLAG":0,"BASE":45}
link_alt:
---
diff --git a/_templates/aoycocr_X10S b/_templates/aoycocr_X10S
index e43e84dd7..49dab37dd 100644
--- a/_templates/aoycocr_X10S
+++ b/_templates/aoycocr_X10S
@@ -6,7 +6,7 @@ type: Plug
standard: us
link: https://www.amazon.com/gp/product/B07RV15W3W/ref=ppx_yo_dt_b_asin_title_o06_s00?ie=UTF8&psc=1
image: https://images-na.ssl-images-amazon.com/images/I/518fCSPoyOL._AC_SL1500_.jpg
-template: '{"NAME":"Aoycocr X10S","GPIO":[56,0,57,0,21,134,0,0,131,17,132,0,0],"FLAG":0,"BASE":45}'
+template: {"NAME":"Aoycocr X10S","GPIO":[56,0,57,0,21,134,0,0,131,17,132,0,0],"FLAG":0,"BASE":45}
link_alt:
---
diff --git a/_templates/aoycocr_X5P b/_templates/aoycocr_X5P
index ff5c64d27..c0cb371dc 100644
--- a/_templates/aoycocr_X5P
+++ b/_templates/aoycocr_X5P
@@ -6,7 +6,7 @@ type: Plug
standard: us
link: https://www.amazon.com/gp/product/B07N1JPPXK/
image: https://images-na.ssl-images-amazon.com/images/I/5166t5gp8PL._AC_SL1100_.jpg
-template: '{"NAME":"Aoycocr X5P","GPIO":[56,0,57,0,0,0,0,0,0,17,0,21,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"Aoycocr X5P","GPIO":[56,0,57,0,0,0,0,0,0,17,0,21,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/aoycocr_X6 b/_templates/aoycocr_X6
index 3118df863..eaa54b3b2 100644
--- a/_templates/aoycocr_X6
+++ b/_templates/aoycocr_X6
@@ -5,7 +5,7 @@ type: Plug
standard: us
link: https://www.amazon.com/Google-Listed-Aoycocr-Outlet-Needed/dp/B07MVT2W68
image: https://i.postimg.cc/X7XZgN46/511o-YCKs-Z9-L-SX679.jpg
-template: '{"NAME":"Aoycocr X6","GPIO":[0,0,56,0,0,0,0,0,0,17,0,21,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"Aoycocr X6","GPIO":[0,0,56,0,0,0,0,0,0,17,0,21,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/arilux_LC01 b/_templates/arilux_LC01
index d6d129180..626a3eb6a 100644
--- a/_templates/arilux_LC01
+++ b/_templates/arilux_LC01
@@ -5,7 +5,7 @@ type: LED Controller
standard: global
link: https://www.banggood.com/ARILUX-AL-LC01-Super-Mini-LED-WIFI-Smart-RGB-Controller-For-RGB-LED-Strip-Light-DC-9-12V-p-1058603.html?cur_warehouse=CN
image: https://user-images.githubusercontent.com/5904370/57947401-1a8d0380-78df-11e9-8c8f-eee38432dcea.png
-template: '{"NAME":"Arilux LC01","GPIO":[17,0,59,0,147,37,0,0,38,39,0,0,0],"FLAG":0,"BASE":37}'
+template: {"NAME":"Arilux LC01","GPIO":[17,0,59,0,147,37,0,0,38,39,0,0,0],"FLAG":0,"BASE":37}
link_alt: https://www.aliexpress.com/item/32918090016.html
---
## Serial Flashing
diff --git a/_templates/arilux_LC06 b/_templates/arilux_LC06
index c965107b8..b2198c020 100644
--- a/_templates/arilux_LC06
+++ b/_templates/arilux_LC06
@@ -5,7 +5,7 @@ type: LED Controller
standard: global
link: https://www.banggood.com/ARILUX-AL-LC06-LED-WIFI-Smartphone-Controller-Romote-5-Channels-DC12-24V-For-RGBWW-Strip-light-p-1061476.html?cur_warehouse=CN
image: https://user-images.githubusercontent.com/5904370/57947770-19a8a180-78e0-11e9-8cd9-4a8063fd3860.png
-template: '{"NAME":"Arilux LC06","GPIO":[17,0,0,0,0,0,0,0,38,39,37,41,40],"FLAG":0,"BASE":18}'
+template: {"NAME":"Arilux LC06","GPIO":[17,0,0,0,0,0,0,0,38,39,37,41,40],"FLAG":0,"BASE":18}
link_alt: https://www.aliexpress.com/item/32967761019.html
---
## Serial Flashing
diff --git a/_templates/arilux_LC11 b/_templates/arilux_LC11
index ddf15c24f..38e05a3f2 100644
--- a/_templates/arilux_LC11
+++ b/_templates/arilux_LC11
@@ -5,7 +5,7 @@ type: LED Controller
standard: global
link: https://www.aliexpress.com/item/32970883509.html
image: https://user-images.githubusercontent.com/5904370/57947634-ba4a9180-78df-11e9-83bc-635a6d7a92e2.png
-template: '{"NAME":"Arilux LC11","GPIO":[17,0,59,0,38,37,0,0,41,40,39,147,0],"FLAG":0,"BASE":38}'
+template: {"NAME":"Arilux LC11","GPIO":[17,0,59,0,38,37,0,0,41,40,39,147,0],"FLAG":0,"BASE":38}
link_alt:
---
## Serial Flashing
diff --git a/_templates/arilux_SL-LC_09 b/_templates/arilux_SL-LC_09
index 0f3e479a5..33e4bf81e 100644
--- a/_templates/arilux_SL-LC_09
+++ b/_templates/arilux_SL-LC_09
@@ -6,7 +6,7 @@ type: LED Controller
standard: global
link: https://www.banggood.com/ARILUX-AL-LC09-Super-Mini-LED-WIFI-APP-Controller-RF-Remote-Control-For-RGB-LED-Strip-DC9-28V-p-1081344.html
image: https://imgaz1.staticbg.com/thumb/large/oaupload/banggood/images/BA/BF/84f7e0d7-febd-4784-a873-946f69978192.jpg
-template: '{"NAME":"Arilux LC09","GPIO":[0,0,0,0,106,37,0,0,39,0,38,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"Arilux LC09","GPIO":[0,0,0,0,106,37,0,0,39,0,38,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/arlec_ALD233HA b/_templates/arlec_ALD233HA
index f9b1c9b42..b3db894f6 100644
--- a/_templates/arlec_ALD233HA
+++ b/_templates/arlec_ALD233HA
@@ -6,7 +6,7 @@ type: LED Strip
standard: anzac
link: https://www.bunnings.com.au/arlec-2m-led-white-smart-colour-changing-strip-light-with-grid-connect_p0099707
image: https://2ecffd01e1ab3e9383f0-07db7b9624bbdf022e3b5395236d5cf8.ssl.cf4.rackcdn.com/Product-1600x1600/11307e19-efcd-4fee-a698-0b37c5b20843.jpg
-template: '{"NAME":"Arlec ALD233AH","GPIO":[0,0,0,0,37,40,0,0,38,0,39,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"Arlec ALD233AH","GPIO":[0,0,0,0,37,40,0,0,38,0,39,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/arlec_GLD112HA b/_templates/arlec_GLD112HA
index 3163fd3f2..83037e172 100644
--- a/_templates/arlec_GLD112HA
+++ b/_templates/arlec_GLD112HA
@@ -1,14 +1,12 @@
---
date_added: 2019-10-05
-title: Arlec GLD112HA 9.5W CCT
-category: light
-type: Bulb
-standard:
- - anzac
- - E27
+title: Arlec GLD112HA 9.5W
+type: CCT
+category: bulb
+standard: E27
link: https://www.bunnings.com.au/arlec-smart-9-5w-806lm-cct-es-globe-with-grid-connect_p0111503
image: https://2ecffd01e1ab3e9383f0-07db7b9624bbdf022e3b5395236d5cf8.ssl.cf4.rackcdn.com/Product-1600x1600/ded8c866-2599-4426-b6ff-3bb6ca3f643e.jpg
-template: '{"NAME":"Arlec CCT","GPIO":[0,0,0,0,0,37,0,0,0,38,0,0,0],"FLAG":0,"BASE":48}'
+template: {"NAME":"Arlec CCT","GPIO":[0,0,0,0,0,37,0,0,0,38,0,0,0],"FLAG":0,"BASE":48}
link_alt:
---
diff --git a/_templates/arlec_GLD122HA b/_templates/arlec_GLD122HA
index cf64581a0..43f59d6c4 100644
--- a/_templates/arlec_GLD122HA
+++ b/_templates/arlec_GLD122HA
@@ -1,14 +1,12 @@
---
date_added: 2019-10-23
-title: Arlec GLD122HA 9.5W RGB+CCT
-category: light
-type: Bulb
-standard:
- - anzac
- - E27
+title: Arlec GLD122HA 9.5W
+type: RGBCCT
+category: bulb
+standard: E27
link: https://www.bunnings.com.au/arlec-smart-9-5w-806lm-rgb-cct-es-globe-with-grid-connect_p0111501
image: https://2ecffd01e1ab3e9383f0-07db7b9624bbdf022e3b5395236d5cf8.ssl.cf4.rackcdn.com/Product-1600x1600/10243ce9-61e7-4dc9-ab83-e4af46094c9f.jpg
-template: '{"NAME":"Arlec RGBWW","GPIO":[0,0,0,0,37,40,0,0,38,41,39,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"Arlec RGBWW","GPIO":[0,0,0,0,37,40,0,0,38,41,39,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/arlec_PB88UHA b/_templates/arlec_PB88UHA
index 8bbb5132d..704aef461 100644
--- a/_templates/arlec_PB88UHA
+++ b/_templates/arlec_PB88UHA
@@ -6,7 +6,7 @@ type: Power Strip
standard: anzac
link: https://www.bunnings.com.au/arlec-4-outlet-smart-powerboard-with-usb-charger-and-grid-connect_p0074829
image: https://2ecffd01e1ab3e9383f0-07db7b9624bbdf022e3b5395236d5cf8.ssl.cf4.rackcdn.com/Product-1600x1600/b6609933-ba09-4320-b8f9-ec95db6b7575.jpg
-template: '{"NAME":"ArlecPowerStri","GPIO":[0,0,0,255,22,21,0,0,24,23,0,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"ArlecPowerStri","GPIO":[0,0,0,255,22,21,0,0,24,23,0,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/arlec_PB89HA b/_templates/arlec_PB89HA
index 36f9c2871..b9a8dff7d 100644
--- a/_templates/arlec_PB89HA
+++ b/_templates/arlec_PB89HA
@@ -6,7 +6,7 @@ type: Power Strip
standard: anzac
link: https://www.bunnings.com.au/arlec-5-outlet-smart-powerboard-with-grid-connect_p0074830
image: https://2ecffd01e1ab3e9383f0-07db7b9624bbdf022e3b5395236d5cf8.ssl.cf4.rackcdn.com/Product-800x800/68e4b1c6-460c-420c-a5d8-53eef03be921.jpg
-template: '{"NAME":"Arlec PB89HA","GPIO":[255,255,255,255,22,21,0,0,24,23,255,255,255],"FLAG":15,"BASE":18}'
+template: {"NAME":"Arlec PB89HA","GPIO":[255,255,255,255,22,21,0,0,24,23,255,255,255],"FLAG":15,"BASE":18}
link_alt:
---
diff --git a/_templates/arlec_PC189HA b/_templates/arlec_PC189HA
index ca59e9884..5ba3dd4a4 100644
--- a/_templates/arlec_PC189HA
+++ b/_templates/arlec_PC189HA
@@ -6,7 +6,7 @@ type: Plug
standard: anzac
link: https://www.bunnings.com.au/arlec-smart-plug-in-socket-with-grid-connect_p0087513
image: https://2ecffd01e1ab3e9383f0-07db7b9624bbdf022e3b5395236d5cf8.ssl.cf4.rackcdn.com/Product-1600x1600/3e7fc9c0-4fdf-4058-ace5-c5432beedea4.jpg
-template: '{"NAME":"Arlec Single","GPIO":[0,0,0,0,57,0,0,0,21,0,90,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"Arlec Single","GPIO":[0,0,0,0,57,0,0,0,21,0,90,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/arlec_twin_PC288HA b/_templates/arlec_twin_PC288HA
index 2c2147c29..073b1a096 100644
--- a/_templates/arlec_twin_PC288HA
+++ b/_templates/arlec_twin_PC288HA
@@ -6,7 +6,7 @@ type: Plug
standard: anzac
link: https://www.bunnings.com.au/arlec-smart-plug-in-twin-socket-with-grid-connect_p0074828
image: https://2ecffd01e1ab3e9383f0-07db7b9624bbdf022e3b5395236d5cf8.ssl.cf4.rackcdn.com/Product-1600x1600/8bab35c2-df31-4ca4-b33f-adc92e36d697.jpg
-template: '{"NAME":"Arlec Twin","GPIO":[0,17,0,22,0,0,0,0,0,56,21,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"Arlec Twin","GPIO":[0,17,0,22,0,0,0,0,0,56,21,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/armtronix_dimmer b/_templates/armtronix_dimmer
index 34f7ca673..f5fe85b91 100644
--- a/_templates/armtronix_dimmer
+++ b/_templates/armtronix_dimmer
@@ -5,6 +5,6 @@ type: Dimmer
standard: global
link: https://www.tindie.com/products/Armtronix/wifi-ac-dimmer-esp8266-one-triac-board-alexaecho/
image: https://user-images.githubusercontent.com/5904370/57955098-33081880-78f5-11e9-990c-0b4a756ef241.png
-template: '{"NAME":"ARMTR Dimmer","GPIO":[0,148,0,149,0,0,0,0,0,0,0,0,0],"FLAG":0,"BASE":56}'
+template: {"NAME":"ARMTR Dimmer","GPIO":[0,148,0,149,0,0,0,0,0,0,0,0,0],"FLAG":0,"BASE":56}
link_alt:
---
diff --git a/_templates/armtronix_dimmer_two b/_templates/armtronix_dimmer_two
index d957e387b..f062b82dd 100644
--- a/_templates/armtronix_dimmer_two
+++ b/_templates/armtronix_dimmer_two
@@ -5,6 +5,6 @@ type: Dimmer
standard: global
link: https://www.tindie.com/products/Armtronix/wifi-ac-dimmer-two-triac-board-mini/
image: https://user-images.githubusercontent.com/5904370/57955098-33081880-78f5-11e9-990c-0b4a756ef241.png
-template: '{"NAME":"ARMTR Dimmer","GPIO":[0,148,0,149,0,0,0,0,0,0,0,0,0],"FLAG":0,"BASE":56}'
+template: {"NAME":"ARMTR Dimmer","GPIO":[0,148,0,149,0,0,0,0,0,0,0,0,0],"FLAG":0,"BASE":56}
link_alt:
---
diff --git a/_templates/asakuki b/_templates/asakuki
index 0159ee92a..6e8800505 100644
--- a/_templates/asakuki
+++ b/_templates/asakuki
@@ -6,7 +6,7 @@ type: Aromatherapy Diffuser
standard: us
link: https://www.amazon.ca/ASAKUKI-Humidifier-Compatible-Ultrasonic-Aromatherapy/dp/B07KXF76MJ/ref=sr_1_1_sspa?keywords=humidifier+wifi&qid=1566207577&s=gateway&sr=8-1-spons&psc=1&spLa=ZW5jcnlwdGVkUXVhbGlmaWVyPUEyMlJLQ1FSRDdKS0wzJmVuY3J5cHRlZElkPUEwMzgwNTYzM0VVSVUxWjFVNEs2RyZlbmNyeXB0ZWRBZElkPUEwNTIzOTIyU0Y3QlRFVE5aWU1MJndpZGdldE5hbWU9c3BfYXRmJmFjdGlvbj1jbGlja1JlZGlyZWN0JmRvTm90TG9nQ2xpY2s9dHJ1ZQ==
image: https://images-na.ssl-images-amazon.com/images/I/61cQ91J%2BBXL._SL1500_.jpg
-template: '{"NAME":"Oil Diffuser","GPIO":[255,255,255,255,255,255,0,0,255,255,255,21,22],"FLAG":0,"BASE":18}'
+template: {"NAME":"Oil Diffuser","GPIO":[255,255,255,255,255,255,0,0,255,255,255,21,22],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/aukey_SH-PA1 b/_templates/aukey_SH-PA1
index 0a3665a43..54f6ed0ac 100644
--- a/_templates/aukey_SH-PA1
+++ b/_templates/aukey_SH-PA1
@@ -6,7 +6,7 @@ type: Plug
standard: us
link: https://smile.amazon.com/gp/product/B07CC9S4MS
image: https://user-images.githubusercontent.com/5904370/69757192-a4563d00-115c-11ea-83fa-324dcc016241.png
-template: '{"NAME":"AUKEY SH-PA1","GPIO":[0,0,57,0,0,0,0,0,0,17,0,21,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"AUKEY SH-PA1","GPIO":[0,0,57,0,0,0,0,0,0,17,0,21,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/aunics_7W_E27_RGB b/_templates/aunics_7W_E27_RGB
index 4c42c282d..96b9b9478 100644
--- a/_templates/aunics_7W_E27_RGB
+++ b/_templates/aunics_7W_E27_RGB
@@ -1,14 +1,12 @@
---
date_added: 2019-11-21
-title: Aunics 7W RGB
-category: light
-type: Bulb
-standard:
- - eu
- - E27
+title: Aunics 7W
+type: RGB
+category: bulb
+standard: E27
link: https://www.amazon.de/gp/product/B07TW894R9
image: https://images-na.ssl-images-amazon.com/images/I/71kwwKoplxL._SL1500_.jpg
-template: '{"NAME":"Aunics RGBW","GPIO":[0,0,0,0,37,40,0,0,38,41,39,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"Aunics RGBW","GPIO":[0,0,0,0,37,40,0,0,38,41,39,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/auvisio_S06 b/_templates/auvisio_S06
index e3bfcfac1..59e89c19f 100644
--- a/_templates/auvisio_S06
+++ b/_templates/auvisio_S06
@@ -6,7 +6,7 @@ type: IR Bridge
standard: global
link: https://www.pearl.de/a-NX4519-1254.shtml
image: https://user-images.githubusercontent.com/5904370/56278781-254d5080-6107-11e9-90b4-a68579147e74.png
-template: '{"NAME":"NX-4519-675","GPIO":[255,255,255,255,52,51,0,0,255,255,8,255,255],"FLAG":1,"BASE":18}'
+template: {"NAME":"NX-4519-675","GPIO":[255,255,255,255,52,51,0,0,255,255,8,255,255],"FLAG":1,"BASE":18}
link_alt: https://www.amazon.de/dp/B07N88CQ6Z
---
It's a Wifi-IR-Gateway with TX and RX
diff --git a/_templates/avatar b/_templates/avatar
index e46144ff0..d71c40052 100644
--- a/_templates/avatar
+++ b/_templates/avatar
@@ -5,7 +5,7 @@ type: Plug
standard: eu
image: https://user-images.githubusercontent.com/5904370/53685479-7520b580-3d1b-11e9-977c-e7c0101e565c.png
link: https://www.amazon.de/Avatar-Controls-Steckdosen-Energie%C3%BCberwachung-kompatibel/dp/B07D74ZGF8/
-template: '{"NAME":"AWP07L","GPIO":[56,255,255,255,255,134,0,0,130,17,132,21,255],"FLAG":1,"BASE":18}'
+template: {"NAME":"AWP07L","GPIO":[56,255,255,255,255,134,0,0,130,17,132,21,255],"FLAG":1,"BASE":18}
---
Can be found under name AISIRER
diff --git a/_templates/avatar_5W_E14 b/_templates/avatar_5W_E14
index c268e8ebc..259f1bcec 100644
--- a/_templates/avatar_5W_E14
+++ b/_templates/avatar_5W_E14
@@ -1,12 +1,12 @@
---
date_added: 2019-10-05
-title: Avatar 5W WW
-category: light
-type: Bulb
+title: Avatar 5W
+type: WW
+category: bulb
standard: E14
link: https://www.amazon.de/gp/product/B07W6Z6KPG
image: https://user-images.githubusercontent.com/5904370/66717473-b745c580-edd9-11e9-9dc3-96dafab812c6.png
-template: '{"NAME":"AVATAR","GPIO":[0,0,0,0,0,0,0,0,0,143,0,144,0],"FLAG":0,"BASE":27}'
+template: {"NAME":"AVATAR","GPIO":[0,0,0,0,0,0,0,0,0,143,0,144,0],"FLAG":0,"BASE":27}
link_alt:
---
diff --git a/_templates/avatar_5W_GU10_RGBW b/_templates/avatar_5W_GU10_RGBW
index 27f25b06f..1ad1d8de4 100644
--- a/_templates/avatar_5W_GU10_RGBW
+++ b/_templates/avatar_5W_GU10_RGBW
@@ -1,12 +1,12 @@
---
date_added: 2019-11-21
-title: Avatar 5W RGB+W
-category: light
-type: Bulb
+title: Avatar 5W
+type: RGBW
+category: bulb
standard: GU10
link: https://www.amazon.de/gp/product/B07PKLMMFP
image: https://www.picclickimg.com/d/l400/pict/163827853882_/Smart-LED-Lampe-GU10-Alexa-Wlan-Gl%C3%BChbirne-5W.jpg
-template: '{"NAME":"Avatar_GU10","GPIO":[0,0,0,0,0,0,0,0,0,143,0,144,0],"FLAG":0,"BASE":27}'
+template: {"NAME":"Avatar_GU10","GPIO":[0,0,0,0,0,0,0,0,0,143,0,144,0],"FLAG":0,"BASE":27}
link_alt:
---
diff --git a/_templates/avatar_7W_E14 b/_templates/avatar_7W_E14
index 97f666362..57b411ae2 100644
--- a/_templates/avatar_7W_E14
+++ b/_templates/avatar_7W_E14
@@ -1,12 +1,12 @@
---
date_added: 2019-11-27
-title: Avatar 7W RGB+CW
-category: light
-type: Bulb
+title: Avatar 7W
+type: RGBW
+category: bulb
standard: E14
link: https://www.amazon.de/gp/product/B07PLGLXSG
image: https://images-na.ssl-images-amazon.com/images/I/41ZS3yefS1L._SL1001_.jpg
-template: '{"NAME":"Avatar E14 7W","GPIO":[0,0,0,0,38,37,0,0,41,39,40,0,0],"FLAG":0,"BASE":20}'
+template: {"NAME":"Avatar E14 7W","GPIO":[0,0,0,0,38,37,0,0,41,39,40,0,0],"FLAG":0,"BASE":20}
link_alt:
---
diff --git a/_templates/avatar_9W-E27 b/_templates/avatar_9W-E27
index c5a7707e4..b23cc3d09 100644
--- a/_templates/avatar_9W-E27
+++ b/_templates/avatar_9W-E27
@@ -1,12 +1,12 @@
---
date_added: 2019-11-27
-title: Avatar 9W RGB+CCT
-category: light
-type: Bulb
+title: Avatar 9W
+type: RGBCCT
+category: bulb
standard: E27
link: https://www.amazon.de/gp/product/B07XBYL2Q2
image: https://images-na.ssl-images-amazon.com/images/I/41uidWxCwUL._SL1000_.jpg
-template: '{"NAME":"AVATAR E27 9W","GPIO":[0,0,0,0,0,39,0,0,38,0,37,40,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"AVATAR E27 9W","GPIO":[0,0,0,0,0,39,0,0,38,0,37,40,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/avatar_AWP07L b/_templates/avatar_AWP07L
index cc7feb23b..000455714 100644
--- a/_templates/avatar_AWP07L
+++ b/_templates/avatar_AWP07L
@@ -6,7 +6,7 @@ type: Plug
standard: eu
link: https://www.amazon.de
image: https://images-na.ssl-images-amazon.com/images/I/517OHYzBCrL._SL1001_.jpg
-template: '{"NAME":"Avatar AWP07L","GPIO":[56,255,255,255,0,134,0,0,131,17,132,21,0],"FLAG":0,"BASE":45}'
+template: {"NAME":"Avatar AWP07L","GPIO":[56,255,255,255,0,134,0,0,131,17,132,21,0],"FLAG":0,"BASE":45}
link_alt:
---
diff --git a/_templates/avatar_UK_10A b/_templates/avatar_UK_10A
index 6dbf04a17..e4d03ed1a 100644
--- a/_templates/avatar_UK_10A
+++ b/_templates/avatar_UK_10A
@@ -6,7 +6,7 @@ type: Plug
standard: uk
link: https://www.amazon.co.uk/gp/product/B07PHB9G2Y/ref=ppx_yo_dt_b_asin_title_o01_s00?ie=UTF8&psc=1
image: https://images-na.ssl-images-amazon.com/images/I/51TMDwUqo7L._SL1001_.jpg
-template: '{"NAME":"Avatar UK 10A","GPIO":[0,0,56,0,0,134,0,0,131,17,132,21,0],"FLAG":0,"BASE":45}'
+template: {"NAME":"Avatar UK 10A","GPIO":[0,0,56,0,0,134,0,0,131,17,132,21,0],"FLAG":0,"BASE":45}
link_alt:
---
diff --git a/_templates/avatto_JH-G01E b/_templates/avatto_JH-G01E
index 3ee72707b..607863efc 100644
--- a/_templates/avatto_JH-G01E
+++ b/_templates/avatto_JH-G01E
@@ -6,7 +6,7 @@ type: Plug
standard: eu
link: https://www.aliexpress.com/item/32961743134.html?spm=a2g0s.9042311.0.0.6f504c4dMqfJ3p
image: https://ae01.alicdn.com/kf/H2f8601a3f4d644588c65b9786f60afadC.jpeg
-template: '{"NAME":"AVATTO JH-G01E","GPIO":[0,145,0,146,0,0,0,0,17,56,21,0,0],"FLAG":0,"BASE":41}'
+template: {"NAME":"AVATTO JH-G01E","GPIO":[0,145,0,146,0,0,0,0,17,56,21,0,0],"FLAG":0,"BASE":41}
link_alt:
---
diff --git a/_templates/awow_9W_E27_RGBW b/_templates/awow_9W_E27_RGBW
index 473328b51..2ba4834b3 100644
--- a/_templates/awow_9W_E27_RGBW
+++ b/_templates/awow_9W_E27_RGBW
@@ -1,12 +1,12 @@
---
date_added: 2019-11-21
-title: AWOW 9W RGB+W
-category: light
-type: Bulb
+title: AWOW 9W
+type: RGBW
+category: bulb
standard: E27
link: https://www.amazon.de/gp/product/B07Y2ZCT3G
image: https://images-na.ssl-images-amazon.com/images/I/71gXsk4ietL._SL1500_.jpg
-template: '{"NAME":"AWOW 9W RGBW","GPIO":[0,0,0,0,37,40,0,0,38,0,39,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"AWOW 9W RGBW","GPIO":[0,0,0,0,37,40,0,0,38,0,39,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/awp04l b/_templates/awp04l
index 41493ff54..20d4212f7 100644
--- a/_templates/awp04l
+++ b/_templates/awp04l
@@ -5,7 +5,7 @@ type: Plug
standard: us
link: https://www.amazon.com/Smart-Outlet-Compatible-Alexa-Google/dp/B07LGSBFNJ
image: https://i.postimg.cc/rsnJGpTS/small-201810291602080595.jpg
-template: '{"NAME":"AWP04L","GPIO":[57,255,255,131,255,134,0,0,21,17,132,56,255],"FLAG":0,"BASE":18}'
+template: {"NAME":"AWP04L","GPIO":[57,255,255,131,255,134,0,0,21,17,132,56,255],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/azpenhome b/_templates/azpenhome
index 03073b288..866218edc 100644
--- a/_templates/azpenhome
+++ b/_templates/azpenhome
@@ -6,7 +6,7 @@ type: Plug
standard: us
link: https://www.azpeninnovation.com/products/azpen-home-smart-plug
image: https://cdn.shopify.com/s/files/1/2283/9481/products/Sp-1_1024x1024@2x.jpg?v=1510176299
-template: '{"NAME":"Socket2Me","GPIO":[52,255,255,255,22,255,0,0,21,255,17,255,255],"FLAG":0,"BASE":18}'
+template: {"NAME":"Socket2Me","GPIO":[52,255,255,255,22,255,0,0,21,255,17,255,255],"FLAG":0,"BASE":18}
link_alt: https://www.amazon.com/Azpen-Home-Smart-Remote-Control/dp/B074TNKDGQ
---
diff --git a/_templates/bakibo_TP2202 b/_templates/bakibo_TP2202
index 73f82148b..627fd4021 100644
--- a/_templates/bakibo_TP2202
+++ b/_templates/bakibo_TP2202
@@ -6,7 +6,7 @@ type: Plug
standard: eu
link: https://www.amazon.de/bakibo-Intelligente-Fernbedienung-Programmieren-Stromverbrauch/dp/B07RQQCK79
image: https://m.media-amazon.com/images/S/aplus-media/sc/97b77f5a-f8ca-401f-92ec-6b6e1015e719.__CR0,0,300,400_PT0_SX300_V1___.jpg
-template: '{"NAME":"Bakibo","GPIO":[0,17,0,57,134,132,0,0,131,56,21,0,0],"FLAG":0,"BASE":52}'
+template: {"NAME":"Bakibo","GPIO":[0,17,0,57,134,132,0,0,131,56,21,0,0],"FLAG":0,"BASE":52}
link_alt:
---
diff --git a/_templates/bakibo_TP22Y b/_templates/bakibo_TP22Y
index 4a9e3bff3..ec6f26d0b 100644
--- a/_templates/bakibo_TP22Y
+++ b/_templates/bakibo_TP22Y
@@ -6,7 +6,7 @@ type: Plug
standard: eu
link: https://www.amazon.it/gp/product/B07RQQCK79/ref=ppx_yo_dt_b_asin_title_o06_s00?ie=UTF8&psc=1
image: https://m.media-amazon.com/images/S/aplus-media/sc/97b77f5a-f8ca-401f-92ec-6b6e1015e719.__CR0,0,300,400_PT0_SX300_V1___.jpg
-template: '{"NAME":"Bakibo TP22Y","GPIO":[0,0,0,17,134,132,0,0,131,56,21,0,0],"FLAG":0,"BASE":52}'
+template: {"NAME":"Bakibo TP22Y","GPIO":[0,0,0,17,134,132,0,0,131,56,21,0,0],"FLAG":0,"BASE":52}
link_alt:
---
diff --git a/_templates/bardi_smart_wallswitch_2 b/_templates/bardi_smart_wallswitch_2
index a19e212be..aac9181d8 100644
--- a/_templates/bardi_smart_wallswitch_2
+++ b/_templates/bardi_smart_wallswitch_2
@@ -6,7 +6,7 @@ type: Switch
standard: eu
link: https://bardi.co.id/product-detail/?id=175
image: https://bardi.co.id/wp-content/uploads/2019/03/Wifi-Controlled-Smart-WallSwitch-2-Horizontal.jpg
-template: '{"NAME":"BARDI 2 Gang","GPIO":[56,0,157,18,22,0,0,0,52,21,57,0,17],"FLAG":0,"BASE":18}'
+template: {"NAME":"BARDI 2 Gang","GPIO":[56,0,157,18,22,0,0,0,52,21,57,0,17],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/bardi_smart_wallswitch_3 b/_templates/bardi_smart_wallswitch_3
index ecc1c496d..b678809e2 100644
--- a/_templates/bardi_smart_wallswitch_3
+++ b/_templates/bardi_smart_wallswitch_3
@@ -6,7 +6,7 @@ type: Switch
standard: eu
link: https://bardi.co.id/product-detail/?id=170
image: https://bardi.co.id/wp-content/uploads/2019/03/Wifi-Controlled-Smart-WallSwitch-3-Horizontal.jpg
-template: '{"NAME":"BARDI 3 Gang","GPIO":[56,57,157,19,23,18,0,0,52,21,58,22,17],"FLAG":0,"BASE":18}'
+template: {"NAME":"BARDI 3 Gang","GPIO":[56,57,157,19,23,18,0,0,52,21,58,22,17],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/bauhn_ASPBU-1019 b/_templates/bauhn_ASPBU-1019
index 518ec66da..b2638ff8e 100644
--- a/_templates/bauhn_ASPBU-1019
+++ b/_templates/bauhn_ASPBU-1019
@@ -6,7 +6,7 @@ type: Power Strip
standard: anzac
link: http://www.bauhn.com.au/product-listing/smart-powerboard-ASPBU-1019
image: http://www.bauhn.com.au/_media/webapp/product-listing/ASPBU-1019/powerboard-2.jpg
-template: '{"NAME":"Bauhn 3AC+3USB","GPIO":[0,157,0,0,22,21,0,0,0,23,17,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"Bauhn 3AC+3USB","GPIO":[0,157,0,0,22,21,0,0,0,23,17,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/bauhn_ASPU-1019 b/_templates/bauhn_ASPU-1019
index fda6be200..8d80399c5 100644
--- a/_templates/bauhn_ASPU-1019
+++ b/_templates/bauhn_ASPU-1019
@@ -6,7 +6,7 @@ type: Plug
standard: anzac
link: http://www.bauhn.com.au/product-listing/smart-wall-plug-ASPU-1019
image: http://www.bauhn.com.au/_media/webapp/product-listing/ASPU-1019/2.jpg
-template: '{"NAME":"Buahn Smart Pl","GPIO":[0,0,0,0,21,22,0,0,0,56,17,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"Buahn Smart Pl","GPIO":[0,0,0,0,21,22,0,0,0,56,17,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/bawoo_EUWL122130 b/_templates/bawoo_EUWL122130
index aa4ea8fb4..d87736f2a 100644
--- a/_templates/bawoo_EUWL122130
+++ b/_templates/bawoo_EUWL122130
@@ -1,14 +1,14 @@
---
date_added: 2019-11-03
-title: Bawoo EUWL122130 7W RGB+W
-category: light
-type: Bulb
+title: Bawoo EUWL122130 7W
+type: RGBW
+category: bulb
standard:
- E27
- B22
link: https://www.amazon.co.uk/Bawoo-Dimmable-Changing-Million-Required/dp/B07868TST4
image: https://images-na.ssl-images-amazon.com/images/I/617tz4ZT7oL._SL1500_.jpg
-template: '{"NAME":"Bawoo","GPIO":[0,0,0,0,140,37,0,0,0,142,141,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"Bawoo","GPIO":[0,0,0,0,140,37,0,0,0,142,141,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/bestek_MRJ10011 b/_templates/bestek_MRJ10011
index 14564dbd5..1e7a4a709 100644
--- a/_templates/bestek_MRJ10011
+++ b/_templates/bestek_MRJ10011
@@ -6,7 +6,7 @@ type: Plug
standard: us
link: https://www.amazon.com/BESTEK-Enabled-Compatible-Required-Anywhere/dp/B07F2Z8GKM
image: https://images-na.ssl-images-amazon.com/images/I/61h3loMrBkL._AC_SL1500_.jpg
-template: '{"NAME":"BestekMRJ1011","GPIO":[0,0,0,0,56,0,0,0,21,17,0,0,0],"FLAG":0,"BASE":1}'
+template: {"NAME":"BestekMRJ1011","GPIO":[0,0,0,0,56,0,0,0,21,17,0,0,0],"FLAG":0,"BASE":1}
link_alt: https://www.walmart.com/ip/BESTEK-MRJ1011-Wifi-Smart-Plug-Compatible-Alexa-Google-Home-Automation-Module-Wireless-Remote-Control-Light-Switch-Wifi-Intelligent-Socket-iOS-Androi/895086428
---
diff --git a/_templates/bestten_LO-2-W2 b/_templates/bestten_LO-2-W2
index 22d75773e..5eae4153d 100644
--- a/_templates/bestten_LO-2-W2
+++ b/_templates/bestten_LO-2-W2
@@ -6,7 +6,7 @@ type: Wall Outlet
standard: us
link: https://www.amazon.ca/gp/product/B07QPZDW28
image: https://images-na.ssl-images-amazon.com/images/I/7147GFysn9L._AC_SL1500_.jpg
-template: '{"NAME":"BESTTEN LO-2-W","GPIO":[17,0,0,0,57,0,0,0,21,56,0,0,0],"FLAG":0,"BASE":1}'
+template: {"NAME":"BESTTEN LO-2-W","GPIO":[17,0,0,0,57,0,0,0,21,56,0,0,0],"FLAG":0,"BASE":1}
link_alt:
---
diff --git a/_templates/bilikay_SP10 b/_templates/bilikay_SP10
index adcbd8174..5e20210c1 100644
--- a/_templates/bilikay_SP10
+++ b/_templates/bilikay_SP10
@@ -6,7 +6,7 @@ type: Plug
standard: eu
link: https://www.gearbest.com/smart-power-socket-plug/pp_009960087679.html
image: https://user-images.githubusercontent.com/5904370/66717348-46ea7480-edd8-11e9-8a97-ed77cc93cb7a.png
-template: '{"NAME":"Bilikay SP10","GPIO":[255,37,255,17,255,255,0,0,255,56,21,255,255],"FLAG":0,"BASE":18}'
+template: {"NAME":"Bilikay SP10","GPIO":[255,37,255,17,255,255,0,0,255,56,21,255,255],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/blitzwolf-bw-lt11 b/_templates/blitzwolf-bw-lt11
index aa4642e0e..cbfebb975 100644
--- a/_templates/blitzwolf-bw-lt11
+++ b/_templates/blitzwolf-bw-lt11
@@ -6,7 +6,7 @@ type: LED Strip
standard: global
link: https://www.banggood.com/BlitzWolf-BW-LT11-2M5M-Smart-APP-Control-RGBW-LED-Light-Strip-Kit-or-1M-Strip-Light-Extension-Plus-p-1390470.html
image: https://user-images.githubusercontent.com/5904370/67769372-a5f4ee00-fa54-11e9-8902-8973c5090094.png
-template: '{"NAME":"BW-LT11 Strip","GPIO":[17,0,0,0,37,40,0,0,38,0,39,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"BW-LT11 Strip","GPIO":[17,0,0,0,37,40,0,0,38,0,39,0,0],"FLAG":0,"BASE":18}
link_alt: https://www.blitzwolf.com/BlitzWolf-BW-LT11-Smart-LED-Light-Strip-with-4000K-Color-Temperature,-RGB-Color,-Works-with-Alexa--Google-Assistant,-APP-Control,-IP44-Water-Resistant-p-310.html
---
diff --git a/_templates/blitzwolf_BW-LT20 b/_templates/blitzwolf_BW-LT20
index 506cf7355..ec7f58b59 100644
--- a/_templates/blitzwolf_BW-LT20
+++ b/_templates/blitzwolf_BW-LT20
@@ -6,7 +6,7 @@ type: Light
standard: global
link: https://www.banggood.com/Blitzwolf-BW-LT20-24W-Smart-LED-Ceiling-Light-Mount-WiFi-APP-Control-Work-with-Amazon-Echo-Google-Home-AC100-240V-p-1508691.html
image: https://imgaz3.staticbg.com/thumb/large/oaupload/banggood/images/06/B5/3b75d6b4-7996-41dd-9cfc-468bfd56aa4a.jpg.webp
-template: '{"NAME":"BW-LT20","GPIO":[0,0,0,0,0,37,0,0,0,38,0,0,0],"FLAG":15,"BASE":18}'
+template: {"NAME":"BW-LT20","GPIO":[0,0,0,0,0,37,0,0,0,38,0,0,0],"FLAG":15,"BASE":18}
link_alt:
---
diff --git a/_templates/blitzwolf_BW-SS1 b/_templates/blitzwolf_BW-SS1
index 9e0b21aaa..ffe749122 100644
--- a/_templates/blitzwolf_BW-SS1
+++ b/_templates/blitzwolf_BW-SS1
@@ -1,12 +1,12 @@
---
date_added: 2019-09-18
title: Blitzwolf BW-SS1
-category: relay
+category: switch
type: Relay
standard: global
link: https://www.banggood.com/BlitzWolf-BW-SS1-3300W-15A-Basic-DIY-WIFI-Wireless-Switch-Smart-Home-APP-Remote-Control-Timer-Module-Socket-Work-with-Amazon-Echo-Google-Home-IFTTT-p-1517584.html?rmmds=search&cur_warehouse=CN
image: https://www.blitzwolf.com/bg_os/other/upload_temp/products/original/201906/1561374437_26.jpg
-template: '{"NAME":"BW-SS1","GPIO":[255,255,255,255,157,21,0,0,255,17,255,255,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"BW-SS1","GPIO":[255,255,255,255,157,21,0,0,255,17,255,255,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/blitzwolf_BW-SS3 b/_templates/blitzwolf_BW-SS3
index f485aba6d..12632bdcd 100644
--- a/_templates/blitzwolf_BW-SS3
+++ b/_templates/blitzwolf_BW-SS3
@@ -6,7 +6,7 @@ type: Switch
standard: eu
link: https://www.banggood.com/BlitzWolf-BW-SS3-EUUS-123-Channel-10A-WIFI-Touch-Remote-Control-Wall-Smart-Home-Switch-Tempered-Glass-Panel-Work-with-Amazon-Alexa-Google-Assistant-p-1582586.html?ID=62813416158105&cur_warehouse=CN
image: https://www.blitzwolf.com/bg_os/other/upload_temp/products/original/201910/1571123579_26.jpg
-template: '{"NAME":"Blitzwolf SS3","GPIO":[158,0,0,10,22,11,0,0,9,21,0,23,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"Blitzwolf SS3","GPIO":[158,0,0,10,22,11,0,0,9,21,0,23,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/blitzwolf_SHP2 b/_templates/blitzwolf_SHP2
index e2fad4928..52574cc6b 100644
--- a/_templates/blitzwolf_SHP2
+++ b/_templates/blitzwolf_SHP2
@@ -5,7 +5,7 @@ type: Plug
standard: eu
link: https://www.blitzwolf.com/3840W-EU-WIFI-Smart-Socket-p-244.html
image: https://user-images.githubusercontent.com/5904370/57949304-524a7a00-78e4-11e9-97df-e90d4aef7604.png
-template: '{"NAME":"BlitzWolf SHP","GPIO":[57,255,56,255,0,134,0,0,131,17,132,21,0],"FLAG":0,"BASE":45}'
+template: {"NAME":"BlitzWolf SHP","GPIO":[57,255,56,255,0,134,0,0,131,17,132,21,0],"FLAG":0,"BASE":45}
link_alt: https://www.aliexpress.com/item/32871562977.html
---
## Attention
diff --git a/_templates/blitzwolf_SHP3 b/_templates/blitzwolf_SHP3
index ea6305357..bbdfaa3eb 100644
--- a/_templates/blitzwolf_SHP3
+++ b/_templates/blitzwolf_SHP3
@@ -6,7 +6,7 @@ type: Plug
standard: us
link: https://www.blitzwolf.com/1200W-US-Dual-WIFI-Smart-Socket-p-294.html
image: https://images-na.ssl-images-amazon.com/images/I/51jB4m6S2IL._SL1200_.jpg
-template: '{"NAME":"Blitzwolf SHP3","GPIO":[56,0,57,0,22,134,0,0,131,18,132,21,17],"FLAG":0,"BASE":45}'
+template: {"NAME":"Blitzwolf SHP3","GPIO":[56,0,57,0,22,134,0,0,131,18,132,21,17],"FLAG":0,"BASE":45}
link_alt: https://www.amazon.com/BlitzWolf-Monitoring-Function-Anywhere-Required/dp/B07GJ6W9L7
---
diff --git a/_templates/blitzwolf_SHP3_alt b/_templates/blitzwolf_SHP3_alt
index 4f4255dd9..0afaa2cb5 100644
--- a/_templates/blitzwolf_SHP3_alt
+++ b/_templates/blitzwolf_SHP3_alt
@@ -6,7 +6,7 @@ type: Plug
standard: us
link: https://www.blitzwolf.com/1200W-US-Dual-WIFI-Smart-Socket-p-294.html
image: https://images-na.ssl-images-amazon.com/images/I/51jB4m6S2IL._SL1200_.jpg
-template: '{"NAME":"Blitzwolf SHP3","GPIO":[18,56,0,131,134,132,0,0,17,0,22,21,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"Blitzwolf SHP3","GPIO":[18,56,0,131,134,132,0,0,17,0,22,21,0],"FLAG":0,"BASE":18}
link_alt: https://www.amazon.com/gp/product/B07GJ6W9L7
---
diff --git a/_templates/blitzwolf_SHP4 b/_templates/blitzwolf_SHP4
index d5936e436..256b4438a 100644
--- a/_templates/blitzwolf_SHP4
+++ b/_templates/blitzwolf_SHP4
@@ -5,7 +5,7 @@ type: Plug
standard: uk
link: https://www.blitzwolf.com/2300W-UK-WIFI-Smart-Socket-p-296.html
image: https://user-images.githubusercontent.com/5904370/57949732-84101080-78e5-11e9-9c70-fdbe0b59b385.png
-template: '{"NAME":"BlitzWolf SHP","GPIO":[57,255,56,255,0,134,0,0,131,17,132,21,0],"FLAG":0,"BASE":45}'
+template: {"NAME":"BlitzWolf SHP","GPIO":[57,255,56,255,0,134,0,0,131,17,132,21,0],"FLAG":0,"BASE":45}
link_alt: https://www.aliexpress.com/item/32931065090.html
---
## Serial Flashing
diff --git a/_templates/blitzwolf_SHP5 b/_templates/blitzwolf_SHP5
index 077507e6b..cb3a7558f 100644
--- a/_templates/blitzwolf_SHP5
+++ b/_templates/blitzwolf_SHP5
@@ -6,7 +6,7 @@ type: Plug
standard: eu
link: https://www.amazon.de/Steckdose-BlitzWolf-intelligente-Erforderlich-kompatibel/dp/B07MNMCBH9/ref=pd_rhf_se_s_cr_simh_0_1/262-8425943-2035967?_encoding=UTF8&pd_rd_i=B07MNMCBH9&pd_rd_r=f9de3ea0-5181-4939-bf99-28c5626c7833&pd_rd_w=fbAUf&pd_rd_wg=F7xPg&pf_rd_p=5cbcab74-6b15-441d-b203-79c1adae5780&pf_rd_r=8S0AK12WGX366YBWDM70&psc=1&refRID=8S0AK12WGX366YBWDM70
image: https://www.blitzwolf.com/bg_os/other/upload_temp/products/original/201902/1550806813_26.jpg
-template: '{"NAME":"SHP5","GPIO":[57,145,56,146,0,22,0,0,0,0,21,0,17],"FLAG":0,"BASE":18}'
+template: {"NAME":"SHP5","GPIO":[57,145,56,146,0,22,0,0,0,0,21,0,17],"FLAG":0,"BASE":18}
link_alt: https://www.blitzwolf.com/BlitzWolf-BW-SHP5-3680W-EU-Wifi-Socket-Smart-Charger-with-Dual-USB-Ports-Compatible-with-French-Standard,-Works-with-Alexa,-Scheduled-Control,-Remote-Control,-Monitor-Power-Use-p-326.html
---
With v6.5.0.14+ Single press switches relay. Double press switches USB power. If inversion is needed execute command `SetOption11 1`
diff --git a/_templates/blitzwolf_SHP6 b/_templates/blitzwolf_SHP6
index 2becee397..81a437692 100644
--- a/_templates/blitzwolf_SHP6
+++ b/_templates/blitzwolf_SHP6
@@ -5,7 +5,7 @@ type: Plug
standard: eu
link: https://www.blitzwolf.com/2300W-EU-WIFI-Smart-Socket-p-300.html
image: https://user-images.githubusercontent.com/5904370/57949586-22e83d00-78e5-11e9-8a4f-c19c843abf99.png
-template: '{"NAME":"BlitzWolf SHP","GPIO":[57,255,56,255,0,134,0,0,131,17,132,21,0],"FLAG":0,"BASE":45}'
+template: {"NAME":"BlitzWolf SHP","GPIO":[57,255,56,255,0,134,0,0,131,17,132,21,0],"FLAG":0,"BASE":45}
link_alt: https://www.aliexpress.com/item/32933098972.html
---
## Serial Flashing
diff --git a/_templates/blitzwolf_SHP7 b/_templates/blitzwolf_SHP7
index f279fc22f..562072415 100644
--- a/_templates/blitzwolf_SHP7
+++ b/_templates/blitzwolf_SHP7
@@ -6,7 +6,7 @@ type: Plug
standard: eu
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?rmmds=myorder&cur_warehouse=CN
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}'
+template: {"NAME":"SHP7","GPIO":[17,158,57,131,134,132,0,0,18,56,21,0,22],"FLAG":0,"BASE":45}
link_alt:
---
diff --git a/_templates/blitzwolf_SHP8 b/_templates/blitzwolf_SHP8
index 65a46fece..3d0c144f8 100644
--- a/_templates/blitzwolf_SHP8
+++ b/_templates/blitzwolf_SHP8
@@ -6,6 +6,6 @@ type: Plug
standard: eu
link: https://www.banggood.com/BlitzWolf-BW-SHP8-3680W-16A-Smart-WIFI-Wall-Outlet-EU-Plug-Socket-Timer-Remote-Control-Power-Monitor-Work-with-Alexa-Google-Assistant-IFTTT-p-1502402.html?cur_warehouse=CN&p=CM27171011078201412U&custlinkid=712612
image: https://www.blitzwolf.com/bg_os/other/upload_temp/products/original/201906/1560341943_26.jpg
-template: '{"NAME":"SHP8","GPIO":[0,56,0,17,134,132,0,0,131,53,21,0,0],"FLAG":0,"BASE":64}'
+template: {"NAME":"SHP8","GPIO":[0,56,0,17,134,132,0,0,131,53,21,0,0],"FLAG":0,"BASE":64}
link_alt:
---
diff --git a/_templates/bn-link_bnc-60 b/_templates/bn-link_bnc-60
index 46546131c..939b0dc89 100644
--- a/_templates/bn-link_bnc-60
+++ b/_templates/bn-link_bnc-60
@@ -6,7 +6,7 @@ type: Plug
standard: us
link: https://www.amazon.com/gp/product/B07HPG58FP/
image: https://user-images.githubusercontent.com/5904370/54481150-5d742180-4831-11e9-8dea-6e1cbf6ef1bd.png
-template: '{"NAME":"BNC-60/U133TJ","GPIO":[0,56,0,17,134,132,0,0,131,57,21,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"BNC-60/U133TJ","GPIO":[0,56,0,17,134,132,0,0,131,57,21,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/bneta_A60_E27 b/_templates/bneta_A60_E27
index 66318002b..d7c1d6354 100644
--- a/_templates/bneta_A60_E27
+++ b/_templates/bneta_A60_E27
@@ -1,12 +1,12 @@
---
date_added: 2019-09-13
-title: BNeta IO-WIFI60-E27P 8.5W RGB+CCT
-category: light
-type: Bulb
+title: BNeta IO-WIFI60-E27P 8.5W
+type: RGBCCT
+category: bulb
standard: E27
link: https://www.bneta.co.za/product/smartbulb_e27/
image: http://www.bneta.co.za/wp-content/uploads/2019/03/E27app.png
-template: '{"NAME":"OM60/RGBW","GPIO":[0,0,0,0,140,37,0,0,38,142,141,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"OM60/RGBW","GPIO":[0,0,0,0,140,37,0,0,38,142,141,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/bneta_GU10 b/_templates/bneta_GU10
index 7d61893c4..c5a8fd61c 100644
--- a/_templates/bneta_GU10
+++ b/_templates/bneta_GU10
@@ -1,12 +1,12 @@
---
date_added: 2019-09-13
-title: BNeta IO-WIFI-GU10 4.5W RGB+W
-category: light
-type: Bulb
+title: BNeta IO-WIFI-GU10 4.5W
+type: RGBW
+category: bulb
standard: GU10
link: https://www.bneta.co.za/product/smartbulb_gu10/
image: http://www.bneta.co.za/wp-content/uploads/2019/03/GU10app.png
-template: '{"NAME":"BNeta","GPIO":[0,0,0,0,140,37,0,0,38,142,141,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"BNeta","GPIO":[0,0,0,0,140,37,0,0,38,142,141,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/bomcosy_7W b/_templates/bomcosy_7W
index a830f12d4..8b86cfbcb 100644
--- a/_templates/bomcosy_7W
+++ b/_templates/bomcosy_7W
@@ -1,14 +1,14 @@
---
date_added: 2019-07-20
-title: Bomcosy 7W RGB+CCT
-category: light
-type: Bulb
+title: Bomcosy 7W
+type: RGBCCT
+category: bulb
standard:
- E27
- B22
link: https://www.amazon.de/dp/B07DRGDP2T/
image: https://user-images.githubusercontent.com/5904370/66716276-fc62fb00-edcb-11e9-85e1-dd441e439c64.png
-template: '{"NAME":"Generic","GPIO":[0,0,0,0,37,40,0,0,38,41,39,0,0],"FLAG":1,"BASE":18}'
+template: {"NAME":"Generic","GPIO":[0,0,0,0,37,40,0,0,38,41,39,0,0],"FLAG":1,"BASE":18}
link_alt:
---
diff --git a/_templates/brilliant_20699 b/_templates/brilliant_20699
index e945d696a..662e08ec7 100644
--- a/_templates/brilliant_20699
+++ b/_templates/brilliant_20699
@@ -1,14 +1,14 @@
---
date_added: 2019-11-18
-title: Brilliant 9W RGB+W
-category: light
-type: Bulb
+title: Brilliant 9W
+type: RGBW
+category: bulb
standard:
- E27
- B22
link: https://www.brilliantsmart.com.au/smart-products/lighting/smart-globe-rgb/
image: https://www.brilliantsmart.com.au/wp-content/uploads/2019/03/20699-1.jpg
-template: '{"NAME":"Brilliant20699","GPIO":[0,0,0,0,141,140,0,0,37,142,0,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"Brilliant20699","GPIO":[0,0,0,0,141,140,0,0,37,142,0,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/brilliant_2070206 b/_templates/brilliant_2070206
index 89f82e595..a4c0d5b13 100644
--- a/_templates/brilliant_2070206
+++ b/_templates/brilliant_2070206
@@ -6,7 +6,7 @@ type: Light
standard: anzac
link: https://www.brilliantsmart.com.au/smart-products/garden/smart-garden-kit/
image: https://www.brilliantsmart.com.au/wp-content/uploads/2019/03/20702-06.jpg
-template: '{"NAME":"Brilliant Gard","GPIO":[0,0,0,0,37,0,0,0,38,0,39,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"Brilliant Gard","GPIO":[0,0,0,0,37,0,0,0,38,0,39,0,0],"FLAG":0,"BASE":18}
link_alt: https://www.mjselectricalsupplies.com.au/brilliant-smart-wifi-rgb-garden-light-kit?gclid=CjwKCAjw_uDsBRAMEiwAaFiHa56fOPFWol4XLby12CW-0MB6Cqy3_XDvC23Oifg7TpUIhyLdJ0meExoCiAMQAvD_BwE
---
diff --git a/_templates/brilliant_20741 b/_templates/brilliant_20741
index 1cb818fe1..60e4c953b 100644
--- a/_templates/brilliant_20741
+++ b/_templates/brilliant_20741
@@ -1,14 +1,14 @@
---
date_added: 2019-10-01
-title: Brilliant 9W RGB+W
-category: light
-type: Bulb
+title: Brilliant 9W
+type: RGBW
+category: bulb
standard:
- E27
- B22
link: https://www.brilliantsmart.com.au/smart-products/lighting/smart-globe-rgb/
image: https://www.brilliantsmart.com.au/wp-content/uploads/2019/03/20698-1.jpg
-template: '{"NAME":"Brilliant RGB+","GPIO":[0,0,0,0,37,40,0,0,38,0,39,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"Brilliant RGB+","GPIO":[0,0,0,0,37,40,0,0,38,0,39,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/brilliant_20743 b/_templates/brilliant_20743
index 39b79dc28..17346a80a 100644
--- a/_templates/brilliant_20743
+++ b/_templates/brilliant_20743
@@ -6,7 +6,7 @@ type: LED Strip
standard: anzac
link: https://www.brilliantsmart.com.au/smart-products/lighting/smart-strip-2m/
image: http://offers.kd2.org/pics/b7/25/b7254fae3dcce1e6361a26966d86ec15ac8dff72.jpg
-template: '{"NAME":"BrilliantStrip","GPIO":[17,0,0,0,37,40,0,0,38,0,39,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"BrilliantStrip","GPIO":[17,0,0,0,37,40,0,0,38,0,39,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/brilliant_BL20925 b/_templates/brilliant_BL20925
index 299f9b02b..abe3a1c5a 100644
--- a/_templates/brilliant_BL20925
+++ b/_templates/brilliant_BL20925
@@ -6,7 +6,7 @@ type: Plug
standard: anzac
link: https://www.officeworks.com.au/shop/officeworks/p/brilliant-lighting-smart-wifi-plug-with-energy-monitoring-bl20925
image: https://user-images.githubusercontent.com/5904370/68767389-e93c8880-0620-11ea-8738-f6125c158932.png
-template: '{"NAME":"BL20925","GPIO":[0,0,0,17,133,132,0,0,131,158,21,0,0],"FLAG":0,"BASE":52}'
+template: {"NAME":"BL20925","GPIO":[0,0,0,17,133,132,0,0,131,158,21,0,0],"FLAG":0,"BASE":52}
link_alt:
---
diff --git a/_templates/brilliant_HK17653S72 b/_templates/brilliant_HK17653S72
index cc2282654..8a3008d97 100644
--- a/_templates/brilliant_HK17653S72
+++ b/_templates/brilliant_HK17653S72
@@ -1,12 +1,12 @@
---
date_added: 2019-10-05
-title: Brilliant HK17653S72 4.5W RGB+W
-category: light
-type: Bulb
+title: Brilliant HK17653S72 4.5W
+type: RGBW
+category: bulb
standard: E14
link: https://www.hornbach.ch/shop/Ampoule-LED-E14-4-5W-350lm-en-forme-de-bougie/4685737/article.html
image: https://www.hornbach.ch/data/shop/D04/001/780/491/515/917/DV_8_4685737_01_4c_DE_20190411114657.jpg
-template: '{"NAME":"Brilliant E14 ","GPIO":[0,0,0,0,37,40,0,0,38,0,39,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"Brilliant E14 ","GPIO":[0,0,0,0,37,40,0,0,38,0,39,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/brilliant_downlight b/_templates/brilliant_downlight
index 3676f0766..056a1ab09 100644
--- a/_templates/brilliant_downlight
+++ b/_templates/brilliant_downlight
@@ -6,7 +6,7 @@ type: Light
standard: anzac
link: https://www.brilliantsmart.com.au/smart-products/lighting/smart-trilogy/
image: https://www.brilliantsmart.com.au/wp-content/uploads/2019/03/20695-05.jpg
-template: '{"NAME":"SmartCCTDwnLgt","GPIO":[0,0,0,0,0,37,0,0,0,38,0,0,0],"FLAG":0,"BASE":48}'
+template: {"NAME":"SmartCCTDwnLgt","GPIO":[0,0,0,0,0,37,0,0,0,38,0,0,0],"FLAG":0,"BASE":48}
link_alt:
---
diff --git a/_templates/brilliant_plug b/_templates/brilliant_plug
index 2d379f614..9bc9f66bf 100644
--- a/_templates/brilliant_plug
+++ b/_templates/brilliant_plug
@@ -6,7 +6,7 @@ type: Plug
standard: anzac
link: https://www.bunnings.com.au/brilliant-smart-wifi-plug-and-usb-charger_p0091644
image: https://2ecffd01e1ab3e9383f0-07db7b9624bbdf022e3b5395236d5cf8.ssl.cf4.rackcdn.com/Product-800x800/c5218415-c9d2-4797-be3e-617fceaa27c9.png
-template: '{"NAME":"Brilliant","GPIO":[0,0,0,0,0,21,0,0,0,52,90,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"Brilliant","GPIO":[0,0,0,0,0,21,0,0,0,52,90,0,0],"FLAG":0,"BASE":18}
link_alt:
---
Wifi Smart plug with USB phone charging port, I believe this is the exact same model as the Mirabella Genio Plug. Purchased at bunnings I used tuya converter project to flash the firmware without opening anything and switch is now working with my Home assistant and working magically with homekit and Siri.
diff --git a/_templates/brizlabs_4_5W_E14 b/_templates/brizlabs_4_5W_E14
index 0a5c31a2c..51c9d1baf 100644
--- a/_templates/brizlabs_4_5W_E14
+++ b/_templates/brizlabs_4_5W_E14
@@ -1,12 +1,12 @@
---
date_added: 2019-11-17
-title: BrizLabs 4.5W RGB+W
-category: light
-type: Bulb
+title: BrizLabs 4.5W
+type: RGBW
+category: bulb
standard: E14
link: https://www.amazon.de/gp/product/B07KZVWVVG
image: https://images-na.ssl-images-amazon.com/images/I/51qw7dhkOKL._SL1000_.jpg
-template: '{"NAME":"BrizLabs E14","GPIO":[0,0,0,0,37,40,0,0,38,0,39,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"BrizLabs E14","GPIO":[0,0,0,0,37,40,0,0,38,0,39,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/brizlabs_EBE-SHW03 b/_templates/brizlabs_EBE-SHW03
index 598a287ea..dbd2e4d47 100644
--- a/_templates/brizlabs_EBE-SHW03
+++ b/_templates/brizlabs_EBE-SHW03
@@ -1,12 +1,12 @@
---
date_added: 2019-11-13
-title: BrizLabs EBE-SHW03 4.5W RGB+W
-category: light
-type: Bulb
+title: BrizLabs EBE-SHW03 4.5W
+type: RGBW
+category: bulb
standard: GU10
link: https://www.amazon.de/gp/product/B07KZN74YJ
image: https://images-na.ssl-images-amazon.com/images/I/51nlRnyL2%2BL._AC_SL1000_.jpg
-template: '{"NAME":"BrizLabs","GPIO":[0,0,0,0,140,37,0,0,0,142,141,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"BrizLabs","GPIO":[0,0,0,0,140,37,0,0,0,142,141,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/bsd25 b/_templates/bsd25
index 90e58a094..321034b45 100644
--- a/_templates/bsd25
+++ b/_templates/bsd25
@@ -6,7 +6,7 @@ type: Plug
standard: eu
link: https://www.aliexpress.com/item/32957842763.html
image: https://user-images.githubusercontent.com/5904370/66717187-7d26f480-edd6-11e9-996a-ee2f3f86e3c0.png
-template: '{"NAME":"Tuya Wifi Plug","GPIO":[255,255,255,255,56,255,0,0,21,17,255,255,255],"FLAG":0,"BASE":18}'
+template: {"NAME":"Tuya Wifi Plug","GPIO":[255,255,255,255,56,255,0,0,21,17,255,255,255],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/bsd29 b/_templates/bsd29
index 24aa26a32..cc255515b 100644
--- a/_templates/bsd29
+++ b/_templates/bsd29
@@ -5,7 +5,7 @@ type: Plug
standard: uk
link: https://shopee.sg/product/74752093/1598782874
image: https://cf.shopee.sg/file/35f8a14723f7364ad361c645d007f23b
-template: '{"NAME":"BSD29","GPIO":[0,0,0,131,134,132,0,0,21,17,56,0,0],"FLAG":0,"BASE":52}'
+template: {"NAME":"BSD29","GPIO":[0,0,0,131,134,132,0,0,21,17,56,0,0],"FLAG":0,"BASE":52}
link_alt:
---
diff --git a/_templates/bsd33 b/_templates/bsd33
index 79753ca3b..04bd50600 100644
--- a/_templates/bsd33
+++ b/_templates/bsd33
@@ -6,7 +6,7 @@ type: Plug
standard: eu
link: https://www.aliexpress.com/item/4000037102284.html
image: https://ae01.alicdn.com/kf/Hc5d2ec3f296c4192a1fbe474cabd6562C/10A-16A-EU-wifi-Smart-Plug-with-Power-Monitor-wifi-wireless-Smart-Socket-Outlet-with-Google.jpg
-template: '{"NAME":"Generic","GPIO":[255,255,255,131,134,132,0,0,21,17,56,255,255],"FLAG":0,"BASE":18}'
+template: {"NAME":"Generic","GPIO":[255,255,255,131,134,132,0,0,21,17,56,255,255],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/canwing_cw-001 b/_templates/canwing_cw-001
index ba87a417f..b6abd4283 100644
--- a/_templates/canwing_cw-001
+++ b/_templates/canwing_cw-001
@@ -1,12 +1,12 @@
---
date_added: 2019-03-13
title: Canwing CW-001
-category: relay
+category: switch
type: Relay
standard: global
link: https://www.aliexpress.com/item/Smart-Home-WiFi-Wireless-Switch-Module-For-Apple-For-Android-APP-Control-Smart-Switch-Remote-Control/32970656459.html
image: https://user-images.githubusercontent.com/42893315/52245571-75778d80-28e2-11e9-8b0f-d1fd4d579690.jpg
-template: '{"NAME":"Canwing CW-001","GPIO":[17,255,0,255,0,0,0,0,21,56,0,0,0],"FLAG":0,"BASE":1}'
+template: {"NAME":"Canwing CW-001","GPIO":[17,255,0,255,0,0,0,0,21,56,0,0,0],"FLAG":0,"BASE":1}
link_alt: https://www.ebay.de/itm/Smart-Wifi-Schalter-Smart-Home-Switch-Modul-1000W-5A-fur-iOS-Android-APP-Ctrl/264061867388
---
## General:
diff --git a/_templates/ce_la-wf3 b/_templates/ce_la-wf3
index 02e342ac6..f1dc2d43f 100644
--- a/_templates/ce_la-wf3
+++ b/_templates/ce_la-wf3
@@ -5,7 +5,7 @@ type: Plug
standard: us
link: https://www.costco.ca/Wi-Fi-Smart-Plug%2C-2-pack.product.100417575.html
image: https://user-images.githubusercontent.com/5904370/54649866-2a899200-4aac-11e9-93be-e1ae3d4c48be.png
-template: '{"NAME":"CE LA-WF3","GPIO":[0,0,0,0,56,57,0,0,21,17,0,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"CE LA-WF3","GPIO":[0,0,0,0,56,57,0,0,21,17,0,0,0],"FLAG":0,"BASE":18}
link_alt:
---
Simple and compact Wifi Plug, internal module Tuya TYWE2S
diff --git a/_templates/ce_power_stake b/_templates/ce_power_stake
index faa8ed5f0..533efcb17 100644
--- a/_templates/ce_power_stake
+++ b/_templates/ce_power_stake
@@ -6,7 +6,7 @@ type: Power Strip
standard: us
link: https://www.amazon.com/Wi-Fi-Smart-Outdoor-outlets-Compatible/dp/B07M83WG1J
image: https://user-images.githubusercontent.com/5904370/54647111-aaf6c580-4aa1-11e9-8da2-fab79ef32e4e.png
-template: '{"NAME":"CE Power Stake","GPIO":[0,0,0,0,56,57,0,0,21,17,0,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"CE Power Stake","GPIO":[0,0,0,0,56,57,0,0,21,17,0,0,0],"FLAG":0,"BASE":18}
alt_link: https://www.ebay.com/itm/CE-Wi-Fi-Smart-Home-Outdoor-Garden-Power-Stake-iOS-Android-Remote-Control/143177384799
---
### Connection
diff --git a/_templates/ce_smart_home-WF500D b/_templates/ce_smart_home-WF500D
index dd7214529..e668eb07b 100644
--- a/_templates/ce_smart_home-WF500D
+++ b/_templates/ce_smart_home-WF500D
@@ -6,7 +6,7 @@ type: Dimmer
standard: us
link: https://www.amazon.ca/2-Pack-Dimmer-Switch-Compatible-Assistant/dp/B07GQ3H8VK
image: https://i.ibb.co/nQK6hwD/image-Service.jpg
-template: '{"NAME":"CE-WF500D","GPIO":[255,255,255,255,255,255,0,0,255,108,255,107,255],"FLAG":0,"BASE":54}'
+template: {"NAME":"CE-WF500D","GPIO":[255,255,255,255,255,255,0,0,255,108,255,107,255],"FLAG":0,"BASE":54}
link_alt: https://www.cesmarthome.com/WF500D.html
---
Steps needed on Tasmota build v6.6.0.10 or later
diff --git a/_templates/ce_smart_home_LA-2-W3 b/_templates/ce_smart_home_LA-2-W3
index f92d7b742..c4eb11717 100644
--- a/_templates/ce_smart_home_LA-2-W3
+++ b/_templates/ce_smart_home_LA-2-W3
@@ -6,7 +6,7 @@ type: Wall Outlet
standard: us
link: https://www.costco.ca/ce-smart-home-wi-fi-receptacle%2C-2-pack.product.100475520.html
image: https://user-images.githubusercontent.com/5904370/68096689-ce487680-feb2-11e9-8f9b-a84bf7d19766.png
-template: '{"NAME":"CE Smart Wall","GPIO":[255,255,255,255,157,17,0,0,21,255,255,255,255],"FLAG":15,"BASE":18}'
+template: {"NAME":"CE Smart Wall","GPIO":[255,255,255,255,157,17,0,0,21,255,255,255,255],"FLAG":15,"BASE":18}
link_alt: https://www.cesmarthome.com/LA-2-W3.html
---
diff --git a/_templates/ce_smart_home_LTS-6A-W5 b/_templates/ce_smart_home_LTS-6A-W5
index 07ffd7067..b9a8ce1b0 100644
--- a/_templates/ce_smart_home_LTS-6A-W5
+++ b/_templates/ce_smart_home_LTS-6A-W5
@@ -6,7 +6,7 @@ type: Power Strip
standard: us
link: https://www.costco.ca/CE-Smart-Home-Wi-Fi-Power-Strip-with-Surge-Protection.product.100486668.html
image: https://www.cesmarthome.com/assets/img/product_images/LTS-6A-W5/LTS-6A-W5_1.jpg
-template: '{"NAME":"CE Power Strip","GPIO":[52,0,0,0,22,21,0,0,24,23,25,26,17],"FLAG":0,"BASE":18}'
+template: {"NAME":"CE Power Strip","GPIO":[52,0,0,0,22,21,0,0,24,23,25,26,17],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/century_aoke b/_templates/century_aoke
index 619781564..bde474e8d 100644
--- a/_templates/century_aoke
+++ b/_templates/century_aoke
@@ -1,12 +1,12 @@
---
date_added: 2019-10-24
title: Century Aoke
-category: relay
+category: switch
type: Relay
standard: global
link: https://www.aliexpress.com/item/33009783089.html
image: https://ae01.alicdn.com/kf/HTB1E8HUSNnaK1RjSZFBq6AW7VXae.jpg
-template: '{"NAME":"CenturyAoke","GPIO":[255,255,255,255,21,255,0,0,17,56,255,255,255],"FLAG":0,"BASE":18}'
+template: {"NAME":"CenturyAoke","GPIO":[255,255,255,255,21,255,0,0,17,56,255,255,255],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/cocoon_DY180363-B b/_templates/cocoon_DY180363-B
index 6d4f9bc42..f772230d5 100644
--- a/_templates/cocoon_DY180363-B
+++ b/_templates/cocoon_DY180363-B
@@ -1,14 +1,14 @@
---
date_added: 2019-11-05
-title: Cocoon DY180363-B 8W RGB+WW
-category: light
-type: Bulb
+title: Cocoon DY180363-B 8W
+type: RGBW
+category: bulb
standard:
- E27
- B22
link: https://www.aldi.com.au
image: https://user-images.githubusercontent.com/5904370/68201033-50bf5c00-ffc1-11e9-9cfa-8c4ee2c51405.png
-template: '{"NAME":"Cocoon RGBW","GPIO":[0,0,0,0,37,40,0,0,38,0,39,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"Cocoon RGBW","GPIO":[0,0,0,0,37,40,0,0,38,0,39,0,0],"FLAG":0,"BASE":18}
link_alt: https://cocoonproducts.com.au/cocoonconnect/smart-wi-fi-light-bulbs/
---
diff --git a/_templates/cocoon_smart_led_strip b/_templates/cocoon_smart_led_strip
index a459adf3c..c835c2ba8 100644
--- a/_templates/cocoon_smart_led_strip
+++ b/_templates/cocoon_smart_led_strip
@@ -6,7 +6,7 @@ type: LED Strip
standard: anzac
link: https://cocoonproducts.com.au/cocoonconnect/smart-led-light-strip/
image: https://user-images.githubusercontent.com/5904370/69321314-21f0e900-0c43-11ea-89a9-9ec871183c12.png
-template: '{"NAME":"Cocoon Smart","GPIO":[0,0,0,0,37,0,0,0,38,0,39,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"Cocoon Smart","GPIO":[0,0,0,0,37,0,0,0,38,0,39,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/conico_SM-PW70 b/_templates/conico_SM-PW70
index 592ba6b7c..9f584b1ca 100644
--- a/_templates/conico_SM-PW70
+++ b/_templates/conico_SM-PW70
@@ -6,7 +6,7 @@ type: Plug
standard: us
link: https://www.amazon.com/Conico-Assistant-Wireless-Schedule-Required/dp/B07Q3DBXP8
image: https://images-na.ssl-images-amazon.com/images/I/61fl1U62dAL._SL1500_.jpg
-template: '{"NAME":"Conico SM-PW70","GPIO":[0,0,0,0,56,57,0,0,21,17,0,0,0],"FLAG":1,"BASE":18}'
+template: {"NAME":"Conico SM-PW70","GPIO":[0,0,0,0,56,57,0,0,21,17,0,0,0],"FLAG":1,"BASE":18}
link_alt:
---
diff --git a/_templates/coosa b/_templates/coosa
index 4d99bf7b9..5cb9fe13e 100644
--- a/_templates/coosa
+++ b/_templates/coosa
@@ -6,7 +6,7 @@ type: Plug
standard: eu
link: https://www.amazon.de/angeschlossen-Intelligente-Steckdose-Geb%C3%A4udetechnik-Smartphones/dp/B073VNS6RQ
image: https://images-na.ssl-images-amazon.com/images/I/51XLQw8AHSL._AC_SL1000_.jpg
-template: '{"NAME":"COOSA","GPIO":[0,0,0,0,57,52,0,0,21,17,255,0,0],"FLAG":0,"BASE":1}'
+template: {"NAME":"COOSA","GPIO":[0,0,0,0,57,52,0,0,21,17,255,0,0],"FLAG":0,"BASE":1}
link_alt:
---
diff --git a/_templates/coosa_SP1 b/_templates/coosa_SP1
index ef193a101..464d244aa 100644
--- a/_templates/coosa_SP1
+++ b/_templates/coosa_SP1
@@ -6,7 +6,7 @@ type: Plug
standard: eu
link: https://www.amazon.de/gp/product/B077RTJJH1
image: https://user-images.githubusercontent.com/5904370/66717237-f45c8880-edd6-11e9-80a9-d91b9a829a1b.png
-template: '{"NAME":"COOSA SP1","GPIO":[57,255,56,255,0,134,0,0,131,17,132,21,0],"FLAG":0,"BASE":45}'
+template: {"NAME":"COOSA SP1","GPIO":[57,255,56,255,0,134,0,0,131,17,132,21,0],"FLAG":0,"BASE":45}
link_alt:
---
diff --git a/_templates/crazylynx_wifi b/_templates/crazylynx_wifi
index 8caec33e9..8d67434e1 100644
--- a/_templates/crazylynx_wifi
+++ b/_templates/crazylynx_wifi
@@ -6,7 +6,7 @@ type: Plug
standard: us
link: https://smile.amazon.com/Wifi-Smart-Plug-CrazyLynX-Compatibles/dp/B075D31RYP/ref=cm_cr_arp_d_product_top?ie=UTF8
image: https://images-na.ssl-images-amazon.com/images/I/51Pyy%2BzEejL._SL1001_.jpg
-template: '{"NAME":"CrazyLynX","GPIO":[255,255,255,255,57,56,0,0,21,17,255,255,255],"FLAG":1,"BASE":18}'
+template: {"NAME":"CrazyLynX","GPIO":[255,255,255,255,57,56,0,0,21,17,255,255,255],"FLAG":1,"BASE":18}
link_alt:
---
diff --git a/_templates/cyyltd_bifans_J23 b/_templates/cyyltd_bifans_J23
index c20e468b5..3196971f4 100644
--- a/_templates/cyyltd_bifans_J23
+++ b/_templates/cyyltd_bifans_J23
@@ -6,7 +6,7 @@ type: Plug
standard: us
link: https://www.amazon.com/gp/product/B078H4SNST
image: https://images-na.ssl-images-amazon.com/images/I/61I%2BXEFBszL._AC_SL1500_.jpg
-template: '{"NAME":"CYYLTD BIFANS J23","GPIO":[56,0,0,0,0,0,0,0,21,17,0,0,0],"FLAG":1,"BASE":18}'
+template: {"NAME":"CYYLTD BIFANS J23","GPIO":[56,0,0,0,0,0,0,0,21,17,0,0,0],"FLAG":1,"BASE":18}
link_alt:
---
diff --git a/_templates/delock_11826 b/_templates/delock_11826
index c90136202..670222c14 100644
--- a/_templates/delock_11826
+++ b/_templates/delock_11826
@@ -6,7 +6,7 @@ type: Plug
standard: eu
link: https://www.delock.com/produkte/H/11826/merkmale.html
image: https://bilder.tragant.de/produkte/orig/5cd3e170704344.60311973.jpg
-template: '{"NAME":"Delock 11826","GPIO":[17,0,0,0,0,0,0,0,21,56,0,0,0],"FLAG":0,"BASE":1}'
+template: {"NAME":"Delock 11826","GPIO":[17,0,0,0,0,0,0,0,21,56,0,0,0],"FLAG":0,"BASE":1}
link_alt:
---
diff --git a/_templates/deltaco_SH-LE14W b/_templates/deltaco_SH-LE14W
index ade901c09..91036a09c 100644
--- a/_templates/deltaco_SH-LE14W
+++ b/_templates/deltaco_SH-LE14W
@@ -1,12 +1,12 @@
---
date_added: 2019-11-23
-title: Deltaco SH-LE14W 5W CCT
-category: light
-type: Bulb
+title: Deltaco SH-LE14W 5W
+type: CCT
+category: bulb
standard: E14
link: https://www.webhallen.com/se/product/309662-Deltaco-Smart-Bulb-E14-White
image: https://www.deltaco.se/sites/cdn/PublishingImages/Products/SH-LE14W.png?width=260
-template: '{"NAME":"SH-LE14W","GPIO":[0,0,0,0,0,140,0,0,38,0,37,142,141],"FLAG":0,"BASE":18}'
+template: {"NAME":"SH-LE14W","GPIO":[0,0,0,0,0,140,0,0,38,0,37,142,141],"FLAG":0,"BASE":18}
link_alt: https://www.deltaco.se/produkter/deltaco/smart-home/belysning/SH-LE14W
---
diff --git a/_templates/deltaco_SH-LE27RGB b/_templates/deltaco_SH-LE27RGB
index 15d8b4d33..099690516 100644
--- a/_templates/deltaco_SH-LE27RGB
+++ b/_templates/deltaco_SH-LE27RGB
@@ -1,12 +1,12 @@
---
date_added: 2019-12-01
-title: Deltaco SH-LE27RGB 9W RGB
-category: light
-type: Bulb
+title: Deltaco SH-LE27RGB 9W
+type: RGB
+category: bulb
standard: E27
link: https://www.deltaco.se/produkter/deltaco/smart-home/belysning/SH-LE27RGB
image: https://www.deltaco.se/sites/cdn/PublishingImages/Products/SH-LE27RGB.png?width=260
-template: '{"NAME":"SH-LE27RGB","GPIO":[0,0,0,0,38,37,0,0,41,39,40,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"SH-LE27RGB","GPIO":[0,0,0,0,38,37,0,0,41,39,40,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/deltaco_SH-LE27W b/_templates/deltaco_SH-LE27W
index 8e6bafe7c..10bacfbac 100644
--- a/_templates/deltaco_SH-LE27W
+++ b/_templates/deltaco_SH-LE27W
@@ -1,12 +1,12 @@
---
date_added: 2019-11-23
-title: Deltaco SH-LE27W 9W CCT
-category: light
-type: Bulb
+title: Deltaco SH-LE27W 9W
+type: CCT
+category: bulb
standard: E27
link: https://www.webhallen.com/se/product/309664-Deltaco-Smart-Bulb-E27-White
image: https://www.deltaco.se/sites/cdn/PublishingImages/Products/SH-LE27W.png?width=260
-template: '{"NAME":"SH-LE27W","GPIO":[0,0,0,0,0,140,0,0,38,0,37,142,141],"FLAG":0,"BASE":18}'
+template: {"NAME":"SH-LE27W","GPIO":[0,0,0,0,0,140,0,0,38,0,37,142,141],"FLAG":0,"BASE":18}
link_alt: https://www.deltaco.se/produkter/deltaco/smart-home/belysning/SH-LE27W
---
diff --git a/_templates/deltaco_SH-P01 b/_templates/deltaco_SH-P01
index 7af29e4ea..f025a74d7 100644
--- a/_templates/deltaco_SH-P01
+++ b/_templates/deltaco_SH-P01
@@ -6,7 +6,7 @@ type: Plug
standard: eu
link: https://www.deltaco.se/produkter/deltaco/smart-home/grenuttag/SH-P01
image: https://www.deltaco.se/sites/cdn/PublishingImages/Products/SH-P01.png?width=260
-template: '{"NAME":"DELTACO SH-P01","GPIO":[0,0,0,0,0,56,0,0,21,17,0,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"DELTACO SH-P01","GPIO":[0,0,0,0,0,56,0,0,21,17,0,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/deltaco_SH-P01E b/_templates/deltaco_SH-P01E
index 991da40ee..2991daadd 100644
--- a/_templates/deltaco_SH-P01E
+++ b/_templates/deltaco_SH-P01E
@@ -6,6 +6,6 @@ type: Plug
standard: eu
link: https://www.deltaco.se/produkter/deltaco/smart-home/grenuttag/SH-P01E
image: https://www.deltaco.se/sites/cdn/PublishingImages/Products/SH-P01E.png?width=260
-template: '{"NAME":"DELTACO SH-P01","GPIO":[0,0,0,0,0,56,0,0,21,17,0,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"DELTACO SH-P01","GPIO":[0,0,0,0,0,56,0,0,21,17,0,0,0],"FLAG":0,"BASE":18}
link_alt: https://www.webhallen.com/se/product/309650-Deltaco-WiFi-Smart-Plug-Energiovervakning-10A
---
diff --git a/_templates/deltaco_SH-P02 b/_templates/deltaco_SH-P02
index 42e59cded..13748691a 100644
--- a/_templates/deltaco_SH-P02
+++ b/_templates/deltaco_SH-P02
@@ -6,7 +6,7 @@ type: Plug
standard: eu
link: https://www.webhallen.com/se/product/309651-Deltaco-WiFi-Smart-Plug-2-Way-Outlet-Energiovervakning-10A
image: https://www.deltaco.se/sites/cdn/PublishingImages/Products/SH-P02.png?width=260
-template: '{"NAME":"SH-P02","GPIO":[18,0,0,0,134,132,0,0,131,56,21,22,17],"FLAG":0,"BASE":18}'
+template: {"NAME":"SH-P02","GPIO":[18,0,0,0,134,132,0,0,131,56,21,22,17],"FLAG":0,"BASE":18}
link_alt: https://www.deltaco.se/produkter/deltaco/smart-home/grenuttag/SH-P02
---
diff --git a/_templates/deta_6912HA b/_templates/deta_6912HA
index 4ee53cce6..e99b48a34 100644
--- a/_templates/deta_6912HA
+++ b/_templates/deta_6912HA
@@ -6,7 +6,7 @@ type: Switch
standard: anzac
link: https://www.bunnings.com.au/deta-smart-double-gang-light-switch-touch-activated-with-grid-connect_p0098812
image: https://2ecffd01e1ab3e9383f0-07db7b9624bbdf022e3b5395236d5cf8.ssl.cf4.rackcdn.com/Product-1600x1600/ee76781a-1398-4a77-87ef-3091c1de7d45.jpg
-template: '{"NAME":"DETA 2G Switch","GPIO":[0,0,0,0,157,0,0,0,91,21,22,0,90],"FLAG":0,"BASE":18}'
+template: {"NAME":"DETA 2G Switch","GPIO":[0,0,0,0,157,0,0,0,91,21,22,0,90],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/deta_6922HA b/_templates/deta_6922HA
index 4c28581ad..692e1ddfb 100644
--- a/_templates/deta_6922HA
+++ b/_templates/deta_6922HA
@@ -6,7 +6,7 @@ type: Wall Outlet
standard: anzac
link: https://www.bunnings.com.au/deta-smart-double-power-point-touch-activated-switch-with-grid-connect_p0098813
image: https://2ecffd01e1ab3e9383f0-07db7b9624bbdf022e3b5395236d5cf8.ssl.cf4.rackcdn.com/Product-1600x1600/0052c529-ef64-4075-b441-29ec04e08d6d.jpg
-template: '{"NAME":"DETA 2G GPO","GPIO":[0,0,0,17,157,0,0,0,91,21,22,0,90],"FLAG":0,"BASE":18}'
+template: {"NAME":"DETA 2G GPO","GPIO":[0,0,0,17,157,0,0,0,91,21,22,0,90],"FLAG":0,"BASE":18}
link_alt: https://www.bunnings.com.au/deta-smart-double-power-point-touch-activated-switch-with-grid-connect_p0098813
---
diff --git a/_templates/deta_6930HA b/_templates/deta_6930HA
index 17444e403..f38c4d194 100644
--- a/_templates/deta_6930HA
+++ b/_templates/deta_6930HA
@@ -6,7 +6,7 @@ type: Plug
standard: anzac
link: https://www.bunnings.com.au/deta-smart-rewireable-plug-with-grid-connect_p0098810
image: https://media.bunnings.com.au/Product-800x800/09a8ffe1-ceac-456d-9bb4-58bbead2f489.jpg
-template: '{"NAME":"DetaSmartPlug","GPIO":[0,17,0,0,0,0,0,0,0,56,21,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"DetaSmartPlug","GPIO":[0,17,0,0,0,0,0,0,0,56,21,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/dgm_L-WT9W1 b/_templates/dgm_L-WT9W1
index 7e0956743..eb82dd08d 100644
--- a/_templates/dgm_L-WT9W1
+++ b/_templates/dgm_L-WT9W1
@@ -1,12 +1,12 @@
---
date_added: 2019-10-05
-title: DGM L-WT9W1 9W CCT
-category: light
-type: Bulb
+title: DGM L-WT9W1 9W
+type: CCT
+category: bulb
standard: E27
link: https://allegro.pl/oferta/zarowka-dgm-l-wt9w1-led-smart-800lm-6500k-8629411028
image: https://linkart.eu/wp-content/uploads/2019/08/zarowkasmart-259x300.jpg
-template: '{"NAME":"DGM L-WT9W1","GPIO":[0,0,0,0,140,142,0,0,38,37,141,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"DGM L-WT9W1","GPIO":[0,0,0,0,140,142,0,0,38,37,141,0,0],"FLAG":0,"BASE":18}
link_alt: https://www.biedronka.pl/pl
---
diff --git a/_templates/digoo-dg-sp01 b/_templates/digoo-dg-sp01
index 45dc39619..4d23afe1d 100644
--- a/_templates/digoo-dg-sp01
+++ b/_templates/digoo-dg-sp01
@@ -6,7 +6,7 @@ type: Plug
standard: eu
link: https://www.banggood.com/it/DIGOO-DG-SP01-10A-Dual-USB-Interface-LED-Night-Light-Smart-WiFi-Socket-EU-Plug-Compatible-Smart-Life-APP-Work-with-Amazon-Alexa-Google-Assistant-p-1396318.html
image: https://img.staticbg.com/thumb/view/oaupload/banggood/images/EC/32/e85f2537-f63e-4aaf-9129-0d766c192dbd.gif
-template: '{"NAME":"DG-SP01","GPIO":[255,17,255,21,56,37,0,0,38,39,40,255,255],"FLAG":0,"BASE":18}'
+template: {"NAME":"DG-SP01","GPIO":[255,17,255,21,56,37,0,0,38,39,40,255,255],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/digoo_DG-PS01 b/_templates/digoo_DG-PS01
index 737209228..8fdb1021a 100644
--- a/_templates/digoo_DG-PS01
+++ b/_templates/digoo_DG-PS01
@@ -6,7 +6,7 @@ type: Power Strip
standard: eu
link: https://www.banggood.com/DIGOO-DG-PS01-Smart-Power-Strip-Work-with-Alexa-Smart-Home-USB-Port-Remote-Control-Power-Outlet-p-1287111.html?rmmds=search&ID=47184&cur_warehouse=CN
image: https://imgaz1.staticbg.com/thumb/view/oaupload/banggood/images/B3/7E/d4498f4b-7c8e-4418-8738-62e596bd2d61.jpg
-template: '{"NAME":"Digoo DG-PS01","GPIO":[0,56,0,17,23,22,0,0,0,24,21,0,0],"FLAG":1,"BASE":18}'
+template: {"NAME":"Digoo DG-PS01","GPIO":[0,56,0,17,23,22,0,0,0,24,21,0,0],"FLAG":1,"BASE":18}
link_alt: https://www.aliexpress.com/item/DIGOO-DG-PS01-Smart-Home-Electronics-Power-Strip-EU-Plug-Work-with-Alexa-4-USB-Port/32878602626.html
---
diff --git a/_templates/digoo_NX-SP202 b/_templates/digoo_NX-SP202
index d10372879..82b6efc03 100644
--- a/_templates/digoo_NX-SP202
+++ b/_templates/digoo_NX-SP202
@@ -6,7 +6,7 @@ type: Plug
standard: eu
link: https://www.banggood.com/DIGOO-DG-SP202-Dual-EU-Plug-Smart-WIFI-Socket-Individual-Controllable-Energy-Monitor-Remote-Control-Timing-Smart-Home-Outlet-let-p-1375323.html?rmmds=category&cur_warehouse=CN
image: https://img.mydigoo.com/mydigoo/images/98/18/434dc864-f519-4968-a74c-ed9be5552fbc.jpg
-template: '{"NAME":"Generic_SP202","GPIO":[52,0,0,131,91,134,0,0,22,17,132,21,0],"FLAG":0,"BASE":63}'
+template: {"NAME":"Generic_SP202","GPIO":[52,0,0,131,91,134,0,0,22,17,132,21,0],"FLAG":0,"BASE":63}
link_alt:
---
diff --git a/_templates/dilisens_SP201 b/_templates/dilisens_SP201
index 0f230d738..476040fea 100644
--- a/_templates/dilisens_SP201
+++ b/_templates/dilisens_SP201
@@ -6,7 +6,7 @@ type: Plug
standard: us
link: https://www.amazon.com/DILISENS-Smart-Wi-Fi-Sockets-Outlets/dp/B07B4CNJKG
image: https://images-na.ssl-images-amazon.com/images/I/51greZwBMgL._SL1103_.jpg
-template: '{"NAME":"Dilisens SP201","GPIO":[0,0,131,0,133,132,52,21,18,22,17,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"Dilisens SP201","GPIO":[0,0,131,0,133,132,52,21,18,22,17,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/dwfengawp02l b/_templates/dwfengawp02l
index 768c57166..4c4957a14 100644
--- a/_templates/dwfengawp02l
+++ b/_templates/dwfengawp02l
@@ -5,5 +5,5 @@ type: Plug
standard: us
link: https://www.amazon.com/gp/product/B07J4QK88D/
image: https://user-images.githubusercontent.com/5904370/53404371-d4966280-39b5-11e9-8ec8-a471ecd3178a.png
-template: '{"NAME":"AWP02L-N","GPIO":[255,255,56,255,255,255,0,0,255,17,255,21,255],"FLAG":0,"BASE":18}'
+template: {"NAME":"AWP02L-N","GPIO":[255,255,56,255,255,255,0,0,255,17,255,21,255],"FLAG":0,"BASE":18}
---
diff --git a/_templates/eFamilyCloud_ASDFEE174 b/_templates/eFamilyCloud_ASDFEE174
index 4e77dfaf8..cba9de179 100644
--- a/_templates/eFamilyCloud_ASDFEE174
+++ b/_templates/eFamilyCloud_ASDFEE174
@@ -6,7 +6,7 @@ type: Plug
standard: eu
link: https://www.amazon.es/gp/product/B078H97JWP/
image: https://images-na.ssl-images-amazon.com/images/I/61xHfa3Pk0L._SL1500_.jpg
-template: '{"NAME":"eFamily Plug","GPIO":[0,0,0,0,52,21,0,0,0,17,0,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"eFamily Plug","GPIO":[0,0,0,0,52,21,0,0,0,17,0,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/eachen_SANT-IR_01 b/_templates/eachen_SANT-IR_01
index adab7062f..01c64be1f 100644
--- a/_templates/eachen_SANT-IR_01
+++ b/_templates/eachen_SANT-IR_01
@@ -6,7 +6,7 @@ type: IR Bridge
standard: global
link: https://www.amazon.de/gp/product/B07NYCHJRW
image: https://images-na.ssl-images-amazon.com/images/I/51VaObTqjOL._SL1000_.jpg
-template: '{"NAME":"Eachen IR","GPIO":[0,0,0,0,56,51,0,0,255,17,8,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"Eachen IR","GPIO":[0,0,0,0,56,51,0,0,255,17,8,0,0],"FLAG":0,"BASE":18}
link_alt: https://eachen.cc/product/eachen-ir-dc6-tuya/
---
diff --git a/_templates/eachen_ST-DC2 b/_templates/eachen_ST-DC2
index fade6c27b..86e3ae579 100644
--- a/_templates/eachen_ST-DC2
+++ b/_templates/eachen_ST-DC2
@@ -1,12 +1,12 @@
---
date_added: 2019-04-19
title: EACHEN ST-DC2
-category: relay
+category: switch
type: Relay
standard: global
link: https://www.amazon.com/gp/product/B078JG96WW
image: https://images-na.ssl-images-amazon.com/images/I/61KkXM7qWTL._SL1001_.jpg
-template: '{"NAME":"Garage Control","GPIO":[11,0,0,0,23,22,18,0,21,52,12,24,0],"FLAG":1,"BASE":18}'
+template: {"NAME":"Garage Control","GPIO":[11,0,0,0,23,22,18,0,21,52,12,24,0],"FLAG":1,"BASE":18}
link_alt:
---
diff --git a/_templates/eco_plugs_CT-065W b/_templates/eco_plugs_CT-065W
index 83d200d6d..d2ead623e 100644
--- a/_templates/eco_plugs_CT-065W
+++ b/_templates/eco_plugs_CT-065W
@@ -6,7 +6,7 @@ type: Plug
standard: us
link: https://www.homedepot.com/p/Grounded-Indoor-Wi-Fi-Adapter-2-Pack-CT-065W/206177754
image: http://www.eco-plugs.net/wl_upload/proimg/1509346066.jpg
-template: '{"NAME":"ECO/CT-065W","GPIO":[255,255,255,255,255,255,0,0,255,17,255,21,255],"FLAG":0,"BASE":18}'
+template: {"NAME":"ECO/CT-065W","GPIO":[255,255,255,255,255,255,0,0,255,17,255,21,255],"FLAG":0,"BASE":18}
link_alt: http://www.eco-plugs.net/en/products/show.php?id=9
---
diff --git a/_templates/electecpro_2 b/_templates/electecpro_2
index 55d63f13b..ca7fd3526 100644
--- a/_templates/electecpro_2
+++ b/_templates/electecpro_2
@@ -6,7 +6,7 @@ type: Plug
standard: us
link: https://www.amazon.com/gp/product/B0798KYKT5
image: https://images-na.ssl-images-amazon.com/images/I/51Natds5TcL._SL1500_.jpg
-template: '{"NAME":"EletecPro-2","GPIO":[255,255,255,255,17,255,0,0,53,52,21,255,255],"FLAG":1,"BASE":18}'
+template: {"NAME":"EletecPro-2","GPIO":[255,255,255,255,17,255,0,0,53,52,21,255,255],"FLAG":1,"BASE":18}
link_alt:
---
diff --git a/_templates/electriq_B22 b/_templates/electriq_B22
index 8eab7c989..08f504939 100644
--- a/_templates/electriq_B22
+++ b/_templates/electriq_B22
@@ -1,12 +1,12 @@
---
date_added: 2019-04-27
-title: electriQ RGB+W
-category: light
-type: Bulb
+title: electriQ
+type: RGBW
+category: bulb
standard: B22
link: https://www.appliancesdirect.co.uk/p/iq-wifibulbb22/electriq-iqwifibulbb22-smart-bulb
image: https://user-images.githubusercontent.com/5904370/69756566-16c61d80-115b-11ea-997c-a8948c0c4109.png
-template: '{"NAME":"ElectricQ B22","GPIO":[0,0,0,0,37,41,0,0,38,40,39,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"ElectricQ B22","GPIO":[0,0,0,0,37,41,0,0,38,40,39,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/electrodragon_board b/_templates/electrodragon_board
index 3e078d637..44f3388cd 100644
--- a/_templates/electrodragon_board
+++ b/_templates/electrodragon_board
@@ -1,12 +1,12 @@
---
date_added: 2019-04-27
title: Electrodragon Board SPDT
-category: relay
+category: switch
type: Relay
standard: global
link: https://www.electrodragon.com/product/wifi-iot-relay-board-spdt-based-esp8266/
image: https://1436477554.rsc.cdn77.org/wp-content/uploads/2017/03/ESP-Relay-Board-SPDT-02.jpg
-template: '{"NAME":"ED Relay Board","GPIO":[255,255,255,255,255,255,0,0,21,22,255,255,52],"FLAG":1,"BASE":18}'
+template: {"NAME":"ED Relay Board","GPIO":[255,255,255,255,255,255,0,0,21,22,255,255,52],"FLAG":1,"BASE":18}
link_alt:
---
diff --git a/_templates/electrodragon_led_strip_mosfet b/_templates/electrodragon_led_strip_mosfet
index 4d2c41f47..80f6d0d51 100644
--- a/_templates/electrodragon_led_strip_mosfet
+++ b/_templates/electrodragon_led_strip_mosfet
@@ -5,7 +5,7 @@ category: light
standard: global
link: https://www.electrodragon.com/product/esp-led-strip-board/
image: https://1436477554.rsc.cdn77.org/wp-content/uploads/2017/06/ESP-LED-Strip-Board-01.jpg
-template: '{"NAME":"LEDBoard RGBW","GPIO":[0,0,0,0,0,0,0,0,39,38,40,37,52],"FLAG":0,"BASE":18}'
+template: {"NAME":"LEDBoard RGBW","GPIO":[0,0,0,0,0,0,0,0,39,38,40,37,52],"FLAG":0,"BASE":18}
link_alt:
screenshot:
---
diff --git a/_templates/electrodragon_relay b/_templates/electrodragon_relay
index 9f4a6b164..536b3d281 100644
--- a/_templates/electrodragon_relay
+++ b/_templates/electrodragon_relay
@@ -1,12 +1,12 @@
---
date_added: 2019-04-27
title: Electrodragon ESP8266
-category: relay
+category: switch
type: Relay
standard: global
link: https://www.electrodragon.com/product/wifi-iot-relay-board-based-esp8266/
image: https://user-images.githubusercontent.com/5904370/57888673-16a3a780-7833-11e9-8101-3e0aef0e6851.png
-template: '{"NAME":"ElectroDragon","GPIO":[18,255,17,255,255,255,0,0,22,21,255,255,52],"FLAG":1,"BASE":15}'
+template: {"NAME":"ElectroDragon","GPIO":[18,255,17,255,255,255,0,0,22,21,255,255,52],"FLAG":1,"BASE":15}
link_alt:
---
diff --git a/_templates/elegant_choice b/_templates/elegant_choice
index dafea91ed..ed30ed9a4 100644
--- a/_templates/elegant_choice
+++ b/_templates/elegant_choice
@@ -6,7 +6,7 @@ type: Bulb Socket
standard: us
link: https://www.amazon.com/gp/product/B07Q9Z5R5R
image: https://images-na.ssl-images-amazon.com/images/I/61Mf6y84RxL._SL1500_.jpg
-template: '{"NAME":"Sm Lghtg Base","GPIO":[0,0,0,0,56,0,0,0,21,17,0,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"Sm Lghtg Base","GPIO":[0,0,0,0,56,0,0,0,21,17,0,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/elelight_7W_A19_E27 b/_templates/elelight_7W_A19_E27
index 044df8a10..d906b4d20 100644
--- a/_templates/elelight_7W_A19_E27
+++ b/_templates/elelight_7W_A19_E27
@@ -1,12 +1,12 @@
---
date_added: 2019-10-17
-title: EleLight A19 7W RGB+W
-category: light
-type: Bulb
+title: EleLight A19 7W
+type: RGBW
+category: bulb
standard: E27
link: https://www.amazon.com/gp/product/B07GV5HDCH
image: https://images-na.ssl-images-amazon.com/images/I/610CKI9EEoL._SL1500_.jpg
-template: '{"NAME":"EleLight 7wA19","GPIO":[0,0,0,0,140,37,0,0,0,142,141,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"EleLight 7wA19","GPIO":[0,0,0,0,140,37,0,0,0,142,141,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/emylo-ya111 b/_templates/emylo-ya111
index 3ab0fd952..61f0c8d85 100644
--- a/_templates/emylo-ya111
+++ b/_templates/emylo-ya111
@@ -1,12 +1,12 @@
---
date_added: 2019-03-03
title: eMylo YSA111A1N-FBA
-category: relay
+category: switch
type: Relay
standard: global
link: https://www.amazon.it/gp/product/B07FPLBGRN/
image: https://images-na.ssl-images-amazon.com/images/I/519CgwGg5yL._SL1001_.jpg
-template: '{"NAME":"Emylo","GPIO":[255,255,255,255,52,255,0,0,21,255,17,255,255],"FLAG":0,"BASE":18}'
+template: {"NAME":"Emylo","GPIO":[255,255,255,255,52,255,0,0,21,255,17,255,255],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/emylo_SS-8839-03 b/_templates/emylo_SS-8839-03
index ad13af29b..60749e4d0 100644
--- a/_templates/emylo_SS-8839-03
+++ b/_templates/emylo_SS-8839-03
@@ -1,12 +1,12 @@
---
date_added: 2019-07-06
title: eMylo SS-8839-03
-category: relay
+category: switch
type: Relay
standard: global
link: https://www.amazon.co.uk/dp/B07FPLBGRN/
image: https://images-na.ssl-images-amazon.com/images/I/519CgwGg5yL._SL1001_.jpg
-template: '{"NAME":"eMylo","GPIO":[0,0,0,0,56,0,0,0,21,0,17,0,0],"FLAG":1,"BASE":18}'
+template: {"NAME":"eMylo","GPIO":[0,0,0,0,56,0,0,0,21,0,17,0,0],"FLAG":1,"BASE":18}
link_alt:
---
diff --git a/_templates/emylo_XL9251WI b/_templates/emylo_XL9251WI
index f0f2f035d..00bfb2d2c 100644
--- a/_templates/emylo_XL9251WI
+++ b/_templates/emylo_XL9251WI
@@ -1,12 +1,12 @@
---
date_added: 2019-04-07
title: eMylo XL9251WI
-category: relay
+category: switch
type: Relay
standard: global
link: https://www.amazon.it/gp/product/B07DXZNR22/
image: https://images-na.ssl-images-amazon.com/images/I/51%2B-0MR-ltL._SL1001_.jpg
-template: '{"NAME":"XL9251WI","GPIO":[255,255,255,255,56,255,0,0,21,255,17,255,255],"FLAG":0,"BASE":18}'
+template: {"NAME":"XL9251WI","GPIO":[255,255,255,255,56,255,0,0,21,255,17,255,255],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/enjowi_SP111 b/_templates/enjowi_SP111
index 65d3e2d91..882075653 100644
--- a/_templates/enjowi_SP111
+++ b/_templates/enjowi_SP111
@@ -6,7 +6,7 @@ type: Plug
standard: eu
link: https://www.aliexpress.com/item/32897620233.html?spm=a2g0s.9042311.0.0.27424c4dIwqVi3
image: https://ae01.alicdn.com/kf/HTB1ZRJ8byzxK1RkSnaVq6xn9VXal.jpg
-template: '{"NAME":"Enjowi SP111-E","GPIO":[17,56,0,0,134,132,0,0,131,57,21,0,0],"FLAG":0,"BASE":55}'
+template: {"NAME":"Enjowi SP111-E","GPIO":[17,56,0,0,134,132,0,0,131,57,21,0,0],"FLAG":0,"BASE":55}
link_alt:
---
diff --git a/_templates/enjowi_WF-SK301 b/_templates/enjowi_WF-SK301
index 90a0eb388..313404af2 100644
--- a/_templates/enjowi_WF-SK301
+++ b/_templates/enjowi_WF-SK301
@@ -6,7 +6,7 @@ type: Switch
standard: eu
link: https://www.aliexpress.com/item/4000027449969.html
image: https://user-images.githubusercontent.com/5904370/67159534-2d9c7780-f346-11e9-983e-8c539369d29f.png
-template: '{"NAME":"Tuya 3 Channel","GPIO":[0,0,0,0,23,18,0,0,17,21,19,22,157],"FLAG":0,"BASE":18}'
+template: {"NAME":"Tuya 3 Channel","GPIO":[0,0,0,0,23,18,0,0,17,21,19,22,157],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/epicka b/_templates/epicka
index a0ce03afc..740448b6d 100644
--- a/_templates/epicka
+++ b/_templates/epicka
@@ -6,7 +6,7 @@ type: Plug
standard: us
link: https://www.amazon.com/gp/product/B076HKHSSX
image: https://images-na.ssl-images-amazon.com/images/I/61EsCN8mtOL._SL1500_.jpg
-template: '{"NAME":"Epicka","GPIO":[255,255,255,255,57,56,0,0,21,17,255,255,255],"FLAG":1,"BASE":18}'
+template: {"NAME":"Epicka","GPIO":[255,255,255,255,57,56,0,0,21,17,255,255,255],"FLAG":1,"BASE":18}
link_alt:
---
diff --git a/_templates/esicoo b/_templates/esicoo
index 4b68d6472..028159092 100644
--- a/_templates/esicoo
+++ b/_templates/esicoo
@@ -5,5 +5,5 @@ type: Plug
standard: us
image: https://raw.githubusercontent.com/digiblur/Sonoff-Tasmota/development/jpgs/Esicoo.jpg
link: https://www.amazon.com/Compatible-Assistant-Required-Electric-Anywhere/dp/B07DYMS1L3
-template: '{"NAME":"Esicoo Plug","GPIO":[255,17,255,255,255,255,0,0,255,56,21,255,255],"FLAG":0,"BASE":18}'
+template: {"NAME":"Esicoo Plug","GPIO":[255,17,255,255,255,255,0,0,255,56,21,255,255],"FLAG":0,"BASE":18}
---
diff --git a/_templates/esicoo_9W_E26 b/_templates/esicoo_9W_E26
index f7debccdc..dba3407d2 100644
--- a/_templates/esicoo_9W_E26
+++ b/_templates/esicoo_9W_E26
@@ -1,12 +1,12 @@
---
date_added: 2019-10-05
-title: Esicoo 9W RGB+W
-category: light
-type: Bulb
+title: Esicoo 9W
+type: RGBW
+category: bulb
standard: E26
link: https://www.amazon.com/ESICOO-Compatible-Google-Dimmable-Equivalent/dp/B07SMSGN86
image: https://user-images.githubusercontent.com/5904370/66718142-d4ca5d80-ede0-11e9-909a-77bd4f315909.png
-template: '{"NAME":"Esicoo Bulb","GPIO":[0,0,0,0,143,144,0,0,0,0,0,0,0],"FLAG":0,"BASE":27}'
+template: {"NAME":"Esicoo Bulb","GPIO":[0,0,0,0,143,144,0,0,0,0,0,0,0],"FLAG":0,"BASE":27}
link_alt:
---
diff --git a/_templates/esp-01_relay_v4 b/_templates/esp-01_relay_v4
index 562656657..3f66f473c 100644
--- a/_templates/esp-01_relay_v4
+++ b/_templates/esp-01_relay_v4
@@ -1,12 +1,12 @@
---
date_added: 2019-08-21
title: ESP-01 Relay V4.0
-category: relay
+category: switch
type: Relay
standard: us
link: https://www.ebay.com/itm/ESP-01-ESP8266-Single-Relay-Module-10A-250V-max/264270051556
image: https://user-images.githubusercontent.com/5904370/66717093-86639180-edd5-11e9-900b-724da9c89916.png
-template: '{"NAME":"ESP01v4","GPIO":[29,52,0,255,255,255,0,0,255,255,255,255,255],"FLAG":0,"BASE":18}'
+template: {"NAME":"ESP01v4","GPIO":[29,52,0,255,255,255,0,0,255,255,255,255,255],"FLAG":0,"BASE":18}
link_alt: https://www.amazon.ca/ESP8266-ESP-01S-Module-ESP01S-Control/dp/B07VQG9J4S
---
diff --git a/_templates/essential_oil_400ml b/_templates/essential_oil_400ml
index bc4fc5205..497215153 100644
--- a/_templates/essential_oil_400ml
+++ b/_templates/essential_oil_400ml
@@ -6,7 +6,7 @@ type: Aromatherapy Diffuser
standard: global
link: https://www.aliexpress.com/item/33025385597.html?spm=a2g0s.9042311.0.0.27424c4dmAh0TE
image: https://user-images.githubusercontent.com/5904370/69001435-719b8180-08de-11ea-9393-b3573c1fb0b9.png
-template: '{"NAME":"XD800W","GPIO":[255,255,255,255,255,255,0,0,255,255,255,255,255],"FLAG":0,"BASE":54}'
+template: {"NAME":"XD800W","GPIO":[255,255,255,255,255,255,0,0,255,255,255,255,255],"FLAG":0,"BASE":54}
link_alt:
---
diff --git a/_templates/estink b/_templates/estink
index 618dba2d7..92ba578db 100644
--- a/_templates/estink
+++ b/_templates/estink
@@ -6,7 +6,7 @@ type: Plug
standard: eu
link: https://www.amazon.it/gp/product/B078N75HGL
image: https://user-images.githubusercontent.com/44721151/57968476-a5f7aa80-795a-11e9-9451-ea9959766ff6.jpg
-template: '{"NAME":"Estink C178","GPIO":[0,0,0,0,52,57,0,0,21,17,0,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"Estink C178","GPIO":[0,0,0,0,52,57,0,0,21,17,0,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/etekcity_3way b/_templates/etekcity_3way
index ff61026e3..da5f3b823 100644
--- a/_templates/etekcity_3way
+++ b/_templates/etekcity_3way
@@ -6,7 +6,7 @@ type: Switch
standard: us
link: https://www.amazon.com/gp/product/B07MBX6NGQ/ref=ppx_yo_dt_b_asin_title_o00_s00?ie=UTF8&psc=1
image: https://user-images.githubusercontent.com/5904370/66718127-ab113680-ede0-11e9-945b-c717cf56ab04.png
-template: '{"NAME":"Etekcity 3Way","GPIO":[255,255,0,255,23,29,0,0,82,22,10,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"Etekcity 3Way","GPIO":[255,255,0,255,23,29,0,0,82,22,10,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/etekcity_ESW01-US b/_templates/etekcity_ESW01-US
index a7f3f41ba..2a7bd9757 100644
--- a/_templates/etekcity_ESW01-US
+++ b/_templates/etekcity_ESW01-US
@@ -6,7 +6,7 @@ type: Plug
standard: us
link: https://www.amazon.com/Etekcity-Voltson-Outlet-Monitoring-Required/dp/B074GYTRFX
image: https://user-images.githubusercontent.com/5904370/56409876-446cef00-627b-11e9-8a12-9a0ed4ef6ee6.png
-template: '{"NAME":"ESW01-US","GPIO":[0,0,0,0,21,56,0,0,0,0,9,0,0],"FLAG":1,"BASE":18}'
+template: {"NAME":"ESW01-US","GPIO":[0,0,0,0,21,56,0,0,0,0,9,0,0],"FLAG":1,"BASE":18}
link_alt: https://www.etekcity.com/product/100312
---
diff --git a/_templates/etekcity_ESWL01 b/_templates/etekcity_ESWL01
index 327ce33b4..9a4171fd5 100644
--- a/_templates/etekcity_ESWL01
+++ b/_templates/etekcity_ESWL01
@@ -6,7 +6,7 @@ type: Switch
standard: us
link: https://www.amazon.com/gp/product/B07J9LF6PS
image: https://user-images.githubusercontent.com/5904370/55393418-7ec95300-553d-11e9-86d9-e765e2abb80d.png
-template: '{"NAME":"EtekCityESWL01","GPIO":[255,255,255,255,52,53,0,0,255,21,122,255,255],"FLAG":1,"BASE":18}'
+template: {"NAME":"EtekCityESWL01","GPIO":[255,255,255,255,52,53,0,0,255,21,122,255,255],"FLAG":1,"BASE":18}
link_alt:
---
diff --git a/_templates/evalogik_NWF001 b/_templates/evalogik_NWF001
index c1594e06f..97c73e0af 100644
--- a/_templates/evalogik_NWF001
+++ b/_templates/evalogik_NWF001
@@ -6,7 +6,7 @@ type: Plug
standard: us
link: https://www.amazon.com/Socket-Outlet-Compatible-Google-Control/dp/B06XZ3J66L
image: https://i.imgur.com/ZIfyaBV.png
-template: '{"NAME":"EVA LOGIK Plug","GPIO":[255,17,255,255,255,255,0,0,255,52,21,255,255],"FLAG":0,"BASE":18}'
+template: {"NAME":"EVA LOGIK Plug","GPIO":[255,17,255,255,255,255,0,0,255,52,21,255,255],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/evalogik_WF31 b/_templates/evalogik_WF31
index e0257e461..827f64d9d 100644
--- a/_templates/evalogik_WF31
+++ b/_templates/evalogik_WF31
@@ -6,7 +6,7 @@ type: Dimmer
standard: us
link: https://www.amazon.com/Dimmer-Switch-Required-Compatible-Google/dp/B07PP4V322
image: https://images-na.ssl-images-amazon.com/images/I/611a1tqt8HL._SL1073_.jpg
-template: '{"NAME":"WF31 Dimmer","GPIO":[255,107,255,108,255,255,0,0,255,255,255,255,255],"FLAG":0,"BASE":54}'
+template: {"NAME":"WF31 Dimmer","GPIO":[255,107,255,108,255,255,0,0,255,255,255,255,255],"FLAG":0,"BASE":54}
link_alt: https://www.ebay.com/itm/2-Way-3-Way-Wifi-Smart-Dimmer-Switch-WF31-Works-with-Alexa-and-Google-Home/254151290386?hash=item3b2c98ee12:g:2KoAAOSwiuRcfiWS&frcectupt=true
---
diff --git a/_templates/evo-smart_JH-G01U b/_templates/evo-smart_JH-G01U
index 2fea9bed5..f0b179aeb 100644
--- a/_templates/evo-smart_JH-G01U
+++ b/_templates/evo-smart_JH-G01U
@@ -6,7 +6,7 @@ type: Plug
standard: us
link: https://www.amazon.com/gp/product/B074RBZNPC
image: https://images-na.ssl-images-amazon.com/images/I/51TfGQsUYDL._SL1300_.jpg
-template: '{"NAME":"EVO JH-G01U","GPIO":[0,0,0,0,21,17,0,0,56,0,0,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"EVO JH-G01U","GPIO":[0,0,0,0,21,17,0,0,56,0,0,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/ex-store_2_kanal_dimmer b/_templates/ex-store_2_kanal_dimmer
index eadba79bb..0bbd83589 100644
--- a/_templates/ex-store_2_kanal_dimmer
+++ b/_templates/ex-store_2_kanal_dimmer
@@ -6,7 +6,7 @@ type: Dimmer
standard: eu
link: https://ex-store.de/navi.php?a=222
image: https://ex-store.de/media/image/product/233/lg/2-kanal-rs232-wifi-wlan-dimmer-modul-v4-fuer-unterputzmontage-230v-3a-nur-modul.png
-template: '{"NAME":"EXS Dimmer","GPIO":[0,148,0,149,0,0,0,0,0,183,0,0,0],"FLAG":0,"BASE":72}'
+template: {"NAME":"EXS Dimmer","GPIO":[0,148,0,149,0,0,0,0,0,183,0,0,0],"FLAG":0,"BASE":72}
link_alt:
---
diff --git a/_templates/ex-store_2kanal b/_templates/ex-store_2kanal
index a10deabc5..54ceb9361 100644
--- a/_templates/ex-store_2kanal
+++ b/_templates/ex-store_2kanal
@@ -1,11 +1,11 @@
---
title: EX Store 2 Kanal V5
-category: relay
+category: switch
type: Relay
standard: global
link: https://ex-store.de/2-Kanal-WiFi-WLan-Relay-V5-Blackline-fuer-Unterputzmontage
image: https://user-images.githubusercontent.com/5904370/57889336-d513fc00-7834-11e9-923f-b4058b8d5c7f.png
-template: '{"NAME":"EXS Relay V5","GPIO":[255,255,255,255,255,255,0,0,21,22,31,52,32],"FLAG":0,"BASE":16}'
+template: {"NAME":"EXS Relay V5","GPIO":[255,255,255,255,255,255,0,0,21,22,31,52,32],"FLAG":0,"BASE":16}
link_alt:
---
## Serial Flashing
diff --git a/_templates/fcmila_7w_rgbw b/_templates/fcmila_7w_rgbw
index 8b6d6eff5..7910b793d 100644
--- a/_templates/fcmila_7w_rgbw
+++ b/_templates/fcmila_7w_rgbw
@@ -1,14 +1,14 @@
---
date_added: 2019-12-02
title: Fcmila 7W
-category: Bulb
+category: bulb
type: RGBW
standard:
- B22
- E27
link: https://www.ebay.de/itm/LED-Lampe-E27-Smart-Dimmbare-WIFI-APP-Fernbedienung-RGB-Home-iOS/283193955875
image: https://user-images.githubusercontent.com/5904370/70042671-94f14c80-15bf-11ea-8151-c0cc1b94e488.png
-template: '{"NAME":"FCMILA E27 0.1","GPIO":[0,0,0,0,37,40,0,0,38,0,39,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"FCMILA E27 0.1","GPIO":[0,0,0,0,37,40,0,0,38,0,39,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/fcmila_EQ723 b/_templates/fcmila_EQ723
index 7c20ca20d..9237f2ebc 100644
--- a/_templates/fcmila_EQ723
+++ b/_templates/fcmila_EQ723
@@ -1,8 +1,8 @@
---
date_added: 2019-10-17
-title: Fcmila 10W RGB+W
-category: light
-type: Bulb
+title: Fcmila 10W
+type: RGBW
+category: bulb
standard:
- E26
- E27
@@ -10,7 +10,7 @@ standard:
- E14
link: https://www.aliexpress.com/item/33047138888.html
image: https://ae01.alicdn.com/kf/H12c7a3e69d3545248ebe0e78de8ef43fi/Dimmable-10W-E27-WiFi-Smart-Light-Bulb-LED-Lamp-App-Operate-Alexa-Google-Assistant-Voice-Control.jpg_640x640.jpg
-template: '{"NAME":"FCMILA LED E27","GPIO":[0,0,0,0,40,0,0,0,38,39,37,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"FCMILA LED E27","GPIO":[0,0,0,0,40,0,0,0,38,39,37,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/fcmila_XDD-48W b/_templates/fcmila_XDD-48W
index 49f7e37de..a4f17c8da 100644
--- a/_templates/fcmila_XDD-48W
+++ b/_templates/fcmila_XDD-48W
@@ -6,7 +6,7 @@ type: Light
standard: global
link: https://www.ebay.de/itm/Smart-Wifi-Wireless-Deckenleuchte-RGBW-Lampe-fur-Alexa-Google-AC90-240V-/113447726477
image: https://user-images.githubusercontent.com/5904370/56112013-0c536c80-5f5a-11e9-86fe-8688ad21f8c6.png
-template: '{"NAME":"XDD-48W","GPIO":[0,0,0,0,37,40,0,0,38,25,39,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"XDD-48W","GPIO":[0,0,0,0,37,40,0,0,38,25,39,0,0],"FLAG":0,"BASE":18}
link_alt: https://www.aliexpress.com/store/product/LED-WIFI-Smart-Ceiling-Light-RGB-Dimmable-48W-APP-Remote-control-Lamp-for-Bed-Room-Living/1827431_32966143703.html
---
Run `setoption15 1`
diff --git a/_templates/feit_electric-BPA800RGBWAG2 b/_templates/feit_electric-BPA800RGBWAG2
index 5b90c5ebe..c30c526d9 100644
--- a/_templates/feit_electric-BPA800RGBWAG2
+++ b/_templates/feit_electric-BPA800RGBWAG2
@@ -1,12 +1,12 @@
---
date_added: 2019-10-07
title: Feit Electric BPA800/RGBW/AG/2
-category: light
-type: Bulb
+type: RGBW
+category: bulb
standard: E26
link: https://www.costco.com/Feit-WiFi-Smart-Bulbs%2c-4-pack.product.100417461.html
image: https://user-images.githubusercontent.com/5904370/66718161-080cec80-ede1-11e9-94f3-7cf3ea739bb3.png
-template: '{"NAME":" BPA800/RGBW","GPIO":[0,0,0,0,37,38,0,0,141,142,140,0,0],"FLAG":0,"BASE":48}'
+template: {"NAME":" BPA800/RGBW","GPIO":[0,0,0,0,37,38,0,0,141,142,140,0,0],"FLAG":0,"BASE":48}
link_alt: https://www.feit.com/products/bulbs/smart-wifi-light-bulb/smart-wifi-bulb-color-changing-tunable-white/
---
diff --git a/_templates/feit_electric-BR30927CAAG b/_templates/feit_electric-BR30927CAAG
index daebd51da..b3fb12d1e 100644
--- a/_templates/feit_electric-BR30927CAAG
+++ b/_templates/feit_electric-BR30927CAAG
@@ -1,11 +1,11 @@
---
title: Feit Electric BR30/927CA/AG
-category: light
-type: Bulb
-standard: us
+type: WW
+category: bulb
+standard: E26
link: https://www.amazon.com/Feit-Electric-Equivalent-BR30-927CA/dp/B07GG5ZV5Y
image: https://user-images.githubusercontent.com/5904370/66718462-8919b300-ede4-11e9-9324-ca4ee0267c19.png
-template: '{"NAME":"Feit BR30 WW","GPIO":[0,0,0,0,0,37,0,0,0,0,0,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"Feit BR30 WW","GPIO":[0,0,0,0,0,37,0,0,0,0,0,0,0],"FLAG":0,"BASE":18}
link_alt: https://www.feit.com/products/bulbs/smart-wifi-light-bulb/650-lumen-2700k-smart-wifi-bulb-2/
---
diff --git a/_templates/feit_electric-BR30950CAAG b/_templates/feit_electric-BR30950CAAG
index 169e35b67..f53f49805 100644
--- a/_templates/feit_electric-BR30950CAAG
+++ b/_templates/feit_electric-BR30950CAAG
@@ -1,11 +1,11 @@
---
title: Feit Electric BR30/950CA/AG
-category: light
-type: Bulb
+type: CW
+category: bulb
standard: E26
link: https://www.amazon.com/Feit-Electric-BR30-950CA-AG/dp/B07GFYYTDP
image: https://user-images.githubusercontent.com/5904370/66718486-cf6f1200-ede4-11e9-89c5-acaf2280879e.png
-template: '{"NAME":"Feit BR30 CW","GPIO":[0,0,0,0,0,37,0,0,0,0,0,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"Feit BR30 CW","GPIO":[0,0,0,0,0,37,0,0,0,0,0,0,0],"FLAG":0,"BASE":18}
link_alt: https://www.feit.com/products/bulbs/smart-wifi-light-bulb/650-lumen-5000k-smart-wifi-bulb/
---
diff --git a/_templates/feit_electric-OM60927CAAG b/_templates/feit_electric-OM60927CAAG
index ae8e9abbb..aac7e7f0b 100644
--- a/_templates/feit_electric-OM60927CAAG
+++ b/_templates/feit_electric-OM60927CAAG
@@ -1,12 +1,12 @@
---
date_added: 2019-04-27
title: Feit Electric OM60/927CA/AG
-category: light
-type: Bulb
+type: WW
+category: bulb
standard: E26
link: https://www.menards.com/main/electrical/alarms-security-systems/security-accessories/feit-electric-reg-60w-equivalent-a19-soft-white-alexa-google-smart-wifi-led-bulb/pa80027kag/p-1531290477173.htm
image: https://user-images.githubusercontent.com/5904370/66718533-43111f00-ede5-11e9-8cb4-52b2f0c64263.png
-template: '{"NAME":" Feit P_A800_2","GPIO":[0,0,0,0,0,37,0,0,0,0,0,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":" Feit P_A800_2","GPIO":[0,0,0,0,0,37,0,0,0,0,0,0,0],"FLAG":0,"BASE":18}
link_alt: https://www.feit.com/products/bulbs/800-lumen-2700k-smart-wifi-bulb/
---
diff --git a/_templates/feit_electric-OM60RGBWCAAG b/_templates/feit_electric-OM60RGBWCAAG
index cddc95549..1d3966403 100644
--- a/_templates/feit_electric-OM60RGBWCAAG
+++ b/_templates/feit_electric-OM60RGBWCAAG
@@ -1,12 +1,11 @@
---
title: Feit Electric OM60/RGBW/CA/AG
-category: light
-type: Bulb
+type: RGBW
+category: bulb
standard: E26
-category: light
link: https://www.amazon.com/FEIT-OM60-RGBW-CA-AG/dp/B07GG98VV2/
image: https://user-images.githubusercontent.com/5904370/66718514-1c52e880-ede5-11e9-8334-4644c016fc42.png
-template: '{"NAME":"OM60/RGBW","GPIO":[0,0,0,0,140,37,0,0,38,142,141,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"OM60/RGBW","GPIO":[0,0,0,0,140,37,0,0,38,142,141,0,0],"FLAG":0,"BASE":18}
link_alt: https://www.feit.com/products/bulbs/enhance/smart-wifi-bulb-color-changing-tunable-white-2/
screenshot:
---
diff --git a/_templates/feit_electric_outdoor b/_templates/feit_electric_outdoor
index 658e94885..4858f10b1 100644
--- a/_templates/feit_electric_outdoor
+++ b/_templates/feit_electric_outdoor
@@ -6,7 +6,7 @@ type: Outdoor Plug
standard: us
link: https://www.costco.com/Feit-Wi-Fi-Smart-Outdoor-Plug-2-pack.product.100515906.html
image: https://images.costco-static.com/ImageDelivery/imageService?profileId=12026540&itemId=1358986-847&recipeName=680
-template: '{"NAME":"Prime Smart ou","GPIO":[255,255,255,255,157,56,0,0,21,17,255,255,255],"FLAG":0,"BASE":18}'
+template: {"NAME":"Prime Smart ou","GPIO":[255,255,255,255,157,56,0,0,21,17,255,255,255],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/flhs-zn04 b/_templates/flhs-zn04
index 8b2e7c98e..5bee0a180 100644
--- a/_templates/flhs-zn04
+++ b/_templates/flhs-zn04
@@ -6,7 +6,7 @@ type: Plug
standard: eu
link: https://www.amazon.de/gp/product/B07FD971T9/
image: https://images-na.ssl-images-amazon.com/images/I/61zWYjf5maL._SL1500_.jpg
-template: '{"NAME":"FLHS-ZN04","GPIO":[57,0,56,0,0,134,0,0,131,17,132,21,0],"FLAG":0,"BASE":45}'
+template: {"NAME":"FLHS-ZN04","GPIO":[57,0,56,0,0,134,0,0,131,17,132,21,0],"FLAG":0,"BASE":45}
link_alt: https://www.fasttech.com/product/9688208-flhs-zn04-wifi-smart-home-wall-socket-timer
---
diff --git a/_templates/fontastic_SH01 b/_templates/fontastic_SH01
index 4eb9a0801..e7caee6a5 100644
--- a/_templates/fontastic_SH01
+++ b/_templates/fontastic_SH01
@@ -6,7 +6,7 @@ type: Plug
standard: eu
link: https://www.reichelt.de/schaltbare-steckdose-ueber-wlan-fontastic-253140-p245072.html?&trstct=pos_10
image: https://cdn-reichelt.de/bilder/web/artikel_ws/E910/FONTASTIC_253140_01.jpg
-template: '{"NAME":"Fontastic","GPIO":[255,0,255,0,56,0,0,0,21,17,0,0,0],"FLAG":1,"BASE":18}'
+template: {"NAME":"Fontastic","GPIO":[255,0,255,0,56,0,0,0,21,17,0,0,0],"FLAG":1,"BASE":18}
link_alt:
---
diff --git a/_templates/frankever_FLHS-ZN04 b/_templates/frankever_FLHS-ZN04
index 45b6e0d3d..7db39a23c 100644
--- a/_templates/frankever_FLHS-ZN04
+++ b/_templates/frankever_FLHS-ZN04
@@ -6,7 +6,7 @@ type: Plug
standard: il
link: https://www.aliexpress.com/item/32968604339.html
image: https://user-images.githubusercontent.com/5904370/69960109-f86c7300-1508-11ea-8af2-c5da3cd0a960.png
-template: '{"NAME":"Israel plug","GPIO":[57,0,56,131,0,134,0,0,0,17,132,21,0],"FLAG":0,"BASE":45}'
+template: {"NAME":"Israel plug","GPIO":[57,0,56,131,0,134,0,0,0,17,132,21,0],"FLAG":0,"BASE":45}
link_alt: https://www.aliexpress.com/item/32985716808.html
---
diff --git a/_templates/fulighture_A60 b/_templates/fulighture_A60
index 61bf64a72..2ba597c59 100644
--- a/_templates/fulighture_A60
+++ b/_templates/fulighture_A60
@@ -1,12 +1,12 @@
---
date_added: 2019-11-07
-title: Fulighture A60 9W RGB+W
-category: light
-type: Bulb
+title: Fulighture A60 9W
+type: RGBW
+category: bulb
standard: B22
link: https://www.amazon.co.uk/gp/product/B07QG7S2M7/ref=ppx_yo_dt_b_search_asin_title?ie=UTF8&psc=1
image: https://images-na.ssl-images-amazon.com/images/I/51H1cuklhtL._SL1200_.jpg
-template: '{"NAME":"Fulighture A60","GPIO":[0,0,0,0,38,37,0,0,0,39,40,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"Fulighture A60","GPIO":[0,0,0,0,38,37,0,0,0,39,40,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/garage_door_controller b/_templates/garage_door_controller
index 13724c641..4b5c84ff9 100644
--- a/_templates/garage_door_controller
+++ b/_templates/garage_door_controller
@@ -1,12 +1,12 @@
---
date_added: 2019-11-15
title: Garage Door Controller
-category: relay
+category: switch
type: Relay
standard: global
link: https://www.aliexpress.com/snapshot/0.html?spm=a2g0s.9042647.6.2.539d4c4dLLfurj&orderId=8002012774661042&productId=32987501714
image: https://ae01.alicdn.com/kf/HTB1rYNFRCzqK1RjSZPxq6A4tVXaR/Zemismart-Wifi-Garage-Door-Controller-for-Car-Garage-Door-Opener-APP-Remote-Control-Timing-Voice-Control.jpg
-template: '{"NAME":"Garage Opener","GPIO":[0,107,0,108,0,0,0,0,0,0,0,0,0],"FLAG":0,"BASE":54}'
+template: {"NAME":"Garage Opener","GPIO":[0,107,0,108,0,0,0,0,0,0,0,0,0],"FLAG":0,"BASE":54}
link_alt: https://www.ebay.com.au/i/283588248968?chn=ps&norover=1&mkevt=1&mkrid=705-139619-5960-0&mkcid=2&itemid=283588248968&targetid=835594789185&device=c&mktype=pla&googleloc=9071258&poi=&campaignid=7408627122&mkgroupid=86410136288&rlsatarget=aud-786643580326:pla-835594789185&abcId=1139226&merchantid=7364522&gclid=Cj0KCQiAtrnuBRDXARIsABiN-7C1a8v5Bzv69x30s2IP1Jd2Y3dHBxwQ1lLz6OlOvt_JZZX-U8li1EMaAmpDEALw_wcB
---
diff --git a/_templates/gdtech-w-us001 b/_templates/gdtech-w-us001
index b570ad168..f647d493b 100644
--- a/_templates/gdtech-w-us001
+++ b/_templates/gdtech-w-us001
@@ -6,7 +6,7 @@ type: Plug
standard: us
link: https://www.amazon.ca/gp/product/B07MJCDV25
image: https://user-images.githubusercontent.com/5904370/53868501-793c2400-3ff6-11e9-9dd1-b2ab7a9c7748.png
-template: '{"NAME":"GDTech W-US001","GPIO":[255,17,255,255,255,255,0,0,255,56,21,255,255],"FLAG":1,"BASE":18}'
+template: {"NAME":"GDTech W-US001","GPIO":[255,17,255,255,255,255,0,0,255,56,21,255,255],"FLAG":1,"BASE":18}
link_alt:
---
diff --git a/_templates/gdtech_W-US003 b/_templates/gdtech_W-US003
index bdd6515a6..0fd841f78 100644
--- a/_templates/gdtech_W-US003
+++ b/_templates/gdtech_W-US003
@@ -6,7 +6,7 @@ type: Plug
standard: us
link: https://www.amazon.ca/gp/product/B07QRWD29N
image: https://images-na.ssl-images-amazon.com/images/I/41KB5kdPqWL._SL1080_.jpg
-template: '{"NAME":"W-US003","GPIO":[0,17,255,255,255,0,0,0,0,56,21,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"W-US003","GPIO":[0,17,255,255,255,0,0,0,0,56,21,0,0],"FLAG":0,"BASE":18}
link_alt: https://www.amazon.com/GDTech-Wireless-Household-Appliance-Compatible/dp/B07QJD7BMF
---
diff --git a/_templates/geekcreit_2ch b/_templates/geekcreit_2ch
index d43fe93cc..a49bd5980 100644
--- a/_templates/geekcreit_2ch
+++ b/_templates/geekcreit_2ch
@@ -1,12 +1,12 @@
---
date_added: 2019-04-17
title: Geekcreit 2 Channel
-category: relay
+category: switch
type: Relay
standard: global
link: https://www.banggood.com/Geekcreit-2-Channel-AC-85V-250V-APP-Remote-Control-WIFI-Wireless-Switch-Socket-For-Smart-Home-p-1114958.html
image: https://user-images.githubusercontent.com/5904370/56273527-2c6f6100-60fd-11e9-8c4d-faa16971f7da.png
-template: '{"NAME":"Geekcreit 2ch","GPIO":[17,0,0,0,0,22,18,0,21,52,0,0,0],"FLAG":1,"BASE":18}'
+template: {"NAME":"Geekcreit 2ch","GPIO":[17,0,0,0,0,22,18,0,21,52,0,0,0],"FLAG":1,"BASE":18}
link_alt: https://www.aliexpress.com/item/Sonoff-Smart-Wifi-Switch-Universal-Module-2CH-USB-DC5V-7-32V-Wireless-Switch-Timer-Phone-APP/32950334093.html
---
diff --git a/_templates/geeklink b/_templates/geeklink
index 18b7e3a32..51f70399e 100644
--- a/_templates/geeklink
+++ b/_templates/geeklink
@@ -6,7 +6,7 @@ type: IR Bridge
standard: us
link: https://www.aliexpress.com/item/32958748327.html
image: https://user-images.githubusercontent.com/5904370/69746645-03a85300-1145-11ea-9fc9-eabd455ed850.png
-template: '{"NAME":"GL IR Blaster","GPIO":[255,255,255,255,56,51,0,0,0,17,8,0,0],"FLAG":0,"BASE":62}'
+template: {"NAME":"GL IR Blaster","GPIO":[255,255,255,255,56,51,0,0,0,17,8,0,0],"FLAG":0,"BASE":62}
link_alt:
---
diff --git a/_templates/geeni_A21 b/_templates/geeni_A21
index 0b782964f..f5c266713 100644
--- a/_templates/geeni_A21
+++ b/_templates/geeni_A21
@@ -1,12 +1,12 @@
---
date_added: 2019-09-10
-title: Geeni LUX 1050 A21 10W CCT
-category: light
-type: Bulb
+title: Geeni LUX 1050 A21 10W
+type: CCT
+category: bulb
standard: E26
link: https://mygeeni.com/products/lux-1050-smart-wi-fi-led-white-light
image: https://images-na.ssl-images-amazon.com/images/I/61tNrglIbeL._SL1500_.jpg
-template: '{"NAME":"Geeni-1050-WW","GPIO":[0,0,0,0,37,37,0,0,38,0,0,0,0],"FLAG":1,"BASE":18}'
+template: {"NAME":"Geeni-1050-WW","GPIO":[0,0,0,0,37,37,0,0,38,0,0,0,0],"FLAG":1,"BASE":18}
link_alt:
---
diff --git a/_templates/geeni_GN-OW101-101 b/_templates/geeni_GN-OW101-101
index b684ce013..61ad59954 100644
--- a/_templates/geeni_GN-OW101-101
+++ b/_templates/geeni_GN-OW101-101
@@ -6,7 +6,7 @@ type: Outdoor Plug
standard: us
link: https://www.amazon.com/Geeni-Outdoor-Required-Assistant-Microsoft/dp/B07BGLZKH1
image: http://www.alantro.com/images/Geeni_Outdoor.jpg
-template: '{"NAME":"Geeni Outdoor","GPIO":[17,0,0,0,0,57,0,0,0,52,21,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"Geeni Outdoor","GPIO":[17,0,0,0,0,57,0,0,0,52,21,0,0],"FLAG":0,"BASE":18}
link_alt: https://www.bimart.com
---
diff --git a/_templates/geeni_GN-SW003 b/_templates/geeni_GN-SW003
index 44eb84082..c00ee1570 100644
--- a/_templates/geeni_GN-SW003
+++ b/_templates/geeni_GN-SW003
@@ -6,7 +6,7 @@ type: Power Strip
standard: us
link: https://www.canadiantire.ca/en/pdp/geeni-smart-wi-fi-surge-protector-0529703p.0529703.html
image: https://images-na.ssl-images-amazon.com/images/I/71-EBgp5LzL._SL1500_.jpg
-template: '{"NAME":"Geeni GNCSW003","GPIO":[52,0,0,0,22,21,0,0,24,25,23,26,17],"FLAG":0,"BASE":18}'
+template: {"NAME":"Geeni GNCSW003","GPIO":[52,0,0,0,22,21,0,0,24,25,23,26,17],"FLAG":0,"BASE":18}
link_alt: https://www.amazon.ca/Geeni-6-Outlet-Protector-Assistant-Microsoft/dp/B07DB3W915
---
diff --git a/_templates/geeni_charge b/_templates/geeni_charge
index c3332eb08..cb3060236 100644
--- a/_templates/geeni_charge
+++ b/_templates/geeni_charge
@@ -6,7 +6,7 @@ type: Plug
standard: us
link:
image: http://www.alantro.com/images/Geeni_Charge.jpg
-template: '{"NAME":"Geeni Charge","GPIO":[0,0,0,0,52,57,0,0,21,17,0,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"Geeni Charge","GPIO":[0,0,0,0,52,57,0,0,21,17,0,0,0],"FLAG":0,"BASE":18}
link_alt: http://www.bimart.com
---
diff --git a/_templates/geeni_glo b/_templates/geeni_glo
index 4f6cecafc..f9788a218 100644
--- a/_templates/geeni_glo
+++ b/_templates/geeni_glo
@@ -6,7 +6,7 @@ type: Plug
standard: us
link: https://www.amazon.com/Geeni-GN-WW108-199/dp/B07DB3L9SN
image: http://www.alantro.com/images/Geeni_Glo.jpg
-template: '{"NAME":"Geeni Glo","GPIO":[0,0,0,0,56,0,0,0,21,17,22,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"Geeni Glo","GPIO":[0,0,0,0,56,0,0,0,21,17,22,0,0],"FLAG":0,"BASE":18}
link_alt: https://www.bimart.com
---
diff --git a/_templates/geeni_lux_edison_A19 b/_templates/geeni_lux_edison_A19
index 5d5aa7893..dbedee3c4 100644
--- a/_templates/geeni_lux_edison_A19
+++ b/_templates/geeni_lux_edison_A19
@@ -1,12 +1,12 @@
---
date_added: 2019-11-28
-title: Geeni LUX Edison A19 8W WW
-category: light
-type: Bulb
-standard: us
+title: Geeni LUX Edison A19 8W
+type: Filament
+category: bulb
+standard: E26
link: https://www.amazon.com/Geeni-Equivalent-Compatible-Assistant-Microsoft/dp/B07R6TD72D/
image: https://cdn.shopify.com/s/files/1/2612/6532/products/49a57dbb-49c7-4fa2-9860-895ca56c4439_608x608.jpg
-template: '{"NAME":"Geeni-Edison","GPIO":[0,0,0,0,0,0,0,0,0,0,37,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"Geeni-Edison","GPIO":[0,0,0,0,0,0,0,0,0,0,37,0,0],"FLAG":0,"BASE":18}
link_alt: https://www.homedepot.com/p/Geeni-60-Watt-Equivalent-A19-Dimmable-Smart-Edison-Wi-Fi-LED-Light-Bulb-White-2-Pack-GN-BW211-999/310449899
---
diff --git a/_templates/geeni_prisma_1050 b/_templates/geeni_prisma_1050
index e3a97aa59..9a84d4017 100644
--- a/_templates/geeni_prisma_1050
+++ b/_templates/geeni_prisma_1050
@@ -1,12 +1,12 @@
---
date_added: 2019-10-26
-title: Geeni Prisma 1050 A21 RGB+W
-category: light
-type: Bulb
+title: Geeni Prisma 1050 A21
+type: RGBW
+category: bulb
standard: E26
link: https://www.amazon.com/gp/product/B071R9ND8B
image: https://user-images.githubusercontent.com/5904370/67624505-af524080-f831-11e9-9c2c-64fdf7af1868.png
-template: '{"NAME":"Geeni 1050 RGB","GPIO":[37,0,0,0,140,38,0,0,0,142,141,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"Geeni 1050 RGB","GPIO":[37,0,0,0,140,38,0,0,0,142,141,0,0],"FLAG":0,"BASE":18}
link_alt: https://mygeeni.com/collections/lighting/products/prisma1050-smart-wi-fi-led-color-ligh
---
diff --git a/_templates/geeni_spot b/_templates/geeni_spot
index 4a0975d3e..3da42a000 100644
--- a/_templates/geeni_spot
+++ b/_templates/geeni_spot
@@ -6,7 +6,7 @@ type: Plug
standard: us
link: https://www.amazon.com/Geeni-Required-Assistant-Microsoft-Cortana/dp/B0777C2BX3
image: https://user-images.githubusercontent.com/5904370/69757328-0a42c480-115d-11ea-9374-541eebce399e.png
-template: '{"NAME":"Geeni Spot","GPIO":[0,0,0,0,52,57,0,0,21,17,0,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"Geeni Spot","GPIO":[0,0,0,0,52,57,0,0,21,17,0,0,0],"FLAG":0,"BASE":18}
link_alt: https://www.bimart.com
---
diff --git a/_templates/geeni_switch_duo b/_templates/geeni_switch_duo
index f8a2236f4..8cf27803c 100644
--- a/_templates/geeni_switch_duo
+++ b/_templates/geeni_switch_duo
@@ -6,7 +6,7 @@ type: Plug
standard: us
link: https://www.amazon.com/Geeni-GN-WW110-199-required-Assistant-Microsoft/dp/B07FLXG64M
image: http://www.alantro.com/images/Geeni_Duo.jpg
-template: '{"NAME":"Geeni Duo","GPIO":[0,0,0,0,18,22,0,0,17,52,21,0,53],"FLAG":0,"BASE":18}'
+template: {"NAME":"Geeni Duo","GPIO":[0,0,0,0,18,22,0,0,17,52,21,0,53],"FLAG":0,"BASE":18}
link_alt: http://www.bimart.com
---
diff --git a/_templates/generic_10W_RGBW b/_templates/generic_10W_RGBW
index 16f684661..58665cf97 100644
--- a/_templates/generic_10W_RGBW
+++ b/_templates/generic_10W_RGBW
@@ -1,14 +1,14 @@
---
date_added: 2019-10-09
-title: Generic 10W RGB+W
-category: light
-type: Bulb
+title: Generic 10W
+type: RGBW
+category: bulb
standard:
- E26
- E27
link: https://www.ebay.com/itm/WiFi-Smart-Light-Bulb-Dimmable-LED-E27-E26-Lamp-For-Google-Home-Alexa-IFTT/401872579690
image: http://gul.asuscomm.com/RGBW-10W-E27-LED-BULB.jpg
-template: '{"NAME":"10W E27 RGBW","GPIO":[0,0,0,0,0,39,0,0,38,0,37,40,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"10W E27 RGBW","GPIO":[0,0,0,0,0,39,0,0,38,0,37,40,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/generic_rgb_10A b/_templates/generic_rgb_10A
index ae6450832..b731b494d 100644
--- a/_templates/generic_rgb_10A
+++ b/_templates/generic_rgb_10A
@@ -6,7 +6,7 @@ type: Plug
standard: eu
link: https://www.ebay.de/itm/143414665009
image: https://user-images.githubusercontent.com/13064701/69458461-a9d41180-0d6f-11ea-9046-a4d127fe56fb.jpg
-template: '{"NAME":"RGBW Plug","GPIO":[0,0,0,0,255,255,0,0,255,17,255,21,0],"FLAG":0,"BASE":1}'
+template: {"NAME":"RGBW Plug","GPIO":[0,0,0,0,255,255,0,0,255,17,255,21,0],"FLAG":0,"BASE":1}
link_alt:
---
diff --git a/_templates/genericus b/_templates/genericus
index 498e9560a..c4be0fc60 100644
--- a/_templates/genericus
+++ b/_templates/genericus
@@ -5,7 +5,7 @@ type: Plug
standard: us
link: https://www.aliexpress.com/item/US-UK-EU-Smart-Plug-WiFi-Remote-Control-with-Alexa-Timing-on-off-The-Power-Samrt/32963187986.html?spm=a2g0s.9042311.0.0.27424c4dxoirjt
image: https://user-images.githubusercontent.com/16266909/65367391-d6986b00-dbfe-11e9-853e-9566447e425f.png
-template: '{"NAME":"TuyaPlugBSD15","GPIO":[255,255,255,255,255,255,0,0,21,17,56,255,255],"FLAG":1,"BASE":18}'
+template: {"NAME":"TuyaPlugBSD15","GPIO":[255,255,255,255,255,255,0,0,21,17,56,255,255],"FLAG":1,"BASE":18}
link_alt:
---
diff --git a/_templates/globe_37726 b/_templates/globe_37726
index a3af02817..b13838328 100644
--- a/_templates/globe_37726
+++ b/_templates/globe_37726
@@ -1,12 +1,12 @@
---
date_added: 2019-06-12
-title: Globe A19 10W RGB+CCT
-category: light
-type: Bulb
+title: Globe A19 10W
+type: RGBCCT
+category: bulb
standard: E27
link: https://globe-electric.com/en/product/globe-electric-wi-fi-smart-60w-equivalent-multicolor-changing-rgb-tunable-white-dimmable-frosted-led-light-bulb-no-hub-required-a19-e26-base-2-pack34207/
image: https://globe-electric.com/wp-content/uploads/2019/06/ts5o1qvdo312wl6mhbha-800x800.jpg
-template: '{"NAME":"GlobeRGBWW","GPIO":[0,0,0,0,37,40,0,0,38,41,39,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"GlobeRGBWW","GPIO":[0,0,0,0,37,40,0,0,38,41,39,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/globe_A19_10W_E26 b/_templates/globe_A19_10W_E26
index 78b7bfe5b..02920787e 100644
--- a/_templates/globe_A19_10W_E26
+++ b/_templates/globe_A19_10W_E26
@@ -1,12 +1,12 @@
---
date_added: 2019-11-29
-title: Globe A19 10W WW
-category: light
-type: Bulb
+title: Globe A19 10W
+type: WW
+category: bulb
standard: E26
link: https://www.canadiantire.ca/en/pdp/globe-smart-bulb-3995166p.html#srp
image: https://canadiantire.scene7.com/is/image/CanadianTire/3995166_1?defaultImage=image_na_EN&imageSet=CanadianTire/3995166_1?defaultImage=image_na_EN,CanadianTire/3995166_2?defaultImage=image_na_EN&id=DCSql2&fmt=jpg&fit=constrain,1&wid=311&hei=499
-template: '{"NAME":"Globe WW 800lm","GPIO":[0,0,0,0,0,37,0,0,0,0,0,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"Globe WW 800lm","GPIO":[0,0,0,0,0,37,0,0,0,0,0,0,0],"FLAG":0,"BASE":18}
link_alt: https://www.thesource.ca/en-ca/smart-home-household/smart-home/smart-lighting/bright-wi-fi-smart-white-led-bulb---works-with-amazon-alexa-and-google-assistant/p/108079794
---
diff --git a/_templates/globe_smart b/_templates/globe_smart
index f6f68ffdf..e8a26df30 100644
--- a/_templates/globe_smart
+++ b/_templates/globe_smart
@@ -6,7 +6,7 @@ type: Plug
standard: us
link: https://www.canadiantire.ca/en/pdp/globe-smart-plug-3995171p.html
image: https://globe-electric.com/wp-content/uploads/2019/04/50000.jpg
-template: '{"NAME":"GlobeSmartPlug","GPIO":[0,0,0,0,56,0,0,0,21,0,17,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"GlobeSmartPlug","GPIO":[0,0,0,0,56,0,0,0,21,0,17,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/gocomma_wifi b/_templates/gocomma_wifi
index d4fca3378..184b1c14f 100644
--- a/_templates/gocomma_wifi
+++ b/_templates/gocomma_wifi
@@ -1,12 +1,12 @@
---
date_added: 2019-06-26
title: Gocomma Wi-Fi Smart Switch
-category: relay
+category: switch
type: Relay
standard: global
link: https://www.gearbest.com/smart-home-controls/pp_009841506979.html
image: https://i.ibb.co/yQS4jGF/gocomma.jpg
-template: '{"NAME":"GoCommaSmartSw","GPIO":[17,255,255,255,21,255,0,0,255,56,255,255,255],"FLAG":0,"BASE":18}'
+template: {"NAME":"GoCommaSmartSw","GPIO":[17,255,255,255,21,255,0,0,255,56,255,255,255],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/goldair_sleepsmart_GCPF315 b/_templates/goldair_sleepsmart_GCPF315
index f64128a87..8ce9131ea 100644
--- a/_templates/goldair_sleepsmart_GCPF315
+++ b/_templates/goldair_sleepsmart_GCPF315
@@ -6,7 +6,7 @@ type: Fan
standard: anzac
link: https://www.target.com.au/p/goldair-sleep-smart-pedestal-fan-gspf315/62258777
image: https://www.target.com.au/medias/static_content/product/images/hero/36/84/A1293684.jpg
-template: '{"NAME":"Goldair Fan","GPIO":[0,0,0,0,0,0,0,0,0,108,0,107,0],"FLAG":0,"BASE":54}'
+template: {"NAME":"Goldair Fan","GPIO":[0,0,0,0,0,0,0,0,0,108,0,107,0],"FLAG":0,"BASE":54}
link_alt:
---
diff --git a/_templates/gosund-KS-602S b/_templates/gosund-KS-602S
index f2dee47f9..f524da024 100644
--- a/_templates/gosund-KS-602S
+++ b/_templates/gosund-KS-602S
@@ -6,7 +6,7 @@ type: Switch
standard: us
link: https://www.amazon.com/gp/product/B07DQDNBZ2
image: https://images-na.ssl-images-amazon.com/images/I/512fi13XMsL._SX679_.jpg
-template: '{"NAME":"Gosund KS-602S","GPIO":[17,56,0,0,0,0,0,0,0,0,21,0,158],"FLAG":0,"BASE":18}'
+template: {"NAME":"Gosund KS-602S","GPIO":[17,56,0,0,0,0,0,0,0,0,21,0,158],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/gosund_SP1 b/_templates/gosund_SP1
index 033a7bc75..c5f8925d6 100644
--- a/_templates/gosund_SP1
+++ b/_templates/gosund_SP1
@@ -6,7 +6,7 @@ type: Plug
standard: eu
link: https://www.amazon.de/gp/product/B0777BWS1P
image: https://user-images.githubusercontent.com/5904370/54648409-70dbf280-4aa6-11e9-8429-a784cf2c6750.png
-template: '{"NAME":"Gosund SP1 v23","GPIO":[0,56,0,17,134,132,0,0,131,57,21,0,0],"FLAG":0,"BASE":55}'
+template: {"NAME":"Gosund SP1 v23","GPIO":[0,56,0,17,134,132,0,0,131,57,21,0,0],"FLAG":0,"BASE":55}
link_alt: https://www.amazon.de/Steckdose-Homecube-intelligente-Verbrauchsanzeige-funktioniert/dp/B076Q2LKHG
---
There are three clones -- use the device type Teckin:
diff --git a/_templates/gosund_SP111 b/_templates/gosund_SP111
index da1147518..7979b64f0 100644
--- a/_templates/gosund_SP111
+++ b/_templates/gosund_SP111
@@ -6,7 +6,7 @@ type: Plug
standard: eu
link: https://www.amazon.de/dp/B07PRF28SR
image: https://images-na.ssl-images-amazon.com/images/I/71KCLLJFetL.jpg
-template: '{"NAME":"Gosund SP111","GPIO":[56,0,57,0,0,134,0,0,131,17,132,21,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"Gosund SP111","GPIO":[56,0,57,0,0,134,0,0,131,17,132,21,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/gosund_SP111_v1_1 b/_templates/gosund_SP111_v1_1
index 2223a15dc..8758325a4 100644
--- a/_templates/gosund_SP111_v1_1
+++ b/_templates/gosund_SP111_v1_1
@@ -6,7 +6,7 @@ type: Plug
standard: eu
link: https://www.amazon.de/gp/product/B07PRDZ7F3
image: https://images-na.ssl-images-amazon.com/images/I/71vYjVhPC-L._SL1500_.jpg
-template: '{"NAME":"Gosund SP111","GPIO":[56,0,57,0,132,134,0,0,131,17,0,21,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"Gosund SP111","GPIO":[56,0,57,0,132,134,0,0,131,17,0,21,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/gosund_SP111_v2 b/_templates/gosund_SP111_v2
index dc2e5a8fc..396aaab2b 100644
--- a/_templates/gosund_SP111_v2
+++ b/_templates/gosund_SP111_v2
@@ -6,7 +6,7 @@ type: Plug
standard: eu
link: https://www.amazon.de/dp/B07PRF28SR
image: https://images-na.ssl-images-amazon.com/images/I/71KCLLJFetL.jpg
-template: '{"NAME":"Gosund SP111 2","GPIO":[57,0,56,0,132,134,0,0,131,17,0,21,0],"FLAG":0,"BASE":45}'
+template: {"NAME":"Gosund SP111 2","GPIO":[57,0,56,0,132,134,0,0,131,17,0,21,0],"FLAG":0,"BASE":45}
link_alt:
---
diff --git a/_templates/gosund_SP112 b/_templates/gosund_SP112
index 9ceeacd04..7a2ff2f6a 100644
--- a/_templates/gosund_SP112
+++ b/_templates/gosund_SP112
@@ -6,7 +6,7 @@ type: Plug
standard: eu
link: https://www.amazon.de/gp/product/B07PMW88L7
image: https://user-images.githubusercontent.com/5904370/66715805-e8b59580-edc7-11e9-954e-dfd45c1fc07e.png
-template: '{"NAME":"SHP5","GPIO":[56,145,57,146,255,22,0,0,255,255,21,255,18],"FLAG":0,"BASE":18}'
+template: {"NAME":"SHP5","GPIO":[56,145,57,146,255,22,0,0,255,255,21,255,18],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/gosund_SW1 b/_templates/gosund_SW1
index 4291f81dd..af2eb23bc 100644
--- a/_templates/gosund_SW1
+++ b/_templates/gosund_SW1
@@ -6,7 +6,7 @@ type: Switch
standard: us
link: https://www.amazon.com/gp/product/B07MV1RTSV
image: https://cdn.shopify.com/s/files/1/0032/3197/3445/products/SW_Pack_of_1_New_2048x2048.jpg
-template: '{"NAME":"Gosund SW1","GPIO":[17,56,0,0,0,0,0,0,0,0,21,0,158],"FLAG":0,"BASE":18}'
+template: {"NAME":"Gosund SW1","GPIO":[17,56,0,0,0,0,0,0,0,0,21,0,158],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/gosund_WP1-1 b/_templates/gosund_WP1-1
index 3b7d03414..e06d32836 100644
--- a/_templates/gosund_WP1-1
+++ b/_templates/gosund_WP1-1
@@ -6,7 +6,7 @@ type: Plug
standard: us
link: https://ideaing.com/product/gosund-wifi-smart-plug-2-pack
image: https://images-na.ssl-images-amazon.com/images/I/61TOzZiBoUL._SL1500_.jpg
-template: '{"NAME":"Gosund WP1-1","GPIO":[0,0,56,0,0,134,0,0,131,17,132,21,0],"FLAG":0,"BASE":45}'
+template: {"NAME":"Gosund WP1-1","GPIO":[0,0,56,0,0,134,0,0,131,17,132,21,0],"FLAG":0,"BASE":45}
link_alt:
---
diff --git a/_templates/gosund_WP2 b/_templates/gosund_WP2
index 9727b6cf8..bf3b92f1a 100644
--- a/_templates/gosund_WP2
+++ b/_templates/gosund_WP2
@@ -6,7 +6,7 @@ type: Plug
standard: us
link: https://www.amazon.com/Gosund-Extender-Independently-Together-Required/dp/B07F58N32V
image: https://images-na.ssl-images-amazon.com/images/I/51lji0CJpQL._AC_SL1500_.jpg
-template: '{"NAME":"Gosund WP2","GPIO":[17,158,57,0,18,0,0,0,22,56,21,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"Gosund WP2","GPIO":[17,158,57,0,18,0,0,0,22,56,21,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/gosund_WP211 b/_templates/gosund_WP211
index e4054dc0b..2b6b6d66e 100644
--- a/_templates/gosund_WP211
+++ b/_templates/gosund_WP211
@@ -6,7 +6,7 @@ type: Plug
standard: us
link: https://www.amazon.com/gp/product/B07F58N32V
image: https://images-na.ssl-images-amazon.com/images/I/61mBiz7jFwL._SL1500_.jpg
-template: '{"NAME":"Gosund wp211","GPIO":[0,0,0,0,21,0,0,0,0,17,0,22,18],"FLAG":0,"BASE":18}'
+template: {"NAME":"Gosund wp211","GPIO":[0,0,0,0,21,0,0,0,0,17,0,22,18],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/gosund_WP212 b/_templates/gosund_WP212
index fb27bc741..a49da71f2 100644
--- a/_templates/gosund_WP212
+++ b/_templates/gosund_WP212
@@ -6,7 +6,7 @@ type: Plug
standard: us
link: https://www.amazon.com/Extender-Independently-Together-Required-Gosund/dp/B07F58N32V
image: https://images-na.ssl-images-amazon.com/images/I/61mBiz7jFwL._SL1500_[1].jpg
-template: '{"NAME":"Gosund_WP212","GPIO":[17,0,0,0,18,0,0,0,21,0,22,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"Gosund_WP212","GPIO":[17,0,0,0,18,0,0,0,21,0,22,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/gosund_WP5 b/_templates/gosund_WP5
index 426c3566f..a1026150d 100644
--- a/_templates/gosund_WP5
+++ b/_templates/gosund_WP5
@@ -6,7 +6,7 @@ type: Plug
standard: us
link: https://www.amazon.com/gp/product/B07GRLQV47
image: https://images-na.ssl-images-amazon.com/images/I/617bTlmaCsL._SL1500_.jpg
-template: '{"NAME":"Gosund-WP5","GPIO":[255,255,255,255,17,255,0,0,56,158,21,255,255],"FLAG":0,"BASE":18}'
+template: {"NAME":"Gosund-WP5","GPIO":[255,255,255,255,17,255,0,0,56,158,21,255,255],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/gosund_WP6 b/_templates/gosund_WP6
index 8b81c9a51..d66a08e48 100644
--- a/_templates/gosund_WP6
+++ b/_templates/gosund_WP6
@@ -6,7 +6,7 @@ type: Plug
standard: us
link: https://www.amazon.com/Gosund-Compatible-Control-Required-Anywhere/dp/B07NSXFWK6
image: https://images-na.ssl-images-amazon.com/images/I/51UqCsp1z0L._SX522_.jpg
-template: '{"NAME":"Gosund WP6","GPIO":[0,0,0,17,0,0,0,0,56,57,21,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"Gosund WP6","GPIO":[0,0,0,17,0,0,0,0,56,57,21,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/gosund_e27_rgbw b/_templates/gosund_e27_rgbw
index 615b1bd15..e50ad5bd8 100644
--- a/_templates/gosund_e27_rgbw
+++ b/_templates/gosund_e27_rgbw
@@ -1,12 +1,12 @@
---
date_added: 2019-05-24
-title: Gosund 8W RGB+W
-category: light
-type: Bulb
+title: Gosund 8W
+type: RGBW
+category: bulb
standard: E27
link: https://www.amazon.de/LED-Lampe-Gosund-Gl%C3%BChbirne-funktioniert-Assistant/dp/B07H8BT5XV
image: https://user-images.githubusercontent.com/5904370/66717540-8fa32d00-edda-11e9-8f99-b1948457fbf6.png
-template: '{"NAME":"Gosund RGB+W","GPIO":[0,0,0,0,40,0,0,0,37,38,39,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"Gosund RGB+W","GPIO":[0,0,0,0,40,0,0,0,37,38,39,0,0],"FLAG":0,"BASE":18}
link_alt: https://www.gosund.store/products/smart-wifi-led-bulb
---
Use command:
diff --git a/_templates/gosund_wp3 b/_templates/gosund_wp3
index 50ac16b43..16f9ff5c2 100644
--- a/_templates/gosund_wp3
+++ b/_templates/gosund_wp3
@@ -6,7 +6,7 @@ type: Plug
standard: us
link: https://www.amazon.com/Assistant-Required-Enabled-Control-Gosund/dp/B072ZX8RTZ
image: https://user-images.githubusercontent.com/34340210/57017460-52146400-6bed-11e9-9b85-d69380be8e70.jpg
-template: '{"NAME":"Gosund WP3","GPIO":[0,0,0,0,17,0,0,0,56,57,21,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"Gosund WP3","GPIO":[0,0,0,0,17,0,0,0,56,57,21,0,0],"FLAG":0,"BASE":18}
link_alt:
---
[Product page](https://www.gosund.store/products/smart-plug)
diff --git a/_templates/grefic_TE101 b/_templates/grefic_TE101
index d609178c2..c726847b3 100644
--- a/_templates/grefic_TE101
+++ b/_templates/grefic_TE101
@@ -6,7 +6,7 @@ type: Plug
standard: eu
link: https://www.amazon.it/gp/product/B07BKY4QFV
image: https://user-images.githubusercontent.com/5904370/66717077-5b793d80-edd5-11e9-8e10-13065610b1d3.png
-template: '{"NAME":"Grefic TE101","GPIO":[0,0,0,0,56,0,0,0,21,17,0,0,0],"FLAG":0,"BASE":1}'
+template: {"NAME":"Grefic TE101","GPIO":[0,0,0,0,56,0,0,0,21,17,0,0,0],"FLAG":0,"BASE":1}
link_alt:
---
diff --git a/_templates/gyman_SM-PW701U b/_templates/gyman_SM-PW701U
index 97cb29d0d..d302cb9e9 100644
--- a/_templates/gyman_SM-PW701U
+++ b/_templates/gyman_SM-PW701U
@@ -6,7 +6,7 @@ type: Plug
standard: us
link: https://smile.amazon.com/gp/product/B071HLPD33
image: https://images-na.ssl-images-amazon.com/images/I/51BmiuypN1L._AC_SL1001_.jpg
-template: '{"NAME":"Gyman","GPIO":[255,255,157,255,56,255,0,0,21,17,255,255,255],"FLAG":0,"BASE":18}'
+template: {"NAME":"Gyman","GPIO":[255,255,157,255,56,255,0,0,21,17,255,255,255],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/h801 b/_templates/h801
index 826fd82d9..7a4bb8f8c 100644
--- a/_templates/h801
+++ b/_templates/h801
@@ -5,7 +5,7 @@ type: LED Controller
standard: global
link: https://www.ebay.com/sch/i.html?_from=R40&_trksid=m570.l1313&_nkw=h801+controller&_sacat=0
image: https://user-images.githubusercontent.com/5904370/57890606-836d7080-7838-11e9-925c-50f7e2af4df2.png
-template: '{"NAME":"H801","GPIO":[0,52,0,0,41,57,0,0,39,38,40,37,0],"FLAG":0,"BASE":20}'
+template: {"NAME":"H801","GPIO":[0,52,0,0,41,57,0,0,39,38,40,37,0],"FLAG":0,"BASE":20}
link_alt: https://www.aliexpress.com/w/wholesale-H801.html?spm=2114.search0104.0.0.16ea5f7exnEDTW&site=glo&g=y&SortType=price_asc&SearchText=H801&groupsort=1&needQuery=n
---
diff --git a/_templates/hIhome_WPP-16S1 b/_templates/hIhome_WPP-16S1
index 4b2c4d5f5..0d881f65b 100644
--- a/_templates/hIhome_WPP-16S1
+++ b/_templates/hIhome_WPP-16S1
@@ -6,7 +6,7 @@ type: Plug
standard: eu
link: https://www.50five.nl/hihome-wpp-16s-smart-plug.html
image: https://www.50five.nl/media/catalog/product/cache/bd0d42d14aeaacc284f202cc745c851f/a/c/ac3106f59dffdb95c36470e766a8f1cd56cb1e85_WPP_16S1.jpg
-template: '{"NAME":"HIhome WPP-16S","GPIO":[17,0,0,0,134,132,0,0,131,56,21,0,0],"FLAG":0,"BASE":49}'
+template: {"NAME":"HIhome WPP-16S","GPIO":[17,0,0,0,134,132,0,0,131,56,21,0,0],"FLAG":0,"BASE":49}
link_alt:
---
diff --git a/_templates/halonix_prime_prizm_12W_B22 b/_templates/halonix_prime_prizm_12W_B22
index e6c45774c..17d91937d 100644
--- a/_templates/halonix_prime_prizm_12W_B22
+++ b/_templates/halonix_prime_prizm_12W_B22
@@ -1,12 +1,12 @@
---
date_added: 2019-11-09
-title: Halonix Prime Prizm 12W RGB
-category: light
-type: Bulb
+title: Halonix Prime Prizm 12W
+type: RGB
+category: bulb
standard: B22
link: https://www.amazon.in/Halonix-Compatible-Amazon-Google-Assistant/dp/B07NN6SZQM
image: https://user-images.githubusercontent.com/5904370/68528449-1b817980-02f3-11ea-9988-07e14ffd02e9.png
-template: '{"NAME":"Halonix Prizm ","GPIO":[0,0,0,0,37,40,0,0,38,41,39,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"Halonix Prizm ","GPIO":[0,0,0,0,37,40,0,0,38,41,39,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/hama_10W_E27_RGBW b/_templates/hama_10W_E27_RGBW
index 625b1734d..24b0e5f69 100644
--- a/_templates/hama_10W_E27_RGBW
+++ b/_templates/hama_10W_E27_RGBW
@@ -6,7 +6,7 @@ type: Light
standard: E27
link: https://www.amazon.de/Hama-LED-Lampe-steuerbar-Farbwechsel-kompatibel/dp/B07FR4ZYCD
image: https://images-na.ssl-images-amazon.com/images/I/41552SdiWVL._SX466_.jpg
-template: '{"NAME":"Hama Smart WiF","GPIO":[0,0,0,0,37,40,0,0,38,41,39,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"Hama Smart WiF","GPIO":[0,0,0,0,37,40,0,0,38,41,39,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/hama_176550 b/_templates/hama_176550
index 1f52cc25e..cf63750bc 100644
--- a/_templates/hama_176550
+++ b/_templates/hama_176550
@@ -1,12 +1,12 @@
---
date_added: 2019-11-27
-title: Hama 176550 10W CCT
-category: light
-type: Bulb
+title: Hama 176550 10W
+type: CCT
+category: bulb
standard: E27
link: https://www.amazon.de/dp/B07FQZS3NP/
image: https://images-na.ssl-images-amazon.com/images/I/51%2ByEjh%2BjHL._SL1100_.jpg
-template: '{"NAME":"Hama Bulb xW","GPIO":[0,0,0,0,0,37,0,0,0,38,0,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"Hama Bulb xW","GPIO":[0,0,0,0,0,37,0,0,0,38,0,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/hauppauge_SL-1642 b/_templates/hauppauge_SL-1642
index 2a9033d95..9f4f13220 100644
--- a/_templates/hauppauge_SL-1642
+++ b/_templates/hauppauge_SL-1642
@@ -6,7 +6,7 @@ type: Plug
standard: eu
link: https://www.amazon.de/dp/B07JLMCMMZ
image: https://images-na.ssl-images-amazon.com/images/I/31xXwBq3xTL.jpg
-template: '{"NAME":"SL-1642","GPIO":[0,0,0,0,52,0,0,0,21,17,0,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"SL-1642","GPIO":[0,0,0,0,52,0,0,0,21,17,0,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/heltec_wifi_kit_8 b/_templates/heltec_wifi_kit_8
index b7aa7ff7f..607f712f8 100644
--- a/_templates/heltec_wifi_kit_8
+++ b/_templates/heltec_wifi_kit_8
@@ -6,7 +6,7 @@ type: DIY
standard: global
link: https://heltec.org/project/wifi-kit-8/
image: https://i2.wp.com/heltec.org/wp-content/uploads/2019/04/SAM_0658_800X800-1.png
-template: '{"NAME":"HTIT-W8266","GPIO":[255,255,255,255,6,5,0,0,255,255,255,255,255],"FLAG":15,"BASE":18}'
+template: {"NAME":"HTIT-W8266","GPIO":[255,255,255,255,6,5,0,0,255,255,255,255,255],"FLAG":15,"BASE":18}
link_alt: https://robotzero.one/heltec-wifi-kit-8/
---
diff --git a/_templates/hihome_WPP-16T b/_templates/hihome_WPP-16T
index 0b7424603..ffed0aae3 100644
--- a/_templates/hihome_WPP-16T
+++ b/_templates/hihome_WPP-16T
@@ -6,7 +6,7 @@ type: Plug
standard: eu
link: https://www.mediamarkt.nl/nl/product/_hihome-wifi-powerplug-twin-1606332.html
image: https://picscdn.redblue.de/doi/pixelboxx-mss-80234304/fee_786_587_png/HIHOME-Wifi-powerplug-Twin
-template: '{"NAME":"HiHome WPP-16T","GPIO":[17,56,255,255,134,132,0,0,18,255,22,130,21],"FLAG":1,"BASE":18}'
+template: {"NAME":"HiHome WPP-16T","GPIO":[17,56,255,255,134,132,0,0,18,255,22,130,21],"FLAG":1,"BASE":18}
link_alt:
---
diff --git a/_templates/hiwild_W-US002 b/_templates/hiwild_W-US002
index d07f6a1b6..b015dd594 100644
--- a/_templates/hiwild_W-US002
+++ b/_templates/hiwild_W-US002
@@ -6,7 +6,7 @@ type: Plug
standard: us
link: http://amazon.com/hiwild-homekit-Compatible-Required-Rectangle/dp/B07GF9KMYH
image: https://images-na.ssl-images-amazon.com/images/I/41tLZFbSDTL._SL1100_.jpg
-template: '{"NAME":"W-US002","GPIO":[0,17,0,0,0,0,0,0,0,52,21,0,158],"FLAG":0,"BASE":18}'
+template: {"NAME":"W-US002","GPIO":[0,17,0,0,0,0,0,0,0,52,21,0,158],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/honeyzy_DN20 b/_templates/honeyzy_DN20
index b5d1e05cb..87bf3820b 100644
--- a/_templates/honeyzy_DN20
+++ b/_templates/honeyzy_DN20
@@ -6,7 +6,7 @@ type: Valve
standard: global
link: https://www.aliexpress.com/item/32977505873.html
image: https://ae01.alicdn.com/kf/HTB1npKzbvjsK1Rjy1Xaq6zispXa6/3-4-Smart-WIFI-Water-Manipulator-Valve-DN20-Smart-Home-Garden-Automation-System-Valve-Gas-Water.jpg
-template: '{"NAME":"Unbranded TYWE3S DN20 WIFI Valve","GPIO":[0,0,0,0,0,0,0,0,17,21,0,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"Unbranded TYWE3S DN20 WIFI Valve","GPIO":[0,0,0,0,0,0,0,0,17,21,0,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/houzetek_AWP07L b/_templates/houzetek_AWP07L
index 48f363fdf..5ec94c899 100644
--- a/_templates/houzetek_AWP07L
+++ b/_templates/houzetek_AWP07L
@@ -6,7 +6,7 @@ type: Plug
standard: eu
link: https://www.amazon.it/Intelligente-Houzetek-supporto-programmabile-Telecomando/dp/B07HH2XQNX?th=1
image: https://images-na.ssl-images-amazon.com/images/I/5180wwTaA4L._SX522_.jpg
-template: '{"NAME":"AWP07L","GPIO":[56,255,255,130,255,134,0,0,0,17,132,21,255],"FLAG":0,"BASE":18}'
+template: {"NAME":"AWP07L","GPIO":[56,255,255,130,255,134,0,0,0,17,132,21,255],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/huafan_qinlu b/_templates/huafan_qinlu
index 0b35b3ae4..9236061f6 100644
--- a/_templates/huafan_qinlu
+++ b/_templates/huafan_qinlu
@@ -5,7 +5,7 @@ type: Plug
standard: uk
link: https://www.amazon.com/HuaFan-Enabled-Control-Counting-Function/dp/B01LPAWWH2
image: https://i.postimg.cc/tRsK4MhH/Hua-Fan-Qin-Lu-Wi-Fi-Smart-Socket-UK-Plug-Outlet-Remotely-Control.jpg
-template: '{"NAME":"Huafan SS","GPIO":[56,0,0,57,17,29,0,0,132,130,133,0,0],"FLAG":0,"BASE":24}'
+template: {"NAME":"Huafan SS","GPIO":[56,0,0,57,17,29,0,0,132,130,133,0,0],"FLAG":0,"BASE":24}
link_alt:
---
## Introduction
diff --git a/_templates/hugoai_awp02l-n b/_templates/hugoai_awp02l-n
index ddf5ea676..2dfc50b44 100644
--- a/_templates/hugoai_awp02l-n
+++ b/_templates/hugoai_awp02l-n
@@ -6,7 +6,7 @@ type: Plug
standard: us
link: https://www.amazon.com/gp/product/B07LF768Y8
image: https://images-na.ssl-images-amazon.com/images/I/41BNWkmtn2L._SL1001_.jpg
-template: '{"NAME":"AWP02L-N","GPIO":[57,0,56,0,0,0,0,0,0,17,0,21,0],"FLAG":1,"BASE":18}'
+template: {"NAME":"AWP02L-N","GPIO":[57,0,56,0,0,0,0,0,0,17,0,21,0],"FLAG":1,"BASE":18}
link_alt:
---
diff --git a/_templates/hykker_9W_E27_RGBW b/_templates/hykker_9W_E27_RGBW
index f0db88991..6e8a4aef1 100644
--- a/_templates/hykker_9W_E27_RGBW
+++ b/_templates/hykker_9W_E27_RGBW
@@ -1,12 +1,12 @@
---
date_added: 2019-11-23
-title: Hykker 9W RGB+W
-category: light
-type: Bulb
+title: Hykker 9W
+type: RGBW
+category: bulb
standard: E27
link: https://www.hykker.com/akcesoria/zarowka-rgbw-9-w-z-wi-fi/
image: https://www.hykker.com/wp-content/uploads/2019/11/zarowka.jpg
-template: '{"NAME":"Hykker RBGW 9W","GPIO":[0,0,0,0,0,40,0,0,37,0,39,38,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"Hykker RBGW 9W","GPIO":[0,0,0,0,0,40,0,0,37,0,39,38,0],"FLAG":0,"BASE":18}
link_alt: https://www.biedronka.pl/pl/product,id,155349,name,zarowka-kolorowa-smart-wi-fi-9-w-rgbw
---
diff --git a/_templates/hykker_SE-0792 b/_templates/hykker_SE-0792
index 402b5b04c..134f7657a 100644
--- a/_templates/hykker_SE-0792
+++ b/_templates/hykker_SE-0792
@@ -6,7 +6,7 @@ type: Plug
standard: eu
link: https://www.hykker.com/akcesoria/gniazdo-wi-fi-z-licznikiem-energii/
image: https://www.hykker.com/wp-content/uploads/2019/11/gniazdo.jpg
-template: '{"NAME":"Hykker SE-0792","GPIO":[17,0,0,0,134,132,0,0,131,56,21,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"Hykker SE-0792","GPIO":[17,0,0,0,134,132,0,0,131,56,21,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/hyleton_313 b/_templates/hyleton_313
index 9a38ebaf0..9cb13eb34 100644
--- a/_templates/hyleton_313
+++ b/_templates/hyleton_313
@@ -6,7 +6,7 @@ type: Plug
standard: uk
link: https://www.aliexpress.com/item/Hyleton-wifi-smart-plug-remote-control-outlet-Wireless-Wall-Socket-Compatible-with-Alexa-Google-Home-for/32861229232.html
image: https://user-images.githubusercontent.com/5904370/54650236-cbc51800-4aad-11e9-833d-b652c8df92cb.png
-template: '{"NAME":"Hyleton 313","GPIO":[57,0,56,0,0,0,0,0,0,17,0,21,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"Hyleton 313","GPIO":[57,0,56,0,0,0,0,0,0,17,0,21,0],"FLAG":0,"BASE":18}
link_alt: https://www.amazon.co.uk/Control-Anywhere-Compatible-Assistant-Required-hyleton/dp/B078Q2N3L4
---
diff --git a/_templates/hyleton_315 b/_templates/hyleton_315
index 29d03fa33..18a5f1a55 100644
--- a/_templates/hyleton_315
+++ b/_templates/hyleton_315
@@ -6,7 +6,7 @@ type: Plug
standard: uk
link: https://www.amazon.co.uk/hyleton-Compatible-Anywhere-Countdown-Function/dp/B07B7HMKND
image: https://images-na.ssl-images-amazon.com/images/I/51l0FwQKv3L._SL1200_.jpg
-template: '{"NAME":"hyleton-315","GPIO":[0,0,0,0,57,56,0,0,21,90,0,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"hyleton-315","GPIO":[0,0,0,0,57,56,0,0,21,90,0,0,0],"FLAG":0,"BASE":18}
link_alt: https://webcache.googleusercontent.com/search?q=cache:H2aqs33UJD4J:https://www.amazon.co.uk/hyleton-Compatible-Anywhere-Countdown-Function/dp/B07B7HMKND+&cd=1&hl=en&ct=clnk&gl=uk&client=firefox-b-d
---
diff --git a/_templates/hyleton_317 b/_templates/hyleton_317
index 302107dde..c91b7c130 100644
--- a/_templates/hyleton_317
+++ b/_templates/hyleton_317
@@ -6,7 +6,7 @@ type: Plug
standard: anzac
link: https://www.amazon.com.au/Wireless-Control-Anywhere-Assistant-Required/dp/B07CLKJTZ2
image: https://images-na.ssl-images-amazon.com/images/I/61qI%2B6sFp1L._SL1200_.jpg
-template: '{"NAME":"hyleton-317","GPIO":[56,0,57,0,58,0,0,0,0,90,0,21,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"hyleton-317","GPIO":[56,0,57,0,58,0,0,0,0,90,0,21,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/hyleton_330 b/_templates/hyleton_330
index 859e6455c..72f8475cd 100644
--- a/_templates/hyleton_330
+++ b/_templates/hyleton_330
@@ -6,7 +6,7 @@ type: Power Strip
standard: us
link: https://www.amazon.com/gp/product/B07JYV1G8V/ref=ppx_yo_dt_b_asin_title_o03_s00?ie=UTF8&psc=1
image: https://images-na.ssl-images-amazon.com/images/I/41tema9ZVbL._AC_SL1000_.jpg
-template: '{"NAME":"Hyleton-330","GPIO":[57,0,0,56,29,17,0,0,31,30,32,0,25],"FLAG":0,"BASE":18}'
+template: {"NAME":"Hyleton-330","GPIO":[57,0,0,56,29,17,0,0,31,30,32,0,25],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/hyleton_331 b/_templates/hyleton_331
index b58b3df6b..ec42e7e0b 100644
--- a/_templates/hyleton_331
+++ b/_templates/hyleton_331
@@ -6,7 +6,7 @@ type: Power Strip
standard: us
link: https://www.amazon.com/gp/product/B07GJB83LC
image: https://images-na.ssl-images-amazon.com/images/I/51JABvnON%2BL._SL1200_.jpg
-template: '{"NAME":"HLT-331","GPIO":[52,255,255,57,29,17,0,0,31,30,32,255,58],"FLAG":0,"BASE":18}'
+template: {"NAME":"HLT-331","GPIO":[52,255,255,57,29,17,0,0,31,30,32,255,58],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/hyleton_333 b/_templates/hyleton_333
index a66ae3b82..812af177b 100644
--- a/_templates/hyleton_333
+++ b/_templates/hyleton_333
@@ -6,7 +6,7 @@ type: Power Strip
standard: eu
link: https://www.amazon.es/gp/product/B07SX176LT/ref=ppx_yo_dt_b_asin_title_o03_s00?ie=UTF8&psc=1
image: https://images-na.ssl-images-amazon.com/images/I/51-XnKQjjBL._AC_SL1500_.jpg
-template: '{"NAME":"HLT-333","GPIO":[52,0,0,57,29,17,0,0,31,30,0,0,24],"FLAG":0,"BASE":18}'
+template: {"NAME":"HLT-333","GPIO":[52,0,0,57,29,17,0,0,31,30,0,0,24],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/hyleton_336 b/_templates/hyleton_336
index b1cfd3e80..64feb9d16 100644
--- a/_templates/hyleton_336
+++ b/_templates/hyleton_336
@@ -6,7 +6,7 @@ type: Power Strip
standard: uk
link: https://www.lazada.sg/products/buybowie-wifi-smart-power-strip-multi-plug-sockets-with-34-ac-outlets-246-usb-port-voice-controlled-by-alexa-google-home-timer-via-android-ios-phone-i290767856-s475480736.html
image: https://my-test-11.slatic.net/p/07ddeb65f97d6378242207143f23427f.jpg
-template: '{"NAME":"HLT-336","GPIO":[52,0,0,57,29,17,0,0,31,30,0,0,32],"FLAG":0,"BASE":18}'
+template: {"NAME":"HLT-336","GPIO":[52,0,0,57,29,17,0,0,31,30,0,0,32],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/ihommate_ZCH-02 b/_templates/ihommate_ZCH-02
index 2a9beb48b..23a49d2da 100644
--- a/_templates/ihommate_ZCH-02
+++ b/_templates/ihommate_ZCH-02
@@ -6,7 +6,7 @@ type: Plug
standard: CH
link: https://www.aliexpress.com/item/4000113339594.html?spm=a2g0s.9042311.0.0.5d094c4d41l3vu
image: https://user-images.githubusercontent.com/5904370/68094936-76574300-fea5-11e9-93b2-8cb29db9fa66.png
-template: '{"NAME":"ZCH-02","GPIO":[0,0,0,17,133,132,0,0,130,56,21,0,0],"FLAG":1,"BASE":18}'
+template: {"NAME":"ZCH-02","GPIO":[0,0,0,17,133,132,0,0,130,56,21,0,0],"FLAG":1,"BASE":18}
link_alt:
---
diff --git a/_templates/innens_BSD29 b/_templates/innens_BSD29
index 03688af39..e58d7199f 100644
--- a/_templates/innens_BSD29
+++ b/_templates/innens_BSD29
@@ -6,7 +6,7 @@ type: Plug
standard: uk
link: https://www.amazon.co.uk/gp/product/B07KXSNPZC
image: https://images-na.ssl-images-amazon.com/images/I/61ZusVvONqL._SX679_.jpg
-template: '{"NAME":"BSD29","GPIO":[0,0,56,131,0,134,0,0,0,17,132,21,0],"FLAG":0,"BASE":52}'
+template: {"NAME":"BSD29","GPIO":[0,0,56,131,0,134,0,0,0,17,132,21,0],"FLAG":0,"BASE":52}
link_alt:
---
diff --git a/_templates/irrigation_timer_BQ05 b/_templates/irrigation_timer_BQ05
index 7e6e5d2a9..d3566afb5 100644
--- a/_templates/irrigation_timer_BQ05
+++ b/_templates/irrigation_timer_BQ05
@@ -6,7 +6,7 @@ type: Valve
standard: global
link: https://www.aliexpress.com/item/32985685144.html
image: https://ae01.alicdn.com/kf/HTB1gJk5PxTpK1RjSZFKq6y2wXXaT/Mobile-smart-WIFI-remote-drip-irrigation-system-garden-irrigation-spray-automatic-watering-kit-adjustable.jpg
-template: '{"NAME":"BQ05","GPIO":[255,255,255,255,255,255,0,0,255,255,255,21,22],"FLAG":1,"BASE":18}'
+template: {"NAME":"BQ05","GPIO":[255,255,255,255,255,255,0,0,255,255,255,21,22],"FLAG":1,"BASE":18}
link_alt: https://www.amazon.ca/Automatic-Irrigation-Electronic-Intelligent-Watering/dp/B07SYLYH5J/ref=sr_1_19?keywords=wifi+watering&qid=1565457985&s=gateway&sr=8-19
---
diff --git a/_templates/iswitch b/_templates/iswitch
index c8f9f8394..08067956a 100644
--- a/_templates/iswitch
+++ b/_templates/iswitch
@@ -6,7 +6,7 @@ type: Plug
standard: in
link: https://iswitch.online/product/wifi-smart-plug-outlet-socket-compatible-with-alexa-google-assistant-no-hub-required-control-your-devices-from-anywhere/
image: https://iswitch.online/wp-content/uploads/2018/12/plug.jpg
-template: '{"NAME":"Smart Plug XSA","GPIO":[255,17,255,255,255,255,0,0,255,56,21,255,255],"FLAG":0,"BASE":18}'
+template: {"NAME":"Smart Plug XSA","GPIO":[255,17,255,255,255,255,0,0,255,56,21,255,255],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/jeeo_TF-SH330 b/_templates/jeeo_TF-SH330
index 0d3ecfe46..a7cd45506 100644
--- a/_templates/jeeo_TF-SH330
+++ b/_templates/jeeo_TF-SH330
@@ -6,7 +6,7 @@ type: Plug
standard: us
link: https://www.amazon.com/Jeeo-Assistant-Required-Certified-TF-SH330/dp/B07SPYZFRR
image: https://images-na.ssl-images-amazon.com/images/I/513EmLkhiqL._SL1015_.jpg
-template: '{"NAME":"Jeeo TF-SH330","GPIO":[56,255,255,255,255,255,0,0,255,17,255,21,255],"FLAG":1,"BASE":18}'
+template: {"NAME":"Jeeo TF-SH330","GPIO":[56,255,255,255,255,255,0,0,255,17,255,21,255],"FLAG":1,"BASE":18}
link_alt:
---
diff --git a/_templates/jinvoo_SM-AW713 b/_templates/jinvoo_SM-AW713
index 5f4583d20..e4edaf11b 100644
--- a/_templates/jinvoo_SM-AW713
+++ b/_templates/jinvoo_SM-AW713
@@ -6,7 +6,7 @@ type: Valve
standard: global
link: https://www.amazon.co.uk/Jinvoo-Control-SM-AW713-Application-Program/dp/B07H3RT8X8
image: https://images-na.ssl-images-amazon.com/images/I/61mxgUPxbSL._SL1500_.jpg
-template: '{"NAME":"Jinvoo Valve","GPIO":[0,0,0,0,0,52,0,0,21,17,0,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"Jinvoo Valve","GPIO":[0,0,0,0,0,52,0,0,21,17,0,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/jinvoo_SM-PW701U b/_templates/jinvoo_SM-PW701U
index 231f60fd1..84afa5f72 100644
--- a/_templates/jinvoo_SM-PW701U
+++ b/_templates/jinvoo_SM-PW701U
@@ -6,7 +6,7 @@ type: Plug
standard: us
link: https://www.amazon.com/Jinvoo-Wireless-Outlet-Schedule-Control/dp/B07121PYWQ
image: https://user-images.githubusercontent.com/5904370/66994022-e6f01880-f0cc-11e9-906d-d5861885d3d9.png
-template: '{"NAME":"SM-PW702","GPIO":[0,0,0,0,57,56,0,0,21,17,0,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"SM-PW702","GPIO":[0,0,0,0,57,56,0,0,21,17,0,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/jinvoo_SM-PW713 b/_templates/jinvoo_SM-PW713
index d028af438..d0b22ed73 100644
--- a/_templates/jinvoo_SM-PW713
+++ b/_templates/jinvoo_SM-PW713
@@ -6,7 +6,7 @@ type: Valve
standard: global
link: https://www.amazon.de/gp/product/B019YTYZX0
image: https://images-na.ssl-images-amazon.com/images/I/61ObcAxwbzL._SL1500_.jpg
-template: '{"NAME":"Jinvoo Valve","GPIO":[0,0,0,0,21,52,0,0,17,53,0,0,0],"FLAG":1,"BASE":18}'
+template: {"NAME":"Jinvoo Valve","GPIO":[0,0,0,0,21,52,0,0,17,53,0,0,0],"FLAG":1,"BASE":18}
link_alt:
---
diff --git a/_templates/jinvoo_SM-PW762U b/_templates/jinvoo_SM-PW762U
index c834ea33b..23089f1ff 100644
--- a/_templates/jinvoo_SM-PW762U
+++ b/_templates/jinvoo_SM-PW762U
@@ -6,7 +6,7 @@ type: Plug
standard: us
link: https://www.canadacomputers.com/product_info.php?cPath=1163_1577&item_id=130064
image: https://user-images.githubusercontent.com/16266909/65367341-ea8f9d00-dbfd-11e9-8bd2-d74ed969ca40.jpg
-template: '{"NAME":"SM-PW762U","GPIO":[0,0,0,0,158,56,0,0,21,17,22,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"SM-PW762U","GPIO":[0,0,0,0,158,56,0,0,21,17,22,0,0],"FLAG":0,"BASE":18}
link_alt: https://www.alibaba.com/trade/search?fsb=y&IndexArea=product_en&CatId=&SearchText=SM-PW762U
---
diff --git a/_templates/jinvoo_SM-SW101-1 b/_templates/jinvoo_SM-SW101-1
index ecb50f924..355081822 100644
--- a/_templates/jinvoo_SM-SW101-1
+++ b/_templates/jinvoo_SM-SW101-1
@@ -6,7 +6,7 @@ type: Switch
standard: eu
link: https://www.amazon.de/dp/B078GM4D39/
image: http://www.xenon.cn/web/userfiles/product/big/SM-SW101E-1.jpg
-template: '{"NAME":"SM-SW101-1","GPIO":[52,0,0,18,0,0,0,0,17,21,0,0,0],"FLAG":1,"BASE":18}'
+template: {"NAME":"SM-SW101-1","GPIO":[52,0,0,18,0,0,0,0,17,21,0,0,0],"FLAG":1,"BASE":18}
link_alt:
---
diff --git a/_templates/jinvoo_SM-SW101-2 b/_templates/jinvoo_SM-SW101-2
index 4c17934d4..9dcc653cb 100644
--- a/_templates/jinvoo_SM-SW101-2
+++ b/_templates/jinvoo_SM-SW101-2
@@ -6,7 +6,7 @@ type: Switch
standard: eu
link: https://www.amazon.de/dp/B078GW29SK
image: http://www.jinvoosmart.com.cn/web/userfiles/product/middle/-E6-AC-A7-E8-A7-84-E9-9D-A2-E6-9D-BF2-E5-BC-80.jpg
-template: '{"NAME":"SM-SW101-2","GPIO":[52,0,0,18,22,0,0,0,17,21,0,0,0],"FLAG":1,"BASE":18}'
+template: {"NAME":"SM-SW101-2","GPIO":[52,0,0,18,22,0,0,0,17,21,0,0,0],"FLAG":1,"BASE":18}
link_alt:
---
diff --git a/_templates/jinvoo_SM-SW101-3 b/_templates/jinvoo_SM-SW101-3
index c0556e9c5..642fed915 100644
--- a/_templates/jinvoo_SM-SW101-3
+++ b/_templates/jinvoo_SM-SW101-3
@@ -6,7 +6,7 @@ type: Switch
standard: eu
link: https://www.amazon.de/dp/B07MHXP46M
image: https://images-na.ssl-images-amazon.com/images/I/61FxMddrP4L._SL1500_.jpg
-template: '{"NAME":"Jinvoo Wall Sw","GPIO":[52,0,0,18,22,19,0,0,17,21,0,23,0],"FLAG":1,"BASE":18}'
+template: {"NAME":"Jinvoo Wall Sw","GPIO":[52,0,0,18,22,19,0,0,17,21,0,23,0],"FLAG":1,"BASE":18}
link_alt:
---
diff --git a/_templates/jinvoo_SM-SW101-C b/_templates/jinvoo_SM-SW101-C
index 3914a92ce..04c95b092 100644
--- a/_templates/jinvoo_SM-SW101-C
+++ b/_templates/jinvoo_SM-SW101-C
@@ -6,7 +6,7 @@ type: Switch
standard: eu
link: https://www.amazon.de/dp/B07CPK2FV5
image: https://images-na.ssl-images-amazon.com/images/I/51dE6Ei%2Bm8L._SY450_.jpg
-template: '{"NAME":"Jinvoo Curtain","GPIO":[52,0,0,18,22,19,0,0,17,21,0,23,0],"FLAG":1,"BASE":18}'
+template: {"NAME":"Jinvoo Curtain","GPIO":[52,0,0,18,22,19,0,0,17,21,0,23,0],"FLAG":1,"BASE":18}
link_alt: https://www.alibaba.com/product-detail/Jinvoo-Wireless-Remote-Controlled-Works-with_60717264270.html
---
diff --git a/_templates/jomarto_9W b/_templates/jomarto_9W
index 81492ade1..6cc3ee611 100644
--- a/_templates/jomarto_9W
+++ b/_templates/jomarto_9W
@@ -1,12 +1,14 @@
---
date_added: 2019-06-13
-title: Jomarto 9W B22
-category: light
-type: Bulb
-standard: uk
+title: Jomarto 9W
+type: RGB
+category: bulb
+standard:
+ - B22
+ - E27
link: https://www.amazon.co.uk/dp/B07F6Z3JLS
image: https://images-eu.ssl-images-amazon.com/images/I/31Ft5pQrT%2BL._SL500_AC_SS350_.jpg
-template: '{"NAME":"Jomarto Wifi S","GPIO":[0,0,0,0,40,0,0,0,38,39,37,0,0],"FLAG":1,"BASE":18}'
+template: {"NAME":"Jomarto Wifi S","GPIO":[0,0,0,0,40,0,0,0,38,39,37,0,0],"FLAG":1,"BASE":18}
link_alt:
---
diff --git a/_templates/jules_v b/_templates/jules_v
index 0cd50cdf1..c638a528f 100644
--- a/_templates/jules_v
+++ b/_templates/jules_v
@@ -6,7 +6,7 @@ type: Plug
standard: eu
link: https://www.amazon.de/gp/product/B07MD3Y6HL/
image: https://images-eu.ssl-images-amazon.com/images/I/31W%2BxwkOtnL._UL320_.jpg
-template: '{"NAME":"Jules-V_UV","GPIO":[56,0,0,0,0,134,0,0,21,17,132,57,131],"FLAG":0,"BASE":18}'
+template: {"NAME":"Jules-V_UV","GPIO":[56,0,0,0,0,134,0,0,21,17,132,57,131],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/julesv_NX-SM300 b/_templates/julesv_NX-SM300
index dcb312f0b..b7a648a10 100644
--- a/_templates/julesv_NX-SM300
+++ b/_templates/julesv_NX-SM300
@@ -6,7 +6,7 @@ type: Plug
standard: us
link: https://www.amazon.co.jp/%E3%82%B9%E3%83%9E%E3%83%BC%E3%83%88%E3%83%97%E3%83%A9%E3%82%B0-JULES-V%E3%83%9F%E3%83%8BWifi%E3%82%A2%E3%82%A6%E3%83%88%E3%83%AC%E3%83%83%E3%83%88%EF%BC%88Alexa%E3%80%81Google-Home%EF%BC%86IFTTT%E3%81%AB%E5%AF%BE%E5%BF%9C%EF%BC%89-%E3%83%AA%E3%83%A2%E3%83%BC%E3%83%88%E3%82%B3%E3%83%B3%E3%83%88%E3%83%AD%E3%83%BC%E3%83%AB%E3%81%A7%E3%81%8D%E3%82%8B-%E3%83%8F%E3%83%96%E3%81%AF%E4%B8%8D%E8%A6%81-%E3%83%9B%E3%83%AF%E3%82%A4%E3%83%882%E5%80%8B%E3%83%91%E3%83%83%E3%82%AF%EF%BC%88%E3%82%A2%E3%83%83%E3%83%97%E3%82%B0%E3%83%AC%E3%83%BC%E3%83%89%E3%83%90%E3%83%BC%E3%82%B8%E3%83%A7%E3%83%B3%EF%BC%89/dp/B07MBFD2VV
image: https://i.postimg.cc/hGh7Hxch/p.png
-template: '{"NAME":"NX-SM300","GPIO":[52,0,0,0,0,130,0,0,21,132,133,52,0],"FLAG":0,"BASE":6}'
+template: {"NAME":"NX-SM300","GPIO":[52,0,0,0,0,130,0,0,21,132,133,52,0],"FLAG":0,"BASE":6}
link_alt:
---
diff --git a/_templates/kainsy_E27 b/_templates/kainsy_E27
index 9ad0d973b..cf4746782 100644
--- a/_templates/kainsy_E27
+++ b/_templates/kainsy_E27
@@ -1,12 +1,12 @@
---
date_added: 2019-07-04
-title: Kainsy 7W E27 RGBW
-category: light
-type: Bulb
-standard: global
+title: Kainsy 7W
+type: RGBW
+category: bulb
+standard: E27
link: https://www.amazon.de/KAINSY-Gl%C3%BChbirne-Kompatibel-%C3%A4quivalent-Millionen/dp/B075WQYQ94
-image: https://user-images.githubusercontent.com/5904370/66717605-1fe17200-eddb-11e9-9c76-3bb3ccc9a9b0.png
-template: '{"NAME":"KAINSY","GPIO":[17,0,0,0,143,144,0,0,0,0,0,0,0],"FLAG":0,"BASE":27}'
+image: https://user-images.githubusercontent.com/5904370/70088114-e9271b80-1615-11ea-8278-ba0c6bd100a5.png
+template: {"NAME":"KAINSY","GPIO":[17,0,0,0,143,144,0,0,0,0,0,0,0],"FLAG":0,"BASE":27}
link_alt:
---
diff --git a/_templates/kesen_KS-604 b/_templates/kesen_KS-604
index 99d13b1ab..7020da2cd 100644
--- a/_templates/kesen_KS-604
+++ b/_templates/kesen_KS-604
@@ -6,7 +6,7 @@ type: Wall Outlet
standard: us
link: https://hidin.en.alibaba.com/product/60797577499-807823258/TUYA_WIFI_smart_US_standard_3_pin_wall_receptacle_outlet_works_with_alexa.html
image: https://sc01.alicdn.com/kf/HTB1JmdeKxSYBuNjSspjq6x73VXaV/TUYA-WIFI-smart-US-standard-3-pin.jpg
-template: '{"NAME":"KS-604","GPIO":[255,255,52,255,255,18,0,0,22,21,255,255,17],"FLAG":0,"BASE":18}'
+template: {"NAME":"KS-604","GPIO":[255,255,52,255,255,18,0,0,22,21,255,255,17],"FLAG":0,"BASE":18}
link_alt: https://www.ebay.ca/itm/Smart-Home-Wifi-Wall-Smart-Socket-for-Alexa-Google-Assistand-IFTTT/202605478827
---
diff --git a/_templates/kesen_KS-604S b/_templates/kesen_KS-604S
index 5a531be60..e48af7704 100644
--- a/_templates/kesen_KS-604S
+++ b/_templates/kesen_KS-604S
@@ -6,7 +6,7 @@ type: Wall Outlet
standard: us
link: https://www.amazon.com/gp/product/B07JZ124FK
image: https://raw.githubusercontent.com/DavinKD/SmartThings/master/DeviceImages/ks-604s.jpg
-template: '{"NAME":"KS-604S","GPIO":[255,255,31,255,255,18,0,0,22,21,255,255,17],"FLAG":1,"BASE":18}'
+template: {"NAME":"KS-604S","GPIO":[255,255,31,255,255,18,0,0,22,21,255,255,17],"FLAG":1,"BASE":18}
link_alt: https://www.alibaba.com/product-detail/New-Design-2-way-Double-Power_60817067611.html
---
diff --git a/_templates/kimire_S12 b/_templates/kimire_S12
index bf57bd0c2..2fff0f6b6 100644
--- a/_templates/kimire_S12
+++ b/_templates/kimire_S12
@@ -6,7 +6,7 @@ type: Plug
standard: us
link: https://www.amazon.com/gp/product/B07FNQ7YP9
image: https://images-na.ssl-images-amazon.com/images/I/61ALsmwVbKL._SL1500_.jpg
-template: '{"NAME":"Kimire S12","GPIO":[255,255,255,17,255,255,0,0,255,56,21,255,255],"FLAG":0,"BASE":18}'
+template: {"NAME":"Kimire S12","GPIO":[255,255,255,17,255,255,0,0,255,56,21,255,255],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/kinetic_switch_SS311KWS b/_templates/kinetic_switch_SS311KWS
index 560a40484..13be0bcfe 100644
--- a/_templates/kinetic_switch_SS311KWS
+++ b/_templates/kinetic_switch_SS311KWS
@@ -1,12 +1,12 @@
---
date_added: 2019-09-06
title: SS311KWS RF Kinetic Switch and WiFi
-category: relay
+category: switch
type: Relay
standard: eu
link: https://www.aliexpress.com/item/32953812650.html
image: https://ae01.alicdn.com/kf/HTB1g6EXNFzqK1RjSZFCq6zbxVXa5.jpg
-template: '{"NAME":"SS311KWS","GPIO":[0,0,0,0,52,0,0,0,21,17,0,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"SS311KWS","GPIO":[0,0,0,0,52,0,0,0,21,17,0,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/king-link_C128 b/_templates/king-link_C128
index 70ec9d401..b253d627d 100644
--- a/_templates/king-link_C128
+++ b/_templates/king-link_C128
@@ -6,7 +6,7 @@ type: Outdoor Plug
standard: us
link: https://www.amazon.com/dp/B07MNYJWHD
image: https://images-na.ssl-images-amazon.com/images/I/614a6V1dPHL._SL1500_.jpg
-template: '{"NAME":"King-Link C128","GPIO":[0,0,55,0,22,53,0,0,23,52,17,21,54],"FLAG":0,"BASE":18}'
+template: {"NAME":"King-Link C128","GPIO":[0,0,55,0,22,53,0,0,23,52,17,21,54],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/king-link_KL-US-WF002 b/_templates/king-link_KL-US-WF002
index 433418df4..536df9b38 100644
--- a/_templates/king-link_KL-US-WF002
+++ b/_templates/king-link_KL-US-WF002
@@ -6,7 +6,7 @@ type: Plug
standard: us
link: https://www.amazon.com/KING-LINK-Wireless-Control-Outlets-Compatible/dp/B077B5X2X9
image: https://images-na.ssl-images-amazon.com/images/I/51WA53t9JqL._SL1500_.jpg
-template: '{"NAME":"Kinglink-plug","GPIO":[0,0,0,0,0,21,0,0,52,17,0,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"Kinglink-plug","GPIO":[0,0,0,0,0,21,0,0,52,17,0,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/kingart_N2 b/_templates/kingart_N2
index 8006eb97f..32d1b4f4c 100644
--- a/_templates/kingart_N2
+++ b/_templates/kingart_N2
@@ -6,7 +6,7 @@ type: Switch
standard: eu
link: https://www.aliexpress.com/item/32917838577.html?spm=a2g0s.9042311.0.0.27426c37DTB6ob
image: https://ae01.alicdn.com/kf/HTB1hxsTukUmBKNjSZFOq6yb2XXaC.jpg
-template: '{"NAME":"kingart N2","GPIO":[17,255,255,255,255,22,18,255,21,255,255,255,255],"FLAG":15,"BASE":18}'
+template: {"NAME":"kingart N2","GPIO":[17,255,255,255,255,22,18,255,21,255,255,255,255],"FLAG":15,"BASE":18}
link_alt:
---
diff --git a/_templates/kingart_dimmer b/_templates/kingart_dimmer
index 24004a834..8ee55322a 100644
--- a/_templates/kingart_dimmer
+++ b/_templates/kingart_dimmer
@@ -6,7 +6,7 @@ type: Dimmer
standard: eu
link: http://www.aliexpress.com/item/Led-Dimmer-220v-Smart-Wifi-Switch-Touch-Control-Stepless-Dimmer-With-Bulb-Compatible-With-Amazon-Alexa/32891383747.html
image: https://user-images.githubusercontent.com/5904370/54643685-c9f05a00-4a97-11e9-9b51-a99c2108b986.png
-template: '{"NAME":"PS-16-DZ","GPIO":[255,148,255,149,255,255,0,0,255,52,255,255,255],"FLAG":0,"BASE":58}'
+template: {"NAME":"PS-16-DZ","GPIO":[255,148,255,149,255,255,0,0,255,52,255,255,255],"FLAG":0,"BASE":58}
link_alt:
---
On AliExpress you can buy a wifi dimmer for mains voltage (110 or 220V) It's a brandless dimmer, but can be found here: [AliExpress page](http://www.aliexpress.com/item/Led-Dimmer-220v-Smart-Wifi-Switch-Touch-Control-Stepless-Dimmer-With-Bulb-Compatible-With-Amazon-Alexa/32891383747.html?spm=a2g0s.9042311.0.0.300d4c4dx6emz1)
diff --git a/_templates/kmc-4 b/_templates/kmc-4
index 8ac5febf1..e1b724091 100644
--- a/_templates/kmc-4
+++ b/_templates/kmc-4
@@ -6,7 +6,7 @@ type: Plug
standard: us
link: https://www.amazon.com/dp/B0786B1LGM
image: https://images-na.ssl-images-amazon.com/images/I/41W9sOQhBKL._SX679_.jpg
-template: '{"NAME":"KMC 4 Outlet","GPIO":[0,56,0,0,133,132,0,0,130,22,23,21,17],"FLAG":0,"BASE":36}'
+template: {"NAME":"KMC 4 Outlet","GPIO":[0,56,0,0,133,132,0,0,130,22,23,21,17],"FLAG":0,"BASE":36}
link_alt:
---
diff --git a/_templates/kmc_5 b/_templates/kmc_5
index 80420e545..351e8864a 100644
--- a/_templates/kmc_5
+++ b/_templates/kmc_5
@@ -6,7 +6,7 @@ type: Power Strip
standard: us
link: https://www.amazon.com/gp/product/B07G2WXK3N
image: https://images-na.ssl-images-amazon.com/images/I/51W8zEDubLL._SL1000_.jpg
-template: '{"NAME":"KMC 5-Outlet","GPIO":[56,0,0,0,25,9,0,0,22,21,23,0,24],"FLAG":0,"BASE":18}'
+template: {"NAME":"KMC 5-Outlet","GPIO":[56,0,0,0,25,9,0,0,22,21,23,0,24],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/kmc_70008 b/_templates/kmc_70008
index 75c8cd793..dfa3ed1c3 100644
--- a/_templates/kmc_70008
+++ b/_templates/kmc_70008
@@ -6,7 +6,7 @@ type: Switch
standard: us
link: https://www.amazon.com/KMC-Wireless-Lighting-Compatible-Assistant/dp/B078HFR27T
image: https://user-images.githubusercontent.com/5904370/54651712-5f014c00-4ab4-11e9-8622-8f4104632427.png
-template: '{"NAME":"KMC 70008","GPIO":[17,255,255,0,0,255,0,0,0,56,21,255,255],"FLAG":0,"BASE":18}'
+template: {"NAME":"KMC 70008","GPIO":[17,255,255,0,0,255,0,0,0,56,21,255,255],"FLAG":0,"BASE":18}
link_alt:
---
I didn't see any place to add pin headers, but the module has the usual ESP-12 pin layout, so I soldered right to the pins. You can skip soldering to GPIO 0 and just hold the button down when booting the device to get into flash mode.
diff --git a/_templates/kmc_70011 b/_templates/kmc_70011
index 7139b05e6..903f8b43b 100644
--- a/_templates/kmc_70011
+++ b/_templates/kmc_70011
@@ -5,7 +5,7 @@ type: Plug
standard: us
link: https://www.amazon.com/KMC-Timing-Monitoring-Network-125V-240V/dp/B06XRX2GTQ
image: https://user-images.githubusercontent.com/5904370/57947140-5f646a80-78de-11e9-9a75-dd821ac69e6b.png
-template: '{"NAME":"KMC 70011","GPIO":[17,0,0,0,133,132,0,0,130,56,21,0,0],"FLAG":0,"BASE":36}'
+template: {"NAME":"KMC 70011","GPIO":[17,0,0,0,133,132,0,0,130,56,21,0,0],"FLAG":0,"BASE":36}
link_alt:
---
## Serial Flashing
diff --git a/_templates/koaanw_CD302-EU-1 b/_templates/koaanw_CD302-EU-1
index a1f4f8009..f16e6fac5 100644
--- a/_templates/koaanw_CD302-EU-1
+++ b/_templates/koaanw_CD302-EU-1
@@ -6,7 +6,7 @@ type: Switch
standard: eu
link: https://www.amazon.de/Lichtschalter-Touchscreen-schalter-Timing-Funktion-%C3%9Cberlastungsschutz-erforderlich/dp/B0793QTY3V
image: https://images-na.ssl-images-amazon.com/images/I/51WRHUWxtsL._SX466_.jpg
-template: '{"NAME":"CD302-EU-1","GPIO":[0,0,0,0,157,56,0,0,21,17,0,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"CD302-EU-1","GPIO":[0,0,0,0,157,56,0,0,21,17,0,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/koaanw_CD302-EU-2 b/_templates/koaanw_CD302-EU-2
index 8eeb0fb66..958c66467 100644
--- a/_templates/koaanw_CD302-EU-2
+++ b/_templates/koaanw_CD302-EU-2
@@ -6,7 +6,7 @@ type: Switch
standard: eu
link: https://www.amazon.de/gp/product/B0793STKZP
image: https://images-na.ssl-images-amazon.com/images/I/51z8%2B3am5NL._SL1500_.jpg
-template: '{"NAME":"CD302-EU-2","GPIO":[157,0,0,0,0,18,0,0,17,21,57,22,56],"FLAG":0,"BASE":18}'
+template: {"NAME":"CD302-EU-2","GPIO":[157,0,0,0,0,18,0,0,17,21,57,22,56],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/koaanw_CD302-EU-3 b/_templates/koaanw_CD302-EU-3
index dfccd3831..693f2dadd 100644
--- a/_templates/koaanw_CD302-EU-3
+++ b/_templates/koaanw_CD302-EU-3
@@ -6,7 +6,7 @@ type: Switch
standard: eu
link: https://smile.amazon.de/gp/product/B0794PK4WR
image: https://images-na.ssl-images-amazon.com/images/I/51GKC34vN5L._SL1500_.jpg
-template: '{"NAME":"CD302-EU-3","GPIO":[158,53,0,19,23,18,0,0,17,21,54,22,52],"FLAG":0,"BASE":18}'
+template: {"NAME":"CD302-EU-3","GPIO":[158,53,0,19,23,18,0,0,17,21,54,22,52],"FLAG":0,"BASE":18}
link_alt: https://de.aliexpress.com/item/32947679016.html?spm=a2g0s.9042311.0.0.f6f24c4d2ei9cP
---
diff --git a/_templates/kogan_10w_b22 b/_templates/kogan_10w_b22
index f9148a137..19fd76a53 100644
--- a/_templates/kogan_10w_b22
+++ b/_templates/kogan_10w_b22
@@ -1,12 +1,12 @@
---
date_added: 2019-04-15
-title: Kogan SmarterHome™ White 10W B22
-category: light
-type: Bulb
-standard: anzac
+title: Kogan SmarterHome™ White 10W
+type: CCT
+category: bulb
+standard: B22
link: https://www.kogan.com/au/buy/kogan-smarterhome-10w-white-smart-bulb-b22/
image: https://user-images.githubusercontent.com/5904370/56110927-779b3f80-5f56-11e9-92f2-8b6993b8b1d9.png
-template: '{"NAME":"Kogan White/Wa","GPIO":[0,0,0,0,37,40,0,0,41,38,39,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"Kogan White/Wa","GPIO":[0,0,0,0,37,40,0,0,41,38,39,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/kogan_smarterhome b/_templates/kogan_smarterhome
index ec23fec16..cf07dd28c 100644
--- a/_templates/kogan_smarterhome
+++ b/_templates/kogan_smarterhome
@@ -6,7 +6,7 @@ type: Plug
standard: anzac
link: https://www.kogan.com/au/buy/kogan-smarterhome-smart-plug-with-energy-meter-pack-of-4-kogan/
image: https://user-images.githubusercontent.com/5904370/55288894-d8574380-53be-11e9-9738-0a801b0705b5.png
-template: '{"NAME":"Kogan Smart Sw","GPIO":[17,0,0,0,133,132,0,0,131,56,21,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"Kogan Smart Sw","GPIO":[17,0,0,0,133,132,0,0,131,56,21,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/kogan_smarterhome_10W-B22 b/_templates/kogan_smarterhome_10W-B22
index 446302177..4a7596a88 100644
--- a/_templates/kogan_smarterhome_10W-B22
+++ b/_templates/kogan_smarterhome_10W-B22
@@ -1,12 +1,12 @@
---
date_added: 2019-10-31
-title: Kogan SmarterHome™ 10W RGBW
-category: light
-type: Bulb
-standard: anzac
+title: Kogan SmarterHome™ 10W
+type: RGBW
+category: bulb
+standard: B22
link: https://www.kogan.com/au/buy/kogan-smarterhome-10w-ambient-rgbw-smart-bulb-b22/
image: https://assets.kogan.com/files/product/SmartBulbs/KASB10RB22HA_2.jpg
-template: '{"NAME":"Kogan RGB","GPIO":[0,0,0,0,140,37,0,0,0,0,141,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"Kogan RGB","GPIO":[0,0,0,0,140,37,0,0,0,0,141,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/kogan_smarterhome_T-20 b/_templates/kogan_smarterhome_T-20
index 55a4840f3..ce4bd7452 100644
--- a/_templates/kogan_smarterhome_T-20
+++ b/_templates/kogan_smarterhome_T-20
@@ -1,12 +1,12 @@
---
date_added: 2019-12-01
-title: Kogan SmarterHome™ ST-20 5W Filament
-category: light
-type: Bulb
-standard: anzac
+title: Kogan SmarterHome™ ST64 5W
+type: Filament
+category: bulb
+standard: B22
link: https://www.kogan.com/au/buy/kogan-smarterhome-5w-smart-dimmable-led-filament-bulb-st-20-e27-2pk/
image: https://user-images.githubusercontent.com/5904370/69923781-b232f780-14a7-11ea-9e02-2540dfbf7caf.png
-template: '{"NAME":"Kogan Filament","GPIO":[0,0,0,0,0,0,0,0,0,0,37,0,0],"FLAG":15,"BASE":18}'
+template: {"NAME":"Kogan Filament","GPIO":[0,0,0,0,0,0,0,0,0,0,37,0,0],"FLAG":15,"BASE":18}
link_alt:
---
diff --git a/_templates/kogan_smarterhome_kettle b/_templates/kogan_smarterhome_kettle
index 6768a7be0..d5ef3a580 100644
--- a/_templates/kogan_smarterhome_kettle
+++ b/_templates/kogan_smarterhome_kettle
@@ -6,7 +6,7 @@ type: Kettle
standard: anzac
link: https://www.kogan.com/au/buy/kogan-smarterhome-17l-smart-glass-kettle/
image: https://user-images.githubusercontent.com/5904370/68201568-4baedc80-ffc2-11e9-85a9-5c3172805740.png
-template: '{"NAME":"Kogan Kettle","GPIO":[255,107,255,108,255,255,0,0,255,255,255,255,255],"FLAG":0,"BASE":54}'
+template: {"NAME":"Kogan Kettle","GPIO":[255,107,255,108,255,255,0,0,255,255,255,255,255],"FLAG":0,"BASE":54}
link_alt:
---
diff --git a/_templates/kogeek_KLUP1 b/_templates/kogeek_KLUP1
index 49116c29b..89d032a58 100644
--- a/_templates/kogeek_KLUP1
+++ b/_templates/kogeek_KLUP1
@@ -6,7 +6,7 @@ type: Plug
standard: uk
link: https://www.amazon.co.uk/Koogeek-Compatible-Monitoring-Schedule-Function/dp/B07PDFD31Q
image: https://i.postimg.cc/xCFfrcnL/g-D3-Cr-W7-KQsi-O-GYliweiu-Q.png
-template: '{"NAME":"Koogeek-KLUP1","GPIO":[0,0,0,17,134,132,0,0,131,56,21,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"Koogeek-KLUP1","GPIO":[0,0,0,17,134,132,0,0,131,56,21,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/kogeek_W-DEXI b/_templates/kogeek_W-DEXI
index 2128dc5b3..469bd207e 100644
--- a/_templates/kogeek_W-DEXI
+++ b/_templates/kogeek_W-DEXI
@@ -6,7 +6,7 @@ type: Plug
standard: eu
link: https://www.amazon.it/gp/product/B07YQS25LB/ref=ppx_yo_dt_b_asin_image_o02_s00?ie=UTF8&th=1
image: https://user-images.githubusercontent.com/5904370/69923722-5a948c00-14a7-11ea-82c0-0fcf5a8c5025.png
-template: '{"NAME":"W-DEXI","GPIO":[0,90,0,0,134,132,0,0,130,52,21,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"W-DEXI","GPIO":[0,90,0,0,134,132,0,0,130,52,21,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/kohree_a19 b/_templates/kohree_a19
index 2eb4b3027..0670d0157 100644
--- a/_templates/kohree_a19
+++ b/_templates/kohree_a19
@@ -1,11 +1,11 @@
---
date_added: 2019-03-18
title: Kohree A19 7W
-category: light
-type: Bulb
-standard: us
+type: RGBCCT
+category: bulb
+standard: E26
link: https://www.amazon.com/gp/product/B07H258JCL
image: https://user-images.githubusercontent.com/5904370/54642725-9c0a1600-4a95-11e9-9f09-96c124d1a7bf.png
-template: '{"NAME":"Kohree VHP560","GPIO":[0,0,0,0,37,41,0,0,38,40,39,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"Kohree VHP560","GPIO":[0,0,0,0,37,41,0,0,38,40,39,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/koogeek_KLSP1 b/_templates/koogeek_KLSP1
index dde2229f8..1eea18c06 100644
--- a/_templates/koogeek_KLSP1
+++ b/_templates/koogeek_KLSP1
@@ -6,7 +6,7 @@ type: Plug
standard: eu
link: https://www.amazon.de/Smart-Koogeek-Intelligente-Steckdose-Alexa/dp/B07H3XDFRQ
image: https://images-na.ssl-images-amazon.com/images/I/41n8zQvF6eL._AC_SL1001_.jpg
-template: '{"NAME":"Koogeek-KLSP1","GPIO":[0,56,0,17,134,132,0,0,131,158,21,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"Koogeek-KLSP1","GPIO":[0,56,0,17,134,132,0,0,131,158,21,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/koogeek_kloe4 b/_templates/koogeek_kloe4
index 489fd76e8..23fdb42c7 100644
--- a/_templates/koogeek_kloe4
+++ b/_templates/koogeek_kloe4
@@ -6,7 +6,7 @@ type: Power Strip
standard: eu
link: https://www.koogeek.com/p-kloe4.html
image: https://img.tttcdn.com/product/xy/500/500/images/tomtopsite/K/KLOE4/KLOE4-15391659717421.jpg
-template: '{"NAME":"Koogeek KLOE4","GPIO":[0,56,0,17,22,21,0,0,23,24,25,0,0],"FLAG":1,"BASE":18}'
+template: {"NAME":"Koogeek KLOE4","GPIO":[0,56,0,17,22,21,0,0,23,24,25,0,0],"FLAG":1,"BASE":18}
link_alt:
---
diff --git a/_templates/kuled-ks602s b/_templates/kuled-ks602s
index ae9fee349..d9866670a 100644
--- a/_templates/kuled-ks602s
+++ b/_templates/kuled-ks602s
@@ -6,7 +6,7 @@ type: Switch
standard: us
link: https://www.amazon.com/Required-Wireless-Requires-Schedule-Compatible/dp/B079FDTG7T
image: https://user-images.githubusercontent.com/5904370/53685150-53253400-3d17-11e9-9dbb-0c868db95e11.png
-template: '{"NAME":"KULED","GPIO":[9,255,255,255,255,255,0,0,21,56,255,255,255],"FLAG":0,"BASE":18}'
+template: {"NAME":"KULED","GPIO":[9,255,255,255,255,255,0,0,21,56,255,255,255],"FLAG":0,"BASE":18}
link_alt:
---
Easily flashable with Tuya Convert
diff --git a/_templates/kuled_9_5W_A19_E26 b/_templates/kuled_9_5W_A19_E26
index 863027b01..749166e67 100644
--- a/_templates/kuled_9_5W_A19_E26
+++ b/_templates/kuled_9_5W_A19_E26
@@ -1,12 +1,12 @@
---
date_added: 2019-11-17
-title: Kuled 9.5W A19 E26 RGBW
-category: light
-type: Bulb
-standard: us
+title: Kuled 9.5W A19
+type: RGBW
+category: bulb
+standard: E26
link: https://www.amazon.ca/Multicolor-Compatible-Required-Equivalent-Changing/dp/B07SJBM59B
image: https://images-na.ssl-images-amazon.com/images/I/31OJkWzCLRL._AC_SY400_.jpg
-template: '{"NAME":"KULED 60W RGB","GPIO":[0,0,0,0,39,40,0,0,37,0,38,0,0],"FLAG":1,"BASE":18}'
+template: {"NAME":"KULED 60W RGB","GPIO":[0,0,0,0,39,40,0,0,37,0,38,0,0],"FLAG":1,"BASE":18}
link_alt:
---
diff --git a/_templates/kuled_k36 b/_templates/kuled_k36
index ed02c430e..45bf761ce 100644
--- a/_templates/kuled_k36
+++ b/_templates/kuled_k36
@@ -6,7 +6,7 @@ type: Switch
standard: us
link: https://www.amazon.com/Required-Wireless-Requires-Schedule-Compatible/dp/B079FDTG7T
image: https://user-images.githubusercontent.com/5904370/53685150-53253400-3d17-11e9-9dbb-0c868db95e11.png
-template: '{"NAME":"KULED-B","GPIO":[9,255,255,255,255,255,21,52,29,56,255,255,255],"FLAG":0,"BASE":18}'
+template: {"NAME":"KULED-B","GPIO":[9,255,255,255,255,255,21,52,29,56,255,255,255],"FLAG":0,"BASE":18}
link_alt: https://kuled.com/product/smart-wifi-light-switch-k36-2pack/
---
diff --git a/_templates/kygne_CD-301 b/_templates/kygne_CD-301
index a66a29fba..e7cc29084 100644
--- a/_templates/kygne_CD-301
+++ b/_templates/kygne_CD-301
@@ -6,7 +6,7 @@ type: Switch
standard: us
link: https://www.amazon.com/gp/product/B078M4WHPP/
image: https://images-na.ssl-images-amazon.com/images/I/71uXPWR7GnL._SL1500_.jpg
-template: '{"NAME":"KYGNE Touch","GPIO":[0,0,0,0,52,53,0,0,21,17,0,0,0],"FLAG":0,"BASE":10}'
+template: {"NAME":"KYGNE Touch","GPIO":[0,0,0,0,52,53,0,0,21,17,0,0,0],"FLAG":0,"BASE":10}
link_alt:
---
diff --git a/_templates/laduo_YX-DE01 b/_templates/laduo_YX-DE01
index 78d98d8b1..eaff9a1c2 100644
--- a/_templates/laduo_YX-DE01
+++ b/_templates/laduo_YX-DE01
@@ -6,7 +6,7 @@ type: Plug
standard: eu
link: https://www.amazon.de/Kompatibel-Fernsteuerung-Überlastungsschutz-erforderlich-10A-2200W-2/dp/B07D77GPLW
image: https://images-na.ssl-images-amazon.com/images/I/61vhVofiWsL._SL1500_.jpg
-template: '{"NAME":"YX-DE01","GPIO":[255,17,255,255,255,255,0,0,255,56,21,255,255],"FLAG":0,"BASE":18}'
+template: {"NAME":"YX-DE01","GPIO":[255,17,255,255,255,255,0,0,255,56,21,255,255],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/rgbw-E14-7W b/_templates/laideyi-7W
similarity index 69%
rename from _templates/rgbw-E14-7W
rename to _templates/laideyi-7W
index f91cf8bcc..d5909f394 100644
--- a/_templates/rgbw-E14-7W
+++ b/_templates/laideyi-7W
@@ -1,12 +1,12 @@
---
date_added: 2019-03-23
-title: RGBW 7W E14
-category: light
-type: Bulb
-standard: eu
+title: Laideyi 7W
+type: RGBW
+category: bulb
+standard: E14
link: https://www.aliexpress.com/item/7W-Wireless-WiFi-Smart-LED-Bulb-E27-B22-E14-RGB-Bulb-Support-Alexa-Google-Home-Voice/32920926027.html
image: https://user-images.githubusercontent.com/5904370/54867860-8e9aa780-4d85-11e9-85fe-2f10138b7ed2.png
-template: '{"NAME":"7W-E14-RGBW-La","GPIO":[0,0,0,0,38,37,0,0,39,0,40,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"7W-E14-RGBW-La","GPIO":[0,0,0,0,38,37,0,0,39,0,40,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/lc_technology_4ch b/_templates/lc_technology_4ch
index 16a48182f..cc23f4003 100644
--- a/_templates/lc_technology_4ch
+++ b/_templates/lc_technology_4ch
@@ -1,12 +1,12 @@
---
date_added: 2019-08-17
title: LC Technology 4CH
-category: relay
+category: switch
type: Relay
standard: eu
link: https://www.ebay.co.uk/itm/LC-Technology-Smart-Switch-IOT-2200W-10A-1-4Ch-LCWSS-Home-Wifi-Flux-Workshop/113799616350
image: https://user-images.githubusercontent.com/5904370/63218166-66a54980-c155-11e9-90ef-189c56e0ae0f.png
-template: '{"NAME":"LC-Tech_4CH ","GPIO":[52,255,17,255,255,255,0,0,21,22,23,24,255],"FLAG":0,"BASE":18}'
+template: {"NAME":"LC-Tech_4CH ","GPIO":[52,255,17,255,255,255,0,0,21,22,23,24,255],"FLAG":0,"BASE":18}
link_alt: http://www.chinalctech.com/cpzx/Programmer/427.html
---
diff --git a/_templates/lctech-pzem004 b/_templates/lctech-pzem004
index e3d3264cd..096edaeae 100644
--- a/_templates/lctech-pzem004
+++ b/_templates/lctech-pzem004
@@ -5,7 +5,7 @@ type: DIY
standard: us
link: https://github.com/arendst/Tasmota/wiki/US-240V-Clothes-Dryer-PZEM004T-Energy-Monitor
image: https://user-images.githubusercontent.com/34340210/50610479-19fc4f00-0ea1-11e9-8238-d46a93850a32.jpg
-template: '{"NAME":"HW-655 PZEM","GPIO":[0,63,0,62,0,0,0,0,0,0,0,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"HW-655 PZEM","GPIO":[0,63,0,62,0,0,0,0,0,0,0,0,0],"FLAG":0,"BASE":18}
link_alt:
---
The PZEM-004T together with a HW-655 Relay provide a good clamp-on energy monitor for a 240V clothes dryer.
diff --git a/_templates/ledenet b/_templates/ledenet
index 87d78aa19..a594bac18 100644
--- a/_templates/ledenet
+++ b/_templates/ledenet
@@ -6,7 +6,7 @@ type: LED Controller
standard: us
link: https://www.amazon.com/gp/product/B01DY56N8U
image: https://images-na.ssl-images-amazon.com/images/I/61GJlcY3I0L._SL1000_.jpg
-template: '{"NAME":"LEDEnet","GPIO":[0,255,56,255,147,0,0,0,38,39,37,40,0],"FLAG":0,"BASE":34}'
+template: {"NAME":"LEDEnet","GPIO":[0,255,56,255,147,0,0,0,38,39,37,40,0],"FLAG":0,"BASE":34}
link_alt:
---
### Hardware Information (from esptool):
diff --git a/_templates/lefun_SK2 b/_templates/lefun_SK2
index bfad989f7..fe39a6beb 100644
--- a/_templates/lefun_SK2
+++ b/_templates/lefun_SK2
@@ -6,7 +6,7 @@ type: Power Strip
standard: us
link: https://www.lefunsmart.com/products/wifi-smart-power-strip-smart-home-surge-protector-strip-with-4-usb-and-4-individually-controlled-smart-plugs-work-with-alexa-and-google-home-timing-function-remote-control-resetable-circuit-break?variant=6880803913764
image: https://camo.githubusercontent.com/0af8afac2ad8d6fe296ada21b711726e140ed675/68747470733a2f2f696d616765732d6e612e73736c2d696d616765732d616d617a6f6e2e636f6d2f696d616765732f492f36312d37767077757a514c2e5f534c313530305f2e6a7067
-template: '{"NAME":"LeFun SK2","GPIO":[0,0,0,17,22,21,0,0,23,24,25,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"LeFun SK2","GPIO":[0,0,0,17,22,21,0,0,23,24,25,0,0],"FLAG":0,"BASE":18}
link_alt:
---
The LeFun SK2 has 4 mains power and 4 USB ports. Each mains power is independently controlled and the USB group is controllable via a solid state relay. The ESP8266 module inside is likely a TYWE3S by Tuya but I didn't open the case and use the tuya-convert tool to flash.
diff --git a/_templates/legelite_e26 b/_templates/legelite_e26
index 1db7e99cf..d174a9787 100644
--- a/_templates/legelite_e26
+++ b/_templates/legelite_e26
@@ -1,12 +1,12 @@
---
date_added: 2019-03-24
-title: Legelite E26
-category: light
-type: Bulb
-standard: us
+title: Legelite A60 7W
+type: RGBCCT
+category: bulb
+standard: E26
link: https://www.amazon.com/gp/product/B07GR4SN63
image: https://images-na.ssl-images-amazon.com/images/I/51MfyefdXiL._SL1150_.jpg
-template: '{"NAME":"Legelite E26","GPIO":[0,0,0,0,37,40,0,0,38,41,39,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"Legelite E26","GPIO":[0,0,0,0,37,40,0,0,38,41,39,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/lepower_outdoor b/_templates/lepower_outdoor
index c85d436d0..123a4c65f 100644
--- a/_templates/lepower_outdoor
+++ b/_templates/lepower_outdoor
@@ -6,7 +6,7 @@ type: Outdoor Plug
standard: us
link: https://www.amazon.com/gp/product/B07KYFP8F8
image: https://user-images.githubusercontent.com/10296053/54907967-d0763b80-4eb4-11e9-8684-eaca6e1ef06b.jpg
-template: '{"NAME":"LEPOWER Outdoo","GPIO":[255,255,255,255,56,57,0,0,21,17,22,255,255],"FLAG":0,"BASE":18}'
+template: {"NAME":"LEPOWER Outdoo","GPIO":[255,255,255,255,56,57,0,0,21,17,22,255,255],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/leshp_KS-501 b/_templates/leshp_KS-501
index 5439938b8..f5ae94721 100644
--- a/_templates/leshp_KS-501
+++ b/_templates/leshp_KS-501
@@ -6,7 +6,7 @@ type: Plug
standard: us
link: https://www.aliexpress.com/item/4000057138899.html
image: https://ae01.alicdn.com/kf/H5b24edc256574beb89883c33a5e3f26bc.jpg
-template: '{"NAME":"LESHP KS-501","GPIO":[17,0,0,0,0,0,0,0,21,56,0,0,0],"FLAG":0,"BASE":1}'
+template: {"NAME":"LESHP KS-501","GPIO":[17,0,0,0,0,0,0,0,21,56,0,0,0],"FLAG":0,"BASE":1}
link_alt: https://www.aliexpress.com/item/4000149127051.html
---
diff --git a/_templates/linganzh_16a b/_templates/linganzh_16a
index 02eb66ace..468517150 100644
--- a/_templates/linganzh_16a
+++ b/_templates/linganzh_16a
@@ -6,7 +6,7 @@ type: Plug
standard: us
link: https://www.amazon.ca/dp/B07D4936JC
image: https://images-na.ssl-images-amazon.com/images/I/41wbjeaQOQL._SX679_.jpg
-template: '{"NAME":"Linganzh Smart","GPIO":[56,0,0,0,0,0,0,0,0,17,0,21,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"Linganzh Smart","GPIO":[56,0,0,0,0,0,0,0,0,17,0,21,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/linghanzh_LWE3 b/_templates/linghanzh_LWE3
index 85d779a54..063e84ba5 100644
--- a/_templates/linghanzh_LWE3
+++ b/_templates/linghanzh_LWE3
@@ -1,12 +1,12 @@
---
date_added: 2019-09-14
-title: Linganzh LWE3 6W RGBW
-category: light
-type: Bulb
-standard: eu
+title: Linganzh LWE3 6W
+type: RGBW
+category: bulb
+standard: E27
link: https://www.amazon.com/gp/aw/d/B074QFZ6B5
image: https://m.media-amazon.com/images/I/31w72X0tMdL._SCLZZZZZZZ__US284_.jpg
-template: '{"NAME":"Linganzh LWE3 ","GPIO":[0,0,0,0,0,38,0,0,39,0,40,37,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"Linganzh LWE3 ","GPIO":[0,0,0,0,0,38,0,0,39,0,40,37,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/linknode_R4 b/_templates/linknode_R4
index 5c7d6a708..ccda21468 100644
--- a/_templates/linknode_R4
+++ b/_templates/linknode_R4
@@ -1,12 +1,12 @@
---
date_added: 2019-05-14
title: LinkNode R4
-category: relay
+category: switch
type: Relay
standard: global
link: https://www.amazon.com/LinkSprite-211201004-Arduino-Compatible-Wi-Fi-Controller/dp/B01NB0XJ0F
image: https://images-na.ssl-images-amazon.com/images/I/518TiGyA0fL.jpg
-template: '{"NAME":"LinkNode R4","GPIO":[0,0,0,0,0,0,0,0,21,22,23,0,24],"FLAG":0,"BASE":18}'
+template: {"NAME":"LinkNode R4","GPIO":[0,0,0,0,0,0,0,0,21,22,23,0,24],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/linknode_R8 b/_templates/linknode_R8
index 89a8aabd3..cec594b8b 100644
--- a/_templates/linknode_R8
+++ b/_templates/linknode_R8
@@ -1,12 +1,12 @@
---
date_added: 2019-05-14
title: LinkNode R8
-category: relay
+category: switch
type: Relay
standard: global
link: https://www.amazon.com/LinkSprite-211201005-Arduino-Compatible-Wi-Fi-Controller/dp/B01N2ALK8X
image: http://linksprite.com/wiki/images/thumb/a/ae/LinkNode_R8-5.jpg/640px-LinkNode_R8-5.jpg
-template: '{"NAME":"LinkNode R8","GPIO":[0,0,0,0,25,26,0,28,23,24,22,27,21],"FLAG":0,"BASE":18}'
+template: {"NAME":"LinkNode R8","GPIO":[0,0,0,0,25,26,0,28,23,24,22,27,21],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/lohas-a19 b/_templates/lohas-a19
deleted file mode 100644
index 6455b3e75..000000000
--- a/_templates/lohas-a19
+++ /dev/null
@@ -1,19 +0,0 @@
----
-date_added: 2019-03-09
-title: Lohas A19 RGBW E12
-category: light
-type: Bulb
-standard: us
-link: https://www.amazon.com/dp/B07MS13GY8
-image: https://images-na.ssl-images-amazon.com/images/I/51mEXRgUoiL._SL1200_.jpg
-template: '{"NAME":"Lohas","GPIO":[17,0,0,0,0,0,0,0,0,143,0,144,0],"FLAG":1,"BASE":26}'
-link_alt:
----
-
-
-Requires a [code change](https://github.com/arendst/Tasmota/pull/5326#issuecomment-466810201) for proper RGB operation
-
-
-
-
-
diff --git a/_templates/lohas_5W_E12 b/_templates/lohas_5W_E12
deleted file mode 100644
index 0e49eb952..000000000
--- a/_templates/lohas_5W_E12
+++ /dev/null
@@ -1,19 +0,0 @@
----
-date_added: 2019-10-04
-title: Lohas 5W E12
-category: light
-type: Bulb
-standard: us
-link: https://www.amazon.com/gp/product/B07951M4DN
-image: https://images-na.ssl-images-amazon.com/images/I/51NaD0UdsvL._SL1200_.jpg
-template: '{"NAME":"LH-5W-ZN01204","GPIO":[0,0,0,0,0,0,0,0,0,143,0,144,0],"FLAG":0,"BASE":27}'
-link_alt:
----
-
-
-
-
-
-
-
-
diff --git a/_templates/lohas_5W_MR16 b/_templates/lohas_5W_MR16
deleted file mode 100644
index aed93f195..000000000
--- a/_templates/lohas_5W_MR16
+++ /dev/null
@@ -1,12 +0,0 @@
----
-date_added: 2019-11-17
-title: Lohas 5W MR16
-category: light
-type: Bulb
-standard: global
-link: https://www.amazon.com/gp/product/B07JRD5GGB
-image: https://www.lohas-led.com/u_file/1901/products/14/784cdaca45.jpg.240x240.jpg
-template: '{"NAME":"Lohas MR16","GPIO":[0,0,0,0,40,0,0,0,38,39,37,0,0],"FLAG":0,"BASE":18}'
-link_alt:
----
-
diff --git a/_templates/lohas_9W_E26_RGBW b/_templates/lohas_9W_E26_RGBW
deleted file mode 100644
index b430c0055..000000000
--- a/_templates/lohas_9W_E26_RGBW
+++ /dev/null
@@ -1,21 +0,0 @@
----
-date_added: 2019-10-18
-title: Lohas 9W E26 RGBW
-category: light
-type: Bulb
-standard: us
-link: https://www.amazon.com/LED-LOHAS-Daylight-Changing-Equivalent/dp/B07T7W7ZMW
-image: https://user-images.githubusercontent.com/3240875/67115086-ff326700-f1a2-11e9-86ac-9d2b3a6a7f86.jpg
-template: '{"NAME":"Lohas RGBW","GPIO":[0,0,0,0,0,0,0,0,0,143,0,144,0],"FLAG":0,"BASE":18}'
-link_alt:
----
-
-This template requires Tasmota 6.6.0.18 or higher to work correctly. Tasmota-basic.bin files will not work with this template. Flash the regular full bin file of Tasmota.
-
-Side note if you do need to attach to the bulb via USB serial the pads are there right under the light diffuser to easily solder RX, TX, GND, and GPIO0 but 3v3 does not work. You will need to solder to the flash memory chip VCC leg to inject 3v3 power, it is easier to solder to this pin instead of the ESP8266 directly.
-
-
-
-
-
-
diff --git a/_templates/lohas_A19_60W_E26_RGB+CCT b/_templates/lohas_A19_60W_E26_RGB+CCT
deleted file mode 100644
index d16b6cd1d..000000000
--- a/_templates/lohas_A19_60W_E26_RGB+CCT
+++ /dev/null
@@ -1,13 +0,0 @@
----
-date_added: 2019-11-28
-title: Lohas A19 60W E26 RGB+CCT
-category: light
-type: Bulb
-standard: us
-link: https://www.amazon.com/LED-LOHAS-2700K-6000K-Daylight-Equivalent/dp/B07T7W7ZMW
-image: https://www.lohas-led.com/u_file/1911/products/11/779dce2733.jpg.640x640.jpg
-template: '{"NAME":"Lohas RGBWW","GPIO":[0,0,0,0,38,37,0,0,41,39,40,0,0],"FLAG":0,"BASE":18}'
-link_alt:
----
-
-New style of LOHAS 60W bulbs include the 5th channel for warm white.
diff --git a/_templates/lohas_LH-6W-5000k-MR16-2pack b/_templates/lohas_LH-6W-5000k-MR16-2pack
new file mode 100644
index 000000000..02f15f0b1
--- /dev/null
+++ b/_templates/lohas_LH-6W-5000k-MR16-2pack
@@ -0,0 +1,13 @@
+---
+date_added: 2019-11-17
+title: Lohas 6W
+type: CW
+category: bulb
+standard: MR16
+link: https://www.lohas-led.com/lohas-smart-wifi-light-bulbmr16-led-50-w-5000k-daylight-compatible-with-alexa-google-home-assistant-remote-control-by-smartphone-2-pack-p0235-p0235.html
+image: https://www.lohas-led.com/u_file/1901/products/14/784cdaca45.jpg.240x240.jpg
+template: {"NAME":"Lohas MR16","GPIO":[0,0,0,0,40,0,0,0,38,39,37,0,0],"FLAG":0,"BASE":18}
+link_alt: https://www.amazon.com/gp/product/B07JRD5GGB
+---
+
+Manufacturer reference: LH-6W-5000k-MR16-2pack
\ No newline at end of file
diff --git a/_templates/lohas_LH-APPW9-E26-4 b/_templates/lohas_LH-APPW9-E26-4
new file mode 100644
index 000000000..e3411dd61
--- /dev/null
+++ b/_templates/lohas_LH-APPW9-E26-4
@@ -0,0 +1,23 @@
+---
+date_added: 2019-10-18
+title: Lohas LH-APP 9W
+type: RGBW
+category: bulb
+standard: E26
+link: https://www.lohas-led.com/lohas-smart-led-bulb-a19-e26-810lm-60w-equivalent9w-rgb-dimmable-alexa-google-home-and-siri-compatible4-pack-p0232-p0232.html
+image: https://user-images.githubusercontent.com/3240875/67115086-ff326700-f1a2-11e9-86ac-9d2b3a6a7f86.jpg
+template: {"NAME":"Lohas RGBW","GPIO":[0,0,0,0,0,0,0,0,0,143,0,144,0],"FLAG":0,"BASE":18}
+link_alt: https://www.amazon.com/LED-LOHAS-Daylight-Changing-Equivalent/dp/B07T7W7ZMW
+---
+
+Manufacturer reference: LH-APPW9-E26-4
+
+Tasmota-basic.bin files will not work with this template. Flash the regular full bin file of Tasmota.
+
+Side note if you do need to attach to the bulb via USB serial the pads are there right under the light diffuser to easily solder RX, TX, GND, and GPIO0 but 3v3 does not work. You will need to solder to the flash memory chip VCC leg to inject 3v3 power, it is easier to solder to this pin instead of the ESP8266 directly.
+
+
+
+
+
+
diff --git a/_templates/lohas_LH-APPW9-E26-4_v2 b/_templates/lohas_LH-APPW9-E26-4_v2
new file mode 100644
index 000000000..fe9d7469d
--- /dev/null
+++ b/_templates/lohas_LH-APPW9-E26-4_v2
@@ -0,0 +1,14 @@
+---
+date_added: 2019-11-28
+title: Lohas LH-APP v2 9W
+type: RGBCCT
+category: bulb
+standard: E26
+link: https://www.lohas-led.com/lohas-smart-led-bulb-a19-e26-810lm-60w-equivalent9w-rgb-dimmable-alexa-google-home-and-siri-compatible4-pack-p0232-p0232.html
+image: https://www.lohas-led.com/u_file/1911/products/11/779dce2733.jpg.640x640.jpg
+template: {"NAME":"Lohas RGBWW","GPIO":[0,0,0,0,38,37,0,0,41,39,40,0,0],"FLAG":0,"BASE":18}
+link_alt: https://www.amazon.com/LED-LOHAS-2700K-6000K-Daylight-Equivalent/dp/B07T7W7ZMW
+---
+Manufacturer reference: LH-ZN001-9W-E12-N1
+
+New style of LOHAS 60W bulbs includes the 5th channel for warm white.
diff --git a/_templates/lohas_LH-Smart-5W-ZN01204 b/_templates/lohas_LH-Smart-5W-ZN01204
new file mode 100644
index 000000000..fd0d89559
--- /dev/null
+++ b/_templates/lohas_LH-Smart-5W-ZN01204
@@ -0,0 +1,13 @@
+---
+date_added: 2019-10-04
+title: Lohas LH-ZN012 5W
+type: RGBW
+category: bulb
+standard: E12
+link: https://www.amazon.com/gp/product/B07951M4DN
+image: https://images-na.ssl-images-amazon.com/images/I/51NaD0UdsvL._SL1200_.jpg
+template: {"NAME":"LH-5W-ZN01204","GPIO":[0,0,0,0,0,0,0,0,0,143,0,144,0],"FLAG":0,"BASE":27}
+link_alt: https://www.lohas-led.com/candle-2000k-9000k-smart-bulb-p0147.html
+---
+
+Manufacturer reference: LH-Smart-5W-ZN01204
\ No newline at end of file
diff --git a/_templates/lohas_LH-ZN001-9W-E12-N1 b/_templates/lohas_LH-ZN001-9W-E12-N1
new file mode 100644
index 000000000..9a06554fd
--- /dev/null
+++ b/_templates/lohas_LH-ZN001-9W-E12-N1
@@ -0,0 +1,21 @@
+---
+date_added: 2019-03-09
+title: Lohas LH-ZN001 9W
+type: RGBW
+category: bulb
+standard: E12
+link: https://www.amazon.com/dp/B07SBW9NMJ
+image: https://images-na.ssl-images-amazon.com/images/I/51mEXRgUoiL._SL1200_.jpg
+template: {"NAME":"Lohas","GPIO":[17,0,0,0,0,0,0,0,0,143,0,144,0],"FLAG":1,"BASE":26}
+link_alt: https://www.lohas-led.com/a19-e12-smart-light-bulb-p0160.html
+---
+Manufacturer reference: LH-ZN001-9W-E12-N1
+
+
+Requires a [code change](https://github.com/arendst/Tasmota/pull/5326#issuecomment-466810201) for proper RGB operation
+
+
+
+
+
+
diff --git a/_templates/lohas_E14_R50 b/_templates/lohas_LH-ZN005W5E14-2
similarity index 52%
rename from _templates/lohas_E14_R50
rename to _templates/lohas_LH-ZN005W5E14-2
index c8e7e07a2..f2e7abd61 100644
--- a/_templates/lohas_E14_R50
+++ b/_templates/lohas_LH-ZN005W5E14-2
@@ -1,19 +1,14 @@
---
date_added: 2019-08-25
-title: Lohas E14 R50
-category: light
-type: Bulb
-standard: uk
+title: Lohas LH-ZN005 5W
+type: RGBW
+category: bulb
+standard: E14
link: https://www.amazon.co.uk/gp/product/B078XCXR2S
image: https://images-na.ssl-images-amazon.com/images/I/51DfVepS-SL._SX342_.jpg
-template: '{"NAME":"Lohas E14 R50","GPIO":[17,0,0,0,0,0,0,0,0,143,0,144,0],"FLAG":0,"BASE":27}'
+template: {"NAME":"Lohas E14 R50","GPIO":[17,0,0,0,0,0,0,0,0,143,0,144,0],"FLAG":0,"BASE":27}
link_alt:
---
+Manufacturer reference: LH-ZN005W5E14-2
Flashed to Tasmota OTA using Tuya Convert
-
-
-
-
-
-
diff --git a/_templates/lohas_A21_100W_E26_RGBW b/_templates/lohas_LH-ZN006-RGB-A21-N1
similarity index 57%
rename from _templates/lohas_A21_100W_E26_RGBW
rename to _templates/lohas_LH-ZN006-RGB-A21-N1
index 983b0f47c..0afff12e2 100644
--- a/_templates/lohas_A21_100W_E26_RGBW
+++ b/_templates/lohas_LH-ZN006-RGB-A21-N1
@@ -1,14 +1,15 @@
---
date_added: 2019-11-28
-title: Lohas A21 100W E26 RGBW
-category: light
-type: Bulb
-standard: us
-link: https://www.amazon.com/LOHAS-LED-Equivalent-Brightness-Compatible/dp/B07P6M2FT3
+title: Lohas LH-ZN006 14W
+type: RGBW
+category: bulb
+standard: E26
+link: https://www.lohas-led.com/lohas-smart-led-bulb-a21-e26-100w-equivalent-14w-rgb-cool-white-dimmable-wifi-app-controlled-alexa-google-assistant-compatible-p0230-p0230.html
image: https://user-images.githubusercontent.com/3240875/69815867-3d20a300-11c5-11ea-8bcc-cd209e0b6aff.png
-template: '{"NAME":"Lohas100 RGBW","GPIO":[0,0,0,0,0,0,0,0,0,143,0,144,0],"FLAG":0,"BASE":18}'
-link_alt:
+template: {"NAME":"Lohas100 RGBW","GPIO":[0,0,0,0,0,0,0,0,0,143,0,144,0],"FLAG":0,"BASE":18}
+link_alt: https://www.amazon.com/LOHAS-LED-Equivalent-Brightness-Compatible/dp/B07P6M2FT3
---
+Manufacturer reference: LH-ZN006-RGB-A21-N1
This template requires Tasmota 6.6.0.18 or higher to work correctly. Tasmota-basic.bin files will not work with this template. Flash the regular full bin file of Tasmota.
diff --git a/_templates/lohas_LH-ZN031-2000K-6500K-2Pack b/_templates/lohas_LH-ZN031-2000K-6500K-2Pack
new file mode 100644
index 000000000..d3eb75459
--- /dev/null
+++ b/_templates/lohas_LH-ZN031-2000K-6500K-2Pack
@@ -0,0 +1,17 @@
+---
+date_added: 2019-04-03
+title: Lohas ZN031 8W
+type: RGBCCT
+category: bulb
+standard: E26
+link: https://www.lohas-led.com/lohas-led-smart-bulb-e26-rgb-p0225.html
+image: https://user-images.githubusercontent.com/5904370/66717637-777fdd80-eddb-11e9-8764-04d1158a329b.png
+template: {"NAME":"Lohas ZN031","GPIO":[0,0,0,0,38,37,0,0,41,39,40,0,0],"FLAG":0,"BASE":18}
+link2: https://www.alibaba.com/product-detail/RGB-2000K-6500K-8W-E26-E27_62045640358.html
+link3: https://www.amazon.com/dp/B07PMD3DY2
+---
+Manufacturer reference: ZN031-2000K-6500K-2Pack or LH-ZN002-wifi-10W
+
+
+
+
diff --git a/_templates/lohas_LH-ZN124 b/_templates/lohas_LH-ZN124-5000K--E26-2P
similarity index 61%
rename from _templates/lohas_LH-ZN124
rename to _templates/lohas_LH-ZN124-5000K--E26-2P
index e81b36954..868da712f 100644
--- a/_templates/lohas_LH-ZN124
+++ b/_templates/lohas_LH-ZN124-5000K--E26-2P
@@ -1,19 +1,13 @@
---
date_added: 2019-11-22
-title: Lohas LH-ZN124
-category: light
-type: Bulb
-standard: us
+title: Lohas LH-ZN124 10W
+type: CW
+category: bulb
+standard: E26
link: https://www.amazon.com/gp/product/B07KSB1KHP
image: https://www.lohas-led.com/u_file/1911/products/11/fa30ca8fd7.jpg.240x240.jpg
-template: '{"NAME":"Lohas LH-ZN124","GPIO":[0,0,0,0,0,0,0,0,0,0,37,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"Lohas LH-ZN124","GPIO":[0,0,0,0,0,0,0,0,0,0,37,0,0],"FLAG":0,"BASE":18}
link_alt: https://www.lohas-led.com/lohas-smart-led-light-bulbs-google-home-siri-and-iftttno-hub-required-e26-daylight-5000k-dimmable-2-pack-p0238-p0238.html
---
-tuya-convert worked too.
-
-
-
-
-
-
+Manufacturer reference: LH-ZN124-5000K--E26-2P
diff --git a/_templates/lohas_ZN031 b/_templates/lohas_ZN031
deleted file mode 100644
index 5772dd7bf..000000000
--- a/_templates/lohas_ZN031
+++ /dev/null
@@ -1,16 +0,0 @@
----
-date_added: 2019-04-03
-title: Lohas ZN031
-category: light
-type: Bulb
-standard: global
-link: https://www.alibaba.com/product-detail/RGB-2000K-6500K-8W-E26-E27_62045640358.html
-image: https://user-images.githubusercontent.com/5904370/66717637-777fdd80-eddb-11e9-8764-04d1158a329b.png
-template: '{"NAME":"Lohas ZN031","GPIO":[0,0,0,0,38,37,0,0,41,39,40,0,0],"FLAG":0,"BASE":18}'
-link_alt:
----
-
-
-
-
-
diff --git a/_templates/lohas_ZN070 b/_templates/lohas_ZN070
index 4dc012985..4d8d6ebff 100644
--- a/_templates/lohas_ZN070
+++ b/_templates/lohas_ZN070
@@ -1,12 +1,12 @@
---
date_added: 2019-12-02
title: Lohas ZN070 8W
-category: Bulb
+category: bulb
type: CCT
standard: E26
link: https://smile.amazon.com/gp/product/B07QY6DDKZ
image: https://images-na.ssl-images-amazon.com/images/I/513j0pYhWfL._SL1200_.jpg
-template: '{"NAME":"Lohas ZN070","GPIO":[0,0,0,0,0,0,0,0,38,0,37,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"Lohas ZN070","GPIO":[0,0,0,0,0,0,0,0,38,0,37,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/lonsonho_3pin b/_templates/lonsonho_3pin
index f353ee26b..5e0e34479 100644
--- a/_templates/lonsonho_3pin
+++ b/_templates/lonsonho_3pin
@@ -6,7 +6,7 @@ type: Plug
standard: eu
link: https://aliexpress.com/item/32901221191.html
image: https://ae01.alicdn.com/kf/HTB1O3.wVwHqK1RjSZFPq6AwapXam/Lonsonho-Smart-Stecker-Wifi-Smart-Steckdose-Tuya-Smart-Leben-App-EU-Frankreich-UNS-AU-UK-Polen.jpg_640x640.jpg
-template: '{"NAME":"Lonsonho10ALed","GPIO":[0,0,0,0,56,0,0,0,21,17,0,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"Lonsonho10ALed","GPIO":[0,0,0,0,56,0,0,0,21,17,0,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/lonsonho_9W_E27_RGBWW b/_templates/lonsonho_9W_E27_RGBWW
index 11c2907d8..642fc6b09 100644
--- a/_templates/lonsonho_9W_E27_RGBWW
+++ b/_templates/lonsonho_9W_E27_RGBWW
@@ -1,12 +1,12 @@
---
date_added: 2019-11-11
-title: Lonsonho 9W E27 RGBWW
-category: light
-type: Bulb
-standard: eu
+title: Lonsonho 9W
+type: RGBW
+category: bulb
+standard: E27
link: https://www.aliexpress.com/item/33006613923.html
image: https://ae01.alicdn.com/kf/Habe5b5a466ca428f9b459f336d013511b/Lonsonho-2PCS-E27-Wifi-Smart-Light-LED-Bulb-Lamp-RGB-W-C-9W-900lm-Tuya-Smart.jpg
-template: '{"NAME":"RGB+W+C Bulb","GPIO":[0,0,0,0,37,40,0,0,38,41,39,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"RGB+W+C Bulb","GPIO":[0,0,0,0,37,40,0,0,38,41,39,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/lonsonho_RGB b/_templates/lonsonho_RGB
index 6ff718491..9ebbe20df 100644
--- a/_templates/lonsonho_RGB
+++ b/_templates/lonsonho_RGB
@@ -6,7 +6,7 @@ type: Plug
standard: anzac
link: https://www.aliexpress.com/item/32921400507.html
image: https://encrypted-tbn0.gstatic.com/images?q=tbn%3AANd9GcQQPpeyXGfA6_myHzvC24vuiK5IWe06__x9cRde1q5yTpeJvnTs
-template: '{"NAME":"RGB Smart Plug","GPIO":[37,0,38,0,0,39,0,0,0,17,0,21,0],"FLAG":0,"BASE":45}'
+template: {"NAME":"RGB Smart Plug","GPIO":[37,0,38,0,0,39,0,0,0,17,0,21,0],"FLAG":0,"BASE":45}
link_alt:
---
diff --git a/_templates/lonsonho_SK3-01 b/_templates/lonsonho_SK3-01
index dce68e198..cd4fd70ba 100644
--- a/_templates/lonsonho_SK3-01
+++ b/_templates/lonsonho_SK3-01
@@ -6,7 +6,7 @@ type: Switch
standard: us
link: https://www.aliexpress.com/item/32996591441.html
image: https://ae01.alicdn.com/kf/HTB1WvHCaGL7gK0jSZFBq6xZZpXaI/Lonsonho-Wifi-Smart-Switch-US-1-2-3-4-Gang-Smart-Wall-Touch-Panel-Light-Switch.jpg_50x50.jpg
-template: '{"NAME":"Tuya 1 Channel","GPIO":[0,0,0,0,0,17,0,0,0,0,0,21,52],"FLAG":0,"BASE":18}'
+template: {"NAME":"Tuya 1 Channel","GPIO":[0,0,0,0,0,17,0,0,0,0,0,21,52],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/lonsonho_SK3-02 b/_templates/lonsonho_SK3-02
index ccbf6c78d..e7d7d8c06 100644
--- a/_templates/lonsonho_SK3-02
+++ b/_templates/lonsonho_SK3-02
@@ -6,7 +6,7 @@ type: Switch
standard: us
link: https://www.aliexpress.com/item/32996591441.html
image: https://ae01.alicdn.com/kf/HTB17UbGaQT2gK0jSZPcq6AKkpXaL/Lonsonho-Wifi-Smart-Switch-US-1-2-3-4-Gang-Smart-Wall-Touch-Panel-Light-Switch.jpg_640x640.jpg
-template: '{"NAME":"Tuya 2 Channel","GPIO":[0,0,0,0,22,0,0,0,17,21,18,0,52],"FLAG":0,"BASE":18}'
+template: {"NAME":"Tuya 2 Channel","GPIO":[0,0,0,0,22,0,0,0,17,21,18,0,52],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/lsc_smart_connect b/_templates/lsc_smart_connect
index b200a7ceb..46a327810 100644
--- a/_templates/lsc_smart_connect
+++ b/_templates/lsc_smart_connect
@@ -6,6 +6,6 @@ type: Plug
standard: eu
link: https://www.action.com/nl-nl/p/lsc-smart-connect-slimme-stekker-2/
image: https://www.action.com/globalassets/cmsarticleimages/79/99/2578685_8712879142782-110_02.png?preset=mediaSliderImageLarge
-template: '{"NAME":"LSC Smart Plug","GPIO":[255,255,255,255,56,255,0,0,21,255,17,255,255],"FLAG":0,"BASE":18}'
+template: {"NAME":"LSC Smart Plug","GPIO":[255,255,255,255,56,255,0,0,21,255,17,255,255],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/lsc_smart_connect_filament b/_templates/lsc_smart_connect_filament
index 70e2577e0..4c8b6320c 100644
--- a/_templates/lsc_smart_connect_filament
+++ b/_templates/lsc_smart_connect_filament
@@ -1,12 +1,12 @@
---
date_added: 2019-09-22
-title: LSC Smart Connect Smart Filament LED
-category: light
-type: Bulb
-standard: eu
-link: https://www.action.com/nl-nl/p/lsc-smart-connect-slimme-filament-ledlamp--1cd77fb0/
+title: LSC Smart Connect Smart Filament 5.5W
+type: Filament
+category: bulb
+standard: E27
+link: https://www.action.com/de-de/p/lsc-smart-connect-intelligente-led-filament-lampe-10/
image: https://www.action.com/globalassets/cmsarticleimages/79/88/2578543_8712879142744-110.png
-template: '{"NAME":"LSC-Filam-Big","GPIO":[0,0,0,0,0,0,0,0,38,0,37,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"LSC-Filam-Big","GPIO":[0,0,0,0,0,0,0,0,38,0,37,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/lsc_smart_connect_multicolor_spot b/_templates/lsc_smart_connect_multicolor_spot
index 6e52deff6..676b71e9d 100644
--- a/_templates/lsc_smart_connect_multicolor_spot
+++ b/_templates/lsc_smart_connect_multicolor_spot
@@ -1,12 +1,12 @@
---
date_added: 2019-10-21
-title: LSC Smart Connect Multicolor Spot GU10
-category: light
-type: Bulb
-standard: eu
+title: LSC Smart Connect Multicolor Spot 5W
+type: RGBW
+category: bulb
+standard: GU10
link: https://www.action.com/nl-nl/p/lsc-smart-connect-slimme-multicolor-spot/
image: https://www.action.com/globalassets/cmsarticleimages/79/68/2578516_8712879142690-110.png
-template: '{"NAME":"LSC RGBCW LED","GPIO":[0,0,0,0,0,0,0,0,181,0,180,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"LSC RGBCW LED","GPIO":[0,0,0,0,0,0,0,0,181,0,180,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/lsc_smart_connect_rgbw b/_templates/lsc_smart_connect_rgbw
index 574e10506..a274d3a1a 100644
--- a/_templates/lsc_smart_connect_rgbw
+++ b/_templates/lsc_smart_connect_rgbw
@@ -6,7 +6,7 @@ type: LED Strip
standard: eu
link: https://www.action.com/de-de/p/lsc-smart-connect-intelligenter-multicolor-led-strip-/
image: https://www.action.com/globalassets/cmsarticleimages/79/81/2578634_8712879142775-111.png?preset=mediaSliderImageLarge
-template: '{"NAME":"LSC-RGBW-Strip","GPIO":[51,0,0,0,37,0,0,0,38,40,39,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"LSC-RGBW-Strip","GPIO":[51,0,0,0,37,0,0,0,38,40,39,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/luani_HVIO b/_templates/luani_HVIO
index eef658a60..765f27787 100644
--- a/_templates/luani_HVIO
+++ b/_templates/luani_HVIO
@@ -1,11 +1,11 @@
---
title: Luani HVIO
-category: relay
+category: switch
type: DIY Project
standard: global
link: https://luani.de/projekte/esp8266-hvio/
image: https://user-images.githubusercontent.com/5904370/57946948-e5cc7c80-78dd-11e9-9ab9-9a52287a7d89.png
-template: '{"NAME":"Luani HVIO","GPIO":[0,255,255,255,21,22,0,0,9,10,255,52,0],"FLAG":1,"BASE":35}'
+template: {"NAME":"Luani HVIO","GPIO":[0,255,255,255,21,22,0,0,9,10,255,52,0],"FLAG":1,"BASE":35}
link_alt:
---
diff --git a/_templates/lumiman-e27 b/_templates/lumiman-LM530-1p-UK-E27
similarity index 53%
rename from _templates/lumiman-e27
rename to _templates/lumiman-LM530-1p-UK-E27
index 303d4c09c..46743adfb 100644
--- a/_templates/lumiman-e27
+++ b/_templates/lumiman-LM530-1p-UK-E27
@@ -1,15 +1,15 @@
---
date_added: 2019-03-09
-title: Lumiman E27 Multicolor
-category: light
-type: Bulb
-standard: eu
+title: Lumiman LM530 7.5W
+type: RGBW
+category: bulb
+standard: E27
link: https://www.amazon.co.uk/gp/product/B07DW539RR
image: https://images-na.ssl-images-amazon.com/images/I/51aUf3KOaXL._SL1000_.jpg
-template: '{"NAME":"Lumiman RGB","GPIO":[0,0,0,0,37,40,0,0,38,41,39,52,0],"FLAG":1,"BASE":18}'
+template: {"NAME":"Lumiman RGB","GPIO":[0,0,0,0,37,40,0,0,38,41,39,52,0],"FLAG":1,"BASE":18}
link_alt:
---
-
+Manufacturer reference: LM530-1p-UK-E27
This was done by trial and error on a UK bulb.
diff --git a/_templates/lumiman_LM650 b/_templates/lumiman_LM650
deleted file mode 100644
index ec423f195..000000000
--- a/_templates/lumiman_LM650
+++ /dev/null
@@ -1,19 +0,0 @@
----
-date_added: 2019-09-30
-title: Lumiman LM650
-category: light
-type: Bulb
-standard: us
-link: https://www.amazon.com/gp/product/B07DLSNNDS
-image: https://images-na.ssl-images-amazon.com/images/I/513gnBOpq1L._AC_SL1000_.jpg
-template: '{"NAME":"Legelite E26","GPIO":[0,0,0,0,37,40,0,0,38,41,39,0,0],"FLAG":0,"BASE":18}'
-link_alt:
----
-
-
-
-
-
-
-
-
diff --git a/_templates/lumiman_LM650-2P-CA b/_templates/lumiman_LM650-2P-CA
new file mode 100644
index 000000000..b81274cfe
--- /dev/null
+++ b/_templates/lumiman_LM650-2P-CA
@@ -0,0 +1,13 @@
+---
+date_added: 2019-03-20
+title: Lumiman LM650-2P-CA 7.5W
+type: RGBW
+category: bulb
+standard: E26
+link: https://www.amazon.com/dp/B07DLSNNDS
+image: https://images-na.ssl-images-amazon.com/images/I/513gnBOpq1L._SL1000_.jpg
+template: {"NAME":"Lumiman LM530","GPIO":[0,0,0,0,37,40,0,0,38,41,39,0,0],"FLAG":1,"BASE":18}
+link_alt:
+---
+
+Manufacturer reference: LM650-2P-CA
\ No newline at end of file
diff --git a/_templates/lumiman_lm350 b/_templates/lumiman_lm350
deleted file mode 100644
index 2a36844d3..000000000
--- a/_templates/lumiman_lm350
+++ /dev/null
@@ -1,11 +0,0 @@
----
-date_added: 2019-03-20
-title: Lumiman LM530 E26
-category: light
-type: Bulb
-standard: us
-link: https://www.amazon.com/dp/B07DLSNNDS
-image: https://images-na.ssl-images-amazon.com/images/I/513gnBOpq1L._SL1000_.jpg
-template: '{"NAME":"Lumiman LM530","GPIO":[0,0,0,0,37,40,0,0,38,41,39,0,0],"FLAG":1,"BASE":18}'
-link_alt:
----
diff --git a/_templates/luminea_LHC-101 b/_templates/luminea_LHC-101
index 7eb1b8ce5..c7a8a543f 100644
--- a/_templates/luminea_LHC-101
+++ b/_templates/luminea_LHC-101
@@ -6,7 +6,7 @@ type: Switch
standard: eu
link: https://www.amazon.de/Luminea-Home-Control-Lichtschalter-Touch-Lichtschalter/dp/B07KFN8BTJ/
image: https://user-images.githubusercontent.com/5904370/66717839-bf076900-eddd-11e9-8e07-154377d87dcd.png
-template: '{"NAME":"LHC-101.on","GPIO":[157,0,0,17,21,0,0,0,0,0,52,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"LHC-101.on","GPIO":[157,0,0,17,21,0,0,0,0,0,52,0,0],"FLAG":0,"BASE":18}
link_alt: https://www.luminea.info/Smart-WiFi-Lichtschalter-1-Weg-aus-gehaerte-NX-4503-919.shtml
---
diff --git a/_templates/luminea_LHC-102 b/_templates/luminea_LHC-102
index 177df6ee2..9c2cd5308 100644
--- a/_templates/luminea_LHC-102
+++ b/_templates/luminea_LHC-102
@@ -6,7 +6,7 @@ type: Switch
standard: eu
link: https://www.amazon.de/Luminea-Home-Control-Taster-Touch-Doppel-Lichttaster/dp/B07KFMTBTC
image: https://microsites.pearl.de/i/07/nx4505_4.jpg
-template: '{"NAME":"LHC-102.on","GPIO":[157,0,53,0,0,18,0,0,17,21,0,22,52],"FLAG":0,"BASE":18}'
+template: {"NAME":"LHC-102.on","GPIO":[157,0,53,0,0,18,0,0,17,21,0,22,52],"FLAG":0,"BASE":18}
link_alt: https://www.pearl.de/a-NX4505-3103.shtml
---
diff --git a/_templates/luminea_NX-4458-675 b/_templates/luminea_NX-4458-675
index b31fa3d5d..63fd19e3d 100644
--- a/_templates/luminea_NX-4458-675
+++ b/_templates/luminea_NX-4458-675
@@ -6,7 +6,7 @@ type: Plug
standard: eu
link: https://www.pearl.de/a-NX4458-3103.shtml
image: https://microsites.pearl.de/i/07/nx4458_1.jpg
-template: '{"NAME":"Luminea NX4458","GPIO":[17,0,0,0,133,132,0,0,131,56,21,0,0],"FLAG":0,"BASE":65}'
+template: {"NAME":"Luminea NX4458","GPIO":[17,0,0,0,133,132,0,0,131,56,21,0,0],"FLAG":0,"BASE":65}
link_alt:
---
diff --git a/_templates/luminea_ZX-2820-675 b/_templates/luminea_ZX-2820-675
index ab0d8d608..d96f15b14 100644
--- a/_templates/luminea_ZX-2820-675
+++ b/_templates/luminea_ZX-2820-675
@@ -6,7 +6,7 @@ type: Plug
standard: eu
link: https://www.luminea.info/WIFI-Smartphone-Steckdose-kompatibel-zu-Amazon-ZX-2820-919.shtml
image: https://microsites.pearl.de/i/07/zx2820_31.jpg
-template: '{"NAME":"ZX2820-675","GPIO":[0,0,56,0,0,134,0,0,131,17,132,21,0],"FLAG":0,"BASE":45}'
+template: {"NAME":"ZX2820-675","GPIO":[0,0,56,0,0,134,0,0,131,17,132,21,0],"FLAG":0,"BASE":45}
link_alt: https://www.pearl.de/a-ZX2820-3103.shtml
---
diff --git a/_templates/luminea_zx-2831 b/_templates/luminea_ZX2831-944
similarity index 60%
rename from _templates/luminea_zx-2831
rename to _templates/luminea_ZX2831-944
index fc175fc17..493f08c47 100644
--- a/_templates/luminea_zx-2831
+++ b/_templates/luminea_ZX2831-944
@@ -1,12 +1,12 @@
---
date_added: 2019-03-20
-title: Luminea ZX-2831 E27 CCT
-category: light
-type: Bulb
-standard: eu
+title: Luminea ZX2831-944
+type: CCT
+category: bulb
+standard: E27
link: https://www.amazon.de/Luminea-Home-Control-Smart-Bulb/dp/B074ST4XF4
image: https://user-images.githubusercontent.com/5904370/66717664-c3328700-eddb-11e9-97aa-fb8366ae4953.png
-template: '{"NAME":"Luminea CCT","GPIO":[0,0,0,0,140,37,0,0,38,142,141,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"Luminea CCT","GPIO":[0,0,0,0,140,37,0,0,38,142,141,0,0],"FLAG":0,"BASE":18}
link_alt: https://www.pearl.de/a-ZX2831-3103.shtml
---
diff --git a/_templates/luminea_ZX2832-944 b/_templates/luminea_ZX2832-944
new file mode 100644
index 000000000..f171cbb12
--- /dev/null
+++ b/_templates/luminea_ZX2832-944
@@ -0,0 +1,19 @@
+---
+date_added: 2019-03-17
+title: Luminea ZX2832-944
+type: RGBW
+category: bulb
+standard: E27
+link: https://www.amazon.de/Luminea-Home-Control-WLAN-Birne/dp/B074SZ6VQC
+image: https://user-images.githubusercontent.com/5904370/66717679-0e4c9a00-eddc-11e9-8db4-a2bca9fa0791.png
+template: {"NAME":"Luminea RGBW","GPIO":[0,0,0,0,140,37,0,0,38,142,141,0,0],"FLAG":1,"BASE":18}
+link_alt: https://www.pearl.de/a-ZX2832-3103.shtml
+---
+
+
+
+
+
+
+
+
diff --git a/_templates/luminea_zx-2820 b/_templates/luminea_zx-2820
deleted file mode 100644
index b162d2aca..000000000
--- a/_templates/luminea_zx-2820
+++ /dev/null
@@ -1,11 +0,0 @@
----
-title: Luminea ZX-2820-919
-category: plug
-type: Plug
-standard: eu
-link: https://www.luminea.info/WIFI-Smartphone-Steckdose-kompatibel-zu-Amazon-ZX-2820-919.shtml
-image: https://user-images.githubusercontent.com/5904370/57956553-aca20580-78f9-11e9-9da7-799e1608285f.png
-template: '{"NAME":"Luminea ZX2820","GPIO":[17,0,0,0,133,132,0,0,131,56,21,0,0],"FLAG":0,"BASE":65}'
-link_alt: https://www.pearl.de/a-ZX2820-3103.shtml
----
-
diff --git a/_templates/luminea_zx-2832 b/_templates/luminea_zx-2832
deleted file mode 100644
index 75a4d7dbe..000000000
--- a/_templates/luminea_zx-2832
+++ /dev/null
@@ -1,19 +0,0 @@
----
-date_added: 2019-03-17
-title: Luminea ZX-2832 E27 RGBW
-category: light
-type: Bulb
-standard: eu
-link: https://www.pearl.de/a-ZX2832-3103.shtml
-image: https://user-images.githubusercontent.com/5904370/66717679-0e4c9a00-eddc-11e9-8db4-a2bca9fa0791.png
-template: '{"NAME":"Luminea RGBW","GPIO":[0,0,0,0,140,37,0,0,38,142,141,0,0],"FLAG":1,"BASE":18}'
-link_alt: https://www.amazon.de/Luminea-Home-Control-WLAN-Birne/dp/B074SZ6VQC
----
-
-
-
-
-
-
-
-
diff --git a/_templates/luminea_zx-2844 b/_templates/luminea_zx-2844
index aa94e8e0a..bc6241637 100644
--- a/_templates/luminea_zx-2844
+++ b/_templates/luminea_zx-2844
@@ -6,7 +6,7 @@ type: LED Controller
standard: global
link: https://www.pearl.de/a-ZX2844-3103.shtml
image: https://user-images.githubusercontent.com/5904370/54643115-6ca7d900-4a96-11e9-99a5-d139bde7f071.png
-template: '{"NAME":"Luminea ZX-284","GPIO":[40,0,0,0,0,39,0,0,38,17,37,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"Luminea ZX-284","GPIO":[40,0,0,0,0,39,0,0,38,17,37,0,0],"FLAG":0,"BASE":18}
link_alt: https://www.amazon.de/Luminea-Zubeh%C3%B6r-Smarthome-LED-Strips-WLAN-Controller-spritzwassergesch%C3%BCtzt/dp/B074T11793
---
also known as:
diff --git a/_templates/lx-wifi-00m b/_templates/lx-wifi-00m
index b9fe2fd10..663305d0c 100644
--- a/_templates/lx-wifi-00m
+++ b/_templates/lx-wifi-00m
@@ -6,7 +6,7 @@ type: Switch
standard: us
link: https://www.amazon.com/dp/B077FNRWG1
image: https://user-images.githubusercontent.com/5904370/55705050-20d5b900-59de-11e9-93fb-c7c77ea7b658.png
-template: '{"NAME":"LX-WIFI-00M","GPIO":[17,25,255,255,23,22,18,19,21,0,20,24,0],"FLAG":0,"BASE":7}'
+template: {"NAME":"LX-WIFI-00M","GPIO":[17,25,255,255,23,22,18,19,21,0,20,24,0],"FLAG":0,"BASE":7}
link_alt: https://www.aliexpress.com/item/4-Gang-WiFi-Smart-Light-Switch-Timing-Voice-Smart-Light-Switch-Switches-Touch-In-wall-Wireless/32880068134.html
---
diff --git a/_templates/lyasi_B07PYMG3WD b/_templates/lyasi_B07PYMG3WD
index b6b111726..17d31df7f 100644
--- a/_templates/lyasi_B07PYMG3WD
+++ b/_templates/lyasi_B07PYMG3WD
@@ -6,7 +6,7 @@ type: Switch
standard: eu
link: https://www.amazon.de/gp/product/B07PYMG3WD?ref=ppx_pt2_dt_b_prod_image
image: https://images-na.ssl-images-amazon.com/images/I/41yjCZ1ymTL._SL1000_.jpg
-template: '{"NAME":"LYASI Touch Sw","GPIO":[0,0,0,0,56,52,0,0,21,17,0,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"LYASI Touch Sw","GPIO":[0,0,0,0,56,52,0,0,21,17,0,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/lyasi_pt-bw09 b/_templates/lyasi_pt-bw09
index 5ff03bc9e..8c1537ce6 100644
--- a/_templates/lyasi_pt-bw09
+++ b/_templates/lyasi_pt-bw09
@@ -1,11 +1,11 @@
---
date_added: 2019-03-01
title: Lyasi PT-BW09
-category: light
-type: Bulb
-standard: eu
+type: RGB
+category: bulb
+standard: E27
link: https://www.amazon.de/LYASI-Mehrfarbige-Smartphone-Tageslicht-Fernbedienung/dp/B07KYGDS3P/
image: https://images-na.ssl-images-amazon.com/images/I/61Skp0WxTJL._SL1000_.jpg
-template: '{"NAME":"Lyasi PT-BW09","GPIO":[17,0,0,0,143,144,0,0,0,0,0,0,0],"FLAG":0,"BASE":27}'
+template: {"NAME":"Lyasi PT-BW09","GPIO":[17,0,0,0,143,144,0,0,0,0,0,0,0],"FLAG":0,"BASE":27}
link_alt:
---
diff --git a/_templates/magichome_ZJ-ESP-IR-F b/_templates/magichome_ZJ-ESP-IR-F
index 998d77f6a..99e5a54ef 100644
--- a/_templates/magichome_ZJ-ESP-IR-F
+++ b/_templates/magichome_ZJ-ESP-IR-F
@@ -6,7 +6,7 @@ type: LED Controller
standard: global
link: https://www.aliexpress.com/item/32865919702.html
image: https://user-images.githubusercontent.com/5904370/66715385-0a604e00-edc3-11e9-8aa9-7e93eaa6c115.png
-template: '{"NAME":"ZJ-ESP-IR-F V1","GPIO":[0,0,0,0,51,38,0,0,37,39,0,40,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"ZJ-ESP-IR-F V1","GPIO":[0,0,0,0,51,38,0,0,37,39,0,40,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/magichome_ZJ-FWMN-A_RGB b/_templates/magichome_ZJ-FWMN-A_RGB
index 964fbc75a..4e57da014 100644
--- a/_templates/magichome_ZJ-FWMN-A_RGB
+++ b/_templates/magichome_ZJ-FWMN-A_RGB
@@ -6,7 +6,7 @@ type: LED Controller
standard: global
link: https://www.aliexpress.com/item/DC-5V-28V-Mini-WiFi-LED-RGBW-Controller-Common-Anode-Connect-iOS-Android-APP-Remote-Controller/32828275557.html
image: https://user-images.githubusercontent.com/5904370/55142867-e2b6da80-513d-11e9-96f2-f10c0c38df50.png
-template: '{"NAME":"MagicHome RGB","GPIO":[0,0,0,0,0,37,0,0,38,39,0,0,0],"FLAG":0,"BASE":34}'
+template: {"NAME":"MagicHome RGB","GPIO":[0,0,0,0,0,37,0,0,38,39,0,0,0],"FLAG":0,"BASE":34}
link_alt:
---
diff --git a/_templates/magichome_ZJ-WFMN-A_RGBW b/_templates/magichome_ZJ-WFMN-A_RGBW
index 308bd393f..47e179827 100644
--- a/_templates/magichome_ZJ-WFMN-A_RGBW
+++ b/_templates/magichome_ZJ-WFMN-A_RGBW
@@ -6,7 +6,7 @@ type: LED Controller
standard: global
link: https://www.aliexpress.com/item/32683166279.html
image: https://user-images.githubusercontent.com/5904370/57791754-c0087180-773d-11e9-845a-afcfa926bf49.png
-template: '{"NAME":"MagicHome RGBW","GPIO":[0,0,0,0,51,38,0,0,37,39,0,40,0],"FLAG":0,"BASE":34}'
+template: {"NAME":"MagicHome RGBW","GPIO":[0,0,0,0,51,38,0,0,37,39,0,40,0],"FLAG":0,"BASE":34}
link_alt:
---
## Serial Flashing
diff --git a/_templates/makegood_MG-AUWF01 b/_templates/makegood_MG-AUWF01
index 69d8b9d39..7050edbbc 100644
--- a/_templates/makegood_MG-AUWF01
+++ b/_templates/makegood_MG-AUWF01
@@ -6,7 +6,7 @@ type: Wall Outlet
standard: anzac
link: https://www.alibaba.com/product-detail/SAA-approved-tuya-smart-life-app_60803461809.html
image: https://sc01.alicdn.com/kf/HTB1oWJXXe6sK1RjSsrbq6xbDXXag/200428940/HTB1oWJXXe6sK1RjSsrbq6xbDXXag.jpg
-template: '{"NAME":"MG-AUWF01","GPIO":[56,10,157,59,134,132,0,0,131,22,57,21,9],"FLAG":0,"BASE":18}'
+template: {"NAME":"MG-AUWF01","GPIO":[56,10,157,59,134,132,0,0,131,22,57,21,9],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/manzoku XS-001 b/_templates/manzoku XS-001
index cd492e0ab..c3b37a756 100644
--- a/_templates/manzoku XS-001
+++ b/_templates/manzoku XS-001
@@ -1,13 +1,13 @@
---
date_added: 2019-10-29
-title: Manzoku XS-001
-category: light
-type: Bulb
-standard: us
+title: Manzoku XS-001 10W
+type: RGBW
+category: bulb
+standard: E26
link: https://www.amazon.com/Dimmable-Changing-Equivalent-Compatible-Assistant/dp/B07JPXYC5F
image: https://images-na.ssl-images-amazon.com/images/I/51s0BwyH%2BiL._SL1000_.jpg
-template: '{"NAME":"Manzoku RGBW","GPIO":[0,0,0,0,40,0,0,0,38,39,37,0,0],"FLAG":0,"BASE":18}'
-link_alt:
+template: {"NAME":"Manzoku RGBW","GPIO":[0,0,0,0,40,0,0,0,38,39,37,0,0],"FLAG":0,"BASE":18}
+link2: https://www.ebay.com/p/28027113022
---
diff --git a/_templates/martin_jerry b/_templates/martin_jerry
index 87bd760d2..97d2594cf 100644
--- a/_templates/martin_jerry
+++ b/_templates/martin_jerry
@@ -6,7 +6,7 @@ type: Plug
standard: us
link: https://www.amazon.com/gp/product/B0776WL59D/ref=ppx_yo_dt_b_asin_title_o02_s00?ie=UTF8&psc=1
image: https://images-na.ssl-images-amazon.com/images/I/31PVvyjlbIL.jpg
-template: '{"NAME":"MJ V01","GPIO":[255,255,255,255,56,255,0,0,21,17,255,255,255],"FLAG":0,"BASE":18}'
+template: {"NAME":"MJ V01","GPIO":[255,255,255,255,56,255,0,0,21,17,255,255,255],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/martin_jerry-XS-SSA01 b/_templates/martin_jerry-XS-SSA01
index 5d9389afd..41eed26f8 100644
--- a/_templates/martin_jerry-XS-SSA01
+++ b/_templates/martin_jerry-XS-SSA01
@@ -6,7 +6,7 @@ type: Plug
standard: us
link: https://www.amazon.com/gp/product/B071Z94F4F
image: https://images-na.ssl-images-amazon.com/images/I/31w9LCm0ymL._SX425_.jpg
-template: '{"NAME":"MJ_XS-SSA01","GPIO":[0,17,0,0,0,0,0,0,0,56,21,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"MJ_XS-SSA01","GPIO":[0,17,0,0,0,0,0,0,0,56,21,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/martiny_jerry_3_way b/_templates/martiny_jerry_3_way
index dd3ea9777..05880b92d 100644
--- a/_templates/martiny_jerry_3_way
+++ b/_templates/martiny_jerry_3_way
@@ -6,7 +6,7 @@ type: Switch
standard: us
link: https://www.amazon.com/Martin-Jerry-Compatible-Devices-Traditional/dp/B07RV9VTRN
image: https://user-images.githubusercontent.com/5904370/53685174-941d4880-3d17-11e9-93a5-1bd29f301333.png
-template: '{"NAME":"MJ 3Way Switch","GPIO":[255,255,255,255,52,53,0,0,21,9,157,255,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"MJ 3Way Switch","GPIO":[255,255,255,255,52,53,0,0,21,9,157,255,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/maxcio-YX-DE04 b/_templates/maxcio-YX-DE04
index 8905878b4..9828fecb6 100644
--- a/_templates/maxcio-YX-DE04
+++ b/_templates/maxcio-YX-DE04
@@ -6,7 +6,7 @@ type: Plug
standard: eu
link: https://www.amazon.de/Steckdose-Maxcio-Intelligente-Kompatibel-Steuerung/dp/B07GH7XRB5
image: https://user-images.githubusercontent.com/5904370/68094967-c0d8bf80-fea5-11e9-8109-53daf18d42cc.png
-template: '{"NAME":"Maxcio YX-DE04","GPIO":[255,17,255,21,56,40,0,0,37,38,39,255,255],"FLAG":1,"BASE":18}'
+template: {"NAME":"Maxcio YX-DE04","GPIO":[255,17,255,21,56,40,0,0,37,38,39,255,255],"FLAG":1,"BASE":18}
link_alt:
---
diff --git a/_templates/maxcio_400ml_diffuser b/_templates/maxcio_400ml_diffuser
index fcd0c1c62..eb0a30641 100644
--- a/_templates/maxcio_400ml_diffuser
+++ b/_templates/maxcio_400ml_diffuser
@@ -6,7 +6,7 @@ type: Aromatherapy Diffuser
standard: eu
link: https://www.amazon.es/Aromaterapia-Inteligente-Maxcio-Humidificador-Ultras%C3%B3nico/dp/B07QPR8W3F
image: https://images-na.ssl-images-amazon.com/images/I/71WGi2Zq9SL._SX522_.jpg
-template: '{"NAME":"MaxcioDiffuser","GPIO":[255,255,255,255,255,255,0,0,255,255,255,255,255],"FLAG":0,"BASE":54}'
+template: {"NAME":"MaxcioDiffuser","GPIO":[255,255,255,255,255,255,0,0,255,255,255,255,255],"FLAG":0,"BASE":54}
link_alt:
---
diff --git a/_templates/maxcio_W-DE004 b/_templates/maxcio_W-DE004
index 3639c4b2a..77b761693 100644
--- a/_templates/maxcio_W-DE004
+++ b/_templates/maxcio_W-DE004
@@ -6,6 +6,6 @@ type: Plug
standard: eu
link: https://www.amazon.de/Steckdose-Maxcio-Kompatibel-Fernsteuerung-erforderlich/dp/B077FX493R
image: https://user-images.githubusercontent.com/5904370/58165226-a4462380-7c87-11e9-854e-e3fdbf7b345d.png
-template: '{"NAME":"Maxcio W-DE004","GPIO":[0,17,0,0,0,0,0,0,0,56,21,0,0],"FLAG":1,"BASE":18}'
+template: {"NAME":"Maxcio W-DE004","GPIO":[0,17,0,0,0,0,0,0,0,56,21,0,0],"FLAG":1,"BASE":18}
link_alt:
---
diff --git a/_templates/maxcio_W-UK007 b/_templates/maxcio_W-UK007
index 684cdabff..5701e691f 100644
--- a/_templates/maxcio_W-UK007
+++ b/_templates/maxcio_W-UK007
@@ -6,7 +6,7 @@ type: Plug
standard: uk
link: https://woostar.manufacturer.globalsources.com/si/6008852840266/pdtl/Wi-Fi-socket/1159121939/UK-standard-Wi-Fi-smart-socket.htm
image: https://p.globalsources.com/IMAGES/PDT/B1159121939/UK-standard-Wi-Fi-smart-socket-with-electricity-consumption-checking-function.jpg
-template: '{"NAME":"Maxcio","GPIO":[0,17,0,0,0,0,0,0,0,56,21,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"Maxcio","GPIO":[0,17,0,0,0,0,0,0,0,56,21,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/maxcio_W-UK007S b/_templates/maxcio_W-UK007S
index 5d8b66be5..548f90cc1 100644
--- a/_templates/maxcio_W-UK007S
+++ b/_templates/maxcio_W-UK007S
@@ -6,7 +6,7 @@ type: Plug
standard: uk
link: https://www.amazon.co.uk/gp/product/B07BWFB55Q
image: https://user-images.githubusercontent.com/5904370/55217741-8cf73680-5200-11e9-9aed-3e78b8f108f2.png
-template: '{"NAME":"Maxcio","GPIO":[56,0,255,0,0,134,0,0,131,17,132,21,0],"FLAG":0,"BASE":45}'
+template: {"NAME":"Maxcio","GPIO":[56,0,255,0,0,134,0,0,131,17,132,21,0],"FLAG":0,"BASE":45}
link_alt:
---
diff --git a/_templates/maxcio_W-US002S b/_templates/maxcio_W-US002S
index 41245242b..717b54e0d 100644
--- a/_templates/maxcio_W-US002S
+++ b/_templates/maxcio_W-US002S
@@ -6,7 +6,7 @@ type: Plug
standard: us
link: https://www.amazon.com/gp/product/B075QG95NX/ref=oh_aui_detailpage_o05_s00?ie=UTF8&psc=1
image: https://github.com/xoseperez/espurna/wiki/images/devices/maxcio-w-us002s.jpg
-template: '{"NAME":"W-US002S","GPIO":[57,0,56,0,0,134,0,0,131,17,132,21,0],"FLAG":0,"BASE":45}'
+template: {"NAME":"W-US002S","GPIO":[57,0,56,0,0,134,0,0,131,17,132,21,0],"FLAG":0,"BASE":45}
link_alt: https://www.amazon.com/OMOTON-compatible-Wireless-Remotely-Controls/dp/B0746G946P
---
Also found under other brand names (Omoton, ...)
diff --git a/_templates/maxcio_YX-DE02 b/_templates/maxcio_YX-DE02
index 95d7c0a4f..504077648 100644
--- a/_templates/maxcio_YX-DE02
+++ b/_templates/maxcio_YX-DE02
@@ -6,7 +6,7 @@ type: Plug
standard: eu
link: https://www.amazon.de/Steckdose-Maxcio-Intelligente-Kompatibel-Steuerung/dp/B07GH7XRB5
image: https://images-na.ssl-images-amazon.com/images/I/61lNrG%2BFvVL._SL1500_.jpg
-template: '{"NAME":"Generic","GPIO":[255,17,255,21,56,37,0,0,38,39,40,255,255],"FLAG":1,"BASE":18}'
+template: {"NAME":"Generic","GPIO":[255,17,255,21,56,37,0,0,38,39,40,255,255],"FLAG":1,"BASE":18}
link_alt:
---
diff --git a/_templates/maxcio_yxl01p b/_templates/maxcio_YX-L01P-E27-2P
similarity index 62%
rename from _templates/maxcio_yxl01p
rename to _templates/maxcio_YX-L01P-E27-2P
index 863bca00f..cddcfe532 100644
--- a/_templates/maxcio_yxl01p
+++ b/_templates/maxcio_YX-L01P-E27-2P
@@ -1,11 +1,11 @@
---
date_added: 2019-03-14
-title: Maxcio YX-L01P-E7
-category: light
-type: Bulb
-standard: eu
+title: Maxcio YX-L01P-E27-2P 9W
+type: RGBW
+category: bulb
+standard: E27
link: https://www.amazon.es/dp/B07F65LTZ4
image: https://images-na.ssl-images-amazon.com/images/I/51pUHqO1UbL._SL1500_.jpg
-template: '{"NAME":"Maxcio YXL01P","GPIO":[17,0,0,0,143,144,0,0,0,0,0,0,0],"FLAG":0,"BASE":27}'
+template: {"NAME":"Maxcio YXL01P","GPIO":[17,0,0,0,143,144,0,0,0,0,0,0,0],"FLAG":0,"BASE":27}
link_alt: https://www.amazon.it/Generazione%E3%80%91Lampadina-Maxcio-Temporizzazione-Intelligente-Compatibile/dp/B0788JRR45
---
diff --git a/_templates/maxcio_ZLD-34EU-W b/_templates/maxcio_ZLD-34EU-W
index 7e4ecaf4f..7c7d79d72 100644
--- a/_templates/maxcio_ZLD-34EU-W
+++ b/_templates/maxcio_ZLD-34EU-W
@@ -6,7 +6,7 @@ type: Power Strip
standard: eu
link: https://www.amazon.de/Steckdosenleiste-Maxcio-%C3%9Cberspannungsschutz-Mehrfachsteckdose-Fernbedienung/dp/B07MNGHH7M
image: https://cdn.shopify.com/s/files/1/0064/5293/6786/products/61afV61bmzL._SL1500_600x600.jpg
-template: '{"NAME":"MAXCIO","GPIO":[0,56,0,17,22,21,0,0,0,23,24,0,0],"FLAG":1,"BASE":18}'
+template: {"NAME":"MAXCIO","GPIO":[0,56,0,17,22,21,0,0,0,23,24,0,0],"FLAG":1,"BASE":18}
link_alt: https://maxcio.com/products/smart-steckdosenleiste-maxcio-alexa-wlan-steckdosenleiste-mit-3-ac-ausgange-und-4-usb-ports-uberspannungsschutz-mehrfachsteckdose-kompatibel-mit-alexa-google-home-und-ifttt-app-fernbedienung-zld-34eu-w
---
diff --git a/_templates/maxciowus003 b/_templates/maxciowus003
index 3c3718a70..62b209a6b 100644
--- a/_templates/maxciowus003
+++ b/_templates/maxciowus003
@@ -5,5 +5,5 @@ type: Plug
standard: us
image: https://user-images.githubusercontent.com/5904370/54652058-b9e77300-4ab5-11e9-894e-01abc3802656.png
link: https://www.amazon.com/gp/product/B075JHCQ43
-template: '{"NAME":"W-US003","GPIO":[255,17,255,255,255,255,0,0,255,22,21,255,255],"FLAG":0,"BASE":18}'
+template: {"NAME":"W-US003","GPIO":[255,17,255,255,255,255,0,0,255,22,21,255,255],"FLAG":0,"BASE":18}
---
diff --git a/_templates/medion_life_S85225 b/_templates/medion_life_S85225
index 27e033095..7df94ddc2 100644
--- a/_templates/medion_life_S85225
+++ b/_templates/medion_life_S85225
@@ -6,7 +6,7 @@ type: Plug
standard: anzac
link: https://aldi.com.au
image: https://d4zzp4ohshzeb.cloudfront.net/resize/listing-picture/1b73d80f-793a-404b-9dad-ed8d3896aba9?width=1000&height=1000&withoutEnlargement=true
-template: '{"NAME":"Medion","GPIO":[0,0,0,17,134,132,0,0,131,56,21,0,0],"FLAG":0,"BASE":52}'
+template: {"NAME":"Medion","GPIO":[0,0,0,17,134,132,0,0,131,56,21,0,0],"FLAG":0,"BASE":52}
link_alt:
---
diff --git a/_templates/merisny_P2 b/_templates/merisny_P2
index 039eb6808..89cdb22f6 100644
--- a/_templates/merisny_P2
+++ b/_templates/merisny_P2
@@ -6,7 +6,7 @@ type: Plug
standard: eu
link: https://www.amazon.it/Merisny-Intelligente-richiesto-Controlla-dispositivi/dp/B07GYFZ5LJ
image: https://images-na.ssl-images-amazon.com/images/I/51-OcfeCZ7L._SL1001_.jpg
-template: '{"NAME":"Generic","GPIO":[0,0,52,0,0,0,0,0,0,17,0,21,0],"FLAG":1,"BASE":18}'
+template: {"NAME":"Generic","GPIO":[0,0,52,0,0,0,0,0,0,17,0,21,0],"FLAG":1,"BASE":18}
link_alt:
---
diff --git a/_templates/merkury-innovations-MI-BW902-999W b/_templates/merkury-innovations-MI-BW902-999W
new file mode 100644
index 000000000..13bd10479
--- /dev/null
+++ b/_templates/merkury-innovations-MI-BW902-999W
@@ -0,0 +1,11 @@
+---
+title: Merkury Innovations MI-BW902-999W
+type: WW
+category: bulb
+standard: E26
+link: https://www.walmart.com/ip/Merkury-Innovations-A19-Smart-Light-Bulb-60W-Dimmable-White-LED-1-Pack/512088827
+image: https://i5.walmartimages.com/asr/9609ab0c-3d9a-4067-bcb9-81b9ce5f1fb1_1.af0f015060a9e935e903c059762abcc3.jpeg?odnWidth=undefined&odnHeight=undefined&odnBg=ffffff
+template: {"NAME":"MI-BW902-999W","GPIO":[0,0,0,0,0,37,0,0,0,0,0,0,0],"FLAG":0,"BASE":18}
+---
+
+Dimmable white bulb
diff --git a/_templates/merkurya21 b/_templates/merkury-innovations-MI-BW904-999W
similarity index 57%
rename from _templates/merkurya21
rename to _templates/merkury-innovations-MI-BW904-999W
index e9b6263a6..7380fb3d7 100644
--- a/_templates/merkurya21
+++ b/_templates/merkury-innovations-MI-BW904-999W
@@ -1,12 +1,11 @@
---
-title: Merkury A21 75W
-category: light
-type: Bulb
-standard: us
+title: Merkury MI-BW904-999W 11W
+type: RGBW
+category: bulb
+standard: E26
link: https://www.walmart.com/ip/Merkury-Innovations-A21-Smart-Light-Bulb-75W-Color-LED-1-Pack/254063201
image: https://user-images.githubusercontent.com/5904370/55722006-390cfe80-5a05-11e9-86e5-9069dfc7336b.png
-template: '{"NAME":"MI-BW904-999W","GPIO":[0,0,0,0,140,37,0,0,0,142,141,0,0],"FLAG":1,"BASE":69}
-'
+template: {"NAME":"MI-BW904-999W","GPIO":[0,0,0,0,140,37,0,0,0,142,141,0,0],"FLAG":1,"BASE":69}
---
RGBW bulb
diff --git a/_templates/merkurybr30 b/_templates/merkury-innovations-MI-BW905-999W
similarity index 66%
rename from _templates/merkurybr30
rename to _templates/merkury-innovations-MI-BW905-999W
index 72a0ce2db..44e6d59fc 100644
--- a/_templates/merkurybr30
+++ b/_templates/merkury-innovations-MI-BW905-999W
@@ -1,12 +1,11 @@
---
-title: Merkury BR30 65W
-category: light
-type: Bulb
-standard: us
+title: Merkury MI-BW905-999W 8W
+type: CCT
+category: bulb
+standard: E26
link: https://www.walmart.com/ip/Merkury-Innovations-BR30-Smart-Light-Bulb-65W-Tunable-White-LED-1-Pack/404320234
image: https://camo.githubusercontent.com/793fa94fb830026271fbd52faf8e5e6b436fe5d6/68747470733a2f2f692e706f7374696d672e63632f794e6b6d576470792f4d492d42573930352d3939392d572e6a7067
-template: '{"NAME":"MI-BW905-999W","GPIO":[0,0,0,0,37,37,0,0,38,0,0,0,0],"FLAG":0,"BASE":18}
-'
+template: {"NAME":"MI-BW905-999W","GPIO":[0,0,0,0,37,37,0,0,38,0,0,0,0],"FLAG":0,"BASE":18}
---
Tunable White LED
diff --git a/_templates/merkury_70011 b/_templates/merkury_70011
index e14b2cec6..b6acb385a 100644
--- a/_templates/merkury_70011
+++ b/_templates/merkury_70011
@@ -6,7 +6,7 @@ type: Plug
standard: us
link: https://www.realcanadiansuperstore.ca
image: https://i5.walmartimages.com/asr/c143943b-db4b-4f10-83a6-454b8a7c1447_1.0a03ef17e3d60e0581e6f18f0581607c.jpeg?odnWidth=undefined&odnHeight=undefined&odnBg=ffffff
-template: '{"NAME":"MIC-WW102","GPIO":[17,0,0,0,0,0,0,0,0,56,21,0,0],"FLAG":0,"BASE":36}'
+template: {"NAME":"MIC-WW102","GPIO":[17,0,0,0,0,0,0,0,0,56,21,0,0],"FLAG":0,"BASE":36}
link_alt:
---
diff --git a/_templates/merkury_MI-OW101-101W b/_templates/merkury_MI-OW101-101W
index 07d6a166c..1496c9d3b 100644
--- a/_templates/merkury_MI-OW101-101W
+++ b/_templates/merkury_MI-OW101-101W
@@ -6,7 +6,7 @@ type: Outdoor Plug
standard: us
link: https://www.amazon.com/Merkury-MI-OW101-101W-Innovations-Outdoor-Smart/dp/B07MKZ29HM
image: https://i.postimg.cc/Kz3cfg1B/5558abb7-4038-4a69-9c8f-9fa34aac67e7-1-a15bc28a5f9e6a2e74ee83a3d.jpg
-template: '{"NAME":"Merkury Switch","GPIO":[17,255,255,255,0,56,0,0,0,54,21,255,255],"FLAG":1,"BASE":18}'
+template: {"NAME":"Merkury Switch","GPIO":[17,255,255,255,0,56,0,0,0,54,21,255,255],"FLAG":1,"BASE":18}
link_alt: https://www.walmart.com/ip/Merkury-Innovations-Indoor-Outdoor-Smart-Plug-1-Pack/967621595
---
diff --git a/_templates/merkury_MI-WW107-199W b/_templates/merkury_MI-WW107-199W
index 86015a7ee..48eef3d07 100644
--- a/_templates/merkury_MI-WW107-199W
+++ b/_templates/merkury_MI-WW107-199W
@@ -6,7 +6,7 @@ type: Switch
standard: us
link: https://www.walmart.com/ip/Merkury-Innovations-Merkury-Smart-Switch/685624859
image: https://i5.wal.co/asr/14f1b7d4-8f21-4e6c-94c2-034a6b44d060_1.904539d6aa46b5987df1c4983e6e8783.jpeg?odnWidth=undefined&odnHeight=undefined&odnBg=ffffff
-template: '{"NAME":"MI-WW107-199W","GPIO":[52,0,0,0,0,0,0,0,17,21,0,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"MI-WW107-199W","GPIO":[52,0,0,0,0,0,0,0,17,21,0,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/merkury_innovations_A19_edison b/_templates/merkury_innovations_vintage_edison
similarity index 65%
rename from _templates/merkury_innovations_A19_edison
rename to _templates/merkury_innovations_vintage_edison
index aea08ce36..a4f5409b8 100644
--- a/_templates/merkury_innovations_A19_edison
+++ b/_templates/merkury_innovations_vintage_edison
@@ -1,12 +1,12 @@
---
date_added: 2019-10-27
-title: Merkury Innovations A19 Edison
-category: light
-type: Bulb
-standard: us
+title: Merkury Innovations Vintage 8W
+type: Filament
+category: bulb
+standard: E26
link: https://www.walmart.com/ip/Merkury-Innovations-A19-Smart-WiFi-LED-Bulb-60W-Glass-Vintage-Edison-Style/476268761
image: https://i5.walmartimages.com/asr/eea41049-d4f0-4948-930d-9d84d95648b2_1.580c7a8e9983e517094cfaed9f01e5d1.jpeg?odnWidth=undefined&odnHeight=undefined&odnBg=ffffff
-template: '{"NAME":"Merkury A19 Ed","GPIO":[0,0,0,0,0,0,0,0,0,0,37,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"Merkury A19 Ed","GPIO":[0,0,0,0,0,0,0,0,0,0,37,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/merkury_plug b/_templates/merkury_plug
index 9e85353fa..fbb837afe 100644
--- a/_templates/merkury_plug
+++ b/_templates/merkury_plug
@@ -6,7 +6,7 @@ type: Plug
standard: us
link: https://www.walmart.com/ip/Merkury-Innovations-Smart-Plug-1-Pack/126201995
image: https://i5.walmartimages.com/asr/6cb5d4c6-85d3-4b4b-b458-2bd700632bc1_1.576a8830886f0e1c1d2cf935076a652b.jpeg?odnWidth=undefined&odnHeight=undefined&odnBg=ffffff
-template: '{"NAME":"Merkury Switch","GPIO":[255,255,255,255,53,56,0,0,21,17,255,255,255],"FLAG":1,"BASE":18}'
+template: {"NAME":"Merkury Switch","GPIO":[255,255,255,255,53,56,0,0,21,17,255,255,255],"FLAG":1,"BASE":18}
link_alt:
---
diff --git a/_templates/merkurya19 b/_templates/merkurya19
deleted file mode 100644
index fcdb13521..000000000
--- a/_templates/merkurya19
+++ /dev/null
@@ -1,12 +0,0 @@
----
-title: Merkury A19 60W
-category: light
-type: Bulb
-standard: us
-link: https://www.walmart.com/ip/Merkury-Innovations-A19-Smart-Light-Bulb-60W-Dimmable-White-LED-1-Pack/512088827
-image: https://camo.githubusercontent.com/884973aed9cd4305cc62b7ffba3d67ad7e917d4c/68747470733a2f2f692e706f7374696d672e63632f676b4a667a7971772f4d492d42573932322d3939392d572e6a7067
-template: '{"NAME":"MI-BW902-999W","GPIO":[0,0,0,0,0,37,0,0,0,0,0,0,0],"FLAG":0,"BASE":18}
-'
----
-
-Dimmable white bulb
diff --git a/_templates/meross_MSS425 b/_templates/meross_MSS425
index bcf515035..8893cc73b 100644
--- a/_templates/meross_MSS425
+++ b/_templates/meross_MSS425
@@ -5,7 +5,7 @@ type: Power Strip
standard: us
link: https://www.amazon.com/meross-Protector-Compatible-Assistant-Individually/dp/B07DXSJP8H
image: https://user-images.githubusercontent.com/5904370/54648572-1727f800-4aa7-11e9-9f92-c19a1045e70a.png
-template: '{"NAME":"Meross MSS425","GPIO":[33,0,0,0,56,0,0,0,21,17,22,23,32],"FLAG":0,"BASE":18}'
+template: {"NAME":"Meross MSS425","GPIO":[33,0,0,0,56,0,0,0,21,17,22,23,32],"FLAG":0,"BASE":18}
---
To open, 4 screws are under the soft foot pads. They take a size 2.0 triangle bit; make sure you have a large collection of small screwdriver bits around.
diff --git a/_templates/mhcozy_relay b/_templates/mhcozy_relay
index 11a476b10..6ee75c1f9 100644
--- a/_templates/mhcozy_relay
+++ b/_templates/mhcozy_relay
@@ -1,12 +1,12 @@
---
date_added: 2019-08-31
title: MHCOZY
-category: relay
+category: switch
type: Relay
standard: global
link: https://www.amazon.fr/verrouillage-autobloquant-commutateur-Control-Android/dp/B0752P57ZG
image: https://images-na.ssl-images-amazon.com/images/I/615szuta7eL._SL1001_.jpg
-template: '{"NAME":"Portail","GPIO":[9,0,0,0,0,0,0,0,21,56,0,0,0],"FLAG":1,"BASE":18}'
+template: {"NAME":"Portail","GPIO":[9,0,0,0,0,0,0,0,21,56,0,0,0],"FLAG":1,"BASE":18}
link_alt:
---
diff --git a/_templates/mi-EW003-999W b/_templates/mi-EW003-999W
index e1e4b4b2e..b2af5884d 100644
--- a/_templates/mi-EW003-999W
+++ b/_templates/mi-EW003-999W
@@ -6,7 +6,7 @@ type: LED Strip
standard: us
link: https://www.walmart.com/ip/Merkury-Innovations-2m-Smart-Wifi-Rgb-Led-Strip-Kit/243703891
image: https://i5.walmartimages.com/asr/08de706f-04ec-422f-94d8-2db78cf36dd5_1.03154eb050b3dbe5a4ff3c0ea4c0e045.jpeg?odnHeight=450&odnWidth=450&odnBg=FFFFFF
-template: '{"NAME":"MI-EW003-999W ","GPIO":[17,0,0,0,37,40,0,0,38,41,39,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"MI-EW003-999W ","GPIO":[17,0,0,0,37,40,0,0,38,41,39,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/mi_desk_lamp b/_templates/mi_desk_lamp
index 0b79157de..046fa8273 100644
--- a/_templates/mi_desk_lamp
+++ b/_templates/mi_desk_lamp
@@ -5,7 +5,7 @@ type: Light
standard: global
link: https://www.mi.com/global/smartlamp/
image: https://user-images.githubusercontent.com/5904370/58196142-e98b4500-7cc9-11e9-9bf0-453d5013fd6c.png
-template: '{"NAME":"Mi Desk Lamp","GPIO":[0,0,17,0,37,38,0,0,150,151,0,0,0],"FLAG":0,"BASE":66}'
+template: {"NAME":"Mi Desk Lamp","GPIO":[0,0,17,0,37,38,0,0,150,151,0,0,0],"FLAG":0,"BASE":66}
link_alt: https://www.gearbest.com/table-lamps/pp_363779.html
---
**If you use a precompiled binary post version 6.5.0.5 this template will not work!**
diff --git a/_templates/minitiger_1_gang b/_templates/minitiger_1_gang
index cb6327e7a..12ca6fc2c 100644
--- a/_templates/minitiger_1_gang
+++ b/_templates/minitiger_1_gang
@@ -6,7 +6,7 @@ type: Switch
standard: eu
link: https://www.aliexpress.com/item/EU-UK-1-2-3-Gang-eWelink-Touch-Light-Smart-Switch-WiFi-Wall-Switch-With-Alexa/32916836771.html
image: https://user-images.githubusercontent.com/5904370/55916503-ce1e1c00-5bec-11e9-96c7-7eff83b0951c.png
-template: '{"NAME":"minitiger 1 Gang","GPIO":[17,255,255,255,0,0,0,0,21,56,0,0,0],"FLAG":0,"BASE":28}'
+template: {"NAME":"minitiger 1 Gang","GPIO":[17,255,255,255,0,0,0,0,21,56,0,0,0],"FLAG":0,"BASE":28}
link_alt:
---
This is a cheap Sonoff T1 clone. Available with 1/2/3 channels.
diff --git a/_templates/minitiger_2_gang b/_templates/minitiger_2_gang
index ba54a96ff..2f0127e3a 100644
--- a/_templates/minitiger_2_gang
+++ b/_templates/minitiger_2_gang
@@ -6,7 +6,7 @@ type: Switch
standard: eu
link: https://www.aliexpress.com/item/EU-UK-1-2-3-Gang-eWelink-Touch-Light-Smart-Switch-WiFi-Wall-Switch-With-Alexa/32916836771.html
image: https://user-images.githubusercontent.com/5904370/55916577-0160ab00-5bed-11e9-8e9b-c20bf489af07.png
-template: '{"NAME":"minitiger 2 Gang","GPIO":[17,255,255,255,0,22,18,0,21,56,0,0,0],"FLAG":0,"BASE":28}'
+template: {"NAME":"minitiger 2 Gang","GPIO":[17,255,255,255,0,22,18,0,21,56,0,0,0],"FLAG":0,"BASE":28}
link_alt:
---
This is a cheap Sonoff T1 clone. Available with 1/2/3 channels.
diff --git a/_templates/minleaf_W-DEXI b/_templates/minleaf_W-DEXI
index 10e4ba7b3..da5e61c02 100644
--- a/_templates/minleaf_W-DEXI
+++ b/_templates/minleaf_W-DEXI
@@ -6,7 +6,7 @@ type: Plug
standard: eu
link: https://www.banggood.com/Minleaf-W-DEXI-16A-Mini-Smart-WiFi-Socket-Switch-100-250V-EU-Plug-Work-with-Amazon-Alexa-Google-Home-IFTTT-p-1558315.html
image: https://imgaz3.staticbg.com/thumb/large/oaupload/ser1/banggood/images/8F/2A/6df478a6-4096-498e-8074-af124b04c7bd.jpg
-template: '{"NAME":"W-DEXI","GPIO":[0,17,0,0,134,132,0,0,131,52,21,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"W-DEXI","GPIO":[0,17,0,0,134,132,0,0,131,52,21,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/mirabella_genio_1002334 b/_templates/mirabella_genio_1002334
index 7a5465ff1..4d6db7752 100644
--- a/_templates/mirabella_genio_1002334
+++ b/_templates/mirabella_genio_1002334
@@ -1,15 +1,17 @@
---
date_added: 2019-06-13
-title: Mirabella Genio 1002334
-category: light
-type: Bulb
-standard: anzac
+title: Mirabella Genio 1002334 9W
+type: CW
+category: bulb
+standard:
+ - B22
+ - E27
link: https://mirabellagenio.net.au/es-%2F-bc-cool-white-specs
image: https://img1.wsimg.com/isteam/ip/67cdd3b9-3600-4104-b097-603c05201237/0ad16db6-7c8c-4a0e-9196-7303de11de5b.png/:/rs=w:400,cg:true,m
-template: '{"NAME":"GenioBulbCW","GPIO":[0,0,0,0,38,37,0,0,0,40,39,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"GenioBulbCW","GPIO":[0,0,0,0,38,37,0,0,0,40,39,0,0],"FLAG":0,"BASE":18}
link_alt: https://www.kmart.com.au/product/mirabella-genio-b22-cw-wi-fi-dim-bulb/2326805
---
-
+Includes also Mirabella Genio 1002335
diff --git a/_templates/mirabella_genio_1002336 b/_templates/mirabella_genio_1002336
index 26fe6398f..6cbbee9e7 100644
--- a/_templates/mirabella_genio_1002336
+++ b/_templates/mirabella_genio_1002336
@@ -1,15 +1,19 @@
---
date_added: 2019-10-21
-title: Mirabella Genio 1002336
-category: light
-type: Bulb
-standard: anzac
+title: Mirabella Genio 1002336 9W
+type: CCT
+category: bulb
+standard:
+ - B22
+ - E27
link: https://www.kmart.com.au/product/mirabella-genio-e27-wi-fi-tunable-bulb/2326811
image: https://www.kmart.com.au/wcsstore/Kmart/images/ncatalog/f/0/42707820-2-f.jpg
-template: '{"NAME":"GenioBulbCCT","GPIO":[0,0,0,0,0,37,0,0,0,38,0,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"GenioBulbCCT","GPIO":[0,0,0,0,0,37,0,0,0,38,0,0,0],"FLAG":0,"BASE":18}
link_alt: https://mirabellagenio.net.au/es-%2F-bc-warm-cct-specs
---
+Includes also Mirabella Genio 1002337
+
Dimmable white only globe with variable colour temperature (2700 to 6500K) Converted with Tuya-Convert. Dont connect to the Mirabella or any other tuya app or the firmware may be updated and prevent OTA flashing. Credit to whoever made the Arlec GLD112HA template, because this is basically a copy of that!
diff --git a/_templates/mirabella_genio_1002338 b/_templates/mirabella_genio_1002338
index e4de4bd68..b92fe6251 100644
--- a/_templates/mirabella_genio_1002338
+++ b/_templates/mirabella_genio_1002338
@@ -1,13 +1,16 @@
---
date_added: 2019-04-24
-title: Mirabella Genio 1002338
-category: light
-type: Bulb
-standard: anzac
+title: Mirabella Genio 1002338 9W
+type: RGBW
+category: bulb
+standard:
+ - B22
+ - E27
link: https://www.kmart.com.au/product/mirabella-genio-wi-fi-e27-colour-bulb/2326804
image: https://img1.wsimg.com/isteam/ip/67cdd3b9-3600-4104-b097-603c05201237/82e13bb8-61c3-42ed-979f-2e2bcf13e659.jpg/:/cr=t:0%25,l:0%25,w:100%25,h:100%25/rs=w:400,cg:true
-template: '{"NAME":"GenioBulbRGB","GPIO":[0,0,0,0,37,40,0,0,38,0,39,0,0],"FLAG":1,"BASE":18}'
+template: {"NAME":"GenioBulbRGB","GPIO":[0,0,0,0,37,40,0,0,38,0,39,0,0],"FLAG":1,"BASE":18}
link_alt: https://mirabellagenio.net.au/es-%2F-bc-warm-rgb-specs
---
+Includes also Mirabella Genio 1002339
RGB and warm white dimmable bulb which can be flashed with Tuya-convert. Dont connect to the Mirabella or any other tuya app or the firmware may be updated and prevent OTA flashing .
diff --git a/_templates/mirabella_genio_1002341 b/_templates/mirabella_genio_1002341
index 89b326c1f..87f94ffd0 100644
--- a/_templates/mirabella_genio_1002341
+++ b/_templates/mirabella_genio_1002341
@@ -5,7 +5,7 @@ type: Plug
standard: anzac
link: https://www.kmart.com.au/product/mirabella-genio-wi-fi-1-usb-adaptor/2326810
image: https://user-images.githubusercontent.com/5904370/54647463-dded8900-4aa2-11e9-9b8a-7b9ef4fe2c23.png
-template: '{"NAME":"Genio 1","GPIO":[0,0,56,0,0,0,0,0,21,17,0,0,0],"FLAG":0,"BASE":1}'
+template: {"NAME":"Genio 1","GPIO":[0,0,56,0,0,0,0,0,21,17,0,0,0],"FLAG":0,"BASE":1}
link_alt: https://mirabellagenio.net.au/smart-adaptor
---
This is a simple smart plug with the addition of a USB port. It is ESP8266 based featuring a On/OFF monenatary push button, 2 LEDs and 2 relays to switch the mains output. The USB port is 'always on' and is not access this from the ESP module.
diff --git a/_templates/mirabella_genio_I002577 b/_templates/mirabella_genio_I002577
index 8867fcfc1..fc239fed1 100644
--- a/_templates/mirabella_genio_I002577
+++ b/_templates/mirabella_genio_I002577
@@ -6,7 +6,7 @@ type: IR Bridge
standard: anzac
link: https://www.kmart.com.au/product/mirabella-genio-wi-fi-smart-ir-universal-remote-controller/2622812
image: https://img1.wsimg.com/isteam/ip/67cdd3b9-3600-4104-b097-603c05201237/Smart%20IR%20Controller.png/:/cr=t:22.22%25,l:17.17%25,w:65.67%25,h:52.63%25/rs=w:600,h:300,cg:true,m
-template: '{"NAME":"Genio IR TxRx","GPIO":[255,255,255,255,56,51,0,0,0,17,8,0,0],"FLAG":0,"BASE":62}'
+template: {"NAME":"Genio IR TxRx","GPIO":[255,255,255,255,56,51,0,0,0,17,8,0,0],"FLAG":0,"BASE":62}
link_alt: https://mirabellagenio.net.au/smart-ir-controller
---
diff --git a/_templates/mirabella_genio_I002579 b/_templates/mirabella_genio_I002579
index d85b9f1bf..28e6d8c27 100644
--- a/_templates/mirabella_genio_I002579
+++ b/_templates/mirabella_genio_I002579
@@ -6,7 +6,7 @@ type: LED Strip
standard: anzac
link: https://mirabellagenio.net.au/led-strip-light
image: https://img1.wsimg.com/isteam/ip/67cdd3b9-3600-4104-b097-603c05201237/STRIP%20Light%20Web.jpg/:/cr=t:2.53%25,l:0%25,w:100%25,h:89.29%25/rs=w:600,h:300,cg:true
-template: '{"NAME":"MirabellaStrip","GPIO":[17,0,0,0,37,40,0,0,38,0,39,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"MirabellaStrip","GPIO":[17,0,0,0,37,40,0,0,38,0,39,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/mirabella_genio_I002741 b/_templates/mirabella_genio_I002741
index 5da5d79c5..7953df17c 100644
--- a/_templates/mirabella_genio_I002741
+++ b/_templates/mirabella_genio_I002741
@@ -6,7 +6,7 @@ type: Light
standard: anzac
link: https://www.kmart.com.au/product/mirabella-genio-9w-led-wi-fi-dimmable-downlight/2754330
image: https://www.kmart.com.au/wcsstore/Kmart/images/ncatalog/f/8/42799368-1-f.jpg
-template: '{"NAME":"GenioDLightRGB","GPIO":[0,0,0,0,38,37,0,0,41,39,40,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"GenioDLightRGB","GPIO":[0,0,0,0,38,37,0,0,41,39,40,0,0],"FLAG":0,"BASE":18}
link_alt: https://mirabellagenio.net.au/downlight-rgb%2Bcct
---
diff --git a/_templates/mirabella_genio_I002742 b/_templates/mirabella_genio_I002742
index 748a21a4a..023eba1c1 100644
--- a/_templates/mirabella_genio_I002742
+++ b/_templates/mirabella_genio_I002742
@@ -6,7 +6,7 @@ type: Light
standard: anzac
link: https://www.kmart.com.au/product/mirabella-genio-wi-fi-dimmable-9w-led-downlight/2754331
image: https://www.kmart.com.au/wcsstore/Kmart/images/ncatalog/f/7/42799337-1-f.jpg
-template: '{"NAME":"GenioDLightCCT","GPIO":[0,0,0,0,0,0,0,0,38,0,37,0,0],"FLAG":0,"BASE":48}'
+template: {"NAME":"GenioDLightCCT","GPIO":[0,0,0,0,0,0,0,0,38,0,37,0,0],"FLAG":0,"BASE":48}
link_alt: https://mirabellagenio.net.au/downlight-rgb%2Bcct
---
diff --git a/_templates/mirabella_genio_I002745 b/_templates/mirabella_genio_I002745
index 2f6c576e2..4cd9b0bc3 100644
--- a/_templates/mirabella_genio_I002745
+++ b/_templates/mirabella_genio_I002745
@@ -1,12 +1,12 @@
---
date_added: 2019-10-31
-title: Mirabella Genio I002745
-category: light
-type: Bulb
-standard: anzac
+title: Mirabella Genio I002745 SES 5.5W
+type: CCT
+category: bulb
+standard: E14
link: https://www.kmart.com.au/product/mirabella-genio-wi-fi-dimmable-5.5w-led-candle-bulb/2746326
image: https://www.kmart.com.au/wcsstore/Kmart/images/ncatalog/sz/0/42800590-1-sz.jpg
-template: '{"NAME":"Mirabella Candle","GPIO":[0,0,0,0,0,0,0,0,38,0,37,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"Mirabella Candle","GPIO":[0,0,0,0,0,0,0,0,38,0,37,0,0],"FLAG":0,"BASE":18}
link_alt: https://mirabellagenio.net.au/ses-led-candle
---
diff --git a/_templates/mirabella_genio_I002746 b/_templates/mirabella_genio_I002746
index 687668cdf..2468ceae7 100644
--- a/_templates/mirabella_genio_I002746
+++ b/_templates/mirabella_genio_I002746
@@ -1,12 +1,12 @@
---
date_added: 2019-10-29
-title: Mirabella Genio I002746
-category: light
-type: Bulb
-standard: anzac
+title: Mirabella Genio I002746 6W
+type: CCT
+category: bulb
+standard: GU10
link: https://www.kmart.com.au/product/mirabella-genio-wi-fi-dimmable-6w-led-light/2746327
image: https://www.kmart.com.au/wcsstore/Kmart/images/ncatalog/sz/6/42800606-1-sz.jpg
-template: '{"NAME":"GenioGU10","GPIO":[0,0,0,0,0,0,0,0,38,0,37,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"GenioGU10","GPIO":[0,0,0,0,0,0,0,0,38,0,37,0,0],"FLAG":0,"BASE":18}
link_alt: https://mirabellagenio.net.au/wi-fi-led-gu10
---
diff --git a/_templates/mirabella_genio__I002578 b/_templates/mirabella_genio__I002578
index 93901c355..34ae9a2aa 100644
--- a/_templates/mirabella_genio__I002578
+++ b/_templates/mirabella_genio__I002578
@@ -6,7 +6,7 @@ type: Power Strip
standard: anzac
link: https://www.kmart.com.au/product/mirabella-genio-wi-fi-powerboard-with-usb-ports/2736803
image: https://www.kmart.com.au/wcsstore/Kmart/images/ncatalog/f/4/42769484-1-f.jpg
-template: '{"NAME":"Genio Powerboa","GPIO":[21,52,0,0,23,22,0,0,25,17,26,24,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"Genio Powerboa","GPIO":[21,52,0,0,23,22,0,0,25,17,26,24,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/mixigoo_10W_E27 b/_templates/mixigoo_10W_E27
index e706fc603..2f70fd1b1 100644
--- a/_templates/mixigoo_10W_E27
+++ b/_templates/mixigoo_10W_E27
@@ -1,12 +1,12 @@
---
date_added: 2019-10-03
-title: Mixigoo 10W E27 RGBW
-category: light
-type: Bulb
-standard: eu
+title: Mixigoo 10W
+type: RGBW
+category: bulb
+standard: E27
link: https://www.amazon.de/gp/product/B07VZXDX6J
image: https://user-images.githubusercontent.com/5904370/66717700-49e76400-eddc-11e9-87f4-2e3b2667eac0.png
-template: '{"NAME":"Mixigoo Bulb","GPIO":[0,0,0,0,41,38,0,0,39,0,37,40,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"Mixigoo Bulb","GPIO":[0,0,0,0,41,38,0,0,39,0,37,40,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/mjswitch b/_templates/mjswitch
index edd766da0..b86223591 100644
--- a/_templates/mjswitch
+++ b/_templates/mjswitch
@@ -5,5 +5,5 @@ type: Switch
standard: us
link: https://www.amazon.com/Martin-Jerry-Devices-required-installation/dp/B07GSTJ8TV
image: https://user-images.githubusercontent.com/5904370/53685174-941d4880-3d17-11e9-93a5-1bd29f301333.png
-template: '{"NAME":"MJ Switch","GPIO":[255,255,255,255,57,56,0,0,21,17,255,255,255],"FLAG":0,"BASE":18}'
+template: {"NAME":"MJ Switch","GPIO":[255,255,255,255,57,56,0,0,21,17,255,255,255],"FLAG":0,"BASE":18}
---
diff --git a/_templates/moes-2switch b/_templates/moes-2switch
index dd769a547..f343ba173 100644
--- a/_templates/moes-2switch
+++ b/_templates/moes-2switch
@@ -6,7 +6,7 @@ type: Switch
standard: anzac
link: https://www.amazon.com/gp/product/B07BLZFQZZ
image: https://images-na.ssl-images-amazon.com/images/I/41R45LydfyL._SL1001_.jpg
-template: '{"NAME":"B07BLZFQZZ ","GPIO":[52,0,53,0,0,18,0,0,17,21,0,22,54],"FLAG":0,"BASE":18}'
+template: {"NAME":"B07BLZFQZZ ","GPIO":[52,0,53,0,0,18,0,0,17,21,0,22,54],"FLAG":0,"BASE":18}
link_alt:
---
The button leds stay blue all the time.
diff --git a/_templates/moes-3-way b/_templates/moes-3-way
index 5275bfc7b..a0dc91bf4 100644
--- a/_templates/moes-3-way
+++ b/_templates/moes-3-way
@@ -6,7 +6,7 @@ type: Switch
standard: us
link: https://www.amazon.com/Wireless-Control-Anywhere-Compatible-Function/dp/B07KQ876W7
image: https://user-images.githubusercontent.com/5904370/67770068-ee60db80-fa55-11e9-991e-445c3cb44df8.png
-template: '{"NAME":"Moes 3-Way","GPIO":[255,255,255,255,21,57,0,0,30,10,9,255,255],"FLAG":0,"BASE":18}'
+template: {"NAME":"Moes 3-Way","GPIO":[255,255,255,255,21,57,0,0,30,10,9,255,255],"FLAG":0,"BASE":18}
link_alt:
---
To control the switch via MQTT you will need to monitor the Power1 state and send an ON/OFF as an event command.
diff --git a/_templates/moes_1_gang_touch b/_templates/moes_1_gang_touch
index c4bf728ca..6972ce02d 100644
--- a/_templates/moes_1_gang_touch
+++ b/_templates/moes_1_gang_touch
@@ -6,7 +6,7 @@ type: Switch
standard: us
link: https://www.amazon.com/gp/product/B07C8FJY3G?th=1
image: https://images-na.ssl-images-amazon.com/images/I/41oZleEF0lL._SL1001_.jpg
-template: '{"NAME":"B07C8FJY3G","GPIO":[54,0,0,17,21,0,0,0,0,0,52,0,55],"FLAG":0,"BASE":18}'
+template: {"NAME":"B07C8FJY3G","GPIO":[54,0,0,17,21,0,0,0,0,0,52,0,55],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/moes_2_gang b/_templates/moes_2_gang
index 327329b05..c300dce63 100644
--- a/_templates/moes_2_gang
+++ b/_templates/moes_2_gang
@@ -6,7 +6,7 @@ type: Switch
standard: us
link: https://www.amazon.com/Wireless-Anywhere-Compatible-Function-Required/dp/B07BLZFQZZ
image: https://images-na.ssl-images-amazon.com/images/I/41R45LydfyL._SX679_.jpg
-template: '{"NAME":"Tuya Moes 2 Ch","GPIO":[25,255,24,0,0,18,0,0,17,21,0,22,23],"FLAG":0,"BASE":18}'
+template: {"NAME":"Tuya Moes 2 Ch","GPIO":[25,255,24,0,0,18,0,0,17,21,0,22,23],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/moes_3_gang b/_templates/moes_3_gang
index e7e60f453..6a83deb28 100644
--- a/_templates/moes_3_gang
+++ b/_templates/moes_3_gang
@@ -6,7 +6,7 @@ type: Switch
standard: us
link: https://www.amazon.com/Wireless-Anywhere-Compatible-Function-Required/dp/B07BM1JJDC
image: https://images-na.ssl-images-amazon.com/images/I/41LEqcVVgZL._SX679_.jpg
-template: '{"NAME":"Tuya Moes 3 Ch","GPIO":[27,255,26,18,22,19,0,0,17,21,25,23,24],"FLAG":0,"BASE":18}'
+template: {"NAME":"Tuya Moes 3 Ch","GPIO":[27,255,26,18,22,19,0,0,17,21,25,23,24],"FLAG":0,"BASE":18}
link_alt: https://www.ebay.com/itm/F-ALEXA-Google-Home-APP-3Gang-WiFi-Smart-Panel-Touch-Switch-Remote-Control-Touch/132661136526
---
diff --git a/_templates/moes_DS01 b/_templates/moes_DS01
index 209bcebbd..08140b769 100644
--- a/_templates/moes_DS01
+++ b/_templates/moes_DS01
@@ -6,7 +6,7 @@ type: Dimmer
standard: us
link: https://www.amazon.ca/MOES-Control-Compatible-Required-Standard/dp/B07PLCMR71
image: https://m.media-amazon.com/images/S/aplus-seller-content-images-us-east-1/A2EUQ1WTGCTBG2/AM2ATWLFGFUBV/7e9e2b45-484b-4e78-af29-cc6917054d84._CR0,0,600,800_PT0_SX300__.jpg
-template: '{"NAME":"MOES - DS01","GPIO":[255,255,255,255,255,255,0,0,255,108,255,107,255],"FLAG":0,"BASE":54}'
+template: {"NAME":"MOES - DS01","GPIO":[255,255,255,255,255,255,0,0,255,108,255,107,255],"FLAG":0,"BASE":54}
link_alt: https://www.aliexpress.com/item/US-WiFi-Smart-Wall-Light-Switch-Dimmer-Mobile-APP-Remote-Control-No-Hub-Required-Works-with/32991817692.html?spm=2114.search0104.3.14.53c94300OPXiLp&ws_ab_test=searchweb0_0,searchweb201602_5_10065_10068_10130_10547_319_10059_10884_317_10548_10887_10696_321_322_10084_453_10083_454_10103_10618_10307_537_536,searchweb201603_52,ppcSwitch_0&algo_expid=ef478460-b615-4373-b9b3-1a88dd4fb41c-2&algo_pvid=ef478460-b615-4373-b9b3-1a88dd4fb41c&transAbTest=ae803_5
---
diff --git a/_templates/moes_no_neutral_2gang b/_templates/moes_no_neutral_2gang
index 552f051fe..155300e05 100644
--- a/_templates/moes_no_neutral_2gang
+++ b/_templates/moes_no_neutral_2gang
@@ -6,7 +6,7 @@ type: Switch
standard: eu
link: https://www.aliexpress.com/item/4000155341437.html
image: https://cdn.shopify.com/s/files/1/0095/4079/6497/products/Hcfa01c0b54a043ac9de2d98f667c9530Z_1800x1800.jpg
-template: '{"NAME":"Tuya 2 Channel","GPIO":[0,0,0,0,22,0,0,0,17,21,18,0,157],"FLAG":0,"BASE":18}'
+template: {"NAME":"Tuya 2 Channel","GPIO":[0,0,0,0,22,0,0,0,17,21,18,0,157],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/moeshouse_MS-104B b/_templates/moeshouse_MS-104B
index c4527dc69..853987ed7 100644
--- a/_templates/moeshouse_MS-104B
+++ b/_templates/moeshouse_MS-104B
@@ -1,12 +1,12 @@
---
date_added: 2019-09-20
title: Moeshouse 2 way 2 gang MS-104B
-category: relay
+category: switch
type: Relay
standard: eu
link: https://www.aliexpress.com/item/33047521274.html?spm=a2g0s.9042311.0.0.5f705c0fkcQLzV
image: https://user-images.githubusercontent.com/39533759/65378668-22f5b080-dcbc-11e9-9401-8d906b204914.jpg
-template: '{"NAME":"moeshouse2gang","GPIO":[0,0,17,0,160,0,0,0,43,42,21,22,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"moeshouse2gang","GPIO":[0,0,17,0,160,0,0,0,43,42,21,22,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/moeshouse_smart_socket b/_templates/moeshouse_smart_socket
index 1a7d71954..7baa4c676 100644
--- a/_templates/moeshouse_smart_socket
+++ b/_templates/moeshouse_smart_socket
@@ -9,7 +9,7 @@ standard:
- anzac
link: https://www.aliexpress.com/item/33000836814.html
image: https://ae01.alicdn.com/kf/HTB1leE2Q3HqK1RjSZFgq6y7JXXa9/WiFi-Smart-Wall-Socket-Outlet-Glass-Panel-Smart-Life-Tuya-APP-Remote-Control-Works-with-Amazon.jpg
-template: '{"NAME":"Smart Socket","GPIO":[255,255,255,255,52,53,0,0,21,17,255,255,255],"FLAG":0,"BASE":18}'
+template: {"NAME":"Smart Socket","GPIO":[255,255,255,255,52,53,0,0,21,17,255,255,255],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/moko b/_templates/moko
index e76a53858..a6c4509f2 100644
--- a/_templates/moko
+++ b/_templates/moko
@@ -6,7 +6,7 @@ type: Switch
standard: us
link: https://www.amazon.com/MoKo-Control-Compatible-Required-Installation/dp/B07VXVHDVD
image: https://m.media-amazon.com/images/S/aplus-media/sc/f75c3753-2b2a-4874-b818-e3d82c4a8e80.__CR0,0,300,300_PT0_SX300_V1___.jpg
-template: '{"NAME":"Moko Switch","GPIO":[0,0,0,17,21,134,0,0,0,0,0,0,0],"FLAG":0,"BASE":59}'
+template: {"NAME":"Moko Switch","GPIO":[0,0,0,17,21,134,0,0,0,0,0,0,0],"FLAG":0,"BASE":59}
link_alt:
---
diff --git a/_templates/moko_YX-L01C-E27 b/_templates/moko_YX-L01C-E27
index b568a8647..208900f85 100644
--- a/_templates/moko_YX-L01C-E27
+++ b/_templates/moko_YX-L01C-E27
@@ -1,12 +1,12 @@
---
date_added: 2019-09-25
-title: MOKO YX-L01C-E27
-category: light
-type: Bulb
-standard: global
+title: MOKO YX-L01C-E27 9W
+type: RGB
+category: bulb
+standard: E27
link: https://www.amazon.de/MoKo-Farblicht-APP-Fernbedienung-Sprachsteuerung-Kompatibel/dp/B07VF4ZFTP
image: https://user-images.githubusercontent.com/5904370/66717715-697e8c80-eddc-11e9-8cce-d925f78d2f1b.png
-template: '{"NAME":"MOKO","GPIO":[17,0,0,0,143,144,0,0,0,0,0,0,0],"FLAG":0,"BASE":27}'
+template: {"NAME":"MOKO","GPIO":[17,0,0,0,143,144,0,0,0,0,0,0,0],"FLAG":0,"BASE":27}
link_alt:
---
diff --git a/_templates/monoprice_34082 b/_templates/monoprice_34082
index b7d5a889c..1dd7a4e51 100644
--- a/_templates/monoprice_34082
+++ b/_templates/monoprice_34082
@@ -6,7 +6,7 @@ type: Power Strip
standard: us
link: https://www.monoprice.com/product?p_id=34082
image: https://images.monoprice.com/productlargeimages/340821.jpg
-template: '{"NAME":"Stitch 34082","GPIO":[255,255,255,255,21,20,0,0,23,22,24,255,255],"FLAG":0,"BASE":18}'
+template: {"NAME":"Stitch 34082","GPIO":[255,255,255,255,21,20,0,0,23,22,24,255,255],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/monster_smart_illuminessence b/_templates/monster_smart_illuminessence
index 38da9ad7b..be8946ffb 100644
--- a/_templates/monster_smart_illuminessence
+++ b/_templates/monster_smart_illuminessence
@@ -6,7 +6,7 @@ type: LED Strip
standard: us
link: https://www.walmart.com/ip/Monster-Smart-Google-Assistant-Multicolor-LED-Light-Strip/541990457
image: https://i5.walmartimages.com/asr/d3352125-e72f-4cd6-a7bf-0e7a2d46ae3c_2.b8e5af6432c6b1a946e6e3c0baede509.jpeg
-template: '{"NAME":"MI-EW003-999W ","GPIO":[17,0,0,0,37,40,0,0,38,41,39,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"MI-EW003-999W ","GPIO":[17,0,0,0,37,40,0,0,38,41,39,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/muvit_IO_miobulb001 b/_templates/muvit_IO_miobulb001
index 097a4813b..50a98d073 100644
--- a/_templates/muvit_IO_miobulb001
+++ b/_templates/muvit_IO_miobulb001
@@ -1,12 +1,12 @@
---
date_added: 2019-11-05
-title: muvit IO miobulb001
-category: light
-type: Bulb
-standard: eu
+title: muvit IO miobulb001 5W
+type: RGB
+category: bulb
+standard: E27
link: https://www.amazon.es/Muvit-MIOBULB001-Inteligente-Compatible-asistentes/dp/B07KMWZ41R
image: https://images-na.ssl-images-amazon.com/images/I/81xjTL6fhuL._AC_SL1500_.jpg
-template: '{"NAME":"miobulb001","GPIO":[0,0,0,0,40,0,0,0,38,39,37,0,0],"FLAG":15,"BASE":18}'
+template: {"NAME":"miobulb001","GPIO":[0,0,0,0,40,0,0,0,38,39,37,0,0],"FLAG":15,"BASE":18}
link_alt: https://www.leroymerlin.es/fp/82215854/bombilla-led-muvit-io-5w-wifi-600-lumenes.iluminacion_bombillas-led-y-tubos_bombillas-inteligentes
---
diff --git a/_templates/naamasmart_KS602 b/_templates/naamasmart_KS602
index 80cc423b7..ca24bd38b 100644
--- a/_templates/naamasmart_KS602
+++ b/_templates/naamasmart_KS602
@@ -6,7 +6,7 @@ type: Switch
standard: us
link: https://www.amazon.com/gp/product/B077M5FN9M
image: https://images-na.ssl-images-amazon.com/images/I/216LMI6KgZL.jpg
-template: '{"NAME":"KS-602","GPIO":[17,0,0,0,0,0,0,0,21,0,0,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"KS-602","GPIO":[17,0,0,0,0,0,0,0,21,0,0,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/nanxin_NX-SM200 b/_templates/nanxin_NX-SM200
index a326f8675..0e0bc9091 100644
--- a/_templates/nanxin_NX-SM200
+++ b/_templates/nanxin_NX-SM200
@@ -6,7 +6,7 @@ type: Plug
standard: eu
link: https://www.alibaba.com/product-detail/Hot-selling-google-home-CE-ROHS_60806392125.html
image: https://user-images.githubusercontent.com/5904370/63218096-702db200-c153-11e9-99b5-3fb240286543.png
-template: '{"NAME":"NX-SM200","GPIO":[56,0,0,0,0,134,0,0,21,17,132,57,131],"FLAG":0,"BASE":18}'
+template: {"NAME":"NX-SM200","GPIO":[56,0,0,0,0,134,0,0,21,17,132,57,131],"FLAG":0,"BASE":18}
link_alt: https://www.amazon.de/gp/product/B07FJLJ5DY
---
diff --git a/_templates/nedis_N_WIFIIP130FWT b/_templates/nedis_N_WIFIIP130FWT
index dca61247b..208ed8ef1 100644
--- a/_templates/nedis_N_WIFIIP130FWT
+++ b/_templates/nedis_N_WIFIIP130FWT
@@ -6,7 +6,7 @@ type: Plug
standard: eu
link: https://nedis.com/en-us/product/550685206/wi-fi-smart-plug-schuko-type-f-10-a
image: https://pictures.content4us.com/products_high_res/WIFIP130FWT_P40.JPG
-template: '{"NAME":"WIFIIP130FWT","GPIO":[255,255,255,255,56,57,255,255,21,17,255,255,255],"FLAG":0,"BASE":18}'
+template: {"NAME":"WIFIIP130FWT","GPIO":[255,255,255,255,56,57,255,255,21,17,255,255,255],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/nedis_WIFILC10WTE14 b/_templates/nedis_WIFILC10WTE14
index be414ef78..faf77ac38 100644
--- a/_templates/nedis_WIFILC10WTE14
+++ b/_templates/nedis_WIFILC10WTE14
@@ -1,13 +1,13 @@
---
date_added: 2019-11-26
title: Nedis WIFILC10WTE14
-category: light
-type: Bulb
-standard: eu
-link: https://www.webhallen.com/se/product/292978-Nedis-WiFi-Smart-LED-lampa-Color-E14
-image: https://pictures.content4us.com/products_high_res/WIFILC10WTE14_P11.JPG
-template: '{"NAME":"Nedis WIFILC10","GPIO":[0,0,0,0,39,37,0,0,40,38,41,0,0],"FLAG":1,"BASE":18}'
-link_alt: https://nedis.com/en-us/product/smart-living/smart-home/lighting/550680690/wifi-smart-led-bulb-full-colour-and-warm-white-e14
+type: RGBW
+category: bulb
+standard: E14
+link: https://nedis.com/en-us/product/smart-living/smart-home/lighting/550680690/wifi-smart-led-bulb-full-colour-and-warm-white-e14
+image: https://pictures.content4us.com/products_high_res/WIFILC10WTE14_P66.JPG
+template: {"NAME":"Nedis WIFILC10","GPIO":[0,0,0,0,39,37,0,0,40,38,41,0,0],"FLAG":1,"BASE":18}
+link_alt: https://www.webhallen.com/se/product/292978-Nedis-WiFi-Smart-LED-lampa-Color-E14
---
Flashed with Tuya-Convert.
diff --git a/_templates/nedis_WIFILC10WTE27 b/_templates/nedis_WIFILC10WTE27
index 93df5075c..ac3a970fd 100644
--- a/_templates/nedis_WIFILC10WTE27
+++ b/_templates/nedis_WIFILC10WTE27
@@ -1,13 +1,13 @@
---
date_added: 2019-09-04
title: Nedis WIFILC10WTE27
-category: light
-type: Bulb
-standard: eu
-link: https://www.nowthatsit.nl/nedis-wifilc10wte27.html
-image: https://webshop.nedis.de/images/products_high_res/WIFILC10WTE27_P11.JPG
-template: '{"NAME":"Nedis RGBW","GPIO":[0,0,0,0,140,37,0,0,0,142,141,0,0],"FLAG":1,"BASE":18}'
-link_alt: https://webshop.nedis.de/de-de/550671324/wifilc10wte27#
+type: RGBW
+category: bulb
+standard: E27
+link: https://nedis.com/en-us/product/550714423/wifi-smart-led-bulb-full-colour-and-warm-white-e27
+image: https://pictures.content4us.com/products_high_res/WIFILC11WTE27_P66.JPG
+template: {"NAME":"Nedis RGBW","GPIO":[0,0,0,0,140,37,0,0,0,142,141,0,0],"FLAG":1,"BASE":18}
+link_alt: https://www.nowthatsit.nl/nedis-wifilc10wte27.html
---
diff --git a/_templates/nedis_WIFILF10GDG125 b/_templates/nedis_WIFILF10GDG125
index 7fa9cda51..6de05bb20 100644
--- a/_templates/nedis_WIFILF10GDG125
+++ b/_templates/nedis_WIFILF10GDG125
@@ -1,13 +1,13 @@
---
date_added: 2019-10-30
-title: Nedis WIFILF10GDG125
-category: light
-type: Bulb
-standard: global
-link: https://webshop.nedis.de/de-de/550695567/wifilf10gdg125
-image: https://webshop.nedis.de/images/products_high_res/WIFILF10GDG125_P11.JPG
-template: '{"NAME":"WIFILF10GDG125","GPIO":[0,0,0,0,0,0,0,0,0,0,37,0,0],"FLAG":0,"BASE":18}'
-link_alt:
+title: Nedis WIFILF10GDG125
+type: Filament
+category: bulb
+standard: E27
+link: https://nedis.com/en-us/product/550695567/wi-fi-smart-led-filament-bulb-e27-125-mm-5w-500-lm
+image: https://pictures.content4us.com/products_high_res/WIFILF10GDG125_P66.JPG
+template: {"NAME":"WIFILF10GDG125","GPIO":[0,0,0,0,0,0,0,0,0,0,37,0,0],"FLAG":0,"BASE":18}
+link_alt: https://webshop.nedis.de/de-de/550695567/wifilf10gdg125
---
I don’t know if there are more options inside the bulb but this will give basic access via PWM1
diff --git a/_templates/nedis_WIFILW10WTE14 b/_templates/nedis_WIFILW10WTE14
index 9c9158b17..a8941b8df 100644
--- a/_templates/nedis_WIFILW10WTE14
+++ b/_templates/nedis_WIFILW10WTE14
@@ -1,13 +1,13 @@
---
date_added: 2019-11-01
title: Nedis WIFILW10WTE14
-category: light
-type: Bulb
-standard: global
-link: https://webshop.nedis.de/de-de/550683246/wifilw10wte14
-image: https://webshop.nedis.de/images/products_high_res/WIFILW10WTE14_P11.JPG
-template: '{"NAME":"WIFILW10WTE14","GPIO":[0,0,0,0,0,37,0,0,0,38,0,0,0],"FLAG":0,"BASE":18}'
-link_alt:
+type: CCT
+category: bulb
+standard: E14
+link: https://nedis.com/en-us/product/550683246/wifi-smart-led-bulb-warm-to-cool-white-e14
+image: https://pictures.content4us.com/products_high_res/WIFILW10WTE14_P66.JPG
+template: {"NAME":"WIFILW10WTE14","GPIO":[0,0,0,0,0,37,0,0,0,38,0,0,0],"FLAG":0,"BASE":18}
+link_alt: https://webshop.nedis.de/de-de/550683246/wifilw10wte14
---
I don’t know if there are more options inside the bulb but this will give basic access via PWM1 (cold) and PWM2 (warm).
diff --git a/_templates/nedis_WIFILW10WTE27 b/_templates/nedis_WIFILW10WTE27
index fbf7dc38d..f561e180d 100644
--- a/_templates/nedis_WIFILW10WTE27
+++ b/_templates/nedis_WIFILW10WTE27
@@ -1,13 +1,13 @@
---
date_added: 2019-10-11
title: Nedis WIFILW10WTE27
-category: light
-type: Bulb
-standard: global
-link: https://webshop.nedis.de/de-de/550671325/wifilw10wte27
-image: https://webshop.nedis.de/images/products_high_res/WIFILW10WTE27_P11.JPG
-template: '{"NAME":"WIFILW10WTE27","GPIO":[0,0,0,0,0,37,0,0,38,0,0,0,0],"FLAG":0,"BASE":18}'
-link_alt:
+type: CCT
+category: bulb
+standard: E27
+link: https://nedis.com/en-us/product/smart-living/smart-home/lighting/550671325/wifi-smart-led-bulb-warm-to-cool-white-e27
+image: https://pictures.content4us.com/products_high_res/WIFILW10WTE27_P66.JPG
+template: {"NAME":"WIFILW10WTE27","GPIO":[0,0,0,0,0,37,0,0,38,0,0,0,0],"FLAG":0,"BASE":18}
+link_alt: https://webshop.nedis.de/de-de/550671325/wifilw10wte27
---
I don't know if there are more options inside the bulb but this will give basic access via PWM1 (cold) and PWM2 (warm)
diff --git a/_templates/nedis_WIFIP110FWT b/_templates/nedis_WIFIP110FWT
index 95d3d83e6..b9d7cf80c 100644
--- a/_templates/nedis_WIFIP110FWT
+++ b/_templates/nedis_WIFIP110FWT
@@ -6,7 +6,7 @@ type: Plug
standard: eu
link: https://nedis.com/en-us/product/550671326/wifi-smart-plug-power-monitor-schuko-type-f-10a
image: https://pictures.content4us.com/products_high_res/WIFIP110FWT_P50.JPG
-template: '{"NAME":"Nedis WIFIP110","GPIO":[17,0,0,0,134,132,0,0,131,56,21,0,0],"FLAG":0,"BASE":49}'
+template: {"NAME":"Nedis WIFIP110","GPIO":[17,0,0,0,134,132,0,0,131,56,21,0,0],"FLAG":0,"BASE":49}
link_alt: https://www.kjell.com/se/produkter/hem-kontor-fritid/smarta-hem/wi-fi/nedis/nedis-smartlife-fjarrstrombrytare-med-energimatning-p51371
---
diff --git a/_templates/nedis_WIFIP310FWT b/_templates/nedis_WIFIP310FWT
index ae4938f58..63f1491ab 100644
--- a/_templates/nedis_WIFIP310FWT
+++ b/_templates/nedis_WIFIP310FWT
@@ -6,7 +6,7 @@ type: Power Strip
standard: eu
link: https://webshop.nedis.se/sv-se/550672299/wifip310fwt
image: https://webshop.nedis.se/images/products_high_res/WIFIP310FWT_P40.JPG
-template: '{"NAME":"Nedis WIFIP310","GPIO":[0,56,0,17,22,21,0,0,0,23,24,0,0],"FLAG":1,"BASE":18}'
+template: {"NAME":"Nedis WIFIP310","GPIO":[0,56,0,17,22,21,0,0,0,23,24,0,0],"FLAG":1,"BASE":18}
link_alt: https://www.reichelt.com/de/en/smart-switchable-socket-outlet-16-a-usb-n-wifip310fwt-p249291.html
---
diff --git a/_templates/nedis_WIFIPO120FWT b/_templates/nedis_WIFIPO120FWT
index f4faf4094..24caf30ff 100644
--- a/_templates/nedis_WIFIPO120FWT
+++ b/_templates/nedis_WIFIPO120FWT
@@ -6,7 +6,7 @@ type: Outdoor Plug
standard: eu
link: https://nedis.com/en-us/product/550710067/wi-fi-smart-outdoor-plug-splashproof-ip44-power-monitor-schuko-type-f-16-a
image: https://pictures.content4us.com/products_high_res/WIFIPO120FWT_P41.JPG
-template: '{"NAME":"WIFIPO120FWT","GPIO":[17,0,0,0,134,132,0,0,131,56,21,0,0],"FLAG":0,"BASE":49}'
+template: {"NAME":"WIFIPO120FWT","GPIO":[17,0,0,0,134,132,0,0,131,56,21,0,0],"FLAG":0,"BASE":49}
link_alt: https://www.webhallen.com/se/product/306173-Nedis-Wi-Fi-Smart-Utomhus-Plug-IP44-Energimatning-16A
link_alt: https://www.kjell.com/se/produkter/el-verktyg/smarta-hem/wi-fi/nedis/nedis-smartlife-fjarrstrombrytare-for-utomhusbruk-p51539
---
diff --git a/_templates/neocoolcam_16a b/_templates/neocoolcam_16a
index c7c2fd357..8ca935638 100644
--- a/_templates/neocoolcam_16a
+++ b/_templates/neocoolcam_16a
@@ -6,7 +6,7 @@ type: Plug
standard: eu
link: https://www.aliexpress.com/item/NEO-Coolcam-Smart-Plug-WiFi-Socket-3680W-16A-Power-Energy-Monitoring-Timer-Switch-EU-Outlet-Voice/32966183521.html
image: https://ae01.alicdn.com/kf/HTB1CiBnasvrK1Rjy0Feq6ATmVXaL/NEO-Coolcam-Smart-Plug-WiFi-Socket-3680W-16A-Power-Energy-Monitoring-Timer-Switch-EU-Outlet-Voice.jpg
-template: '{"NAME":"Neo Coolcam 16","GPIO":[17,0,0,0,133,132,0,0,131,56,21,0,0],"FLAG":0,"BASE":49}'
+template: {"NAME":"Neo Coolcam 16","GPIO":[17,0,0,0,133,132,0,0,131,56,21,0,0],"FLAG":0,"BASE":49}
link_alt: https://www.szneo.com/en/products/show.php?id=215
---
diff --git a/_templates/neocoolcam_16a_v2 b/_templates/neocoolcam_16a_v2
index 63467ceee..88c2395d8 100644
--- a/_templates/neocoolcam_16a_v2
+++ b/_templates/neocoolcam_16a_v2
@@ -6,7 +6,7 @@ type: Plug
standard: eu
link: https://www.aliexpress.com/item/NEO-Coolcam-Smart-Plug-WiFi-Socket-3680W-16A-Power-Energy-Monitoring-Timer-Switch-EU-Outlet-Voice/32966183521.html
image: https://ae01.alicdn.com/kf/HTB1CiBnasvrK1Rjy0Feq6ATmVXaL/NEO-Coolcam-Smart-Plug-WiFi-Socket-3680W-16A-Power-Energy-Monitoring-Timer-Switch-EU-Outlet-Voice.jpg
-template: '{"NAME":"Neo Coolcam 16","GPIO":[17,0,0,0,134,132,0,0,131,56,21,0,0],"FLAG":0,"BASE":49}'
+template: {"NAME":"Neo Coolcam 16","GPIO":[17,0,0,0,134,132,0,0,131,56,21,0,0],"FLAG":0,"BASE":49}
link_alt: https://www.szneo.com/en/products/show.php?id=215
---
diff --git a/_templates/nexete_DS-123 b/_templates/nexete_DS-123
index a45b794fb..5a190a430 100644
--- a/_templates/nexete_DS-123
+++ b/_templates/nexete_DS-123
@@ -6,7 +6,7 @@ type: Switch
standard: us
link: https://www.amazon.com/gp/product/B07X4Z69BV
image: https://user-images.githubusercontent.com/5904370/67141285-f05eb980-f261-11e9-97e8-72ab86e779ac.png
-template: '{"NAME":"DS-123","GPIO":[157,57,255,17,21,18,0,0,255,22,56,255,255],"FLAG":0,"BASE":18}'
+template: {"NAME":"DS-123","GPIO":[157,57,255,17,21,18,0,0,255,22,56,255,255],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/nexete_DS-123_single b/_templates/nexete_DS-123_single
index 686d41503..2bbc4376f 100644
--- a/_templates/nexete_DS-123_single
+++ b/_templates/nexete_DS-123_single
@@ -6,7 +6,7 @@ type: Switch
standard: us
link: https://www.amazon.com/Wireless-Smartphone-Compatible-Anywhere-Function/dp/B078ZNJNSK
image: https://images-na.ssl-images-amazon.com/images/I/51x1pjHlfjL._SX425_.jpg
-template: '{"NAME":"DS-123","GPIO":[157,0,255,18,0,17,0,0,255,21,56,255,255],"FLAG":0,"BASE":18}'
+template: {"NAME":"DS-123","GPIO":[157,0,255,18,0,17,0,0,255,21,56,255,255],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/nexluxled b/_templates/nexluxled
index cbfc5d267..e3235121e 100644
--- a/_templates/nexluxled
+++ b/_templates/nexluxled
@@ -6,7 +6,7 @@ type: LED Controller
standard: global
link: https://www.amazon.com/Nexlux-Wireless-Controller-Compatible-Included/dp/B07116SX41
image: https://images-na.ssl-images-amazon.com/images/I/41BgQ4VkQJL._AC_SR160,160_.jpg
-template: '{"NAME":"MagicHome V1.1","GPIO":[0,0,0,0,51,37,0,0,38,39,0,0,0],"FLAG":0,"BASE":34}'
+template: {"NAME":"MagicHome V1.1","GPIO":[0,0,0,0,51,37,0,0,38,39,0,0,0],"FLAG":0,"BASE":34}
link_alt:
---
MagicHome V1.1 IR varient
diff --git a/_templates/nitebird_TT-WB4 b/_templates/nitebird_TT-WB4
index f4158a878..691ada0eb 100644
--- a/_templates/nitebird_TT-WB4
+++ b/_templates/nitebird_TT-WB4
@@ -1,12 +1,12 @@
---
date_added: 2019-09-27
title: NiteBird TT-WB4
-category: light
-type: Bulb
-standard: us
+type: RGBW
+category: bulb
+standard: E26
link: https://www.amazon.com/gp/product/B07MTYVSSV
image: https://m.media-amazon.com/images/S/aplus-media/sc/b70090ee-c12e-4454-9a59-02721cb27415.__CR0,0,600,600_PT0_SX300_V1___.jpg
-template: '{"NAME":"NiteBird TT-WB","GPIO":[0,0,0,0,40,0,0,0,37,38,39,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"NiteBird TT-WB","GPIO":[0,0,0,0,40,0,0,0,37,38,39,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/nova_digital_basic_MS101 b/_templates/nova_digital_basic_MS101
index 14e99b5ed..cc57b4a70 100644
--- a/_templates/nova_digital_basic_MS101
+++ b/_templates/nova_digital_basic_MS101
@@ -1,12 +1,12 @@
---
date_added: 2019-10-09
title: Nova Digital Basic 1 MS101
-category: relay
+category: switch
type: Relay
standard: global
link: https://novadigitalonline.com.br/products/novadigital-interruptor-wifi-automacao-residencial-original-ms101
image: https://user-images.githubusercontent.com/5904370/68545548-64f2c700-03ce-11ea-8eb8-cbe8b58ed26a.png
-template: '{"NAME":"NovaDigBasic1","GPIO":[255,255,255,255,56,255,0,0,21,17,255,255,255],"FLAG":0,"BASE":18}'
+template: {"NAME":"NovaDigBasic1","GPIO":[255,255,255,255,56,255,0,0,21,17,255,255,255],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/novostella_12W_RGBCT b/_templates/novostella_12W_RGBCT
deleted file mode 100644
index a40a49c3c..000000000
--- a/_templates/novostella_12W_RGBCT
+++ /dev/null
@@ -1,19 +0,0 @@
----
-date_added: 2019-09-27
-title: Novostella 12W RGBCT E27
-category: light
-type: Bulb
-standard: eu
-link: https://www.amazon.co.uk/gp/product/B07P8XKHHS
-image: https://images-na.ssl-images-amazon.com/images/I/61WEqGnwtuL._AC_SL1500_.jpg
-template: '{"NAME":"Novostella","GPIO":[0,0,0,0,37,40,0,0,38,41,39,0,0],"FLAG":0,"BASE":18}'
-link_alt: https://www.novostella.net/products/1-pack-12w-e26-rgbcw-2700-6500k-smart-wifi-led-bulb
----
-
-Flashed using tuya convert (New SDK)
-
-
-
-
-
-
diff --git a/_templates/novostella_20W_flood b/_templates/novostella_20W_flood
index 0386c118c..77754966a 100644
--- a/_templates/novostella_20W_flood
+++ b/_templates/novostella_20W_flood
@@ -6,7 +6,7 @@ type: Light
standard: us
link: https://www.amazon.com/gp/product/B07VH1VHYL
image: https://images-na.ssl-images-amazon.com/images/I/71JV5A3kSkL._AC_SL1500_.jpg
-template: '{"NAME":"Novo 20W Flood","GPIO":[0,0,0,0,37,40,0,0,38,41,39,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"Novo 20W Flood","GPIO":[0,0,0,0,37,40,0,0,38,41,39,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/novostella_A19_9W_E26 b/_templates/novostella_A19_9W_E26
deleted file mode 100644
index aabef5556..000000000
--- a/_templates/novostella_A19_9W_E26
+++ /dev/null
@@ -1,13 +0,0 @@
----
-date_added: 2019-11-30
-title: Novostella A19 9W E26
-category: light
-type: Bulb
-standard: us
-link: https://www.amazon.com/gp/product/B07XNXDHVV
-image: https://images-na.ssl-images-amazon.com/images/I/61PC2moDsIL._SL1000_.jpg
-template: '{"NAME":"Novostella A19","GPIO":[0,0,0,0,41,38,0,0,39,0,40,37,0],"FLAG":0,"BASE":18}'
-link_alt:
----
-
-`Setoption15 1`
\ No newline at end of file
diff --git a/_templates/novostella_GD-BW09 b/_templates/novostella_GD-BW09
new file mode 100644
index 000000000..02e20b183
--- /dev/null
+++ b/_templates/novostella_GD-BW09
@@ -0,0 +1,14 @@
+---
+date_added: 2019-09-27
+title: Novostella GD-BW09 12W
+type: RGBCCT
+category: bulb
+standard: E27
+link: https://www.amazon.co.uk/dp/B07P5QCCSZ
+image: https://images-na.ssl-images-amazon.com/images/I/61WEqGnwtuL._SL1500_.jpg
+template: {"NAME":"Novostella","GPIO":[0,0,0,0,37,40,0,0,38,41,39,0,0],"FLAG":0,"BASE":18}
+link_alt:
+---
+Manufacturer reference: UT55508-RGBCW-EU-1
+
+Flashed using tuya convert (New SDK)
diff --git a/_templates/novostella_HM-LB07-RGBCW-US-1 b/_templates/novostella_HM-LB07-RGBCW-US-1
new file mode 100644
index 000000000..f68aa2fca
--- /dev/null
+++ b/_templates/novostella_HM-LB07-RGBCW-US-1
@@ -0,0 +1,14 @@
+---
+date_added: 2019-11-30
+title: Novostella HM-LB07 9W
+type: RGBCCT
+category: bulb
+standard: E26
+link: https://www.amazon.com/gp/product/B07XNXDHVV
+image: https://cdn.shopify.com/s/files/1/0079/8870/7381/products/9W_2048x2048.jpg?v=1575357995
+template: {"NAME":"Novostella A19","GPIO":[0,0,0,0,41,38,0,0,39,0,40,37,0],"FLAG":0,"BASE":18}
+link_alt: https://www.novostella.net/collections/smart-bulb-rgbcw-smart-bulb/products/1-pack-9w-e26-rgbcw-2700-6500k-smart-wifi-led-bulb
+---
+Manufacturer reference: HM-LB07-RGBCW-US-1
+
+Requires `SetOption15 1`
\ No newline at end of file
diff --git a/_templates/novostella_UT55505-RGBCW-UK-1 b/_templates/novostella_UT55505-RGBCW-UK-1
new file mode 100644
index 000000000..5407ee80f
--- /dev/null
+++ b/_templates/novostella_UT55505-RGBCW-UK-1
@@ -0,0 +1,12 @@
+---
+date_added: 2019-03-18
+title: Novostella UT55505 7W
+type: RGBCCT
+category: bulb
+standard: B22
+link: https://www.amazon.co.uk/gp/product/B07DN4NLKM
+image: https://images-na.ssl-images-amazon.com/images/I/61BYD0%2B1g9L._SL1200_.jpg
+template: {"NAME":"Novostella B22","GPIO":[0,0,0,0,37,41,0,0,38,40,39,0,0],"FLAG":0,"BASE":18}
+link_alt:
+---
+Manufacturer reference: UT55505-RGBCW-UK-1
\ No newline at end of file
diff --git a/_templates/novostella_b22 b/_templates/novostella_b22
deleted file mode 100644
index 2a2509e82..000000000
--- a/_templates/novostella_b22
+++ /dev/null
@@ -1,11 +0,0 @@
----
-date_added: 2019-03-18
-title: Novostella B22 7W
-category: light
-type: Bulb
-standard: uk
-link: https://www.amazon.co.uk/gp/product/B07DN4NLKM
-image: https://user-images.githubusercontent.com/5904370/54642319-92cc7980-4a94-11e9-8bbc-8a7450cecbfc.png
-template: '{"NAME":"Novostella B22","GPIO":[0,0,0,0,37,41,0,0,38,40,39,0,0],"FLAG":0,"BASE":18}'
-link_alt:
----
diff --git a/_templates/obi_stecker b/_templates/obi_stecker
index 66266058f..fb013906e 100644
--- a/_templates/obi_stecker
+++ b/_templates/obi_stecker
@@ -5,7 +5,7 @@ type: Plug
standard: eu
link: https://www.obi.de/hausfunksteuerung/wifi-stecker-schuko/p/2291706
image: https://user-images.githubusercontent.com/5904370/57953956-cdfef380-78f1-11e9-9a69-37609bec9cee.png
-template: '{"NAME":"OBI Socket","GPIO":[255,255,0,255,52,21,0,0,54,255,17,0,255],"FLAG":1,"BASE":51}'
+template: {"NAME":"OBI Socket","GPIO":[255,255,0,255,52,21,0,0,54,255,17,0,255],"FLAG":1,"BASE":51}
link_alt:
---
## Serial Flashing
diff --git a/_templates/obi_stecker_2 b/_templates/obi_stecker_2
index 57d3f2ce1..713a3063a 100644
--- a/_templates/obi_stecker_2
+++ b/_templates/obi_stecker_2
@@ -5,7 +5,7 @@ type: Plug
standard: eu
link: https://www.obi.de/hausfunksteuerung/wifi-stecker-schuko-2-stueck-weiss/p/4077673
image: https://user-images.githubusercontent.com/5904370/57955953-97c47280-78f7-11e9-85bf-3288acd4fb7f.png
-template: '{"NAME":"OBI Socket 2","GPIO":[0,0,0,0,21,17,0,0,56,53,0,0,0],"FLAG":0,"BASE":61}'
+template: {"NAME":"OBI Socket 2","GPIO":[0,0,0,0,21,17,0,0,56,53,0,0,0],"FLAG":0,"BASE":61}
link_alt:
---
***Supported since version [6.4.1.8](https://github.com/arendst/Tasmota/issues/4829) as OBI Socket 2 (61)***
diff --git a/_templates/obi_stecker_black b/_templates/obi_stecker_black
index f386b83db..bd8c6dd14 100644
--- a/_templates/obi_stecker_black
+++ b/_templates/obi_stecker_black
@@ -5,7 +5,7 @@ type: Outdoor Plug
standard: eu
link: https://www.obi.de/hausfunksteuerung/wifi-stecker-schuko-2-stueck-weiss/p/4077673
image: https://user-images.githubusercontent.com/33325587/50388246-94dea080-0710-11e9-945a-8dbb2e78d74e.jpg
-template: '{"NAME":"OBI Socket 2","GPIO":[0,0,0,0,21,17,0,0,56,53,0,0,0],"FLAG":0,"BASE":61}'
+template: {"NAME":"OBI Socket 2","GPIO":[0,0,0,0,21,17,0,0,56,53,0,0,0],"FLAG":0,"BASE":61}
link_alt:
---
This WiFi socket is a cheap outdoor alternative to the popular low-cost indoor WiFi socket ["Wifi Stecker Schuko Weiß"](https://www.obi.de/hausfunksteuerung/wifi-stecker-schuko-weiss/p/4077806) from the German DIY-warehouse OBI.
diff --git a/_templates/ohlux_7W_A19_E26 b/_templates/ohlux_7W_A19_E26
index ad6ffbf26..05c44cc20 100644
--- a/_templates/ohlux_7W_A19_E26
+++ b/_templates/ohlux_7W_A19_E26
@@ -1,19 +1,13 @@
---
date_added: 2019-11-04
-title: OHLUX 7W A19 E26 RGB+CCT
-category: light
-type: Bulb
-standard: global
+title: OHLUX 7W
+type: RGBCCT
+category: bulb
+standard: E26
link: https://www.amazon.com/gp/product/B07LCB3HQJ
image: https://images-na.ssl-images-amazon.com/images/I/71xro8dWZML._AC_SL1500_.jpg
-template: '{"NAME":"OHLUX","GPIO":[0,0,0,0,37,40,0,0,38,41,39,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"OHLUX","GPIO":[0,0,0,0,37,40,0,0,38,41,39,0,0],"FLAG":0,"BASE":18}
link_alt:
---
-Bought in US off Amazon; easily flashed with with tuya-convert
-
-
-
-
-
-
+easily flashed with with tuya-convert
diff --git a/_templates/oil_diffuser_550ml b/_templates/oil_diffuser_550ml
index a23167004..70ccde15a 100644
--- a/_templates/oil_diffuser_550ml
+++ b/_templates/oil_diffuser_550ml
@@ -6,7 +6,7 @@ type: Aromatherapy Diffuser
standard: global
link: https://www.aliexpress.com/item/550ML-APP-Control-Essential-Oil-Aroma-Diffuser-With-Wood-Grain-Air-Humidifier-Aromatherapy-Diffuser-For-Home/32983725049.html
image: https://user-images.githubusercontent.com/5904370/57200999-010cc300-6f93-11e9-8fbe-ad02435e367f.png
-template: '{"NAME":"MY-KCL01800FB","GPIO":[255,255,255,255,255,255,0,0,255,255,255,255,255],"FLAG":0,"BASE":54}'
+template: {"NAME":"MY-KCL01800FB","GPIO":[255,255,255,255,255,255,0,0,255,255,255,255,255],"FLAG":0,"BASE":54}
link_alt:
---
**Configuration for this device uses features not yet in official Tasmota release(TuyaSend and TuyaReceived). Use the [latest development branch](http://thehackbox.org/tasmota/) binary.**
diff --git a/_templates/oittm_outdoor b/_templates/oittm_outdoor
index 8901b5746..acf65edba 100644
--- a/_templates/oittm_outdoor
+++ b/_templates/oittm_outdoor
@@ -6,7 +6,7 @@ type: Outdoor Plug
standard: us
link: https://www.amazon.ca/Oittm-Outdoor-Monitoring-Wireless-Weatherproof/dp/B074J49F4R
image: https://images-na.ssl-images-amazon.com/images/I/61s0jx7cy2L._SL1500_.jpg
-template: '{"NAME":"Oittm Outdoor","GPIO":[17,0,0,0,0,0,0,0,0,0,56,21,255],"FLAG":0,"BASE":18}'
+template: {"NAME":"Oittm Outdoor","GPIO":[17,0,0,0,0,0,0,0,0,0,56,21,255],"FLAG":0,"BASE":18}
link_alt: https://www.ebay.ca/itm/WiFi-Smart-Outdoor-Plug-Oittm-Timer-Outlet-With-Energy-Monitoring-Wireless-By/283285458597?hash=item41f5210ea5:g:B6YAAOSwTDpcAqO0
---
diff --git a/_templates/oittm_plug b/_templates/oittm_plug
index 3221fbae8..753cc9984 100644
--- a/_templates/oittm_plug
+++ b/_templates/oittm_plug
@@ -5,7 +5,7 @@ type: Plug
standard: us
link: https://www.oittm.com/Oittm-Wifi-Smart-Plug
image: https://dustplanet.de/wp-content/uploads/2018/12/Screen-Shot-2018-12-02-at-12.26.29-AM.png
-template: '{"NAME":"Oittm","GPIO":[0,0,0,0,21,56,0,0,17,0,0,0,0],"FLAG":0,"BASE":1}'
+template: {"NAME":"Oittm","GPIO":[0,0,0,0,21,56,0,0,17,0,0,0,0],"FLAG":0,"BASE":1}
link_alt: https://www.aliexpress.com/item/Oittm-Wifi-Smart-Plug-Home-Automation-Phone-APP-Timing-Switch-Remote-Control-Wifi-Socket-Working-With/32881262369.html
---
Although the instructions are for the EU version, this plug as available in US and UK plug types too
diff --git a/_templates/oobest_ZN93028 b/_templates/oobest_ZN93028
index 0f7b70d9c..ccffa7f2e 100644
--- a/_templates/oobest_ZN93028
+++ b/_templates/oobest_ZN93028
@@ -1,12 +1,12 @@
---
date_added: 2019-06-20
-title: Oobest ZN93028 11W E27 RGB
-category: light
-type: Bulb
-standard: eu
+title: Oobest ZN93028 11W
+type: RGB
+category: bulb
+standard: E27
link: https://www.aliexpress.com/item/LED-Bulb-Lamps-11W-E27-B22-Smart-Light-Bulb-WiFi-Voice-Control-RGB-Energy-Saving-Dimming/32958468609.html
image: https://user-images.githubusercontent.com/5904370/66717744-bb271700-eddc-11e9-9bcf-d6f53437d201.png
-template: '{"NAME":"RGB Bulb 11W","GPIO":[0,0,0,0,40,0,0,0,38,39,37,0,0],"FLAG":1,"BASE":18}'
+template: {"NAME":"RGB Bulb 11W","GPIO":[0,0,0,0,40,0,0,0,38,39,37,0,0],"FLAG":1,"BASE":18}
link_alt:
---
diff --git a/_templates/oobest_rgbw b/_templates/oobest_rgbw
index c7dca5212..4d7b5e361 100644
--- a/_templates/oobest_rgbw
+++ b/_templates/oobest_rgbw
@@ -1,12 +1,12 @@
---
date_added: 2019-04-24
-title: Oobest RGBW E27
-category: light
-type: Bulb
-standard: us
+title: Oobest 6.5W/4.5W
+type: RGBW
+category: bulb
+standard: E27
link: https://www.aliexpress.com/item/New-E27-WiFi-Smart-Light-Bulb-Dimmable-Multicolor-Wake-Up-Lights-RGBWW-LED-Lamp-Compatible-with/32932204996.html
image: https://ae01.alicdn.com/kf/HTB1THHuXovrK1RjSszfq6xJNVXa4/New-E27-WiFi-Smart-Light-Bulb-Dimmable-Multicolor-Wake-Up-Lights-RGBWW-LED-Lamp-Compatible-with.jpg
-template: '{"NAME":"WifiBulb","GPIO":[0,0,0,0,0,37,0,0,39,40,38,0,0],"FLAG":1,"BASE":18}'
+template: {"NAME":"WifiBulb","GPIO":[0,0,0,0,0,37,0,0,39,40,38,0,0],"FLAG":1,"BASE":18}
link_alt:
---
diff --git a/_templates/oukitel-x6p b/_templates/oukitel-x6p
index d4c532f8f..ba832758e 100644
--- a/_templates/oukitel-x6p
+++ b/_templates/oukitel-x6p
@@ -6,7 +6,7 @@ type: Plug
standard: us
link: https://smile.amazon.com/OUKITEL-X6P-Control-Required-Listed-4/dp/B07JK5MJBK
image: https://images-na.ssl-images-amazon.com/images/I/51r5b4PWSrL._SL1000_.jpg
-template: '{"NAME":"OUKITEL X6P","GPIO":[0,0,57,0,0,0,0,0,0,17,0,21,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"OUKITEL X6P","GPIO":[0,0,57,0,0,0,0,0,0,17,0,21,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/oukitelp1 b/_templates/oukitelp1
index 6dc6e9f4b..eb850f18e 100644
--- a/_templates/oukitelp1
+++ b/_templates/oukitelp1
@@ -5,7 +5,7 @@ type: Plug
standard: us
link: https://www.banggood.com/Oukitel-Double-Outlet-Smart-WIFI-Socket-US-Plug-APP-Remote-Control-Timing-Smart-Home-Switch-Power-Ou-p-1371092.html
image: https://raw.githubusercontent.com/digiblur/Sonoff-Tasmota/development/jpgs/OukitelP1.JPG
-template: '{"NAME":"Oukitel P1Dual","GPIO":[52,255,255,255,255,255,0,0,22,17,255,21,255],"FLAG":0,"BASE":18}'
+template: {"NAME":"Oukitel P1Dual","GPIO":[52,255,255,255,255,255,0,0,22,17,255,21,255],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/oxaoxe_NX-SM200 b/_templates/oxaoxe_NX-SM200
index 3691e01d1..1190a81ee 100644
--- a/_templates/oxaoxe_NX-SM200
+++ b/_templates/oxaoxe_NX-SM200
@@ -6,7 +6,7 @@ type: Plug
standard: eu
link: https://www.amazon.es/gp/product/B07MQ4734T/
image: https://i.imgur.com/sYi1W8Q.png
-template: '{"NAME":"NX-SM200","GPIO":[17,0,0,0,133,132,0,0,131,158,21,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"NX-SM200","GPIO":[17,0,0,0,133,132,0,0,131,158,21,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/oxaoxe_NX-SP202 b/_templates/oxaoxe_NX-SP202
index a3f92d33a..5d7d22dd8 100644
--- a/_templates/oxaoxe_NX-SP202
+++ b/_templates/oxaoxe_NX-SP202
@@ -6,7 +6,7 @@ type: Plug
standard: eu
link: https://www.amazon.de/Gruppensteuerung-%C3%9Cberlastschutz-Stromz%C3%A4hler-OxaOxe-Kompatibel/dp/B07KP7CXZ3
image: https://user-images.githubusercontent.com/5904370/66717288-8d8b9f00-edd7-11e9-9bc9-b0bd31b13545.png
-template: '{"NAME":"oxaoxe-dold","GPIO":[56,0,0,131,17,134,0,0,21,18,132,22,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"oxaoxe-dold","GPIO":[56,0,0,131,17,134,0,0,21,18,132,22,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/oxaoxe_NX-SP202_eu b/_templates/oxaoxe_NX-SP202_eu
index d41c423f0..4d0d9cd4d 100644
--- a/_templates/oxaoxe_NX-SP202_eu
+++ b/_templates/oxaoxe_NX-SP202_eu
@@ -6,7 +6,7 @@ type: Plug
standard: eu
link: https://oxaoxe.com/product/wifi-smart-plug-2-in-1-for-eu.html
image: https://user-images.githubusercontent.com/5904370/66717288-8d8b9f00-edd7-11e9-9bc9-b0bd31b13545.png
-template: '{"NAME":"oxaoxe-dual","GPIO":[18,0,0,0,134,132,0,0,131,56,21,22,17],"FLAG":0,"BASE":18}'
+template: {"NAME":"oxaoxe-dual","GPIO":[18,0,0,0,134,132,0,0,131,56,21,22,17],"FLAG":0,"BASE":18}
link_alt: https://www.amazon.fr/gp/product/B07KP7CXZ3
---
diff --git a/_templates/oxaoxenx-sm800 b/_templates/oxaoxenx-sm800
index 40c7478ff..5947e3e66 100644
--- a/_templates/oxaoxenx-sm800
+++ b/_templates/oxaoxenx-sm800
@@ -6,6 +6,6 @@ type: Plug
standard: us
link: https://www.amazon.com/OxaOxe-Monitoring-Overload-Protection-Required/dp/B07G2NQMGX
image: https://user-images.githubusercontent.com/5904370/53570017-c1c29000-3b65-11e9-9c41-4d8fcf2d2352.png
-template: '{"NAME":"NX-SM800","GPIO":[0,0,0,131,0,134,0,0,21,17,132,0,0],"FLAG":0,"BASE":45}'
+template: {"NAME":"NX-SM800","GPIO":[0,0,0,131,0,134,0,0,21,17,132,0,0],"FLAG":0,"BASE":45}
link_alt:
---
diff --git a/_templates/panamalar_NX-SM200 b/_templates/panamalar_NX-SM200
index 72e2acd6b..73e0079e6 100644
--- a/_templates/panamalar_NX-SM200
+++ b/_templates/panamalar_NX-SM200
@@ -6,7 +6,7 @@ type: Plug
standard: eu
image: https://camo.githubusercontent.com/a762f613da7dae5360c72e45de6f48616fbe1f0f/68747470733a2f2f692e706f7374696d672e63632f5a4b34546b7267472f6e78736d3230302e6a7067
link: https://www.amazon.de/gp/product/B07JBRRW1M/
-template: '{"NAME":"NX-SM200","GPIO":[0,0,0,0,56,134,0,0,131,17,132,21,0],"FLAG":1,"BASE":18}'
+template: {"NAME":"NX-SM200","GPIO":[0,0,0,0,56,134,0,0,131,17,132,21,0],"FLAG":1,"BASE":18}
---
If the first template doesn't work try this alternative:
diff --git a/_templates/xiaomi_phillips_E14 b/_templates/phillips_zhirui_E14
similarity index 67%
rename from _templates/xiaomi_phillips_E14
rename to _templates/phillips_zhirui_E14
index 03dbf50d7..0b0d8257a 100644
--- a/_templates/xiaomi_phillips_E14
+++ b/_templates/phillips_zhirui_E14
@@ -1,11 +1,11 @@
---
-title: Xiaomi Phillips E14
-category: light
-type: Bulb
-standard: eu
-link: https://www.gearbest.com/candle-bulbs/pp_1645204.html
+title: Philips Zhirui Candle 3.5W
+type: CCT
+category: bulb
+standard: E14
+link: https://www.aliexpress.com/item/32989238917.html
image: https://user-images.githubusercontent.com/5904370/57953683-1964d200-78f1-11e9-89d0-c1b5566967e9.png
-template: '{"NAME":"Xiaomi Philips","GPIO":[0,0,0,0,0,0,0,0,38,0,0,37,0],"FLAG":0,"BASE":48}'
+template: {"NAME":"Xiaomi Philips","GPIO":[0,0,0,0,0,0,0,0,38,0,0,37,0],"FLAG":0,"BASE":48}
link_alt: https://www.aliexpress.com/af/xiaomi-philips-e14.html?SearchText=xiaomi+philips+e14&d=y&initiative_id=SB_20190517121309&origin=n&catId=0&isViewCP=y&jump=afs
---
## Serial Flashing
diff --git a/_templates/xiaomi_phillips_E27 b/_templates/phillips_zhirui_E27
similarity index 58%
rename from _templates/xiaomi_phillips_E27
rename to _templates/phillips_zhirui_E27
index a11052987..aa8e05c84 100644
--- a/_templates/xiaomi_phillips_E27
+++ b/_templates/phillips_zhirui_E27
@@ -1,11 +1,11 @@
---
-title: Xiaomi Phillips E27
-category: light
-type: Bulb
-standard: eu
-link: https://www.gearbest.com/smart-lighting/pp_644095.html
+title: Phillips Zhirui 6.5W
+type: CCT
+category: bulb
+standard: E27
+link: https://www.ebay.com/itm/Xiaomi-Philips-Smart-LED-6-5W-E27-220V-Wifi-Ball-Lamp-Bulb-Mobile-App-Control/122953628814?hash=item1ca09b7c8e:g:svUAAOSwWGlZ1MRU
image: https://user-images.githubusercontent.com/5904370/57953177-a9a21780-78ef-11e9-90a7-92d491784eff.png
-template: '{"NAME":"Xiaomi Philips","GPIO":[0,0,0,0,0,0,0,0,38,0,0,37,0],"FLAG":0,"BASE":48}'
+template: {"NAME":"Xiaomi Philips","GPIO":[0,0,0,0,0,0,0,0,38,0,0,37,0],"FLAG":0,"BASE":48}
link_alt: https://www.aliexpress.com/af/xiaomi-philips-e27.html?SearchText=xiaomi+philips+e27&d=y&initiative_id=SB_20190517120816&origin=n&catId=0&isViewCP=y&jump=afs
---
## Serial Flashing
diff --git a/_templates/positivo_PPW1000 b/_templates/positivo_PPW1000
index b3b3edeb4..12ed47926 100644
--- a/_templates/positivo_PPW1000
+++ b/_templates/positivo_PPW1000
@@ -6,7 +6,7 @@ type: Plug
standard: br
link: https://www.amazon.com.br/Positivo-Casa-Inteligente-eletrodomésticos-Compatível/dp/B07S14JHF2/
image: https://images-na.ssl-images-amazon.com/images/I/71dZDzGGU6L._SX679_.jpg
-template: '{"NAME":"PPW1000","GPIO":[0,0,56,0,0,134,0,0,131,17,132,21,0],"FLAG":0,"BASE":45}'
+template: {"NAME":"PPW1000","GPIO":[0,0,56,0,0,134,0,0,131,17,132,21,0],"FLAG":0,"BASE":45}
link_alt: https://www.positivocasainteligente.com.br/conforto-e-automacao/smart-plug/
---
diff --git a/_templates/powertech b/_templates/powertech
index 567b682fb..557797e74 100644
--- a/_templates/powertech
+++ b/_templates/powertech
@@ -6,7 +6,7 @@ type: Plug
standard: anzac
link: https://www.jaycar.com.au/smart-plug-wifi-controlled-mains-switch/p/MS6106
image: https://i.postimg.cc/xdLwwBZP/63218102-9eab8d00-c153-11e9-85d7-4dd2fee332cd.png
-template: '{"NAME":"Jaycar","GPIO":[56,0,0,0,0,0,0,0,0,9,0,21,0],"FLAG":0,"BASE":6}'
+template: {"NAME":"Jaycar","GPIO":[56,0,0,0,0,0,0,0,0,9,0,21,0],"FLAG":0,"BASE":6}
link_alt:
---
diff --git a/_templates/powrui_AHR-079 b/_templates/powrui_AHR-079
index c6d0f773e..bbbe68acd 100644
--- a/_templates/powrui_AHR-079
+++ b/_templates/powrui_AHR-079
@@ -6,7 +6,7 @@ type: Power Strip
standard: us
link: https://www.amazon.com/gp/product/B07RL56DPD
image: https://cdn.shopify.com/s/files/1/0034/4401/5213/products/1_733f4f74-2cb9-4e38-b2c1-59b467766e77.jpg
-template: '{"NAME":"Powrui Power S","GPIO":[56,0,0,17,19,21,0,0,23,20,22,24,18],"FLAG":0,"BASE":18}'
+template: {"NAME":"Powrui Power S","GPIO":[56,0,0,17,19,21,0,0,23,20,22,24,18],"FLAG":0,"BASE":18}
link_alt: https://www.powrui.com/products/smart-surge-protector
---
diff --git a/_templates/powrui_AW-08 b/_templates/powrui_AW-08
index 62ca2982d..1c4d4ddbb 100644
--- a/_templates/powrui_AW-08
+++ b/_templates/powrui_AW-08
@@ -6,7 +6,7 @@ type: Plug
standard: us
link: https://www.amazon.com/gp/product/B07J2V6SHQ
image: https://images-na.ssl-images-amazon.com/images/I/51-cEZXm38L._SL1200_.jpg
-template: '{"NAME":"POWRUI AW-08","GPIO":[0,0,0,0,9,21,0,0,0,52,57,0,0],"FLAG":1,"BASE":18}'
+template: {"NAME":"POWRUI AW-08","GPIO":[0,0,0,0,9,21,0,0,0,52,57,0,0],"FLAG":1,"BASE":18}
link_alt:
---
diff --git a/_templates/powruia39 b/_templates/powruia39
index ccc4ab4c4..5e75f54d4 100644
--- a/_templates/powruia39
+++ b/_templates/powruia39
@@ -3,7 +3,7 @@ title: Powrui AW-39
category: plug
type: Power Strip
standard: us
-template: '{"NAME":"Powrui AW-39","GPIO":[56,0,0,0,21,255,0,0,23,24,22,0,9],"FLAG":0,"BASE":18}'
+template: {"NAME":"Powrui AW-39","GPIO":[56,0,0,0,21,255,0,0,23,24,22,0,9],"FLAG":0,"BASE":18}
link: https://www.amazon.com/gp/product/B07KK62GB7
image: https://user-images.githubusercontent.com/5904370/53308200-82fbb400-389f-11e9-80a8-6686b28539d4.png
---
diff --git a/_templates/premier_10W_A19_E26 b/_templates/premier_10W_A19_E26
index d53022719..46b449590 100644
--- a/_templates/premier_10W_A19_E26
+++ b/_templates/premier_10W_A19_E26
@@ -1,12 +1,12 @@
---
date_added: 2019-11-13
-title: Premier 10W A19 E26
-category: light
-type: Bulb
-standard: us
+title: Premier 10W
+type: RGBW
+category: bulb
+standard: E26
link: https://www.autozone.com/
image: https://lh3.googleusercontent.com/u7k-IVPId-lSaWJ_T9VwFeskfME21kHHpVnJfYHzVs984aR_frBX86HXwd8WRxsJvAJTr8hiaxm3ivHx0y-LE0UqkBszm7qhOyUWoYo2xx1VoGihpRlotJSGIgha71junTdyF9kUKwkYOD9ccZvkZPBp1b1gRlTeyrAs6H1GIDp72FzgAHJij5nVDNbR4ja60sw_R-vFWK1DNh8fKxFQo1pIwWP7baa1JevAvNAEW8_1dlSO0HnWDSex674X37vJbBPl2LYLJ27Umx4nuE3Nauw7nblZZ8D4tPKl3gz1XDXwTLGjSIqC-k8JGAzDotHb11NzsrFb8DZrsvfnpNLvLFgzigN8TBTdvqLbr_Y_kl_PNPH8cQNALv8eUiJXRVGLq_qKf_JRg3B7PotgHESQZFM24-v-x54ivFgLn3gQO2DjvoBSKGtp4NtJSsmfxDEs98qsoUmxvd5RG4hzZEPHPFP1NUXTx2j0WQLTwkufvKnlxifhroXfa3CA2k1LBb5SqIW-XVktQ5zyHZ6Sm3Lt-cvDWNpvmHXV0bA0YfqijWtjlDk1dFK48ytaeu55HUIctJ13hZKXigye6w-RXb9TrG_eF8XvvH2brHAC6nG4kx-r3xc6Q7mf3vH9L810vItpuMSLugacPDOwbyYLpzWidO8cnALQkEnjeiKddjY41vUbz-umHOQIGdHB49HwJudlrQ948UQx772spNS9cFnsOIyB-TQ1c9bBy9GklX5Uj74VSJGV=w538-h717-no
-template: '{"NAME":"Premier Light","GPIO":[0,0,0,0,0,39,0,0,38,0,37,40,0],"FLAG":1,"BASE":18}'
+template: {"NAME":"Premier Light","GPIO":[0,0,0,0,0,39,0,0,38,0,37,40,0],"FLAG":1,"BASE":18}
link_alt: http://www.premieraccessorygroup.com/admin/tiny_mce/plugins/filemanager/uploads/Bulb_Setup_050219.pdf
---
diff --git a/_templates/premier_PWIFPLG b/_templates/premier_PWIFPLG
index b0fe64717..7c3709a5e 100644
--- a/_templates/premier_PWIFPLG
+++ b/_templates/premier_PWIFPLG
@@ -6,7 +6,7 @@ type: Plug
standard: us
link: https://www.autozone.com/miscellaneous-non-automotive/smart-socket/premier-wifi-socket/336055_0_0
image: https://contentinfo.autozone.com/znetcs/product-info/en/US/pre/PWIFPLG/image/4/
-template: '{"NAME":"Premier Plug","GPIO":[0,0,0,17,0,0,0,0,0,56,21,0,0],"FLAG":1,"BASE":18}'
+template: {"NAME":"Premier Plug","GPIO":[0,0,0,17,0,0,0,0,0,56,21,0,0],"FLAG":1,"BASE":18}
link_alt:
---
diff --git a/_templates/prime_CCRCWFII113PK b/_templates/prime_CCRCWFII113PK
index 4b1132d4f..2c77c435a 100644
--- a/_templates/prime_CCRCWFII113PK
+++ b/_templates/prime_CCRCWFII113PK
@@ -6,7 +6,7 @@ type: Plug
standard: us
link: https://www.costco.ca/Prime-Indoor-Smart-Wi-Fi-Outlet%2C-3-pack.product.100506631.html
image: https://images.costco-static.com/ImageDelivery/imageService?profileId=12026539&imageId=1226565-894__1&recipeName=300
-template: '{"NAME":"Prime","GPIO":[0,0,0,0,57,56,0,0,21,122,0,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"Prime","GPIO":[0,0,0,0,57,56,0,0,21,122,0,0,0],"FLAG":0,"BASE":18}
link_alt:
---
Alternative template:
diff --git a/_templates/prime_CCRCWFIO2PK b/_templates/prime_CCRCWFIO2PK
index 9a6c35036..9c4f357d7 100644
--- a/_templates/prime_CCRCWFIO2PK
+++ b/_templates/prime_CCRCWFIO2PK
@@ -6,7 +6,7 @@ type: Outdoor Plug
standard: us
link: https://www.costco.ca/prime-smart-outlets-2-pack.product.100485219.html
image: https://images.costco-static.com/ImageDelivery/imageService?profileId=12026539&imageId=1221313-894__1&recipeName=350
-template: '{"NAME":"Prime Outdoor","GPIO":[0,0,0,0,56,57,0,0,21,17,0,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"Prime Outdoor","GPIO":[0,0,0,0,56,57,0,0,21,17,0,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/proscenic_807C b/_templates/proscenic_807C
index 92f5c8c3b..2931f508f 100644
--- a/_templates/proscenic_807C
+++ b/_templates/proscenic_807C
@@ -6,7 +6,7 @@ type: Humidifier
standard: eu
link: https://www.amazon.it/gp/product/B07PW715W6
image: https://images-na.ssl-images-amazon.com/images/I/51I0vlBhfBL._SL1000_.jpg
-template: '{"NAME":"Generic","GPIO":[255,255,255,255,255,255,0,0,255,255,255,255,255],"FLAG":15,"BASE":54}'
+template: {"NAME":"Generic","GPIO":[255,255,255,255,255,255,0,0,255,255,255,255,255],"FLAG":15,"BASE":54}
link_alt:
---
diff --git a/_templates/qs-wifi_D01_dimmer b/_templates/qs-wifi_D01_dimmer
index d32c7b900..8863a45ac 100644
--- a/_templates/qs-wifi_D01_dimmer
+++ b/_templates/qs-wifi_D01_dimmer
@@ -6,7 +6,7 @@ type: Dimmer
standard: eu
link: https://www.aliexpress.com/item/33010332202.html
image: https://user-images.githubusercontent.com/36734573/67634487-efaad080-f8bc-11e9-923f-4aa8babfd609.png
-template: '{"NAME":"WiFi-Dimmer","GPIO":[0,148,0,149,0,0,0,0,0,42,37,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"WiFi-Dimmer","GPIO":[0,148,0,149,0,0,0,0,0,42,37,0,0],"FLAG":0,"BASE":18}
link_alt: https://www.amazon.de/s?k=Wi-Fi+Dimmer+150W
---
diff --git a/_templates/qualitel_ALS08L b/_templates/qualitel_ALS08L
index bbe0bf20a..d15a97c49 100644
--- a/_templates/qualitel_ALS08L
+++ b/_templates/qualitel_ALS08L
@@ -1,12 +1,14 @@
---
date_added: 2019-11-01
title: Qualitel ALS08L
-category: light
-type: Bulb
-standard: za
+type: RGBCCT
+category: bulb
+standard:
+ - E27
+ - B22
link: https://www.qualitel.co.za/product/als08l/
image: https://www.qualitel.co.za/wp/wp-content/uploads/2019/10/ALS08L.jpg
-template: '{"NAME":"Qualitel ALS08","GPIO":[0,0,0,0,37,40,0,0,38,41,39,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"Qualitel ALS08","GPIO":[0,0,0,0,37,40,0,0,38,41,39,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/reafoo_A26 b/_templates/reafoo_A26
index 4f03d79fb..abfcb67d2 100644
--- a/_templates/reafoo_A26
+++ b/_templates/reafoo_A26
@@ -1,12 +1,12 @@
---
date_added: 2019-10-01
-title: Reafoo 9W A26
-category: light
-type: Bulb
-standard: us
+title: Reafoo A26 9W
+type: RGBCCT
+category: bulb
+standard: E26
link: https://www.amazon.com/dp/B07W1KH7VK
image: https://user-images.githubusercontent.com/5904370/67769463-d63c8c80-fa54-11e9-84ac-345b01863f49.png
-template: '{"NAME":"ReaFooE26","GPIO":[0,0,0,0,41,38,0,0,39,0,40,37,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"ReaFooE26","GPIO":[0,0,0,0,41,38,0,0,39,0,40,37,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/rgb_plug_us b/_templates/rgb_plug_us
index 1ac6129d5..4583d1c5f 100644
--- a/_templates/rgb_plug_us
+++ b/_templates/rgb_plug_us
@@ -6,7 +6,7 @@ type: Plug
standard: us
link: https://www.amazon.com/gp/product/B07HH29XNS
image: https://user-images.githubusercontent.com/5904370/54651586-d2ef2480-4ab3-11e9-9157-c56d3a427009.png
-template: '{"NAME":"RGB Light","GPIO":[37,0,38,0,0,39,0,0,0,90,0,21,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"RGB Light","GPIO":[37,0,38,0,0,39,0,0,0,90,0,21,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/rgbpow b/_templates/rgbpow
index 4c9851ac0..9c069e74e 100644
--- a/_templates/rgbpow
+++ b/_templates/rgbpow
@@ -5,7 +5,7 @@ type: Plug
standard: eu
image: https://i.postimg.cc/YStMTTFq/rgbsmartplug.jpg
link: https://www.aliexpress.com/item/ET-Smart-Plug-Wifi-Socket-With-Switch-Phone-APP-Voice-Remote-Control-Monitor-Smart-Timing-Switch/32964036349.html
-template: '{"NAME":"RGB Smart Plug","GPIO":[37,0,39,0,38,134,0,0,131,17,132,21,0],"FLAG":0,"BASE":45}'
+template: {"NAME":"RGB Smart Plug","GPIO":[37,0,39,0,38,134,0,0,131,17,132,21,0],"FLAG":0,"BASE":45}
link_alt: https://www.amazon.de/gp/product/B07MYL3HLZ
screenshot:
---
diff --git a/_templates/rgbw_b22 b/_templates/rgbw_b22
deleted file mode 100644
index 2b449d8f6..000000000
--- a/_templates/rgbw_b22
+++ /dev/null
@@ -1,16 +0,0 @@
----
-date_added: 2019-03-21
-title: RGBW 7W B22
-category: light
-type: Bulb
-standard: anzac
-link: https://www.ebay.com.au/itm/Smart-LED-Light-Bulb-Wireless-WiFi-Color-Dimmable-RGB-W-Lamp-AU-Stock-7W-B22/192725965159
-image: https://i.ebayimg.com/images/g/RKcAAOSwg-tcRZqn/s-l1600.jpg
-template: '{"NAME":"SM16716","GPIO":[0,0,0,0,140,37,0,0,0,0,141,0,0],"FLAG":0,"BASE":18}'
-link_alt:
----
-
-"Light circuit board marked with SYW07 RGBW
-ESP Board: TYWE3L
-
-GPIO12 is unused by the board, but is found on WW of interconnect between light and supply boards."
diff --git a/_templates/rgbw_ceiling_light b/_templates/rgbw_ceiling_light
index 9de7d0acf..d2f364f2f 100644
--- a/_templates/rgbw_ceiling_light
+++ b/_templates/rgbw_ceiling_light
@@ -6,7 +6,7 @@ type: Light
standard: global
link: https://www.aliexpress.com/item/Mini-Intelligent-Wifi-LED-Ceiling-Lights-RGB-W-Dimmable-7W-APP-Remote-Control-Foyer-Bedroom-Hallway/32970274710.html
image: https://user-images.githubusercontent.com/5904370/55022165-5354de80-4ffa-11e9-95b5-80428ab68ded.png
-template: '{"NAME":"Spotlight RGBW","GPIO":[0,0,0,0,0,0,0,0,0,143,0,144,0],"FLAG":0,"BASE":27}'
+template: {"NAME":"Spotlight RGBW","GPIO":[0,0,0,0,0,0,0,0,0,143,0,144,0],"FLAG":0,"BASE":27}
link_alt:
---
Flashed with Tuya-Convert.
diff --git a/_templates/s2199EU b/_templates/s2199EU
index d791c4781..7f32396db 100644
--- a/_templates/s2199EU
+++ b/_templates/s2199EU
@@ -6,7 +6,7 @@ type: Power Strip
standard: eu
link: https://www.aliexpress.com/item/WiFi-Smart-Power-Strip-Socket-Voice-Control-Timer-Switch-Power-Strip-Outlet-with-4-AC-Outlets/32915120795.html
image: https://i.postimg.cc/Hkt7zqVQ/Wi-Fi-Socket-Smart-Power-Strip-Voice-Control-Timer-Switch-Power-S.jpg
-template: '{"NAME":"S2199EU","GPIO":[0,17,0,52,23,25,0,0,21,24,22,0,0],"FLAG":1,"BASE":18}'
+template: {"NAME":"S2199EU","GPIO":[0,17,0,52,23,25,0,0,21,24,22,0,0],"FLAG":1,"BASE":18}
link_alt: https://www.aliexpress.com/item/WiFi-Socket-Smart-Power-Strip-Voice-Control-Timer-Switch-Power-Strip-Outlet-with-4-AC-Outlets/32914473349.html
---
diff --git a/_templates/saiham_KS-601 b/_templates/saiham_KS-601
index 5ce0e4fe2..db0c8772b 100644
--- a/_templates/saiham_KS-601
+++ b/_templates/saiham_KS-601
@@ -6,7 +6,7 @@ type: Switch
standard: eu
link: https://www.amazon.de/gp/product/B07GPH1NKG
image: https://user-images.githubusercontent.com/5904370/66717934-697f8c00-edde-11e9-8a0b-36f9c5d9a5a5.png
-template: '{"NAME":"2way Switch","GPIO":[255,255,158,255,255,83,0,0,22,21,255,82,255],"FLAG":0,"BASE":18}'
+template: {"NAME":"2way Switch","GPIO":[255,255,158,255,255,83,0,0,22,21,255,82,255],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/sainko_1way b/_templates/sainko_1way
index d34bff9e6..0b04cc383 100644
--- a/_templates/sainko_1way
+++ b/_templates/sainko_1way
@@ -6,7 +6,7 @@ type: Switch
standard: eu
link: https://www.amazon.de/gp/product/B07B7G1TF7/
image: https://user-images.githubusercontent.com/5904370/66717949-9fbd0b80-edde-11e9-8dd0-36e09e7a7114.png
-template: '{"NAME":"SAINKO 1CH","GPIO":[17,255,255,255,0,0,0,0,21,56,0,0,0],"FLAG":0,"BASE":28}'
+template: {"NAME":"SAINKO 1CH","GPIO":[17,255,255,255,0,0,0,0,21,56,0,0,0],"FLAG":0,"BASE":28}
link_alt:
---
diff --git a/_templates/sana_SW02-03 b/_templates/sana_SW02-03
index 705a74a05..4052073b1 100644
--- a/_templates/sana_SW02-03
+++ b/_templates/sana_SW02-03
@@ -6,7 +6,7 @@ type: Switch
standard: us
link: https://www.amazon.com/installation-Control-Compatible-Required-Switches/dp/B07MZQ4LJ9/
image: https://i.imgur.com/nUJqNMj.jpg
-template: '{"NAME":"SW02-03","GPIO":[56,255,255,19,23,18,0,0,17,21,255,22,255],"FLAG":0,"BASE":18}'
+template: {"NAME":"SW02-03","GPIO":[56,255,255,19,23,18,0,0,17,21,255,22,255],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/sana_sasw-03 b/_templates/sana_sasw-03
index 9ee02aebd..024c7785d 100644
--- a/_templates/sana_sasw-03
+++ b/_templates/sana_sasw-03
@@ -6,7 +6,7 @@ type: Switch
standard: anzac
link: https://www.amazon.com/gp/product/B07JLL5Q8Q
image: https://images-na.ssl-images-amazon.com/images/I/51N17Nca9TL._SL1500_.jpg
-template: '{"NAME":"SANA SASW-03","GPIO":[54,0,0,19,23,18,0,0,17,21,0,22,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"SANA SASW-03","GPIO":[54,0,0,19,23,18,0,0,17,21,0,22,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/saudio_X002BU0DOL b/_templates/saudio_X002BU0DOL
index 1910a1538..68b2327ad 100644
--- a/_templates/saudio_X002BU0DOL
+++ b/_templates/saudio_X002BU0DOL
@@ -1,12 +1,12 @@
---
date_added: 2019-11-25
title: Saudio X002BU0DOL
-category: light
-type: Bulb
-standard: us
+type: RGBCCT
+category: bulb
+standard: E26
link: https://www.amazon.com/gp/product/B07RX62616/ref=ppx_yo_dt_b_asin_title_o04_s00
image: https://images-na.ssl-images-amazon.com/images/I/61c2qLHbMcL._SL1500_.jpg
-template: '{"NAME":"X002BU0DOL","GPIO":[0,0,0,0,37,40,0,0,38,41,39,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"X002BU0DOL","GPIO":[0,0,0,0,37,40,0,0,38,41,39,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/sesoo-WIFI-EU-SK3-01 b/_templates/sesoo-WIFI-EU-SK3-01
index 04149e84f..562020a56 100644
--- a/_templates/sesoo-WIFI-EU-SK3-01
+++ b/_templates/sesoo-WIFI-EU-SK3-01
@@ -6,7 +6,7 @@ type: Switch
standard: eu
link: https://www.aliexpress.com/item/32896267121.html
image: https://i.imgur.com/58ogkoy.png
-template: '{"NAME":"Sensoo SK3-01","GPIO":[255,255,57,255,255,17,0,0,255,255,255,21,52],"FLAG":0,"BASE":18}'
+template: {"NAME":"Sensoo SK3-01","GPIO":[255,255,57,255,255,17,0,0,255,255,255,21,52],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/sesoo_ WIFI-US-SK3-04 b/_templates/sesoo_ WIFI-US-SK3-04
index 3725b85fa..f0156e3b3 100644
--- a/_templates/sesoo_ WIFI-US-SK3-04
+++ b/_templates/sesoo_ WIFI-US-SK3-04
@@ -6,7 +6,7 @@ type: Switch
standard: us
link: https://www.aliexpress.com/item/33039910999.html
image: https://sc01.alicdn.com/kf/HTB1A8S3acfrK1RjSszcq6xGGFXa7/UK-US-4gang-Tuya-App-Touch-Light.jpg
-template: '{"NAME":"Tuya 4 Channel","GPIO":[52,255,255,19,23,17,0,0,20,24,22,21,18],"FLAG":0,"BASE":18}'
+template: {"NAME":"Tuya 4 Channel","GPIO":[52,255,255,19,23,17,0,0,20,24,22,21,18],"FLAG":0,"BASE":18}
link_alt: https://sesoo.en.alibaba.com/product/60825780347-806282494/UK_US_4gang_Tuya_App_Touch_Light_Smart_Switch_WiFi_Wall_Switch_with_Alexa_Google.html
---
diff --git a/_templates/sesoo_WIFI-EU-SK3-02 b/_templates/sesoo_WIFI-EU-SK3-02
index 703c0c35b..90cb37007 100644
--- a/_templates/sesoo_WIFI-EU-SK3-02
+++ b/_templates/sesoo_WIFI-EU-SK3-02
@@ -6,7 +6,7 @@ type: Switch
standard: eu
link: https://www.aliexpress.com/item/32896267121.html
image: https://i.imgur.com/X5XuEt2.png
-template: '{"NAME":"Sesoo SK3-02","GPIO":[0,0,57,0,22,0,0,0,17,21,18,0,52],"FLAG":0,"BASE":18}'
+template: {"NAME":"Sesoo SK3-02","GPIO":[0,0,57,0,22,0,0,0,17,21,18,0,52],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/sesoo_WIFI-US-SK3-04 b/_templates/sesoo_WIFI-US-SK3-04
index 657d75c1f..0a6458480 100644
--- a/_templates/sesoo_WIFI-US-SK3-04
+++ b/_templates/sesoo_WIFI-US-SK3-04
@@ -6,7 +6,7 @@ type: Switch
standard: us
link: https://www.alibaba.com/product-detail/Sesoo-Smart-Touch-Button-Amazon-Alexa_60827162885.html
image: https://user-images.githubusercontent.com/5904370/55691622-34622f00-59a0-11e9-8f1d-8f4c8e649d66.png
-template: '{"NAME":"WIFI-US-SK3-04","GPIO":[255,255,255,19,23,17,0,0,20,24,22,21,18],"FLAG":0,"BASE":18}'
+template: {"NAME":"WIFI-US-SK3-04","GPIO":[255,255,255,19,23,17,0,0,20,24,22,21,18],"FLAG":0,"BASE":18}
link_alt:
---
ALL LED's works fine as Red - on and Blue - off, GPIO0 is the Wifi LED if you want to control
diff --git a/_templates/shelly_1 b/_templates/shelly_1
index 0114a9610..9d077fa02 100644
--- a/_templates/shelly_1
+++ b/_templates/shelly_1
@@ -1,11 +1,11 @@
---
title: Shelly 1
-category: relay
+category: switch
type: Relay
standard: global
link: https://shelly.cloud/product/shelly-1-open-source/
image: https://user-images.githubusercontent.com/5904370/57952006-2632f700-78ec-11e9-9a1a-dd37479a0d79.png
-template: '{"NAME":"Shelly 1","GPIO":[0,0,0,0,21,82,0,0,0,0,0,0,0],"FLAG":0,"BASE":46}'
+template: {"NAME":"Shelly 1","GPIO":[0,0,0,0,21,82,0,0,0,0,0,0,0],"FLAG":0,"BASE":46}
link_alt:
---
diff --git a/_templates/shelly_1PM b/_templates/shelly_1PM
index a6d23323e..bef1d7e1c 100644
--- a/_templates/shelly_1PM
+++ b/_templates/shelly_1PM
@@ -1,12 +1,12 @@
---
date_added: 2019-05-01
title: Shelly 1PM
-category: relay
+category: switch
type: Relay
standard: global
link: https://shelly.cloud/shelly-1pm-wifi-smart-relay-home-automation/
image: https://user-images.githubusercontent.com/4916781/57010210-abad7a80-6c4f-11e9-93ae-73b45697a214.jpg
-template: '{"NAME":"Shelly 1PM","GPIO":[56,0,0,0,82,134,0,0,0,0,0,21,0],"FLAG":2,"BASE":18}'
+template: {"NAME":"Shelly 1PM","GPIO":[56,0,0,0,82,134,0,0,0,0,0,21,0],"FLAG":2,"BASE":18}
link_alt:
---
diff --git a/_templates/shelly_2 b/_templates/shelly_2
index ea374a306..701026404 100644
--- a/_templates/shelly_2
+++ b/_templates/shelly_2
@@ -1,11 +1,11 @@
---
title: Shelly 2
-category: relay
+category: switch
type: Relay
standard: global
link:
image: https://user-images.githubusercontent.com/5904370/57952065-5aa6b300-78ec-11e9-9b87-9efb617a64dc.png
-template: '{"NAME":"Shelly 2","GPIO":[0,135,0,136,21,22,0,0,9,0,10,137,0],"FLAG":0,"BASE":47}'
+template: {"NAME":"Shelly 2","GPIO":[0,135,0,136,21,22,0,0,9,0,10,137,0],"FLAG":0,"BASE":47}
link_alt:
---
## This product has been discontinued
diff --git a/_templates/shelly_25 b/_templates/shelly_25
index c699a779d..8c22fe2cd 100644
--- a/_templates/shelly_25
+++ b/_templates/shelly_25
@@ -1,12 +1,12 @@
---
date_added: 2019-04-15
title: Shelly 2.5
-category: relay
+category: switch
type: Relay
standard: global
link: https://shelly.cloud/shelly-25-wifi-smart-relay-roller-shutter-home-automation/
image: https://user-images.githubusercontent.com/5904370/56116577-7b36c280-5f66-11e9-9052-f97a35669708.png
-template: '{"NAME":"Shelly 2.5","GPIO":[56,255,17,255,21,83,0,0,6,82,5,22,156],"FLAG":2,"BASE":18}'
+template: {"NAME":"Shelly 2.5","GPIO":[56,255,17,255,21,83,0,0,6,82,5,22,156],"FLAG":2,"BASE":18}
link_alt:
---
diff --git a/_templates/shelly_RGBW2 b/_templates/shelly_RGBW2
index 2c0d49e03..cb5161c0d 100644
--- a/_templates/shelly_RGBW2
+++ b/_templates/shelly_RGBW2
@@ -6,7 +6,7 @@ type: LED Controller
standard: eu
link: https://shelly.cloud/wifi-smart-shelly-rgbw-2/
image: https://shelly.cloud/wp-content/uploads/2018/11/RGBWv2_top.jpg
-template: '{"NAME":"RGBW2","GPIO":[255,255,33,255,24,91,0,0,21,17,23,22,255],"FLAG":0,"BASE":18}'
+template: {"NAME":"RGBW2","GPIO":[255,255,33,255,24,91,0,0,21,17,23,22,255],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/shelly_plug_S b/_templates/shelly_plug_S
index 2f564f615..3860801ec 100644
--- a/_templates/shelly_plug_S
+++ b/_templates/shelly_plug_S
@@ -6,7 +6,7 @@ type: Plug
standard: eu
link: https://shelly.cloud/shelly-plug-s/
image: https://shelly.cloud/wp-content/uploads/2018/12/Shelly_Plug_boxx_maket.png
-template: '{"NAME":"Shelly Plug S","GPIO":[57,255,56,255,0,134,0,0,131,17,132,21,0],"FLAG":2,"BASE":45}'
+template: {"NAME":"Shelly Plug S","GPIO":[57,255,56,255,0,134,0,0,131,17,132,21,0],"FLAG":2,"BASE":45}
link_alt:
---
diff --git a/_templates/signstek_EOP03-EU b/_templates/signstek_EOP03-EU
index f230ba6da..cc3ee04c1 100644
--- a/_templates/signstek_EOP03-EU
+++ b/_templates/signstek_EOP03-EU
@@ -6,7 +6,7 @@ type: Outdoor Plug
standard: eu
link: https://www.amazon.de/gp/product/B07WFRJZVK
image: https://images-na.ssl-images-amazon.com/images/I/81I43H82zkL._SL1500_.jpg
-template: '{"NAME":"Signstek EOP03","GPIO":[0,0,0,0,56,57,0,0,21,17,22,0,0],"FLAG":15,"BASE":18}'
+template: {"NAME":"Signstek EOP03","GPIO":[0,0,0,0,56,57,0,0,21,17,22,0,0],"FLAG":15,"BASE":18}
link_alt:
---
diff --git a/_templates/slampher b/_templates/slampher
index 66dbac782..4096454ed 100644
--- a/_templates/slampher
+++ b/_templates/slampher
@@ -5,7 +5,7 @@ type: Bulb Socket
standard: eu
link: https://www.itead.cc/sonoff-slampher-r2.html
image: https://user-images.githubusercontent.com/5904370/63218053-137dc780-c152-11e9-8190-10709858a97d.png
-template: '{"NAME":"Slampher","GPIO":[17,255,0,255,0,0,0,0,21,56,0,0,0],"FLAG":0,"BASE":9}'
+template: {"NAME":"Slampher","GPIO":[17,255,0,255,0,0,0,0,21,56,0,0,0],"FLAG":0,"BASE":9}
link_alt:
---
## Serial Flashing
diff --git a/_templates/slitinto_NX-SM200 b/_templates/slitinto_NX-SM200
index 0b1194d4c..3d0c72833 100644
--- a/_templates/slitinto_NX-SM200
+++ b/_templates/slitinto_NX-SM200
@@ -6,7 +6,7 @@ type: Plug
standard: eu
link: https://www.amazon.de/gp/product/B07QWR6QD1/ref=ppx_yo_dt_b_asin_title_o00_s00?ie=UTF8&psc=1
image: https://images-na.ssl-images-amazon.com/images/I/51qsDKPoHTL._SL1001_.jpg
-template: '{"NAME":"NX-SM200","GPIO":[0,0,0,17,134,132,0,0,0,52,21,130,0],"FLAG":0,"BASE":45}'
+template: {"NAME":"NX-SM200","GPIO":[0,0,0,17,134,132,0,0,0,52,21,130,0],"FLAG":0,"BASE":45}
link_alt:
---
diff --git a/_templates/sm-pw702 b/_templates/sm-pw702
index ae7051099..45840973e 100644
--- a/_templates/sm-pw702
+++ b/_templates/sm-pw702
@@ -6,7 +6,7 @@ type: Plug
standard: us
link: https://www.amazon.com/4-Pack-Upgraded-Assistant-Required-KKUP2U/dp/B07CKQTK9X
image: https://user-images.githubusercontent.com/5904370/55259459-007f5f00-5266-11e9-94f8-cc2e6e09b963.png
-template: '{"NAME":"SM-PW702","GPIO":[0,0,0,0,57,56,0,0,21,17,0,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"SM-PW702","GPIO":[0,0,0,0,57,56,0,0,21,17,0,0,0],"FLAG":0,"BASE":18}
link_alt: https://www.amazon.com/Control-anywhere-Compatible-required-Occupies/dp/B071CJNRHR
---
diff --git a/_templates/sm-s0301-us b/_templates/sm-s0301-us
index 65e8c6100..b82224741 100644
--- a/_templates/sm-s0301-us
+++ b/_templates/sm-s0301-us
@@ -5,7 +5,7 @@ type: Power Strip
standard: us
link: https://www.amazon.com/d/Surge-Protector-Power-Strips/Jinvoo-Protector-Outlets-Required-Google/B071ZGDDQG
image: https://user-images.githubusercontent.com/5904370/54858992-ac75f700-4d08-11e9-934c-4def2fe87dda.png
-template: '{"NAME":"SM-SO301","GPIO":[56,0,0,0,30,17,0,0,32,31,33,0,21],"FLAG":0,"BASE":18}'
+template: {"NAME":"SM-SO301","GPIO":[56,0,0,0,30,17,0,0,32,31,33,0,21],"FLAG":0,"BASE":18}
link_alt: https://www.aliexpress.com/wholesale?SearchText=sm-s0301&opensearch=true
---
SM-S0301 with an FCC ID of 2AJ5F-SM-SO3015 has 4 mains power and 4 USB ports. Each mains power is independently controlled and the USB group is controllable via a solid state relay.
diff --git a/_templates/sm-so301 b/_templates/sm-so301
index 4da3bec46..ea62821fa 100644
--- a/_templates/sm-so301
+++ b/_templates/sm-so301
@@ -6,7 +6,7 @@ type: Power Strip
standard: us
link: https://www.amazon.com/Smart-Power-Strip-Socket-Weton/dp/B073CPTM49
image: https://images-na.ssl-images-amazon.com/images/I/51PqExIi1PL._SL1000_.jpg
-template: '{"NAME":"SM-SO301","GPIO":[52,255,255,57,29,17,0,0,31,30,32,255,25],"FLAG":0,"BASE":18}'
+template: {"NAME":"SM-SO301","GPIO":[52,255,255,57,29,17,0,0,31,30,32,255,25],"FLAG":0,"BASE":18}
link_alt: https://www.amazon.com/d/Surge-Protector-Power-Strips/Jinvoo-Protector-Outlets-Required-Google/B071ZGDDQG
---
diff --git a/_templates/smanergy_KA10 b/_templates/smanergy_KA10
index 2d41eae52..8f501264c 100644
--- a/_templates/smanergy_KA10
+++ b/_templates/smanergy_KA10
@@ -5,7 +5,7 @@ type: Wall Outlet
standard: eu
link: https://www.amazon.es/dp/B07MBTCH2Y
image: https://user-images.githubusercontent.com/5904370/57956442-3dc4ac80-78f9-11e9-814e-173e76119b01.png
-template: '{"NAME":"KA10","GPIO":[0,56,0,17,134,132,0,0,131,53,21,0,0],"FLAG":0,"BASE":64}'
+template: {"NAME":"KA10","GPIO":[0,56,0,17,134,132,0,0,131,53,21,0,0],"FLAG":0,"BASE":64}
link_alt:
---
diff --git a/_templates/smart_A19_RGBW_8W_E26 b/_templates/smart_A19_RGBW_8W_E26
index 2ea52c806..ecfa182a0 100644
--- a/_templates/smart_A19_RGBW_8W_E26
+++ b/_templates/smart_A19_RGBW_8W_E26
@@ -1,14 +1,15 @@
---
date_added: 2019-05-27
-title: Smart A19 RGB+W 8W E26
-category: light
-type: Bulb
-standard: us
+title: Smart 8W
+type: RGBW
+category: bulb
+standard: E26
link: https://www.amazon.ca/gp/product/B07H9Y222L
image: https://images-na.ssl-images-amazon.com/images/I/61fociPaDuL._SL1200_.jpg
-template: '{"NAME":"OOOLED 60W RGB","GPIO":[0,0,0,0,39,40,0,0,37,0,38,0,0],"FLAG":1,"BASE":18}'
+template: {"NAME":"OOOLED 60W RGB","GPIO":[0,0,0,0,39,40,0,0,37,0,38,0,0],"FLAG":1,"BASE":18}
link_alt:
---
+Reference #: Smart-A19-RGBCW-01
```
setoption15 1
diff --git a/_templates/smartbase_E0260 b/_templates/smartbase_E0260
index d10c4a163..6f41a185b 100644
--- a/_templates/smartbase_E0260
+++ b/_templates/smartbase_E0260
@@ -6,7 +6,7 @@ type: Bulb Socket
standard: us
link: https://www.amazon.ca/gp/product/B07JGC1FYG
image: https://user-images.githubusercontent.com/5904370/64081455-6f734f00-cd01-11e9-95cd-b556c776e6d3.png
-template: '{"NAME":"SmartBaseE0260","GPIO":[0,0,0,0,56,0,0,0,21,17,0,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"SmartBaseE0260","GPIO":[0,0,0,0,56,0,0,0,21,17,0,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/smartdgm_PP-W162 b/_templates/smartdgm_PP-W162
index c42a33868..845d77b51 100644
--- a/_templates/smartdgm_PP-W162
+++ b/_templates/smartdgm_PP-W162
@@ -6,7 +6,7 @@ type: Plug
standard: eu
link: https://www.biedronka.pl/pl/product,id,142580,name,smart-gniazdo-pp-w162
image: https://i.imgur.com/qZkLlKy.png
-template: '{"NAME":"SmartDGM Plug","GPIO":[0,0,0,17,134,132,0,0,131,52,21,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"SmartDGM Plug","GPIO":[0,0,0,17,134,132,0,0,131,52,21,0,0],"FLAG":0,"BASE":18}
link_alt: http://digimate.pl/
---
diff --git a/_templates/smarthome_smart_breaker b/_templates/smarthome_smart_breaker
index 5ba32ae4e..6dfdf4a16 100644
--- a/_templates/smarthome_smart_breaker
+++ b/_templates/smarthome_smart_breaker
@@ -1,12 +1,12 @@
---
date_added: 2019-08-09
title: SmartHome Smart Breaker
-category: relay
+category: switch
type: Relay
standard: global
link: https://www.banggood.com/AC90-250V-WiFi-APP-Relay-Module-DIY-Smart-Home-Automation-Light-Switch-Work-With-Amazon-Alexa-Google-p-1351912.html?cur_warehouse=CN
image: https://user-images.githubusercontent.com/5904370/63218113-006bf700-c154-11e9-8d0f-6a49f9409451.png
-template: '{"NAME":"SmartHome Swit","GPIO":[255,255,255,255,21,255,0,0,17,57,255,56,255],"FLAG":0,"BASE":18}'
+template: {"NAME":"SmartHome Swit","GPIO":[255,255,255,255,21,255,0,0,17,57,255,56,255],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/smartlife_opard_CD302 b/_templates/smartlife_opard_CD302
index 1b6e9c925..9037ff1a0 100644
--- a/_templates/smartlife_opard_CD302
+++ b/_templates/smartlife_opard_CD302
@@ -6,7 +6,7 @@ type: Switch
standard: eu
link: https://www.amazon.de/gp/product/B079GWRWVF/
image: https://images-eu.ssl-images-amazon.com/images/I/41rHJgrDbxL._SY180_.jpg
-template: '{"NAME":"CD302","GPIO":[0,0,0,0,52,57,0,0,29,17,0,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"CD302","GPIO":[0,0,0,0,52,57,0,0,29,17,0,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/smartplex_3_gang b/_templates/smartplex_3_gang
index 60e8b860d..990d847a6 100644
--- a/_templates/smartplex_3_gang
+++ b/_templates/smartplex_3_gang
@@ -6,7 +6,7 @@ type: Switch
standard: us
link: https://www.amazon.com/Smart-Wifi-Light-Switch-Wall/dp/B07JYR4P5F
image: https://images-na.ssl-images-amazon.com/images/I/71BNTnKgTYL._SX679_.jpg
-template: '{"NAME":"Tuya 3 Channel","GPIO":[255,255,255,255,21,18,0,0,19,23,17,22,255],"FLAG":0,"BASE":18}'
+template: {"NAME":"Tuya 3 Channel","GPIO":[255,255,255,255,21,18,0,0,19,23,17,22,255],"FLAG":0,"BASE":18}
link_alt: https://www.ebay.com/itm/BSEED-Smart-Wall-Switch-Wifi-Touch-Switch-Glass-Panel-Google-Alexa-Light-Switch-/173652452052
---
diff --git a/_templates/solimo_12W_B22 b/_templates/solimo_12W_B22
index 4f3cbfd9c..4d8e80523 100644
--- a/_templates/solimo_12W_B22
+++ b/_templates/solimo_12W_B22
@@ -1,12 +1,12 @@
---
date_added: 2019-10-19
-title: Solimo 12W B22 RGBWW
-category: light
-type: Bulb
-standard: in
+title: Solimo 12W
+type: RGBW
+category: bulb
+standard: b22
link: https://www.amazon.in/gp/product/B07R2YF1R1
image: https://user-images.githubusercontent.com/5904370/67141457-2865fc80-f262-11e9-9388-8435ab922410.png
-template: '{"NAME":"Solimo RGBWW12","GPIO":[0,0,0,0,37,40,0,0,38,41,39,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"Solimo RGBWW12","GPIO":[0,0,0,0,37,40,0,0,38,41,39,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/solimo_9W_B22 b/_templates/solimo_9W_B22
index 5eee2d225..532f474f2 100644
--- a/_templates/solimo_9W_B22
+++ b/_templates/solimo_9W_B22
@@ -1,12 +1,12 @@
---
date_added: 2019-10-02
-title: Solimo 9W B22 RGBWW
-category: light
-type: Bulb
-standard: in
+title: Solimo 9W
+type: RGBW
+category: bulb
+standard: B22
link: https://www.amazon.in/gp/product/B07QXKC3SX
image: https://images-na.ssl-images-amazon.com/images/I/714KSu%2BXdgL._SL1500_.jpg
-template: '{"NAME":"Solimo RGBWW 9","GPIO":[0,0,0,0,37,40,0,0,38,41,39,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"Solimo RGBWW 9","GPIO":[0,0,0,0,37,40,0,0,38,41,39,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/sonoff_1channel b/_templates/sonoff_1channel
index b95b2a41f..28034463b 100644
--- a/_templates/sonoff_1channel
+++ b/_templates/sonoff_1channel
@@ -1,11 +1,11 @@
---
title: 1 Channel Inching/Self-Locking
-category: relay
+category: switch
type: Relay
standard: global
link: https://www.itead.cc/inching-self-locking-wifi-wireless-switch.html
image: https://user-images.githubusercontent.com/5904370/57887139-173a3f00-782f-11e9-8bcc-b0a41451bb10.png
-template: '{"NAME":"1 Channel","GPIO":[17,0,0,0,0,0,0,0,21,56,0,0,0],"FLAG":0,"BASE":12}'
+template: {"NAME":"1 Channel","GPIO":[17,0,0,0,0,0,0,0,21,56,0,0,0],"FLAG":0,"BASE":12}
link_alt:
---
## Serial Flashing
diff --git a/_templates/sonoff_4CH b/_templates/sonoff_4CH
index 85285f993..d2c7ce147 100644
--- a/_templates/sonoff_4CH
+++ b/_templates/sonoff_4CH
@@ -1,11 +1,11 @@
---
title: Sonoff 4CH (R2)
-category: relay
+category: switch
type: Relay
standard: global
link: https://www.itead.cc/smart-home/sonoff-4ch.html
image: https://user-images.githubusercontent.com/5904370/57882765-c4f42080-7824-11e9-93c9-fafaf0299dd0.png
-template: '{"NAME":"Sonoff 4CH","GPIO":[17,255,255,255,23,22,18,19,21,56,20,24,0],"FLAG":0,"BASE":7}'
+template: {"NAME":"Sonoff 4CH","GPIO":[17,255,255,255,23,22,18,19,21,56,20,24,0],"FLAG":0,"BASE":7}
link_alt:
---
## Serial Flashing
diff --git a/_templates/sonoff_4CH_Pro b/_templates/sonoff_4CH_Pro
index 37b06ab5d..c71a49c0b 100644
--- a/_templates/sonoff_4CH_Pro
+++ b/_templates/sonoff_4CH_Pro
@@ -1,11 +1,11 @@
---
title: Sonoff 4CH Pro (R2)
-category: relay
+category: switch
type: Relay
standard: global
link: https://www.itead.cc/smart-home/sonoff-4ch-pro.html
image: https://user-images.githubusercontent.com/5904370/57883997-f91d1080-7827-11e9-96dd-f7a0a6df0edc.png
-template: '{"NAME":"Sonoff 4CH Pro","GPIO":[17,255,255,255,23,22,18,19,21,56,20,24,0],"FLAG":0,"BASE":23}'
+template: {"NAME":"Sonoff 4CH Pro","GPIO":[17,255,255,255,23,22,18,19,21,56,20,24,0],"FLAG":0,"BASE":23}
link_alt:
---
Compared to the 4CH the main differences/improvements of the 4CH Pro are:
diff --git a/_templates/sonoff_B1 b/_templates/sonoff_B1
index 85e4b6ea5..f1f997be2 100644
--- a/_templates/sonoff_B1
+++ b/_templates/sonoff_B1
@@ -1,11 +1,11 @@
---
title: Sonoff B1 (R2)
-category: light
-type: Bulb
-standard: eu
+type: RGBCCT
+category: bulb
+standard: E27
link: https://www.itead.cc/sonoff-b1.html
image: https://user-images.githubusercontent.com/5904370/57892486-5f615d80-783f-11e9-8273-1b08e163047a.png
-template: '{"NAME":"Sonoff B1","GPIO":[17,0,0,0,0,0,0,0,143,0,144,0,0],"FLAG":0,"BASE":26}'
+template: {"NAME":"Sonoff B1","GPIO":[17,0,0,0,0,0,0,0,143,0,144,0,0],"FLAG":0,"BASE":26}
link_alt:
---
diff --git a/_templates/sonoff_BN-SZ01 b/_templates/sonoff_BN-SZ01
index 745f979b0..389e16ef8 100644
--- a/_templates/sonoff_BN-SZ01
+++ b/_templates/sonoff_BN-SZ01
@@ -5,7 +5,7 @@ type: Light
standard: global
link: https://www.itead.cc/bn-sz01.html
image: https://user-images.githubusercontent.com/5904370/57891254-098ab680-783b-11e9-9933-f5dd214ee534.png
-template: '{"NAME":"Sonoff BN-SZ","GPIO":[0,0,0,0,0,0,0,0,37,56,0,0,0],"FLAG":0,"BASE":22}'
+template: {"NAME":"Sonoff BN-SZ","GPIO":[0,0,0,0,0,0,0,0,37,56,0,0,0],"FLAG":0,"BASE":22}
link_alt: https://www.boxelectronica.com/en/smart-living/1189-sonoff-bn-sz01-wifi-round-flush-mount-led-ceiling-light.html
---
***This product is discontinued.***
diff --git a/_templates/sonoff_L1 b/_templates/sonoff_L1
index b0dbfe552..00879e0cf 100644
--- a/_templates/sonoff_L1
+++ b/_templates/sonoff_L1
@@ -6,7 +6,7 @@ type: LED Strip
standard: global
link: https://www.itead.cc/sonoff-l1-smart-led-light-strip.html
image: https://user-images.githubusercontent.com/5904370/65447568-23ff1d00-de37-11e9-8c18-c4bb24372194.png
-template: '{"NAME":"SonoffL1","GPIO":[0,148,0,149,0,0,0,0,0,56,0,0,0],"FLAG":0,"BASE":70}'
+template: {"NAME":"SonoffL1","GPIO":[0,148,0,149,0,0,0,0,0,56,0,0,0],"FLAG":0,"BASE":70}
link_alt:
---
diff --git a/_templates/sonoff_Pow b/_templates/sonoff_Pow
index a02d6f066..95db04db2 100644
--- a/_templates/sonoff_Pow
+++ b/_templates/sonoff_Pow
@@ -1,11 +1,11 @@
---
title: Sonoff Pow
-category: relay
+category: switch
type: Relay
standard: global
link: https://www.itead.cc/smart-home/sonoff-pow.html
image: https://user-images.githubusercontent.com/5904370/57881237-139fbb80-7821-11e9-8c1b-e375f6d0c0a3.png
-template: '{"NAME":"Sonoff Pow","GPIO":[17,0,0,0,0,130,0,0,21,132,133,52,0],"FLAG":0,"BASE":6}'
+template: {"NAME":"Sonoff Pow","GPIO":[17,0,0,0,0,130,0,0,21,132,133,52,0],"FLAG":0,"BASE":6}
link_alt:
---
Sonoff Pow has been obsoleted with [Sonoff Pow R2](https://blakadder.github.io/templates/sonoff_Pow_R2.html). Before configuring your device check which revision you have.
diff --git a/_templates/sonoff_Pow_R2 b/_templates/sonoff_Pow_R2
index 43aaa5683..57de8fe26 100644
--- a/_templates/sonoff_Pow_R2
+++ b/_templates/sonoff_Pow_R2
@@ -1,11 +1,11 @@
---
title: Sonoff Pow R2
-category: relay
+category: switch
type: Relay
standard: global
link: https://www.itead.cc/sonoff-pow-r2.html
image: https://user-images.githubusercontent.com/5904370/57882172-65494580-7823-11e9-9202-cac2dccd18b2.png
-template: '{"NAME":"Sonoff Pow R2","GPIO":[17,145,0,146,0,0,0,0,21,56,0,0,0],"FLAG":0,"BASE":43}'
+template: {"NAME":"Sonoff Pow R2","GPIO":[17,145,0,146,0,0,0,0,21,56,0,0,0],"FLAG":0,"BASE":43}
link_alt:
---
## ⚠️️Special Attention ⚠️️
diff --git a/_templates/sonoff_RE5V1C b/_templates/sonoff_RE5V1C
index a5be83166..bf428da32 100644
--- a/_templates/sonoff_RE5V1C
+++ b/_templates/sonoff_RE5V1C
@@ -1,12 +1,12 @@
---
date_added: 2019-10-13
title: Sonoff 5V Inching/Selflock Module RE5V1C
-category: relay
+category: switch
type: Relay
standard: global
link: https://www.itead.cc/sonoff-re5v1c.html
image: https://cdn-media.itead.cc/media/catalog/product/cache/1/image/9df78eab33525d08d6e5fb8d27136e95/r/e/re5v1c1000px-4.jpg
-template: '{"NAME":"Sonoff RE5V1C","GPIO":[17,255,255,255,255,255,0,0,21,56,0,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"Sonoff RE5V1C","GPIO":[17,255,255,255,255,255,0,0,21,56,0,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/sonoff_RF b/_templates/sonoff_RF
index 98783d5bc..1e418f837 100644
--- a/_templates/sonoff_RF
+++ b/_templates/sonoff_RF
@@ -1,6 +1,6 @@
---
title: Sonoff RF
-category: relay
+category: switch
type: Relay
standard: global
link: https://www.itead.cc/smart-home/sonoff-rf.html
diff --git a/_templates/sonoff_RF_bridge b/_templates/sonoff_RF_bridge
index 3b03fba9c..82edb01d3 100644
--- a/_templates/sonoff_RF_bridge
+++ b/_templates/sonoff_RF_bridge
@@ -5,7 +5,7 @@ type: RF Bridge
standard: global
link: https://www.itead.cc/sonoff-rf-bridge-433.html
image: https://user-images.githubusercontent.com/5904370/57891774-eeb94180-783c-11e9-9031-676fae24ce1c.png
-template: '{"NAME":"Sonoff Bridge","GPIO":[17,148,255,149,255,255,0,0,255,56,255,0,0],"FLAG":0,"BASE":25}'
+template: {"NAME":"Sonoff Bridge","GPIO":[17,148,255,149,255,255,0,0,255,56,255,0,0],"FLAG":0,"BASE":25}
link_alt:
---
## Serial Flashing
diff --git a/_templates/sonoff_S20 b/_templates/sonoff_S20
index d9673613f..5d07d2d70 100644
--- a/_templates/sonoff_S20
+++ b/_templates/sonoff_S20
@@ -9,7 +9,7 @@ standard:
- anzac
link: https://www.itead.cc/smart-home/smart-socket.html
image: https://user-images.githubusercontent.com/5904370/57884318-a55ef700-7828-11e9-8cb5-52d9fb54d9fa.png
-template: '{"NAME":"Sonoff S20","GPIO":[17,255,255,255,0,0,0,0,21,56,0,0,0],"FLAG":0,"BASE":8}'
+template: {"NAME":"Sonoff S20","GPIO":[17,255,255,255,0,0,0,0,21,56,0,0,0],"FLAG":0,"BASE":8}
link_alt:
---
Sonoff S20 comes in 4 plug type variants. Flashing process will be the same for each type.
diff --git a/_templates/sonoff_S26 b/_templates/sonoff_S26
index 39d230105..e50efb50d 100644
--- a/_templates/sonoff_S26
+++ b/_templates/sonoff_S26
@@ -9,7 +9,7 @@ standard:
- anzac
link: https://www.itead.cc/smart-home/smart-socket.html
image: https://user-images.githubusercontent.com/5904370/57954559-89745780-78f3-11e9-9e8f-8b59b0efaf81.png
-template: '{"NAME":"Sonoff S26","GPIO":[17,255,255,255,0,0,0,0,21,56,0,0,0],"FLAG":0,"BASE":8}'
+template: {"NAME":"Sonoff S26","GPIO":[17,255,255,255,0,0,0,0,21,56,0,0,0],"FLAG":0,"BASE":8}
link_alt:
---
Sonoff S26 comes in 6 plug type variants. Flashing process will be the same for each type.
diff --git a/_templates/sonoff_S31 b/_templates/sonoff_S31
index 4c4ba8747..0d4e0c21b 100644
--- a/_templates/sonoff_S31
+++ b/_templates/sonoff_S31
@@ -5,7 +5,7 @@ type: Plug
standard: us
link: https://www.itead.cc/smart-home/sonoff-s31.html
image: https://user-images.githubusercontent.com/5904370/57948059-f0d4dc00-78e0-11e9-85df-a23c5af638a3.png
-template: '{"NAME":"Sonoff S31","GPIO":[17,145,0,146,0,0,0,0,21,56,0,0,0],"FLAG":0,"BASE":41}'
+template: {"NAME":"Sonoff S31","GPIO":[17,145,0,146,0,0,0,0,21,56,0,0,0],"FLAG":0,"BASE":41}
link_alt: https://www.amazon.com/Consumption-Measure-Monitor-Anywhere-S31-1Pack/dp/B07CKKP4RX
---
## Serial Flashing
diff --git a/_templates/sonoff_S55 b/_templates/sonoff_S55
index 8af45c7a3..083fe77c9 100644
--- a/_templates/sonoff_S55
+++ b/_templates/sonoff_S55
@@ -11,7 +11,7 @@ standard:
- za
link: https://www.itead.cc/smart-home/sonoff-s55.html
image: https://user-images.githubusercontent.com/5904370/61628399-7890eb00-ac82-11e9-9742-3e837ee9f09b.png
-template: '{"NAME":"Sonoff S55","GPIO":[17,255,0,255,255,0,0,0,21,56,0,0,0],"FLAG":0,"BASE":1}'
+template: {"NAME":"Sonoff S55","GPIO":[17,255,0,255,255,0,0,0,21,56,0,0,0],"FLAG":0,"BASE":1}
link_alt:
---
diff --git a/_templates/sonoff_SC b/_templates/sonoff_SC
index 523125ea7..78da2b1e3 100644
--- a/_templates/sonoff_SC
+++ b/_templates/sonoff_SC
@@ -5,7 +5,7 @@ type: Environment Monitor
standard: global
link: https://www.itead.cc/sonoff-sc.html
image: https://user-images.githubusercontent.com/5904370/57957790-da894900-78fd-11e9-92c6-7f32fd9d4a59.png
-template: '{"NAME":"Sonoff SC","GPIO":[17,148,255,149,0,0,0,0,0,56,0,0,0],"FLAG":0,"BASE":21}'
+template: {"NAME":"Sonoff SC","GPIO":[17,148,255,149,0,0,0,0,0,56,0,0,0],"FLAG":0,"BASE":21}
link_alt: https://www.fasttech.com/products/0/10040739/8817900-authentic-sonoff-sc-smart-indoor-wifi
---
## Serial Flashing
diff --git a/_templates/sonoff_SV b/_templates/sonoff_SV
index 9270cc0fd..9822856f1 100644
--- a/_templates/sonoff_SV
+++ b/_templates/sonoff_SV
@@ -1,11 +1,11 @@
---
title: Sonoff SV
-category: relay
+category: switch
type: Relay
standard: global
link: https://www.itead.cc/smart-home/sonoff-sv.html
image: https://user-images.githubusercontent.com/5904370/57877355-eef31600-7817-11e9-9812-393f47558adc.png
-template: '{"NAME":"Sonoff SV","GPIO":[17,255,0,255,255,255,0,0,21,56,255,0,0],"FLAG":1,"BASE":3}'
+template: {"NAME":"Sonoff SV","GPIO":[17,255,0,255,255,255,0,0,21,56,255,0,0],"FLAG":1,"BASE":3}
link_alt:
---
Sonoff Safe Voltage is almost the same as Sonoff Basic R1.
diff --git a/_templates/sonoff_T1_eu_1 b/_templates/sonoff_T1_eu_1
index 99092c8b6..71c186cf7 100644
--- a/_templates/sonoff_T1_eu_1
+++ b/_templates/sonoff_T1_eu_1
@@ -5,7 +5,7 @@ type: Switch
standard: eu
link: https://www.itead.cc/smart-home/sonoff-t1-eu.html
image: https://user-images.githubusercontent.com/5904370/57943003-34c0e480-78d3-11e9-9c94-a83588ace163.png
-template: '{"NAME":"Sonoff T1 1CH","GPIO":[17,255,255,255,0,0,0,0,21,56,0,0,0],"FLAG":0,"BASE":28}'
+template: {"NAME":"Sonoff T1 1CH","GPIO":[17,255,255,255,0,0,0,0,21,56,0,0,0],"FLAG":0,"BASE":28}
link_alt:
---
## Serial Flashing
diff --git a/_templates/sonoff_T1_eu_2 b/_templates/sonoff_T1_eu_2
index 89408df2d..dbe83c88d 100644
--- a/_templates/sonoff_T1_eu_2
+++ b/_templates/sonoff_T1_eu_2
@@ -5,7 +5,7 @@ type: Switch
standard: eu
link: https://www.itead.cc/smart-home/sonoff-t1-eu.html
image: https://user-images.githubusercontent.com/5904370/57942984-2c68a980-78d3-11e9-9781-dc9170916d86.png
-template: '{"NAME":"Sonoff T1 2CH","GPIO":[17,255,255,255,0,22,18,0,21,56,0,0,0],"FLAG":0,"BASE":29}'
+template: {"NAME":"Sonoff T1 2CH","GPIO":[17,255,255,255,0,22,18,0,21,56,0,0,0],"FLAG":0,"BASE":29}
link_alt:
---
## Serial Flashing
diff --git a/_templates/sonoff_T1_uk_1 b/_templates/sonoff_T1_uk_1
index 9497a4bd0..d823d4911 100644
--- a/_templates/sonoff_T1_uk_1
+++ b/_templates/sonoff_T1_uk_1
@@ -5,7 +5,7 @@ type: Switch
standard: uk
link: https://www.itead.cc/smart-home/sonoff-t1.html
image: https://user-images.githubusercontent.com/5904370/57943737-1c51c980-78d5-11e9-9795-5f3492b08498.png
-template: '{"NAME":"Sonoff T1 1CH","GPIO":[17,255,255,255,0,0,0,0,21,56,0,0,0],"FLAG":0,"BASE":28}'
+template: {"NAME":"Sonoff T1 1CH","GPIO":[17,255,255,255,0,0,0,0,21,56,0,0,0],"FLAG":0,"BASE":28}
link_alt:
---
## Serial Flashing
diff --git a/_templates/sonoff_T1_uk_2 b/_templates/sonoff_T1_uk_2
index 43ebb3135..7c400f622 100644
--- a/_templates/sonoff_T1_uk_2
+++ b/_templates/sonoff_T1_uk_2
@@ -5,7 +5,7 @@ type: Switch
standard: uk
link: https://www.itead.cc/smart-home/sonoff-t1.html
image: https://user-images.githubusercontent.com/5904370/57893156-22e33100-7842-11e9-8749-81db74dac23f.png
-template: '{"NAME":"Sonoff T1 2CH","GPIO":[17,255,255,255,0,22,18,0,21,56,0,0,0],"FLAG":0,"BASE":29}'
+template: {"NAME":"Sonoff T1 2CH","GPIO":[17,255,255,255,0,22,18,0,21,56,0,0,0],"FLAG":0,"BASE":29}
link_alt:
---
## Serial Flashing
diff --git a/_templates/sonoff_T1_uk_3 b/_templates/sonoff_T1_uk_3
index c6af939b8..0533f431b 100644
--- a/_templates/sonoff_T1_uk_3
+++ b/_templates/sonoff_T1_uk_3
@@ -5,7 +5,7 @@ type: Switch
standard: uk
link: https://www.itead.cc/smart-home/sonoff-t1.html
image: https://user-images.githubusercontent.com/5904370/57893269-984f0180-7842-11e9-910d-71763c3cf6bd.png
-template: '{"NAME":"Sonoff T1 3CH","GPIO":[17,255,255,255,23,22,18,19,21,56,0,0,0],"FLAG":0,"BASE":30}'
+template: {"NAME":"Sonoff T1 3CH","GPIO":[17,255,255,255,23,22,18,19,21,56,0,0,0],"FLAG":0,"BASE":30}
link_alt:
---
## Serial Flashing
diff --git a/_templates/sonoff_T1_us_1 b/_templates/sonoff_T1_us_1
index fa3726ffa..79aaa6a33 100644
--- a/_templates/sonoff_T1_us_1
+++ b/_templates/sonoff_T1_us_1
@@ -5,7 +5,7 @@ type: Switch
standard: us
link: https://www.itead.cc/smart-home/sonoff-t1-us.html
image: https://user-images.githubusercontent.com/5904370/57944870-a0f21700-78d8-11e9-8937-63ba1dfd6583.png
-template: '{"NAME":"Sonoff T1 1CH","GPIO":[17,255,255,255,0,0,0,0,21,56,0,0,0],"FLAG":0,"BASE":28}'
+template: {"NAME":"Sonoff T1 1CH","GPIO":[17,255,255,255,0,0,0,0,21,56,0,0,0],"FLAG":0,"BASE":28}
link_alt:
---
## Serial Flashing
diff --git a/_templates/sonoff_T1_us_2 b/_templates/sonoff_T1_us_2
index 74b2bdffa..c012ca90b 100644
--- a/_templates/sonoff_T1_us_2
+++ b/_templates/sonoff_T1_us_2
@@ -5,7 +5,7 @@ type: Switch
standard: us
link: https://www.itead.cc/smart-home/sonoff-t1-us.html
image: https://user-images.githubusercontent.com/5904370/57944942-cc750180-78d8-11e9-8267-e960fbe74d0a.png
-template: '{"NAME":"Sonoff T1 2CH","GPIO":[17,255,255,255,0,22,18,0,21,56,0,0,0],"FLAG":0,"BASE":29}'
+template: {"NAME":"Sonoff T1 2CH","GPIO":[17,255,255,255,0,22,18,0,21,56,0,0,0],"FLAG":0,"BASE":29}
link_alt:
---
## Serial Flashing
diff --git a/_templates/sonoff_T1_us_3 b/_templates/sonoff_T1_us_3
index 4d2b07cc8..ad215219a 100644
--- a/_templates/sonoff_T1_us_3
+++ b/_templates/sonoff_T1_us_3
@@ -5,7 +5,7 @@ type: Switch
standard: us
link: https://www.itead.cc/smart-home/sonoff-t1-us.html
image: https://user-images.githubusercontent.com/5904370/57944986-ee6e8400-78d8-11e9-99db-49d336c68084.png
-template: '{"NAME":"Sonoff T1 3CH","GPIO":[17,255,255,255,23,22,18,19,21,56,0,0,0],"FLAG":0,"BASE":30}'
+template: {"NAME":"Sonoff T1 3CH","GPIO":[17,255,255,255,23,22,18,19,21,56,0,0,0],"FLAG":0,"BASE":30}
link_alt:
---
## Serial Flashing
diff --git a/_templates/sonoff_TH b/_templates/sonoff_TH
index 0f55c8e8a..09afea0ae 100644
--- a/_templates/sonoff_TH
+++ b/_templates/sonoff_TH
@@ -1,11 +1,11 @@
---
title: Sonoff TH10/TH16
-category: relay
+category: switch
type: Relay
standard: global
link: https://www.itead.cc/smart-home/sonoff-th.html
image: https://user-images.githubusercontent.com/5904370/57877996-5e1d3a00-7819-11e9-9008-f183f321d45a.png
-template: '{"NAME":"Sonoff TH","GPIO":[17,255,0,255,255,0,0,0,21,56,255,0,0],"FLAG":0,"BASE":4}'
+template: {"NAME":"Sonoff TH","GPIO":[17,255,0,255,255,0,0,0,21,56,255,0,0],"FLAG":0,"BASE":4}
link_alt:
---
Sonoff TH10 or TH16 / Ver 2.0 (year 2017/2018/2019) based on ESP8266.
diff --git a/_templates/sonoff_basic b/_templates/sonoff_basic
index cde08c83e..2494717ea 100644
--- a/_templates/sonoff_basic
+++ b/_templates/sonoff_basic
@@ -1,11 +1,11 @@
---
title: Sonoff Basic
-category: relay
+category: switch
type: Relay
standard: global
link: https://sonoff.itead.cc/en/products/sonoff/sonoff-basic
image: https://user-images.githubusercontent.com/5904370/57875590-99b50580-7813-11e9-86fa-73ce736467e6.png
-template: '{"NAME":"Sonoff Basic","GPIO":[17,255,255,255,255,0,0,0,21,56,255,0,0],"FLAG":0,"BASE":1}'
+template: {"NAME":"Sonoff Basic","GPIO":[17,255,255,255,255,0,0,0,21,56,255,0,0],"FLAG":0,"BASE":1}
link_alt: https://www.banggood.com/SONOFF-Basic-10A-2200W-WIFI-Wireless-Smart-Switch-Remote-Control-Socket-APP-Timer-p-1019971.html?p=CM27171011078201412U&custlinkid=712613
---
Sonoff Basic - the one that started it all!
diff --git a/_templates/sonoff_basic_R3 b/_templates/sonoff_basic_R3
index 9f58b7eb6..a0cf32aec 100644
--- a/_templates/sonoff_basic_R3
+++ b/_templates/sonoff_basic_R3
@@ -1,12 +1,12 @@
---
date_added: 2019-10-22
title: Sonoff Basic R3
-category: relay
+category: switch
type: Relay
standard: global
link: https://www.itead.cc/sonoff-basicr3-wifi-diy-smart-switch.html
image: https://user-images.githubusercontent.com/5904370/67286319-7c2e4b00-f4d9-11e9-9c3d-993e5a8c6422.png
-template: '{"NAME":"Basic R3","GPIO":[17,255,0,255,255,0,0,0,21,56,255,0,255],"FLAG":0,"BASE":1}'
+template: {"NAME":"Basic R3","GPIO":[17,255,0,255,255,0,0,0,21,56,255,0,255],"FLAG":0,"BASE":1}
link_alt:
---
diff --git a/_templates/sonoff_dual b/_templates/sonoff_dual
index 75b019542..df4bdceb0 100644
--- a/_templates/sonoff_dual
+++ b/_templates/sonoff_dual
@@ -1,11 +1,11 @@
---
title: Sonoff Dual
-category: relay
+category: switch
type: Relay
standard: global
link: https://www.itead.cc/smart-home/sonoff-dual.html
image: https://user-images.githubusercontent.com/5904370/57879170-121fc480-781c-11e9-8bed-7ba8ad73f579.png
-template: '{"NAME":"Sonoff Dual","GPIO":[0,148,0,149,255,0,0,0,0,56,255,0,0],"FLAG":0,"BASE":5}'
+template: {"NAME":"Sonoff Dual","GPIO":[0,148,0,149,255,0,0,0,0,56,255,0,0],"FLAG":0,"BASE":5}
link_alt:
---
Sonoff Dual has been obsoleted by [Sonoff Dual R2](https://blakadder.github.io/templates/sonoff_dual_R2.html). Before configuring your device check which revision you have since there are significant differences in how they operate.
diff --git a/_templates/sonoff_dual_R2 b/_templates/sonoff_dual_R2
index d68f1451a..359a2d27a 100644
--- a/_templates/sonoff_dual_R2
+++ b/_templates/sonoff_dual_R2
@@ -1,11 +1,11 @@
---
title: Sonoff Dual R2
-category: relay
+category: switch
type: Relay
standard: global
link: https://www.itead.cc/smart-home/sonoff-dual.html
image: https://user-images.githubusercontent.com/5904370/57879170-121fc480-781c-11e9-8bed-7ba8ad73f579.png
-template: '{"NAME":"Sonoff Dual R2","GPIO":[255,255,0,255,0,22,255,17,21,56,0,0,0],"FLAG":0,"BASE":39}'
+template: {"NAME":"Sonoff Dual R2","GPIO":[255,255,0,255,0,22,255,17,21,56,0,0,0],"FLAG":0,"BASE":39}
link_alt:
---
Sonoff Dual R2 is the replacement for Sonoff Dual. Compared to the Dual the main differences/improvements for R2 are:
diff --git a/_templates/sonoff_ifan02 b/_templates/sonoff_ifan02
index 14e5266ee..e65d98229 100644
--- a/_templates/sonoff_ifan02
+++ b/_templates/sonoff_ifan02
@@ -5,7 +5,7 @@ type: Fan Controller
standard: global
link: https://www.itead.cc/sonoff-ifan02-wifi-smart-ceiling-fan-with-light.html
image: https://user-images.githubusercontent.com/5904370/57948708-a6545f00-78e2-11e9-9d04-05f31ff77a72.png
-template: '{"NAME":"Sonoff iFan02","GPIO":[17,255,0,255,23,22,18,19,21,56,20,24,0],"FLAG":0,"BASE":44}'
+template: {"NAME":"Sonoff iFan02","GPIO":[17,255,0,255,23,22,18,19,21,56,20,24,0],"FLAG":0,"BASE":44}
link_alt:
---
The Sonoff iFan02 is supported in Tasmota from version 6.0.0b
diff --git a/_templates/sonoff_ifan03 b/_templates/sonoff_ifan03
index 840be5ecb..a9150f458 100644
--- a/_templates/sonoff_ifan03
+++ b/_templates/sonoff_ifan03
@@ -6,7 +6,7 @@ type: Fan Controller
standard: global
link: https://www.itead.cc/sonoff-ifan03-wifi-ceiling-fan-light-controller.html
image: https://user-images.githubusercontent.com/34340210/62710777-e6008380-b9c5-11e9-83a2-35dbf1cdb782.png
-template: '{"NAME":"SonoffiFan03","GPIO":[17,148,0,149,0,0,29,161,23,56,22,24,0],"FLAG":0,"BASE":71}'
+template: {"NAME":"SonoffiFan03","GPIO":[17,148,0,149,0,0,29,161,23,56,22,24,0],"FLAG":0,"BASE":71}
link_alt:
---
diff --git a/_templates/sonoff_mini b/_templates/sonoff_mini
index 74313863f..45387e5f0 100644
--- a/_templates/sonoff_mini
+++ b/_templates/sonoff_mini
@@ -1,12 +1,12 @@
---
date_added: 2019-07-22
title: Sonoff Mini
-category: relay
+category: switch
type: Relay
standard: global
link: https://www.itead.cc/sonoff-mini.html
image: https://user-images.githubusercontent.com/5904370/63218127-3610e000-c154-11e9-9ae9-8ed36009dda4.png
-template: '{"NAME":"Sonoff Mini","GPIO":[17,0,0,0,9,0,0,0,21,56,0,0,255],"FLAG":0,"BASE":1}'
+template: {"NAME":"Sonoff Mini","GPIO":[17,0,0,0,9,0,0,0,21,56,0,0,255],"FLAG":0,"BASE":1}
link_alt:
---
diff --git a/_templates/sonoff_s22 b/_templates/sonoff_s22
index a8cbbc2a6..378a3f509 100644
--- a/_templates/sonoff_s22
+++ b/_templates/sonoff_s22
@@ -5,7 +5,7 @@ type: Plug
standard: anzac
link: https://www.banggood.com/SONOFF-S22-10A2200W-AU-Plug-Wireless-Remote-Control-Smart-Socket-Phone-App-Control-Wifi-Smart-Home-p-1142284.html
image: https://www.dhresource.com/webp/m/0x0s/f2-albu-g6-M00-F2-AD-rBVaSFtyKPyAA7NgAAC1azypYqY471.jpg/sonoff-s22-10a-2200w-samrt-plug-wireless.jpg
-template: '{"NAME":"Sonoff S22","GPIO":[17,255,0,255,255,0,0,0,21,56,255,0,0],"FLAG":0,"BASE":4}'
+template: {"NAME":"Sonoff S22","GPIO":[17,255,0,255,255,0,0,0,21,56,255,0,0],"FLAG":0,"BASE":4}
link_alt:
---
diff --git a/_templates/sonoff_touch_eu b/_templates/sonoff_touch_eu
index e4bd83ceb..1cf5f378c 100644
--- a/_templates/sonoff_touch_eu
+++ b/_templates/sonoff_touch_eu
@@ -5,7 +5,7 @@ type: Switch
standard: eu
link: https://www.itead.cc/smart-home/sonoff-touch.html
image: https://user-images.githubusercontent.com/5904370/57885431-36cf6880-782b-11e9-9361-f4fa9f60fd80.png
-template: '{"NAME":"Sonoff Touch","GPIO":[17,255,0,255,0,0,0,0,21,56,0,0,0],"FLAG":0,"BASE":10}'
+template: {"NAME":"Sonoff Touch","GPIO":[17,255,0,255,0,0,0,0,21,56,0,0,0],"FLAG":0,"BASE":10}
link_alt:
---
Sonoff Touch is based on the ESP8285. Though the actual chip inside may be a [PSF-A85](https://www.itead.cc/wiki/PSF-A85).
diff --git a/_templates/sonoff_touch_us b/_templates/sonoff_touch_us
index a6eeb8874..dc0923f78 100644
--- a/_templates/sonoff_touch_us
+++ b/_templates/sonoff_touch_us
@@ -5,7 +5,7 @@ type: Switch
standard: us
link: https://www.itead.cc/smart-home/sonoff-touch.html
image: https://user-images.githubusercontent.com/5904370/57885987-84000a00-782c-11e9-90e5-33706c197497.png
-template: '{"NAME":"Sonoff Touch","GPIO":[17,255,0,255,0,0,0,0,21,56,0,0,0],"FLAG":0,"BASE":10}'
+template: {"NAME":"Sonoff Touch","GPIO":[17,255,0,255,0,0,0,0,21,56,0,0,0],"FLAG":0,"BASE":10}
link_alt:
---
Sonoff Touch is based on the ESP8285. Though the actual chip inside may be a [PSF-A85](https://www.itead.cc/wiki/PSF-A85).
diff --git a/_templates/sp201dual b/_templates/sp201dual
index b55a6a77f..830b8bc48 100644
--- a/_templates/sp201dual
+++ b/_templates/sp201dual
@@ -5,6 +5,6 @@ type: Plug
standard: us
image: https://camo.githubusercontent.com/36e5c8c63b06813c077a620d56569e4fc5e677db/68747470733a2f2f692e706f7374696d672e63632f664c51676a6356542f36312d42322d4f31322d4c4f4f4c2d534c313530302e6a7067
link: https://www.amazon.com/dp/B07G2GVX2K
-template: '{"NAME":"SP-201","GPIO":[31,0,0,131,17,134,0,0,21,18,132,22,0],"FLAG":0,"BASE":45}'
+template: {"NAME":"SP-201","GPIO":[31,0,0,131,17,134,0,0,21,18,132,22,0],"FLAG":0,"BASE":45}
---
Note: These are sold under many different names. Oxaoxe, Stillento, Syncwire, Voion, Pemorn, Dilesens, etc.
diff --git a/_templates/ss118 b/_templates/ss118
index 0445118d3..614d99e04 100644
--- a/_templates/ss118
+++ b/_templates/ss118
@@ -6,7 +6,7 @@ type: Switch
standard: us
link: https://www.aliexpress.com/store/product/Zemismart-WiFi-switch-Push-Wall-Switches-Alexa-Google-home-Enable-APP-Remote-Control/1848374_32965399160.html
image: https://user-images.githubusercontent.com/5904370/67770256-50b9dc00-fa56-11e9-9d7b-201d5c78a003.png
-template: '{"NAME":"SS118-01K1","GPIO":[255,255,255,17,21,255,0,0,255,255,56,255,255],"FLAG":0,"BASE":18}'
+template: {"NAME":"SS118-01K1","GPIO":[255,255,255,17,21,255,0,0,255,255,56,255,255],"FLAG":0,"BASE":18}
link_alt: https://www.amazon.com/Switch-Installation-Compatible-Assistant-Required/dp/B07FTJWLCP
---
Generic Smart Light Switch from Amazon, based in ESP8266, internal module Tuya TYWE3S. Flashable with Tuya-Convert
diff --git a/_templates/stilinto_NX-SM110 b/_templates/stilinto_NX-SM110
index 33f91c090..9977be2e7 100644
--- a/_templates/stilinto_NX-SM110
+++ b/_templates/stilinto_NX-SM110
@@ -6,7 +6,7 @@ type: Plug
standard: uk
link: https://www.amazon.co.uk//dp/B07DVXNNH4/
image: https://images-na.ssl-images-amazon.com/images/I/41UKCcSIryL._SL1001_.jpg
-template: '{"NAME":"Slitinto SM110","GPIO":[0,0,56,0,0,134,0,0,131,17,132,21,0],"FLAG":0,"BASE":45}'
+template: {"NAME":"Slitinto SM110","GPIO":[0,0,56,0,0,134,0,0,131,17,132,21,0],"FLAG":0,"BASE":45}
link_alt:
---
diff --git a/_templates/stilinto_NX-SM112 b/_templates/stilinto_NX-SM112
index a7dac19c1..d845c965c 100644
--- a/_templates/stilinto_NX-SM112
+++ b/_templates/stilinto_NX-SM112
@@ -6,7 +6,7 @@ type: Plug
standard: uk
link: https://www.amazon.co.uk/gp/product/B07R14VCKN
image: https://images-na.ssl-images-amazon.com/images/I/51kx5VwKhRL._AC_SL1200_.jpg
-template: '{"NAME":"NX-SM112","GPIO":[158,0,0,131,0,134,0,0,0,17,132,21,0],"FLAG":0,"BASE":45}'
+template: {"NAME":"NX-SM112","GPIO":[158,0,0,131,0,134,0,0,0,17,132,21,0],"FLAG":0,"BASE":45}
link_alt: https://www.amazon.co.uk/Compatible-SLITINTO-Monitoring-Schedule-Control/dp/B07R4W7KCM
link_alt: https://www.amazon.co.uk/bakibo-Compatible-Monitoring-Schedule-Control/dp/B07R48KSWK
---
diff --git a/_templates/stilinto_NX-SM200 b/_templates/stilinto_NX-SM200
index 856588a6f..a36a6476f 100644
--- a/_templates/stilinto_NX-SM200
+++ b/_templates/stilinto_NX-SM200
@@ -6,7 +6,7 @@ type: Plug
standard: eu
link: https://www.amazon.fr/gp/product/B07QWR6QD1/ref=ppx_yo_dt_b_asin_title_o00_s00
image: https://images-na.ssl-images-amazon.com/images/I/41CW4Wx6TTL._SL1001_.jpg
-template: '{"NAME":"NX-SM200","GPIO":[17,0,0,0,133,132,0,0,131,158,21,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"NX-SM200","GPIO":[17,0,0,0,133,132,0,0,131,158,21,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/stitch_27937 b/_templates/stitch_27937
index dfbdeb4e6..1efc3994a 100644
--- a/_templates/stitch_27937
+++ b/_templates/stitch_27937
@@ -6,7 +6,7 @@ type: Plug
standard: us
link: https://www.monoprice.com/product?p_id=27937
image: https://images.monoprice.com/productlargeimages/279371.jpg
-template: '{"NAME":"Stitch 27937","GPIO":[17,0,56,0,133,132,0,0,131,0,21,0,57],"FLAG":0,"BASE":18}'
+template: {"NAME":"Stitch 27937","GPIO":[17,0,56,0,133,132,0,0,131,0,21,0,57],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/stitch_35511 b/_templates/stitch_35511
index a4b5cc324..7f0da3d8c 100644
--- a/_templates/stitch_35511
+++ b/_templates/stitch_35511
@@ -6,7 +6,7 @@ type: Plug
standard: us
link: https://www.monoprice.com/product?p_id=35511
image: https://images.monoprice.com/productlargeimages/355111.jpg
-template: '{"NAME":"Stitch 35511","GPIO":[56,0,57,0,0,0,0,0,0,17,0,21,0],"FLAG":1,"BASE":18}'
+template: {"NAME":"Stitch 35511","GPIO":[56,0,57,0,0,0,0,0,0,17,0,21,0],"FLAG":1,"BASE":18}
link_alt:
---
diff --git a/_templates/stitch_35557 b/_templates/stitch_35557
index 4e0687111..1364aaf7f 100644
--- a/_templates/stitch_35557
+++ b/_templates/stitch_35557
@@ -6,7 +6,7 @@ type: Switch
standard: us
link: https://www.monoprice.com/product?p_id=35557
image: https://images.monoprice.com/productlargeimages/355571.jpg
-template: '{"NAME":"Tuya WF15S ","GPIO":[255,255,0,0,255,255,0,0,255,108,255,107,0],"FLAG":0,"BASE":54}'
+template: {"NAME":"Tuya WF15S ","GPIO":[255,255,0,0,255,255,0,0,255,108,255,107,0],"FLAG":0,"BASE":54}
link_alt: https://www.enerlites.com/wf15s.html
---
*Post Tasmota version 6.6.0.10
diff --git a/_templates/stitch_35753 b/_templates/stitch_35753
index 47c8daec8..c8fe077bb 100644
--- a/_templates/stitch_35753
+++ b/_templates/stitch_35753
@@ -6,7 +6,7 @@ type: IR Bridge
standard: global
link: https://www.monoprice.com/product?p_id=35753
image: https://images.monoprice.com/productlargeimages/357531.jpg
-template: '{"NAME":"Stitch 35753","GPIO":[0,0,0,0,52,51,0,0,0,90,8,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"Stitch 35753","GPIO":[0,0,0,0,52,51,0,0,0,90,8,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/supernight_dual,markdown b/_templates/supernight_dual,markdown
index f678fd13d..7dfab69dc 100644
--- a/_templates/supernight_dual,markdown
+++ b/_templates/supernight_dual,markdown
@@ -6,7 +6,7 @@ type: Plug
standard: us
link: https://www.amazon.com/gp/product/B07K1QSFFJ
image: https://m.media-amazon.com/images/S/aplus-seller-content-images-us-east-1/ATVPDKIKX0DER/AXEJGN8WLZD9M/6265beec-09b0-48b5-a8a5-373cd58b9c79._CR0,0,300,400_PT0_SX300__.jpg
-template: '{"NAME":"SuperNight Dua","GPIO":[255,17,255,21,132,133,0,0,22,130,58,255,255],"FLAG":1,"BASE":18}'
+template: {"NAME":"SuperNight Dua","GPIO":[255,17,255,21,132,133,0,0,22,130,58,255,255],"FLAG":1,"BASE":18}
link_alt:
---
Received these in a 2 pack. flashing with OTA was no issue.
diff --git a/_templates/supla_incan b/_templates/supla_incan
index 230e533e9..33d6b776c 100644
--- a/_templates/supla_incan
+++ b/_templates/supla_incan
@@ -1,11 +1,11 @@
---
title: SUPLA inCan by Espablo
-category: relay
+category: switch
type: DIY Project
standard: global
link: https://forum.supla.org/viewtopic.php?f=33&t=2188
image: https://user-images.githubusercontent.com/5904370/57946103-d51b0700-78db-11e9-8d78-08d795f56323.png
-template: '{"NAME":"Supla Espablo","GPIO":[0,255,4,255,17,21,0,0,255,22,255,0,52],"FLAG":1,"BASE":31}'
+template: {"NAME":"Supla Espablo","GPIO":[0,255,4,255,17,21,0,0,255,22,255,0,52],"FLAG":1,"BASE":31}
link_alt:
---
diff --git a/_templates/sw01_10 b/_templates/sw01_10
index cc03202fa..06db2fc96 100644
--- a/_templates/sw01_10
+++ b/_templates/sw01_10
@@ -3,7 +3,7 @@
title: WL-SW01_10
type: Relay
standard: global
-category: relay
+category: switch
link: https://www.aliexpress.com/item/TISHRIC-SONOFF-Basic-Light-WIFI-Switch-220V-10A-16A-For-Smart-Home-Automation-Relay-Module-Remote/32963672255.html
image: https://camo.githubusercontent.com/d41d35c4d2be85d9eb2cc7994981346578f7725d/68747470733a2f2f692e706f7374696d672e63632f6d6b724b72534b6e2f737731302e6a7067
template: '{"NAME":"WL-SW01_10","GPIO":[17,149,0,148,0,0,0,0,21,56,0,0,0],"FLAG":0,"BASE":1}
diff --git a/_templates/swa1_uk b/_templates/swa1_uk
index c8205bc5e..5a60c8335 100644
--- a/_templates/swa1_uk
+++ b/_templates/swa1_uk
@@ -6,7 +6,7 @@ type: Plug
standard: uk
link: https://www.amazon.co.uk/gp/product/B079GMF8SJ
image: https://images-na.ssl-images-amazon.com/images/I/51gZ-WbfeqL._SL1000_.jpg
-template: '{"NAME":"SWA1","GPIO":[0,0,0,0,52,21,0,0,0,17,0,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"SWA1","GPIO":[0,0,0,0,52,21,0,0,0,17,0,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/swb1 b/_templates/swb1
index b006426d1..97459b112 100644
--- a/_templates/swb1
+++ b/_templates/swb1
@@ -6,7 +6,7 @@ type: Power Strip
standard: us
link: https://www.amazon.com/Aneken-Protector-Individually-Controlled-Compatible/dp/B07FDX6XZ6
image: https://user-images.githubusercontent.com/5904370/54648203-9fa59900-4aa5-11e9-9701-f3586d9375da.png
-template: '{"NAME":"SWB1","GPIO":[52,0,0,0,0,24,0,0,21,17,22,23,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"SWB1","GPIO":[52,0,0,0,0,24,0,0,21,17,22,23,0],"FLAG":0,"BASE":18}
link_alt: https://www.aliexpress.com/item/2000W-WiFi-Socket-Portable-SWB1-Smart-Power-Strip-Intelligent-4-Ports-Plug-Wifi-Wireless-Remote-Power/32883983405.html
---
### Product
diff --git a/_templates/swisstone_SH330 b/_templates/swisstone_SH330
index 8efe68bf3..e0f48f9e1 100644
--- a/_templates/swisstone_SH330
+++ b/_templates/swisstone_SH330
@@ -1,12 +1,12 @@
---
date_added: 2019-11-21
-title: Swisstone SH330
-category: light
-type: Bulb
-standard: eu
-link: https://www.amazon.de/LED-Leuchtmittel-sprachsteuerbar-kompatibel-SH-330
+title: Swisstone SH 330
+type: CCT
+category: bulb
+standard: E27
+link: https://www.conrad.com/p/swisstone-smart-home-sh-330-led-light-bulb-eec-a-a-e-alexa-google-home-1873409
image: https://www.ivsgmbh.de/_wpframe/_wpf.img.php?wpf_pic_id=8183
-template: '{"NAME":"SwisstoneSH330","GPIO":[0,0,0,0,140,37,0,0,38,142,141,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"SwisstoneSH330","GPIO":[0,0,0,0,140,37,0,0,38,142,141,0,0],"FLAG":0,"BASE":18}
link_alt: https://www.voelkner.de/products/1280816/Swisstone-SH-330-Smart-Home-LED-Leuchtmittel-EEK-A-A-E-Alexa-Google-Home.html?group=3
---
diff --git a/_templates/swisstone_SH_340 b/_templates/swisstone_SH340
similarity index 72%
rename from _templates/swisstone_SH_340
rename to _templates/swisstone_SH340
index 3f44da978..6004501a8 100644
--- a/_templates/swisstone_SH_340
+++ b/_templates/swisstone_SH340
@@ -1,12 +1,12 @@
---
date_added: 2019-11-05
title: Swisstone SH 340
-category: light
-type: Bulb
-standard: eu
+type: RGBW
+category: bulb
+standard: E27
link: https://www.conrad.com/p/swisstone-smart-home-sh-340-led-light-bulb-eec-a-a-e-alexa-google-home-1873410
image: https://asset.conrad.com/media10/isa/160267/c1/-/en/1873410_AB_00_FB/image.jpg?x=600&y=600
-template: '{"NAME":"SH 340","GPIO":[0,0,0,0,140,37,0,0,0,142,141,0,0],"FLAG":15,"BASE":18}'
+template: {"NAME":"SH 340","GPIO":[0,0,0,0,140,37,0,0,0,142,141,0,0],"FLAG":15,"BASE":18}
link_alt: https://www.ivsgmbh.de/produktdetail_de.php?wpf_reference=1040
---
diff --git a/_templates/syska_9W_B22_RGBW b/_templates/syska_9W_B22_RGBW
index 1262bd75c..8b1299c87 100644
--- a/_templates/syska_9W_B22_RGBW
+++ b/_templates/syska_9W_B22_RGBW
@@ -1,12 +1,12 @@
---
date_added: 2019-11-23
-title: Syska 9W B22 RGBW
-category: light
-type: Bulb
-standard: in
+title: Syska 9W
+type: RGBW
+category: bulb
+standard: B22
link: https://www.amazon.in/gp/product/B07P9R6DKP
image: https://images-na.ssl-images-amazon.com/images/I/412sFP8Q4aL._SL1000_.jpg
-template: '{"NAME":"SyskaSmartBulb","GPIO":[0,0,0,0,37,40,0,0,38,0,39,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"SyskaSmartBulb","GPIO":[0,0,0,0,37,40,0,0,38,0,39,0,0],"FLAG":0,"BASE":18}
link_alt: https://www.amazon.in/gp/product/B076JLQSSL
---
diff --git a/_templates/tantan_WP3 b/_templates/tantan_WP3
index 63e15230f..efdb7c2ec 100644
--- a/_templates/tantan_WP3
+++ b/_templates/tantan_WP3
@@ -6,7 +6,7 @@ type: Plug
standard: us
link: https://www.amazon.com/TanTan-Wireless-Required-Anywhere-Upgraded/dp/B071VYFJRL
image: https://images-na.ssl-images-amazon.com/images/I/51w4yXJCnnL._SL1500_.jpg
-template: '{"NAME":"TanTan WP3","GPIO":[57,0,56,0,0,0,0,0,0,17,0,21,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"TanTan WP3","GPIO":[57,0,56,0,0,0,0,0,0,17,0,21,0],"FLAG":0,"BASE":18}
link_alt: https://www.amazon.com/Smart-Plug-TanTan-Enabled-Socket/dp/B079KYVRN8/
---
diff --git a/_templates/tcp_WISSINWUK b/_templates/tcp_WISSINWUK
index bca1ba8a3..0db25aeee 100644
--- a/_templates/tcp_WISSINWUK
+++ b/_templates/tcp_WISSINWUK
@@ -6,7 +6,7 @@ type: Plug
standard: uk
link: https://www.screwfix.com/p/tcp-wissinwuk-smart-plug-white/231hk
image: https://media.screwfix.com/is/image//ae235?src=ae235/231HK_P&$prodImageLarge$
-template: '{"NAME":"TCP_Plug","GPIO":[0,0,0,0,52,21,0,0,0,17,0,0,0],"FLAG":0,"BASE":45}'
+template: {"NAME":"TCP_Plug","GPIO":[0,0,0,0,52,21,0,0,0,17,0,0,0],"FLAG":0,"BASE":45}
link_alt:
---
diff --git a/_templates/teckin-sp20 b/_templates/teckin-sp20
index 824e93a35..8443bd860 100644
--- a/_templates/teckin-sp20
+++ b/_templates/teckin-sp20
@@ -6,7 +6,7 @@ type: Plug
standard: us
link: https://www.amazon.ca/gp/product/B07CZFDLXC
image: https://images-na.ssl-images-amazon.com/images/I/51Cd3ueE5-L._SL1001_.jpg
-template: '{"NAME":"TECKIN SP20","GPIO":[56,255,57,255,21,134,0,0,131,17,132,0,0],"FLAG":0,"BASE":45}'
+template: {"NAME":"TECKIN SP20","GPIO":[56,255,57,255,21,134,0,0,131,17,132,0,0],"FLAG":0,"BASE":45}
link_alt:
---
diff --git a/_templates/teckin_FL41 b/_templates/teckin_FL41
index 008969624..47d77e4aa 100644
--- a/_templates/teckin_FL41
+++ b/_templates/teckin_FL41
@@ -6,7 +6,7 @@ type: Light
standard: eu
link: https://www.amazon.de/gp/product/B07G35GN5R
image: https://images-na.ssl-images-amazon.com/images/I/516gJHfnY6L._SL1001_.jpg
-template: '{"NAME":"Teckin FL41","GPIO":[0,0,0,0,0,17,0,0,0,0,21,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"Teckin FL41","GPIO":[0,0,0,0,0,17,0,0,0,0,21,0,0],"FLAG":0,"BASE":18}
link_alt: https://fccid.io/2AQNX-FL41
---
diff --git a/_templates/teckin_SB50 b/_templates/teckin_SB50
index 6641d5812..4aed26691 100644
--- a/_templates/teckin_SB50
+++ b/_templates/teckin_SB50
@@ -1,19 +1,22 @@
---
-date_added: 2019-09-30
-title: Teckin SB50 v2
-category: light
-type: Bulb
-standard: uk
-link: https://www.amazon.co.uk/Dimmable-Multicolor-Required-TECKIN-Equivalent/dp/B07GTF2DN1
-image: https://images-na.ssl-images-amazon.com/images/I/51HhCAk5RaL._SX679_.jpg
-template: '{"NAME":"Teckin SB50","GPIO":[0,0,0,0,37,0,0,0,38,40,39,0,0],"FLAG":0,"BASE":18}'
+date_added: 2019-03-03
+title: Teckin SB50 7.5W
+type: RGBW
+category: bulb
+standard: E27
+link: https://www.amazon.ca/dp/B07KYJZ523
+image: https://images-na.ssl-images-amazon.com/images/I/51HhCAk5RaL._SX425_.jpg
+template: {"NAME":"Teckin SB50","GPIO":[0,0,0,0,40,0,0,0,38,39,37,0,0],"FLAG":0,"BASE":18}
link_alt:
---
-This was provided by Teckin directly as a "reward" for reviewing their SP23 plugs. (September 2019)
-
+Note: Although the product link shows E27, the model on the box is SB50
+On my recent bulb (Sept 2019) the template needed is:
+```
+{"NAME":"Teckin SB50","GPIO":[0,0,0,0,37,0,0,0,38,40,39,0,0],"FLAG":0,"BASE":18}
+```
diff --git a/_templates/teckin_SB50_v3 b/_templates/teckin_SB50-2
similarity index 59%
rename from _templates/teckin_SB50_v3
rename to _templates/teckin_SB50-2
index c5ace4cc9..0e826760b 100644
--- a/_templates/teckin_SB50_v3
+++ b/_templates/teckin_SB50-2
@@ -1,12 +1,12 @@
---
date_added: 2019-10-22
-title: Teckin SB50 V3
-category: light
-type: Bulb
-standard: global
+title: Teckin SB50-2 8W
+type: RGBCCT
+category: bulb
+standard: E27
link: https://www.amazon.com/gp/product/B07GT2Q5RW/
image: https://images-na.ssl-images-amazon.com/images/I/51HhCAk5RaL._SX679_.jpg
-template: '{"NAME":"Teckin SB50v3","GPIO":[0,0,0,0,37,40,0,0,38,41,39,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"Teckin SB50v3","GPIO":[0,0,0,0,37,40,0,0,38,41,39,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/teckin_SB50_v2 b/_templates/teckin_SB50_v2
new file mode 100644
index 000000000..52cf3341a
--- /dev/null
+++ b/_templates/teckin_SB50_v2
@@ -0,0 +1,19 @@
+---
+date_added: 2019-09-30
+title: Teckin SB50 v2 7.5W
+type: RGBW
+category: bulb
+standard: E27
+link: https://www.amazon.co.uk/Dimmable-Multicolor-Required-TECKIN-Equivalent/dp/B07GTF2DN1
+image: https://images-na.ssl-images-amazon.com/images/I/51HhCAk5RaL._SX679_.jpg
+template: {"NAME":"Teckin SB50","GPIO":[0,0,0,0,37,0,0,0,38,40,39,0,0],"FLAG":0,"BASE":18}
+link_alt:
+---
+
+This was provided by Teckin directly as a "reward" for reviewing their SP23 plugs. (September 2019)
+
+
+
+
+
+
diff --git a/_templates/teckin_SB50v1 b/_templates/teckin_SB50v1
deleted file mode 100644
index b37bd7063..000000000
--- a/_templates/teckin_SB50v1
+++ /dev/null
@@ -1,22 +0,0 @@
----
-date_added: 2019-03-03
-title: Teckin SB50
-category: light
-type: Bulb
-standard: global
-link: https://www.amazon.ca/dp/B07KYJZ523
-image: https://images-na.ssl-images-amazon.com/images/I/51HhCAk5RaL._SX425_.jpg
-template: '{"NAME":"Teckin SB50","GPIO":[0,0,0,0,40,0,0,0,38,39,37,0,0],"FLAG":0,"BASE":18}'
-link_alt:
----
-
-
-Note: Although the product link shows E27, the model on the box is SB50
-
-
-On my recent bulb (Sept 2019) the template needed is:
-```
-{"NAME":"Teckin SB50","GPIO":[0,0,0,0,37,0,0,0,38,40,39,0,0],"FLAG":0,"BASE":18}
-```
-
-
diff --git a/_templates/teckin_SB51 b/_templates/teckin_SB51
index ab73848af..4660d9276 100644
--- a/_templates/teckin_SB51
+++ b/_templates/teckin_SB51
@@ -1,12 +1,12 @@
---
date_added: 2019-04-17
title: Teckin SB51
-category: light
-type: Bulb
-standard: uk
+type: RGBW
+category: bulb
+standard: B22
link: https://www.amazon.co.uk/gp/product/B07K1J1RDS
image: https://user-images.githubusercontent.com/5904370/56267544-65a0d480-60ef-11e9-97f8-126c4053ae9e.png
-template: '{"NAME":"Teckin SB51","GPIO":[0,0,0,0,40,0,0,0,38,39,37,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"Teckin SB51","GPIO":[0,0,0,0,40,0,0,0,38,39,37,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/teckin_SB53 b/_templates/teckin_SB53
index b2059a467..a9ca87805 100644
--- a/_templates/teckin_SB53
+++ b/_templates/teckin_SB53
@@ -1,12 +1,12 @@
---
date_added: 2019-08-30
-title: Teckin SB53
-category: light
-type: Bulb
-standard: global
+title: Teckin SB53
+type: RGBCCT
+category: bulb
+standard: E27
link: https://www.amazon.co.uk/Changing-Equivalent-TECKIN-Compatible-Assistant/dp/B07RY2LHC1
image: https://images-na.ssl-images-amazon.com/images/I/41zfqZFBKhL._SL1000_.jpg
-template: '{"NAME":"Teckin SB53","GPIO":[0,0,0,0,37,40,0,0,38,41,39,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"Teckin SB53","GPIO":[0,0,0,0,37,40,0,0,38,41,39,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/teckin_SP10 b/_templates/teckin_SP10
index c4be42c7d..f6a592b9c 100644
--- a/_templates/teckin_SP10
+++ b/_templates/teckin_SP10
@@ -6,7 +6,7 @@ type: Plug
standard: us
link: https://www.amazon.com/gp/product/B079QKNYHM
image: https://images-na.ssl-images-amazon.com/images/I/51mTgHIhufL._SL1001_.jpg
-template: '{"NAME":"Teckin SP10","GPIO":[255,255,56,255,255,255,0,0,255,17,255,21,255],"FLAG":0,"BASE":18}'
+template: {"NAME":"Teckin SP10","GPIO":[255,255,56,255,255,255,0,0,255,17,255,21,255],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/teckin_SP21 b/_templates/teckin_SP21
index 0fa650e87..a46055873 100644
--- a/_templates/teckin_SP21
+++ b/_templates/teckin_SP21
@@ -6,7 +6,7 @@ type: Plug
standard: eu
link: https://www.amazon.de/Steckdose-TECKIN-funktioniert-Steurung-%C3%BCberall/dp/B07HHFKWJJ
image: https://user-images.githubusercontent.com/5904370/58085795-b3609f00-7bbd-11e9-800b-88a9ec1a43cb.png
-template: '{"NAME":"Teckin SP21","GPIO":[0,0,56,0,0,0,0,0,0,17,0,21,0],"FLAG":0,"BASE":45}'
+template: {"NAME":"Teckin SP21","GPIO":[0,0,56,0,0,0,0,0,0,17,0,21,0],"FLAG":0,"BASE":45}
link_alt:
---
diff --git a/_templates/teckin_SP22 b/_templates/teckin_SP22
index 59d7d56dd..394ecae81 100644
--- a/_templates/teckin_SP22
+++ b/_templates/teckin_SP22
@@ -5,7 +5,7 @@ type: Plug
standard: eu
link: https://www.teckinhome.com/copy-of-sp-23
image: https://user-images.githubusercontent.com/5904370/57954192-875dc900-78f2-11e9-885a-17dc201795f6.png
-template: '{"NAME":"Teckin","GPIO":[0,17,0,57,134,132,0,0,131,56,21,0,0],"FLAG":0,"BASE":52}'
+template: {"NAME":"Teckin","GPIO":[0,17,0,57,134,132,0,0,131,56,21,0,0],"FLAG":0,"BASE":52}
link_alt: https://www.amazon.de/TECKIN-Intelligente-fernbedienbar-Stromverbrauch-funktioniert/dp/B07CDCYLQ6
---
diff --git a/_templates/teckin_SP23 b/_templates/teckin_SP23
index 9b3f6439c..0e7815b4b 100644
--- a/_templates/teckin_SP23
+++ b/_templates/teckin_SP23
@@ -6,7 +6,7 @@ type: Plug
standard: uk
link: https://www.amazon.co.uk/TECKIN-Monitoring-Function-Anywhere-Required/dp/B07D7BH6N8
image: https://camo.githubusercontent.com/7d4ca69835d7b64fe60d1371fd97a5f36794a57e/68747470733a2f2f692e706f7374696d672e63632f30327852645748332f5445434b494e2d343139632d5271302d5536782d4c2d534c313030312e6a7067
-template: '{"NAME":"Teckin SP23","GPIO":[56,255,57,255,0,134,0,0,131,17,132,21,0],"FLAG":0,"BASE":45}'
+template: {"NAME":"Teckin SP23","GPIO":[56,255,57,255,0,134,0,0,131,17,132,21,0],"FLAG":0,"BASE":45}
link_alt:
---
diff --git a/_templates/teckin_SP25 b/_templates/teckin_SP25
index 2df1afcd3..04b73ddd5 100644
--- a/_templates/teckin_SP25
+++ b/_templates/teckin_SP25
@@ -6,7 +6,7 @@ type: Plug
standard: us
link: https://www.amazon.com/Compatible-Function-Required-Allliances-Overcharging/dp/B07G78YSQS
image: https://images-na.ssl-images-amazon.com/images/I/512Gy7t9t0L._SL1001_.jpg
-template: '{"NAME":"Teckin SP25","GPIO":[56,255,255,255,255,255,0,0,22,17,255,21,255],"FLAG":1,"BASE":18}'
+template: {"NAME":"Teckin SP25","GPIO":[56,255,255,255,255,255,0,0,22,17,255,21,255],"FLAG":1,"BASE":18}
link_alt:
---
diff --git a/_templates/teckin_SS42 b/_templates/teckin_SS42
index 3bcf0e679..1356d4801 100644
--- a/_templates/teckin_SS42
+++ b/_templates/teckin_SS42
@@ -6,7 +6,7 @@ type: Outdoor Plug
standard: eu
link: https://www.amazon.de/gp/product/B07RHPGNYM
image: https://user-images.githubusercontent.com/5904370/67770938-a2169b00-fa57-11e9-9e90-f576206d920a.png
-template: '{"NAME":"Teckin SS42","GPIO":[255,255,255,255,255,52,0,0,21,157,22,255,255],"FLAG":15,"BASE":18}'
+template: {"NAME":"Teckin SS42","GPIO":[255,255,255,255,255,52,0,0,21,157,22,255,255],"FLAG":15,"BASE":18}
link_alt:
---
diff --git a/_templates/teckin_sp27 b/_templates/teckin_sp27
index 700087d26..d47614ff8 100644
--- a/_templates/teckin_sp27
+++ b/_templates/teckin_sp27
@@ -6,7 +6,7 @@ type: Plug
standard: uk
link: https://www.amazon.co.uk/gp/product/B07JFJQ3ZP
image: https://images-na.ssl-images-amazon.com/images/I/51H575jJc5L._SL1001_.jpg
-template: '{"NAME":"Teckin SP27","GPIO":[56,255,255,255,255,255,0,0,255,17,255,21,255],"FLAG":0,"BASE":18}'
+template: {"NAME":"Teckin SP27","GPIO":[56,255,255,255,255,255,0,0,255,17,255,21,255],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/teckin_ss30 b/_templates/teckin_ss30
index 200c1c5b5..94dfed46c 100644
--- a/_templates/teckin_ss30
+++ b/_templates/teckin_ss30
@@ -6,7 +6,7 @@ type: Power Strip
standard: us
link: https://www.teckinhome.com/copy-of-sp-23-1
image: https://images-na.ssl-images-amazon.com/images/I/51E21BTODPL._SL1001_.jpg
-template: '{"NAME":"Teckin SS30","GPIO":[52,255,255,57,29,17,0,0,31,30,32,255,25],"FLAG":0,"BASE":18}'
+template: {"NAME":"Teckin SS30","GPIO":[52,255,255,57,29,17,0,0,31,30,32,255,25],"FLAG":0,"BASE":18}
link_alt: https://www.amazon.ca/dp/B07G179ZWS
---
diff --git a/_templates/teepao_curtain_switch b/_templates/teepao_curtain_switch
index 85157001a..03868900e 100644
--- a/_templates/teepao_curtain_switch
+++ b/_templates/teepao_curtain_switch
@@ -6,7 +6,7 @@ type: Curtain Switch
standard: eu
link: https://www.amazon.de/gp/product/B07H9PSQCN
image: https://images-na.ssl-images-amazon.com/images/I/51XUwB0IefL._SL1200_.jpg
-template: '{"NAME":"Taopao","GPIO":[255,255,255,18,22,19,0,0,255,21,255,255,17],"FLAG":1,"BASE":18}'
+template: {"NAME":"Taopao","GPIO":[255,255,255,18,22,19,0,0,255,21,255,255,17],"FLAG":1,"BASE":18}
link_alt:
---
diff --git a/_templates/teepao_schalter b/_templates/teepao_schalter
index 3a7c367dc..2a9520b2c 100644
--- a/_templates/teepao_schalter
+++ b/_templates/teepao_schalter
@@ -6,7 +6,7 @@ type: Switch
standard: eu
link: https://www.amazon.de/Generation-Rolladen-Zeitschaltuhr-Rolladenmotor-Rolladenantrieb/dp/B07H9PSQCN/
image: https://images-na.ssl-images-amazon.com/images/I/51QDcL470xL._SL1200_.jpg
-template: '{"NAME":"Teepao","GPIO":[158,58,23,18,22,19,0,0,56,21,57,0,17],"FLAG":0,"BASE":18}'
+template: {"NAME":"Teepao","GPIO":[158,58,23,18,22,19,0,0,56,21,57,0,17],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/tellur_TLL331031 b/_templates/tellur_TLL331031
index fc1a0f729..fd679d6ff 100644
--- a/_templates/tellur_TLL331031
+++ b/_templates/tellur_TLL331031
@@ -6,7 +6,7 @@ type: Power Strip
standard: eu
link: https://www.emag.ro/prelungitor-smart-tellur-wireless-3-prize-4-x-usb-2200w-10a-cablu-1-8m-alb-tll331031/pd/D6YK7VBBM/
image: https://www.tellur.com/wp-content/uploads/2018/08/TLL331031_1-696x696.jpg
-template: '{"NAME":"Tellur","GPIO":[0,56,0,17,22,21,0,0,0,23,24,0,0],"FLAG":1,"BASE":18}'
+template: {"NAME":"Tellur","GPIO":[0,56,0,17,22,21,0,0,0,23,24,0,0],"FLAG":1,"BASE":18}
link_alt: https://www.tellur.com/product/wifi-power-strip-3-outlets-4usb-4a-2200w-10a-1-8m/#prettyPhoto
---
diff --git a/_templates/tessan_A4L-BK b/_templates/tessan_A4L-BK
index 1386e4920..7ff596abd 100644
--- a/_templates/tessan_A4L-BK
+++ b/_templates/tessan_A4L-BK
@@ -6,7 +6,7 @@ type: Power Strip
standard: us
link: https://www.amazon.com/gp/product/B07D1KK92W
image: https://images-na.ssl-images-amazon.com/images/I/61EJ3baMnFL._SL1300_.jpg
-template: '{"NAME":"TESSAN A4L-BK","GPIO":[0,0,0,24,23,0,0,0,21,0,22,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"TESSAN A4L-BK","GPIO":[0,0,0,24,23,0,0,0,21,0,22,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/tflag_NX-SM100 b/_templates/tflag_NX-SM100
index 969b074a2..a5f8361eb 100644
--- a/_templates/tflag_NX-SM100
+++ b/_templates/tflag_NX-SM100
@@ -6,7 +6,7 @@ type: Plug
standard: eu
link: https://www.amazon.de/dp/B07FCBWTVQ?tag=papsmarthome3198896-21
image: https://images-na.ssl-images-amazon.com/images/I/41RiUIuoYSL._SL1001_.jpg
-template: '{"NAME":"NX-SM100","GPIO":[56,0,0,0,0,134,0,0,21,17,132,57,131],"FLAG":0,"BASE":18}'
+template: {"NAME":"NX-SM100","GPIO":[56,0,0,0,0,134,0,0,21,17,132,57,131],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/thrumm_XS-A11 b/_templates/thrumm_XS-A11
index ee6a8a6c7..fda989d80 100644
--- a/_templates/thrumm_XS-A11
+++ b/_templates/thrumm_XS-A11
@@ -6,7 +6,7 @@ type: Plug
standard: in
link: https://www.amazon.in/Thrumm-WiFi-Smart-Plug-White/dp/B07D5XTLDB
image: https://images-na.ssl-images-amazon.com/images/I/61Uhxg1JD4L._SL1500_.jpg
-template: '{"NAME":"THRUMM XS-A11 ","GPIO":[255,17,255,255,255,255,0,0,255,56,29,255,255],"FLAG":0,"BASE":18}'
+template: {"NAME":"THRUMM XS-A11 ","GPIO":[255,17,255,255,255,255,0,0,255,56,29,255,255],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/tiklok_dimmable b/_templates/tiklok_TL530-1P-CA
similarity index 70%
rename from _templates/tiklok_dimmable
rename to _templates/tiklok_TL530-1P-CA
index bbc1b3e5d..4c8266950 100644
--- a/_templates/tiklok_dimmable
+++ b/_templates/tiklok_TL530-1P-CA
@@ -1,14 +1,15 @@
---
date_added: 2019-10-02
-title: TikLOk 7.5W A19 E26
-category: light
-type: Bulb
-standard: us
+title: TikLOk TL530-1P-CA
+type: RGBW
+category: bulb
+standard: E26
link: https://www.amazon.ca/gp/product/B07FCCFC4T
image: https://images-na.ssl-images-amazon.com/images/I/41re%2Bs3qUoL._SL1000_.jpg
-template: '{"NAME":"TikLOk WW-CW-L","GPIO":[0,0,0,0,0,37,0,0,38,0,0,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"TikLOk WW-CW-L","GPIO":[0,0,0,0,0,37,0,0,38,0,0,0,0],"FLAG":0,"BASE":18}
link_alt:
---
+Reference: TL530-1P-CA
Tuya Convert compatible. (Oct 1, 2019) brand new stock.X001V8UTGL label on box.
diff --git a/_templates/timethinker_TK04 b/_templates/timethinker_TK04
index cd2a5e505..97c4c0518 100644
--- a/_templates/timethinker_TK04
+++ b/_templates/timethinker_TK04
@@ -6,7 +6,7 @@ type: Plug
standard: eu
link: https://www.aliexpress.com/item/33012294817.html
image: https://ae01.alicdn.com/kf/HTB1cU.FUkvoK1RjSZFNq6AxMVXa8/Timethinker-Smart-Wifi-Socket-In-Electrical-Plug-Smart-Home-Work-With-Apple-Homekit-US-EU-Smart.jpg_640x640.jpg
-template: '{"NAME":"TimethinkerEU","GPIO":[255,255,255,255,17,255,0,0,255,52,21,255,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"TimethinkerEU","GPIO":[255,255,255,255,17,255,0,0,255,52,21,255,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/timethinker_WS2 b/_templates/timethinker_WS2
index 9ca4ebaae..e398d0970 100644
--- a/_templates/timethinker_WS2
+++ b/_templates/timethinker_WS2
@@ -6,7 +6,7 @@ type: Plug
standard: eu
link: https://www.aliexpress.com/item/33012797322.html
image: https://user-images.githubusercontent.com/5904370/66717408-fb849600-edd8-11e9-834e-3eb4a1b994d8.png
-template: '{"NAME":"TimeThinkerWS2","GPIO":[0,0,0,0,17,0,0,0,0,52,21,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"TimeThinkerWS2","GPIO":[0,0,0,0,17,0,0,0,0,52,21,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/tomaxusa_HKWL-SO07W b/_templates/tomaxusa_HKWL-SO07W
index bc9b35a13..cb53886f8 100644
--- a/_templates/tomaxusa_HKWL-SO07W
+++ b/_templates/tomaxusa_HKWL-SO07W
@@ -6,7 +6,7 @@ type: Plug
standard: us
link:
image: https://p.globalsources.com/IMAGES/PDT/BIG/694/B1154350694.jpg
-template: '{"NAME":"HKWL-SO07W","GPIO":[17,255,255,255,255,255,0,0,255,255,21,255,56],"FLAG":0,"BASE":18}'
+template: {"NAME":"HKWL-SO07W","GPIO":[17,255,255,255,255,255,0,0,255,255,21,255,56],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/tonbux-amz180648 b/_templates/tonbux-amz180648
index f1f193a47..ba3db63a0 100644
--- a/_templates/tonbux-amz180648
+++ b/_templates/tonbux-amz180648
@@ -6,7 +6,7 @@ type: Switch
standard: us
link: https://www.amazon.com/gp/product/B07FFVG67H/
image: https://images-na.ssl-images-amazon.com/images/I/41U7qEEmDLL._SX679_.jpg
-template: '{"NAME":"Tonbux","GPIO":[17,255,255,255,255,0,0,0,21,56,255,0,0],"FLAG":0,"BASE":1}'
+template: {"NAME":"Tonbux","GPIO":[17,255,255,255,255,0,0,0,21,56,255,0,0],"FLAG":0,"BASE":1}
link_alt:
---
diff --git a/_templates/topersun_WL-SC01 b/_templates/topersun_WL-SC01
index 199e61b60..f88c8a217 100644
--- a/_templates/topersun_WL-SC01
+++ b/_templates/topersun_WL-SC01
@@ -6,7 +6,7 @@ type: Plug
standard: anzac
link: https://www.amazon.com.au/TOPERSUN-Electrical-Anywhere-Function-Compatible/dp/B07FM62NGS
image: https://images-na.ssl-images-amazon.com/images/I/51YGTWLyiBL._AC_SX679_.jpg
-template: '{"NAME":"Topersun ","GPIO":[0,0,0,0,52,0,0,0,21,0,17,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"Topersun ","GPIO":[0,0,0,0,52,0,0,0,21,0,17,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/topgreener_TGWF115APM-W b/_templates/topgreener_TGWF115APM-W
index 289a1da41..ebd1995a9 100644
--- a/_templates/topgreener_TGWF115APM-W
+++ b/_templates/topgreener_TGWF115APM-W
@@ -6,7 +6,7 @@ type: Plug
standard: us
link: https://www.amazon.com/gp/product/B07FDLBGQT
image: https://www.topgreener.com/Item%20Images/TGWF115APM-W_0001.jpg
-template: '{"NAME":"TGWF115APM-W","GPIO":[0,56,0,17,134,132,0,0,131,57,21,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"TGWF115APM-W","GPIO":[0,56,0,17,134,132,0,0,131,57,21,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/topgreener_TGWF15RM b/_templates/topgreener_TGWF15RM
index c7f2db807..3b04856fb 100644
--- a/_templates/topgreener_TGWF15RM
+++ b/_templates/topgreener_TGWF15RM
@@ -6,7 +6,7 @@ type: Wall Outlet
standard: us
link: https://www.amazon.com/TOPGREENER-Monitoring-Tamper-Resistant-Appliances-TGWF15RM/dp/B07BX13MLF
image: https://www.topgreener.com/Item%20Images/TGWF15RM-W_0001.jpg
-template: '{"NAME":"TGWF15RM","GPIO":[0,56,0,17,134,132,0,0,131,57,21,0,0],"FLAG":0,"BASE":55}'
+template: {"NAME":"TGWF15RM","GPIO":[0,56,0,17,134,132,0,0,131,57,21,0,0],"FLAG":0,"BASE":55}
link_alt: https://www.newegg.com/topgreener-tgwf15rm-wifi-wire-in-outlet-modules/p/35B-007S-00004
---
diff --git a/_templates/topmax_PS-1602 b/_templates/topmax_PS-1602
index 92177d43a..e53a74d37 100644
--- a/_templates/topmax_PS-1602
+++ b/_templates/topmax_PS-1602
@@ -6,7 +6,7 @@ type: Outdoor Plug
standard: us
link: https://amazon.com/gp/product/B07CGC9CW4
image: https://images-na.ssl-images-amazon.com/images/I/51Gr7ufxlYL._SX679_.jpg
-template: '{"NAME":"PS-1602","GPIO":[17,255,255,255,0,22,18,0,21,56,0,0,0],"FLAG":0,"BASE":29}'
+template: {"NAME":"PS-1602","GPIO":[17,255,255,255,0,22,18,0,21,56,0,0,0],"FLAG":0,"BASE":29}
link_alt:
---
diff --git a/_templates/torchstar b/_templates/torchstar
index 258df24e0..8ec2c37d5 100644
--- a/_templates/torchstar
+++ b/_templates/torchstar
@@ -6,7 +6,7 @@ type: LED Strip
standard: us
link: https://www.amazon.com/Lighting-Compatible-Dimmable-Daylight-Showcase/dp/B07DCSB7RJ
image: http://www.torchstar.us/media/catalog/product/cache/1/image/9df78eab33525d08d6e5fb8d27136e95/1/_/1_6__1_1.jpg
-template: '{"NAME":"Torchstar","GPIO":[0,0,0,0,52,0,0,0,0,0,0,37,53],"FLAG":1,"BASE":18}'
+template: {"NAME":"Torchstar","GPIO":[0,0,0,0,52,0,0,0,0,0,0,37,53],"FLAG":1,"BASE":18}
link_alt:
---
diff --git a/_templates/touch_2-gang_au b/_templates/touch_2-gang_au
index 1b0279134..b75888c22 100644
--- a/_templates/touch_2-gang_au
+++ b/_templates/touch_2-gang_au
@@ -6,7 +6,7 @@ type: Switch
standard: anzac
link: https://www.ebay.com.au/itm/Smart-Home-WiFi-Panel-Touch-Switch-Wall-Control-Light-For-Alexa-Google-Home-AU/292793195329?hash=item442bd59b41:m:mb826J75he1R1yYUORjzKKQ
image: https://image.pushauction.com/0/0/ccedd968-69cc-4a07-a5ef-f846e1b5c221/6314991f-3f7f-4a73-bc56-715bc707999e.jpg
-template: '{"NAME":"tuya_2_gang","GPIO":[52,0,0,0,18,0,0,0,17,21,255,22,29],"FLAG":0,"BASE":18}'
+template: {"NAME":"tuya_2_gang","GPIO":[52,0,0,0,18,0,0,0,17,21,255,22,29],"FLAG":0,"BASE":18}
link_alt:
---
Button 2 does not turn on to reflect the state of relay 2.
diff --git a/_templates/treatlife_SS01S b/_templates/treatlife_SS01S
index 0041211e7..3ab8f55c9 100644
--- a/_templates/treatlife_SS01S
+++ b/_templates/treatlife_SS01S
@@ -6,7 +6,7 @@ type: Switch
standard: us
link: https://www.amazon.com/Smart-Light-Switch-Treatlife-Installation/dp/B07R7PCCT9
image: https://images-na.ssl-images-amazon.com/images/I/619baPMeuhL._SL1500_.jpg
-template: '{"NAME":"TL SS01S Swtch","GPIO":[0,0,0,0,52,158,0,0,21,17,0,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"TL SS01S Swtch","GPIO":[0,0,0,0,52,158,0,0,21,17,0,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/utorch_PZE-911 b/_templates/utorch_PZE-911
index 51a683775..addb448bf 100644
--- a/_templates/utorch_PZE-911
+++ b/_templates/utorch_PZE-911
@@ -6,7 +6,7 @@ type: Light
standard: global
link: https://www.gearbest.com/smart-ceiling-lights/pp_009748680892.html
image: https://gloimg.gbtcdn.com/soa/gb/pdm-product-pic/Electronic/2018/09/03/goods_img_big-v32/20180903154832_22560.jpg
-template: '{"NAME":"Utorch PZE-911","GPIO":[0,0,0,0,0,0,0,0,38,0,37,0,0],"FLAG":0,"BASE":1}'
+template: {"NAME":"Utorch PZE-911","GPIO":[0,0,0,0,0,0,0,0,38,0,37,0,0],"FLAG":0,"BASE":1}
link_alt:
---
diff --git a/_templates/utorch_UT40 b/_templates/utorch_UT40
index f5f31cd52..14bb4497f 100644
--- a/_templates/utorch_UT40
+++ b/_templates/utorch_UT40
@@ -6,7 +6,7 @@ type: Light
standard: global
link: https://www.gearbest.com/smart-ceiling-lights/pp_009748680892.html
image: https://user-images.githubusercontent.com/5904370/66717793-502a1000-eddd-11e9-9b38-1295260c3854.png
-template: '{"NAME":"Utorch UT40","GPIO":[0,0,0,0,0,0,0,0,38,0,37,0,0],"FLAG":0,"BASE":1}'
+template: {"NAME":"Utorch UT40","GPIO":[0,0,0,0,0,0,0,0,38,0,37,0,0],"FLAG":0,"BASE":1}
link_alt:
---
diff --git a/_templates/v-tac_VT-5113 b/_templates/v-tac_VT-5113
index df3196d29..e9226cecf 100644
--- a/_templates/v-tac_VT-5113
+++ b/_templates/v-tac_VT-5113
@@ -1,12 +1,12 @@
---
date_added: 2019-11-24
title: V-Tac VT-5113
-category: light
-type: Bulb
-standard: eu
+type: RGBW
+category: bulb
+standard: E27
link: https://www.reichelt.de/smart-light-lampe-e27-11-w-rgbw-eek-a-wlan-vt-2752-p264529.html?&trstct=pos_0
image: https://cdn-reichelt.de/bilder/web/xxl_ws/L700/V-TAC_2752_01.png
-template: '{"NAME":"V-TAC LED A60 ","GPIO":[0,0,0,0,180,0,0,0,0,0,181,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"V-TAC LED A60 ","GPIO":[0,0,0,0,180,0,0,0,0,0,181,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/varna_crafts_16A b/_templates/varna_crafts_16A
index 50ad4f5b9..7b4ee395e 100644
--- a/_templates/varna_crafts_16A
+++ b/_templates/varna_crafts_16A
@@ -8,7 +8,7 @@ standard:
- za
link: https://www.amazon.in/gp/product/B07QK1ZRQK
image: https://user-images.githubusercontent.com/5904370/68044410-8faa9480-fcd7-11e9-8425-86c26fd53029.png
-template: '{"NAME":"VC Plug","GPIO":[157,0,0,0,0,134,0,0,131,17,132,21,0],"FLAG":0,"BASE":45}'
+template: {"NAME":"VC Plug","GPIO":[157,0,0,0,0,134,0,0,131,17,132,21,0],"FLAG":0,"BASE":45}
link_alt:
---
diff --git a/_templates/vaupan_X6P b/_templates/vaupan_X6P
index 63a8d5b3a..6c8d97bb4 100644
--- a/_templates/vaupan_X6P
+++ b/_templates/vaupan_X6P
@@ -6,7 +6,7 @@ type: Plug
standard: us
link: https://www.amazon.com/gp/product/B07TTPCRDV/ref=ppx_yo_dt_b_asin_title_o03_s00?ie=UTF8&psc=1
image: https://images-na.ssl-images-amazon.com/images/I/61siix1YdAL._AC_SL1500_.jpg
-template: '{"NAME":"Vaupan 10a X6P","GPIO":[0,0,56,0,0,0,0,0,0,17,0,21,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"Vaupan 10a X6P","GPIO":[0,0,56,0,0,0,0,0,0,17,0,21,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/vigica_VGSPK00815 b/_templates/vigica_VGSPK00815
index cfb94c92a..61935c8ce 100644
--- a/_templates/vigica_VGSPK00815
+++ b/_templates/vigica_VGSPK00815
@@ -6,7 +6,7 @@ type: Wall Outlet
standard: uk
link: https://www.amazon.co.uk/gp/product/B07GBQJSHK
image: https://images-na.ssl-images-amazon.com/images/I/51B4-LAUdBL._SL1000_.jpg
-template: '{"NAME":"VIGICA outlet","GPIO":[17,255,255,255,255,22,18,255,21,255,255,255,255],"FLAG":1,"BASE":18}'
+template: {"NAME":"VIGICA outlet","GPIO":[17,255,255,255,255,22,18,255,21,255,255,255,255],"FLAG":1,"BASE":18}
link_alt: https://www.ebay.co.uk/itm/VIGICA-2-1A-USB-Charger-13A-WiFi-Wall-Socket-Smart-Switch-Outlet-Plug-/283350487249
---
diff --git a/_templates/waga_CHCZ02MB b/_templates/waga_CHCZ02MB
index b7d18482f..154663303 100644
--- a/_templates/waga_CHCZ02MB
+++ b/_templates/waga_CHCZ02MB
@@ -5,6 +5,6 @@ type: Plug
standard: us
link: http://waga.life
image: https://user-images.githubusercontent.com/5904370/58197549-cb731400-7ccc-11e9-9ca9-4cb4f99b5296.png
-template: '{"NAME":"WAGA CHCZ02MB","GPIO":[57,0,0,131,0,134,0,0,21,17,132,56,0],"FLAG":0,"BASE":68}'
+template: {"NAME":"WAGA CHCZ02MB","GPIO":[57,0,0,131,0,134,0,0,21,17,132,56,0],"FLAG":0,"BASE":68}
link_alt: https://www.amazon.com/Wireless-socket-Amazon-Control-Sockets/dp/B07D2XGTKS
---
\ No newline at end of file
diff --git a/_templates/waza10a b/_templates/waza10a
index 0c7e3c949..690db75c9 100644
--- a/_templates/waza10a
+++ b/_templates/waza10a
@@ -5,5 +5,5 @@ type: Plug
standard: eu
link: https://www.amazon.it/gp/product/B07BXTYVJ9
image: https://images-na.ssl-images-amazon.com/images/I/61WDnRuSa4L._SL1500_.jpg
-template: '{"NAME":"WAZA","GPIO":[0,0,0,0,21,17,0,0,56,0,0,0,0],"FLAG":1,"BASE":18}'
+template: {"NAME":"WAZA","GPIO":[0,0,0,0,21,17,0,0,56,0,0,0,0],"FLAG":1,"BASE":18}
---
diff --git a/_templates/waza_JH-&01B b/_templates/waza_JH-&01B
index adc1f2c4d..d8d501dd8 100644
--- a/_templates/waza_JH-&01B
+++ b/_templates/waza_JH-&01B
@@ -6,7 +6,7 @@ type: Plug
standard: uk
link: https://www.amazon.co.uk/gp/product/B07HT7MCXP
image: https://images-na.ssl-images-amazon.com/images/I/61XWCGdBU3L._SL1500_.jpg
-template: '{"NAME":"Teckin SP27","GPIO":[255,255,255,255,53,255,0,0,21,17,255,255,255],"FLAG":0,"BASE":18}'
+template: {"NAME":"Teckin SP27","GPIO":[255,255,255,255,53,255,0,0,21,17,255,255,255],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/waza_JH-G01E b/_templates/waza_JH-G01E
index 2167521c8..27d7d6a95 100644
--- a/_templates/waza_JH-G01E
+++ b/_templates/waza_JH-G01E
@@ -6,7 +6,7 @@ type: Plug
standard: eu
link: https://www.lightinthebox.com/nl/p/smart-plug-for-slaapkamer-woonkamer-origineel-keukengerei-100-240v-smart_p6593540.html?prm=1.5.1.1
image: https://li0.rightinthebox.com/desc_image/201803/kljzxi1522132895548.jpg
-template: '{"NAME":"Waza JH-G01E","GPIO":[0,0,0,0,52,0,0,0,21,17,0,0,0],"FLAG":1,"BASE":18}'
+template: {"NAME":"Waza JH-G01E","GPIO":[0,0,0,0,52,0,0,0,21,17,0,0,0],"FLAG":1,"BASE":18}
link_alt: https://www.miniinthebox.com/nl/p/smart-plug-for-slaapkamer-woonkamer-origineel-keukengerei-100-240v-smart_p6593540.html?prm=2.5.1.1
---
diff --git a/_templates/wemos_relay_module b/_templates/wemos_relay_module
index 64dd3902d..cadf0d1a9 100644
--- a/_templates/wemos_relay_module
+++ b/_templates/wemos_relay_module
@@ -1,12 +1,12 @@
---
date_added: 2019-05-08
title: Wemos Module 10A
-category: relay
+category: switch
type: Relay
standard: global
link: https://www.banggood.com/Wemos-ESP8266-Development-Board-WIFI-Relay-Module-220V-10A-Relay-p-1436275.html
image: https://img.staticbg.com/images/oaupload/banggood/images/AC/25/ea80f17f-2906-4ddd-8660-b2a177c7da92.jpg
-template: '{"NAME":"WeMos Relay","GPIO":[17,255,52,255,21,255,0,0,255,255,255,255,255],"FLAG":0,"BASE":18}'
+template: {"NAME":"WeMos Relay","GPIO":[17,255,52,255,21,255,0,0,255,255,255,255,255],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/winpro_next b/_templates/winpro_next
index bdadb3b07..c935e6213 100644
--- a/_templates/winpro_next
+++ b/_templates/winpro_next
@@ -6,7 +6,7 @@ type: Light
standard: in
link: https://www.amazon.in/dp/B07P7JNQ56
image: https://images-na.ssl-images-amazon.com/images/I/71g1EjcZQ0L._SL1500_.jpg
-template: '{"NAME":"WIPROBatten","GPIO":[0,0,0,0,0,37,0,0,0,47,0,0,0],"FLAG":1,"BASE":18}'
+template: {"NAME":"WIPROBatten","GPIO":[0,0,0,0,0,37,0,0,0,47,0,0,0],"FLAG":1,"BASE":18}
link_alt:
---
diff --git a/_templates/wion_outlet b/_templates/wion_outlet
index 81083bedf..844c5738c 100644
--- a/_templates/wion_outlet
+++ b/_templates/wion_outlet
@@ -5,7 +5,7 @@ type: Plug
standard: us
link: https://www.amazon.com/gp/product/B00ZYLUBJU
image: https://user-images.githubusercontent.com/5904370/57890132-11485c00-7837-11e9-8158-18847f79a60f.png
-template: '{"NAME":"WiOn","GPIO":[255,0,52,0,0,0,0,0,255,17,0,21,0],"FLAG":0,"BASE":17}'
+template: {"NAME":"WiOn","GPIO":[255,0,52,0,0,0,0,0,255,17,0,21,0],"FLAG":0,"BASE":17}
link_alt:
---
## Serial Flashing
diff --git a/_templates/wipro_garnet_12W_B22 b/_templates/wipro_garnet_12W_B22
deleted file mode 100644
index d6769eb90..000000000
--- a/_templates/wipro_garnet_12W_B22
+++ /dev/null
@@ -1,19 +0,0 @@
----
-date_added: 2019-11-23
-title: Wipro Garnet 12W B22
-category: light
-type: Bulb
-standard: in
-link: https://www.amazon.in/gp/product/B07S5TH6BN
-image: https://www.wiproconsumerlighting.com/sites/default/files/Wipro_9W-Smart-Bulb.png
-template: '{"NAME":"WiproSmartBulb","GPIO":[0,0,0,0,37,40,0,0,38,41,39,0,0],"FLAG":0,"BASE":18}'
-link_alt:
----
-
-Same as Wipro Garnet 9W bulb, but swapped GPIO5 and GPIO13
-
-
-
-
-
-
diff --git a/_templates/wipro_garnet_B22_9W b/_templates/wipro_garnet_B22_9W
deleted file mode 100644
index 344fa890d..000000000
--- a/_templates/wipro_garnet_B22_9W
+++ /dev/null
@@ -1,14 +0,0 @@
----
-date_added: 2019-06-06
-title: Wipro Garnet B22 9W
-category: light
-type: Bulb
-standard: in
-link: https://www.amazon.in/gp/product/B07PD4DW17
-image: https://www.wiproconsumerlighting.com/sites/default/files/Wipro_9W-Smart-Bulb.png
-template: '{"NAME":"WiproSmartBulb","GPIO":[0,0,0,0,37,41,0,0,38,40,39,0,0],"FLAG":0,"BASE":18}'
-link_alt:
----
-
-Same as electriQ RGBW B22 Bulb - but the color temp seems inverted
-
diff --git a/_templates/wipro_garnet_NS7001 b/_templates/wipro_garnet_NS7001
new file mode 100644
index 000000000..a977443b1
--- /dev/null
+++ b/_templates/wipro_garnet_NS7001
@@ -0,0 +1,19 @@
+---
+date_added: 2019-11-23
+title: Wipro Garnet NS7001 7W
+type: RGB
+category: bulb
+standard: B22
+link: https://www.amazon.in/Enabled-12-Watt-Million-Compatible-Assistant/dp/B07S5TH6BN
+image: https://images-na.ssl-images-amazon.com/images/I/61S9XsagcDL._AC_SL1200_.jpg
+template: {"NAME":"WiproSmartBulb","GPIO":[0,0,0,0,37,40,0,0,38,41,39,0,0],"FLAG":0,"BASE":18}
+link_alt:
+---
+
+Same as Wipro Garnet 9W bulb, but swapped GPIO5 and GPIO13
+
+
+
+
+
+
diff --git a/_templates/wipro_garnet_NS9001 b/_templates/wipro_garnet_NS9001
new file mode 100644
index 000000000..e21b43108
--- /dev/null
+++ b/_templates/wipro_garnet_NS9001
@@ -0,0 +1,14 @@
+---
+date_added: 2019-06-06
+title: Wipro Garnet NS9001 9W
+type: RGBCCT
+category: bulb
+standard: B22
+link: https://www.amazon.in/gp/product/B07PD4DW17
+image: https://images-na.ssl-images-amazon.com/images/I/71Y3lsKoFUL._AC_SL1500_.jpg
+template: {"NAME":"WiproSmartBulb","GPIO":[0,0,0,0,37,41,0,0,38,40,39,0,0],"FLAG":0,"BASE":18}
+link_alt:
+---
+
+Same as electriQ RGBW B22 Bulb - but the color temp seems inverted
+
diff --git a/_templates/wipro_garnet_9W_B22_CT b/_templates/wipro_garnet_NS9100
similarity index 52%
rename from _templates/wipro_garnet_9W_B22_CT
rename to _templates/wipro_garnet_NS9100
index 44adc9592..36a0f4a1b 100644
--- a/_templates/wipro_garnet_9W_B22_CT
+++ b/_templates/wipro_garnet_NS9100
@@ -1,12 +1,12 @@
---
date_added: 2019-11-23
-title: Wipro Garnet 9W B22 CT
-category: light
-type: Bulb
-standard: in
+title: Wipro Garnet NS9100 9W
+type: CCT
+category: bulb
+standard: B22
link: https://www.amazon.in/gp/product/B07WZNNYDM
-image: https://images-na.ssl-images-amazon.com/images/I/71uVMdkGigL._SL1500_.jpg
-template: '{"NAME":"WiproSmartBulb","GPIO":[0,0,0,0,38,38,0,0,37,37,0,0,0],"FLAG":0,"BASE":18}'
+image: https://images-na.ssl-images-amazon.com/images/I/71uVMdkGigL._AC_SL1500_.jpg
+template: {"NAME":"WiproSmartBulb","GPIO":[0,0,0,0,38,38,0,0,37,37,0,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/wisdom_ZY_ACU02 b/_templates/wisdom_ZY_ACU02
index 5859468a8..320d73357 100644
--- a/_templates/wisdom_ZY_ACU02
+++ b/_templates/wisdom_ZY_ACU02
@@ -6,7 +6,7 @@ type: Plug
standard: us
link: https://www.amazon.com/gp/product/B07PF41CLZ/ref=ppx_yo_dt_b_search_asin_title?ie=UTF8&psc=1
image: https://images-na.ssl-images-amazon.com/images/I/71uVW%2BRvHQL._SL1500_.jpg
-template: '{"NAME":"ZY-ACU02","GPIO":[255,255,255,52,22,21,0,0,31,17,32,255,255],"FLAG":15,"BASE":18}'
+template: {"NAME":"ZY-ACU02","GPIO":[255,255,255,52,22,21,0,0,31,17,32,255,255],"FLAG":15,"BASE":18}
link_alt: https://www.aliexpress.com/i/4000106627197.html
---
diff --git a/_templates/witty_cloud b/_templates/witty_cloud
index 063cbadb4..8029bfc91 100644
--- a/_templates/witty_cloud
+++ b/_templates/witty_cloud
@@ -5,7 +5,7 @@ type: DIY
standard: global
link: https://www.aliexpress.com/af/witty-cloud.html?site=glo&g=y&d=y&origin=n&spm=2114.search0604.0.0.1e943181ijfCjr&filterCat=400103%2C153713&jump=afs&groupsort=1&SortType=price_asc&SearchText=witty+cloud&initiative_id=SB_20190517094810&isViewCP=y
image: https://user-images.githubusercontent.com/5904370/57946364-6b4f2d00-78dc-11e9-897c-0e5ec0d74860.png
-template: '{"NAME":"Witty Cloud","GPIO":[255,255,56,255,17,255,0,0,38,39,255,37,255],"FLAG":1,"BASE":32}'
+template: {"NAME":"Witty Cloud","GPIO":[255,255,56,255,17,255,0,0,38,39,255,37,255],"FLAG":1,"BASE":32}
link_alt: https://www.amazon.com/Sunhokey-ESP8266-Serial-Development-ESP-12F/dp/B07BRNQHC1
---
diff --git a/_templates/woopower-e14 b/_templates/woopower-e14
index 2a76df01f..015b029af 100644
--- a/_templates/woopower-e14
+++ b/_templates/woopower-e14
@@ -1,23 +1,11 @@
---
date_added: 2019-03-14
-title: Woopower RGBW E14 5W
-category: light
-type: Bulb
-standard: eu
+title: Woopower 5W
+type: RGBW
+category: bulb
+standard: E14
link: https://www.aliexpress.com/item/E14-WiFi-LED-Candle-Bulbs-Bedroom-Home-Light-RGB-5W-Led-Smart-Bulb-For-Alexa-Google/32966023980.html
image: https://user-images.githubusercontent.com/5904370/54396962-14975e00-46b5-11e9-82dd-dc95ac588e84.png
-template: '{"NAME":"Woopower E14","GPIO":[0,0,0,0,0,0,0,0,0,143,0,144,0],"FLAG":0,"BASE":27}'
+template: {"NAME":"Woopower E14","GPIO":[0,0,0,0,0,0,0,0,0,143,0,144,0],"FLAG":0,"BASE":27}
link_alt:
---
-- Specifications:
-- Material: Aluminum alloy+PC.
-- Beam angle: 180 degree.
-- CRI: >80Ra (vivid and natural light)
-- Voltage: 85-265V
-- Wattage: 5W
-- Colour: 6000K+RGB
-- Luminous Intensity: 460LM
-- LED Working Temperature: -25 degree - +45 degree
-- Lifespan: 30,000 hours
-- Bulb connector: E14
-- Size: 40*118mm
diff --git a/_templates/woox_R4026 b/_templates/woox_R4026
index 9ea2dead1..639fe8816 100644
--- a/_templates/woox_R4026
+++ b/_templates/woox_R4026
@@ -6,7 +6,7 @@ type: Plug
standard: eu
link: https://www.amazon.de/gp/product/B07GFNFBGP/
image: https://user-images.githubusercontent.com/5904370/66717441-5e762d00-edd9-11e9-9b65-27adea758d65.png
-template: '{"NAME":"WOOX R4026","GPIO":[0,0,0,17,0,0,0,0,0,56,21,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"WOOX R4026","GPIO":[0,0,0,17,0,0,0,0,0,56,21,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/woox_R4028 b/_templates/woox_R4028
index f897d06b2..5f38fb8c2 100644
--- a/_templates/woox_R4028
+++ b/_templates/woox_R4028
@@ -6,7 +6,7 @@ type: Power Strip
standard: eu
link: https://www.amazon.de/Woox-Smart-Steckdosenleiste-kompatibel-Amazon/dp/B07GFNL67Z/
image: https://images-na.ssl-images-amazon.com/images/I/41bkmbxX4UL._SX679_.jpg
-template: '{"NAME":"Woox R4028","GPIO":[0,56,0,17,23,22,0,0,0,24,21,0,0],"FLAG":1,"BASE":18}'
+template: {"NAME":"Woox R4028","GPIO":[0,56,0,17,23,22,0,0,0,24,21,0,0],"FLAG":1,"BASE":18}
link_alt:
---
diff --git a/_templates/woox_R4553 b/_templates/woox_R4553
index 152c96613..4de862b7d 100644
--- a/_templates/woox_R4553
+++ b/_templates/woox_R4553
@@ -1,12 +1,12 @@
---
date_added: 2019-11-07
title: WOOX R4553
-category: light
-type: Bulb
-standard: eu
+type: RGBW
+category: bulb
+standard: E27
link: https://wooxhome.com/lighting-c1/woox-r4553-smart-bulb-e27-p10
image: https://wooxhome.com/images/woox-r4553-smart-bulb-e27-p10-163_image.jpg
-template: '{"NAME":"WOOX R4553","GPIO":[0,0,0,0,37,40,0,0,38,0,39,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"WOOX R4553","GPIO":[0,0,0,0,37,40,0,0,38,0,39,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/woox_R4785 b/_templates/woox_R4785
index b30bb7084..86c993c64 100644
--- a/_templates/woox_R4785
+++ b/_templates/woox_R4785
@@ -6,7 +6,7 @@ type: Plug
standard: uk
link: https://wooxhome.com/power-c2/woox-r4785-smart-plug-uk-p9
image: https://wooxhome.com/images/woox-r4785-smart-plug-uk-p9-85_medium.jpg
-template: '{"NAME":"WooxR4785","GPIO":[0,0,0,0,52,21,0,0,0,17,0,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"WooxR4785","GPIO":[0,0,0,0,52,21,0,0,0,17,0,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/wsiiroon b/_templates/wsiiroon
index cfb377b1b..e7f56b438 100644
--- a/_templates/wsiiroon
+++ b/_templates/wsiiroon
@@ -6,7 +6,7 @@ type: Plug
standard: eu
link: https://www.amazon.de/gp/product/B07KSZ1MSM
image: https://images-na.ssl-images-amazon.com/images/I/61uwAhTjbgL._AC_SL1500_.jpg
-template: '{"NAME":"WSIIROON","GPIO":[0,0,0,0,17,56,0,0,21,0,0,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"WSIIROON","GPIO":[0,0,0,0,17,56,0,0,21,0,0,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/xenon_SM-S0301 b/_templates/xenon_SM-S0301
index 5f55bbd87..f495104db 100644
--- a/_templates/xenon_SM-S0301
+++ b/_templates/xenon_SM-S0301
@@ -6,7 +6,7 @@ type: Power Strip
standard: us
link: https://www.amazon.ca/gp/product/B07K9LGGVG
image: https://user-images.githubusercontent.com/34340210/64914301-089c5f80-d71d-11e9-86b7-b200f83f8d37.jpg
-template: '{"NAME":"SM-SO301","GPIO":[52,255,255,57,29,17,0,0,31,30,32,255,25],"FLAG":0,"BASE":18}'
+template: {"NAME":"SM-SO301","GPIO":[52,255,255,57,29,17,0,0,31,30,32,255,25],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/xenon_sm-sw102-2 b/_templates/xenon_sm-sw102-2
index f5dd4c869..811dec78f 100644
--- a/_templates/xenon_sm-sw102-2
+++ b/_templates/xenon_sm-sw102-2
@@ -6,7 +6,7 @@ type: Switch
standard: us
link: https://www.amazon.com/Tempered-Controlled-Separately-Standard-Compatible/dp/B0719Q5G5B
image: https://user-images.githubusercontent.com/5904370/54644416-85fe5480-4a99-11e9-8f0a-ece4a8640e45.png
-template: '{"NAME":"SM SW102","GPIO":[255,255,255,18,22,255,0,0,17,21,255,255,255],"FLAG":0,"BASE":18}'
+template: {"NAME":"SM SW102","GPIO":[255,255,255,18,22,255,0,0,17,21,255,255,255],"FLAG":0,"BASE":18}
link_alt: https://www.amazon.ca/SM-SW102-Tempered-Wireless-Compatible-Assistant/dp/B07KFVYMPT
---
I didn't spot any headers, but device has a sub-board with an ESP-12 module on it. Solder right to the 3.3V, Ground, TX, RX, and GPIO pins and flash away. I set the device up as a generic device with the following assignments.
diff --git a/_templates/xmrj b/_templates/xmrj
deleted file mode 100644
index ff45177c6..000000000
--- a/_templates/xmrj
+++ /dev/null
@@ -1,19 +0,0 @@
----
-date_added: 2019-09-22
-title: XMRJ
-category: light
-type: Bulb
-standard: eu
-link: https://www.amazon.fr/gp/product/B07PBG6S5S/
-image: https://user-images.githubusercontent.com/49731213/65392969-5a776200-dd7b-11e9-817f-a8d760aaecf1.jpg
-template: '{"NAME":"XMRJ","GPIO":[0,0,0,0,0,0,0,0,0,143,0,144,0],"FLAG":0,"BASE":27}'
-link_alt:
----
-
-Similar to AI Light. Can be tuya-converted.
-
-
-
-
-
-
diff --git a/_templates/xs-ssa05 b/_templates/xs-ssa05
index f0822c53a..83cfb672c 100644
--- a/_templates/xs-ssa05
+++ b/_templates/xs-ssa05
@@ -5,7 +5,7 @@ type: Plug
standard: us
link: https://www.amazon.com/gp/product/B07KP3HQR4
image: https://raw.githubusercontent.com/DavinKD/SmartThings/master/DeviceImages/XS-SSA05.jpg
-template: '{"NAME":"XS-SSA05","GPIO":[30,255,255,131,255,133,0,0,21,17,132,31,255],"FLAG":1,"BASE":18}'
+template: {"NAME":"XS-SSA05","GPIO":[30,255,255,131,255,133,0,0,21,17,132,31,255],"FLAG":1,"BASE":18}
link_alt:
---
diff --git a/_templates/yagala b/_templates/yagala
index a24d4158b..26f63090f 100644
--- a/_templates/yagala
+++ b/_templates/yagala
@@ -6,7 +6,7 @@ type: Power Strip
standard: us
link: https://www.amazon.com/gp/product/B07PC14L9B
image: https://images-na.ssl-images-amazon.com/images/I/51vBeFv7bIL._SL1200_.jpg
-template: '{"NAME":"Yagala","GPIO":[0,0,0,17,22,24,0,0,23,25,21,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"Yagala","GPIO":[0,0,0,17,22,24,0,0,23,25,21,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/yagala_SWB3 b/_templates/yagala_SWB3
index 3041070b4..a48208054 100644
--- a/_templates/yagala_SWB3
+++ b/_templates/yagala_SWB3
@@ -6,7 +6,7 @@ type: Power Strip
standard: uk
link: https://www.amazon.co.uk/gp/product/B07R7H6RT5
image: https://images-na.ssl-images-amazon.com/images/I/511KSaQSxWL._SL1001_.jpg
-template: '{"NAME":"YAGALA SWB3","GPIO":[0,0,53,0,0,23,0,0,21,0,22,24,0],"FLAG":1,"BASE":18}'
+template: {"NAME":"YAGALA SWB3","GPIO":[0,0,53,0,0,23,0,0,21,0,22,24,0],"FLAG":1,"BASE":18}
link_alt:
---
diff --git a/_templates/yagala_SWB3_v2 b/_templates/yagala_SWB3_v2
index 929094bfb..388b5dee6 100644
--- a/_templates/yagala_SWB3_v2
+++ b/_templates/yagala_SWB3_v2
@@ -6,7 +6,7 @@ type: Power Strip
standard: uk
link: https://www.amazon.co.uk/gp/product/B07R7H6RT5/ref=ppx_yo_dt_b_asin_title_o01_s00?ie=UTF8&psc=1
image: https://images-na.ssl-images-amazon.com/images/I/511KSaQSxWL._SY355_.jpg
-template: '{"NAME":"YAGALA SWB3","GPIO":[157,0,53,0,0,23,0,0,21,17,22,24,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"YAGALA SWB3","GPIO":[157,0,53,0,0,23,0,0,21,17,22,24,0],"FLAG":0,"BASE":18}
link_alt: https://www.amazon.co.uk/gp/product/B07STZYG9X/ref=ppx_yo_dt_b_asin_title_o07_s00?ie=UTF8&psc=1
---
diff --git a/_templates/yapmor_1gang b/_templates/yapmor_1gang
index 4e4026373..b3e9eb0ac 100644
--- a/_templates/yapmor_1gang
+++ b/_templates/yapmor_1gang
@@ -6,7 +6,7 @@ type: Switch
standard: eu
link: https://www.amazon.de/gp/product/B07GQW64T7/
image: https://user-images.githubusercontent.com/5904370/68812348-131e9b00-0673-11ea-901c-e4d69f28b782.png
-template: '{"NAME":"YAPMOR 1CH","GPIO":[17,255,255,255,0,0,0,0,21,56,0,0,0],"FLAG":0,"BASE":28}'
+template: {"NAME":"YAPMOR 1CH","GPIO":[17,255,255,255,0,0,0,0,21,56,0,0,0],"FLAG":0,"BASE":28}
link_alt:
---
diff --git a/_templates/yelomin_JH-G01E b/_templates/yelomin_JH-G01E
index 6781a3709..7407602e0 100644
--- a/_templates/yelomin_JH-G01E
+++ b/_templates/yelomin_JH-G01E
@@ -6,7 +6,7 @@ type: Plug
standard: eu
link: https://www.amazon.de/YELOMIN-Intelligente-Fernbedienbar-Stromverbrauch-Kompatibel/dp/B07Q5YFQR9
image: https://images-na.ssl-images-amazon.com/images/I/61yd7Fkg7PL._AC_SX569_.jpg
-template: '{"NAME":"Yelomin","GPIO":[0,145,0,146,0,0,0,0,17,56,21,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"Yelomin","GPIO":[0,145,0,146,0,0,0,0,17,56,21,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/yeron-us101 b/_templates/yeron-us101
index ec3e89087..c0a19e1c4 100644
--- a/_templates/yeron-us101
+++ b/_templates/yeron-us101
@@ -6,7 +6,7 @@ type: Plug
standard: us
link: https://www.amazon.com/gp/product/B07DP12DQP
image: https://images-na.ssl-images-amazon.com/images/I/51XjHkiaVrL._SL1203_.jpg
-template: '{"NAME":"YERON_US101","GPIO":[255,255,255,17,133,132,0,0,131,56,21,255,255],"FLAG":0,"BASE":18}'
+template: {"NAME":"YERON_US101","GPIO":[255,255,255,17,133,132,0,0,131,56,21,255,255],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/youngzuth_3in1 b/_templates/youngzuth_3in1
index 73bb26bfa..68f5af2e1 100644
--- a/_templates/youngzuth_3in1
+++ b/_templates/youngzuth_3in1
@@ -6,7 +6,7 @@ type: Switch
standard: us
link: https://www.amazon.com/gp/product/B07Q5XPRKD
image: https://images-na.ssl-images-amazon.com/images/I/419VfpnDm9L._SL1000_.jpg
-template: '{"NAME":"SW02 3W","GPIO":[52,0,255,19,23,18,0,0,17,21,255,22,255],"FLAG":0,"BASE":18}'
+template: {"NAME":"SW02 3W","GPIO":[52,0,255,19,23,18,0,0,17,21,255,22,255],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/youngzuth_SW02 b/_templates/youngzuth_SW02
index 3e9b296aa..f5970d058 100644
--- a/_templates/youngzuth_SW02
+++ b/_templates/youngzuth_SW02
@@ -6,7 +6,7 @@ type: Switch
standard: us
link: https://www.amazon.com/gp/product/B07BTBZ69B
image: https://images-na.ssl-images-amazon.com/images/I/410cYdpO7AL._SL1001_.jpg
-template: '{"NAME":"SW02 2W","GPIO":[52,255,255,9,21,255,0,0,10,22,255,255,255],"FLAG":0,"BASE":18}'
+template: {"NAME":"SW02 2W","GPIO":[52,255,255,9,21,255,0,0,10,22,255,255,255],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/ytf_ir_bridge b/_templates/ytf_ir_bridge
index 94b8e0662..beacd7e95 100644
--- a/_templates/ytf_ir_bridge
+++ b/_templates/ytf_ir_bridge
@@ -5,7 +5,7 @@ type: IR Bridge
standard: global
link: https://www.aliexpress.com/item/32951202513.html
image: https://user-images.githubusercontent.com/5904370/57956262-b414df00-78f8-11e9-93d8-709995e2c8df.png
-template: '{"NAME":"YTF IR Bridge","GPIO":[255,255,255,255,56,51,0,0,0,17,8,0,0],"FLAG":0,"BASE":62}'
+template: {"NAME":"YTF IR Bridge","GPIO":[255,255,255,255,56,51,0,0,0,17,8,0,0],"FLAG":0,"BASE":62}
link_alt: https://www.amazon.com/gp/product/B07H46LJZK
---
diff --git a/_templates/yuanguo_4AC_2USB b/_templates/yuanguo_4AC_2USB
index 829f7cdc1..d37e86c7b 100644
--- a/_templates/yuanguo_4AC_2USB
+++ b/_templates/yuanguo_4AC_2USB
@@ -6,7 +6,7 @@ type: Power Strip
standard: eu
link: https://www.amazon.it/Multipresa-Yuanguo-Intelligente-Controllo-Compatibile/dp/B07L3FMYSQ
image: http://www.yuanguotec.com/data/up/78/97/78ae49d97d07e1df.jpg
-template: '{"NAME":"YUANGUO","GPIO":[13,20,0,24,19,18,0,0,17,22,21,23,157],"FLAG":0,"BASE":1}'
+template: {"NAME":"YUANGUO","GPIO":[13,20,0,24,19,18,0,0,17,22,21,23,157],"FLAG":0,"BASE":1}
link_alt:
---
diff --git a/_templates/yuanguou_strip b/_templates/yuanguou_strip
index 233b01d33..4ad7311fe 100644
--- a/_templates/yuanguou_strip
+++ b/_templates/yuanguou_strip
@@ -6,7 +6,7 @@ type: Power Strip
standard: eu
link: https://www.amazon.fr/Yuanguo-Intelligente-Ind%C3%A9pendants-Interrupteur-Compactible/dp/B07L3FMYSQ
image: https://images-na.ssl-images-amazon.com/images/I/51zdMb28IUL._SL1100_.jpg
-template: '{"NAME":"YUANGUO","GPIO":[0,20,0,24,19,18,0,0,17,22,21,23,0],"FLAG":0,"BASE":1}'
+template: {"NAME":"YUANGUO","GPIO":[0,20,0,24,19,18,0,0,17,22,21,23,0],"FLAG":0,"BASE":1}
link_alt:
---
diff --git a/_templates/yunshan b/_templates/yunshan
index e4b9dd73c..11cce1671 100644
--- a/_templates/yunshan
+++ b/_templates/yunshan
@@ -1,13 +1,13 @@
---
date_added: 2019-03-02
title: Yunshan 10A 7-30VDC
-category: relay
+category: switch
type: Relay
standard: global
tags: relay diy
link: https://www.banggood.com/ESP8266-10A-220V-Network-Relay-WIFI-Module-Input-DC-7V30V-p-1089200.html
image: https://img.staticbg.com/thumb/large/oaupload/banggood/images/9C/4F/be1cc42e-0a08-4a00-b097-8c001600f677.JPG
-template: '{"NAME":"Yunshan Relay","GPIO":[0,255,56,255,21,17,0,0,0,0,0,0,0],"FLAG":0,"BASE":33}'
+template: {"NAME":"Yunshan Relay","GPIO":[0,255,56,255,21,17,0,0,0,0,0,0,0],"FLAG":0,"BASE":33}
link_alt: https://www.ebay.com/p/Esp8266-220v-10a-Network-Relay-WiFi-Module/1369583381
---
This device is supported directly in the firmware by selecting module "Yunshan Relay (33)" or using command `Module 33`
diff --git a/_templates/zemismart-ks-7011 b/_templates/zemismart-ks-7011
index b8ed9069c..67f227d58 100644
--- a/_templates/zemismart-ks-7011
+++ b/_templates/zemismart-ks-7011
@@ -6,7 +6,7 @@ type: Dimmer
standard: us
link: https://www.aliexpress.com/store/product/Zemismart-WiFi-US-Dimmer-Switch-110V-240V-for-Light-with-Display-Screen-Smart-Life-Alexa-Google/1848374_32980154009.html
image: https://user-images.githubusercontent.com/5904370/67769963-b48fd500-fa55-11e9-8403-7217ee65c40d.png
-template: '{"NAME":"KS-7011 Dimmer","GPIO":[255,107,255,108,255,255,0,0,255,255,255,255,255],"FLAG":0,"BASE":54}'
+template: {"NAME":"KS-7011 Dimmer","GPIO":[255,107,255,108,255,255,0,0,255,255,255,255,255],"FLAG":0,"BASE":54}
link_alt: https://www.amazon.com/Maxcio-Dimmable-Compatible-Schedule-Function/dp/B07HRC69N8
---
Tuya Dimmer Module
diff --git a/_templates/zemismart_14W_RGB-CCT b/_templates/zemismart_14W_RGB-CCT
index f18f422be..7c65500bd 100644
--- a/_templates/zemismart_14W_RGB-CCT
+++ b/_templates/zemismart_14W_RGB-CCT
@@ -6,7 +6,7 @@ type: Light
standard: global
link: https://www.aliexpress.com/item/32883690565.html
image: https://user-images.githubusercontent.com/5904370/66718388-9d10e500-ede3-11e9-95b5-2c7c58f1572e.png
-template: '{"NAME":"ZemiDownLight6","GPIO":[0,0,0,0,37,40,0,0,38,41,39,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"ZemiDownLight6","GPIO":[0,0,0,0,37,40,0,0,38,41,39,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/zemismart_4 b/_templates/zemismart_4
index d9752764f..42ee44ce2 100644
--- a/_templates/zemismart_4
+++ b/_templates/zemismart_4
@@ -6,7 +6,7 @@ type: Light
standard: global
link: https://www.amazon.com/Downlight-Ceiling-Control-Compatible-Automation/dp/B07F281FPR
image: https://images-na.ssl-images-amazon.com/images/I/51bffXJrJoL._SX466_.jpg
-template: '{"NAME":"ZemiDownLight","GPIO":[0,0,0,0,0,0,0,0,0,143,0,144,0],"FLAG":0,"BASE":27}'
+template: {"NAME":"ZemiDownLight","GPIO":[0,0,0,0,0,0,0,0,0,143,0,144,0],"FLAG":0,"BASE":27}
link_alt: https://www.aliexpress.com/item/Zemismart-4-inch-WiFi-RGBW-Led-Downlight-10w-Voice-Control-Alexa-Echo-Dot-Spot-Show-Google/32872319062.html
---
diff --git a/_templates/zemismart_4inch_10W b/_templates/zemismart_4inch_10W
index 2ee74eb2e..8fbfba248 100644
--- a/_templates/zemismart_4inch_10W
+++ b/_templates/zemismart_4inch_10W
@@ -6,7 +6,7 @@ type: Light
standard: global
link: https://www.aliexpress.com/item/4000018731463.html
image: https://ae01.alicdn.com/kf/HTB1b9mSaebviK0jSZFNq6yApXXaS/Zemismart-4-inch-WiFi-RGBCW-Color-Charging-With-Music-for-Home-Party-Led-Downlight-Ceiling-Light.jpg
-template: '{"NAME":"ZemiDownLight4","GPIO":[0,0,0,0,37,40,0,0,38,41,39,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"ZemiDownLight4","GPIO":[0,0,0,0,37,40,0,0,38,41,39,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/zemismart_KS-611_3 b/_templates/zemismart_KS-611_3
index 304b72ffb..d20670294 100644
--- a/_templates/zemismart_KS-611_3
+++ b/_templates/zemismart_KS-611_3
@@ -6,7 +6,7 @@ type: Switch
standard: eu
link: https://www.aliexpress.com/item/Zemismart-EU-WiFi-Wall-Push-Light-Switch-Alexa-Google-Home-Smart-Life-Control-One-Gang-Two/32979309306.html
image: https://ae01.alicdn.com/kf/HTB1jiAWUNnaK1RjSZFtq6zC2VXa6/Zemismart-EU-WiFi-Wall-Push-Light-Switch-Alexa-Google-Home-Smart-Life-Control-One-Gang-Two.jpg
-template: '{"NAME":"Zemismart 3 Ga","GPIO":[0,0,56,0,19,18,0,0,22,21,23,0,17],"FLAG":0,"BASE":18}'
+template: {"NAME":"Zemismart 3 Ga","GPIO":[0,0,56,0,19,18,0,0,22,21,23,0,17],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/zemismart_KS-811_1gang b/_templates/zemismart_KS-811_1gang
index 9e1b97b49..b8865d14e 100644
--- a/_templates/zemismart_KS-811_1gang
+++ b/_templates/zemismart_KS-811_1gang
@@ -3,10 +3,12 @@ date_added: 2019-06-17
title: Zemismart KS-811 1 gang
category: switch
type: Switch
-standard: global
+standard:
+ - us
+ - anzac
link: https://www.zemismart.com/zemismart-au-wifi-wall-push-light-switch-alexa-google-home-enable-smart-life-app-controlone-gang-two-gangs-three-gangs-p0163.html
image: https://ueeshop.ly200-cdn.com/u_file/UPAC/UPAC387/1903/products/06/743965c8ea.jpg.240x240.jpg
-template: '{"NAME":"KS-811 Single","GPIO":[17,255,255,255,255,255,0,0,21,56,255,255,255],"FLAG":0,"BASE":18}'
+template: {"NAME":"KS-811 Single","GPIO":[17,255,255,255,255,255,0,0,21,56,255,255,255],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/zemismart_KS-811_2gang b/_templates/zemismart_KS-811_2gang
index b50fb2d5b..8ddd6adfc 100644
--- a/_templates/zemismart_KS-811_2gang
+++ b/_templates/zemismart_KS-811_2gang
@@ -3,10 +3,12 @@ date_added: 2019-03-09
title: Zemismart KS-811 2 Gang
category: switch
type: Switch
-standard: us
+standard:
+ - us
+ - anzac
link: https://www.aliexpress.com/store/product/Zemismart-US-WiFi-Wall-Push-Light-Switch-Alexa-Google-Home-Enable-Smart-Life-APP-ControlOne-Gang/1848374_32982759923.html
image: https://user-images.githubusercontent.com/5904370/67770608-fff6b300-fa56-11e9-8279-7d064ed56fdd.png
-template: '{"NAME":"KS-811 Dual","GPIO":[255,255,52,255,255,18,0,0,22,21,255,255,17],"FLAG":0,"BASE":18}'
+template: {"NAME":"KS-811 Dual","GPIO":[255,255,52,255,255,18,0,0,22,21,255,255,17],"FLAG":0,"BASE":18}
link_alt: https://www.zemismart.com/zemismart-us-wifi-wall-push-light-switch-alexa-google-home-enable-smart-life-app-controlone-gang-two-gangs-three-gangs_p0163.html
---
diff --git a/_templates/zemismart_KS-811_3gang b/_templates/zemismart_KS-811_3gang
index b577d192b..c4c348c02 100644
--- a/_templates/zemismart_KS-811_3gang
+++ b/_templates/zemismart_KS-811_3gang
@@ -3,10 +3,12 @@ date_added: 2019-07-22
title: Zemismart KS-811 3 Gang
category: switch
type: Switch
-standard: global
+standard:
+ - us
+ - anzac
link: https://www.aliexpress.com/item/Zemismart-US-AU-WiFi-Wall-Push-Light-Switch-Alexa-Google-Home-TUYA-APP-Control-One-Gang/32982759923.html
image: https://ueeshop.ly200-cdn.com/u_file/UPAC/UPAC387/1903/products/06/0f36ba5fdd.jpg.240x240.jpg
-template: '{"NAME":"KS-811 Triple","GPIO":[255,255,56,255,19,18,0,0,22,21,23,255,17],"FLAG":0,"BASE":18}'
+template: {"NAME":"KS-811 Triple","GPIO":[255,255,56,255,19,18,0,0,22,21,23,255,17],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/zemismart_RGBW b/_templates/zemismart_RGBW
index 7ec11eec1..f2be08c59 100644
--- a/_templates/zemismart_RGBW
+++ b/_templates/zemismart_RGBW
@@ -6,7 +6,7 @@ type: LED Strip
standard: global
link: https://www.zemismart.com/zemismart-rgbw-led-light-strip-work-with-alexa-echo-google-home-ifttt-wifi-support-up-to-6m-waterproof-timer-voice-control-p0045-p0045.html
image: https://www.zemismart.com/u_file/1904/products/19/b7d7427f0c.jpg
-template: '{"NAME":"Zemismart LED","GPIO":[0,0,0,0,38,37,0,0,0,39,40,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"Zemismart LED","GPIO":[0,0,0,0,38,37,0,0,0,39,40,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/zemismart_WF-BS01 b/_templates/zemismart_WF-BS01
index d8102ac5c..f55a71666 100644
--- a/_templates/zemismart_WF-BS01
+++ b/_templates/zemismart_WF-BS01
@@ -6,7 +6,7 @@ type: Switch
standard: us
link: https://www.aliexpress.com/item/WiFi-Alexa-Google-Home-Water-Boiler-Switch-Support-Smart-Life-Phone-APP-Control-Control-When-Outside/32971557463.html
image: https://user-images.githubusercontent.com/5904370/56020785-3c0b3600-5d08-11e9-82e2-9bf0ee24169e.png
-template: '{"NAME":"WF-BS01","GPIO":[53,0,0,17,21,0,0,0,0,0,52,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"WF-BS01","GPIO":[53,0,0,17,21,0,0,0,0,0,52,0,0],"FLAG":0,"BASE":18}
link_alt: https://www.aliexpress.com/item/Smart-Wifi-Water-Heater-Switch-Boiler-Switches-Alexa-Google-Home-Voice-US-standard-Touch-Panel-Timer/32951540790.html
---
diff --git a/_templates/zemismart_ZM-L01E b/_templates/zemismart_ZM-L01E
index 7a753d2d9..aa153fd41 100644
--- a/_templates/zemismart_ZM-L01E
+++ b/_templates/zemismart_ZM-L01E
@@ -6,7 +6,7 @@ type: Switch
standard: eu
link: https://www.zemismart.com/zemismart-wifi-wall-push-switch-alexa-google-home-tuya-light-switches-three-gangs-two-gangs-one-gang-physical-button-p0219-p0219.html
image: https://user-images.githubusercontent.com/5904370/67437127-68c1d380-f5f0-11e9-91e6-4d307da269fa.png
-template: '{"NAME":"ZSmart ZM-L01E","GPIO":[255,255,255,255,255,255,0,0,255,21,255,255,17],"FLAG":0,"BASE":18}'
+template: {"NAME":"ZSmart ZM-L01E","GPIO":[255,255,255,255,255,255,0,0,255,21,255,255,17],"FLAG":0,"BASE":18}
link_alt: https://www.aliexpress.com/item/4000078103986.html
---
diff --git a/_templates/zemismart_ZM-L02E b/_templates/zemismart_ZM-L02E
index 542f6415f..017ba5beb 100644
--- a/_templates/zemismart_ZM-L02E
+++ b/_templates/zemismart_ZM-L02E
@@ -6,7 +6,7 @@ type: Switch
standard: eu
link: https://www.zemismart.com/zemismart-wifi-wall-push-switch-alexa-google-home-tuya-light-switches-three-gangs-two-gangs-one-gang-physical-button-p0219-p0219.html
image: https://user-images.githubusercontent.com/5904370/65717055-b9511a00-e0a0-11e9-9e7d-2623af6cbcac.png
-template: '{"NAME":"ZSmart ZM-L02E","GPIO":[255,255,255,255,255,17,0,0,18,21,22,255,255],"FLAG":0,"BASE":18}'
+template: {"NAME":"ZSmart ZM-L02E","GPIO":[255,255,255,255,255,17,0,0,18,21,22,255,255],"FLAG":0,"BASE":18}
link_alt: https://www.aliexpress.com/item/4000078103986.html
---
diff --git a/_templates/zemismart_ZM-L03E b/_templates/zemismart_ZM-L03E
index 82c37aa1d..d44e6d41a 100644
--- a/_templates/zemismart_ZM-L03E
+++ b/_templates/zemismart_ZM-L03E
@@ -6,7 +6,7 @@ type: Switch
standard: eu
link: https://www.zemismart.com/zemismart-wifi-wall-push-switch-alexa-google-home-tuya-light-switches-three-gangs-two-gangs-one-gang-physical-button-p0219-p0219.html
image: https://user-images.githubusercontent.com/5904370/69001494-b4118e00-08df-11ea-8e6a-e3f98e2a17b4.png
-template: '{"NAME":"ZSmart ZM-L03E","GPIO":[0,0,0,0,23,17,0,0,19,21,22,0,18],"FLAG":0,"BASE":18}'
+template: {"NAME":"ZSmart ZM-L03E","GPIO":[0,0,0,0,23,17,0,0,19,21,22,0,18],"FLAG":0,"BASE":18}
link_alt: https://www.aliexpress.com/item/4000042024675.html
---
diff --git a/_templates/zeoota_PS022 b/_templates/zeoota_PS022
index dfd6fe7bb..512269620 100644
--- a/_templates/zeoota_PS022
+++ b/_templates/zeoota_PS022
@@ -6,7 +6,7 @@ type: Power Strip
standard: eu
link: https://www.aliexpress.com/item/Smart-Wifi-Power-Strip-Surge-Protector-Multiple-Power-Sockets-4-USB-Port-Voice-Control-for-Amazon/32864068545.html
image: https://ae01.alicdn.com/kf/HTB1ejchXUzrK1RjSspmq6AOdFXaS/Smart-Wifi-Power-Strip-Surge-Protector-Multiple-Power-Sockets-4-USB-Port-Voice-Control-for-Amazon.jpg
-template: '{"NAME":"ZEOOTA 3x plus","GPIO":[0,57,0,56,22,21,0,0,17,23,24,0,0],"FLAG":1,"BASE":18}'
+template: {"NAME":"ZEOOTA 3x plus","GPIO":[0,57,0,56,22,21,0,0,17,23,24,0,0],"FLAG":1,"BASE":18}
link_alt:
---
diff --git a/_templates/zld-44EU-W b/_templates/zld-44EU-W
index ee903a98a..7fd704644 100644
--- a/_templates/zld-44EU-W
+++ b/_templates/zld-44EU-W
@@ -6,7 +6,7 @@ type: Power Strip
standard: eu
link: https://www.amazon.de/gp/product/B07KK9P92N
image: https://images-na.ssl-images-amazon.com/images/I/61KEZ5a7pjL._SL1500_.jpg
-template: '{"NAME":"ZLD-44EU-W","GPIO":[17,255,255,255,22,21,18,19,23,24,25,0,0],"FLAG":0,"BASE":23}'
+template: {"NAME":"ZLD-44EU-W","GPIO":[17,255,255,255,22,21,18,19,23,24,25,0,0],"FLAG":0,"BASE":23}
link_alt:
---
diff --git a/_templates/zoozee b/_templates/zoozee
index 2b78d4f68..636adaad5 100644
--- a/_templates/zoozee
+++ b/_templates/zoozee
@@ -6,7 +6,7 @@ type: Plug
standard: us
link: https://www.amazon.ca/Outlet-Wireless-Socket-Compatible-Google/dp/B07MPGJDNK
image: https://i.imgur.com/3M68GnP.jpg
-template: '{"NAME":"ZooZee","GPIO":[57,255,56,255,255,255,0,0,255,17,255,21,255],"FLAG":0,"BASE":18}'
+template: {"NAME":"ZooZee","GPIO":[57,255,56,255,255,255,0,0,255,17,255,21,255],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/_templates/zoozee_SA102 b/_templates/zoozee_SA102
index 2295f0091..852e42374 100644
--- a/_templates/zoozee_SA102
+++ b/_templates/zoozee_SA102
@@ -6,7 +6,7 @@ type: Plug
standard: us
link: https://www.amazon.com/Outlet-ZOOZEE-Monitoring-Function-Compatible/dp/B07J2LR5KN
image: https://images-na.ssl-images-amazon.com/images/I/51PttjDj%2BBL._SX425_.jpg
-template: '{"NAME":"ZooZee","GPIO":[57,255,56,255,21,133,0,0,131,17,132,255,255],"FLAG":0,"BASE":18}'
+template: {"NAME":"ZooZee","GPIO":[57,255,56,255,21,133,0,0,131,17,132,255,255],"FLAG":0,"BASE":18}
link_alt: https://www.amazon.ca/gp/product/B07ML92QX8
---
diff --git a/_templates/zoozee_SE131 b/_templates/zoozee_SE131
index 03d079c00..acdf42d2d 100644
--- a/_templates/zoozee_SE131
+++ b/_templates/zoozee_SE131
@@ -6,7 +6,7 @@ type: Plug
standard: eu
link: https://www.amazon.de/gp/product/B07J2CT8WL
image: https://user-images.githubusercontent.com/5904370/66717458-967d7000-edd9-11e9-9952-eb163b595bba.png
-template: '{"NAME":"ZooZee SE131","GPIO":[255,0,56,0,0,0,0,0,255,17,0,21,0],"FLAG":0,"BASE":17}'
+template: {"NAME":"ZooZee SE131","GPIO":[255,0,56,0,0,0,0,0,255,17,0,21,0],"FLAG":0,"BASE":17}
link_alt:
---
diff --git a/_templates/zzhxon_6w_e14 b/_templates/zzhxon_6w_e14
index c2247dc80..480e86c28 100644
--- a/_templates/zzhxon_6w_e14
+++ b/_templates/zzhxon_6w_e14
@@ -1,12 +1,14 @@
---
date_added: 2019-09-13
-title: ZZHXON 6W E14/E27
-category: light
-type: Bulb
-standard: global
+title: ZZHXON 6W
+type: RGBCCT
+category: bulb
+standard:
+ - E27
+ - E14
link: https://www.aliexpress.com/item/33047013453.html
image: https://user-images.githubusercontent.com/5904370/66715410-5c08d880-edc3-11e9-96e0-6a37854058d1.png
-template: '{"NAME":"E27_RGB_Bulb","GPIO":[0,0,0,0,40,41,0,0,38,39,37,0,0],"FLAG":0,"BASE":18}'
+template: {"NAME":"E27_RGB_Bulb","GPIO":[0,0,0,0,40,41,0,0,38,39,37,0,0],"FLAG":0,"BASE":18}
link_alt:
---
diff --git a/assets/js/prism.js b/assets/js/prism.js
index 1b691bffe..e5f75ec88 100644
--- a/assets/js/prism.js
+++ b/assets/js/prism.js
@@ -7,6 +7,7 @@ Prism.languages.clike={comment:[{pattern:/(^|[^\\])\/\*[\s\S]*?(?:\*\/|$)/,lookb
Prism.languages.javascript=Prism.languages.extend("clike",{"class-name":[Prism.languages.clike["class-name"],{pattern:/(^|[^$\w\xA0-\uFFFF])[_$A-Z\xA0-\uFFFF][$\w\xA0-\uFFFF]*(?=\.(?:prototype|constructor))/,lookbehind:!0}],keyword:[{pattern:/((?:^|})\s*)(?:catch|finally)\b/,lookbehind:!0},{pattern:/(^|[^.])\b(?:as|async(?=\s*(?:function\b|\(|[$\w\xA0-\uFFFF]|$))|await|break|case|class|const|continue|debugger|default|delete|do|else|enum|export|extends|for|from|function|get|if|implements|import|in|instanceof|interface|let|new|null|of|package|private|protected|public|return|set|static|super|switch|this|throw|try|typeof|undefined|var|void|while|with|yield)\b/,lookbehind:!0}],number:/\b(?:(?:0[xX](?:[\dA-Fa-f](?:_[\dA-Fa-f])?)+|0[bB](?:[01](?:_[01])?)+|0[oO](?:[0-7](?:_[0-7])?)+)n?|(?:\d(?:_\d)?)+n|NaN|Infinity)\b|(?:\b(?:\d(?:_\d)?)+\.?(?:\d(?:_\d)?)*|\B\.(?:\d(?:_\d)?)+)(?:[Ee][+-]?(?:\d(?:_\d)?)+)?/,function:/#?[_$a-zA-Z\xA0-\uFFFF][$\w\xA0-\uFFFF]*(?=\s*(?:\.\s*(?:apply|bind|call)\s*)?\()/,operator:/--|\+\+|\*\*=?|=>|&&|\|\||[!=]==|<<=?|>>>?=?|[-+*/%&|^!=<>]=?|\.{3}|\?[.?]?|[~:]/}),Prism.languages.javascript["class-name"][0].pattern=/(\b(?:class|interface|extends|implements|instanceof|new)\s+)[\w.\\]+/,Prism.languages.insertBefore("javascript","keyword",{regex:{pattern:/((?:^|[^$\w\xA0-\uFFFF."'\])\s])\s*)\/(?:\[(?:[^\]\\\r\n]|\\.)*]|\\.|[^/\\\[\r\n])+\/[gimyus]{0,6}(?=\s*(?:$|[\r\n,.;})\]]))/,lookbehind:!0,greedy:!0},"function-variable":{pattern:/#?[_$a-zA-Z\xA0-\uFFFF][$\w\xA0-\uFFFF]*(?=\s*[=:]\s*(?:async\s*)?(?:\bfunction\b|(?:\((?:[^()]|\([^()]*\))*\)|[_$a-zA-Z\xA0-\uFFFF][$\w\xA0-\uFFFF]*)\s*=>))/,alias:"function"},parameter:[{pattern:/(function(?:\s+[_$A-Za-z\xA0-\uFFFF][$\w\xA0-\uFFFF]*)?\s*\(\s*)(?!\s)(?:[^()]|\([^()]*\))+?(?=\s*\))/,lookbehind:!0,inside:Prism.languages.javascript},{pattern:/[_$a-z\xA0-\uFFFF][$\w\xA0-\uFFFF]*(?=\s*=>)/i,inside:Prism.languages.javascript},{pattern:/(\(\s*)(?!\s)(?:[^()]|\([^()]*\))+?(?=\s*\)\s*=>)/,lookbehind:!0,inside:Prism.languages.javascript},{pattern:/((?:\b|\s|^)(?!(?:as|async|await|break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|export|extends|finally|for|from|function|get|if|implements|import|in|instanceof|interface|let|new|null|of|package|private|protected|public|return|set|static|super|switch|this|throw|try|typeof|undefined|var|void|while|with|yield)(?![$\w\xA0-\uFFFF]))(?:[_$A-Za-z\xA0-\uFFFF][$\w\xA0-\uFFFF]*\s*)\(\s*)(?!\s)(?:[^()]|\([^()]*\))+?(?=\s*\)\s*\{)/,lookbehind:!0,inside:Prism.languages.javascript}],constant:/\b[A-Z](?:[A-Z_]|\dx?)*\b/}),Prism.languages.insertBefore("javascript","string",{"template-string":{pattern:/`(?:\\[\s\S]|\${(?:[^{}]|{(?:[^{}]|{[^}]*})*})+}|(?!\${)[^\\`])*`/,greedy:!0,inside:{"template-punctuation":{pattern:/^`|`$/,alias:"string"},interpolation:{pattern:/((?:^|[^\\])(?:\\{2})*)\${(?:[^{}]|{(?:[^{}]|{[^}]*})*})+}/,lookbehind:!0,inside:{"interpolation-punctuation":{pattern:/^\${|}$/,alias:"punctuation"},rest:Prism.languages.javascript}},string:/[\s\S]+/}}}),Prism.languages.markup&&Prism.languages.markup.tag.addInlined("script","javascript"),Prism.languages.js=Prism.languages.javascript;
Prism.languages.json={property:{pattern:/"(?:\\.|[^\\"\r\n])*"(?=\s*:)/,greedy:!0},string:{pattern:/"(?:\\.|[^\\"\r\n])*"(?!\s*:)/,greedy:!0},comment:/\/\/.*|\/\*[\s\S]*?(?:\*\/|$)/,number:/-?\d+\.?\d*(?:e[+-]?\d+)?/i,punctuation:/[{}[\],]/,operator:/:/,boolean:/\b(?:true|false)\b/,null:{pattern:/\bnull\b/,alias:"keyword"}};
Prism.languages.yaml={scalar:{pattern:/([\-:]\s*(?:![^\s]+)?[ \t]*[|>])[ \t]*(?:((?:\r?\n|\r)[ \t]+)[^\r\n]+(?:\2[^\r\n]+)*)/,lookbehind:!0,alias:"string"},comment:/#.*/,key:{pattern:/(\s*(?:^|[:\-,[{\r\n?])[ \t]*(?:![^\s]+)?[ \t]*)[^\r\n{[\]},#\s]+?(?=\s*:\s)/,lookbehind:!0,alias:"atrule"},directive:{pattern:/(^[ \t]*)%.+/m,lookbehind:!0,alias:"important"},datetime:{pattern:/([:\-,[{]\s*(?:![^\s]+)?[ \t]*)(?:\d{4}-\d\d?-\d\d?(?:[tT]|[ \t]+)\d\d?:\d{2}:\d{2}(?:\.\d*)?[ \t]*(?:Z|[-+]\d\d?(?::\d{2})?)?|\d{4}-\d{2}-\d{2}|\d\d?:\d{2}(?::\d{2}(?:\.\d*)?)?)(?=[ \t]*(?:$|,|]|}))/m,lookbehind:!0,alias:"number"},boolean:{pattern:/([:\-,[{]\s*(?:![^\s]+)?[ \t]*)(?:true|false)[ \t]*(?=$|,|]|})/im,lookbehind:!0,alias:"important"},null:{pattern:/([:\-,[{]\s*(?:![^\s]+)?[ \t]*)(?:null|~)[ \t]*(?=$|,|]|})/im,lookbehind:!0,alias:"important"},string:{pattern:/([:\-,[{]\s*(?:![^\s]+)?[ \t]*)("|')(?:(?!\2)[^\\\r\n]|\\.)*\2(?=[ \t]*(?:$|,|]|}|\s*#))/m,lookbehind:!0,greedy:!0},number:{pattern:/([:\-,[{]\s*(?:![^\s]+)?[ \t]*)[+-]?(?:0x[\da-f]+|0o[0-7]+|(?:\d+\.?\d*|\.?\d+)(?:e[+-]?\d+)?|\.inf|\.nan)[ \t]*(?=$|,|]|})/im,lookbehind:!0},tag:/![^\s]+/,important:/[&*][\w]+/,punctuation:/---|[:[\]{}\-,|>?]|\.\.\./},Prism.languages.yml=Prism.languages.yaml;
+Prism.languages.erlang={comment:/%.+/,string:{pattern:/"(?:\\.|[^\\"\r\n])*"/,greedy:!0},"quoted-function":{pattern:/'(?:\\.|[^\\'\r\n])+'(?=\()/,alias:"function"},"quoted-atom":{pattern:/'(?:\\.|[^\\'\r\n])+'/,alias:"atom"},boolean:/\b(?:true|false)\b/,keyword:/\b(?:fun|when|case|of|end|if|receive|after|try|catch)\b/,number:[/\$\\?./,/\d+#[a-z0-9]+/i,/(?:\b\d+\.?\d*|\B\.\d+)(?:e[+-]?\d+)?/i],function:/\b[a-z][\w@]*(?=\()/,variable:{pattern:/(^|[^@])(?:\b|\?)[A-Z_][\w@]*/,lookbehind:!0},operator:[/[=\/<>:]=|=[:\/]=|\+\+?|--?|[=*\/!]|\b(?:bnot|div|rem|band|bor|bxor|bsl|bsr|not|and|or|xor|orelse|andalso)\b/,{pattern:/(^|[^<])<(?!<)/,lookbehind:!0},{pattern:/(^|[^>])>(?!>)/,lookbehind:!0}],atom:/\b[a-z][\w@]*/,punctuation:/[()[\]{}:;,.#|]|<<|>>/};
Prism.languages.console = {
'regex': {
pattern: /(?
+{% assign category = site.templates | where: "category", "bulb" %}
+{% assign type_group = category | group_by: 'type' %}
+{% assign type_grouped = type_group | sort: "name" %}
+{% for group in type_grouped %}
+
+{{ group.name | replace: "RGBCCT", "RGB + Color Temperature" | replace: "WW", "Dimmable Warm White" | replace: "CW", "Dimmable Cool White" | replace: "CCT", "Color Temperature" }}
+