reorganised sidebar

HemiBob · Dec 14, 2019 · 41ec78e · 41ec78e
1 parent 674e1b3
commit 41ec78e
Show file tree

Hide file tree

Showing 192 changed files with 527 additions and 385 deletions.
diff --git a/_data/nav.yaml 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
@@ -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
@@ -0,0 +1,7 @@
+<!DOCTYPE html>
+<html>
+   <head>
+      <title>HTML Meta Tag</title>
+      <meta http-equiv="Refresh" content="0; url=bulb-socket.html#{{page.title}} " />   </head>
+
+</html>
diff --git a/_includes/nav.html b/_includes/nav.html
@@ -0,0 +1,12 @@
+{% assign cat = site.data.nav.toc %}
+{% for item in cat %}
+<ul class="navigation" id="navigation">
+    <li><a class="{% if page.url == item.url %}active{% endif %}" href="{{ item.url | relative_url }}">{{ item.name }}</a>
+        <ul class="subnav" id="subnav">
+            {% for entry in item.subnav %}
+            <li><a class="{% if page.url == entry.url %}active{% endif %}" href="{{ entry.url | relative_url }}">{{ entry.title }}</a></li>
+            {% endfor %}
+        </ul>
+    </li>
+</ul>
+{% endfor %}
diff --git a/_includes/sidebar.html b/_includes/sidebar.html
@@ -6,8 +6,8 @@
 	{% include search.html %}
 	<div class="sidebar-main">
 		<a href="{{ "index.html" | relative_url }}"><img src="{{ "/assets/images/logo.svg" | relative_url }}" alt="Logo"></a>
-		{% include navigation.html %}
 		{% include search-results.html %}
+		{% include nav.html %}
 		{% include footer.html %}
 	</div>
 </sidebar>
diff --git a/_includes/tablerow_standard.html b/_includes/tablerow_standard.html
@@ -2,8 +2,8 @@
     <td><img src="{{ template.image }}" alt="{{ template.title }}" style="max-height:80px;vertical-align: middle;"></td>
     <td><b><a class="menu" href="{{site.baseurl}}{{ template.url }}">{{ template.title }}</a></b></td>
     <td>{% 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 %}<BR>
+        Power Monitoring<BR>
+        {% endif %}
         {{ template.type }}</td>
     <td> {% assign standard_list = template.standard %}
         {% for item_standard in standard_list %}

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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`
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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}'