Merge branch 'mega' into feature/taskvalueset_by_name

docs/source/Plugin/P075.rst

@@ -95,7 +95,7 @@ This is automatically done when hardware serial is chosen.
 A transistor circuit must be added when hardware serial is used. Despite the extra work, the hardware serial method is strongly recommended.
 
 .. attention::
-   Hardware serial receiver (RX) uses ESP8266's D8 "boot" configuration pin.
+   Hardware serial transmit (TX) uses ESP8266's D8 "boot" configuration pin.
    A transistor buffer is required to isolate the ESP8266 from the Nextion's RX input circuity.
    Omitting the transistor may prevent the ESP8266 from booting correctly!
 

docs/source/Plugin/P079.rst

@@ -41,14 +41,12 @@ The Shield has a TB6612FNG driver chip that can control two DC motors that draw
 Motor supply voltage can range from 2.5VDC to 15.0VDC.
 There is also a STM32F030 microcontroller onboard that handles the i2c communication for command processing.
 
-Warning: Only one Motor Shield can be used on a ESPEasy device. This is a limitation of the ESPEasy plugin.
-
 Supported Hardware
 ------------------
 
 There are two variations of the Motor Shield. Originally only the Wemos V1.0 Motor Shield was supported.
 This board requires modification (custom STM32F030 firmware and solder jumpers).
-But in Oct-2020 the ESPEasy plugin was updated to support the Lolin 2.0 Motor Shield.
+But on mega-20200929 and later releases the plugin has been updated to support the Lolin 2.0 Motor Shield.
 The Lolin Shield requires no modifications which greatly simplifies a new installation.
 
 Hardware Installation

docs/source/Plugin/P079_LolinMotorshield.rst

@@ -31,9 +31,6 @@ It has a TB6612FNG driver chip that can control two DC motors that draw 1.2A or
 Motor supply voltage can range from 2.5VDC to 15.0VDC.
 There is also a STM32F030 microcontroller onboard that handles the i2c communication for command processing.
 
-Only one Motor Shield can be used on a ESPEasy device.
-This is a limitation of the ESPEasy plugin.
-
 Hardware Installation
 ---------------------
 The Shield is designed to plug directly onto a Wemos D1 mini (ESP8266).
