letscontrolit · TD-er · Dec 29, 2023 · Oct 1, 2022 · Oct 1, 2022 · Oct 1, 2022
diff --git a/docs/source/Plugin/P020.rst b/docs/source/Plugin/P020.rst
@@ -26,30 +26,120 @@ Supported hardware
 
 |P020_usedby|
 
+Configuration
+-------------
+
+.. image:: P020_DeviceConfiguration.png
+
+* **Name** In the Name field a unique name should be entered.
+
+* **Enabled** When unchecked the plugin is not enabled.
+
 Sensor
 ^^^^^^
 
 See: :ref:`SerialHelper_page`
 
+Device Settings
+^^^^^^^^^^^^^^^
+
+* **TCP Port**: The port for an external network client to read the data from, range 1..65535. The used port number must be unique within the device.
+
+* **Baud Rate / Serial config**: See *Serial helper configuration*, above.
+
+* **Event Processing**: Select the type of data that is expected, to enable correct preprocessing. Available options:
+
+.. image:: P020_EventProcessingOptions.png
+
+* *None*: No special processing, what is received is sent out to the network client, not generating an event.
+
+* *Generic*: No special processing, received data is sent to the network client, and an event ``!Serial#<message>``, containing the message as is, is generated. Spaces and newlines are processed as configured below.
+
+* *RFLink*: Specifically designed for receiving serial data from RFLink devices, it follows this process:
+
+  * Remove the regular RFLink ``20;xx;`` prefix
+  * Check for prefix ``ESPEASY;``, if found, remove the prefix and generate event ``RFLink#<message>``. The ``<message>`` will contain commands to be handled by ESPEasy.
+  * If previous prefix is not found, generate event ``!RFLink#<message>``, containing the entire received data. Spaces and newlines are processed as configured below.
+
+    *Also see the* **Multiple lines processing** *option, below.*
+
+* *P1 WiFi Gateway*: Process the data, received from a P1 Energy meter, that does a checksum validation, as included in the message. No separate data values are available in ESPEasy, these are usually handled by Home automation systems that support the P1 protocol via TCP network communication. An event ``<TaskName>#Data`` is generated when a valid P1 packet is received.
+
+  Replacing spaces or newlines should be **disabled** for the P1 protocol data to be handled properly as these replacements will disturb the checksum calculation, and also, the **Multiple lines processing** should be disabled if the data is to be handled as P1 protocol data, as that does contain newlines.
+
+.. spacer
+
+* **P1 #data event with message**: When enabled, the *P1 WiFi Gateway* Event Processing option will include the received message. **WARNING** This may easily cause memory overflow exceptions, especially when running on ESP8266 or other low-memory situations!
+
+When selecting the **Event processing** options *Generic* or *RFLink*, after submitting the page will show extra options for the events generated:
+
+.. image:: P020_EventOptions.png
 
-**TODO**: Complete this documentation...
+* **Use Serial Port as eventname**: Instead of the default ``!Serial#<data>`` event, the name of the configured serial port will be used: (**Only** available for *Generic* Event processing)
 
-.. Commands available
-.. ^^^^^^^^^^^^^^^^^^
+.. spacer
 
-.. .. include:: P020_commands.repl
+* *(Unchecked)* -> ``Serial``
+* *HW Serial0* -> ``serial0``
+* *HW Serial0 swap* -> ``serial0``
+* *HW Serial1* -> ``serial1``
+* *HW Serial2* -> ``serial2``
+* *SW Serial* -> ``serialsw``
+* *I2C Serial* -> ``seriali2c``
+* *USB HWCDC* -> ``serialhwcdc``
+* *USB CDC* -> ``serialcdc``
 
-.. Events
-.. ~~~~~~
+.. spacer
 
