From 68ae3eabea75a597f88b12a0b00ddc459ec3b962 Mon Sep 17 00:00:00 2001 From: blakadder Date: Wed, 30 Oct 2019 20:54:01 +0100 Subject: [PATCH] PZEM article changed --- Buttons-and-Switches.md | 2 +- Components.md | 2 +- Connecting-Peripheral-Devices.md | 2 +- Home.md | 2 +- PIR-Motion-Sensors.md | 5 +++-- PZEM-Energy-Monitoring-Custom-Devices.md => PZEM-0XX.md | 9 +++++++++ Peripherals.md | 2 +- Supported-sensors.md | 2 +- 8 files changed, 18 insertions(+), 8 deletions(-) rename PZEM-Energy-Monitoring-Custom-Devices.md => PZEM-0XX.md (72%) diff --git a/Buttons-and-Switches.md b/Buttons-and-Switches.md index 415f00ab..9498b172 100644 --- a/Buttons-and-Switches.md +++ b/Buttons-and-Switches.md @@ -26,7 +26,7 @@ In Tasmota a `Switch` is any switch or push-button additionally connected to a f - [mechanical toggle switch](https://en.wikipedia.org/wiki/Switch#Toggle_switch) - also called a rocker switch - [capacitive touch switch](https://en.wikipedia.org/wiki/Touch_switch) - [reed switch](https://en.wikipedia.org/wiki/Reed_switch) -- [PIR](https://en.wikipedia.org/wiki/Passive_infrared_sensor) - even though it's technically a sensor it is configured as a switch in Tasmota +- [PIR](https://en.wikipedia.org/wiki/Passive_infrared_sensor) - even though it's technically a sensor it is [configured as a switch in Tasmota](PIR-Motion-Sensors) - [mechanical push-button](https://en.wikipedia.org/wiki/Push-button) By default a switch toggles the corresponding relay. Every time the switch gets flipped, the relay changes its state (ON or OFF). Apart from the default toggling of the relay, switches can be configured to send messages to different MQTT topics, or send commands to other Tasmota devices. diff --git a/Components.md b/Components.md index 3fbe1f64..104ab47e 100644 --- a/Components.md +++ b/Components.md @@ -13,7 +13,7 @@ If you wish to expand a device with your own component, after properly wiring ev ![GPIO assign](https://user-images.githubusercontent.com/5904370/58193269-e771b800-7cc2-11e9-9bb6-8d425a1fa3b2.png) -Read more about adding specific [sensors](supported-sensors) or [adding peripherals to a device](Expanding-Tasmota). +Read more about adding specific [sensors](Peripherals) or [adding peripherals to a device](Expanding-Tasmota). ### Components List |#|Name|Description diff --git a/Connecting-Peripheral-Devices.md b/Connecting-Peripheral-Devices.md index 3f216d64..82e9fbd9 100644 --- a/Connecting-Peripheral-Devices.md +++ b/Connecting-Peripheral-Devices.md @@ -1,3 +1,3 @@ -- [**Sensors and Controllers**](Supported-Sensors) +- [**Sensors and Controllers**](Peripherals) - [**Displays**](Displays) diff --git a/Home.md b/Home.md index 7ec1267e..54f0b9de 100644 --- a/Home.md +++ b/Home.md @@ -10,7 +10,7 @@ Alternative open source firmware for [**ESP8266**](https://en.wikipedia.org/wiki - [Rules](Rules) and [Timers](commands#Timers) for on device automation - Control with [web UI](commands#console-in-web-ui), [MQTT](MQTT), [web requests](commands#web) or [serial terminal](commands#serial) - Easy configuration of devices using [Templates](Templates) -- Connect [components](components) ([switches](Buttons-and-Switches), [sensors](supported-sensors), [displays](displays),...) +- Connect [components](components) ([switches](Buttons-and-Switches), [sensors](Peripherals), [displays](displays),...) - Easy integration in home automation solutions such as [openHAB](https://www.openhab.org/), [Home Assistant](https://www.home-assistant.io/), [Domoticz](http://www.domoticz.com/) and [more](Integrations) - Wemo and Hue emulation for [Amazon Alexa](Alexa) support - [KNX](KNX-features) IP protocol support diff --git a/PIR-Motion-Sensors.md b/PIR-Motion-Sensors.md index a0dbe20a..73d4bb06 100644 --- a/PIR-Motion-Sensors.md +++ b/PIR-Motion-Sensors.md @@ -38,9 +38,10 @@ Pin marked VOUT is connected to a free GPIO pin on the device. This PIR goes to off state after a few seconds so we need to use this rule *instead* of the one in the example. ``` -Rule1 on switch1#state=1 do backlog publish stat/%topic%/PIR1 ON; RuleTimer1 30 endon on Rules#Timer=1 do publish stat/%topic%/PIR1 OFF endon` -With this it will stay ON for 30 seconds then send OFF message and the timer restarts every time there's an ON trigger. +Rule1 on switch1#state=1 do backlog publish stat/%topic%/PIR1 ON; RuleTimer1 30 endon on Rules#Timer=1 do publish stat/%topic%/PIR1 OFF endon ``` +With this it will stay ON for 30 seconds then send OFF message and the timer restarts every time there's an ON trigger. + ## HC-SR501 diff --git a/PZEM-Energy-Monitoring-Custom-Devices.md b/PZEM-0XX.md similarity index 72% rename from PZEM-Energy-Monitoring-Custom-Devices.md rename to PZEM-0XX.md index 90f3b494..015e6155 100644 --- a/PZEM-Energy-Monitoring-Custom-Devices.md +++ b/PZEM-0XX.md @@ -1,7 +1,16 @@ +## PZEM-004 + +## Pinout +![](https://user-images.githubusercontent.com/5904370/67893137-58f94080-fb56-11e9-877e-9675149c0fd6.png) + - [**PZEM-004T Energy Monitor**](PZEM004T-Energy-Monitor) - using a Sonoff Basic - [**PZEM-004T Energy Monitor - US 240V**](US-240V-Clothes-Dryer-PZEM004T-Energy-Monitor) - using a HW-655/LC Technology relay module - [**PZEM-004T Energy Monitor with a 1602 I2C display**](PZEM004T,-Wemos-D1-Mini-and-a-1602-I2C-display) - using a Wemos D1 Mini - [**PZEM-016 Energy Monitor**](PZEM016-Energy-Monitoring) - RS485 to TTL serial modification +## PZEM-016 + +![](https://user-images.githubusercontent.com/5904370/67893552-0cfacb80-fb57-11e9-9a9b-67482ca905d1.png) + ## Note on Calibration [Per Theo](https://github.com/arendst/Sonoff-Tasmota/issues/3208#issuecomment-405048466) - As the PZEM is a dedicated energy monitor, device calibration in TASMOTA is currently not supported. diff --git a/Peripherals.md b/Peripherals.md index 9d728ee6..521c4906 100644 --- a/Peripherals.md +++ b/Peripherals.md @@ -44,7 +44,7 @@ More about [sensor configuration.](https://github.com/arendst/Sonoff-Tasmota/wik - **PCF8574** 8-port I\/O Expander (I2C) - **PMS3003-5003-7003** Particle Concentration sensor (Serial) - [**PN532**](PN532) NFC/RFID controller -- [**PZEM-0XX**](PZEM-Energy-Monitoring-Custom-Devices) Energy Monitor (Serial) +- [**PZEM-0XX**](PZEM-0XX) Energy Monitor (Serial) - [**RCWL 0516**](Wemos-D1-Mini-and-RCWL-0516-Microwave-Radar-Sensor) Microwave Radar Presence detection - [**RDM6300**](Wemos-D1-Mini-and-RDM6300) 125Khz RFID Module - **RX-4M50RR30SF / RX-AM8SF** RF Sensor receiver (GPIO) diff --git a/Supported-sensors.md b/Supported-sensors.md index 35982847..98be120d 100644 --- a/Supported-sensors.md +++ b/Supported-sensors.md @@ -40,7 +40,7 @@ - **PCF8574** 8-port I\/O Expander (I2C) - **PMS3003-5003-7003** Particle Concentration sensor (Serial) - [**PN532**](PN532) NFC/RFID controller -- [**PZEM-0XX**](PZEM-Energy-Monitoring-Custom-Devices) Energy Monitor (Serial) +- [**PZEM-0XX**](PZEM-0XX) Energy Monitor (Serial) - [**RCWL 0516**](Wemos-D1-Mini-and-RCWL-0516-Microwave-Radar-Sensor) Microwave Radar Presence detection - [**RDM6300**](Wemos-D1-Mini-and-RDM6300) 125Khz RFID Module - **RX-4M50RR30SF / RX-AM8SF** RF Sensor receiver (GPIO)