diff --git a/_data/nav.yaml b/_data/nav.yaml new file mode 100644 index 000000000..f3e5121cd --- /dev/null +++ b/_data/nav.yaml @@ -0,0 +1,46 @@ +toc: + - name: Bulbs + subnav: + - title: by Type + url: bulb-type.html + - title: by Socket + url: bulb-socket.html + - title: by Name + url: bulb.html + - name: Switches and Relays + url: switch.html + - name: Lights and LEDs + url: light.html + - name: Plugs and Sockets + url: plug.html + - name: Miscellaneous + url: misc.html + - name: Devices by Standard + url: standard.html + subnav: + - title: EU + url: eu.html + - title: US + url: us.html + - title: UK + url: uk.html + - title: AU + url: au.html + - title: BR + url: br.html + - title: CH + url: ch.html + - title: FR + url: fr.html + - title: IL + url: il.html + - title: IN + url: in.html + - title: IT + url: it.html + - title: ZA + url: za.html + - title: GLOBAL + url: global.html + - title: ALL + url: all.html diff --git a/_data/standards.yaml b/_data/standards.yaml new file mode 100644 index 000000000..c4d9bff07 --- /dev/null +++ b/_data/standards.yaml @@ -0,0 +1,47 @@ +toc-std: + - name: Devices by Country Standard + subnav: + - title: EU + url: eu.html + - title: US + url: us.html + - title: UK + url: uk.html + - title: AU + url: au.html + - title: BR + url: br.html + - title: CH + url: ch.html + - title: FR + url: fr.html + - title: IL + url: il.html + - title: IN + url: in.html + - title: IT + url: it.html + - title: ZA + url: za.html + - title: GLOBAL + url: global.html + - title: ALL + url: all.html + - name: Bulbs by Socket Size + subnav: + - title: E27 + url: e27.html + - title: E26 + url: e26.html + - title: b22 + url: b22.html + - title: E12 + url: e12.html + - title: E14 + url: e14.html + - title: GU10 + url: gu10.html + - title: MR16 + url: mr16.html + - title: ALL + url: all-bulbs.html diff --git a/_includes/bulb-redir.html b/_includes/bulb-redir.html new file mode 100644 index 000000000..d9b853140 --- /dev/null +++ b/_includes/bulb-redir.html @@ -0,0 +1,7 @@ + + + + HTML Meta Tag + + + diff --git a/_includes/nav.html b/_includes/nav.html new file mode 100644 index 000000000..0dae33f61 --- /dev/null +++ b/_includes/nav.html @@ -0,0 +1,12 @@ +{% assign cat = site.data.nav.toc %} +{% for item in cat %} + +{% endfor %} diff --git a/_includes/sidebar.html b/_includes/sidebar.html index 88886ac4d..0eef511ac 100644 --- a/_includes/sidebar.html +++ b/_includes/sidebar.html @@ -6,8 +6,8 @@ {% include search.html %}
Logo - {% include navigation.html %} {% include search-results.html %} + {% include nav.html %} {% include footer.html %}
diff --git a/_includes/tablerow_standard.html b/_includes/tablerow_standard.html index 090fad395..c96af60db 100644 --- a/_includes/tablerow_standard.html +++ b/_includes/tablerow_standard.html @@ -2,8 +2,8 @@ {{ template.title }} {{ template.title }} {% if template.template contains '131' or template.template contains '132' or template.template contains '133' or template.template contains '134' or template.template contains '135' or template.template contains '136' or template.template contains '137' or template.template contains '145' or template.template contains '146' or template.template contains '156'%} - Power Monitoring - {% endif %}
+ Power Monitoring
+ {% endif %} {{ template.type }} {% assign standard_list = template.standard %} {% for item_standard in standard_list %} diff --git a/_layouts/templates.html b/_layouts/templates.html index 46ed972f2..682106616 100644 --- a/_layouts/templates.html +++ b/_layouts/templates.html @@ -22,8 +22,10 @@ {{ link | append: "?tag=tasmotatempla-21" }} {% elsif link contains "amazon.co.uk" %} {{ link | append: "?tag=tasmotatemp0a-21" }} -{% elsif link contains "amazon.com" %} + {% elsif link contains "amazon.com" %} {{ link | append: "?tag=tasmotatempla-20" }} + {% elsif link contains "amazon.ca" %} + {{ link | append: "?tag=tasmotatemp03-20" }} {% else %} {{ link }} {% endif %} @@ -41,6 +43,8 @@ {{ link | append: "?tag=tasmotatemp0a-21" }} {% elsif link contains "amazon.com" %} {{ link | append: "?tag=tasmotatempla-20" }} + {% elsif link contains "amazon.ca" %} + {{ link | append: "?tag=tasmotatemp03-20" }} {% else %} {{ link }} {% endif %} diff --git a/_sass/milligram.scss b/_sass/milligram.scss index 3544e89c6..ea2bdc3a4 100644 --- a/_sass/milligram.scss +++ b/_sass/milligram.scss @@ -511,7 +511,7 @@ ul dl, ul ol, ul ul { font-size: 90%; - margin: 1.5rem 0 1.5rem 3.0rem; + margin: 1.5rem 0 1.5rem 1.0rem; } ol { @@ -527,7 +527,7 @@ button, dd, dt, li { - margin-bottom: 1.0rem; + margin-bottom: .5rem; } fieldset, @@ -559,6 +559,7 @@ th { border-bottom: 0.1rem solid #e1e1e1; padding: 0.1rem 0.5rem; text-align: left; + vertical-align: middle; } td:first-child, diff --git a/_templates/3stone_10W_A21_RGBW b/_templates/3stone_10W_A21_RGBW index 2c7a07cbe..4fe7e7274 100644 --- a/_templates/3stone_10W_A21_RGBW +++ b/_templates/3stone_10W_A21_RGBW @@ -3,7 +3,7 @@ date_added: 2019-11-10 title: 3Stone A21 10W type: RGBW category: bulb -standard: E26 +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}' diff --git a/_templates/CSH-B22WW10W b/_templates/CSH-B22WW10W index cafbbfaed..b8fcb84d5 100644 --- a/_templates/CSH-B22WW10W +++ b/_templates/CSH-B22WW10W @@ -3,7 +3,7 @@ date_added: 2019-12-02 title: Connect Smart 10W category: bulb type: WW -standard: B22 +standard: b22 link: https://www.harveynorman.com.au/connect-smart-10w-b22-white-led-light-bulb.html image: https://azcd.harveynorman.com.au/media/catalog/product/cache/21/image/992x558/9df78eab33525d08d6e5fb8d27136e95/c/s/csh-b22ww10w-connect-smart-white-led-light-bulb.jpg template: '{"NAME":"CSH-B22WW10W","GPIO":[0,0,0,0,0,37,0,0,0,38,0,0,0],"FLAG":0,"BASE":18}' diff --git a/_templates/Hama_176531 b/_templates/Hama_176531 index a03e13c72..2e2ca6d18 100644 --- a/_templates/Hama_176531 +++ b/_templates/Hama_176531 @@ -3,7 +3,7 @@ date_added: 2019-11-27 title: Hama 176531 10W type: RGBW category: bulb -standard: E27 +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}' diff --git a/_templates/LE_A19_RGBCT_9W_E26 b/_templates/LE_A19_RGBCT_9W_E26 index 4f8cc538e..a8d95f7e6 100644 --- a/_templates/LE_A19_RGBCT_9W_E26 +++ b/_templates/LE_A19_RGBCT_9W_E26 @@ -3,7 +3,7 @@ date_added: 2019-05-27 title: LE A19 9W type: RGBCCT category: bulb -standard: E26 +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}' diff --git a/_templates/TCP_B22_RGBW b/_templates/TCP_B22_RGBW index af9384a25..bb47cf9b5 100644 --- a/_templates/TCP_B22_RGBW +++ b/_templates/TCP_B22_RGBW @@ -3,7 +3,7 @@ date_added: 2019-08-15 title: TCP Smart type: RGBW category: bulb -standard: B22 +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/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}' diff --git a/_templates/WWK-UN-W b/_templates/WWK-UN-W deleted file mode 100644 index 3978698a3..000000000 --- a/_templates/WWK-UN-W +++ /dev/null @@ -1,16 +0,0 @@ ---- -date_added: 2019-05-24 -title: WWK-UN-W Glass Panel -category: plug -type: Wall Outlet -standard: - - eu - - uk - - au -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}' -link2: ---- - -Can be flashed with Tuya-Convert diff --git a/_templates/aisirer_9W_A19_E26 b/_templates/aisirer_9W_A19_E26 index f18b3fa7e..1f0fd6240 100644 --- a/_templates/aisirer_9W_A19_E26 +++ b/_templates/aisirer_9W_A19_E26 @@ -3,7 +3,7 @@ date_added: 2019-10-17 title: Aisirer A19 9W type: WW category: bulb -standard: E26 +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}' diff --git a/_templates/ajax_online_4_5W_GU10_CCT b/_templates/ajax_online_4_5W_GU10_CCT index d24b3468f..4c03491fe 100644 --- a/_templates/ajax_online_4_5W_GU10_CCT +++ b/_templates/ajax_online_4_5W_GU10_CCT @@ -3,7 +3,7 @@ date_added: 2019-11-19 title: Ajax Online 4.5W type: CCT category: bulb -standard: GU10 +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/61VdJsoS0-L._SL1500_.jpg template: '{"NAME":"AjaxOnline","GPIO":[17,0,0,0,0,37,0,0,38,0,0,0,0],"FLAG":0,"BASE":38}' diff --git a/_templates/al_above_lights_9W_E26_rgbw b/_templates/al_above_lights_9W_E26_rgbw index 1b94b5db1..a8ca22c20 100644 --- a/_templates/al_above_lights_9W_E26_rgbw +++ b/_templates/al_above_lights_9W_E26_rgbw @@ -3,7 +3,7 @@ date_added: 2019-11-17 title: AL Above Lights 9W type: RGBW category: bulb -standard: E26 +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}' diff --git a/_templates/annhome_3ac-2usb b/_templates/annhome_3ac-2usb index e9fb8ae07..6bb91b7f9 100644 --- a/_templates/annhome_3ac-2usb +++ b/_templates/annhome_3ac-2usb @@ -5,7 +5,7 @@ category: plug 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 +image: https://user-images.githubusercontent.com/5904370/70851297-a249e900-1e93-11ea-8965-56f0ce7add9f.png template: '{"NAME":"1200W WiFi SPS","GPIO":[32,0,0,0,57,52,0,0,21,17,22,23,33],"FLAG":0,"BASE":18}' link2: 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 ba04b3495..5c8383196 100644 --- a/_templates/anoopsyche_9W_E26 +++ b/_templates/anoopsyche_9W_E26 @@ -3,7 +3,7 @@ date_added: 2019-03-10 title: Anoopsyche 9W type: CCT category: bulb -standard: E26 +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}' diff --git a/_templates/aoycocr_5W_GU10_RGBW b/_templates/aoycocr_5W_GU10_RGBW index abc691d5e..2ee52251d 100644 --- a/_templates/aoycocr_5W_GU10_RGBW +++ b/_templates/aoycocr_5W_GU10_RGBW @@ -3,7 +3,7 @@ date_added: 2019-11-27 title: Aoycocr 5W type: RGBW category: bulb -standard: GU10 +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}' diff --git a/_templates/aoycocr_A19_9W_E26 b/_templates/aoycocr_A19_9W_E26 index d2dba2b7f..436115a99 100644 --- a/_templates/aoycocr_A19_9W_E26 +++ b/_templates/aoycocr_A19_9W_E26 @@ -3,7 +3,7 @@ date_added: 2019-10-01 title: Aoycocr A19 9W type: RGBCCT category: bulb -standard: E26 +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}' diff --git a/_templates/arlec_GLD112HA b/_templates/arlec_GLD112HA index 98d05f788..d70e11fd2 100644 --- a/_templates/arlec_GLD112HA +++ b/_templates/arlec_GLD112HA @@ -3,7 +3,7 @@ date_added: 2019-10-05 title: Arlec GLD112HA 9.5W type: CCT category: bulb -standard: E27 +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}' diff --git a/_templates/arlec_GLD122HA b/_templates/arlec_GLD122HA index 243b94aaf..aeae185b5 100644 --- a/_templates/arlec_GLD122HA +++ b/_templates/arlec_GLD122HA @@ -3,7 +3,7 @@ date_added: 2019-10-23 title: Arlec GLD122HA 9.5W type: RGBCCT category: bulb -standard: E27 +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}' diff --git a/_templates/aseer-Hi-UK5PinWFWS01W b/_templates/aseer-Hi-UK5PinWFWS01W new file mode 100644 index 000000000..ef3a4ac77 --- /dev/null +++ b/_templates/aseer-Hi-UK5PinWFWS01W @@ -0,0 +1,17 @@ +--- +date_added: 2019-12-14 +title: Aseer Hi-UK5PinWFWS01W +link: https://www.aliexpress.com/item/4000192716338.html +image: https://ae01.alicdn.com/kf/Hed2221b545fe4a29beb6d32abdeb9c1bM/ASEER-UK-Standard-WIFI-Socket-5-pin-Universal-WIFI-wall-socket-15A-Crystal-tempered-glass-panel.jpg_640x640.jpg +template: '{"NAME":"Aseer 1-Gang","GPIO":[56,0,157,57,134,132,0,0,131,0,0,21,9],"FLAG":0,"BASE":18}' +link2: +link3: +flash: tuya-convert +category: plug +type: Wall Outlet +standard: global +--- + +I based this loosely on the MakeGood template found here and made some changes. The only thing I did not manage to get working is the low blue LED light when the socket is switched off. LED for power on works fine. + +Also be sure to run the commands: `SwitchMode1 5` and `SwitchMode2 5` \ No newline at end of file diff --git a/_templates/aunics_7W_E27_RGB b/_templates/aunics_7W_E27_RGB index 2c73e466e..fa561cc67 100644 --- a/_templates/aunics_7W_E27_RGB +++ b/_templates/aunics_7W_E27_RGB @@ -3,7 +3,7 @@ date_added: 2019-11-21 title: Aunics 7W type: RGB category: bulb -standard: E27 +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}' diff --git a/_templates/avatar_5W_E14 b/_templates/avatar_5W_E14 index 40ce52e8d..d120be8d8 100644 --- a/_templates/avatar_5W_E14 +++ b/_templates/avatar_5W_E14 @@ -3,7 +3,7 @@ date_added: 2019-10-05 title: Avatar 5W type: WW category: bulb -standard: E14 +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}' diff --git a/_templates/avatar_5W_GU10_RGBW b/_templates/avatar_5W_GU10_RGBW index db88c0f34..b8a712ffb 100644 --- a/_templates/avatar_5W_GU10_RGBW +++ b/_templates/avatar_5W_GU10_RGBW @@ -3,7 +3,7 @@ date_added: 2019-11-21 title: Avatar 5W type: RGBW category: bulb -standard: GU10 +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}' diff --git a/_templates/avatar_7W_E14 b/_templates/avatar_7W_E14 index 1d9a11aa3..9fda00a3b 100644 --- a/_templates/avatar_7W_E14 +++ b/_templates/avatar_7W_E14 @@ -3,7 +3,7 @@ date_added: 2019-11-27 title: Avatar 7W type: RGBW category: bulb -standard: E14 +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}' diff --git a/_templates/avatar_9W-E27 b/_templates/avatar_9W-E27 index 63912133d..461d583e7 100644 --- a/_templates/avatar_9W-E27 +++ b/_templates/avatar_9W-E27 @@ -3,7 +3,7 @@ date_added: 2019-11-27 title: Avatar 9W type: RGBCCT category: bulb -standard: E27 +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}' diff --git a/_templates/awow_9W_E27_RGBW b/_templates/awow_9W_E27_RGBW index 19032350d..c8533b0bc 100644 --- a/_templates/awow_9W_E27_RGBW +++ b/_templates/awow_9W_E27_RGBW @@ -3,7 +3,7 @@ date_added: 2019-11-21 title: AWOW 9W type: RGBW category: bulb -standard: E27 +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}' diff --git a/_templates/bakibo_TP22Y b/_templates/bakibo_TP22Y index 197e2951c..10f584e2b 100644 --- a/_templates/bakibo_TP22Y +++ b/_templates/bakibo_TP22Y @@ -1,10 +1,10 @@ --- date_added: 2019-11-30 -title: BAKIBO TP22Y +title: Bakibo TP22Y category: plug 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 +link: https://www.amazon.de/gp/product/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 TP22Y","GPIO":[0,0,0,17,134,132,0,0,131,56,21,0,0],"FLAG":0,"BASE":52}' link2: diff --git a/_templates/bawoo_EUWL122130 b/_templates/bawoo_EUWL122130 index bc1e79046..d742e91af 100644 --- a/_templates/bawoo_EUWL122130 +++ b/_templates/bawoo_EUWL122130 @@ -4,8 +4,8 @@ title: Bawoo EUWL122130 7W type: RGBW category: bulb standard: - - E27 - - B22 + - 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}' diff --git a/_templates/bneta_A60_E27 b/_templates/bneta_A60_E27 index 4690a2c65..f0ca89ce0 100644 --- a/_templates/bneta_A60_E27 +++ b/_templates/bneta_A60_E27 @@ -3,7 +3,7 @@ date_added: 2019-09-13 title: BNeta IO-WIFI60-E27P 8.5W type: RGBCCT category: bulb -standard: E27 +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}' diff --git a/_templates/bneta_GU10 b/_templates/bneta_GU10 index 7357dbbbe..6dee1018d 100644 --- a/_templates/bneta_GU10 +++ b/_templates/bneta_GU10 @@ -3,7 +3,7 @@ date_added: 2019-09-13 title: BNeta IO-WIFI-GU10 4.5W type: RGBW category: bulb -standard: GU10 +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}' diff --git a/_templates/bomcosy_7W b/_templates/bomcosy_7W index 41128f215..dc46840c4 100644 --- a/_templates/bomcosy_7W +++ b/_templates/bomcosy_7W @@ -4,8 +4,8 @@ title: Bomcosy 7W type: RGBCCT category: bulb standard: - - E27 - - B22 + - 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}' diff --git a/_templates/brilliant_20699 b/_templates/brilliant_20699 index 0586fef22..db83bb505 100644 --- a/_templates/brilliant_20699 +++ b/_templates/brilliant_20699 @@ -1,11 +1,9 @@ --- date_added: 2019-11-18 -title: Brilliant 9W +title: Brilliant 20699 9W type: RGBW category: bulb -standard: - - E27 - - B22 +standard: 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}' diff --git a/_templates/brilliant_20741 b/_templates/brilliant_20741 index a29ae5010..189c644f4 100644 --- a/_templates/brilliant_20741 +++ b/_templates/brilliant_20741 @@ -1,16 +1,15 @@ --- date_added: 2019-10-01 -title: Brilliant 9W +title: Brilliant 20741 9W type: RGBW category: bulb -standard: - - E27 - - B22 +standard: e27 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}' link2: --- +Do not confuse with 20698 model! Converted with tuya-convert 2 diff --git a/_templates/brilliant_HK17653S72 b/_templates/brilliant_HK17653S72 index a154f848c..cfe567457 100644 --- a/_templates/brilliant_HK17653S72 +++ b/_templates/brilliant_HK17653S72 @@ -3,7 +3,7 @@ date_added: 2019-10-05 title: Brilliant HK17653S72 4.5W type: RGBW category: bulb -standard: E14 +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}' diff --git a/_templates/brizlabs_4_5W_E14 b/_templates/brizlabs_4_5W_E14 index 06229796c..4eae8ff21 100644 --- a/_templates/brizlabs_4_5W_E14 +++ b/_templates/brizlabs_4_5W_E14 @@ -3,7 +3,7 @@ date_added: 2019-11-17 title: BrizLabs 4.5W type: RGBW category: bulb -standard: E14 +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}' diff --git a/_templates/brizlabs_EBE-SHW03 b/_templates/brizlabs_EBE-SHW03 index cf78bdcd2..2cfdcee42 100644 --- a/_templates/brizlabs_EBE-SHW03 +++ b/_templates/brizlabs_EBE-SHW03 @@ -3,7 +3,7 @@ date_added: 2019-11-13 title: BrizLabs EBE-SHW03 4.5W type: RGBW category: bulb -standard: GU10 +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}' diff --git a/_templates/cocoon_DY180363-B b/_templates/cocoon_DY180363-B index 824b6d168..9673f6a08 100644 --- a/_templates/cocoon_DY180363-B +++ b/_templates/cocoon_DY180363-B @@ -4,8 +4,8 @@ title: Cocoon DY180363-B 8W type: RGBW category: bulb standard: - - E27 - - B22 + - 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}' diff --git a/_templates/deltaco_SH-LE14W b/_templates/deltaco_SH-LE14W index f2eecd925..26bb1581d 100644 --- a/_templates/deltaco_SH-LE14W +++ b/_templates/deltaco_SH-LE14W @@ -3,7 +3,7 @@ date_added: 2019-11-23 title: Deltaco SH-LE14W 5W type: CCT category: bulb -standard: E14 +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}' diff --git a/_templates/deltaco_SH-LE27RGB b/_templates/deltaco_SH-LE27RGB index 4d0d3453e..88225bb47 100644 --- a/_templates/deltaco_SH-LE27RGB +++ b/_templates/deltaco_SH-LE27RGB @@ -3,7 +3,7 @@ date_added: 2019-12-01 title: Deltaco SH-LE27RGB 9W type: RGB category: bulb -standard: E27 +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}' diff --git a/_templates/deltaco_SH-LE27W b/_templates/deltaco_SH-LE27W index 8601a716f..9b1731c54 100644 --- a/_templates/deltaco_SH-LE27W +++ b/_templates/deltaco_SH-LE27W @@ -3,7 +3,7 @@ date_added: 2019-11-23 title: Deltaco SH-LE27W 9W type: CCT category: bulb -standard: E27 +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}' diff --git a/_templates/dgm_L-WT9W1 b/_templates/dgm_L-WT9W1 index a31830005..3258b6cdf 100644 --- a/_templates/dgm_L-WT9W1 +++ b/_templates/dgm_L-WT9W1 @@ -3,7 +3,7 @@ date_added: 2019-10-05 title: DGM L-WT9W1 9W type: CCT category: bulb -standard: E27 +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}' diff --git a/_templates/electriq_B22 b/_templates/electriq_B22 index de85ee40d..b86a32ecd 100644 --- a/_templates/electriq_B22 +++ b/_templates/electriq_B22 @@ -3,7 +3,7 @@ date_added: 2019-04-27 title: electriQ type: RGBW category: bulb -standard: B22 +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}' diff --git a/_templates/elelight_7W_A19_E27 b/_templates/elelight_7W_A19_E27 index 203433a2d..9ccfb9bdc 100644 --- a/_templates/elelight_7W_A19_E27 +++ b/_templates/elelight_7W_A19_E27 @@ -3,7 +3,7 @@ date_added: 2019-10-17 title: EleLight A19 7W type: RGBW category: bulb -standard: E27 +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}' diff --git a/_templates/esicoo_9W_E26 b/_templates/esicoo_9W_E26 index e1dce9e93..1df580f54 100644 --- a/_templates/esicoo_9W_E26 +++ b/_templates/esicoo_9W_E26 @@ -3,7 +3,7 @@ date_added: 2019-10-05 title: Esicoo 9W type: RGBW category: bulb -standard: E26 +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}' diff --git a/_templates/fcmila_7w b/_templates/fcmila_7w index 53287132d..05860b2e2 100644 --- a/_templates/fcmila_7w +++ b/_templates/fcmila_7w @@ -4,8 +4,8 @@ title: Fcmila 7W category: bulb type: RGBW standard: - - B22 - - E27 + - 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}' diff --git a/_templates/fcmila_EQ723 b/_templates/fcmila_EQ723 index 14ac67676..e8ecada97 100644 --- a/_templates/fcmila_EQ723 +++ b/_templates/fcmila_EQ723 @@ -4,10 +4,10 @@ title: Fcmila 10W type: RGBW category: bulb standard: - - E26 - - E27 - - B22 - - E14 + - e26 + - e27 + - b22 + - 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}' diff --git a/_templates/feit_electric-BPA800RGBWAG2 b/_templates/feit_electric-BPA800RGBWAG2 index 0367ba802..344caedce 100644 --- a/_templates/feit_electric-BPA800RGBWAG2 +++ b/_templates/feit_electric-BPA800RGBWAG2 @@ -3,7 +3,7 @@ date_added: 2019-10-07 title: Feit Electric BPA800/RGBW/AG/2 type: RGBW category: bulb -standard: E26 +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}' diff --git a/_templates/feit_electric-BR30927CAAG b/_templates/feit_electric-BR30927CAAG index 8ea454ca4..9afb49a3f 100644 --- a/_templates/feit_electric-BR30927CAAG +++ b/_templates/feit_electric-BR30927CAAG @@ -2,7 +2,7 @@ title: Feit Electric BR30/927CA/AG type: WW category: bulb -standard: E26 +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}' diff --git a/_templates/feit_electric-BR30950CAAG b/_templates/feit_electric-BR30950CAAG index 5ea1c0180..70f1c3066 100644 --- a/_templates/feit_electric-BR30950CAAG +++ b/_templates/feit_electric-BR30950CAAG @@ -2,7 +2,7 @@ title: Feit Electric BR30/950CA/AG type: CW category: bulb -standard: E26 +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}' diff --git a/_templates/feit_electric-OM60927CAAG b/_templates/feit_electric-OM60927CAAG index a2614763c..f8cc69873 100644 --- a/_templates/feit_electric-OM60927CAAG +++ b/_templates/feit_electric-OM60927CAAG @@ -3,7 +3,7 @@ date_added: 2019-04-27 title: Feit Electric OM60/927CA/AG type: WW category: bulb -standard: E26 +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}' diff --git a/_templates/feit_electric-OM60RGBWCAAG b/_templates/feit_electric-OM60RGBWCAAG index 485dc3f75..e823a5e88 100644 --- a/_templates/feit_electric-OM60RGBWCAAG +++ b/_templates/feit_electric-OM60RGBWCAAG @@ -2,7 +2,7 @@ title: Feit Electric OM60/RGBW/CA/AG type: RGBW category: bulb -standard: E26 +standard: e26 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}' diff --git a/_templates/fulighture_A60 b/_templates/fulighture_A60 index 30ecd3c54..e658bb627 100644 --- a/_templates/fulighture_A60 +++ b/_templates/fulighture_A60 @@ -3,7 +3,7 @@ date_added: 2019-11-07 title: Fulighture A60 9W type: RGBW category: bulb -standard: B22 +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}' diff --git a/_templates/geeni-GN-BW903-999 b/_templates/geeni-GN-BW903-999 index 59062300c..7cf2c8999 100644 --- a/_templates/geeni-GN-BW903-999 +++ b/_templates/geeni-GN-BW903-999 @@ -3,7 +3,7 @@ date_added: 2019-09-10 title: Geeni LUX 1050 A21 10W type: CCT category: bulb -standard: E26 +standard: e26 link: https://www.amazon.com/Geeni-Smart-Wi-Fi-Tunable-White/dp/B071DCJ749/ 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}' diff --git a/_templates/geeni-GN-BW904-999 b/_templates/geeni-GN-BW904-999 index e925ff9a0..d480c7c48 100644 --- a/_templates/geeni-GN-BW904-999 +++ b/_templates/geeni-GN-BW904-999 @@ -3,7 +3,7 @@ date_added: 2019-10-26 title: Geeni Prisma 1050 A21 10W type: RGBW category: bulb -standard: E26 +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}' diff --git a/_templates/geeni-GN-BW911-999 b/_templates/geeni-GN-BW911-999 index f71de8eb7..33a2138df 100644 --- a/_templates/geeni-GN-BW911-999 +++ b/_templates/geeni-GN-BW911-999 @@ -3,7 +3,7 @@ date_added: 2019-12-13 title: Geeni LUX Edison A19 7.5W type: Filament category: bulb -standard: E26 +standard: e26 link: https://www.amazon.com/dp/B07R5VS6ZG/ 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}' diff --git a/_templates/generic_10W_RGBW b/_templates/generic_10W_RGBW index a91a88b66..c117991e3 100644 --- a/_templates/generic_10W_RGBW +++ b/_templates/generic_10W_RGBW @@ -4,8 +4,8 @@ title: Generic 10W type: RGBW category: bulb standard: - - E26 - - E27 + - 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}' diff --git a/_templates/globe_37726 b/_templates/globe_37726 index 71c291515..23320c8e8 100644 --- a/_templates/globe_37726 +++ b/_templates/globe_37726 @@ -3,7 +3,7 @@ date_added: 2019-06-12 title: Globe A19 10W type: RGBCCT category: bulb -standard: E27 +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}' diff --git a/_templates/globe_A19_10W_E26 b/_templates/globe_A19_10W_E26 index e6dc5684e..677a30380 100644 --- a/_templates/globe_A19_10W_E26 +++ b/_templates/globe_A19_10W_E26 @@ -3,7 +3,7 @@ date_added: 2019-11-29 title: Globe A19 10W type: WW category: bulb -standard: E26 +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}' diff --git a/_templates/gosund-SP111-v14 b/_templates/gosund-SP111-v14 index 1ac1e71d9..ebefa889d 100644 --- a/_templates/gosund-SP111-v14 +++ b/_templates/gosund-SP111-v14 @@ -2,7 +2,7 @@ date_added: 2019-12-12 title: Gosund SP111 v1.4 link: https://www.ebay.de/i/283634303185 -image: https://cdn.shopify.com/s/files/1/0032/3197/3445/products/Wi-Fi_Smart_Plug_SP111_Only_For_Europe_336x336_1e233ff2-a6e5-4f0a-b65c-080519167c36_2048x2048.jpg?v=1551063460 +image: https://m.media-amazon.com/images/S/aplus-seller-content-images-us-east-1/A1PA6795UKMFR9/AP1KRSUMUNTSI/2c2392eb-0188-4ce4-a20b-ad8131b7e743._CR0,0,300,300_PT0_SX300__.jpg template: '{"NAME":"Gosund SP111","GPIO":[57,255,56,255,0,134,0,0,131,17,132,21,0],"FLAG":0,"BASE":45}' link2: link3: https://www.gosund.store/products/wi-fi-smart-plug-sp111-only-for-europe diff --git a/_templates/gosund_e27_rgbw b/_templates/gosund_e27_rgbw index 49ebc741f..de9f9f995 100644 --- a/_templates/gosund_e27_rgbw +++ b/_templates/gosund_e27_rgbw @@ -3,7 +3,7 @@ date_added: 2019-05-24 title: Gosund 8W type: RGBW category: bulb -standard: E27 +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}' diff --git a/_templates/halonix_prime_prizm_12W_B22 b/_templates/halonix_prime_prizm_12W_B22 index 3cc34c913..a9a113747 100644 --- a/_templates/halonix_prime_prizm_12W_B22 +++ b/_templates/halonix_prime_prizm_12W_B22 @@ -3,7 +3,7 @@ date_added: 2019-11-09 title: Halonix Prime Prizm 12W type: RGB category: bulb -standard: B22 +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}' diff --git a/_templates/hama_10W_E27_RGBW b/_templates/hama_10W_E27_RGBW index 026ab288c..b8842388b 100644 --- a/_templates/hama_10W_E27_RGBW +++ b/_templates/hama_10W_E27_RGBW @@ -3,7 +3,7 @@ date_added: 2019-11-17 title: Hama 10W RGB+WW category: light type: Light -standard: E27 +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}' diff --git a/_templates/hama_176550 b/_templates/hama_176550 index 73c081234..2d585263a 100644 --- a/_templates/hama_176550 +++ b/_templates/hama_176550 @@ -3,7 +3,7 @@ date_added: 2019-11-27 title: Hama 176550 10W type: CCT category: bulb -standard: E27 +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}' diff --git a/_templates/hykker_9W_E27_RGBW b/_templates/hykker_9W_E27_RGBW index dda0308aa..6e572f282 100644 --- a/_templates/hykker_9W_E27_RGBW +++ b/_templates/hykker_9W_E27_RGBW @@ -3,7 +3,7 @@ date_added: 2019-11-23 title: Hykker 9W type: RGBW category: bulb -standard: E27 +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}' diff --git a/_templates/ihommate_ZCH-02 b/_templates/ihommate_ZCH-02 index 702822982..7ae459f0a 100644 --- a/_templates/ihommate_ZCH-02 +++ b/_templates/ihommate_ZCH-02 @@ -3,7 +3,7 @@ date_added: 2019-11-03 title: Ihommate ZCH-02 category: plug type: Plug -standard: CH +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}' diff --git a/_templates/jomarto_9W b/_templates/jomarto_9W index fbec8a41e..c15c842b2 100644 --- a/_templates/jomarto_9W +++ b/_templates/jomarto_9W @@ -4,8 +4,8 @@ title: Jomarto 9W type: RGB category: bulb standard: - - B22 - - E27 + - 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}' diff --git a/_templates/kainsy_E27 b/_templates/kainsy_E27 index 645260c89..5fa8d2a41 100644 --- a/_templates/kainsy_E27 +++ b/_templates/kainsy_E27 @@ -3,7 +3,7 @@ date_added: 2019-07-04 title: Kainsy 7W type: RGBW category: bulb -standard: E27 +standard: e27 link: https://www.amazon.de/KAINSY-Gl%C3%BChbirne-Kompatibel-%C3%A4quivalent-Millionen/dp/B075WQYQ94 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}' diff --git a/_templates/kingart-N3 b/_templates/kingart-N3 index 186edf160..44aee111f 100644 --- a/_templates/kingart-N3 +++ b/_templates/kingart-N3 @@ -9,7 +9,7 @@ link3: flash: serial category: switch type: Switch -standard: UK +standard: uk --- Requires soldering to surface pads (no Sonoff Style through-plated connection holes) but easy enough with a fine tip iron and the solder resist is good. TX and RX are a little close but not too hard to deal with. diff --git a/_templates/kogan-KASB10R b/_templates/kogan-KASB10R index 1768abe8b..52f5b60a6 100644 --- a/_templates/kogan-KASB10R +++ b/_templates/kogan-KASB10R @@ -3,7 +3,7 @@ date_added: 2019-10-31 title: Kogan 10W type: RGBW category: bulb -standard: B22 +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}' diff --git a/_templates/kogan-KASB10W b/_templates/kogan-KASB10W index e8736a60a..2b211f43e 100644 --- a/_templates/kogan-KASB10W +++ b/_templates/kogan-KASB10W @@ -3,7 +3,7 @@ date_added: 2019-04-15 title: Kogan White 10W type: CCT category: bulb -standard: B22 +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}' diff --git a/_templates/kogan-KASHFLB64AA b/_templates/kogan-KASHFLB64AA index 05e220a05..bf29b244c 100644 --- a/_templates/kogan-KASHFLB64AA +++ b/_templates/kogan-KASHFLB64AA @@ -3,7 +3,7 @@ date_added: 2019-12-01 title: Kogan ST64 5W type: Filament category: bulb -standard: B22 +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}' diff --git a/_templates/kohree_a19 b/_templates/kohree_a19 index b6cdcd1b4..5aad37797 100644 --- a/_templates/kohree_a19 +++ b/_templates/kohree_a19 @@ -3,7 +3,7 @@ date_added: 2019-03-18 title: Kohree A19 7W type: RGBCCT category: bulb -standard: E26 +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}' diff --git a/_templates/kuled_9_5W_A19_E26 b/_templates/kuled_9_5W_A19_E26 index a871a121e..01ee1c834 100644 --- a/_templates/kuled_9_5W_A19_E26 +++ b/_templates/kuled_9_5W_A19_E26 @@ -3,7 +3,7 @@ date_added: 2019-11-17 title: Kuled 9.5W A19 type: RGBW category: bulb -standard: E26 +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}' diff --git a/_templates/laideyi-7W b/_templates/laideyi-7W index eb73d8300..89581aaf8 100644 --- a/_templates/laideyi-7W +++ b/_templates/laideyi-7W @@ -3,7 +3,7 @@ date_added: 2019-03-23 title: Laideyi 7W type: RGBW category: bulb -standard: E14 +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}' diff --git a/_templates/legelite_e26 b/_templates/legelite_e26 index 7228e5f36..e9282b16b 100644 --- a/_templates/legelite_e26 +++ b/_templates/legelite_e26 @@ -3,7 +3,7 @@ date_added: 2019-03-24 title: Legelite A60 7W type: RGBCCT category: bulb -standard: E26 +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}' diff --git a/_templates/linganzh_16a b/_templates/linganzh_16a index ff6cd5932..0ece31145 100644 --- a/_templates/linganzh_16a +++ b/_templates/linganzh_16a @@ -1,10 +1,10 @@ --- date_added: 2019-03-27 -title: LINGANZH 16A +title: Linganzh 16A category: plug type: Plug standard: us -link: https://www.amazon.ca/dp/B07D4936JC +link: https://www.amazon.com/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}' link2: diff --git a/_templates/linghanzh_LWE3 b/_templates/linghanzh_LWE3 index aa1239d90..7e4f82a1a 100644 --- a/_templates/linghanzh_LWE3 +++ b/_templates/linghanzh_LWE3 @@ -3,7 +3,7 @@ date_added: 2019-09-14 title: Linganzh LWE3 6W type: RGBW category: bulb -standard: E27 +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}' diff --git a/_templates/lohas_LH-6W-5000k-MR16-2pack b/_templates/lohas_LH-6W-5000k-MR16-2pack index 6d872f994..0a64263d4 100644 --- a/_templates/lohas_LH-6W-5000k-MR16-2pack +++ b/_templates/lohas_LH-6W-5000k-MR16-2pack @@ -3,7 +3,7 @@ date_added: 2019-11-17 title: Lohas 6W type: CW category: bulb -standard: MR16 +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}' diff --git a/_templates/lohas_LH-APPW9-E26-4 b/_templates/lohas_LH-APPW9-E26-4 index d6ef3786b..b3d0c988e 100644 --- a/_templates/lohas_LH-APPW9-E26-4 +++ b/_templates/lohas_LH-APPW9-E26-4 @@ -3,7 +3,7 @@ date_added: 2019-10-18 title: Lohas LH-APP 9W type: RGBW category: bulb -standard: E26 +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}' diff --git a/_templates/lohas_LH-APPW9-E26-4_v2 b/_templates/lohas_LH-APPW9-E26-4_v2 index 8eb61a8fa..3ba6caf4f 100644 --- a/_templates/lohas_LH-APPW9-E26-4_v2 +++ b/_templates/lohas_LH-APPW9-E26-4_v2 @@ -3,7 +3,7 @@ date_added: 2019-11-28 title: Lohas LH-APP v2 9W type: RGBCCT category: bulb -standard: E26 +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}' diff --git a/_templates/lohas_LH-Smart-5W-ZN01204 b/_templates/lohas_LH-Smart-5W-ZN01204 index 6ed260507..d0c2b831b 100644 --- a/_templates/lohas_LH-Smart-5W-ZN01204 +++ b/_templates/lohas_LH-Smart-5W-ZN01204 @@ -3,7 +3,7 @@ date_added: 2019-10-04 title: Lohas LH-ZN012 5W type: RGBW category: bulb -standard: E12 +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}' diff --git a/_templates/lohas_LH-ZN001-9W-E12-N1 b/_templates/lohas_LH-ZN001-9W-E12-N1 index 1d3a770d3..4d60a1261 100644 --- a/_templates/lohas_LH-ZN001-9W-E12-N1 +++ b/_templates/lohas_LH-ZN001-9W-E12-N1 @@ -3,7 +3,7 @@ date_added: 2019-03-09 title: Lohas LH-ZN001 9W type: RGBW category: bulb -standard: E12 +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}' diff --git a/_templates/lohas_LH-ZN005W5E14-2 b/_templates/lohas_LH-ZN005W5E14-2 index 8cfb66521..43ec8505b 100644 --- a/_templates/lohas_LH-ZN005W5E14-2 +++ b/_templates/lohas_LH-ZN005W5E14-2 @@ -3,7 +3,7 @@ date_added: 2019-08-25 title: Lohas LH-ZN005 5W type: RGBW category: bulb -standard: E14 +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}' diff --git a/_templates/lohas_LH-ZN006-RGB-A21-N1 b/_templates/lohas_LH-ZN006-RGB-A21-N1 index 417f553c5..fae1489b3 100644 --- a/_templates/lohas_LH-ZN006-RGB-A21-N1 +++ b/_templates/lohas_LH-ZN006-RGB-A21-N1 @@ -3,7 +3,7 @@ date_added: 2019-11-28 title: Lohas LH-ZN006 14W type: RGBW category: bulb -standard: E26 +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}' diff --git a/_templates/lohas_LH-ZN031-2000K-6500K-2Pack b/_templates/lohas_LH-ZN031-2000K-6500K-2Pack index 6376d740d..1caba8ab3 100644 --- a/_templates/lohas_LH-ZN031-2000K-6500K-2Pack +++ b/_templates/lohas_LH-ZN031-2000K-6500K-2Pack @@ -3,7 +3,7 @@ date_added: 2019-04-03 title: Lohas ZN031 8W type: RGBCCT category: bulb -standard: E26 +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}' diff --git a/_templates/lohas_LH-ZN124-5000K--E26-2P b/_templates/lohas_LH-ZN124-5000K--E26-2P index c65e0c7cd..d0a3f22e0 100644 --- a/_templates/lohas_LH-ZN124-5000K--E26-2P +++ b/_templates/lohas_LH-ZN124-5000K--E26-2P @@ -3,7 +3,7 @@ date_added: 2019-11-22 title: Lohas LH-ZN124 10W type: CW category: bulb -standard: E26 +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}' diff --git a/_templates/lohas_ZN070 b/_templates/lohas_ZN070 index fee232df5..6256379b0 100644 --- a/_templates/lohas_ZN070 +++ b/_templates/lohas_ZN070 @@ -3,7 +3,7 @@ date_added: 2019-12-02 title: Lohas ZN070 8W category: bulb type: CCT -standard: E26 +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}' diff --git a/_templates/lonsonho_9W_E27_RGBWW b/_templates/lonsonho_9W_E27_RGBWW index 2dbf7a521..7323f947d 100644 --- a/_templates/lonsonho_9W_E27_RGBWW +++ b/_templates/lonsonho_9W_E27_RGBWW @@ -3,7 +3,7 @@ date_added: 2019-11-11 title: Lonsonho 9W type: RGBW category: bulb -standard: E27 +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}' diff --git a/_templates/lsc_smart_connect_filament b/_templates/lsc_smart_connect_filament index c91ab7404..a4e5c7cff 100644 --- a/_templates/lsc_smart_connect_filament +++ b/_templates/lsc_smart_connect_filament @@ -3,7 +3,7 @@ date_added: 2019-09-22 title: LSC Smart Connect Smart Filament 5.5W type: Filament category: bulb -standard: E27 +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}' diff --git a/_templates/lsc_smart_connect_multicolor_spot b/_templates/lsc_smart_connect_multicolor_spot index 93d6a19fa..affa056b5 100644 --- a/_templates/lsc_smart_connect_multicolor_spot +++ b/_templates/lsc_smart_connect_multicolor_spot @@ -3,7 +3,7 @@ date_added: 2019-10-21 title: LSC Smart Connect Multicolor Spot 5W type: RGBW category: bulb -standard: GU10 +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}' diff --git a/_templates/lumiman-LM530-1p-UK-E27 b/_templates/lumiman-LM530-1p-UK-E27 index 8d89b0405..8600d8063 100644 --- a/_templates/lumiman-LM530-1p-UK-E27 +++ b/_templates/lumiman-LM530-1p-UK-E27 @@ -3,7 +3,7 @@ date_added: 2019-03-09 title: Lumiman LM530 7.5W type: RGBW category: bulb -standard: E27 +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}' diff --git a/_templates/lumiman_LM650-2P-CA b/_templates/lumiman_LM650-2P-CA index e1b9b75a5..6370818ab 100644 --- a/_templates/lumiman_LM650-2P-CA +++ b/_templates/lumiman_LM650-2P-CA @@ -3,7 +3,7 @@ date_added: 2019-03-20 title: Lumiman LM650-2P-CA 7.5W type: RGBW category: bulb -standard: E26 +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}' diff --git a/_templates/luminea_ZX-2831 b/_templates/luminea_ZX-2831 index ed79d4ba6..da4edb4cd 100644 --- a/_templates/luminea_ZX-2831 +++ b/_templates/luminea_ZX-2831 @@ -3,7 +3,7 @@ date_added: 2019-03-20 title: Luminea ZX-2831 type: CCT category: bulb -standard: E27 +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}' diff --git a/_templates/luminea_ZX-2832 b/_templates/luminea_ZX-2832 index 856a73b90..3b2896e31 100644 --- a/_templates/luminea_ZX-2832 +++ b/_templates/luminea_ZX-2832 @@ -3,7 +3,7 @@ date_added: 2019-03-17 title: Luminea ZX-2832 type: RGBW category: bulb -standard: E27 +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}' diff --git a/_templates/lyasi_pt-bw09 b/_templates/lyasi_pt-bw09 index 645f6ea0c..ca5f4a4c4 100644 --- a/_templates/lyasi_pt-bw09 +++ b/_templates/lyasi_pt-bw09 @@ -3,7 +3,7 @@ date_added: 2019-03-01 title: Lyasi PT-BW09 type: RGB category: bulb -standard: E27 +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}' diff --git a/_templates/manzoku XS-001 b/_templates/manzoku-XS-001 similarity index 76% rename from _templates/manzoku XS-001 rename to _templates/manzoku-XS-001 index 7ca0a5336..e9503761d 100644 --- a/_templates/manzoku XS-001 +++ b/_templates/manzoku-XS-001 @@ -3,9 +3,9 @@ date_added: 2019-10-29 title: Manzoku XS-001 10W type: RGBW category: bulb -standard: E26 +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 +image: https://images-na.ssl-images-amazon.com/images/I/41X9KE%2B2zwL._AC_SL1000_.jpg 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/martiny_jerry_3_way b/_templates/martin-jerry-3-way-ST01 similarity index 96% rename from _templates/martiny_jerry_3_way rename to _templates/martin-jerry-3-way-ST01 index f806ff92a..bd85914fc 100644 --- a/_templates/martiny_jerry_3_way +++ b/_templates/martin-jerry-3-way-ST01 @@ -1,6 +1,6 @@ --- date_added: 2019-08-23 -title: Martin Jerry 3 Way +title: Martin Jerry ST01 3 Way category: switch type: Switch standard: us diff --git a/_templates/mjswitch b/_templates/martin-jerry-MJ-S01 similarity index 63% rename from _templates/mjswitch rename to _templates/martin-jerry-MJ-S01 index edd766da0..fe44977ff 100644 --- a/_templates/mjswitch +++ b/_templates/martin-jerry-MJ-S01 @@ -1,9 +1,10 @@ --- -title: Martin Jerry 15A +date: 2019-12-14 +title: Martin Jerry MJ-S01 15A category: switch 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":[0,0,0,0,57,56,0,0,21,17,0,0,0],"FLAG":0,"BASE":18}' --- diff --git a/_templates/maxcio_YX-L01P-E27-2P b/_templates/maxcio_YX-L01P-E27-2P index 2da5e78db..065ad4559 100644 --- a/_templates/maxcio_YX-L01P-E27-2P +++ b/_templates/maxcio_YX-L01P-E27-2P @@ -3,7 +3,7 @@ date_added: 2019-03-14 title: Maxcio YX-L01P-E27-2P 9W type: RGBW category: bulb -standard: E27 +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}' diff --git a/_templates/merkury-innovations-MI-BW902-999W b/_templates/merkury-innovations-MI-BW902-999W index 85b0438ff..e5f45bd63 100644 --- a/_templates/merkury-innovations-MI-BW902-999W +++ b/_templates/merkury-innovations-MI-BW902-999W @@ -2,7 +2,7 @@ title: Merkury Innovations MI-BW902-999W type: WW category: bulb -standard: E26 +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}' diff --git a/_templates/merkury-innovations-MI-BW904-999W b/_templates/merkury-innovations-MI-BW904-999W index 8f6bdb98d..3fcac68d0 100644 --- a/_templates/merkury-innovations-MI-BW904-999W +++ b/_templates/merkury-innovations-MI-BW904-999W @@ -2,7 +2,7 @@ title: Merkury MI-BW904-999W 11W type: RGBW category: bulb -standard: E26 +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}' diff --git a/_templates/merkury-innovations-MI-BW905-999W b/_templates/merkury-innovations-MI-BW905-999W index 9c1a84a38..0e4fb1de1 100644 --- a/_templates/merkury-innovations-MI-BW905-999W +++ b/_templates/merkury-innovations-MI-BW905-999W @@ -2,7 +2,7 @@ title: Merkury MI-BW905-999W 8W type: CCT category: bulb -standard: E26 +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}' diff --git a/_templates/merkury_innovations_vintage_edison b/_templates/merkury_innovations_vintage_edison index 88b8a4b34..396e980f3 100644 --- a/_templates/merkury_innovations_vintage_edison +++ b/_templates/merkury_innovations_vintage_edison @@ -3,7 +3,7 @@ date_added: 2019-10-27 title: Merkury Innovations Vintage 8W type: Filament category: bulb -standard: E26 +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}' diff --git a/_templates/mirabella_genio_1002334 b/_templates/mirabella_genio_1002334 index 4e7f11396..3eeaed18e 100644 --- a/_templates/mirabella_genio_1002334 +++ b/_templates/mirabella_genio_1002334 @@ -4,12 +4,13 @@ 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 + - b22 + - e27 +link3: https://mirabellagenio.net.au/es-%2F-bc-cool-white-specs +image: https://www.kmart.com.au/wcsstore/Kmart/images/ncatalog/sz/5/42707875-1-sz.jpg template: '{"NAME":"GenioBulbCW","GPIO":[0,0,0,0,38,37,0,0,0,40,39,0,0],"FLAG":0,"BASE":18}' -link2: https://www.kmart.com.au/product/mirabella-genio-b22-cw-wi-fi-dim-bulb/2326805 +link1: https://www.kmart.com.au/product/mirabella-genio-b22-cw-wi-fi-dim-bulb/2326805 +link2: --- Includes also Mirabella Genio 1002335 diff --git a/_templates/mirabella_genio_1002336 b/_templates/mirabella_genio_1002336 index 3b31140c8..fffec150c 100644 --- a/_templates/mirabella_genio_1002336 +++ b/_templates/mirabella_genio_1002336 @@ -5,7 +5,7 @@ type: CCT category: bulb standard: 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 +image: https://www.kmart.com.au/wcsstore/Kmart/images/ncatalog/sz/0/42707820-1-sz.jpg template: '{"NAME":"GenioBulbCCT","GPIO":[0,0,0,0,0,37,0,0,0,38,0,0,0],"FLAG":0,"BASE":18}' link2: link3: https://mirabellagenio.net.au/es-%2F-bc-warm-cct-specs diff --git a/_templates/mirabella_genio_1002338 b/_templates/mirabella_genio_1002338 index abf1d2b4b..85c2afa68 100644 --- a/_templates/mirabella_genio_1002338 +++ b/_templates/mirabella_genio_1002338 @@ -4,12 +4,13 @@ title: Mirabella Genio 1002338 9W type: RGBW category: bulb standard: - - B22 - - E27 + - 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 +image: https://www.kmart.com.au/wcsstore/Kmart/images/ncatalog/sz/8/42707998-1-sz.jpg template: '{"NAME":"GenioBulbRGB","GPIO":[0,0,0,0,37,40,0,0,38,0,39,0,0],"FLAG":1,"BASE":18}' -link2: https://mirabellagenio.net.au/es-%2F-bc-warm-rgb-specs +link2: +link3: https://mirabellagenio.net.au/es-%2F-bc-warm-rgb-specs --- Includes also Mirabella Genio 1002339 diff --git a/_templates/mirabella_genio_1002341 b/_templates/mirabella_genio_1002341 index 68c26397d..0c02cf9ed 100644 --- a/_templates/mirabella_genio_1002341 +++ b/_templates/mirabella_genio_1002341 @@ -4,9 +4,9 @@ category: plug type: Plug standard: au 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 +image: https://www.kmart.com.au/wcsstore/Kmart/images/ncatalog/sz/7/42707967-1-sz.jpg template: '{"NAME":"Genio 1","GPIO":[0,0,56,0,0,0,0,0,21,17,0,0,0],"FLAG":0,"BASE":1}' -link2: https://mirabellagenio.net.au/smart-adaptor +link3: 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. Opening up the device is easy. Two 2 screws are removed from the back panel then a small amount of gentle prying removed the cover exposing the components. Two more screws hold the PCB in place. diff --git a/_templates/mirabella_genio_I002577 b/_templates/mirabella_genio_I002577 index 54630c104..f432d4b98 100644 --- a/_templates/mirabella_genio_I002577 +++ b/_templates/mirabella_genio_I002577 @@ -5,7 +5,7 @@ category: misc type: IR Bridge standard: au 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 +image: https://www.kmart.com.au/wcsstore/Kmart/images/ncatalog/sz/0/42769460-1-sz.jpg template: '{"NAME":"Genio IR TxRx","GPIO":[255,255,255,255,56,51,0,0,0,17,8,0,0],"FLAG":0,"BASE":62}' link2: https://mirabellagenio.net.au/smart-ir-controller --- diff --git a/_templates/mirabella_genio__I002578 b/_templates/mirabella_genio_I002578 similarity index 85% rename from _templates/mirabella_genio__I002578 rename to _templates/mirabella_genio_I002578 index 72c98a0bf..9a975df31 100644 --- a/_templates/mirabella_genio__I002578 +++ b/_templates/mirabella_genio_I002578 @@ -11,11 +11,13 @@ link2: --- Short press = All on incl. button LED -Long press = All off incl. button LED +Long press = All off incl. button LED + +```console +Backlog ButtonTopic 0; SetOption1 1; SetOption32 20 +``` + ```console -ButtonTopic 0 -SetOption1 1 -SetOption32 20 Rule on button1#state=3 do backlog power1 0;power2 0;power4 0;power3 0;power5 0;power6 1 endon on button1#state=2 do backlog power1 1;power2 1;power4 1;power3 1;power5 1;power6 0 endon Rule 1 ``` diff --git a/_templates/mirabella_genio_I002579 b/_templates/mirabella_genio_I002579 index 013e8a32d..4b836a9e9 100644 --- a/_templates/mirabella_genio_I002579 +++ b/_templates/mirabella_genio_I002579 @@ -4,9 +4,10 @@ title: Mirabella Genio I002579 category: light type: LED Strip standard: au -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 +link3: https://mirabellagenio.net.au/led-strip-light +image: https://www.kmart.com.au/wcsstore/Kmart/images/ncatalog/sz/9/42826859-1-sz.jpg template: '{"NAME":"MirabellaStrip","GPIO":[17,0,0,0,37,40,0,0,38,0,39,0,0],"FLAG":0,"BASE":18}' +link: https://www.kmart.com.au/product/mirabella-genio-wi-fi-led-strip-light/2754878 link2: --- diff --git a/_templates/mirabella_genio_I002741 b/_templates/mirabella_genio_I002741 index 59d238f87..effb77f02 100644 --- a/_templates/mirabella_genio_I002741 +++ b/_templates/mirabella_genio_I002741 @@ -5,9 +5,10 @@ category: light type: Light standard: au 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 +image: https://www.kmart.com.au/wcsstore/Kmart/images/ncatalog/sz/8/42799368-1-sz.jpg template: '{"NAME":"GenioDLightRGB","GPIO":[0,0,0,0,38,37,0,0,41,39,40,0,0],"FLAG":0,"BASE":18}' -link2: https://mirabellagenio.net.au/downlight-rgb%2Bcct +link2: +link3: https://mirabellagenio.net.au/downlight-rgb%2Bcct --- This is specifically for the RGB+CCT variant (Can do both RGB and cool to warm white). diff --git a/_templates/mirabella_genio_I002742 b/_templates/mirabella_genio_I002742 index 938812a0a..7e44c4c7b 100644 --- a/_templates/mirabella_genio_I002742 +++ b/_templates/mirabella_genio_I002742 @@ -5,9 +5,10 @@ category: light type: Light standard: au 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 +image: https://www.kmart.com.au/wcsstore/Kmart/images/ncatalog/sz/7/42799337-1-sz.jpg template: '{"NAME":"GenioDLightCCT","GPIO":[0,0,0,0,0,0,0,0,38,0,37,0,0],"FLAG":0,"BASE":48}' -link2: https://mirabellagenio.net.au/downlight-rgb%2Bcct +link2: +link3: https://mirabellagenio.net.au/downlight-rgb%2Bcct --- This is specifically for the CCT variant (Cool to warm white only)! diff --git a/_templates/mirabella_genio_I002745 b/_templates/mirabella_genio_I002745 index abc4f00b6..5a12fe25b 100644 --- a/_templates/mirabella_genio_I002745 +++ b/_templates/mirabella_genio_I002745 @@ -3,11 +3,12 @@ date_added: 2019-10-31 title: Mirabella Genio I002745 SES 5.5W type: CCT category: bulb -standard: E14 +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}' -link2: https://mirabellagenio.net.au/ses-led-candle +link2: +link3: https://mirabellagenio.net.au/ses-led-candle --- Flashed with Tuya-Convert 2 diff --git a/_templates/mirabella_genio_I002746 b/_templates/mirabella_genio_I002746 index c9dd072ca..5cd2888fa 100644 --- a/_templates/mirabella_genio_I002746 +++ b/_templates/mirabella_genio_I002746 @@ -3,11 +3,12 @@ date_added: 2019-10-29 title: Mirabella Genio I002746 6W type: CCT category: bulb -standard: GU10 +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}' -link2: https://mirabellagenio.net.au/wi-fi-led-gu10 +link2: +link3: https://mirabellagenio.net.au/wi-fi-led-gu10 --- Flashed with [Tuya-Convert](https://github.com/ct-Open-Source/tuya-convert) diff --git a/_templates/mixigoo_10W_E27 b/_templates/mixigoo_10W_E27 index 969acacd2..edf110616 100644 --- a/_templates/mixigoo_10W_E27 +++ b/_templates/mixigoo_10W_E27 @@ -3,7 +3,7 @@ date_added: 2019-10-03 title: Mixigoo 10W type: RGBW category: bulb -standard: E27 +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}' diff --git a/_templates/moeshouse-WWK b/_templates/moes-WWK similarity index 80% rename from _templates/moeshouse-WWK rename to _templates/moes-WWK index a63aba453..d03847b36 100644 --- a/_templates/moeshouse-WWK +++ b/_templates/moes-WWK @@ -15,11 +15,11 @@ link2: link3: https://www.moeshouse.com/collections/smart-socket/products/universal-wifi-smart-wall-socket-13a-outlet-glass-panel-french-app-remote-control-works-with-amazon-echo-alexa-google-home --- -Serial number changes according to plug type and color: -UN - Universal plug -DE - Type F plug -FR - Type E plug -UK - Type G plug +Serial number changes according to plug type and color: +* UN - Universal plug +* DE - Type F plug +* FR - Type E plug +* UK - Type G plug Comes in black (B), white (W) and gold (G) color for each plug type. diff --git a/_templates/moko b/_templates/moko-switch similarity index 65% rename from _templates/moko rename to _templates/moko-switch index ee7f772a5..06c22a2e4 100644 --- a/_templates/moko +++ b/_templates/moko-switch @@ -1,11 +1,11 @@ --- date_added: 2019-10-01 -title: Moko +title: MoKo Smart Life category: switch 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 +image: https://user-images.githubusercontent.com/5904370/70848523-28096c80-1e73-11ea-86c5-d44e7ba877b8.png template: '{"NAME":"Moko Switch","GPIO":[0,0,0,17,21,134,0,0,0,0,0,0,0],"FLAG":0,"BASE":59}' link2: --- diff --git a/_templates/moko_YX-L01C-E27 b/_templates/moko_YX-L01C-E27 index 80c82c1d7..29ebd2f8a 100644 --- a/_templates/moko_YX-L01C-E27 +++ b/_templates/moko_YX-L01C-E27 @@ -1,9 +1,9 @@ --- date_added: 2019-09-25 -title: MOKO YX-L01C-E27 9W +title: MoKo YX-L01C-E27 9W type: RGB category: bulb -standard: E27 +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}' diff --git a/_templates/muvit_IO_miobulb001 b/_templates/muvit_IO_miobulb001 index d99253c97..e9cb94ea7 100644 --- a/_templates/muvit_IO_miobulb001 +++ b/_templates/muvit_IO_miobulb001 @@ -3,7 +3,7 @@ date_added: 2019-11-05 title: muvit IO miobulb001 5W type: RGB category: bulb -standard: E27 +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}' diff --git a/_templates/nedis_WIFILC10WTE14 b/_templates/nedis_WIFILC10WTE14 index 2d0bcdb76..bd9dc5da7 100644 --- a/_templates/nedis_WIFILC10WTE14 +++ b/_templates/nedis_WIFILC10WTE14 @@ -3,7 +3,7 @@ date_added: 2019-11-26 title: Nedis WIFILC10WTE14 type: RGBW category: bulb -standard: E14 +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}' diff --git a/_templates/nedis_WIFILC10WTE27 b/_templates/nedis_WIFILC10WTE27 index 304437390..ff3894434 100644 --- a/_templates/nedis_WIFILC10WTE27 +++ b/_templates/nedis_WIFILC10WTE27 @@ -3,7 +3,7 @@ date_added: 2019-09-04 title: Nedis WIFILC10WTE27 type: RGBW category: bulb -standard: E27 +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}' diff --git a/_templates/nedis_WIFILF10GDG125 b/_templates/nedis_WIFILF10GDG125 index 08764323e..38caee1ff 100644 --- a/_templates/nedis_WIFILF10GDG125 +++ b/_templates/nedis_WIFILF10GDG125 @@ -3,7 +3,7 @@ date_added: 2019-10-30 title: Nedis WIFILF10GDG125 type: Filament category: bulb -standard: E27 +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}' diff --git a/_templates/nedis_WIFILW10WTE14 b/_templates/nedis_WIFILW10WTE14 index 6096dd1e2..de0c60195 100644 --- a/_templates/nedis_WIFILW10WTE14 +++ b/_templates/nedis_WIFILW10WTE14 @@ -3,7 +3,7 @@ date_added: 2019-11-01 title: Nedis WIFILW10WTE14 type: CCT category: bulb -standard: E14 +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}' diff --git a/_templates/nedis_WIFILW10WTE27 b/_templates/nedis_WIFILW10WTE27 index 08ed4f668..5694df3e9 100644 --- a/_templates/nedis_WIFILW10WTE27 +++ b/_templates/nedis_WIFILW10WTE27 @@ -3,7 +3,7 @@ date_added: 2019-10-11 title: Nedis WIFILW10WTE27 type: CCT category: bulb -standard: E27 +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}' diff --git a/_templates/nitebird_TT-WB4 b/_templates/nitebird_TT-WB4 index 971a5b916..9070cf93b 100644 --- a/_templates/nitebird_TT-WB4 +++ b/_templates/nitebird_TT-WB4 @@ -3,7 +3,7 @@ date_added: 2019-09-27 title: NiteBird TT-WB4 type: RGBW category: bulb -standard: E26 +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}' diff --git a/_templates/novostella_GD-BW09 b/_templates/novostella_GD-BW09 index 873781b93..5c94c6ac6 100644 --- a/_templates/novostella_GD-BW09 +++ b/_templates/novostella_GD-BW09 @@ -3,7 +3,7 @@ date_added: 2019-09-27 title: Novostella GD-BW09 12W type: RGBCCT category: bulb -standard: E27 +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}' diff --git a/_templates/novostella_HM-LB07-RGBCW-US-1 b/_templates/novostella_HM-LB07-RGBCW-US-1 index aa1d88efa..1dfef08db 100644 --- a/_templates/novostella_HM-LB07-RGBCW-US-1 +++ b/_templates/novostella_HM-LB07-RGBCW-US-1 @@ -3,7 +3,7 @@ date_added: 2019-11-30 title: Novostella HM-LB07 9W type: RGBCCT category: bulb -standard: E26 +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}' diff --git a/_templates/novostella_UT55505-RGBCW-UK-1 b/_templates/novostella_UT55505-RGBCW-UK-1 index 5759193a3..7d7b46225 100644 --- a/_templates/novostella_UT55505-RGBCW-UK-1 +++ b/_templates/novostella_UT55505-RGBCW-UK-1 @@ -3,7 +3,7 @@ date_added: 2019-03-18 title: Novostella UT55505 7W type: RGBCCT category: bulb -standard: B22 +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}' diff --git a/_templates/ohlux_7W_A19_E26 b/_templates/ohlux_7W_A19_E26 index 57486b60f..ab438ebf7 100644 --- a/_templates/ohlux_7W_A19_E26 +++ b/_templates/ohlux_7W_A19_E26 @@ -3,7 +3,7 @@ date_added: 2019-11-04 title: OHLUX 7W type: RGBCCT category: bulb -standard: E26 +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}' diff --git a/_templates/oobest_ZN93028 b/_templates/oobest_ZN93028 index b5bdf2733..21ee1f002 100644 --- a/_templates/oobest_ZN93028 +++ b/_templates/oobest_ZN93028 @@ -3,7 +3,7 @@ date_added: 2019-06-20 title: Oobest ZN93028 11W type: RGB category: bulb -standard: E27 +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}' diff --git a/_templates/oobest_rgbw b/_templates/oobest_rgbw index 110527960..0157c7281 100644 --- a/_templates/oobest_rgbw +++ b/_templates/oobest_rgbw @@ -3,7 +3,7 @@ date_added: 2019-04-24 title: Oobest 6.5W/4.5W type: RGBW category: bulb -standard: E27 +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}' diff --git a/_templates/phillips_zhirui_E14 b/_templates/phillips_zhirui_E14 index ab8e295d7..3d9b9b2c0 100644 --- a/_templates/phillips_zhirui_E14 +++ b/_templates/phillips_zhirui_E14 @@ -2,7 +2,7 @@ title: Philips Zhirui Candle 3.5W type: CCT category: bulb -standard: E14 +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}' diff --git a/_templates/phillips_zhirui_E27 b/_templates/phillips_zhirui_E27 index 0ff3f6275..6d65b521e 100644 --- a/_templates/phillips_zhirui_E27 +++ b/_templates/phillips_zhirui_E27 @@ -2,7 +2,7 @@ title: Phillips Zhirui 6.5W type: CCT category: bulb -standard: E27 +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}' diff --git a/_templates/powertech-SL225X b/_templates/powertech-SL225X index c49687556..5e0a1281c 100644 --- a/_templates/powertech-SL225X +++ b/_templates/powertech-SL225X @@ -2,7 +2,7 @@ date_added: 2019-12-07 title: Powertech SL225X 9W link: https://www.jaycar.com.au/smart-wi-fi-led-bulb-with-colour-change-with-bayonet-light-fitting/p/SL2250 -image: https://www.jaycar.com.au/medias/sys_master/images/9334930833438/SL2250-smart-wi-fi-led-bulb-with-colour-change-with-bayonet-light-fittinggallery8-900.jpg +image: https://user-images.githubusercontent.com/5904370/70851074-32d2fa00-1e91-11ea-866d-ddeb96584366.png template: '{"NAME":"Jaycar SL225X","GPIO":[0,0,0,0,37,40,0,0,38,41,39,0,0],"FLAG":0,"BASE":18}' link2: link3: diff --git a/_templates/premier_10W_A19_E26 b/_templates/premier_10W_A19_E26 index c685da903..b3dc782f9 100644 --- a/_templates/premier_10W_A19_E26 +++ b/_templates/premier_10W_A19_E26 @@ -3,7 +3,7 @@ date_added: 2019-11-13 title: Premier 10W type: RGBW category: bulb -standard: E26 +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}' diff --git a/_templates/qualitel_ALS08L b/_templates/qualitel_ALS08L index 0d261937d..3d86b65a9 100644 --- a/_templates/qualitel_ALS08L +++ b/_templates/qualitel_ALS08L @@ -4,8 +4,8 @@ title: Qualitel ALS08L type: RGBCCT category: bulb standard: - - E27 - - B22 + - 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}' diff --git a/_templates/reafoo_A26 b/_templates/reafoo_A26 index 5c4aec40e..81e247096 100644 --- a/_templates/reafoo_A26 +++ b/_templates/reafoo_A26 @@ -3,7 +3,7 @@ date_added: 2019-10-01 title: Reafoo A26 9W type: RGBCCT category: bulb -standard: E26 +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}' diff --git a/_templates/sana_SW02-03 b/_templates/sana_SW02-03 index 097654c32..171764c21 100644 --- a/_templates/sana_SW02-03 +++ b/_templates/sana_SW02-03 @@ -1,11 +1,11 @@ --- date_added: 2019-07-01 -title: SANA +title: SANA SW02-03 category: switch type: Switch standard: us link: https://www.amazon.com/installation-Control-Compatible-Required-Switches/dp/B07MZQ4LJ9/ -image: https://i.imgur.com/nUJqNMj.jpg +image: https://images-na.ssl-images-amazon.com/images/I/51ojKWDhFPL._AC_SL1500_.jpg template: '{"NAME":"SW02-03","GPIO":[56,255,255,19,23,18,0,0,17,21,255,22,255],"FLAG":0,"BASE":18}' link2: --- diff --git a/_templates/saudio_X002BU0DOL b/_templates/saudio_X002BU0DOL index 8986bf27f..6f8ce7d63 100644 --- a/_templates/saudio_X002BU0DOL +++ b/_templates/saudio_X002BU0DOL @@ -3,7 +3,7 @@ date_added: 2019-11-25 title: Saudio X002BU0DOL type: RGBCCT category: bulb -standard: E26 +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}' diff --git a/_templates/smart_A19_RGBW_8W_E26 b/_templates/smart_A19_RGBW_8W_E26 index fdaa6bdea..9bd7b6f15 100644 --- a/_templates/smart_A19_RGBW_8W_E26 +++ b/_templates/smart_A19_RGBW_8W_E26 @@ -3,7 +3,7 @@ date_added: 2019-05-27 title: Smart 8W type: RGBW category: bulb -standard: E26 +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}' diff --git a/_templates/solimo_9W_B22 b/_templates/solimo_9W_B22 index 373156211..55caba7ad 100644 --- a/_templates/solimo_9W_B22 +++ b/_templates/solimo_9W_B22 @@ -3,7 +3,7 @@ date_added: 2019-10-02 title: Solimo 9W type: RGBW category: bulb -standard: B22 +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}' diff --git a/_templates/sonoff_B1 b/_templates/sonoff_B1 index abd74c925..1d6b5b787 100644 --- a/_templates/sonoff_B1 +++ b/_templates/sonoff_B1 @@ -2,7 +2,7 @@ title: Sonoff B1 (R2) type: RGBCCT category: bulb -standard: E27 +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}' diff --git a/_templates/swisstone_SH330 b/_templates/swisstone_SH330 index 18351e9d2..2eac6fdf3 100644 --- a/_templates/swisstone_SH330 +++ b/_templates/swisstone_SH330 @@ -3,7 +3,7 @@ date_added: 2019-11-21 title: Swisstone SH 330 type: CCT category: bulb -standard: E27 +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}' diff --git a/_templates/swisstone_SH340 b/_templates/swisstone_SH340 index f26414773..8735713ff 100644 --- a/_templates/swisstone_SH340 +++ b/_templates/swisstone_SH340 @@ -3,7 +3,7 @@ date_added: 2019-11-05 title: Swisstone SH 340 type: RGBW category: bulb -standard: E27 +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}' diff --git a/_templates/syska_9W_B22_RGBW b/_templates/syska_9W_B22_RGBW index e00606df6..38379c4bd 100644 --- a/_templates/syska_9W_B22_RGBW +++ b/_templates/syska_9W_B22_RGBW @@ -3,7 +3,7 @@ date_added: 2019-11-23 title: Syska 9W type: RGBW category: bulb -standard: B22 +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}' diff --git a/_templates/teckin_SB50 b/_templates/teckin_SB50 index abf454e8f..b642796ff 100644 --- a/_templates/teckin_SB50 +++ b/_templates/teckin_SB50 @@ -3,7 +3,7 @@ date_added: 2019-03-03 title: Teckin SB50 7.5W type: RGBW category: bulb -standard: E27 +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}' diff --git a/_templates/teckin_SB50-2 b/_templates/teckin_SB50-2 index e962929ec..e507783e0 100644 --- a/_templates/teckin_SB50-2 +++ b/_templates/teckin_SB50-2 @@ -3,7 +3,7 @@ date_added: 2019-10-22 title: Teckin SB50-2 8W type: RGBCCT category: bulb -standard: E27 +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}' diff --git a/_templates/teckin_SB50_v2 b/_templates/teckin_SB50_v2 index c7283144a..c5836d4c7 100644 --- a/_templates/teckin_SB50_v2 +++ b/_templates/teckin_SB50_v2 @@ -3,7 +3,7 @@ date_added: 2019-09-30 title: Teckin SB50 v2 7.5W type: RGBW category: bulb -standard: E27 +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}' diff --git a/_templates/teckin_SB51 b/_templates/teckin_SB51 index 16a75abc5..da063f437 100644 --- a/_templates/teckin_SB51 +++ b/_templates/teckin_SB51 @@ -3,7 +3,7 @@ date_added: 2019-04-17 title: Teckin SB51 type: RGBW category: bulb -standard: B22 +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}' diff --git a/_templates/teckin_SB53 b/_templates/teckin_SB53 index f96a9210c..fb8087fce 100644 --- a/_templates/teckin_SB53 +++ b/_templates/teckin_SB53 @@ -3,7 +3,7 @@ date_added: 2019-08-30 title: Teckin SB53 type: RGBCCT category: bulb -standard: E27 +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}' diff --git a/_templates/tiklok_TL530-1P-CA b/_templates/tiklok_TL530-1P-CA index 944ca9c58..2c5df57b0 100644 --- a/_templates/tiklok_TL530-1P-CA +++ b/_templates/tiklok_TL530-1P-CA @@ -3,7 +3,7 @@ date_added: 2019-10-02 title: TikLOk TL530-1P-CA type: RGBW category: bulb -standard: E26 +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}' diff --git a/_templates/v-tac_VT-5113 b/_templates/v-tac_VT-5113 index e9997691e..01b834edc 100644 --- a/_templates/v-tac_VT-5113 +++ b/_templates/v-tac_VT-5113 @@ -3,7 +3,7 @@ date_added: 2019-11-24 title: V-Tac VT-5113 type: RGBW category: bulb -standard: E27 +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}' diff --git a/_templates/wipro_garnet_NS7001 b/_templates/wipro_garnet_NS7001 index 946e11cb4..853963136 100644 --- a/_templates/wipro_garnet_NS7001 +++ b/_templates/wipro_garnet_NS7001 @@ -3,7 +3,7 @@ date_added: 2019-11-23 title: Wipro Garnet NS7001 7W type: RGB category: bulb -standard: B22 +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}' diff --git a/_templates/wipro_garnet_NS9001 b/_templates/wipro_garnet_NS9001 index 8d070de49..2a6500bc9 100644 --- a/_templates/wipro_garnet_NS9001 +++ b/_templates/wipro_garnet_NS9001 @@ -3,7 +3,7 @@ date_added: 2019-06-06 title: Wipro Garnet NS9001 9W type: RGBCCT category: bulb -standard: B22 +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}' diff --git a/_templates/wipro_garnet_NS9100 b/_templates/wipro_garnet_NS9100 index 7a22b787f..3427fdc2f 100644 --- a/_templates/wipro_garnet_NS9100 +++ b/_templates/wipro_garnet_NS9100 @@ -3,7 +3,7 @@ date_added: 2019-11-23 title: Wipro Garnet NS9100 9W type: CCT category: bulb -standard: B22 +standard: b22 link: https://www.amazon.in/gp/product/B07WZNNYDM 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}' diff --git a/_templates/woopower-e14 b/_templates/woopower-e14 index a93eb0ae2..5f2f09358 100644 --- a/_templates/woopower-e14 +++ b/_templates/woopower-e14 @@ -3,7 +3,7 @@ date_added: 2019-03-14 title: Woopower 5W type: RGBW category: bulb -standard: E14 +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}' diff --git a/_templates/woox_R4553 b/_templates/woox_R4553 index 31c3258d8..2fcf6f810 100644 --- a/_templates/woox_R4553 +++ b/_templates/woox_R4553 @@ -3,7 +3,7 @@ date_added: 2019-11-07 title: WOOX R4553 type: RGBW category: bulb -standard: E27 +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}' diff --git a/_templates/zzhxon_6w_e14 b/_templates/zzhxon_6w_e14 index ecb2de288..f72aff825 100644 --- a/_templates/zzhxon_6w_e14 +++ b/_templates/zzhxon_6w_e14 @@ -4,8 +4,8 @@ title: ZZHXON 6W type: RGBCCT category: bulb standard: - - E27 - - E14 + - 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}' diff --git a/all.html b/all.html index e86d00a65..b9e6acd74 100644 --- a/all.html +++ b/all.html @@ -3,6 +3,8 @@ title: All Devices navigation: 19 --- +

{{ page.title }}

+ {% assign category = site.templates %} {% assign type_group = category | group_by: 'type' %} diff --git a/assets/css/docs.scss b/assets/css/docs.scss index 41fdc22a7..1adf36e02 100644 --- a/assets/css/docs.scss +++ b/assets/css/docs.scss @@ -108,7 +108,32 @@ a.menu { li { margin: 0; - padding: 10px 15px; + padding: 5px 15px; + } + + a { + display: block; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + text-decoration: none; + + &.active { + color: $navigation-link-color; + } + } +} + +.subnav { + display: block; + width: 100%; + margin: 0; + padding: 0; + list-style: none; + + li { + margin: 0; + padding: 2px 15px; } a { diff --git a/au.html b/au.html index 129c1a668..d029a7566 100644 --- a/au.html +++ b/au.html @@ -3,8 +3,7 @@ title: AU Devices navigation: 6 --- - -

AU Only

+

{{ page.title }}

{% assign standard = site.templates | where: "standard", "au" | sort_natural: 'title' %} @@ -24,6 +23,7 @@

{{ type.name }}

Global Standard

+ {% assign standard = site.templates | where: "standard", "global" | sort_natural: 'title' %} {% assign types = standard | group_by: 'type' | sort: 'name' %} diff --git a/b22.html b/b22.html index d0b21b695..4910c745e 100644 --- a/b22.html +++ b/b22.html @@ -1,22 +1,7 @@ --- layout: default -title: B22 Bulbs +title: b22 --- -

B22

- - -{% assign standard = site.templates | where: "standard", "B22" | sort_natural: 'title' %} -{% assign types = standard | group_by: 'type' | sort: 'name' %} - {% for type in types %} -

{{ type.name }}

- - - {% assign type_sorted = type.items | sort_natural: 'title' %} - {% for template in type_sorted %} - {% include tablerow.html %} -{% endfor %} - -
-{% endfor %} +{% include bulb-redir.html %} diff --git a/br.html b/br.html index d0aea9a87..f00440fc9 100644 --- a/br.html +++ b/br.html @@ -3,7 +3,7 @@ title: BR Devices navigation: 9 --- -

BR Only

+

{{ page.title }}

{% assign standard = site.templates | where: "standard", "br" | sort_natural: 'title' %} {% assign types = standard | group_by: 'type' | sort: 'name' %} diff --git a/bulb-socket.html b/bulb-socket.html new file mode 100644 index 000000000..4f6298181 --- /dev/null +++ b/bulb-socket.html @@ -0,0 +1,22 @@ +--- +layout: default +title: Light Bulbs by Socket +navigation: 20 +--- +

{{ page.title }}

+ + +{% assign category = site.templates | where: "category", "bulb" %} +{% assign standard_group = category | map: 'standard' | join: ',' | split: ',' | uniq | sort_natural %} + +{% for std in standard_group %} +

{{ std | upcase }} Socket

+ + + {% assign grouptitlesorted = category | where: "standard" , std | sort_natural: "title" %} + {% for template in grouptitlesorted %} + {% include tablerow.html %} + {% endfor %} + +
+{% endfor %} diff --git a/bulb-type.html b/bulb-type.html new file mode 100644 index 000000000..9d1f8b36d --- /dev/null +++ b/bulb-type.html @@ -0,0 +1,23 @@ +--- +layout: default +title: Light Bulbs by Type +navigation: 20 +--- +

{{ page.title }}

+ + +{% 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" }}

+ + + {% assign grouptitlesorted = group.items | sort_natural: 'title' %} + {% for template in grouptitlesorted %} + {% include tablerow_standard.html %} + {% endfor %} + +
+{% endfor %} diff --git a/bulb.html b/bulb.html index 26a50c4dd..bbffe8c13 100644 --- a/bulb.html +++ b/bulb.html @@ -1,21 +1,16 @@ --- layout: default -title: Light Bulbs +title: Light Bulbs by Name navigation: 20 --- +

{{ page.title }}

-{% 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" }}

+ +{% assign category = site.templates | where: "category", "bulb" | sort: 'title' %} - {% assign grouptitlesorted = group.items | sort_natural: 'title' %} - {% for template in grouptitlesorted %} + {% for template in category %} {% include tablerow_standard.html %} {% endfor %}
-{% endfor %} diff --git a/ch.html b/ch.html index 15bdccbfd..93eb19d27 100644 --- a/ch.html +++ b/ch.html @@ -3,9 +3,7 @@ title: CH Devices navigation: 11 --- - -

CH Only

- +

{{ page.title }}

{% assign standard = site.templates | where: "standard", "ch" | sort_natural: 'title' %} {% assign types = standard | group_by: 'type' | sort: 'name' %} diff --git a/e12.html b/e12.html index 44b097c17..ad8477c41 100644 --- a/e12.html +++ b/e12.html @@ -1,22 +1,8 @@ --- layout: default -title: E12 Bulbs +title: e12 --- -

E12

+{% include bulb-redir.html %} - -{% assign standard = site.templates | where: "standard", "E12" | sort_natural: 'title' %} -{% assign types = standard | group_by: 'type' | sort: 'name' %} - {% for type in types %} -

{{ type.name }}

- - - {% assign type_sorted = type.items | sort_natural: 'title' %} - {% for template in type_sorted %} - {% include tablerow.html %} -{% endfor %} - -
-{% endfor %} diff --git a/e14.html b/e14.html index a05bcfe91..8a046e13d 100644 --- a/e14.html +++ b/e14.html @@ -1,22 +1,6 @@ --- layout: default -title: E14 Bulbs +title: e14 --- -

E14

- - -{% assign standard = site.templates | where: "standard", "E14" | sort_natural: 'title' %} -{% assign types = standard | group_by: 'type' | sort: 'name' %} - {% for type in types %} -

{{ type.name }}

- - - {% assign type_sorted = type.items | sort_natural: 'title' %} - {% for template in type_sorted %} - {% include tablerow.html %} -{% endfor %} - -
-{% endfor %} - +{% include bulb-redir.html %} diff --git a/e26.html b/e26.html index 6a3d538c5..4206d5c39 100644 --- a/e26.html +++ b/e26.html @@ -1,22 +1,7 @@ --- layout: default -title: E26 Bulbs +title: e26 --- -

E26

- - -{% assign standard = site.templates | where: "standard", "E26" | sort_natural: 'title' %} -{% assign types = standard | group_by: 'type' | sort: 'name' %} - {% for type in types %} -

{{ type.name }}

- - - {% assign type_sorted = type.items | sort_natural: 'title' %} - {% for template in type_sorted %} - {% include tablerow.html %} -{% endfor %} - -
-{% endfor %} +{% include bulb-redir.html %} diff --git a/e27.html b/e27.html index b1d046303..165034134 100644 --- a/e27.html +++ b/e27.html @@ -1,22 +1,7 @@ --- layout: default -title: E27 Bulbs +title: e27 --- -

E27

- - -{% assign standard = site.templates | where: "standard", "E27" | sort_natural: 'title' %} -{% assign types = standard | group_by: 'type' | sort: 'name' %} - {% for type in types %} -

{{ type.name }}

- - - {% assign type_sorted = type.items | sort_natural: 'title' %} - {% for template in type_sorted %} - {% include tablerow.html %} -{% endfor %} - -
-{% endfor %} +{% include bulb-redir.html %} diff --git a/eu.html b/eu.html index 4bafd1822..9a8e22764 100644 --- a/eu.html +++ b/eu.html @@ -3,8 +3,7 @@ title: EU Devices navigation: 3 --- - -

EU Only

+

{{ page.title }}

{% assign standard = site.templates | where: "standard", "eu" | sort_natural: 'title' %} diff --git a/fr.html b/fr.html index 832bcfc70..c0190f7fd 100644 --- a/fr.html +++ b/fr.html @@ -3,8 +3,7 @@ title: FR Devices navigation: 12 --- - -

FR Only

+

{{ page.title }}

{% assign standard = site.templates | where: "standard", "fr" | sort_natural: 'title' %} diff --git a/global.html b/global.html index e2b449d68..909dcce61 100644 --- a/global.html +++ b/global.html @@ -1,7 +1,9 @@ --- layout: default -title: EU Devices +title: Global Devices --- +

{{ page.title }}

+ {% assign standard_global = site.templates | where: "standard", "global" | sort_natural: 'title' %} {% assign standard = standard_global %} diff --git a/gu10.html b/gu10.html index f9e6b013b..63366a557 100644 --- a/gu10.html +++ b/gu10.html @@ -1,22 +1,6 @@ --- layout: default -title: GU10 Bulbs +title: gu10 --- -

GU10

- - -{% assign standard = site.templates | where: "standard", "GU10" | sort_natural: 'title' %} -{% assign types = standard | group_by: 'type' | sort: 'name' %} - {% for type in types %} -

{{ type.name }}

- - - {% assign type_sorted = type.items | sort_natural: 'title' %} - {% for template in type_sorted %} - {% include tablerow.html %} -{% endfor %} - -
-{% endfor %} - +{% include bulb-redir.html %} diff --git a/il.html b/il.html index fd5e69c84..6b61e2b94 100644 --- a/il.html +++ b/il.html @@ -3,7 +3,8 @@ title: IL Devices navigation: 8 --- -

IL Only

+

{{ page.title }}

+ {% assign standard = site.templates | where: "standard", "il" | sort_natural: 'title' %} {% assign types = standard | group_by: 'type' | sort: 'name' %} diff --git a/in.html b/in.html index 392a6862d..af6405694 100644 --- a/in.html +++ b/in.html @@ -3,7 +3,7 @@ title: IN Devices navigation: 7 --- -

IN Only

+

{{ page.title }}

{% assign standard = site.templates | where: "standard", "in" | sort_natural: 'title' %} diff --git a/index.html b/index.html index c386202ca..78cc3dc3e 100644 --- a/index.html +++ b/index.html @@ -6,26 +6,25 @@

Tasmota Device Templates Repository

{% assign counter = 0 %}{% for item in site.templates %}{% assign counter=counter | plus:1 %}{% endfor %}{{ counter }} devices submitted by the community

See world map of plugs for more information.

Devices by electrical standard:

-

-ALL -EU -US -UK -AU -IN -IL -BR -ZA -CH -FR -GLOBAL +{% assign category = site.templates | where: "category", "plug" %} +{% assign standard_group = category | map: 'standard' | join: ',' | split: ',' | uniq | sort_natural %} +{% for std in standard_group %} +{{ std | upcase }} +{% endfor %}
+{% assign category = site.templates | where: "category", "bulb" %} +{% assign standard_group = category | map: 'standard' | join: ',' | split: ',' | uniq | sort_natural %} +{% for std in standard_group %} +{{ std | upcase }} +{% endfor %} +ALL +

Devices by type:

-BULBS -PLUGS -LIGHTS -SWITCHES -MISCELLANEOUS +BULBS +PLUGS +LIGHTS +SWITCHES +MISCELLANEOUS

You can now easily copy the template to clipboard by using the copy button!

diff --git a/it.html b/it.html new file mode 100644 index 000000000..dbdd0019c --- /dev/null +++ b/it.html @@ -0,0 +1,39 @@ +--- +layout: default +title: IT Devices +navigation: 7 +--- +

{{ page.title }}

+ + +{% assign standard = site.templates | where: "standard", "it" | sort_natural: 'title' %} +{% assign types = standard | group_by: 'type' | sort: 'name' %} + {% for type in types %} +

{{ type.name }}

+ + + {% assign type_sorted = type.items | sort_natural: 'title' %} + {% for template in type_sorted %} + {% include tablerow.html %} +{% endfor %} + +
+{% endfor %} + +
+ +

Global Standard

+ +{% assign standard = site.templates | where: "standard", "global" | sort_natural: 'title' %} +{% assign types = standard | group_by: 'type' | sort: 'name' %} + {% for type in types %} +

{{ type.name }}

+ + + {% assign type_sorted = type.items | sort_natural: 'title' %} + {% for template in type_sorted %} + {% include tablerow.html %} +{% endfor %} + +
+{% endfor %} diff --git a/light.html b/light.html index 367973d47..c66f7dc0d 100644 --- a/light.html +++ b/light.html @@ -3,6 +3,8 @@ title: Lights and LEDs navigation: 22 --- +

{{ page.title }}

+ {% assign category = site.templates | where: "category", "light" %} {% assign type_group = category | group_by: 'type' %} diff --git a/misc.html b/misc.html index e67abf4be..fbaadb00d 100644 --- a/misc.html +++ b/misc.html @@ -3,6 +3,8 @@ title: Miscellaneous Devices navigation: 24 --- +

{{ page.title }}

+ {% assign category = site.templates | where: "category", "misc" %} {% assign type_group = category | group_by: 'type' | sort: 'type' %} diff --git a/mr16.html b/mr16.html index 798564505..3220d298b 100644 --- a/mr16.html +++ b/mr16.html @@ -1,22 +1,6 @@ --- layout: default -title: MR16 Bulbs +title: mr16 --- -

MR16

- - -{% assign standard = site.templates | where: "standard", "MR16" | sort_natural: 'title' %} -{% assign types = standard | group_by: 'type' | sort: 'name' %} - {% for type in types %} -

{{ type.name }}

- - - {% assign type_sorted = type.items | sort_natural: 'title' %} - {% for template in type_sorted %} - {% include tablerow.html %} -{% endfor %} - -
-{% endfor %} - +{% include bulb-redir.html %} diff --git a/plug.html b/plug.html index 3ca635151..4e211b6e8 100644 --- a/plug.html +++ b/plug.html @@ -3,6 +3,8 @@ title: Plugs and Sockets navigation: 21 --- +

{{ page.title }}

+ {% assign category = site.templates | where: "category", "plug" %} {% assign type_group = category | group_by: 'type' | sort: 'type' %} diff --git a/standard.html b/standard.html new file mode 100644 index 000000000..b4b3a1acd --- /dev/null +++ b/standard.html @@ -0,0 +1,11 @@ +--- +layout: default +--- +{% for item in site.data.nav.toc %} +

{{ item.url }} {{ item.name }}

+ + {% endfor %} diff --git a/switch.html b/switch.html index 3405868fd..4c944293d 100644 --- a/switch.html +++ b/switch.html @@ -1,8 +1,10 @@ --- layout: default -title: Switches and Dimmers +title: Switches, Dimmers and Relays navigation: 23 --- +

{{ page.title }}

+ {% assign category = site.templates | where: "category", "switch" %} {% assign type_group = category | group_by: 'type' %} diff --git a/uk.html b/uk.html index e379e15d0..9779ab0c9 100644 --- a/uk.html +++ b/uk.html @@ -3,7 +3,8 @@ title: UK Devices navigation: 5 --- -

UK Only

+

{{ page.title }}

+ {% assign standard = site.templates | where: "standard", "uk" | sort_natural: 'title' %} {% assign types = standard | group_by: 'type' | sort: 'name' %} diff --git a/us.html b/us.html index efb6542f2..6de2a9437 100644 --- a/us.html +++ b/us.html @@ -3,7 +3,7 @@ title: US Devices navigation: 4 --- -

US Only

+

{{ page.title }}

{% assign standard = site.templates | where: "standard", "us" | sort_natural: 'title' %} diff --git a/za.html b/za.html index d9374f415..b002e4324 100644 --- a/za.html +++ b/za.html @@ -3,7 +3,7 @@ title: ZA Devices navigation: 10 --- -

ZA Only

+

{{ page.title }}

{% assign standard = site.templates | where: "standard", "za" | sort_natural: 'title' %}