-.. .. include:: P020_events.repl
+* **Append Task Number to eventname**: Will append the task number to the event name, f.e. ``Serial8`` or ``RFLink12`` when task 8 or 12 is in use for this plugin. Can be combined with **Use Serial Port as eventname** if that is option is shown, resulting f.e. in ``serial0swap6`` etc. (Only available for *Generic* and *RFLink* Event processing)
+
+.. spacer
+
+* **Replace spaces in event by**: Here a single character can be selected to replace all spaces during receiving the data. 
+* **Replace newlines in event by**: Here a single character can be selected to replace all newlines during receiving the data. When enabled, all linefeeds are replaced, and all carriage returns (if any) are discarded.
+
+.. image:: P020_ReplaceCharInEventOptions.png
+
+The available set of replacement characters is ``, ; : . ! ^ | / \`` (comma, semicolon, colon, period, exclamation, caret, pipe, slash and backslash). When set to None, no replacement will be done.
+
+* **Process events without client**: By default, if no network client is connected, no serial data will be received and processed either. Enabling this option enables receiving data and generating events without a TCP client connected.
+
+* **Multiple lines processing**: When enabled, all received data will be split at a linefeed and sent out/event generated as separate messages.
+
+* **RX Receive timeout (mSec)**: If parts of serial data packets are somewhat delayed, but should still be handled as a single message, then the delay to wait for the next part can be configured here. 0 disables the delay.
+
+* **Reset target after init**: Select a GPIO pin that should be pulled low once during initialization of the plugin, used to synchronize the external serial data source with the plugin.
+
+* **RX Buffer size (bytes)**: To not overburden the memory use of the plugin, the buffer size is set rather low. Some serial devices, like energy meters may require a larger buffer if the message exceeds this size. Range: 256..1024.
+
+Led
+^^^
+
+* **Led enabled**: To enable a *data is being processed* activity led.
+
+* **Led pin**: The GPIO pin the Led is connected to.
+
+* **Led inverted**: Iverts the on/off state for the Led.
+
+Data Acquisition
+^^^^^^^^^^^^^^^^
+
+The Data Acquisition and Send to Controller settings are standard available configuration items. Send to Controller only when one or more Controllers are configured. *Single event with all values* option is not applicable for this plugin.
+
+
+Commands
+~~~~~~~~
+
+.. include:: P020_commands.repl
 
 Change log
 ----------
 
 .. versionchanged:: 2.0
   ...
 
+  |changed| 2022-12-13: Merge of P020 and P044 to reduce code size and combine features, as P044 was initially started as a spin-off from P020, but not evolved with the P020 features.
+
   |added|
   Major overhaul for 2.0 release.
 

diff --git a/docs/source/Plugin/P020_DeviceConfiguration.png b/docs/source/Plugin/P020_DeviceConfiguration.png
diff --git a/docs/source/Plugin/P020_EventOptions.png b/docs/source/Plugin/P020_EventOptions.png
diff --git a/docs/source/Plugin/P020_EventProcessingOptions.png b/docs/source/Plugin/P020_EventProcessingOptions.png
diff --git a/docs/source/Plugin/P020_ReplaceCharInEventOptions.png b/docs/source/Plugin/P020_ReplaceCharInEventOptions.png
diff --git a/docs/source/Plugin/P020_commands.repl b/docs/source/Plugin/P020_commands.repl
@@ -0,0 +1,37 @@
+.. csv-table::
+        :header: "Command", "Extra information"
+        :widths: 20, 30
+
+        "
+        ``serialsend,<content to send>``
+
+        ``<content to send>``: Text that will be sent (nearly) unprocessed. Only the regular variable replacements will be applied before sending the content to the serial port.
+        ","
+        Using this command, either from rules, via http or mqtt, the text that is provided as content is completely sent to the serial port. No extra data is added, other than any (system) variables that are included, being replaced.
+        "
+        "
+        ``ser2netclientsend,<content to send>``
+
+        ``<content to send>``: Text that will be sent (nearly) unprocessed. Only the regular variable replacements will be applied before sending the content to the network client.
+        ","
+        This command will only send data to the network client, when there is an active connection.
+
+        Using this command, either from rules, via http or mqtt, the text that is provided as content is completely sent to the network client. No extra data is added, other than any (system) variables that are included, being replaced.
+        "
+        "
+        ``serialsendmix,'<content to send>'[,...]``
+
+        ``<content to send>``: Text and/or hex byte(s) (having 0x prefix) that will be sent (nearly) unprocessed. Only the regular variable replacements will be applied before sending the content to the serial port.
+        ","
+
+        This command requires quotes to be used if spaces or commas are part of the content.
+
+        Any data can be sent, even if it can not be typed in a text content, by specifying that as a separate argument: ``serialsendmix,'text, optionally including spaces or commas',0xXX,'0xXXxx XX,xx-XX:xx'``
+
+        ``'text, optionally including spaces or commas'``: Any text content to be sent to the serial port. Can contain variables. Quotes are only required if spaces or commas (separators) are used.
+
+        ``0xXX``: A single character in hexadecimal notation (range: 0x00..0xFF), that is appended to the data to send.
+
+        ``'0xXXxx XX,xx-XX:xx'``: A sequence of hexadecimal values (range: 0x00..0xFF), that *can* be separated by a space, comma, dash, colon, semicolon or period, or are just entered adjecent. Only the first 2 characters should be ``0x`` or ``0X``, the rest is interpreted as hex bytes, and appended to the string to send. Quotes are only required if space or comma separators are used.
+        Using this command, either from rules, via http or mqtt, the text that is provided as content is completely sent to the serial port. No extra data is added, other than any (system) variables that are included, being replaced.
+        "
diff --git a/docs/source/Plugin/P037.rst b/docs/source/Plugin/P037.rst
@@ -190,11 +190,17 @@ Option: Limit events being generated
 
 * **Max. # events in event queue**: As a protection against event-overflow this configures a check for the queue-length, so if more than the selected number of events is still in the queue, new events will be discarded until some events are processed, and the remaining is less than this count. When set to 0 this check is disabled.
 
