Merge pull request tasmota#470 from tasmota/development

merge dev into master

Author: blakadder

docs/AS3935.md

@@ -122,14 +122,15 @@ Setting table of the NF-noise sensitivity and stages:
   Stage 9  |   001  |  Outdoors  |   630 |
   Stage 10 |   010  |  Outdoors  |   860 |
   Stage 11 |   011  |  Outdoors  |  1100 |
-  Stage 12 |   100  |  Outdoors  |  1140 |
+  Stage 12 |   100  |  Outdoors  |  1330 |
   Stage 13 |   101  |  Outdoors  |  1570 |
   Stage 14 |   110  |  Outdoors  |  1800 |
   Stage 15 |   111  |  Outdoors  |  2000 | less sensitive
 
 
 !!! tips "Hint and Tips"
 - take a stabilized power supply.
+- keep a distance of at least 200 mm from the ESP and the AS3395
 - be careful with "ready to Use" devices like Sonoff, etc. they don't have a good power supply inside.
 - use a Ferrit clamp filter on the sensor cable.
 - wire all related Pins for I2C use.
@@ -156,7 +157,7 @@ You can find some troubleshooting tips in the [Tasmota GitHub discussion](https:
 "Some type of this sensor have wrong capacitors (100pF and 1000pF) installed and the calibration fails.
 The correct caps are 680pF and 270pF." <br>
 
-
+![AS3935](_media/peripherals/CJMCU_AS3935_Wrong.jpg)<br><br>
 
 ## Datasheet:
 [Datasheet from Mouser Web Site](https://www.mouser.com/datasheet/2/588/ams_AS3935_Datasheet_EN_v5-1214568.pdf)

docs/Blinds-and-Shutters.md

@@ -117,7 +117,7 @@ If you desire that the %-opening closely match what `ShutterPosition<x>` and web
 - Finally, enter the position measurements as the calibration values:
   `ShutterCalibration<x> 15 50 100 150 180`  
 
-`ShutterCalibration<x>` takes position measurements (**not** the time it takes to move). During calibration you position the shutter to an indicated percentage (e.g., `30%`) of opening and measure the shutter position (e.g., `15`). Use the same unit of measure for all your measurements (e.g., centimeters, inches, etc.). After calibration `ShutterPosition<x> 30` will move to `30%` opening which will correspond to the position you provided (`15`).  
+`ShutterCalibration<x>` takes position measurements (**not** the time it takes to move). During calibration you position the shutter to an indicated percentage (e.g., `30%`) of opening and measure the shutter position (e.g., `15`). Use the same unit of measure for all your measurements (e.g., centimeters, inches, steps, etc.). After calibration `ShutterPosition<x> 30` will move to `30%` opening which will correspond to the position you provided (`15`).  
 
 Notice that there is no calibration for the 10\% position. On many shutters, there is no movement during the initial phase (i.e., nearly 10% of total time). Therefore the opening could be `0`. This measurement would cause an execution DIV 0 exception. Therefore the first calibration point is 30%. In most cases this is not a large opening so the calibration will be near enough. Yes, until ~10%, the position will be a bit "off" but not enough for concern.  
 

docs/I2CDevices.md

@@ -2,6 +2,8 @@
 
 Tasmota supports several I2C devices but to use them they mostly need to be enabled at compile time to solve possible address conflicts.
 
+### Look at [Pre-Compiled Builds](https://github.com/arendst/Tasmota/blob/development/BUILDS.md) to see, which Driver is compiled in the release binarys.
+
 Using command ``I2cDriver`` individual drivers can be enabled or disabled at runtime allowing duplicate I2C addresses at compile time. Use the Index from the table below to control I2C drivers like ``I2cDriver10 0`` for disabling BMP support.
 
 ## Supported I2C devices
@@ -64,7 +66,8 @@ Index | Define              | Driver  | Device   | Address(es) | Description
   41  | USE_DHT12           | xsns_58 | DHT12    | 0x5C        | Temperature and humidity sensor
   42  | USE_DS1624          | xsns_59 | DS1621   | 0x48 - 0x4F | Temperature sensor
   42  | USE_DS1624          | xsns_59 | DS1624   | 0x48 - 0x4F | Temperature sensor
-  43  | USE_AHT1x           | xsns_63 | AHT10/15 | 0x38        | Temperature and humidity sensor
+  43  | USE_AHT1x           | xsns_63 | AHT10/15 | 0x38 or 0x39 | Temperature and humidity sensor
+  43  | USE_AHT2x           | xsns_63 | AHT20    | 0x38        | Temperature and humidity sensor
   44  | USE_WEMOS_MOTOR_V1  | xdrv_34 |          | 0x2D - 0x30 | WEMOS motor shield v1.0.0 (6612FNG)
   45  | USE_HDC1080         | xsns_65 | HDC1080  | 0x40        | Temperature and Humidity sensor
   46  | USE_IAQ             | xsns_66 | IAQ      | 0x5a        | Air quality sensor

docs/P1-Smart-Meter.md

@@ -1,8 +1,12 @@
-# Kaifa MA105C Energy Meter
-In this example the Kaifa MA105C meter is used and might work with other meters as well.
+# P1 Smart Meter
+ Reading serial data from a P1 smart meter using a Wemos with Tasmota installed.
+
+ Tested on the following smart meters:
+  - Kaifa MA105C
+  - De Landis + Gyr, E350 (ZCF110)
 
 ## Schematics
-<img src="https://github.com/arendst/arendst.github.io/blob/master/media/wemos/wemos_kaifa_energy_meter_scematic.png?raw=true" >
+![](_media/p1-smartmeter/p1-smartmeter.png) 
 
 The transistor makes sure that the RxD signal is converted and inverted to 3.3v 
 
@@ -11,40 +15,41 @@ In the **_Configuration -> Configure Module_** page, select module `Generic (18)
 
 From the web console set the serial delimiter to 10 (newline). This makes Tasmota publish each line of the telegram separately to mqtt. 
 
-`SerialDelimiter 10`
+- `SerialDelimiter 10`
+- `SerialSend 1`
 
-`SerialSend`
+For more details see [serial-bridge](Commands.md#serial-bridge).
 
 ## Example output
 Below an example of the telegram message published (per line) to mqtt. From here your HA system can process the data required for your needs.
 
 ```json
-16:59:39 MQT: tele/wemos-9/RESULT = {"SerialReceived":"/KFM5KAIFA-METER"}
-16:59:39 MQT: tele/wemos-9/RESULT = {"SerialReceived":""}
-16:59:39 MQT: tele/wemos-9/RESULT = {"SerialReceived":"1-3:0.2.8(42)"}
-16:59:39 MQT: tele/wemos-9/RESULT = {"SerialReceived":"0-0:1.0.0(190104170020W)"}
-16:59:39 MQT: tele/wemos-9/RESULT = {"SerialReceived":"0-0:96.1.1(4530303235303030303639363432393136)"}
-16:59:39 MQT: tele/wemos-9/RESULT = {"SerialReceived":"1-0:1.8.1(002342.060*kWh)"}
-16:59:39 MQT: tele/wemos-9/RESULT = {"SerialReceived":"1-0:1.8.2(002566.728*kWh)"}
-16:59:39 MQT: tele/wemos-9/RESULT = {"SerialReceived":"1-0:2.8.1(000000.000*kWh)"}
-16:59:39 MQT: tele/wemos-9/RESULT = {"SerialReceived":"1-0:2.8.2(000000.000*kWh)"}
-16:59:39 MQT: tele/wemos-9/RESULT = {"SerialReceived":"0-0:96.14.0(0002)"}
-16:59:40 MQT: tele/wemos-9/RESULT = {"SerialReceived":"1-0:1.7.0(00.428*kW)"}
-16:59:40 MQT: tele/wemos-9/RESULT = {"SerialReceived":"1-0:2.7.0(00.000*kW)"}
-16:59:40 MQT: tele/wemos-9/RESULT = {"SerialReceived":"0-0:96.7.21(00000)"}
-16:59:40 MQT: tele/wemos-9/RESULT = {"SerialReceived":"0-0:96.7.9(00000)"}
-16:59:40 MQT: tele/wemos-9/RESULT = {"SerialReceived":"1-0:99.97.0(1)(0-0:96.7.19)(000101000001W)(2147483647*s)"}
-16:59:40 MQT: tele/wemos-9/RESULT = {"SerialReceived":"1-0:32.32.0(00000)"}
-16:59:40 MQT: tele/wemos-9/RESULT = {"SerialReceived":"1-0:32.36.0(00000)"}
-16:59:40 MQT: tele/wemos-9/RESULT = {"SerialReceived":"0-0:96.13.1()"}
-16:59:40 MQT: tele/wemos-9/RESULT = {"SerialReceived":"0-0:96.13.0()"}
-16:59:40 MQT: tele/wemos-9/RESULT = {"SerialReceived":"1-0:31.7.0(002*A)"}
-16:59:40 MQT: tele/wemos-9/RESULT = {"SerialReceived":"1-0:21.7.0(00.453*kW)"}
-16:59:40 MQT: tele/wemos-9/RESULT = {"SerialReceived":"1-0:22.7.0(00.000*kW)"}
-16:59:40 MQT: tele/wemos-9/RESULT = {"SerialReceived":"0-1:24.1.0(003)"}
-16:59:40 MQT: tele/wemos-9/RESULT = {"SerialReceived":"0-1:96.1.0(4730303332353631323736373836373136)"}
-16:59:40 MQT: tele/wemos-9/RESULT = {"SerialReceived":"0-1:24.2.1(190104160000W)(02949.209*m3)"}
-16:59:40 MQT: tele/wemos-9/RESULT = {"SerialReceived":"!EE58"}
+09:16:17 MQT: tele/wemos-9/RESULT = {"SerialReceived":"/KFM5KAIFA-METER\r"}
+09:16:17 MQT: tele/wemos-9/RESULT = {"SerialReceived":"\r"}
+09:16:17 MQT: tele/wemos-9/RESULT = {"SerialReceived":"1-3:0.2.8(42)\r"}
+09:16:17 MQT: tele/wemos-9/RESULT = {"SerialReceived":"0-0:1.0.0(200913101618S)\r"}
+09:16:17 MQT: tele/wemos-9/RESULT = {"SerialReceived":"0-0:96.1.1(4530303235303030303639363432393136)\r"}
+09:16:17 MQT: tele/wemos-9/RESULT = {"SerialReceived":"1-0:1.8.1(005779.835*kWh)\r"}
+09:16:17 MQT: tele/wemos-9/RESULT = {"SerialReceived":"1-0:1.8.2(005583.617*kWh)\r"}
+09:16:17 MQT: tele/wemos-9/RESULT = {"SerialReceived":"1-0:2.8.1(000000.000*kWh)\r"}
+09:16:17 MQT: tele/wemos-9/RESULT = {"SerialReceived":"1-0:2.8.2(000000.000*kWh)\r"}
+09:16:17 MQT: tele/wemos-9/RESULT = {"SerialReceived":"0-0:96.14.0(0001)\r"}
+09:16:17 MQT: tele/wemos-9/RESULT = {"SerialReceived":"1-0:1.7.0(00.498*kW)\r"}
+09:16:17 MQT: tele/wemos-9/RESULT = {"SerialReceived":"1-0:2.7.0(00.000*kW)\r"}
+09:16:17 MQT: tele/wemos-9/RESULT = {"SerialReceived":"0-0:96.7.21(00000)\r"}
+09:16:17 MQT: tele/wemos-9/RESULT = {"SerialReceived":"0-0:96.7.9(00000)\r"}
+09:16:17 MQT: tele/wemos-9/RESULT = {"SerialReceived":"1-0:99.97.0(1)(0-0:96.7.19)(000101000001W)(2147483647*s)\r"}
+09:16:17 MQT: tele/wemos-9/RESULT = {"SerialReceived":"1-0:32.32.0(00000)\r"}
+09:16:17 MQT: tele/wemos-9/RESULT = {"SerialReceived":"1-0:32.36.0(00000)\r"}
+09:16:17 MQT: tele/wemos-9/RESULT = {"SerialReceived":"0-0:96.13.1()\r"}
+09:16:17 MQT: tele/wemos-9/RESULT = {"SerialReceived":"0-0:96.13.0()\r"}
+09:16:17 MQT: tele/wemos-9/RESULT = {"SerialReceived":"1-0:31.7.0(002*A)\r"}
+09:16:17 MQT: tele/wemos-9/RESULT = {"SerialReceived":"1-0:21.7.0(00.496*kW)\r"}
+09:16:17 MQT: tele/wemos-9/RESULT = {"SerialReceived":"1-0:22.7.0(00.000*kW)\r"}
+09:16:17 MQT: tele/wemos-9/RESULT = {"SerialReceived":"0-1:24.1.0(003)\r"}
+09:16:17 MQT: tele/wemos-9/RESULT = {"SerialReceived":"0-1:96.1.0(4730303332353631323736373836373136)\r"}
+09:16:17 MQT: tele/wemos-9/RESULT = {"SerialReceived":"0-1:24.2.1(200913100000S)(04139.079*m3)\r"}
+09:16:17 MQT: tele/wemos-9/RESULT = {"SerialReceived":"!F798\r"}
 ```
 
 ## Description of each line 

docs/_media/p1-smartmeter/p1-smartmeter.png

@@ -42,7 +42,7 @@ Bridge mqtt:broker:myMQTTBroker [ host="IPofBroker", secure=false, username="myU
 {
     Thing topic tasmota_TH_Thing "Light_TH" {
     Channels:
-        Type switch : PowerSwitch  [ stateTopic="stat/tasmota_TH/POWER" , transformationPattern="JSONPATH:$.POWER" , commandTopic="cmnd/tasmota_TH/POWER", on="ON", off="OFF" ]
+        Type switch : PowerSwitch  [ stateTopic="stat/tasmota_TH/POWER" , commandTopic="cmnd/tasmota_TH/POWER", on="ON", off="OFF" ]
         Type string : Version [stateTopic="stat/tasmota_TH/STATUS2", transformationPattern="JSONPATH:$.StatusFWR.Version"]
         Type string : Temperature [stateTopic="tele/tasmota_TH/SENSOR", transformationPattern="JSONPATH:$.AM2301.Temperature"]
       }