Skip to content

Commit

Permalink
all the updates
Browse files Browse the repository at this point in the history
  • Loading branch information
blakadder committed Aug 29, 2020
1 parent 0d9c7c4 commit feccbce
Show file tree
Hide file tree
Showing 160 changed files with 343 additions and 266 deletions.
8 changes: 6 additions & 2 deletions _data/nav.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
toc:
- name: Search...
url: search.html
- name: Bulbs by
url: bulb.html
subnav:
Expand All @@ -10,14 +12,16 @@ toc:
url: bulb-socket.html
- name: Curtains, Shutters and Shades
url: cover.html
- name: Dimmers and Switches
- name: Wall Switches and Dimmers
url: switch.html
- name: In-Wall Dimmers and Switches
- name: Inline Switches and Dimmers
url: relay.html
- name: Lights and LEDs
url: light.html
- name: Plugs and Sockets
url: plug.html
- name: Sensors
url: sensors.html
- name: Miscellaneous
url: misc.html
- name: Devices by Standard
Expand Down
2 changes: 1 addition & 1 deletion _includes/nav.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@
<a href="https://paypal.me/tasmotatemplates"><img src="https://img.shields.io/static/v1?logo=paypal&label=&message=donate&color=slategrey"></a>
<span style="font-size:0.7em;">When purchasing devices through affiliated links you support this site!</span>
</div>
</div>
</div>
2 changes: 1 addition & 1 deletion _includes/search-results.html
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<ul id="search-results" class="navigation" style="font-family:'Roboto Condensed', 'Helvetica Narrow', 'Arial Narrow';"></ul>
<ul id="search-results" class="navigation" ></ul>
2 changes: 1 addition & 1 deletion _includes/search.html
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<div class="search">
<input type="text" class="search-input" id="search-input" placeholder="Search for device..." />
<input type="text" class="search-input" id="search-input" placeholder="Search by device name, type or model ..." />
</div>
8 changes: 4 additions & 4 deletions _includes/sidebar.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
<img src="{{ "/assets/images/close.svg" | relative_url }}" class="close-icon" id="close" />
</div>
<a href="{{ "index.html" | relative_url }}"><img src="{{ "/assets/images/logo.svg" | relative_url }}" alt="Logo"></a>
{% include search.html %}
<!-- {% include search.html %} -->
<div class="sidebar-main">
{% include nav.html %}
{% include search-results.html %}<BR>
</div>
</sidebar>
<!-- {% include search-results.html %}<BR> -->
</div>
</sidebar>
19 changes: 10 additions & 9 deletions _includes/tablerow.html
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
<tr>
<td style="width: 20%;"><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 style="width: 20%;">{% 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>
{{ template.type }}
{% if template.category contains 'bulb'%}
Bulb
{% endif %}
</td>
<td><b><a class="menu" href="{{site.baseurl}}{{ template.url }}">{{ 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 %}
{{ template.type }}
{% if template.category contains 'bulb'%}
Bulb
{% endif %}
</a></b>
</td>
<td style="width: 20%;">{{ template.model }}</td>
</tr>
8 changes: 5 additions & 3 deletions _includes/tablerow_bulb.html
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
<tr>
<td style="width: 20%"><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 style="width: 20%"> {% assign standard_list = template.standard %}
<td><b><a class="menu" href="{{site.baseurl}}{{ template.url }}">{{ template.title }}{% assign standard_list = template.standard %}
{% for item_standard in standard_list %}
{{ item_standard | upcase }}<br>
{% endfor %} </td>
{% endfor %}
</a></b>
</td>
<td style="width: 20%">{{ template.model }}</td>
</tr>

7 changes: 5 additions & 2 deletions _includes/tablerow_standard.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<tr>
<td style="width: 20%"><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 style="width: 22%">{% assign splitter = template.template | split: ':' %}
<td><b><a class="menu" href="{{site.baseurl}}{{ template.url }}">{{ template.title }} {% assign splitter = template.template | split: ':' %}
{% assign gpios = splitter[2] | remove: '[' | remove: '],"FLAG"' | split: ',' %}
{% if gpios contains '131' or gpios contains '132' or gpios contains '133' or gpios contains '134' or gpios contains '135' or gpios contains '136' or gpios contains '137' or gpios contains '145' or gpios contains '146' or gpios contains '156' or gpios contains '207' %}
Power Monitoring<BR>
Expand All @@ -10,6 +9,10 @@
{% if template.category contains 'bulb'%}
Bulb
{% endif %}
</a></b>
</td>
<td style="width: 22%">
{{ template.model }}
</td>
<td style="width: 10%"> {% assign standard_list = template.standard %}
{% for item_standard in standard_list %}
Expand Down
3 changes: 2 additions & 1 deletion _templates/3a_HGZB-043
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
---
date_added: 2019-07-04
title: 3A Smart Home HGZB-043
title: 3A Smart Home
model: HGZB-043
category: switch
type: Switch
standard: au
Expand Down
2 changes: 1 addition & 1 deletion _templates/ATMS1601
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ link2:
mlink:
flash: tuya-convert
category: relay
type: Relay
type: Switch
standard: za
---
6 changes: 3 additions & 3 deletions _templates/DHT11_ESP01
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
---
date_added: 2020-07-09
title: ESP01S DHT11 v1.0 Module Temperature
title: ESP01S DHT11 v1.0 DIY
model:
image: /assets/images/DHT11_ESP01.jpg
template: '{"NAME":"ESP01S DHT11","GPIO":[0,0,1,0,0,0,0,0,0,0,0,0,0],"FLAG":0,"BASE":4}'
link: https://www.amazon.com/gp/product/B07XC23HBW/
link2: https://www.aliexpress.com/af/dht11-esp01s.html
mlink:
flash: serial
category: misc
type: Sensor
category: sensor
type: Temperature Sensor
standard: global
---
4 changes: 2 additions & 2 deletions _templates/DP-WP001
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ link: https://www.amazon.com/Motion-Sensor-Office-Security-Compatible/dp/B07L2WT
link2: https://www.aliexpress.com/af/DP%25252dWP001.html
mlink:
flash: serial
category: misc
type: Sensor
category: sensor
type: Motion Sensor
standard: global
---

Expand Down
8 changes: 4 additions & 4 deletions _templates/DS18B20_ESP01
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
---
date_added: 2019-11-20
title: DS18B20 ESP01 Module Temperature
category: misc
type: Sensor
title: DS18B20 ESP01 DIY
category: sensor
type: Temperature Sensor
standard: global
link: http://s.click.aliexpress.com/e/Fnr8DTf2
link: https://www.aliexpress.com/item/32971371815.html
image: https://user-images.githubusercontent.com/5904370/69268583-b6b9ff00-0bcf-11ea-8259-2ef0b4d22970.png
template: '{"NAME":"ESP01S ds18b20","GPIO":[255,255,4,255,255,255,0,0,255,255,255,255,255],"FLAG":15,"BASE":18}'
link2: https://www.amazon.com/GalaxyElec-ESP8266-ESP-01S-Temperature-Humidity/dp/B082HTF385/
Expand Down
4 changes: 2 additions & 2 deletions _templates/ERC309
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
---
date_added: 2019-07-13
title: Zemismart ERC309 Kinetic Switch
title: Zemismart ERC309 Kinetic
category: relay
type: Relay
type: Switch
standard: global
link: http://s.click.aliexpress.com/e/NaO0MWbW
image: https://user-images.githubusercontent.com/25117255/61148426-0e888100-a4df-11e9-92c5-43453afcc6c5.png
Expand Down
6 changes: 3 additions & 3 deletions _templates/IOT4SH01DS
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
---
date_added: 2019-11-20
title: IOT4SH01DS Temperature
category: misc
type: Sensor
title: IOT4SH01DS
category: sensor
type: Temperature Sensor
standard: global
link: https://www.iot4.eu/?product=iot4sh01ds
image: https://www.iot4.eu/wp-content/uploads/2017/03/IMG_0694_hatter.png
Expand Down
2 changes: 1 addition & 1 deletion _templates/L-5A01
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ link2:
mlink:
flash: serial
category: relay
type: Relay
type: Switch
standard: global
---
<div style="float:right; margin:10px; text-align: center;"><img style="width:50px" src="/assets/images/blakapproved.png"> <br><b> by <a href="https://blakadder.com">blakadder</a></b></div>
Expand Down
33 changes: 33 additions & 0 deletions _templates/LC-ESP01-4R-12V
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
---
date_added: 2020-08-29
title: LC Technology 12V 4 Channel
model: LC-ESP01-4R-12V
image: /assets/images/
template: '{"NAME":"LC Technology 4CH Relay","GPIO":[21,0,22,0,23,24,0,0,0,0,0,0,0],"FLAG":0,"BASE":18}'
link: https://www.banggood.com/DC12V-ESP8266-Four-Channel-Wifi-Relay-IOT-Smart-Home-Phone-APP-Remote-Control-Switch-p-13170.html
link2:
mlink: http://www.chinalctech.com/cpzx/Programmer/428.html
flash: serial
category: relay
type: Relay
standard: global
---
With Nuvoton N76E003AT20 microcontroller

You need to configure these rules to control the relays. The ones defined in the template are just virtual relays!

```console
rule1
on System#Boot do Backlog Baudrate 115200
on SerialReceived#Data=41542B5253540D0A do SerialSend5 5749464920434f4e4e45435445440a5749464920474f542049500a41542b4349504d55583d310a41542b4349505345525645523d312c383038300a41542b43495053544f3d333630 endon
on Power1#State=1 do SerialSend5 A00101A2 endon
on Power1#State=0 do SerialSend5 A00100A1 endon
on Power2#State=1 do SerialSend5 A00201A3 endon
on Power2#State=0 do SerialSend5 A00200A2 endon
on Power3#State=1 do SerialSend5 A00301A4 endon
on Power3#State=0 do SerialSend5 A00300A3 endon
on Power4#State=1 do SerialSend5 A00401A5 endon
on Power4#State=0 do SerialSend5 A00400A4 endon
```

Make sure to enable the rule: `rule1 1`
4 changes: 2 additions & 2 deletions _templates/PA-210WYS
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
date_added: 2020-06-24
title: Natural Gas (CH4) Alarm
model: PA-210WYS
category: misc
type: Sensor
category: sensor
type: Gas Sensor
standard: global
flash: tuya-convert
image: /assets/images/PA-210WYS.jpg
Expand Down
2 changes: 1 addition & 1 deletion _templates/PS-1604
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ link2: https://www.amazon.in/gp/product/B07ZF7Y17R
mlink:
flash: tuya-convert
category: relay
type: Relay
type: Switch
standard: in
---

Expand Down
4 changes: 2 additions & 2 deletions _templates/QS-WIFI-S03
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
---
date_added: 2019-07-14
title: QS-WIFI-S03 Module Switch
title: QS-WIFI-S03 Module
category: relay
type: Relay
type: Switch
standard: global
mlink: http://www.aihomestyle.com/content/151.html
link: https://www.aliexpress.com/item/33012114855.html?spm=a2g0s.9042311.0.0.274263c0c3kalL
Expand Down
2 changes: 1 addition & 1 deletion _templates/QS-WIFI-S05
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ link2:
mlink:
flash: tuya-convert
category: relay
type: Relay
type: Switch
standard: global
---
2 changes: 1 addition & 1 deletion _templates/SS-8839-01
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
date_added: 2019-08-09
title: Smart Home SS-8839-01
category: relay
type: Relay
type: Switch
standard: global
link: https://www.banggood.com/AC90-250V-WiFi-APP-Relay-Module-DIY-Smart-Home-Automation-Light-Switch-Work-With-Amazon-Alexa-Google-p-1351912.html
image: https://user-images.githubusercontent.com/5904370/72061655-9c022d80-32d6-11ea-85af-29362a12ce8f.png
Expand Down
2 changes: 1 addition & 1 deletion _templates/SS-8839-02
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
date_added: 2020-01-09
title: SS-8839-02
category: relay
type: Relay
type: Switch
standard: global
link: https://www.aliexpress.com/af/ss-8839-02.html
image: https://user-images.githubusercontent.com/5904370/72059346-1da38c80-32d2-11ea-9eab-3af6efb81f53.png
Expand Down
2 changes: 1 addition & 1 deletion _templates/SW-R03
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ link2:
mlink: https://www.alibaba.com/product-detail/No-hub-or-Gateway-Smart-Wireless_62427807198.html
flash: tuya-convert
category: relay
type: Relay
type: Switch
standard: global
---
#### Note
Expand Down
2 changes: 1 addition & 1 deletion _templates/SWB2
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ link: https://www.aliexpress.com/item/4001289675090.html
link2: https://www.amazon.de/dp/B07KFY7HXC
mlink: https://lingan.en.alibaba.com/search/product?SearchText=swb1
---
Produced by Lingan, branded under various names [(Blitzwolf BW-SHP9](blitzwolf_SHP9)). PCB is marked "Lingan swb2-1 REV:v1.1".
Produced by Lingan, branded under various names [(BlitzWolf BW-SHP9](blitzwolf_SHP9)). PCB is marked "Lingan swb2-1 REV:v1.1".

To disassemble remove the rubber feet, unscrew 6 screws (two are hidden behind the sticker), remove backplate and unscrew 6 more screws holding the PCB to the enclosure. Run on ESP8266 based LM1 module. All GPIO's are broken out and labelled in the corner.
4 changes: 2 additions & 2 deletions _templates/TY01
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ template: '{"NAME":"TY01","GPIO":[0,107,0,108,0,0,0,0,0,0,0,0,0],"FLAG":0,"BASE"
link2: https://www.aliexpress.com/item/4000492919273.html
mlink:
flash: serial
category: misc
type: Sensor
category: sensor
type: Contact Sensor
standard: global
---
<div style="float:right; margin:10px; text-align: center;"><img style="width:50px" src="/assets/images/blakapproved.png"> <br><b> by <a href="https://blakadder.com">blakadder</a></b></div>
Expand Down
4 changes: 2 additions & 2 deletions _templates/TYMC-1
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ template: '{"NAME":"TYMC-1","GPIO":[0,107,0,108,0,0,0,0,0,0,0,0,0],"FLAG":0,"BAS
link2: https://www.amazon.de/dp/B07ZQ2XSKK/
mlink:
flash: serial
category: misc
type: Sensor
category: sensor
type: Contact Sensor
standard: global
---
<div style="float:right; margin:10px; text-align: center;"><img style="width:50px" src="/assets/images/blakapproved.png"> <br><b> by <a href="https://blakadder.com">blakadder</a></b></div>
Expand Down
6 changes: 3 additions & 3 deletions _templates/W06
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
---
date_added: 2020-08-22
title: W06 Water
title: W06
model: W06
image: /assets/images/W06.jpg
template: '{"NAME":"W06 Water Sensor","GPIO":[0,148,0,149,0,0,0,0,0,0,0,0,0],"FLAG":0,"BASE":18}'
mlink:
link: https://www.aliexpress.com/item/4000510216875.html
link2: https://www.aliexpress.com/item/4000492919273.html
flash: serial
category: misc
type: Sensor
category: sensor
type: Water Sensor
standard: global
---
<div style="float:right; margin:10px; text-align: center;"><img style="width:50px" src="/assets/images/blakapproved.png"> <br><b> by <a href="https://blakadder.com">blakadder</a></b></div>
Expand Down
2 changes: 1 addition & 1 deletion _templates/WL-SW01_10
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
date_added: 2020-01-05
title: WL-SW01_10
type: Relay
type: Switch
standard: global
category: relay
link: https://www.aliexpress.com/item/32829067852.html
Expand Down
4 changes: 2 additions & 2 deletions _templates/YG400A
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
date_added: 2020-06-30
title: Smoke Alarm
model: YG400A
category: misc
type: Sensor
category: sensor
type: Smoke Sensor
standard: global
flash: serial
image: /assets/images/YG400A.jpg
Expand Down
6 changes: 3 additions & 3 deletions _templates/ZMAi-90
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
date_added: 2020-05-12
title: ZMAi-90 Digital Energy Meter
title: ZMAi-90 Digital
model: ZMAi-90
image: /assets/images/ZMAi-90.jpg
template: '{"NAME":"ZMAi-90","GPIO":[0,148,0,149,0,0,0,0,21,90,0,0,0],"FLAG":0,"BASE":18}'
Expand All @@ -9,8 +9,8 @@ link2: https://www.amazon.com/Digital-Energy-Metering-90-250V-ZMAi-90/dp/B088BHP
link3: https://www.amazon.de/Xigeapg-Schalter-Stromverbrauch-Energie%C3%BCBerwachungsmesser-Fernbedienung/dp/B0875P8Y3V/
mlink:
flash: tuya-convert
category: relay
type: Relay
category: sensor
type: Energy Meter
standard: global
---
Full instructions [here](https://www.creationfactory.co/2019/12/reverse-engineering-zmai-90-din-rail.html)
Loading

0 comments on commit feccbce

Please sign in to comment.