-Option: Modify separater character in events
+Option: Modify separator character in events
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 * **To replace by comma in event**: Select a character that is to be replaced by a comma, before it is put into the event-queue. There is a limited set of characters that can be replaced, to avoid ending up with malformed events.
 
+Available options:
+
+.. image:: P037_ReplaceByCommaOptions.png
+
+The available set of replacement characters is ``! @ $ % ^ & * ; : . | / \`` (exclamation, at, dollar, percent, caret, ampersand, semicolon, colon, period, pipe, slash and backslash). When set to None, no replacement will be done.
+
 This can be used to 'transform' the content of a JSON message so the used separator is a comma, for easier use in rules.
 
 Topic Subscriptions

diff --git a/docs/source/Plugin/P037_ReplaceByCommaOptions.png b/docs/source/Plugin/P037_ReplaceByCommaOptions.png
diff --git a/docs/source/Plugin/P044.rst b/docs/source/Plugin/P044.rst
@@ -26,30 +26,55 @@ Supported hardware
 
 |P044_usedby|
 
+.. note:: This plugin is now merged (back) into :ref:`P020_page` where it initially was forked off from, with using some predefined settings.
+
+Configuration
+-------------
+
+.. image:: P044_DeviceConfiguration.png
+
+* **Name** In the Name field a unique name should be entered.
+
+* **Enabled** When unchecked the plugin is not enabled.
+
 Sensor
 ^^^^^^
 
 See: :ref:`SerialHelper_page`
 
+Device Settings
+^^^^^^^^^^^^^^^
+
+* **TCP Port**: The port for an external network client to read the data from, range 1..65535. The used port number must be unique within the device.
 
-**TODO**: Complete this documentation...
+* **Baud Rate / Serial config**: See *Serial helper configuration*, above.
 
-.. Commands available
-.. ^^^^^^^^^^^^^^^^^^
+* **P1 #data event with message**: When enabled, the *P1 WiFi Gateway* Event Processing option will include the received message. **WARNING** This may easily cause memory overflow exceptions, especially when running on ESP8266 or other low-memory situations!
 
-.. .. include:: P044_commands.repl
+* **Process events without client**: By default, if no network client is connected, no serial data will be received and processed either. Enabling this option enables receiving data and generating events without a TCP client connected.
 
-.. Events
-.. ~~~~~~
+* **RX Receive timeout (mSec)**: If parts of serial data packets are somewhat delayed, but should still be handled as a single message, then the delay to wait for the next part can be configured here. 0 disables the delay.
+
+* **Reset target after init**: Select a GPIO pin that should be pulled low once during initialization of the plugin, used to synchronize the external serial data source with the plugin.
+
+Led
+^^^
+
+* **Led enabled**: To enable a *data is being processed* activity led.
+
+* **Led pin**: The GPIO pin the Led is connected to.
+
+* **Led inverted**: Iverts the on/off state for the Led.
 
-.. .. include:: P044_events.repl
 
 Change log
 ----------
 
 .. versionchanged:: 2.0
   ...
 
+  |changed| 2022-10-08: Merge of P020 and P044 to reduce code size and combine features, as P044 was initially started as a spin-off from P020, but not evolved with the P020 features.
+
   |added|
   Major overhaul for 2.0 release.
 

diff --git a/docs/source/Plugin/P044_DeviceConfiguration.png b/docs/source/Plugin/P044_DeviceConfiguration.png
diff --git a/docs/source/Plugin/P044_ReplaceCharInEventOptions.png b/docs/source/Plugin/P044_ReplaceCharInEventOptions.png
diff --git a/docs/source/Reference/Command.rst b/docs/source/Reference/Command.rst
@@ -249,10 +249,10 @@ P019 :ref:`P019_page`
 .. include:: ../Plugin/P019_commands.repl
 
 