@@ -79,7 +76,7 @@ Motor Shield Testing
 --------------------
 
 The I2C scan function (found on ESPEasy's *Tools* page) can be used to confirm the board is seen by the bus.
-If the scan does not find address 0x30 then check your wiring and the ESPEasy plugin's configuration.
+If the scan does not find address 0x30 then check your wiring.
 The image below shows a successful Motor Shield I2C Scan:
 
 .. figure:: P079_i2c_scan1.png
@@ -143,33 +140,33 @@ A pair of switches (requires two *Switch input - Switch* plugins) are used to li
 .. code-block:: none
 
   // Events
-  On DoorOpen Do
-    LolinMotorShieldCMD 0 Backward 30
-  EndOn
+  on DoorOpen do
+    LolinMotorShieldCMD,0,Backward,30
+  endon
 
-  On DoorClose Do
-    LolinMotorShieldCMD 0 Forward 30
-  EndOn
+  on DoorClose do
+    LolinMotorShieldCMD,0,Forward,30
+  endon
 
-  On DoorStop Do
-    LolinMotorShieldCMD 0 Stop
-  EndOn
+  on DoorStop do
+    LolinMotorShieldCMD,0,Stop
+  endon
 
   // Timer for all day open door at time if not open
-  On Clock#Time=All,07:00 do
-    If [Limit1#Switch]!=1
-      Event,DoorOpen
-    Else
-      Event,DoorStop
+  on Clock#Time=All,07:00 do
+    if [Limit1#Switch]!=1
+      event,DoorOpen
+    else
+      event,DoorStop
     endif
   endon
 
   // Timer for all day close door at time if not closed
-  On Clock#Time=All,22:00 do
-    If [Limit2#Switch]!=1
-      Event,DoorClose
-    Else
-     Event,DoorStop
+  on Clock#Time=All,22:00 do
+    if [Limit2#Switch]!=1
+      event,DoorClose
+    else
+     event,DoorStop
     endif
   endon
 

docs/source/Plugin/P079_WemosMotorshield.rst

@@ -30,14 +30,12 @@ It has a TB6612FNG driver chip that can control two DC motors that draw 1.2A or
 Motor supply voltage can range from 2.5VDC to 15.0VDC.
 There is also a STM32F030 microcontroller onboard that handles the i2c communication for command processing.
 
-Only one Motor Shield can be used on a ESPEasy device. This is a limitation of the ESPEasy plugin.
-
 Firmware Upgrade
 ----------------
 Piotr Bugalski has re-written the firmware for the Wemos V1.0 Motor Shield. It is published at https://github.com/pbugalski/wemos_motor_shield.
 Details to Piotr's firmware redesign can be found `Here <https://hackaday.io/project/18439-motor-shield-reprogramming>`_
 
-The original firmware has reliability issues, such as hard lockup (hang) of the I2C bus.
+The factory installed firmware has reliability issues, such as hard lockup (hang) of the I2C bus.
 When this occurs all I2c communication is lost.
 A power cycle is required to restore operation!
 
@@ -159,7 +157,7 @@ Motor Shield Testing
 --------------------
 
 The I2C scan function (found on ESPEasy's *Tools* page) can be used to confirm the board is seen by the bus.
-If the scan does not find address 0x30 then check your wiring and the ESPEasy plugin's configuration.
+If the scan does not find address 0x30 then recheck your wiring.
 The image below shows a successful Motor Shield I2C Scan:
 
 .. image:: P079_i2c_scan1.png
@@ -203,33 +201,33 @@ A pair of switches (requires two *Switch input - Switch* plugins) are used to li
 .. code-block:: none
 
   // Events
-  On DoorOpen Do
-    WemosMotorShieldCMD 0 Backward 30
-  EndOn
+  on DoorOpen do
+    WemosMotorShieldCMD,0,Backward,30
+  endon
 
-  On DoorClose Do
-    WemosMotorShieldCMD 0 Forward 30
-  EndOn
+  on DoorClose do
+    WemosMotorShieldCMD,0,Forward,30
+  endon
 
-  On DoorStop Do
-    WemosMotorShieldCMD 0 Stop
-  EndOn
+  on DoorStop do
+    WemosMotorShieldCMD,0,Stop
+  endon
 
   // Timer for all day open door at time if not open
-  On Clock#Time=All,07:00 do
-    If [Limit1#Switch]!=1
-      Event,DoorOpen
-    Else
-      Event,DoorStop
+  on Clock#Time=All,07:00 do
+    if [Limit1#Switch]!=1
+      event,DoorOpen
+    else
+      event,DoorStop
     endif
   endon
 
   // Timer for all day close door at time if not closed
-  On Clock#Time=All,22:00 do
-    If [Limit2#Switch]!=1
-      Event,DoorClose
-    Else
-     Event,DoorStop
+  on Clock#Time=All,22:00 do
+    if [Limit2#Switch]!=1
+      event,DoorClose
+    else
+     event,DoorStop
     endif
   endon
 

docs/source/Plugin/P079_commands.repl

@@ -9,7 +9,7 @@
 
     ","
     | The *WemosMotorShieldCMD* and *LolinMotorShieldCMD* command keywords are interchangeable.
-    | The *LolinMotorShieldCMD* command keyword is available with Oct-2020 or later mega releases.
+    | The *LolinMotorShieldCMD* command keyword is available on mega-20200929 and later releases.
     | All commands are case insensitive.
 
     "
@@ -43,7 +43,7 @@
 
     ","
 
-    *Brake* and *Standby* actions are only available with Oct-2020 or later mega releases.
+    *Brake* and *Standby* actions are available on mega-20200929 and later releases.
 
     **HTTP Examples:**