Merge branch 'master' of https://github.com/arendst/Tasmota.wiki

BlitzWolf-SHP6.md

@@ -77,6 +77,19 @@ It significantly reduces the effort of reflashing multiple SHP-6 units.
 [[https://raw.githubusercontent.com/wiki/RTurala/Sonoff-Tasmota/images/BlitzWolf-SHP6/BW-SHP6-08.jpg|Back]]
 [[https://raw.githubusercontent.com/wiki/RTurala/Sonoff-Tasmota/images/BlitzWolf-SHP6/BW-SHP6-09.jpg|All parts]]
 
+## Template
+[[https://blakadder.github.io/templates/blitzwolf_SHP6.html]]
+
+## Calibration fine tuning
+Approach the calibration using the Method 2. If not satisfied with the results, you could mod the SMD direct measure resistor or mitigate this using a Tasmota set of rules:
+
+```
+Rule1 ON energy#power<=100 DO Currentcal 2500 BREAK ON energy#power<=500 DO Currentcal 2635 BREAK ON energy#power<=1000 DO Currentcal 2788 BREAK ON energy#power<=1500 DO Currentcal 2942 BREAK ON energy#power<=2000 DO Currentcal 3095 BREAK ON energy#power<=2500 DO Currentcal 3249 BREAK ON energy#power>2500 DO Currentcal 3402 BREAK 
+Rule1 1
+```
+
+Take the CurrentCal values above as a first approach and should be corrected through the Tasmota Method 2 calibration procedure: [[https://github.com/arendst/Tasmota/wiki/Power-Monitoring-Calibration]]
+
 ## Home Assistant configuration 
 ```yaml
 switch:

Home-Assistant.md

@@ -58,8 +58,27 @@ Automatic discovery is currently supported for:
     - Use Hass [light.switch](https://www.home-assistant.io/components/light.switch/) component
 - Sensor - Announced as Home Assistant `sensor`
 - Button - Announced as Home Assistant `binary sensor` 
+  - As normal behavior a button will automatically turn off after `one second`
 - Switch - Announced as Home Assistant `binary sensor`
 
+Starting from release 6.7.1 to have `buttons` and `switches` discovered `switchtopic` or `buttontopic` must be set to default value `0` and they will listen to `sonoff/stat/RESULT` topic.
+```yaml
+MQT: sonoff/stat/RESULT = {"BUTTON1":"TOGGLE"} 
+MQT: sonoff/stat/RESULT = {"POWER":"ON"} 
+MQT: sonoff/stat/POWER = ON
+```
+This option leave to the user the ability to get a more granular control over entities, for example with a simple rule:
+```yaml
+Rule1 ON Button1#STATE DO Var1 %value% ENDON
+```
+With the rule enabled , on button press the result will be
+```yaml
+RUL: BUTTON1#STATE performs "var1 2"
+MQT: sonoff/stat/RESULT = {"Var1":"2"}
+MQT: sonoff/stat/RESULT = {"BUTTON1":"TOGGLE"}
+```
+and the relay will NOT be switched.
+
 For other type of devices, e.g iFan02, example entries for configuration.yaml is available in [[Home Assistant - Manual Config|Home-Assistant-‐-Manual-Config]]
 
 On each Tasmota device which should be automatically discovered by Hass, enter the following commands in the web console:\
@@ -76,18 +95,23 @@ You cannot use custom defined topics while `Setoption19` is on since it will alw
 ## Setup Tasmota devices through Home Assistant
 All automatically discovered entities will show up under:\
 Configuration -> Integrations -> Configured -> MQTT\
-The entities are grouped by hardware, example for a Sonoff T1 2CH:
+The entities are grouped by hardware, example for a Sonoff Basic:
 
-![image](https://user-images.githubusercontent.com/14281572/50019947-bf27b400-ffd4-11e8-98b5-4bd5ef848cf1.png)
+![image](https://user-images.githubusercontent.com/7702766/67961116-082b2b80-fbda-11e9-8552-ce2bd85d2a3f.png)
 
 By clicking on one of the entities, and then on the cog wheel, name in Hass and `entity_id` can be customized:
 
 ![image](https://user-images.githubusercontent.com/14281572/50020005-f4cc9d00-ffd4-11e8-9881-b04ed6e85468.png)
+
 ![image](https://user-images.githubusercontent.com/14281572/50020040-09109a00-ffd5-11e8-8026-74293753783a.png)
 
 Note1: Lights currently show up under "Entities without devices", this will be fixed in Hass 0.85 [#19013](https://github.com/home-assistant/home-assistant/pull/19013)\
 Note2: After changing `entity_id` Hass must be restarted, this will be fixed in Hass 0.85 [#19414](https://github.com/home-assistant/home-assistant/pull/19414)
 
+For every device discovered with `setoption19` an informative sensor will be created automatically:
+
+![image](https://user-images.githubusercontent.com/7702766/67965278-88ed2600-fbe0-11e9-9de5-29ecd2c78fac.png)
+
 ## Tips
 
 ### Tip: Sync power state