-.. P020 :ref:`P020_page`
-.. ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+P020 :ref:`P020_page`
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. .. include:: ../Plugin/P020_commands.repl
+.. include:: ../Plugin/P020_commands.repl
 
 
 P021 :ref:`P021_page`

diff --git a/lib/ESPEasySerial/ESPEasySerialPort.cpp b/lib/ESPEasySerial/ESPEasySerialPort.cpp
@@ -1,31 +1,32 @@
 #include "ESPEasySerialPort.h"
 
-const __FlashStringHelper* ESPEasySerialPort_toString(ESPEasySerialPort port)
+const __FlashStringHelper* ESPEasySerialPort_toString(ESPEasySerialPort port, bool shortName)
 {
   switch (port) {
     case ESPEasySerialPort::not_set:         break;
 #if USES_I2C_SC16IS752
-    case ESPEasySerialPort::sc16is752:       return F("I2C Serial");
+    case ESPEasySerialPort::sc16is752:       return shortName ? F("seriali2c") : F("I2C Serial");
 #endif // if USES_I2C_SC16IS752
 #ifdef ESP8266
-    case ESPEasySerialPort::serial0_swap:    return F("HW Serial0 swap");
+    case ESPEasySerialPort::serial0_swap:    return shortName ? F("serial0swap") : F("HW Serial0 swap");
 #endif // ifdef ESP8266
-    case ESPEasySerialPort::serial0:         return F("HW Serial0");
+    case ESPEasySerialPort::serial0:         return shortName ? F("serial0") : F("HW Serial0");
 #if SOC_UART_NUM > 1
-    case ESPEasySerialPort::serial1:         return F("HW Serial1");
+    case ESPEasySerialPort::serial1:         return shortName ? F("serial1") : F("HW Serial1");
 #endif // if SOC_UART_NUM > 1
 #if SOC_UART_NUM > 2
-    case ESPEasySerialPort::serial2:         return F("HW Serial2");
+    case ESPEasySerialPort::serial2:         return shortName ? F("serial2") : F("HW Serial2");
 #endif // if SOC_UART_NUM > 2
 #if USES_SW_SERIAL
-    case ESPEasySerialPort::software:        return F("SW Serial");
+    case ESPEasySerialPort::software:        return shortName ? F("serialsw") : F("SW Serial");
 #endif // if USES_SW_SERIAL
 #if USES_HWCDC
-    case ESPEasySerialPort::usb_hw_cdc:      return F("USB HWCDC");
+    case ESPEasySerialPort::usb_hw_cdc:      return shortName ? F("serialhwcdc") : F("USB HWCDC");
 #endif // if USES_HWCDC
 #if USES_USBCDC
-    case ESPEasySerialPort::usb_cdc_0:       return F("USB CDC");
-//    case ESPEasySerialPort::usb_cdc_1:       return F("USB CDC1");
+    case ESPEasySerialPort::usb_cdc_0:       return shortName ? F("serialcdc") : F("USB CDC");
+
+      //    case ESPEasySerialPort::usb_cdc_1:       return F("USB CDC1");
 #endif // if USES_USBCDC
     case ESPEasySerialPort::MAX_SERIAL_TYPE: break;
 
@@ -103,7 +104,7 @@ bool validSerialPort(ESPEasySerialPort port)
 #endif // if USES_HWCDC
 #if USES_USBCDC
     case ESPEasySerialPort::usb_cdc_0:
-//    case ESPEasySerialPort::usb_cdc_1:
+      //    case ESPEasySerialPort::usb_cdc_1:
 #endif // if USES_USBCDC
       return true;
 

diff --git a/lib/ESPEasySerial/ESPEasySerialPort.h b/lib/ESPEasySerial/ESPEasySerialPort.h
@@ -36,7 +36,7 @@ enum class ESPEasySerialPort : uint8_t {
 };
 
 
-const __FlashStringHelper* ESPEasySerialPort_toString(ESPEasySerialPort port);
+const __FlashStringHelper* ESPEasySerialPort_toString(ESPEasySerialPort port, bool shortName = false);
 
 bool                       isHWserial(ESPEasySerialPort port);
-Original file line number
+Diff line change
@@ Expand Up / @@ -36,7 +36,7 @@ enum class ESPEasySerialPort : uint8_t { @@
     };
-    const __FlashStringHelper* ESPEasySerialPort_toString(ESPEasySerialPort port);
+    const __FlashStringHelper* ESPEasySerialPort_toString(ESPEasySerialPort port, bool shortName = false);
     bool                       isHWserial(ESPEasySerialPort port);
@@ Expand Down @@