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

mpbecker · Feb 15, 2022 · ea6b385 · ea6b385
2 parents 02cc3e0 + 5db067e
commit ea6b385
Show file tree

Hide file tree

Showing 21 changed files with 162 additions and 21 deletions.
diff --git a/_templates/WB5 b/_templates/WB5
@@ -0,0 +1,44 @@
+---
+date_added: 2022-01-28
+title: Tuya WB5 5 in 1
+model: WB5
+category: light
+type: LED Controller
+standard: global
+image: /assets/images/WB5.jpg
+templatec3: '{"NAME":"WB5","GPIO":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2304,2272],"FLAG":0,"BASE":18,"CMND":"TuyaMCU 11,20 | TuyaMCU 21,22 | TuyaMCU 22,21 | TuyaMCU 23,23 | TuyaMCU 98,101 | DimmerRange 0,1024"}'
+link: https://www.aliexpress.com/item/1005003081976104.html
+link2: https://www.amazon.com/dp/B08L9GWJK1
+mlink: https://www.alibaba.com/product-detail/SKYDANCE-WB5-TuyaBluetooth-RF-5-in1_1600136303591.html
+chip: CB3S
+flash: replace
+---
+![PCB](/assets/images/WB5_pcb.jpg)
+
+## Hardware
+
+The chip used on this board is a CB3S, and requires a transplant. It cannot be flashed. The daughterboard for the SoC is compatible with the ESP12-S and in this case ESP-C3-12F module. Other formats may be compatible, but may require jumper wires.
+
+The TuyaMCU on board requires the following settings for an CCT (Dual White (CW+WW)) strip.
+
+```console
+Backlog TuyaMCU 11,20; TuyaMCU 21,22; TuyaMCU 22,21; TuyaMCU 23,23; TuyaMCU 98,101; DimmerRange 0,1024
+```
+
+## Serial Flashing
+
+Please see the [Hardware Preparation](https://tasmota.github.io/docs/Getting-Started/#hardware-preparation) page for general instructions.
+
+## Wiring
+
+Make sure to press the switch and select the mode corresponding to the strip you are using. ie. To use an RGB strip, you press the switch until it flashes red. The setting will stick between restarts. The mode cannot be changed from Tasmota as there are no connection between it and the switch. You can solder a wire from a free GPIO to the switch and change the mode by pulsing the GPIO from Tasmota.
+
+| Light Color | Mode |
+| --- | --- |
+| White Flashing | Single Color Mode |
+| Yellow Flashing | Dual White Mode |
+| Red Flashing | RGB Mode |
+| Green Flashing | RGBW Mode |
+| Blue Flashing | RGB+CCT Mode |
+
+![WB5 Manual](https://user-images.githubusercontent.com/367863/147174536-5f7c5325-ffe2-4585-a1e4-57e6229a3355.jpg)
diff --git a/_templates/aofo_4AC+4USB_tuya b/_templates/aofo_4AC+4USB_tuya
@@ -1,13 +1,15 @@
 ---
 date_added: 2019-11-08
-title: AOFO 4AC+4USB Tuya
+title: AOFO 4AC+4USB Tuya 
+model: C733
 category: plug
 type: Power Strip
 standard: eu
 link: https://www.amazon.de/AOFO-Steckdosenleiste-Fernsteuerung-Mehrfachsteckdose-%C3%9Cberspannungsschutz/dp/B07X1H3NWF
 image: https://images-na.ssl-images-amazon.com/images/I/816DuO0a4WL._SL1500_.jpg
 template: '{"NAME":"AOFO-4AC-4USB","GPIO":[255,255,255,255,255,255,0,0,255,255,255,255,255],"FLAG":1,"BASE":54}' 
 link2: 
+chip: CB2S
 ---
 
 `Backlog TuyaMCU 11,38; TuyaMCU 12,1; TuyaMCU 13,2; TuyaMCU 14,3; TuyaMCU 15,4 ; TuyaMCU 16,7`
@@ -21,3 +23,18 @@ link2:
 `dpID 9` , `dpID 10`, `dpID 11`,`dpID 12` and  `dpID 15` set timer in seconds for AC 1-4 and USB
 
 
+
+My device contained an incompatible CB2S module. Swapped it for a pin compatible [ESP-02s](ESP-02S.html). 
+
+Button1/Power1 (switch all) does not completely work with configuration above - it will be updated correctly when the actual button on the device is pressed, but can´t be controlled from Tasmota, so I added following rule: 
+
+`rule1 on Power1#State do backlog power2 %value%; power3 %value%; power4 %value%; power5 %value%; power6 %value%; endon`
+
+enable rule1: `rule1 1`
+
+This way everything works as expected. Using backlog there will be some delay between the sockets on switching on/off - to reduce this, 'backlog0' can be used instead. 
+
+Renamed web buttons: 
+
+`backlog webbutton1 ALL; webbutton2 S1; webbutton3 S2; webbutton4 S3; webbutton5 S4; webbutton6 USB;`
+
diff --git a/_templates/arlec_GLD112HA b/_templates/arlec_GLD112HA
@@ -8,8 +8,12 @@ type: CCT
 category: bulb
 standard: e27
 link: https://www.bunnings.com.au/arlec-smart-9-5w-806lm-cct-es-globe-with-grid-connect_p0111503
-template: '{"NAME":"Arlec CCT","GPIO":[0,0,0,0,0,37,0,0,0,38,0,0,0],"FLAG":0,"BASE":48}' 
+template9: '{"NAME":"Arlec CCT","GPIO":[0,0,0,0,0,416,0,0,0,449,0,0,0,0],"FLAG":0,"BASE":48}'
 link2: https://www.bunnings.co.nz/arlec-grid-connect-smart-9-5w-806lm-cct-es-globe_p0119820
 ---
 
-The bulb has hardware Gamma Correction included, you need to configure `LedTable 0` 
+This bulb uses PWM1 for brightness and PWM2 (inverted) for color temperature (instead of PWM1 for Cold White and PWM2 for Warm White),
+so this template is based on `Module 48` aka Philips Xiaomi mode. Alternatively, you could use `SetOption92 1`.
+See the [PWM CT](https://tasmota.github.io/docs/Lights/#pwm-ct) documentation for details.
+
+The bulb has hardware Gamma Correction included, you need to configure `LedTable 0` 
diff --git a/_templates/athom_PG05V2-AU16A-TAS b/_templates/athom_PG05V2-AU16A-TAS
@@ -3,7 +3,7 @@ date_added: 2022-01-25
 title: Athom 16A AU
 model: PG05V2-AU16A-TAS
 image: /assets/images/athom_PG05V2-AU16A-TAS.jpg
-template: '{"NAME":"Athom Plug V2","GPIO":[0,0,0,3104,0,32,0,0,224,576,0,0,0,0],"FLAG":0,"BASE":18}' 
+template9: '{"NAME":"Athom Plug V2","GPIO":[0,0,0,3104,0,32,0,0,224,576,0,0,0,0],"FLAG":0,"BASE":18}' 
 mlink: https://www.athom.tech/blank-1/au-plug
 link: https://www.aliexpress.com/item/1005001670435059.html
 link2: 

diff --git a/_templates/globe_50322 b/_templates/globe_50322
@@ -0,0 +1,14 @@
+---
+date_added: 2022-01-28
+title: Globe 3 Way
+model: 50322
+image: /assets/images/globe_50322.jpg
+template9: '{"NAME":"Globe Dimmer","GPIO":[0,107,0,108,0,0,0,0,0,0,0,0,0],"FLAG":0,"BASE":54,"CMND":"TuyaMCU 11,1 | TuyaMCU 21,2 | Ledtable 0"}' 
+link: https://www.amazon.ca/dp/B08TT6ZDRC/
+link2: 
+mlink: 
+flash: serial
+category: switch
+type: Dimmer
+standard: us
+---
diff --git a/_templates/gosund_WO1 b/_templates/gosund_WO1
@@ -4,7 +4,7 @@ title: Gosund
 model: WO1
 template: '{"NAME":"Gosund WO1","GPIO":[320,0,576,0,2656,2720,0,0,2624,321,225,224,0,4704],"FLAG":0,"BASE":18}' 
 image: /assets/images/gosund_WO1.jpg
-link: https://www.amazon.com/dp/B08HH8RDRB
+link: https://www.amazon.com/dp/B09JZDSLNC
 mlink: https://us.gosund.com/collections/all-products/products/smart-wall-outlet-with-energy-monitoring-wo1
 flash: tuya-convert
 category: plug
@@ -14,4 +14,6 @@ standard: us
 
 ```console
 backlog rule1 on analog#a0<400 do power2 toggle break on analog#a0<800 do power1 toggle break endon; rule1 1
-```
+```
+
+Note: Tuya convert still worked as of 2022-06-02
diff --git a/_templates/gosund_wp3 b/_templates/gosund_wp3
@@ -19,4 +19,4 @@ mlink: https://www.alibaba.com/product-detail/Gosund-US-10A-Standard-Tuya-Wirele
 ## Serial Flashing
 [Instructions] (https://www.instructables.com/Downloading-Tasmota-Onto-a-Gosund-WP5-or-WP3-Smart/)
 
-## Bought a 4-pack on Jan-15-2022 from the ebay link. I was able to use tuya-convert on all of them
+Bought a 4-pack on Jan-15-2022 from the ebay link. I was able to use tuya-convert on all of them
diff --git a/_templates/nedis_WIFIDS10WT b/_templates/nedis_WIFIDS10WT
@@ -50,6 +50,25 @@ Rule1
   ON TuyaReceived#CmndData=6A04000103 DO publish2 stat/%topic%/MUTE OFF ENDON
   ON TuyaReceived#CmndData=6A04000104 DO publish2 stat/%topic%/BATTERY ON ENDON
 ```
+The rule above uses the publish2 command. This will send the topics with retained flag to the broker. This means, that the broker stores the value.
+In some smarthome scenarios you don't want this and let the persistence layer of your smarthome to handle the states. So I changed the command to publish (without 2)
+which works well in my scenario.
+
+```console
+Rule1
+  ON TuyaReceived#CmndData=6A04000100 DO publish stat/%topic%/FIRE OFF ENDON
+  ON TuyaReceived#CmndData=6A04000100 DO publish stat/%topic%/TEST OFF ENDON
+  ON TuyaReceived#CmndData=6A04000100 DO publish stat/%topic%/BATTERY OFF ENDON
+  ON TuyaReceived#CmndData=6A04000100 DO publish stat/%topic%/MUTE OFF ENDON
+  ON TuyaReceived#CmndData=6A04000101 DO publish stat/%topic%/FIRE ON ENDON
+  ON TuyaReceived#CmndData=6A04000101 DO publish stat/%topic%/MUTE OFF ENDON
+  ON TuyaReceived#CmndData=6A04000102 DO publish stat/%topic%/FIRE ON ENDON
+  ON TuyaReceived#CmndData=6A04000102 DO publish stat/%topic%/MUTE ON ENDON
+  ON TuyaReceived#CmndData=6A04000103 DO publish stat/%topic%/FIRE ON ENDON
+  ON TuyaReceived#CmndData=6A04000103 DO publish stat/%topic%/TEST ON ENDON
+  ON TuyaReceived#CmndData=6A04000103 DO publish stat/%topic%/MUTE OFF ENDON
+  ON TuyaReceived#CmndData=6A04000104 DO publish stat/%topic%/BATTERY ON ENDON
+```
 
 Enable the rule: `Rule1 1`
 

diff --git a/_templates/shelly_plus_i4 b/_templates/shelly_plus_i4
@@ -0,0 +1,22 @@
+---
+date_added: 2022-01-29
+title: Shelly Plus i4
+model: SPI4
+image: /assets/images/shelly_plus_i4.jpg
+template32: '{"NAME":"Shelly Plus i4","GPIO":[0,0,0,0,0,0,0,0,192,0,193,0,0,0,0,0,0,0,0,0,0,0,195,194,0,0,0,0,0,0,0,0,0,0,0,0],"FLAG":0,"BASE":1,"CMND":"SwitchMode1 1 | SwitchMode2 1 | SwitchMode3 1 | SwitchMode4 1 | SwitchTopic 0 | SetOption114 1"}' 
+link: https://shop.shelly.cloud/shelly-plus-i4-wifi-smart-home-automation
+link2: https://www.aliexpress.com/item/1005003774487679.html
+link3: https://www.idealo.de/preisvergleich/Typ/3800235265079.html
+mlink: https://shelly.cloud/shelly-plus-i4/
+flash: serial
+category: switch
+type: Switch
+standard: global
+chip: solo1
+---
+
+Example to publish switch events to separate topics
+
+```console
+Backlog Rule1 on Switch1#state do Publish stat/%topic%/SWITCH1 %value% endon on Switch2#state do Publish stat/%topic%/SWITCH2 %value% endon on Switch3#state do Publish stat/%topic%/SWITCH3 %value% endon on Switch4#state do Publish stat/%topic%/SWITCH4 %value%; Rule1 1
+```
diff --git a/_templates/virage_labs_KS-7012 b/_templates/virage_labs_KS-7012
@@ -8,7 +8,7 @@ link: https://www.viragelabs.com/product/viragedimmer/
 link2: 
 mlink: https://www.viragelabs.com
 flash: preflashed
-category: light
+category: switch
 type: Dimmer
 standard: us
 ---

diff --git a/_templates/wemos_D1_R2 b/_templates/wemos_D1_R2
@@ -0,0 +1,15 @@
+---
+date_added: 2022-01-28
+title: Wemos D1 R2
+model: 
+image: /assets/images/wemos_D1_R2.jpg
+template9: 'Module 18' 
+link: https://www.aliexpress.com/item/1005001621842425.html
+link2: 
+link3: https://www.amazon.com/dp/B07J2QKNHB
+mlink: 
+flash: serial
+category: diy
+type: Development Board
+standard: global
+---
diff --git a/_templates/wireless_tag_WT32-SC01 b/_templates/wireless_tag_WT32-SC01
@@ -0,0 +1,17 @@
+---
+date_added: 2022-01-29
+title: Wireless Tag 3.5" Touch
+model: WT32-SC01
+image: /assets/images/wireless_tag_WT32-SC01.jpg
+template32: '{"NAME":"WT32-SC01","GPIO":[6210,1,1,1,1,1,0,0,1,704,736,768,1,1,640,608,1,800,1024,992,0,1,1,1,0,0,0,0,1,1,1,1,1,0,0,1],"FLAG":0,"BASE":1}' 
+link3: https://www.alibaba.com/product-detail/esp32-development-board-WT32-SC01-3_62534911683.html
+link4: https://www.amazon.de/dp/B09Q5GHNTX/
+link2: https://www.banggood.com/WT32-SC01-ESP32-Development-Board-with-3_5-inch-320X480-Capacitive-Multi-Touch-LCD-Screen-Built-In-bluetooth-WIFI-p-1921644.html
+link: https://www.aliexpress.com/item/1005003365708049.html
+mlink: http://www.wireless-tag.com/portfolio/wt32-sc01/
+flash: serial
+category: diy
+type: Display
+standard: global
+---
+Development board with 3.5" colour screen (SPI) and capacitive touch (I2C). All GPIOs are broken out for easy access. Comes with ESP32-WROVER-B Chip and 4/16MB Flash & 8MB PSRAM. 
diff --git a/_unsupported/2AWJP-WD300 → _unsupported/2AWJP-WD300.md b/_unsupported/2AWJP-WD300 → _unsupported/2AWJP-WD300.md
diff --git a/_unsupported/WB5.md b/_unsupported/WB5.md
diff --git a/_unsupported/lumary_floodlight → _unsupported/lumary_floodlight.md b/_unsupported/lumary_floodlight → _unsupported/lumary_floodlight.md
diff --git a/...rted/simply_conserve_L9W-A19-CCT-RGB-WIFI → ...d/simply_conserve_L9W-A19-CCT-RGB-WIFI.md b/...rted/simply_conserve_L9W-A19-CCT-RGB-WIFI → ...d/simply_conserve_L9W-A19-CCT-RGB-WIFI.md
diff --git a/_unsupported/zemismart_ZMDL002 → _unsupported/zemismart_ZMDL002.md b/_unsupported/zemismart_ZMDL002 → _unsupported/zemismart_ZMDL002.md
diff --git a/assets/images/globe_50322.jpg b/assets/images/globe_50322.jpg
diff --git a/assets/images/shelly_plus_i4.jpg b/assets/images/shelly_plus_i4.jpg
diff --git a/assets/images/wemos_D1_R2.jpg b/assets/images/wemos_D1_R2.jpg
diff --git a/assets/images/wireless_tag_WT32-SC01.jpg b/assets/images/wireless_tag_WT32-SC01.jpg