automatically updated release notes for mega-20181027

Add IR RAW2 Reading / Transmitting.

.github/issue_template.md

@@ -1,3 +1,25 @@
+### Checklist
+- [ ] The title of this issue is "to the point" and descriptive.
+- [ ] This issue describes what is happening.
+- [ ] This issue describes what components are affected (e.g. name of plugin/controller)
+- [ ] This issue describes how to reproduce it.
+- [ ] This issue describes when it was introduced (when known) and what version is now showing the problem.
+
+### I have...
+- [ ] searched the [issue tracker](https://github.com/letscontrolit/ESPEasy/issues) or the [forum](https://www.letscontrolit.com/forum/viewforum.php?f=1) for a similar issue. (include links when applicable)
+- [ ] entered a system description using "Copy info to clipboard" on the sysinfo page. (when possible)
+- [ ] entered the full filename of the used version (e.g. `ESP_Easy_mega-20181001_test_ESP8266_4096_VCC.bin` )
+- [ ] given a list of active plugins or controllers when applicable.
+- [ ] filled out all applicable fields below.
+
+### Steps already tried...
+- [ ] Tried a clean install (empty `.bin` files are included in the ZIP)
+- [ ] Tested previous/other build (mention which one already tested)
+- [ ] Tested on other node to make sure hardware isn't defective.
+- [ ] Verified if the problem is limited to a single plugin/controller
+
+
+
 ### If you self compile, please state this and PLEASE try to ONLY REPORT ISSUES WITH OFFICIAL BUILDS! ###
 <!--- If you self compile, please state this and PLEASE try to ONLY REPORT ISSUES WITH OFFICIAL BUILDS!  --->
 <!--- NOTE: This is not a support forum! For questions and support go here: --->
@@ -5,6 +27,7 @@
 <!--- Remove topics that are not applicable to your feature request of issue --->
 <!--- Remember to have a "to the point" TITLE --->
 
+
 ### Summarize of the problem/feature request
 <!--- Describe the problem or feature request --->
 YOUR TEXT GOES HERE

.gitignore

@@ -22,3 +22,5 @@ test/output_export.cpp
 .vscode/.browse.c_cpp.db*
 .vscode/c_cpp_properties.json
 .vscode/launch.json
+
+docs/build/

.travis.yml

@@ -22,9 +22,10 @@ addons:
 
 
 install:
-  - pip install -U platformio
+  - pip install -U platformio sphinx recommonmark sphinx_bootstrap_theme
 
 script:
+  # - bash ./preflight.sh # make sure input files are OK before wasting time with prereqs
   # - cppcheck --enable=warning src/*.ino -q --force -I src --include=src/ESPEasy.ino --error-exitcode=1
   # - ./memanalyzer.py ~/.platformio/packages/toolchain-xtensa/bin/xtensa-lx106-elf-objdump
   - PLATFORMIO_BUILD_FLAGS="-D CONTINUOUS_INTEGRATION" platformio run

README.md

@@ -41,4 +41,6 @@ ESPEasy_mega-20180102_dev_ESP8285_1024.bin     | ESP8285 with 1Mb flash  | Stabl
 
 Details and discussion are on the Experimental forum: https://www.letscontrolit.com/forum/viewforum.php?f=18
 
+Automated builds of the (new) documentation can be found at [ESPEasy.readthedocs.io](https://espeasy.readthedocs.io/en/latest/)
+
 We're also on IRC: #ESPEasy @freenode

before_deploy

@@ -21,6 +21,7 @@ for ENV in \
   dev_ESP8266PUYA_1024\
   dev_ESP8266PUYA_1024_VCC\
   hard_SONOFF_POW\
+  hard_SONOFF_POW_R2_4M\
   hard_Shelly_1\
   esp32dev\
   esp32test_1M8_partition;\
@@ -35,10 +36,14 @@ done
 
 
 #create a source structure that is the same as the original ESPEasy project (and works with the howto on the wiki)
-rm -rf dist/Source 2>/dev/null
-mkdir dist/Source
+#rm -rf dist/Source 2>/dev/null
+rm -rf dist/Docs 2>/dev/null
+
+mkdir -p dist/Source
+#mkdir -p dist/Docs
 cp -r lib dist/Source/
 cp -r src dist/Source/
+#cp -r docs/build/ dist/Docs/
 cp platformio.ini dist/Source/
 
 cd dist

dist/Release_notes.txt

@@ -1,3 +1,342 @@
+-------------------------------------------------
+Changes in release mega-20181027 (since mega-20181026)
+-------------------------------------------------
+
+Release date: Sat Oct 27 04:00:12 CEST 2018
+
+Bartlomiej Zimon (1):
+      CSE7766 - fix stats plus add buffer fill level
+
+Gilad (7):
+      Add IR RAW2 Reading / Transmitting.
+      Add IR RAW2 Reading / Transmitting.
+      Add IR RAW2 Reading / Transmitting - fixed ambiguity.
+      Add IR RAW2 Reading / Transmitting - added a safety check.
+      Improved IR RAW2 format to support RLE.
+      Fixed warnings...
+      Fixed warnings...
+
+Gilad Raz (1):
+      Increased buffer size. Added constants.
+
+Plebs (4):
+      doubleclick and longpress for PCF and MCP
+      fixed a display bug
+      final fixes
+      fixed as requested
+
+
+-------------------------------------------------
+Changes in release mega-20181026 (since mega-20181025)
+-------------------------------------------------
+
+Release date: Fri Oct 26 04:00:22 CEST 2018
+
+Bartlomiej Zimon (7):
+      CSE7766 uses 8E1 serial connection
+      Ser2Net catch serial data only if plugin used
+      CSE7766 add online checksumming, autosyncing without data loos
+      move to PLUGIN_TEN_PER_SECOND     update comments
+      move to PLUGIN_SERIAL_IN from PLUGIN_TEN_PER_SECOND - serial commandline uses our data
+      optimization - remove double checksum check
+      CSE7766 - add some stats to debug log
+
+Saverio Cisternino (1):
+      Fixed plugin timer processing do not start, when call setPluginTaskTimer in PLUGIN_TIMER_IN
+
+TD-er (1):
+      [C009] Reduce memory usage for C009 controller.
+
+
+-------------------------------------------------
+Changes in release mega-20181025 (since mega-20181023)
+-------------------------------------------------
+
+Release date: Thu Oct 25 04:00:13 CEST 2018
+
+Saverio Cisternino (1):
+      Added auto redirect to home after run reboot command from web page.
+
+TD-er (5):
+      [WDT] Change yield() to delay(0)
+      [Build] Add Sonoff POW R2 (4MB)
+      [Sonoff] Add pre-defined switch and relay + rules on factory reset
+      [Info] Remove MD5 check fail on self-built images
+      [Travis] Use variables even when no predefined plugins are added.
+
+
+-------------------------------------------------
+Changes in release mega-20181023 (since mega-20181022)
+-------------------------------------------------
+
+Release date: Tue Oct 23 04:00:14 CEST 2018
+
+Kurairaito (2):
+      Update _P067_HX711_Load_Cell.ino
+      Update _P067_HX711_Load_Cell.ino
+
+TD-er (6):
+      [#1486] Allow multiple instances of rotary encoder
+      [JavaScript] Fix update values on Devices tab
+      [JavaScript] Cleanup some code duplication
+      [PubSubClient] Add delay when waiting for data and flush on disconnect
+      [WiFi timeout] Set default to 1000 msec again
+      [Docs] Add some WiFi related information to docs
+
+
+-------------------------------------------------
+Changes in release mega-20181022 (since mega-20181021)
+-------------------------------------------------
+
+Release date: Mon Oct 22 04:00:15 CEST 2018
+
+TD-er (2):
+      [Webserver] Generate copyText id names
+      [Webserver] Uniform row labels to reduce flash string size
+
+
+-------------------------------------------------
+Changes in release mega-20181021 (since mega-20181020)
+-------------------------------------------------
+
+Release date: Sun Oct 21 04:00:16 CEST 2018
+
+Bartlomiej Zimon (2):
+      fix for #1920     fix for out of sync, check both header bytes     proper check for abnormal state
+      Revert "fix for #1920"
+
+TD-er (6):
+      [stack usage] Allocate temp char array on heap for parsing arguments
+      Proper look for connection.
+      [Rules] Early exit on rules processing when rules not enabled
+      [#1910] Notification settings extra strings on stack
+      [#1891] Send all values for Generic UDP controller
+      [#1870] Feature request build date as system info
+
+
+-------------------------------------------------
+Changes in release mega-20181020 (since mega-20181017)
+-------------------------------------------------
+
+Release date: Sat Oct 20 04:00:16 CEST 2018
+
+Plebs (22):
+      Added [plugin#pcfgpio#pinstate#xx]
+      added [plugin#mcpgpio#pinstate#xx]
+      code optimization
+      some code optimizations
+      Update src/_P001_Switch.ino
+      Update src/_P001_Switch.ino
+      small fixes
+      few changes
+      Update src/_P001_Switch.ino
+      Update src/_P001_Switch.ino
+      some fixes
+      added global variables for rules
+      some fixes
+      fixes
+      fixed length check
+      some optimizations
+      modified command and variable name
+      Update src/_P001_Switch.ino
+      Update src/_P001_Switch.ino
+      optimizations
+      Update src/StringConverter.ino
+      added 4 variables to verify the system status
+
+kpalczewski (1):
+      add support for 64bit IR codes.
+
+
+-------------------------------------------------
+Changes in release mega-20181017 (since mega-20181016)
+-------------------------------------------------
+
+Release date: Wed Oct 17 04:00:18 CEST 2018
+
+Gijs Noorlander (1):
+      Added checklist to the Issue_template
+
+TD-er (3):
+      [#1906] Allocate NotificationSettings on the heap
+      [#1906] Allocate ControllerSettings on the heap
+      [Stack] Add Free Stack to System Info plugin
+
+
+-------------------------------------------------
+Changes in release mega-20181016 (since mega-20181015)
+-------------------------------------------------
+
+Release date: Tue Oct 16 04:00:06 CEST 2018
+
+Plebs (1):
+      Fix for togglegpio without gpio initialization
+
+TD-er (1):
+      [Revert] Safe_strncpy cannot be used as generic strncpy replacement
+
+
+-------------------------------------------------
+Changes in release mega-20181015 (since mega-20181014)
+-------------------------------------------------
+
+Release date: Mon Oct 15 04:00:10 CEST 2018
+
+Plebs (2):
+      fix for bug #1864
+      Update src/_P023_OLED.ino
+
+TD-er (1):
+      [safe strncpy] Add warning when entered string is too large
+
+
+-------------------------------------------------
+Changes in release mega-20181014 (since mega-20181011)
+-------------------------------------------------
+
+Release date: Sun Oct 14 04:00:13 CEST 2018
+
+Gijs Noorlander (1):
+      [#1799] Add SSID to main page
+
+TD-er (5):
+      [#1891] Generic UPD controller - send only first value from sensor
+      [Controller] Fix send only first value
+      Time#Initialized event in rules before %syshour% is set
+      [UX] Warn user for incomplete network IP settings
+      [#1895] Incorrect number bytes read I2C_read32_reg
+
+
+-------------------------------------------------
+Changes in release mega-20181011 (since mega-20181010)
+-------------------------------------------------
+
+Release date: Thu Oct 11 04:00:24 CEST 2018
+
+TD-er (5):
+      [C009] Reduce memory usage of FHEM HTTP delay queue
+      [Controller] Set default timeout to 300 msec (was 100 msec)
+      Make sure to load ExtraTaskSettings when needed
+      [Travis Doc] Remove building documentation by Travis
+      [WebLog] Disable weblog when it is not being read
+
+
+-------------------------------------------------
+Changes in release mega-20181010 (since mega-20181009)
+-------------------------------------------------
+
+Release date: Wed Oct 10 04:00:09 CEST 2018
+
+Plebs (1):
+      Update src/_P019_PCF8574.ino
+
+
+-------------------------------------------------
+Changes in release mega-20181009 (since mega-20181008)
+-------------------------------------------------
+
+Release date: Tue Oct  9 04:00:18 CEST 2018
+
+TD-er (7):
+      [Docs] Add favicon to documentation
+      [Docs] Add Travis check for documentation and stop build for docs only
+      [Docs] Run Travic documentation check before compiling project
+      [Docs] Disable travis_terminate for now
+      [JSON] Replace \n and \r in text fields
+      [LWIP1.4] Move back to LWIP1.4
+      [StringConverter] Some optimisations to reduce memory allocation
+
+
+-------------------------------------------------
+Changes in release mega-20181008 (since mega-20181007)
+-------------------------------------------------
+
+Release date: Mon Oct  8 04:00:09 CEST 2018
+
+Gijs Noorlander (1):
+      Added link to ReadTheDocs
+
+Grovkillen (1):
+      [Sphinx] added extension "sphinx.ext.imgconverter"
+
+TD-er (3):
+      [Sphinx] Initial setup for Sphinx documentation
+      [Docs] First ESPEasy documentation (Controllers)
+      [Docs] Added some directory structure and template
+
+
+-------------------------------------------------
+Changes in release mega-20181007 (since mega-20181006)
+-------------------------------------------------
+
+Release date: Sun Oct  7 04:00:09 CEST 2018
+
+Max (2):
+      Force slash to be converted in htmlEscape
+      Fix XSS-Vulnerabilites on wifi configuration pages
+
+Plebs (3):
+      Add three new TOGGLE commands
+      fixed float to int conversion
+      added "mcpgpiotoggle" command
+
+TD-er (3):
+      [ESP32] Allow Wrover dev kit to be used for PIO debug
+      [Stack] Move Arduino 'cont' stack into user RAM
+      [SPIFFS] Make sure to close open files on SPIFFS
+
+
+-------------------------------------------------
+Changes in release mega-20181006 (since mega-20181004)
+-------------------------------------------------
+
+Release date: Sat Oct  6 04:00:13 CEST 2018
+
+TD-er (3):
+      [Stack] Increase stack to 5k and reduce stack allocations in rules
+      [WiFi] Add delay to connection attempts in ControllerSettings
+      [Build flags] Remove NO_EXTRA_4K_HEAP
+
+
+-------------------------------------------------
+Changes in release mega-20181004 (since mega-20181003)
+-------------------------------------------------
+
+Release date: Thu Oct  4 04:00:08 CEST 2018
+
+Bartlomiej Zimon (1):
+      - partial fix for #1723
+
+JojoS (1):
+      added error checking and logging
+
+JojoS62 (5):
+      added float calculation for time to distance conversion
+      added more settings: unit, filtertype and size
+      max distance depends on measurement unit
+      code clean up
+      fixed 'unused variable' warning
+
+TD-er (3):
+      [sendHttp] #1830 Set timeout and early exit on timeout reached
+      [WiFiClient] Set timeout and make it configurable for controllers
+      [Core 2.4.1] Move back to core 2.4.1 from 2.4.2
+
+Thomas (1):
+      Update _P075_Nextion.ino (#1)
+
+
+-------------------------------------------------
+Changes in release mega-20181003 (since mega-20181002)
+-------------------------------------------------
+
+Release date: Wed Oct  3 04:00:18 CEST 2018
+
+David Conran (2):
+      Acknowledge credit & origin of code used in IRTX
+      Acknowledge credit & origin of code used in _P016IR.ino
+
+
 -------------------------------------------------
 Changes in release mega-20181002 (since mega-20181001)
 -------------------------------------------------

docs/Makefile

@@ -0,0 +1,19 @@
+# Minimal makefile for Sphinx documentation
+#
+
+# You can set these variables from the command line.
+SPHINXOPTS    =
+SPHINXBUILD   = sphinx-build
+SOURCEDIR     = source
+BUILDDIR      = build
+
+# Put it first so that "make" without argument is like "make help".
+help:
+	@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
+
+.PHONY: help Makefile
+
+# Catch-all target: route all unknown targets to Sphinx using the new
+# "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).
+%: Makefile
+	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)

docs/make.bat

@@ -0,0 +1,35 @@
+@ECHO OFF
+
+pushd %~dp0
+
+REM Command file for Sphinx documentation
+
+if "%SPHINXBUILD%" == "" (
+	set SPHINXBUILD=sphinx-build
+)
+set SOURCEDIR=source
+set BUILDDIR=build
+
+if "%1" == "" goto help
+
+%SPHINXBUILD% >NUL 2>NUL
+if errorlevel 9009 (
+	echo.
+	echo.The 'sphinx-build' command was not found. Make sure you have Sphinx
+	echo.installed, then set the SPHINXBUILD environment variable to point
+	echo.to the full path of the 'sphinx-build' executable. Alternatively you
+	echo.may add the Sphinx directory to PATH.
+	echo.
+	echo.If you don't have Sphinx installed, grab it from
+	echo.http://sphinx-doc.org/
+	exit /b 1
+)
+
+%SPHINXBUILD% -M %1 %SOURCEDIR% %BUILDDIR% %SPHINXOPTS%
+goto end
+
+:help
+%SPHINXBUILD% -M help %SOURCEDIR% %BUILDDIR% %SPHINXOPTS%
+
+:end
+popd

docs/requirements.txt

@@ -0,0 +1,3 @@
+recommonmark
+Sphinx
+sphinx-bootstrap-theme

docs/source/Controller/Controller.rst

@@ -0,0 +1,66 @@
+Controller
+**********
+
+A controller is a component to enable a plugin to send data elsewhere.
+
+- Up-to 3 controllers can be active in ESPEasy.
+- Per plugin up-to 3 active controllers can be selected.
+- For some controllers an additional parameter can be given.
+
+For example, Domoticz needs an 'IDX' value to identify the configured entry in
+Domoticz for which new data is sent.
+
+Controller Parameters
+=====================
+
+Generic fields
+--------------
+
+- **Protocol** - The type of controller (e.g. ThingSpeak/OpenHAB MQTT/etc.)
+- **Locate Controller** - Selection between hostname/IP
+- **Controller Hostname/IP**  - The address to reach the selected service
+- **Controller Port** - TCP/UDP Port number (0...65536)
+- **Enabled** - Whether or not the controller is active.
+
+Send queue parameters
+---------------------
+
+Controllers have a queue to keep unsent messages.
+This queue is used to handle message bursts and also store messages which are recorded
+before WiFi connection is made or during lost connection.
+
+- **Minimum Send Interval** - Minimum time between two messages in msec.
+- **Max Queue Depth** - Maximum length of the buffer queue to keep unsent messages.
+- **Max Retries** - Maximum number of retries to send a message.
+- **Full Queue Action** - How to handle when queue is full, ignore new or delete oldest message.
+- **Client Timeout** - Timeout in msec for an network connection used by the controller.
+- **Check Reply** - When set to false, a sent message is considered always successful.
+
+
+Sample ThingSpeak configuration
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Some controllers, like ThingSpeak, need a specific configuration.
+ThingSpeak only allows a message every 15 seconds for the free accounts.
+
+- **Minimum Send Interval** - 15000 msec
+- **Max Queue Depth** - 1 (only report the last value)
+- **Max Retries** - 2
+- **Full Queue Action** - Delete Oldest
+- **Client Timeout** - 500 msec (server is online, so timeout must be a bit longer)
+
+
+Controller user credentials
+---------------------------
+
+- **Controller User** - User name (optional)
+- **Controller Password** - Password (optional)
+
+MQTT related settings
+---------------------
+
+- **Controller Subscribe** - Subscribe to the given topic.
+- **Controller Publish** - Publish to the given topic.
+- **Controller lwl topic** - Topic to which LWT (Last Will Testament) messages should be sent.
+- **LWT Connect Message** - Connection established message.
+- **LWT Disconnect Message** - Connection lost message (sent to broker during connect and published by broker when connection is lost)

docs/source/ESPEasy/AboutUs.rst

@@ -0,0 +1,2 @@
+About Us
+********

docs/source/ESPEasy/FunctionBlocks.rst

@@ -0,0 +1,2 @@
+ESPEasy Function Blocks
+***********************

docs/source/Participate/Documentation.rst

@@ -0,0 +1,35 @@
+Documentation
+*************
+
+For documentation we use Sphinx and this will be read by ReadTheDocs.
+We use the `Sphinx Bootstrap Theme <https://github.com/ryan-roemer/sphinx-bootstrap-theme>`_
+
+This documentation is included in the GitHub repository.
+It allows us to create documentation per version of ESPEasy.
+
+See also the `ESPEasy wiki <https://www.letscontrolit.com/wiki/index.php/ESPEasy>`_
+for more documentation which has not been moved here.
+
+Needed Python packages::
+
+   pip install sphinx recommonmark sphinx_bootstrap_theme
+
+PlatformIO with Atom
+====================
+
+With the ESPEasy project open in Atom, open the PIO terminal in Atom.
+
+Install dependencies::
+
+   cd docs
+   pip install ... (see needed Python packages above)
+
+Build on Windows::
+
+   cd docs
+   .\make.bat html
+
+Build on Linux/Mac::
+
+   cd docs
+   ./make html

docs/source/Plugin/Plugin.rst

@@ -0,0 +1,2 @@
+Plugins
+*******

docs/source/Reference/Command.rst

@@ -0,0 +1,2 @@
+Command Reference
+*****************

docs/source/Reference/SystemVariable.rst

@@ -0,0 +1,2 @@
+System Variables
+****************

docs/source/Rules/Rules.rst

@@ -0,0 +1,2 @@
+Rules
+*****

docs/source/WiFi/WiFi.rst

@@ -0,0 +1,25 @@
+WiFi
+****
+
+WiFi disconnect reasons
+=======================
+
+Beacon timeout (200)
+--------------------
+
+For more information on the Beacon frame, see `Wikipedia <https://en.wikipedia.org/wiki/Beacon_frame>`_.
+
+In short, the access point sends periodically a packet containing information about the network.
+This interval is typically 100 TU (102.4 msec).
+The ESP module is trying to listen to this beacon every time, but for a number of reasons it may
+miss a beacon frame.
+The timeout is longer than 100 TU, so it must miss a number of these beacon frames
+to report a beacon timeout.
+Reasons to miss such a beacon frame are:
+
+- too busy processing other blocking tasks (very likely)
+- access point not sending a beacon due to high traffic demands of others (depending on brand/model/settings)
+- RF disturbances (not likely given how often this occurs)
+- clock drift (not really likely)
+
+So the "beacon timeout" is happening every now and then on the ESP nodes and ESPeasy will try to reconnect.

docs/source/conf.py

@@ -0,0 +1,286 @@
+# -*- coding: utf-8 -*-
+#
+# Configuration file for the Sphinx documentation builder.
+#
+# This file does only contain a selection of the most common options. For a
+# full list see the documentation:
+# http://www.sphinx-doc.org/en/master/config
+
+# -- Path setup --------------------------------------------------------------
+
+# If extensions (or modules to document with autodoc) are in another directory,
+# add these directories to sys.path here. If the directory is relative to the
+# documentation root, use os.path.abspath to make it absolute, like shown here.
+#
+# import os
+# import sys
+# sys.path.insert(0, os.path.abspath('.'))
+from recommonmark.parser import CommonMarkParser
+import sphinx_bootstrap_theme
+
+
+# -- Project information -----------------------------------------------------
+
+project = u'ESPEasy'
+copyright = u'2018, ESPEasy'
+author = u'Many'
+
+# The short X.Y version
+version = u''
+# The full version, including alpha/beta/rc tags
+release = u'2.1b1'
+
+
+# -- General configuration ---------------------------------------------------
+
+# If your documentation needs a minimal Sphinx version, state it here.
+#
+# needs_sphinx = '1.0'
+
+# Add any Sphinx extension module names here, as strings. They can be
+# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
+# ones.
+extensions = [
+    'sphinx.ext.autodoc',
+    'sphinx.ext.intersphinx',
+    'sphinx.ext.todo',
+    'sphinx.ext.imgmath',
+    'sphinx.ext.imgconverter',
+]
+
+# Add any paths that contain templates here, relative to this directory.
+templates_path = ['_templates']
+
+source_parsers = {
+    '.md': CommonMarkParser,
+}
+
+# The suffix(es) of source filenames.
+# You can specify multiple suffix as a list of string:
+#
+source_suffix = ['.rst', '.md']
+#source_suffix = '.rst'
+
+# The master toctree document.
+master_doc = 'index'
+
+# The language for content autogenerated by Sphinx. Refer to documentation
+# for a list of supported languages.
+#
+# This is also used if you do content translation via gettext catalogs.
+# Usually you set "language" from the command line for these cases.
+language = None
+
+# List of patterns, relative to source directory, that match files and
+# directories to ignore when looking for source files.
+# This pattern also affects html_static_path and html_extra_path.
+exclude_patterns = []
+
+# The name of the Pygments (syntax highlighting) style to use.
+pygments_style = None
+
+
+# -- Options for HTML output -------------------------------------------------
+html_logo = 'ESPEasy/espeasy_logo.png'
+html_favicon = 'ESPEasy/favicon.ico'
+
+# The theme to use for HTML and HTML Help pages.  See the documentation for
+# a list of builtin themes.
+#
+#html_theme = 'sphinx_rtd_theme'
+html_theme = 'bootstrap'
+html_theme_path = sphinx_bootstrap_theme.get_html_theme_path()
+
+# Theme options are theme-specific and customize the look and feel of a theme
+# further.  For a list of options available for each theme, see the
+# documentation.
+#
+# html_theme_options = {}
+#html_theme_options = {
+#    'canonical_url': '',
+#    'analytics_id': '',
+#    'logo_only': False,
+#    'display_version': True,
+#    'prev_next_buttons_location': 'bottom',
+#    'style_external_links': False,
+#    # Toc options
+#    'collapse_navigation': True,
+#    'sticky_navigation': True,
+#    'navigation_depth': 4,
+#    'includehidden': True,
+#    'titles_only': False
+#}
+
+html_theme_options = {
+    # Navigation bar title. (Default: ``project`` value)
+    'navbar_title': "ESPEasy",
+
+    # Tab name for entire site. (Default: "Site")
+    'navbar_site_name': "Site",
+
+    # A list of tuples containing pages or urls to link to.
+    # Valid tuples should be in the following forms:
+    #    (name, page)                 # a link to a page
+    #    (name, "/aa/bb", 1)          # a link to an arbitrary relative url
+    #    (name, "http://example.com", True) # arbitrary absolute url
+    # Note the "1" or "True" value above as the third argument to indicate
+    # an arbitrary url.
+    'navbar_links': [
+        ("Rules", "rules"),
+        ("Forum", "https://www.letscontrolit.com/forum/viewforum.php?f=1", True),
+    ],
+
+    # Render the next and previous page links in navbar. (Default: true)
+    'navbar_sidebarrel': True,
+
+    # Render the current pages TOC in the navbar. (Default: true)
+    'navbar_pagenav': True,
+
+    # Tab name for the current pages TOC. (Default: "Page")
+    'navbar_pagenav_name': "Page",
+
+    # Global TOC depth for "site" navbar tab. (Default: 1)
+    # Switching to -1 shows all levels.
+    'globaltoc_depth': 2,
+
+    # Include hidden TOCs in Site navbar?
+    #
+    # Note: If this is "false", you cannot have mixed ``:hidden:`` and
+    # non-hidden ``toctree`` directives in the same page, or else the build
+    # will break.
+    #
+    # Values: "true" (default) or "false"
+    'globaltoc_includehidden': "true",
+
+    # HTML navbar class (Default: "navbar") to attach to <div> element.
+    # For black navbar, do "navbar navbar-inverse"
+    'navbar_class': "navbar navbar-inverse",
+
+    # Fix navigation bar to top of page?
+    # Values: "true" (default) or "false"
+    'navbar_fixed_top': "true",
+
+    # Location of link to source.
+    # Options are "nav" (default), "footer" or anything else to exclude.
+    'source_link_position': "none",
+
+    # Bootswatch (http://bootswatch.com/) theme.
+    #
+    # Options are nothing (default) or the name of a valid theme
+    # such as "cosmo" or "sandstone".
+    #
+    # The set of valid themes depend on the version of Bootstrap
+    # that's used (the next config option).
+    #
+    # Currently, the supported themes are:
+    # - Bootstrap 2: https://bootswatch.com/2
+    # - Bootstrap 3: https://bootswatch.com/3
+    'bootswatch_theme': "cerulean",
+
+    # Choose Bootstrap version.
+    # Values: "3" (default) or "2" (in quotes)
+    'bootstrap_version': "3",
+}
+
+# Add any paths that contain custom static files (such as style sheets) here,
+# relative to this directory. They are copied after the builtin static files,
+# so a file named "default.css" will overwrite the builtin "default.css".
+html_static_path = ['_static']
+
+# Custom sidebar templates, must be a dictionary that maps document names
+# to template names.
+#
+# The default sidebars (for documents that don't match any pattern) are
+# defined by theme itself.  Builtin themes are using these templates by
+# default: ``['localtoc.html', 'relations.html', 'sourcelink.html',
+# 'searchbox.html']``.
+#
+# html_sidebars = {}
+
+
+# -- Options for HTMLHelp output ---------------------------------------------
+
+# Output file base name for HTML help builder.
+htmlhelp_basename = 'ESPEasydoc'
+
+
+# -- Options for LaTeX output ------------------------------------------------
+
+latex_elements = {
+    # The paper size ('letterpaper' or 'a4paper').
+    #
+    # 'papersize': 'letterpaper',
+
+    # The font size ('10pt', '11pt' or '12pt').
+    #
+    # 'pointsize': '10pt',
+
+    # Additional stuff for the LaTeX preamble.
+    #
+    # 'preamble': '',
+
+    # Latex figure (float) alignment
+    #
+    # 'figure_align': 'htbp',
+}
+
+# Grouping the document tree into LaTeX files. List of tuples
+# (source start file, target name, title,
+#  author, documentclass [howto, manual, or own class]).
+latex_documents = [
+    (master_doc, 'ESPEasy.tex', u'ESPEasy Documentation',
+     u'Many', 'manual'),
+]
+
+
+# -- Options for manual page output ------------------------------------------
+
+# One entry per manual page. List of tuples
+# (source start file, name, description, authors, manual section).
+man_pages = [
+    (master_doc, 'espeasy', u'ESPEasy Documentation',
+     [author], 1)
+]
+
+
+# -- Options for Texinfo output ----------------------------------------------
+
+# Grouping the document tree into Texinfo files. List of tuples
+# (source start file, target name, title, author,
+#  dir menu entry, description, category)
+texinfo_documents = [
+    (master_doc, 'ESPEasy', u'ESPEasy Documentation',
+     author, 'ESPEasy', 'ESP82xx/ESP32 firmware to connect people with any level of experience to system automation.',
+     'Miscellaneous'),
+]
+
+
+# -- Options for Epub output -------------------------------------------------
+
+# Bibliographic Dublin Core info.
+epub_title = project
+
+# The unique identifier of the text. This can be a ISBN number
+# or the project homepage.
+#
+# epub_identifier = ''
+
+# A unique identification for the text.
+#
+# epub_uid = ''
+
+# A list of files that should not be packed into the epub file.
+epub_exclude_files = ['search.html']
+
+
+# -- Extension configuration -------------------------------------------------
+
+# -- Options for intersphinx extension ---------------------------------------
+
+# Example configuration for intersphinx: refer to the Python standard library.
+intersphinx_mapping = {'https://docs.python.org/': None}
+
+# -- Options for todo extension ----------------------------------------------
+
+# If true, `todo` and `todoList` produce output, else they produce nothing.
+todo_include_todos = True

docs/source/index.rst

@@ -0,0 +1,39 @@
+.. ESPEasy documentation master file, created by
+   sphinx-quickstart on Sat Oct 06 22:34:34 2018.
+   You can adapt this file completely to your liking, but it should at least
+   contain the root `toctree` directive.
+
+Welcome to ESPEasy's documentation!
+===================================
+
+.. toctree::
+   :maxdepth: 2
+   :caption: Table of Contents
+
+   ESPEasy/AboutUs.rst
+   ESPEasy/FunctionBlocks.rst
+   Controller/Controller.rst
+   Plugin/Plugin.rst
+   Rules/Rules.rst
+   WiFi/WiFi.rst
+
+.. raw:: latex
+
+   \appendix
+
+
+.. toctree::
+   :caption: Appendix
+
+   Participate/Documentation.rst
+   Reference/Command.rst
+   Reference/SystemVariable.rst
+
+
+
+Indices and tables
+==================
+
+* :ref:`genindex`
+* :ref:`modindex`
+* :ref:`search`

lib/NewPingESP8266/NewPingESP8266.cpp

@@ -6,12 +6,13 @@
 // ---------------------------------------------------------------------------
 
 #include "NewPingESP8266.h"
-
+//#include "ESPEasy-Globals.h"
 // ---------------------------------------------------------------------------
 // NewPingESP8266 constructor
 // ---------------------------------------------------------------------------
 
 NewPingESP8266::NewPingESP8266(uint32_t trigger_pin, uint32_t echo_pin, unsigned int max_cm_distance) {
+	_errorState = STATUS_SENSOR_READY;
 #if DO_BITWISE == true
 	_triggerBit = digitalPinToBitMask(trigger_pin); // Get the port register bitmask for the trigger pin.
 	_echoBit = digitalPinToBitMask(echo_pin);       // Get the port register bitmask for the echo pin.
@@ -58,7 +59,10 @@ unsigned int NewPingESP8266::ping(unsigned int max_cm_distance) {
 		while (!digitalRead(_echoPin))                // Wait for the ping echo.
 	#endif
 	  {
-			if (micros() > _max_time) return NO_ECHO; // Stop the loop and return NO_ECHO (false) if we're beyond the set maximum distance.
+			if ((_max_cm_distance > 0) && (micros() > _max_time)) {
+				_errorState = STATUS_MAX_DISTANCE_EXCEEDED;
+				return NO_ECHO; // Stop the loop and return NO_ECHO (false) if we're beyond the set maximum distance.
+			}
 	  }
 #else
 	#if DO_BITWISE == true
@@ -67,10 +71,14 @@ unsigned int NewPingESP8266::ping(unsigned int max_cm_distance) {
 		while (digitalRead(_echoPin))                 // Wait for the ping echo.
 	#endif
 		{
-			if (micros() > _max_time) return NO_ECHO; // Stop the loop and return NO_ECHO (false) if we're beyond the set maximum distance.
+			if ((_max_cm_distance > 0) && (micros() > _max_time)) {
+				_errorState = STATUS_MAX_DISTANCE_EXCEEDED;
+				return NO_ECHO; // Stop the loop and return NO_ECHO (false) if we're beyond the set maximum distance.
+			}
 		}
 #endif
 
+	_errorState = STATUS_MEASUREMENT_VALID;
 	return (micros() - (_max_time - _maxEchoTime) - PING_OVERHEAD); // Calculate ping time, include overhead.
 }
 
@@ -144,15 +152,39 @@ boolean NewPingESP8266::ping_trigger() {
 	#endif
 
 	#if URM37_ENABLED == true
-		if (!(*_echoInput & _echoBit)) return false;            // Previous ping hasn't finished, abort.
+		if (!(*_echoInput & _echoBit)) {								      	// Previous ping hasn't finished, abort.{
+			_errorState = STATUS_ECHO_STATE_ERROR;
+			return false;
+		}
 		_max_time = micros() + _maxEchoTime + MAX_SENSOR_DELAY; // Maximum time we'll wait for ping to start (most sensors are <450uS, the SRF06 can take up to 34,300uS!)
 		while (*_echoInput & _echoBit)                          // Wait for ping to start.
-			if (micros() > _max_time) return false;             // Took too long to start, abort.
+		{
+			if (millis() > (start + 50)) {
+				_errorState = STATUS_ECHO_START_TIMEOUT_50ms;
+				return false;
+			}
+			if ((_max_cm_distance > 0) && (micros() > _max_time)) {	// check max. distance if != 0 cm
+				_errorState = STATUS_ECHO_START_TIMEOUT_DISTANCE;
+				return false;             													// echo too late, max distance exceeded
+			}
+		}
 	#else
-		if (*_echoInput & _echoBit) return false;               // Previous ping hasn't finished, abort.
+		if (*_echoInput & _echoBit) { 				              		// Previous ping hasn't finished, abort.
+			_errorState = STATUS_ECHO_STATE_ERROR;
+			return false;
+		}
 		_max_time = micros() + _maxEchoTime + MAX_SENSOR_DELAY; // Maximum time we'll wait for ping to start (most sensors are <450uS, the SRF06 can take up to 34,300uS!)
 		while (!(*_echoInput & _echoBit))                       // Wait for ping to start.
-			if (micros() > _max_time) return false;             // Took too long to start, abort.
+		{
+			if (millis() > (start + 50)) {
+				_errorState = STATUS_ECHO_START_TIMEOUT_50ms;
+				return false;
+			}
+			if ((_max_cm_distance > 0) && (micros() > _max_time)) {	// check max. distance if != 0 cm
+				_errorState = STATUS_ECHO_START_TIMEOUT_DISTANCE;
+				return false;             													// echo too late, max distance exceeded
+			}
+		}
 	#endif
 #else
 	#if ONE_PIN_ENABLED == true
@@ -170,30 +202,51 @@ boolean NewPingESP8266::ping_trigger() {
 	#endif
 
 	#if URM37_ENABLED == true
-		if (!digitalRead(_echoPin)) return false;               // Previous ping hasn't finished, abort.
+		if (!digitalRead(_echoPin)) {
+			_errorState = STATUS_ECHO_STATE_ERROR;
+			return false;                // Previous ping hasn't finished, abort.
+		}
 		_max_time = micros() + _maxEchoTime + MAX_SENSOR_DELAY; // Maximum time we'll wait for ping to start (most sensors are <450uS, the SRF06 can take up to 34,300uS!)
 		while (digitalRead(_echoPin))                           // Wait for ping to start.
 		{
-			if (millis() > (start + 50)) return false;
-			if (micros() > _max_time) return false;             // Took too long to start, abort.
+			if (millis() > (start + 50)) {
+				_errorState = STATUS_ECHO_START_TIMEOUT_50ms;
+				return false;
+			}
+			if ((_max_cm_distance > 0) && (micros() > _max_time)) {	// check max. distance if != 0 cm
+				_errorState = STATUS_ECHO_START_TIMEOUT_DISTANCE;
+				return false;             													// echo too late, max distance exceeded
+			}
 		}
 	#else
-		if (digitalRead(_echoPin)) return false;                // Previous ping hasn't finished, abort.
+		if (digitalRead(_echoPin)) {
+			_errorState = STATUS_ECHO_STATE_ERROR;
+			return false;                // Previous ping hasn't finished, abort.
+		}
 		_max_time = micros() + _maxEchoTime + MAX_SENSOR_DELAY; // Maximum time we'll wait for ping to start (most sensors are <450uS, the SRF06 can take up to 34,300uS!)
 		while (!digitalRead(_echoPin))                          // Wait for ping to start.
 		{
-			if (millis() > (start + 50)) return false;
-			if (micros() > _max_time) return false;             // Took too long to start, abort.
+			if (millis() > (start + 50)) {
+				_errorState = STATUS_ECHO_START_TIMEOUT_50ms;
+				return false;
+			}
+			if ((_max_cm_distance > 0) && (micros() > _max_time)) {	// check max. distance if != 0 cm
+				_errorState = STATUS_ECHO_START_TIMEOUT_DISTANCE;
+				return false;             													// echo too late, max distance exceeded
+			}
   	}
 	#endif
 #endif
 
 	_max_time = micros() + _maxEchoTime; // Ping started, set the time-out.
+	_errorState = STATUS_ECHO_TRIGGERED;
+
 	return true;                         // Ping started successfully.
 }
 
 
 void NewPingESP8266::set_max_distance(unsigned int max_cm_distance) {
+	_max_cm_distance = max_cm_distance;
 #if ROUNDING_ENABLED == false
 	_maxEchoTime = min(max_cm_distance + 1, (unsigned int) MAX_SENSOR_DISTANCE + 1) * US_ROUNDTRIP_CM; // Calculate the maximum distance in uS (no rounding).
 #else
@@ -222,3 +275,12 @@ unsigned int NewPingESP8266::convert_in(unsigned int echoTime) {
 	return NewPingESP8266Convert(echoTime, US_ROUNDTRIP_IN); // Convert uS to inches.
 #endif
 }
+
+float NewPingESP8266::convert_cm_F(unsigned int echoTime) {
+	return ((float)echoTime / US_ROUNDTRIP_CM);              // Convert uS to centimeters (no rounding).
+}
+
+
+float NewPingESP8266::convert_in_F(unsigned int echoTime) {
+	return ((float)echoTime / US_ROUNDTRIP_IN);              // Convert uS to inches (no rounding).
+}

lib/NewPingESP8266/NewPingESP8266.h

@@ -194,15 +194,29 @@
 
 class NewPingESP8266 {
 	public:
+		enum errorState {
+			STATUS_SENSOR_READY,  								// no error, no measruement started
+			STATUS_MEASUREMENT_VALID, 						// no errors
+			STATUS_ECHO_TRIGGERED,								// echo triggered, intermediate state
+			STATUS_MAX_DISTANCE_EXCEEDED, 				// echo too late, maximum distance exceeded
+			STATUS_ECHO_START_TIMEOUT_50ms, 			// no echo start signal after 50 ms
+			STATUS_ECHO_START_TIMEOUT_DISTANCE,		// no echo start signal after max. distance
+			STATUS_ECHO_STATE_ERROR 				 			// echopin level not low after triggered
+		};
+
 		NewPingESP8266(uint32_t trigger_pin, uint32_t echo_pin, unsigned int max_cm_distance = MAX_SENSOR_DISTANCE);
+		~NewPingESP8266() { };
 		unsigned int ping(unsigned int max_cm_distance = 0);
 		unsigned long ping_cm(unsigned int max_cm_distance = 0);
 		unsigned long ping_in(unsigned int max_cm_distance = 0);
 		unsigned long ping_median(uint32_t it = 5, unsigned int max_cm_distance = 0);
 		static unsigned int convert_cm(unsigned int echoTime);
 		static unsigned int convert_in(unsigned int echoTime);
+		static float convert_cm_F(unsigned int echoTime);
+		static float convert_in_F(unsigned int echoTime);
 
-		unsigned int getMaxEchoTime() { return _maxEchoTime; }
+		unsigned int getMaxEchoTime() { return _maxEchoTime; };
+		errorState getErrorState() { return _errorState; };
 	private:
 		boolean ping_trigger();
 		void set_max_distance(unsigned int max_cm_distance);
@@ -218,6 +232,8 @@ class NewPingESP8266 {
 #endif
 		unsigned int _maxEchoTime;
 		unsigned long _max_time;
+		errorState _errorState;
+		unsigned int _max_cm_distance;
 };
 
 

lib/pubsubclient/src/PubSubClient.cpp

@@ -209,6 +209,7 @@ boolean PubSubClient::connect(const char *id, const char *user, const char *pass
 boolean PubSubClient::readByte(uint8_t * result) {
    uint32_t previousMillis = millis();
    while(!_client->available()) {
+     delay(1);  // Prevent watchdog crashes
      uint32_t currentMillis = millis();
      if(currentMillis - previousMillis >= ((int32_t) MQTT_SOCKET_TIMEOUT * 1000)){
        return false;
@@ -522,9 +523,12 @@ boolean PubSubClient::unsubscribe(const char* topic) {
 void PubSubClient::disconnect() {
     buffer[0] = MQTTDISCONNECT;
     buffer[1] = 0;
-    _client->write(buffer,2);
+    if (_client != NULL) {
+      _client->write(buffer,2);
+      _client->flush();
+      _client->stop();
+    }
     _state = MQTT_DISCONNECTED;
-    _client->stop();
     lastInActivity = lastOutActivity = millis();
 }
 

platformio.ini

@@ -106,7 +106,9 @@ monitor_speed             = 115200
 ;  -DVTABLES_IN_IRAM
 ; NO_EXTRA_4K_HEAP - this forces the default NONOS-SDK user's heap location
 ;     Default currently overlaps cont stack (Arduino) with sys stack (System)
-;     to save up-to 4 kB of heap.
+;     to save up-to 4 kB of heap. (starting core_2.4.2)
+; ESP8266_DISABLE_EXTRA4K  - Calls disable_extra4k_at_link_time() from setup
+;                            to force the linker keep user's stack in user ram.
 ; CONT_STACKSIZE to set the 'cont' (Arduino) stack size. Default = 4096
 
 [common]
@@ -115,7 +117,7 @@ build_unflags             =
 build_flags               = -D BUILD_GIT='"${sysenv.TRAVIS_TAG}"'
                    -D NDEBUG
                    -lstdc++ -lsupc++
-                   -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY
+                   -DPIO_FRAMEWORK_ARDUINO_LWIP_HIGHER_BANDWIDTH
                    -DVTABLES_IN_FLASH
 
 
@@ -126,20 +128,20 @@ lib_archive               = false
 upload_speed              = 460800
 framework                 = arduino
 board                     = esp12e
-platform                  = ${core_2_4_2.platform}
+platform                  = ${core_2_4_1.platform}
 monitor_speed             = 115200
 
 [normal]
 platform                  = ${common.platform}
-build_flags               = -DNO_EXTRA_4K_HEAP -DCONT_STACKSIZE=5120
+build_flags               =
 
 [testing]
-platform                  = ${core_2_4_2.platform}
-build_flags               = -DNO_EXTRA_4K_HEAP -DPLUGIN_BUILD_TESTING
+platform                  = ${core_2_4_1.platform}
+build_flags               = -DPLUGIN_BUILD_TESTING
 
 [dev]
-platform                  = ${core_2_4_2.platform}
-build_flags               = -DNO_EXTRA_4K_HEAP -DPLUGIN_BUILD_DEV
+platform                  = ${core_2_4_1.platform}
+build_flags               = -DPLUGIN_BUILD_DEV
 
 [ir]
 lib_ignore                = ESP32_ping, ESP32WebServer
@@ -160,24 +162,6 @@ board_build.f_cpu         = ${esp8266_1M.board_build.f_cpu}
 build_unflags             = ${esp8266_1M.build_unflags}
 build_flags               = ${esp8266_1M.build_flags} -DESP8285
 
-[Sonoff]
-board                     = esp01_1m
-board_upload.maximum_size = ${esp8266_1M.board_upload.maximum_size}
-board_build.flash_mode    = ${esp8266_1M.board_build.flash_mode}
-board_build.f_cpu         = ${esp8266_1M.board_build.f_cpu}
-build_unflags             = ${common.build_unflags}
-build_flags               = ${common.build_flags} -Wl,-Tesp8266.flash.1m128.ld
-platform                  = ${core_2_4_2.platform}
-
-[Sonoff_8285]
-board_upload.maximum_size = ${esp8285_1M.board_upload.maximum_size}
-board_build.flash_mode    = ${esp8285_1M.board_build.flash_mode}
-board_build.f_cpu         = ${esp8285_1M.board_build.f_cpu}
-board                     = ${esp8285_1M.board}
-build_unflags             = ${esp8285_1M.build_unflags}
-build_flags               = ${esp8285_1M.build_flags}
-platform                  = ${core_2_4_2.platform}
-
 [espWroom2M]
 board_build.flash_mode    = dout
 board_build.f_cpu         = ${common.board_build.f_cpu}
@@ -193,15 +177,64 @@ build_flags               = ${common.build_flags} -Wl,-Tesp8266.flash.2m.ld
 
 [esp8266_4M]
 board_build.flash_mode    = dio
+board_upload.maximum_size = 900000
 board_build.f_cpu         = ${common.board_build.f_cpu}
 build_unflags             = ${common.build_unflags}
 build_flags               = ${common.build_flags} -Wl,-Tesp8266.flash.4m1m.ld
 
+
+[Sonoff]
+board                     = esp01_1m
+board_upload.maximum_size = ${esp8266_1M.board_upload.maximum_size}
+board_build.flash_mode    = ${esp8266_1M.board_build.flash_mode}
+board_build.f_cpu         = ${esp8266_1M.board_build.f_cpu}
+build_unflags             = ${common.build_unflags}
+build_flags               = ${common.build_flags} -Wl,-Tesp8266.flash.1m128.ld
+platform                  = ${core_2_4_1.platform}
+
+[Sonoff_4M]
+board                     = esp12e
+board_upload.maximum_size = ${esp8266_4M.board_upload.maximum_size}
+board_build.flash_mode    = ${esp8266_4M.board_build.flash_mode}
+board_build.f_cpu         = ${esp8266_4M.board_build.f_cpu}
+build_unflags             = ${esp8266_4M.build_unflags}
+build_flags               = ${esp8266_4M.build_flags}
+platform                  = ${common.platform}
+
+
+[Sonoff_8285]
+board_upload.maximum_size = ${esp8285_1M.board_upload.maximum_size}
+board_build.flash_mode    = ${esp8285_1M.board_build.flash_mode}
+board_build.f_cpu         = ${esp8285_1M.board_build.f_cpu}
+board                     = ${esp8285_1M.board}
+build_unflags             = ${esp8285_1M.build_unflags}
+build_flags               = ${esp8285_1M.build_flags}
+platform                  = ${core_2_4_1.platform}
+
 ;;; ESP32 pre-alpha test build ; ****; ****; ****; ****; ****; ****; ****; ****; ****;;;;;
 ; Very limited build for ESP32, to start testing regular building for ESP32.             ;
 ; Will probably not work, not tested and guaranteed to take a few hours time of some     ;
 ; still trying to build the version without reading this warning.                        ;
 ; *********************************************************************
+[env:esp-wrover-kit_test_1M8_partition]
+platform                  = ${core_esp32.platform}
+board                     = esp-wrover-kit
+build_unflags             = ${core_esp32.build_unflags}
+build_flags               = ${core_esp32.build_flags}  -DPLUGIN_SET_TEST_ESP32
+lib_deps                  = ${core_esp32.lib_deps}
+lib_ignore                = ${core_esp32.lib_ignore}
+lib_ldf_mode              = ${common.lib_ldf_mode}
+lib_archive               = ${common.lib_archive}
+framework                 = ${common.framework}
+upload_speed              = ${common.upload_speed}
+upload_protocol           = ftdi
+debug_tool                = ftdi
+monitor_speed             = ${common.monitor_speed}
+board_build.partitions    = esp32_partition_app1810k_spiffs316k.csv
+board_upload.maximum_size = 1900544
+debug_extra_cmds          = break Misc.ino:3011
+
+
 [env:esp32dev]
 platform                  = ${core_esp32.platform}
 board                     = esp32dev
@@ -543,24 +576,9 @@ build_flags               = ${esp8266_1M.build_flags} ${dev.build_flags} -D FLAS
 ;build_unflags             = ${Sonoff.build_unflags}
 ;build_flags               = ${Sonoff.build_flags} -D PLUGIN_SET_SONOFF_BASIC
 
-; ITEAD / SONOFF TH10 version -------------------
-;[env:hard_SONOFF_TH10]
-;upload_speed              = ${common.upload_speed}
-;monitor_speed             = ${common.monitor_speed}
-;framework                 = ${common.framework}
-;platform                  = ${Sonoff.platform}
-;lib_deps                  = ${common.lib_deps}
-;lib_ignore                = ${common.lib_ignore}
-;lib_ldf_mode              = ${common.lib_ldf_mode}
-;lib_archive               = ${common.lib_archive}
-;board_build.f_cpu         = ${Sonoff.board_build.f_cpu}
-;board_build.flash_mode    = ${Sonoff.board_build.flash_mode}
-;board                     = ${Sonoff.board}
-;build_unflags             = ${Sonoff.build_unflags}
-;build_flags               = ${Sonoff.build_flags} -D PLUGIN_SET_SONOFF_TH10
 
-; ITEAD / SONOFF TH16 version -------------------
-;[env:hard_SONOFF_TH16]
+; ITEAD / SONOFF TH10/TH16 version -------------------
+;[env:hard_SONOFF_TH1x]
 ;upload_speed              = ${common.upload_speed}
 ;monitor_speed             = ${common.monitor_speed}
 ;framework                 = ${common.framework}
@@ -573,7 +591,7 @@ build_flags               = ${esp8266_1M.build_flags} ${dev.build_flags} -D FLAS
 ;board_build.flash_mode    = ${Sonoff.board_build.flash_mode}
 ;board                     = ${Sonoff.board}
 ;build_unflags             = ${Sonoff.build_unflags}
-;build_flags               = ${Sonoff.build_flags} -D PLUGIN_SET_SONOFF_TH16
+;build_flags               = ${Sonoff.build_flags} -D PLUGIN_SET_SONOFF_TH1x
 
 ; ITEAD / SONOFF POW version --------------------
 ; Sonoff Pow (ESP8266 - HLW8012)
@@ -598,26 +616,26 @@ board                     = ${Sonoff.board}
 build_unflags             = ${Sonoff.build_unflags}
 build_flags               = ${Sonoff.build_flags} -D PLUGIN_SET_SONOFF_POW
 
-; Sonoff Pow R2 (ESP8266 - CSE7766)
+; Sonoff Pow R2 (ESP8266 4M flash - CSE7766)
 ; GPIO00 Button
 ; GPIO01 Serial RXD 4800 baud 8E1 CSE7766 energy sensor
 ; GPIO03 Serial TXD
 ; GPIO12 Red Led and Relay (0 = Off, 1 = On)
 ; GPIO13 Blue Led (0 = On, 1 = Off)
-[env:hard_SONOFF_POW_R2]
+[env:hard_SONOFF_POW_R2_4M]
 upload_speed              = ${common.upload_speed}
 monitor_speed             = ${common.monitor_speed}
 framework                 = ${common.framework}
-platform                  = ${Sonoff.platform}
+platform                  = ${Sonoff_4M.platform}
 lib_deps                  = ${common.lib_deps}
 lib_ignore                = ${common.lib_ignore}
 lib_ldf_mode              = ${common.lib_ldf_mode}
 lib_archive               = ${common.lib_archive}
-board_build.f_cpu         = ${Sonoff.board_build.f_cpu}
-board_build.flash_mode    = ${Sonoff.board_build.flash_mode}
-board                     = ${Sonoff.board}
-build_unflags             = ${Sonoff.build_unflags}
-build_flags               = ${Sonoff.build_flags} -D PLUGIN_SET_SONOFF_POW_R2
+board_build.f_cpu         = ${Sonoff_4M.board_build.f_cpu}
+board_build.flash_mode    = ${Sonoff_4M.board_build.flash_mode}
+board                     = ${Sonoff_4M.board}
+build_unflags             = ${Sonoff_4M.build_unflags}
+build_flags               = ${Sonoff_4M.build_flags} -D PLUGIN_SET_SONOFF_POW_R2
 
 ; ITEAD / SONOFF S20 version --------------------
 ;[env:hard_SONOFF_S20]
@@ -633,7 +651,7 @@ build_flags               = ${Sonoff.build_flags} -D PLUGIN_SET_SONOFF_POW_R2
 ;board_build.flash_mode    = ${Sonoff.board_build.flash_mode}
 ;board                     = ${Sonoff.board}
 ;build_unflags             = ${Sonoff.build_unflags}
-;build_flags               = ${Sonoff.build_flags} -D PLUGIN_SET_SONOFF_S20
+;build_flags               = ${Sonoff.build_flags} -D PLUGIN_SET_SONOFF_S2x
 
 ; ITEAD / SONOFF 4CH version --------------------
 ;[env:hard_SONOFF_4CH]

preflight.sh

@@ -0,0 +1,36 @@
+#!/bin/bash
+
+# Check for documentation only changes.
+# Source: https://github.com/dev-id/Magic-Spoiler/blob/8111a06ab6682e020169991d5e2aa4fa503d787f/preflight.sh
+
+set -e
+MAIN_BRANCH="mega"
+MD=".md$"
+DOCS="^docs/"
+
+CHANGED_FILES=`git diff --name-only ${MAIN_BRANCH}...${TRAVIS_COMMIT}`
+ONLY_READMES=True
+DOCUMENTATION_CHANGED=False
+
+for CHANGED_FILE in $CHANGED_FILES; do
+  if ! [[ $CHANGED_FILE =~ $MD || $CHANGED_FILE =~ $DOCS ]]; then
+    ONLY_READMES=False
+#    break
+  else
+    DOCUMENTATION_CHANGED=True
+  fi
+done
+
+#if [[ $ONLY_READMES == True ]]; then
+#  echo "Only documentation files found, exiting."
+#  travis_terminate 0
+#  exit 1
+#else
+#  echo "Non-documentation files found, continuing with build."
+#fi
+
+if [[ $DOCUMENTATION_CHANGED == True ]]; then
+  echo "Generate documentation."
+  cd docs
+  make html
+fi

src/Command.ino

@@ -79,6 +79,7 @@ String doExecuteCommand(const char * cmd, struct EventStruct *event, const char*
       break;
     }
     case 'l': {
+    COMMAND_CASE("let"                    , Command_Rules_Let);                  // Rules.h
 	  COMMAND_CASE("load"                   , Command_Settings_Load);              // Settings.h
 	  COMMAND_CASE("logentry"               , Command_logentry);                   // Diagnostic.h
 	  COMMAND_CASE("lowmem"                 , Command_Lowmem);                     // Diagnostic.h
@@ -131,7 +132,8 @@ String doExecuteCommand(const char * cmd, struct EventStruct *event, const char*
 	  COMMAND_CASE("taskclear"              , Command_Task_Clear);                 // Tasks.h
 	  COMMAND_CASE("taskclearall"           , Command_Task_ClearAll);              // Tasks.h
 	  COMMAND_CASE("taskrun"                , Command_Task_Run);                   // Tasks.h
-	  COMMAND_CASE("taskvalueset"           , Command_Task_ValueSet);              // Tasks.h
+    COMMAND_CASE("taskvalueset"           , Command_Task_ValueSet);              // Tasks.h
+    COMMAND_CASE("taskvaluetoggle"        , Command_Task_ValueToggle);           // Tasks.h
 	  COMMAND_CASE("taskvaluesetandrun"     , Command_Task_ValueSetAndRun);        // Tasks.h
 	  COMMAND_CASE("timerpause"             , Command_Timer_Pause);                // Timers.h
 	  COMMAND_CASE("timerresume"            , Command_Timer_Resume);               // Timers.h
@@ -225,9 +227,9 @@ void ExecuteCommand(byte source, const char *Line)
   if (source == VALUE_SOURCE_WEB_FRONTEND) {
     // Must run immediately, to see result in web frontend
     String status = doExecuteCommand((char*)&cmd[0], &TempEvent, Line);
-    yield();
+    delay(0);
     SendStatus(source, status);
-    yield();
+    delay(0);
   } else {
     // Schedule to run async
     schedule_command_timer((char*)&cmd[0], &TempEvent, Line);

src/Commands/HTTP.h

@@ -33,7 +33,7 @@ String Command_HTTP_SendToHTTP(struct EventStruct *event, const char* Line)
 			}
 			String request = do_create_http_request(hostportString, F("GET"), path);
 			addLog(LOG_LEVEL_DEBUG, request);
-			send_via_http(F("Command_HTTP_SendToHTTP"), client, request);
+			send_via_http(F("Command_HTTP_SendToHTTP"), client, request, false);
 		}
 	}
 	return return_command_success();

src/Commands/Rules.h

@@ -34,4 +34,15 @@ String Command_Rules_Events(struct EventStruct *event, const char* Line)
 	return return_command_success();
 }
 
+String Command_Rules_Let(struct EventStruct *event, const char* Line)
+{
+	char TmpStr1[INPUT_COMMAND_SIZE];
+	if (GetArgv(Line, TmpStr1, 3)) {
+		float result = 0;
+		Calculate(TmpStr1, &result);
+		customFloatVar[event->Par1-1] = result;
+	}
+	return return_command_success();
+}
+
 #endif // COMMAND_RULES_H

src/Commands/Tasks.h

@@ -30,6 +30,15 @@ String Command_Task_ValueSet(struct EventStruct *event, const char* Line)
 	return return_command_success();
 }
 
+String Command_Task_ValueToggle(struct EventStruct *event, const char* Line)
+{
+	const int result = round(UserVar[(VARS_PER_TASK * (event->Par1 - 1)) + event->Par2 - 1]);
+	if (result == 0 || result == 1) {
+	  UserVar[(VARS_PER_TASK * (event->Par1 - 1)) + event->Par2 - 1] = !result;
+	}
+	return return_command_success();
+}
+
 String Command_Task_ValueSetAndRun(struct EventStruct *event, const char* Line)
 {
 	char TmpStr1[INPUT_COMMAND_SIZE];

src/Controller.ino

@@ -132,7 +132,7 @@ void callback(char* c_topic, byte* b_payload, unsigned int length) {
 bool MQTTConnect(int controller_idx)
 {
   ++mqtt_reconnect_count;
-  ControllerSettingsStruct ControllerSettings;
+  MakeControllerSettings(ControllerSettings);
   LoadControllerSettings(controller_idx, ControllerSettings);
   if (!ControllerSettings.checkHostReachable(true))
     return false;
@@ -141,6 +141,8 @@ bool MQTTConnect(int controller_idx)
     updateMQTTclient_connected();
   }
   mqtt = WiFiClient(); // workaround see: https://github.com/esp8266/Arduino/issues/4497#issuecomment-373023864
+  mqtt.setTimeout(ControllerSettings.ClientTimeout);
+  MQTTclient.setClient(mqtt);
   if (ControllerSettings.UseDNS) {
     MQTTclient.setServer(ControllerSettings.getHost().c_str(), ControllerSettings.Port);
   } else {
@@ -202,10 +204,12 @@ bool MQTTConnect(int controller_idx)
   } else {
     MQTTresult = MQTTclient.connect(clientid.c_str(), LWTTopic.c_str(), willQos, willRetain, LWTMessageDisconnect.c_str());
   }
-  yield();
+  delay(0);
 
   if (!MQTTresult) {
     addLog(LOG_LEVEL_ERROR, F("MQTT : Failed to connect to broker"));
+    MQTTclient.disconnect();
+    updateMQTTclient_connected();
     return false;
   }
   MQTTclient_should_reconnect = false;
@@ -292,9 +296,9 @@ void scheduleNextMQTTdelayQueue() {
 
 void processMQTTdelayQueue() {
   START_TIMER;
-  MQTT_queue_element element;
-  if (!MQTTDelayHandler.getNext(element)) return;
-  if (MQTTclient.publish(element._topic.c_str(), element._payload.c_str(), element._retained)) {
+  MQTT_queue_element* element(MQTTDelayHandler.getNext());
+  if (element == NULL) return;
+  if (MQTTclient.publish(element->_topic.c_str(), element->_payload.c_str(), element->_retained)) {
     setIntervalTimerOverride(TIMER_MQTT, 10); // Make sure the MQTT is being processed as soon as possible.
     MQTTDelayHandler.markProcessed(true);
   } else {
@@ -315,7 +319,7 @@ void processMQTTdelayQueue() {
 \*********************************************************************************************/
 void MQTTStatus(String& status)
 {
-  ControllerSettingsStruct ControllerSettings;
+  MakeControllerSettings(ControllerSettings);
   int enabledMqttController = firstEnabledMQTTController();
   if (enabledMqttController >= 0) {
     LoadControllerSettings(enabledMqttController, ControllerSettings);

src/ESPEasy-Globals.h

@@ -12,7 +12,7 @@
 // You can always change these during runtime and save to eeprom
 // After loading firmware, issue a 'reset' command to load the defaults.
 // --- Basic Config Settings ------------------------------------------------------------------------
-#define DEFAULT_NAME        "ESP_Easy"                  // Enter your device friendly name
+#define DEFAULT_NAME        "ESP_Easy"          // Enter your device friendly name
 #define UNIT                            0                                       // Unit Number
 #define DEFAULT_DELAY       60                  // Sleep Delay in seconds
 
@@ -79,7 +79,7 @@
 #define DEFAULT_MQTT_LWT_TOPIC                  ""      // Default lwt topic
 #define DEFAULT_MQTT_LWT_CONNECT_MESSAGE        "Connected" // Default lwt message
 #define DEFAULT_MQTT_LWT_DISCONNECT_MESSAGE     "Connection Lost" // Default lwt message
-#define DEFAULT_MQTT_USE_UNITNANE_AS_CLIENTID   0
+#define DEFAULT_MQTT_USE_UNITNAME_AS_CLIENTID   0
 
 #define DEFAULT_USE_NTP                         false   // (true|false) Use NTP Server
 #define DEFAULT_NTP_HOST                        ""              // NTP Server Hostname
@@ -191,6 +191,8 @@
 
 #define MAX_FLASHWRITES_PER_DAY           100 // per 24 hour window
 #define INPUT_COMMAND_SIZE                240 // Affects maximum command length in rules and other commands
+// FIXME TD-er: INPUT_COMMAND_SIZE is also used in commands where simply a check for valid parameter is needed
+// and some may need less memory. (which is stack allocated)
 
 #define NODE_TYPE_ID_ESP_EASY_STD           1
 #define NODE_TYPE_ID_ESP_EASYM_STD         17
@@ -226,6 +228,9 @@
 // N.B. Retries without a connection to wifi do not count as retry.
 #define CONTROLLER_DELAY_QUEUE_RETRY_MAX   10
 #define CONTROLLER_DELAY_QUEUE_RETRY_DFLT  10
+// Timeout of the client in msec.
+#define CONTROLLER_CLIENTTIMEOUT_MAX     1000
+#define CONTROLLER_CLIENTTIMEOUT_DFLT    1000
 
 
 #define PLUGIN_INIT_ALL                     1
@@ -287,6 +292,7 @@
 #define NPLUGIN_NOT_FOUND                 255
 
 
+#define LOG_LEVEL_NONE                      0
 #define LOG_LEVEL_ERROR                     1
 #define LOG_LEVEL_INFO                      2
 #define LOG_LEVEL_DEBUG                     3
@@ -333,6 +339,7 @@
 #define RULES_BUFFER_SIZE                  64
 #define NAME_FORMULA_LENGTH_MAX            40
 #define RULES_IF_MAX_NESTING_LEVEL          4
+#define CUSTOM_VARS_MAX                    16
 
 #define UDP_PACKETSIZE_MAX               2048
 
@@ -594,14 +601,17 @@ bool MQTTclient_should_reconnect = true;
 bool MQTTclient_connected = false;
 int mqtt_reconnect_count = 0;
 
+//NTP status
+bool statusNTPInitialized = false;
+
+// mqtt import status
+bool P037_MQTTImport_connected = false;
+
 // udp protocol stuff (syslog, global sync, node info list, ntp time)
 WiFiUDP portUDP;
 
 class TimingStats;
 
-#define LOADFILE_STATS  0
-#define LOOP_STATS      1
-
 /*********************************************************************************************\
  * CRCStruct
 \*********************************************************************************************/
@@ -669,6 +679,16 @@ struct SecurityStruct
   uint8_t       md5[16];
 } SecuritySettings;
 
+
+/*********************************************************************************************\
+ * Custom Variables for usage in rules and http.
+ * Syntax: %vX%
+ * usage:
+ * let,1,10
+ * if %v1%=10 do ...
+\*********************************************************************************************/
+float         customFloatVar[CUSTOM_VARS_MAX];
+
 /*********************************************************************************************\
  * SettingsStruct
 \*********************************************************************************************/
@@ -690,6 +710,10 @@ struct SettingsStruct
     if (VariousBits1 > (1 << 30)) VariousBits1 = 0;
   }
 
+  bool networkSettingsEmpty() {
+    return (IP[0] == 0 && Gateway[0] == 0 && Subnet[0] == 0 && DNS[0] == 0);
+  }
+
   void clearNetworkSettings() {
     for (byte i = 0; i < 4; ++i) {
       IP[i] = 0;
@@ -889,13 +913,30 @@ SettingsStruct* SettingsStruct_ptr = new SettingsStruct;
 SettingsStruct& Settings = *SettingsStruct_ptr;
 */
 
+
 /*********************************************************************************************\
- * ControllerSettingsStruct
+ *  Analyze SettingsStruct and report inconsistencies
+ *  Not a member function to be able to use the F-macro
+\*********************************************************************************************/
+bool SettingsCheck(String& error) {
+  error = "";
+  if (!Settings.networkSettingsEmpty()) {
+    if (Settings.IP[0] == 0 || Settings.Gateway[0] == 0 || Settings.Subnet[0] == 0 || Settings.DNS[0] == 0) {
+      error += F("Error: Either fill all IP settings fields or leave all empty");
+    }
+  }
+
+  return error.length() == 0;
+}
+
+/*********************************************************************************************\
+ * ControllerSettingsStruct definition
 \*********************************************************************************************/
 struct ControllerSettingsStruct
 {
   ControllerSettingsStruct() : UseDNS(false), Port(0),
-      MinimalTimeBetweenMessages(100), MaxQueueDepth(10), MaxRetry(10), DeleteOldest(false) {
+      MinimalTimeBetweenMessages(100), MaxQueueDepth(10), MaxRetry(10),
+      DeleteOldest(false), ClientTimeout(100), MustCheckReply(false) {
     for (byte i = 0; i < 4; ++i) {
       IP[i] = 0;
     }
@@ -919,13 +960,18 @@ struct ControllerSettingsStruct
   unsigned int  MaxQueueDepth;
   unsigned int  MaxRetry;
   boolean       DeleteOldest; // Action to perform when buffer full, delete oldest, or ignore newest.
+  unsigned int  ClientTimeout;
+  boolean       MustCheckReply; // When set to false, a sent message is considered always successful.
 
   void validate() {
     if (Port > 65535) Port = 0;
-    if (MinimalTimeBetweenMessages < 1) MinimalTimeBetweenMessages = 100;
-    if (MinimalTimeBetweenMessages > 3600000) MinimalTimeBetweenMessages = 100;
-    if (MaxQueueDepth > 25) MaxQueueDepth = 10;
-    if (MaxRetry > 10) MaxRetry = 10;
+    if (MinimalTimeBetweenMessages < 1  ||  MinimalTimeBetweenMessages > CONTROLLER_DELAY_QUEUE_DELAY_MAX)
+      MinimalTimeBetweenMessages = CONTROLLER_DELAY_QUEUE_DELAY_DFLT;
+    if (MaxQueueDepth > CONTROLLER_DELAY_QUEUE_DEPTH_MAX) MaxQueueDepth = CONTROLLER_DELAY_QUEUE_DEPTH_DFLT;
+    if (MaxRetry > CONTROLLER_DELAY_QUEUE_RETRY_MAX) MaxRetry = CONTROLLER_DELAY_QUEUE_RETRY_MAX;
+    if (ClientTimeout < 10 || ClientTimeout > CONTROLLER_CLIENTTIMEOUT_MAX) {
+      ClientTimeout = CONTROLLER_CLIENTTIMEOUT_DFLT;
+    }
   }
 
   IPAddress getIP() const {
@@ -949,6 +995,7 @@ struct ControllerSettingsStruct
     if (!WiFiConnected(10)) {
       return false; // Not connected, so no use in wasting time to connect to a host.
     }
+    delay(1); // Make sure the Watchdog will not trigger a reset.
     if (quick && ipSet()) return true;
     if (UseDNS) {
       if (!updateIPcache()) {
@@ -1027,6 +1074,11 @@ private:
 
 };
 
+typedef std::shared_ptr<ControllerSettingsStruct> ControllerSettingsStruct_ptr_type;
+#define MakeControllerSettings(T) ControllerSettingsStruct_ptr_type ControllerSettingsStruct_ptr(new ControllerSettingsStruct());\
+                                    ControllerSettingsStruct& T = *ControllerSettingsStruct_ptr;
+
+
 
 /*********************************************************************************************\
  * NotificationSettingsStruct
@@ -1058,6 +1110,11 @@ struct NotificationSettingsStruct
   //its safe to extend this struct, up to 4096 bytes, default values in config are 0
 };
 
+typedef std::shared_ptr<NotificationSettingsStruct> NotificationSettingsStruct_ptr_type;
+#define MakeNotificationSettings(T) NotificationSettingsStruct_ptr_type NotificationSettingsStruct_ptr(new NotificationSettingsStruct());\
+                                    NotificationSettingsStruct& T = *NotificationSettingsStruct_ptr;
+
+
 /*********************************************************************************************\
  * ExtraTaskSettingsStruct
 \*********************************************************************************************/
@@ -1141,22 +1198,36 @@ struct ExtraTaskSettingsStruct
 struct EventStruct
 {
   EventStruct() :
+    Data(NULL), idx(0), Par1(0), Par2(0), Par3(0), Par4(0), Par5(0),
     Source(0), TaskIndex(TASKS_MAX), ControllerIndex(0), ProtocolIndex(0), NotificationIndex(0),
-    BaseVarIndex(0), idx(0), sensorType(0), Par1(0), Par2(0), Par3(0), Par4(0), Par5(0),
-    OriginTaskIndex(0), Data(NULL) {}
+    BaseVarIndex(0), sensorType(0), OriginTaskIndex(0) {}
   EventStruct(const struct EventStruct& event):
-        Source(event.Source), TaskIndex(event.TaskIndex), ControllerIndex(event.ControllerIndex)
-        , ProtocolIndex(event.ProtocolIndex), NotificationIndex(event.NotificationIndex)
-        , BaseVarIndex(event.BaseVarIndex), idx(event.idx), sensorType(event.sensorType)
-        , Par1(event.Par1), Par2(event.Par2), Par3(event.Par3), Par4(event.Par4), Par5(event.Par5)
-        , OriginTaskIndex(event.OriginTaskIndex)
-        , String1(event.String1)
+          String1(event.String1)
         , String2(event.String2)
         , String3(event.String3)
         , String4(event.String4)
         , String5(event.String5)
-        , Data(event.Data) {}
+        , Data(event.Data)
+        , idx(event.idx)
+        , Par1(event.Par1), Par2(event.Par2), Par3(event.Par3), Par4(event.Par4), Par5(event.Par5)
+        , Source(event.Source), TaskIndex(event.TaskIndex), ControllerIndex(event.ControllerIndex)
+        , ProtocolIndex(event.ProtocolIndex), NotificationIndex(event.NotificationIndex)
+        , BaseVarIndex(event.BaseVarIndex), sensorType(event.sensorType)
+        , OriginTaskIndex(event.OriginTaskIndex)
+         {}
 
+  String String1;
+  String String2;
+  String String3;
+  String String4;
+  String String5;
+  byte *Data;
+  int idx;
+  int Par1;
+  int Par2;
+  int Par3;
+  int Par4;
+  int Par5;
   byte Source;
   byte TaskIndex; // index position in TaskSettings array, 0-11
   byte ControllerIndex; // index position in Settings.Controller, 0-3
@@ -1165,20 +1236,8 @@ struct EventStruct
   //Edwin: Not needed, and wasnt used. We can determine the protocol index with getNotificationProtocolIndex(NotificationIndex)
   // byte NotificationProtocolIndex; // index position in notification array, depending on which controller plugins are loaded.
   byte BaseVarIndex;
-  int idx;
   byte sensorType;
-  int Par1;
-  int Par2;
-  int Par3;
-  int Par4;
-  int Par5;
   byte OriginTaskIndex;
-  String String1;
-  String String2;
-  String String3;
-  String String4;
-  String String5;
-  byte *Data;
 };
 
 
@@ -1188,18 +1247,19 @@ struct EventStruct
 #define LOG_STRUCT_MESSAGE_SIZE 128
 #ifdef ESP32
   #define LOG_STRUCT_MESSAGE_LINES 30
+  #define LOG_BUFFER_EXPIRE         30000  // Time after which a buffered log item is considered expired.
 #else
   #if defined(PLUGIN_BUILD_TESTING) || defined(PLUGIN_BUILD_DEV)
     #define LOG_STRUCT_MESSAGE_LINES 10
   #else
     #define LOG_STRUCT_MESSAGE_LINES 15
   #endif
+  #define LOG_BUFFER_EXPIRE         5000  // Time after which a buffered log item is considered expired.
 #endif
 
 struct LogStruct {
-    LogStruct() : write_idx(0), read_idx(0) {
+    LogStruct() : write_idx(0), read_idx(0), lastReadTimeStamp(0) {
       for (int i = 0; i < LOG_STRUCT_MESSAGE_LINES; ++i) {
-        Message[i].reserve(LOG_STRUCT_MESSAGE_SIZE);
         timeStamp[i] = 0;
         log_level[i] = 0;
       }
@@ -1217,6 +1277,7 @@ struct LogStruct {
       if (linelength > LOG_STRUCT_MESSAGE_SIZE-1)
         linelength = LOG_STRUCT_MESSAGE_SIZE-1;
       Message[write_idx] = "";
+      Message[write_idx].reserve(linelength);
       for (unsigned i = 0; i < linelength; ++i) {
         Message[write_idx] += *(line + i);
       }
@@ -1225,6 +1286,7 @@ struct LogStruct {
     // Read the next item and append it to the given string.
     // Returns whether new lines are available.
     bool get(String& output, const String& lineEnd) {
+      lastReadTimeStamp = millis();
       if (!isEmpty()) {
         read_idx = (read_idx + 1) % LOG_STRUCT_MESSAGE_LINES;
         output += formatLine(read_idx, lineEnd);
@@ -1233,6 +1295,7 @@ struct LogStruct {
     }
 
     String get_logjson_formatted(bool& logLinesAvailable, unsigned long& timestamp) {
+      lastReadTimeStamp = millis();
       logLinesAvailable = false;
       if (isEmpty()) {
         return "";
@@ -1246,31 +1309,15 @@ struct LogStruct {
       return output;
     }
 
-    bool get(String& output, const String& lineEnd, int line) {
-      int tmpread((write_idx + 1+line) % LOG_STRUCT_MESSAGE_LINES);
-      if (timeStamp[tmpread] != 0) {
-        output += formatLine(tmpread, lineEnd);
-      }
-      return !isEmpty();
-    }
-
-    bool getAll(String& output, const String& lineEnd) {
-      int tmpread((write_idx + 1) % LOG_STRUCT_MESSAGE_LINES);
-      bool someAdded = false;
-      while (tmpread != write_idx) {
-        if (timeStamp[tmpread] != 0) {
-          output += formatLine(tmpread, lineEnd);
-          someAdded = true;
-        }
-        tmpread = (tmpread + 1)% LOG_STRUCT_MESSAGE_LINES;
-      }
-      return someAdded;
-    }
-
     bool isEmpty() {
       return (write_idx == read_idx);
     }
 
+    bool logActiveRead() {
+      clearExpiredEntries();
+      return timePassedSince(lastReadTimeStamp) < LOG_BUFFER_EXPIRE;
+    }
+
   private:
     String formatLine(int index, const String& lineEnd) {
       String output;
@@ -1294,20 +1341,38 @@ struct LogStruct {
       return output;
     }
 
+    void clearExpiredEntries() {
+      if (isEmpty()) {
+        return;
+      }
+      if (timePassedSince(lastReadTimeStamp) > LOG_BUFFER_EXPIRE) {
+        // Clear the entire log.
+        // If web log is the only log active, it will not be checked again until it is read.
+        for (read_idx = 0; read_idx < LOG_STRUCT_MESSAGE_LINES; ++read_idx) {
+          Message[read_idx] = String(); // Free also the reserved memory.
+          timeStamp[read_idx] = 0;
+          log_level[read_idx] = 0;
+        }
+        read_idx = 0;
+        write_idx = 0;
+      }
+    }
 
     int write_idx;
     int read_idx;
     unsigned long timeStamp[LOG_STRUCT_MESSAGE_LINES];
+    unsigned long lastReadTimeStamp;
     byte log_level[LOG_STRUCT_MESSAGE_LINES];
     String Message[LOG_STRUCT_MESSAGE_LINES];
 
 } Logging;
 
 std::deque<char> serialLogBuffer;
-unsigned long last_serial_log_emptied = 0;
+unsigned long last_serial_log_read = 0;
 
 byte highest_active_log_level = 0;
 bool log_to_serial_disabled = false;
+bool log_to_serial_disabled_temporary = false;
 // Do this in a template to prevent casting to String when not needed.
 #define addLog(L,S) if (loglevelActiveFor(L)) { addToLog(L,S); }
 
@@ -1331,16 +1396,16 @@ struct DeviceStruct
   byte Type;    // How the device is connected. e.g. DEVICE_TYPE_SINGLE => connected through 1 datapin
   byte VType;   // Type of value the plugin will return, used only for Domoticz
   byte Ports;   // Port to use when device has multiple I/O pins  (N.B. not used much)
-  byte ValueCount;            // The number of output values of a plugin. The value should match the number of keys PLUGIN_VALUENAME1_xxx
-  boolean PullUpOption;       // Allow to set internal pull-up resistors.
-  boolean InverseLogicOption; // Allow to invert the boolean state (e.g. a switch)
-  boolean FormulaOption;      // Allow to enter a formula to convert values during read. (not possible with Custom enabled)
-  boolean Custom;
-  boolean SendDataOption;     // Allow to send data to a controller.
-  boolean GlobalSyncOption;   // No longer used. Was used for ESPeasy values sync between nodes
-  boolean TimerOption;        // Allow to set the "Interval" timer for the plugin.
-  boolean TimerOptional;      // When taskdevice timer is not set and not optional, use default "Interval" delay (Settings.Delay)
-  boolean DecimalsOnly;       // Allow to set the number of decimals (otherwise treated a 0 decimals)
+  byte ValueCount;             // The number of output values of a plugin. The value should match the number of keys PLUGIN_VALUENAME1_xxx
+  bool PullUpOption : 1;       // Allow to set internal pull-up resistors.
+  bool InverseLogicOption : 1; // Allow to invert the boolean state (e.g. a switch)
+  bool FormulaOption : 1;      // Allow to enter a formula to convert values during read. (not possible with Custom enabled)
+  bool Custom : 1;
+  bool SendDataOption : 1;     // Allow to send data to a controller.
+  bool GlobalSyncOption : 1;   // No longer used. Was used for ESPeasy values sync between nodes
+  bool TimerOption : 1;        // Allow to set the "Interval" timer for the plugin.
+  bool TimerOptional : 1;      // When taskdevice timer is not set and not optional, use default "Interval" delay (Settings.Delay)
+  bool DecimalsOnly;           // Allow to set the number of decimals (otherwise treated a 0 decimals)
 };
 typedef std::vector<DeviceStruct> DeviceVector;
 DeviceVector Device;
@@ -1405,16 +1470,16 @@ NodesMap Nodes;
 struct systemTimerStruct
 {
   systemTimerStruct() :
-    timer(0), plugin(0), TaskIndex(-1), Par1(0), Par2(0), Par3(0), Par4(0), Par5(0) {}
+    timer(0), Par1(0), Par2(0), Par3(0), Par4(0), Par5(0), TaskIndex(-1), plugin(0) {}
 
   unsigned long timer;
-  byte plugin;
-  int16_t TaskIndex;
   int Par1;
   int Par2;
   int Par3;
   int Par4;
   int Par5;
+  int16_t TaskIndex;
+  byte plugin;
 };
 std::map<unsigned long, systemTimerStruct> systemTimers;
 
@@ -1423,11 +1488,11 @@ std::map<unsigned long, systemTimerStruct> systemTimers;
 \*********************************************************************************************/
 struct pinStatesStruct
 {
-  pinStatesStruct() : plugin(0), index(0), mode(0), value(0) {}
+  pinStatesStruct() : value(0), plugin(0), index(0), mode(0) {}
+  uint16_t value;
   byte plugin;
   byte index;
   byte mode;
-  uint16_t value;
 } pinStates[PINSTATE_TABLE_MAX];
 
 
@@ -1487,6 +1552,7 @@ unsigned long connectionFailures = 0;
 unsigned long wdcounter = 0;
 unsigned long timerAPoff = 0;
 unsigned long timerAwakeFromDeepSleep = 0;
+unsigned long last_system_event_run = 0;
 
 #if FEATURE_ADC_VCC
 float vcc = -1.0;
@@ -1783,31 +1849,32 @@ unsigned long timediff_calls = 0;
 unsigned long timediff_cpu_cycles_total = 0;
 
 #define LOADFILE_STATS        0
-#define LOOP_STATS            1
-#define PLUGIN_CALL_50PS      2
-#define PLUGIN_CALL_10PS      3
-#define PLUGIN_CALL_10PSU     4
-#define PLUGIN_CALL_1PS       5
-#define SENSOR_SEND_TASK      6
-#define SEND_DATA_STATS       7
-#define COMPUTE_FORMULA_STATS 8
-#define PROC_SYS_TIMER        9
-#define SET_NEW_TIMER        10
-#define TIME_DIFF_COMPUTE    11
-#define MQTT_DELAY_QUEUE     12
-#define C001_DELAY_QUEUE     13
-#define C002_DELAY_QUEUE     14
-#define C003_DELAY_QUEUE     15
-#define C004_DELAY_QUEUE     16
-#define C005_DELAY_QUEUE     17
-#define C006_DELAY_QUEUE     18
-#define C007_DELAY_QUEUE     19
-#define C008_DELAY_QUEUE     20
-#define C009_DELAY_QUEUE     21
-#define C010_DELAY_QUEUE     22
-#define C011_DELAY_QUEUE     23
-#define C012_DELAY_QUEUE     24
-#define C013_DELAY_QUEUE     25
+#define SAVEFILE_STATS        1
+#define LOOP_STATS            2
+#define PLUGIN_CALL_50PS      3
+#define PLUGIN_CALL_10PS      4
+#define PLUGIN_CALL_10PSU     5
+#define PLUGIN_CALL_1PS       6
+#define SENSOR_SEND_TASK      7
+#define SEND_DATA_STATS       8
+#define COMPUTE_FORMULA_STATS 9
+#define PROC_SYS_TIMER       10
+#define SET_NEW_TIMER        11
+#define TIME_DIFF_COMPUTE    12
+#define MQTT_DELAY_QUEUE     13
+#define C001_DELAY_QUEUE     14
+#define C002_DELAY_QUEUE     15
+#define C003_DELAY_QUEUE     16
+#define C004_DELAY_QUEUE     17
+#define C005_DELAY_QUEUE     18
+#define C006_DELAY_QUEUE     19
+#define C007_DELAY_QUEUE     20
+#define C008_DELAY_QUEUE     21
+#define C009_DELAY_QUEUE     22
+#define C010_DELAY_QUEUE     23
+#define C011_DELAY_QUEUE     24
+#define C012_DELAY_QUEUE     25
+#define C013_DELAY_QUEUE     26
 
 
 
@@ -1816,13 +1883,14 @@ unsigned long timediff_cpu_cycles_total = 0;
 
 #define START_TIMER const unsigned statisticsTimerStart(micros());
 #define STOP_TIMER_TASK(T,F)  if (mustLogFunction(F)) pluginStats[T*32 + F].add(usecPassedSince(statisticsTimerStart));
-#define STOP_TIMER_LOADFILE miscStats[LOADFILE_STATS].add(usecPassedSince(statisticsTimerStart));
+//#define STOP_TIMER_LOADFILE miscStats[LOADFILE_STATS].add(usecPassedSince(statisticsTimerStart));
 #define STOP_TIMER(L)       miscStats[L].add(usecPassedSince(statisticsTimerStart));
 
 
 String getMiscStatsName(int stat) {
     switch (stat) {
         case LOADFILE_STATS: return F("Load File");
+        case SAVEFILE_STATS: return F("Save File");
         case LOOP_STATS:     return F("Loop");
         case PLUGIN_CALL_50PS:      return F("Plugin call 50 p/s  ");
         case PLUGIN_CALL_10PS:      return F("Plugin call 10 p/s  ");

src/ESPEasy.ino

@@ -106,6 +106,9 @@ int firstEnabledBlynkController() {
 \*********************************************************************************************/
 void setup()
 {
+#ifdef ESP8266_DISABLE_EXTRA4K
+  disable_extra4k_at_link_time();
+#endif
   WiFi.persistent(false); // Do not use SDK storage of SSID/WPA parameters
   WiFi.setAutoReconnect(false);
   setWifiMode(WIFI_OFF);
@@ -529,6 +532,7 @@ void loop()
     }
     // Flush outstanding MQTT messages
     runPeriodicalMQTT();
+    flushAndDisconnectAllClients();
 
     deepSleep(Settings.Delay);
     //deepsleep will never return, its a special kind of reboot
@@ -544,6 +548,14 @@ bool checkConnectionsEstablished() {
   return true;
 }
 
+void flushAndDisconnectAllClients() {
+  if (MQTTclient.connected()) {
+    MQTTclient.disconnect();
+    updateMQTTclient_connected();
+  }
+  /// FIXME TD-er: add call to all controllers (delay queue) to flush all data.
+}
+
 void runPeriodicalMQTT() {
   // MQTT_KEEPALIVE = 15 seconds.
   if (!WiFiConnected(10)) {
@@ -836,13 +848,10 @@ void SensorSendTask(byte TaskIndex)
       {
         if (ExtraTaskSettings.TaskDeviceFormula[varNr][0] != 0)
         {
-          String spreValue = String(preValue[varNr]);
           String formula = ExtraTaskSettings.TaskDeviceFormula[varNr];
-          float value = UserVar[varIndex + varNr];
+          formula.replace(F("%pvalue%"), String(preValue[varNr]));
+          formula.replace(F("%value%"), String(UserVar[varIndex + varNr]));
           float result = 0;
-          String svalue = String(value);
-          formula.replace(F("%pvalue%"), spreValue);
-          formula.replace(F("%value%"), svalue);
           byte error = Calculate(formula.c_str(), &result);
           if (error == 0)
             UserVar[varIndex + varNr] = result;
@@ -863,7 +872,7 @@ void backgroundtasks()
 {
   //checkRAM(F("backgroundtasks"));
   //always start with a yield
-  yield();
+  delay(0);
 /*
   // Remove this watchdog feed for now.
   // See https://github.com/letscontrolit/ESPEasy/issues/1722#issuecomment-419659193
@@ -906,13 +915,13 @@ void backgroundtasks()
   //once OTA is triggered, only handle that and dont do other stuff. (otherwise it fails)
   while (ArduinoOTAtriggered)
   {
-    yield();
+    delay(0);
     ArduinoOTA.handle();
   }
 
   #endif
 
-  yield();
+  delay(0);
 
   statusLED(false);
 

src/ESPEasyStorage.ino

@@ -41,6 +41,19 @@ String flashGuard()
 //use this in function that can return an error string. it automaticly returns with an error string if there where too many flash writes.
 #define FLASH_GUARD() { String flashErr=flashGuard(); if (flashErr.length()) return(flashErr); }
 
+
+String appendLineToFile(const String& fname, const String& line) {
+  fs::File f = SPIFFS.open(fname, "a+");
+  SPIFFS_CHECK(f, fname.c_str());
+  const size_t lineLength = line.length();
+  for (size_t i = 0; i < lineLength; ++i) {
+    SPIFFS_CHECK(f.write(line[i]), fname.c_str());
+  }
+  f.close();
+  return "";
+}
+
+
 /********************************************************************************************\
   Fix stuff to clear out differences between releases
   \*********************************************************************************************/
@@ -77,7 +90,7 @@ String BuildFixes()
     Settings.UseRTOSMultitasking = false;
     Settings.Pin_Reset = -1;
     Settings.SyslogFacility = DEFAULT_SYSLOG_FACILITY;
-    Settings.MQTTUseUnitNameAsClientId = DEFAULT_MQTT_USE_UNITNANE_AS_CLIENTID;
+    Settings.MQTTUseUnitNameAsClientId = DEFAULT_MQTT_USE_UNITNAME_AS_CLIENTID;
     Settings.StructSize = sizeof(Settings);
   }
 
@@ -113,7 +126,7 @@ void fileSystemCheck()
     {
       ResetFactory();
     }
-    f.close();
+    if (f) f.close();
   }
   else
   {
@@ -150,7 +163,11 @@ String SaveSettings(void)
     Settings.validate();
     err=SaveToFile((char*)FILE_CONFIG, 0, (byte*)&Settings, sizeof(Settings));
     if (err.length())
-     return(err);
+      return(err);
+    // Must check this after saving, or else it is not possible to fix multiple
+    // issues which can only corrected on different pages.
+    if (!SettingsCheck(err)) return err;
+
 //  }
 
   memcpy( SecuritySettings.ProgmemMd5, CRCValues.runTimeMD5, 16);
@@ -413,6 +430,13 @@ String SaveCustomTaskSettings(int TaskIndex, byte* memAddress, int datasize)
   return(SaveToFile(CustomTaskSettings_Type, TaskIndex, (char*)FILE_CONFIG, memAddress, datasize));
 }
 
+String getCustomTaskSettingsError(byte varNr) {
+  String error = F("Error: Text too long for line ");
+  error += varNr + 1;
+  error += '\n';
+  return error;
+}
+
 
 /********************************************************************************************\
   Clear custom task settings
@@ -518,13 +542,15 @@ String InitFile(const char* fname, int datasize)
   FLASH_GUARD();
 
   fs::File f = SPIFFS.open(fname, "w");
-  SPIFFS_CHECK(f, fname);
+  if (f) {
+    SPIFFS_CHECK(f, fname);
 
-  for (int x = 0; x < datasize ; x++)
-  {
-    SPIFFS_CHECK(f.write(0), fname);
+    for (int x = 0; x < datasize ; x++)
+    {
+      SPIFFS_CHECK(f.write(0), fname);
+    }
+    f.close();
   }
-  f.close();
 
   //OK
   return String();
@@ -551,24 +577,47 @@ String SaveToFile(char* fname, int index, byte* memAddress, int datasize)
     addLog(LOG_LEVEL_ERROR, log);
     return log;
   }
-
+  START_TIMER;
   checkRAM(F("SaveToFile"));
   FLASH_GUARD();
-
-  fs::File f = SPIFFS.open(fname, "r+");
-  SPIFFS_CHECK(f, fname);
-
-  SPIFFS_CHECK(f.seek(index, fs::SeekSet), fname);
-  byte *pointerToByteToSave = memAddress;
-  for (int x = 0; x < datasize ; x++)
   {
-    SPIFFS_CHECK(f.write(*pointerToByteToSave), fname);
-    pointerToByteToSave++;
+    String log = F("SaveToFile: free stack: ");
+    log += getCurrentFreeStack();
+    addLog(LOG_LEVEL_INFO, log);
+  }
+  delay(1);
+  unsigned long timer = millis() + 50;
+  fs::File f = SPIFFS.open(fname, "r+");
+  if (f) {
+    SPIFFS_CHECK(f, fname);
+    SPIFFS_CHECK(f.seek(index, fs::SeekSet), fname);
+    byte *pointerToByteToSave = memAddress;
+    for (int x = 0; x < datasize ; x++)
+    {
+      SPIFFS_CHECK(f.write(*pointerToByteToSave), fname);
+      pointerToByteToSave++;
+      if (timeOutReached(timer)) {
+        timer += 50;
+        delay(1);
+      }
+    }
+    f.close();
+    String log = F("FILE : Saved ");
+    log=log+fname;
+    addLog(LOG_LEVEL_INFO, log);
+  } else {
+    String log = F("SaveToFile: ");
+    log += fname;
+    log += F(" ERROR, Cannot save to file");
+    addLog(LOG_LEVEL_ERROR, log);
+    return log;
+  }
+  STOP_TIMER(SAVEFILE_STATS);
+  {
+    String log = F("SaveToFile: free stack after: ");
+    log += getCurrentFreeStack();
+    addLog(LOG_LEVEL_INFO, log);
   }
-  f.close();
-  String log = F("FILE : Saved ");
-  log=log+fname;
-  addLog(LOG_LEVEL_INFO, log);
 
   //OK
   return String();
@@ -591,14 +640,22 @@ String ClearInFile(char* fname, int index, int datasize)
   FLASH_GUARD();
 
   fs::File f = SPIFFS.open(fname, "r+");
-  SPIFFS_CHECK(f, fname);
+  if (f) {
+    SPIFFS_CHECK(f, fname);
 
-  SPIFFS_CHECK(f.seek(index, fs::SeekSet), fname);
-  for (int x = 0; x < datasize ; x++)
-  {
-    SPIFFS_CHECK(f.write(0), fname);
+    SPIFFS_CHECK(f.seek(index, fs::SeekSet), fname);
+    for (int x = 0; x < datasize ; x++)
+    {
+      SPIFFS_CHECK(f.write(0), fname);
+    }
+    f.close();
+  } else {
+    String log = F("ClearInFile: ");
+    log += fname;
+    log += F(" ERROR, Cannot save to file");
+    addLog(LOG_LEVEL_ERROR, log);
+    return log;
   }
-  f.close();
 
   //OK
   return String();
@@ -617,10 +674,10 @@ String LoadFromFile(char* fname, int offset, byte* memAddress, int datasize)
     addLog(LOG_LEVEL_ERROR, log);
     return log;
   }
+  delay(1);
   START_TIMER;
 
   checkRAM(F("LoadFromFile"));
-
   fs::File f = SPIFFS.open(fname, "r+");
   SPIFFS_CHECK(f, fname);
   SPIFFS_CHECK(f.seek(offset, fs::SeekSet), fname);
@@ -628,6 +685,7 @@ String LoadFromFile(char* fname, int offset, byte* memAddress, int datasize)
   f.close();
 
   STOP_TIMER(LOADFILE_STATS);
+  delay(1);
 
   return(String());
 }

src/ESPEasyTimeTypes.h

@@ -184,7 +184,7 @@ private:
     if (is_idle) return;
     last_exec_time_usec = micros();
     is_idle = true;
-    yield(); // Nothing to do, so call yield for backgroundtasks
+    delay(0); // Nothing to do, so leave time for backgroundtasks
   }
 
   void recordRunning() {

src/ESPEasyWifi.ino

@@ -678,6 +678,7 @@ void WifiScan()
 
 String formatScanResult(int i, const String& separator) {
   String result = WiFi.SSID(i);
+  htmlEscape(result);
   #ifndef ESP32
   if (WiFi.isHidden(i)) {
     result += F("#Hidden#");

src/I2C.ino

@@ -121,7 +121,7 @@ int32_t I2C_read32_reg(uint8_t i2caddr, byte reg) {
   Wire.beginTransmission(i2caddr);
   Wire.write((uint8_t)reg);
   Wire.endTransmission(END_TRANSMISSION_FLAG);
-  Wire.requestFrom(i2caddr, (byte)3);
+  Wire.requestFrom(i2caddr, (byte)4);
   value = (((int32_t)Wire.read()) <<24) | (((uint32_t)Wire.read()) << 16) | (Wire.read() << 8) | Wire.read();
 
   return value;

src/Misc.ino

@@ -445,23 +445,19 @@ void delayBackground(unsigned long delay)
 void parseCommandString(struct EventStruct *event, const String& string)
 {
   checkRAM(F("parseCommandString"));
-  char command[INPUT_COMMAND_SIZE];
-  command[0] = 0;
-  char TmpStr1[INPUT_COMMAND_SIZE];
-  TmpStr1[0] = 0;
-
-  string.toCharArray(command, INPUT_COMMAND_SIZE);
+  char *TmpStr1 = new char[INPUT_COMMAND_SIZE]();
   event->Par1 = 0;
   event->Par2 = 0;
   event->Par3 = 0;
   event->Par4 = 0;
   event->Par5 = 0;
 
-  if (GetArgv(command, TmpStr1, 2)) event->Par1 = CalculateParam(TmpStr1);
-  if (GetArgv(command, TmpStr1, 3)) event->Par2 = CalculateParam(TmpStr1);
-  if (GetArgv(command, TmpStr1, 4)) event->Par3 = CalculateParam(TmpStr1);
-  if (GetArgv(command, TmpStr1, 5)) event->Par4 = CalculateParam(TmpStr1);
-  if (GetArgv(command, TmpStr1, 6)) event->Par5 = CalculateParam(TmpStr1);
+  if (GetArgv(string.c_str(), TmpStr1, 2)) { event->Par1 = CalculateParam(TmpStr1); }
+  if (GetArgv(string.c_str(), TmpStr1, 3)) { event->Par2 = CalculateParam(TmpStr1); }
+  if (GetArgv(string.c_str(), TmpStr1, 4)) { event->Par3 = CalculateParam(TmpStr1); }
+  if (GetArgv(string.c_str(), TmpStr1, 5)) { event->Par4 = CalculateParam(TmpStr1); }
+  if (GetArgv(string.c_str(), TmpStr1, 6)) { event->Par5 = CalculateParam(TmpStr1); }
+  delete[] TmpStr1;
 }
 
 /********************************************************************************************\
@@ -572,15 +568,19 @@ boolean GetArgv(const char *string, char *argv, unsigned int argc) {
 
 boolean GetArgv(const char *string, char *argv, unsigned int argv_size, unsigned int argc)
 {
+  memset(argv, 0, argv_size);
+  size_t string_len = strlen(string);
   unsigned int string_pos = 0, argv_pos = 0, argc_pos = 0;
   char c, d;
   boolean parenthesis = false;
   char matching_parenthesis = '"';
 
-  while (string_pos < strlen(string))
+  while (string_pos < string_len)
   {
     c = string[string_pos];
-    d = string[string_pos + 1];
+    d = 0;
+    if ((string_pos + 1) < string_len)
+      d = string[string_pos + 1];
 
     if       (!parenthesis && c == ' ' && d == ' ') {}
     else if  (!parenthesis && c == ' ' && d == ',') {}
@@ -813,7 +813,7 @@ void ResetFactory(void)
 
 	Settings.MQTTRetainFlag	= DEFAULT_MQTT_RETAIN;
 	Settings.MessageDelay	= DEFAULT_MQTT_DELAY;
-	Settings.MQTTUseUnitNameAsClientId = DEFAULT_MQTT_USE_UNITNANE_AS_CLIENTID;
+	Settings.MQTTUseUnitNameAsClientId = DEFAULT_MQTT_USE_UNITNAME_AS_CLIENTID;
 
     Settings.UseNTP			= DEFAULT_USE_NTP;
 	strcpy_P(Settings.NTPHost, PSTR(DEFAULT_NTP_HOST));
@@ -843,7 +843,12 @@ void ResetFactory(void)
 	Settings.WireClockStretchLimit			= DEFAULT_I2C_CLOCK_LIMIT;
 */
 
+#ifdef PLUGIN_DESCR
+  strcpy_P(Settings.Name, PSTR(PLUGIN_DESCR));
+#endif
 
+  addPredefinedPlugins();
+  addPredefinedRules();
 
 
 
@@ -851,7 +856,7 @@ void ResetFactory(void)
   SaveSettings();
 
 #if DEFAULT_CONTROLLER
-  ControllerSettingsStruct ControllerSettings;
+  MakeControllerSettings(ControllerSettings);
   strcpy_P(ControllerSettings.Subscribe, PSTR(DEFAULT_SUB));
   strcpy_P(ControllerSettings.Publish, PSTR(DEFAULT_PUB));
   strcpy_P(ControllerSettings.MQTTLwtTopic, PSTR(DEFAULT_MQTT_LWT_TOPIC));
@@ -873,6 +878,108 @@ void ResetFactory(void)
   reboot();
 }
 
+void addSwitchPlugin(byte taskIndex, byte gpio, const String& name, bool activeLow) {
+  setTaskDevice_to_TaskIndex(1, taskIndex);
+  setBasicTaskValues(
+    taskIndex,
+    0,            // taskdevicetimer
+    true,         // enabled
+    name,         // name
+    gpio,         // pin1
+    -1,            // pin2
+    -1);           // pin3
+  Settings.TaskDevicePin1PullUp[taskIndex] = true;
+  if (activeLow)
+    Settings.TaskDevicePluginConfig[taskIndex][2] = 1; // PLUGIN_001_BUTTON_TYPE_PUSH_ACTIVE_LOW;
+}
+
+bool addPredefinedPlugins() {
+  byte taskIndex = 0;
+  #ifdef GPIO_KEY1
+  // Create button switch P001
+  addSwitchPlugin(taskIndex, GPIO_KEY1, F("Button1"), true);
+  ++taskIndex;
+  #endif // GPIO_KEY1
+  #ifdef GPIO_KEY2
+  // Create button switch P001
+  addSwitchPlugin(taskIndex, GPIO_KEY2, F("Button2"), true);
+  ++taskIndex;
+  #endif // GPIO_KEY2
+  #ifdef GPIO_KEY3
+  // Create button switch P001
+  addSwitchPlugin(taskIndex, GPIO_KEY3, F("Button3"), true);
+  ++taskIndex;
+  #endif // GPIO_KEY3
+  #ifdef GPIO_KEY4
+  // Create button switch P001
+  addSwitchPlugin(taskIndex, GPIO_KEY4, F("Button4"), true);
+  ++taskIndex;
+  #endif // GPIO_KEY4
+
+  #ifdef GPIO_REL1
+    // Create relay switch P001
+    addSwitchPlugin(taskIndex, GPIO_REL1, F("Relay1"), false);
+    ++taskIndex;
+  #endif // GPIO_REL1
+  #ifdef GPIO_REL2
+    // Create relay switch P001
+    addSwitchPlugin(taskIndex, GPIO_REL2, F("Relay2"), false);
+    ++taskIndex;
+  #endif // GPIO_REL2
+  #ifdef GPIO_REL3
+    // Create relay switch P001
+    addSwitchPlugin(taskIndex, GPIO_REL3, F("Relay3"), false);
+    ++taskIndex;
+  #endif // GPIO_REL3
+  #ifdef GPIO_REL4
+    // Create relay switch P001
+    addSwitchPlugin(taskIndex, GPIO_REL4, F("Relay4"), false);
+    ++taskIndex;
+  #endif // GPIO_REL4
+  return taskIndex != 0; // Indicate something was added
+  // Also needed to make sure the variable is being used.
+}
+
+void addButtonRelayRule(byte buttonNumber, byte relay_gpio) {
+  Settings.UseRules = true;
+  String fileName;
+  #if defined(ESP32)
+    fileName += '/';
+  #endif
+  fileName += F("rules1.txt");
+  String rule = F("on ButtonBNR#switch do\n  if [ButtonBNR#switch]=1\n    gpio,GNR,1\n  else\n    gpio,GNR,0\n  endif\nendon\n");
+  rule.replace(F("BNR"), String(buttonNumber));
+  rule.replace(F("GNR"), String(relay_gpio));
+  String result = appendLineToFile(fileName, rule);
+  if (result.length() > 0) {
+    addLog(LOG_LEVEL_ERROR, result);
+  }
+}
+
+void addPredefinedRules() {
+  #ifdef GPIO_KEY1
+    #ifdef GPIO_REL1
+      addButtonRelayRule(1, GPIO_REL1);
+    #endif // GPIO_REL1
+  #endif // GPIO_KEY1
+  #ifdef GPIO_KEY2
+    #ifdef GPIO_REL2
+      addButtonRelayRule(2, GPIO_REL2);
+    #endif // GPIO_REL2
+  #endif // GPIO_KEY2
+  #ifdef GPIO_KEY3
+    #ifdef GPIO_REL3
+      addButtonRelayRule(3, GPIO_REL3);
+    #endif // GPIO_REL3
+  #endif // GPIO_KEY3
+  #ifdef GPIO_KEY4
+    #ifdef GPIO_REL4
+      addButtonRelayRule(4, GPIO_REL4);
+    #endif // GPIO_REL4
+  #endif // GPIO_KEY4
+
+}
+
 
 /********************************************************************************************\
   If RX and TX tied together, perform emergency reset to get the system out of boot loops
@@ -997,6 +1104,11 @@ String getPluginDescriptionString() {
   #ifdef PLUGIN_BUILD_DEV
     result += F(" [Development]");
   #endif
+  #ifdef PLUGIN_DESCR
+  result += " [";
+  result += F(PLUGIN_DESCR);
+  result += ']';
+  #endif
   return result;
 }
 
@@ -1155,16 +1267,31 @@ void initLog()
 /********************************************************************************************\
   Logging
   \*********************************************************************************************/
-String getLogLevelDisplayString(byte index, int& logLevel) {
+String getLogLevelDisplayString(int logLevel) {
+  switch (logLevel) {
+    case LOG_LEVEL_NONE:       return F("None");
+    case LOG_LEVEL_ERROR:      return F("Error");
+    case LOG_LEVEL_INFO:       return F("Info");
+    case LOG_LEVEL_DEBUG:      return F("Debug");
+    case LOG_LEVEL_DEBUG_MORE: return F("Debug More");
+    case LOG_LEVEL_DEBUG_DEV:  return F("Debug dev");
+
+    default:
+      return "";
+  }
+}
+
+String getLogLevelDisplayStringFromIndex(byte index, int& logLevel) {
   switch (index) {
-    case 0: logLevel = LOG_LEVEL_ERROR;      return F("Error");
-    case 1: logLevel = LOG_LEVEL_INFO;       return F("Info");
-    case 2: logLevel = LOG_LEVEL_DEBUG;      return F("Debug");
-    case 3: logLevel = LOG_LEVEL_DEBUG_MORE; return F("Debug More");
-    case 4: logLevel = LOG_LEVEL_DEBUG_DEV;  return F("Debug dev");
+    case 0: logLevel = LOG_LEVEL_ERROR;      break;
+    case 1: logLevel = LOG_LEVEL_INFO;       break;
+    case 2: logLevel = LOG_LEVEL_DEBUG;      break;
+    case 3: logLevel = LOG_LEVEL_DEBUG_MORE; break;
+    case 4: logLevel = LOG_LEVEL_DEBUG_DEV;  break;
 
     default: logLevel = -1; return "";
   }
+  return getLogLevelDisplayString(logLevel);
 }
 
 void addToLog(byte loglevel, const String& string)
@@ -1179,14 +1306,6 @@ void addToLog(byte logLevel, const __FlashStringHelper* flashString)
     addToLog(logLevel, s.c_str());
 }
 
-bool SerialAvailableForWrite() {
-  if (!Settings.UseSerial) return false;
-  #if defined(ESP8266)
-    if (!Serial.availableForWrite()) return false; // UART FIFO overflow or TX disabled.
-  #endif
-  return true;
-}
-
 void disableSerialLog() {
   log_to_serial_disabled = true;
   setLogLevelFor(LOG_TO_SERIAL, 0);
@@ -1208,10 +1327,20 @@ void setLogLevelFor(byte destination, byte logLevel) {
 
 void updateLogLevelCache() {
   byte max_lvl = 0;
-  max_lvl = _max(max_lvl, Settings.SerialLogLevel);
+  if (!log_to_serial_disabled && serialLogActiveRead()) {
+    max_lvl = _max(max_lvl, Settings.SerialLogLevel);
+    if (Settings.SerialLogLevel >= LOG_LEVEL_DEBUG_MORE)
+      Serial.setDebugOutput(true);
+  } else {
+    Serial.setDebugOutput(false);
+  }
   max_lvl = _max(max_lvl, Settings.SyslogLevel);
-  max_lvl = _max(max_lvl, Settings.WebLogLevel);
+  if (Logging.logActiveRead()) {
+    max_lvl = _max(max_lvl, Settings.WebLogLevel);
+  }
+#ifdef FEATURE_SD
   max_lvl = _max(max_lvl, Settings.SDLogLevel);
+#endif
   highest_active_log_level = max_lvl;
 }
 
@@ -1219,14 +1348,42 @@ bool loglevelActiveFor(byte logLevel) {
   return loglevelActive(logLevel, highest_active_log_level);
 }
 
+byte getSerialLogLevel() {
+  byte logLevelSettings = 0;
+  if (!Settings.UseSerial) return 0;
+  if (log_to_serial_disabled || log_to_serial_disabled_temporary) return 0;
+  logLevelSettings = Settings.SerialLogLevel;
+  if (wifiStatus != ESPEASY_WIFI_SERVICES_INITIALIZED){
+    logLevelSettings = 2;
+  }
+/*
+  if (!serialLogActiveRead()) {
+    if (logLevelSettings != 0) {
+      updateLogLevelCache();
+    }
+    logLevelSettings = 0;
+  }
+*/
+  return logLevelSettings;
+}
+
+byte getWebLogLevel() {
+  byte logLevelSettings = 0;
+  if (Logging.logActiveRead()) {
+    logLevelSettings = Settings.WebLogLevel;
+  } else {
+    if (Settings.WebLogLevel != 0) {
+      updateLogLevelCache();
+    }
+  }
+  return logLevelSettings;
+}
+
 boolean loglevelActiveFor(byte destination, byte logLevel) {
   byte logLevelSettings = 0;
   switch (destination) {
     case LOG_TO_SERIAL: {
-      if (!SerialAvailableForWrite()) return false;
-      logLevelSettings = Settings.SerialLogLevel;
-      if (wifiStatus != ESPEASY_WIFI_SERVICES_INITIALIZED)
-        logLevelSettings = 2;
+      logLevelSettings = getSerialLogLevel();
       break;
     }
     case LOG_TO_SYSLOG: {
@@ -1234,11 +1391,13 @@ boolean loglevelActiveFor(byte destination, byte logLevel) {
       break;
     }
     case LOG_TO_WEBLOG: {
-      logLevelSettings = Settings.WebLogLevel;
+      logLevelSettings = getWebLogLevel();
       break;
     }
     case LOG_TO_SDCARD: {
+      #ifdef FEATURE_SD
       logLevelSettings = Settings.SDLogLevel;
+      #endif
       break;
     }
     default:
@@ -1291,24 +1450,58 @@ void addToLog(byte logLevel, const char *line)
 
 void process_serialLogBuffer() {
   if (serialLogBuffer.size() == 0) return;
-  if (timePassedSince(last_serial_log_emptied) > 10000) {
-    last_serial_log_emptied = millis();
-    serialLogBuffer.clear();
-    return;
-  }
   size_t snip = 128; // Some default, ESP32 doesn't have the availableForWrite function yet.
 #if defined(ESP8266)
   snip = Serial.availableForWrite();
 #endif
-  if (snip > 0) last_serial_log_emptied = millis();
-  size_t bytes_to_write = serialLogBuffer.size();
-  if (snip < bytes_to_write) bytes_to_write = snip;
-  for (size_t i = 0; i < bytes_to_write; ++i) {
-    Serial.write(serialLogBuffer.front());
-    serialLogBuffer.pop_front();
+  if (snip > 0) {
+    last_serial_log_read = millis();
+    size_t bytes_to_write = serialLogBuffer.size();
+    if (snip < bytes_to_write) bytes_to_write = snip;
+    for (size_t i = 0; i < bytes_to_write; ++i) {
+      Serial.write(serialLogBuffer.front());
+      serialLogBuffer.pop_front();
+    }
   }
 }
 
+void tempDisableSerialLog(bool setToDisabled) {
+  if (log_to_serial_disabled_temporary == setToDisabled) return;
+
+  // FIXME TD-er: For some reason disabling serial log will not enable it again.
+  //  log_to_serial_disabled_temporary = setToDisabled;
+  //  updateLogLevelCache();
+}
+
+bool serialLogActiveRead() {
+  if (!Settings.UseSerial) return false;
+  // Some default, ESP32 doesn't have the availableForWrite function yet.
+  // Not sure how to detect read activity on an ESP32.
+  size_t tx_free = 128;
+#if defined(ESP8266)
+  tx_free = Serial.availableForWrite();
+#endif
+  static size_t prev_tx_free = 0;
+  if (tx_free < prev_tx_free) {
+    prev_tx_free = tx_free;
+    tempDisableSerialLog(false);
+    return true;
+  }
+  // Must always set it or else it will never recover from prev_tx_free == 0
+  prev_tx_free = tx_free;
+  if (timePassedSince(last_serial_log_read) > LOG_BUFFER_EXPIRE) {
+    serialLogBuffer.clear();
+    // Just add some marker to get it going again when the serial buffer is
+    // read again and the serial log level was temporary set to 0 since nothing was read.
+    if (Settings.SerialLogLevel > 0) {
+      serialLogBuffer.push_back('\n');
+    }
+    tempDisableSerialLog(true);
+    return false;
+  }
+  return true;
+}
+
 /********************************************************************************************\
   Delayed reboot, in case of issues, do not reboot with high frequency as it might not help...
   \*********************************************************************************************/
@@ -2171,6 +2364,7 @@ for (byte x=0; x < RULESETS_MAX; x++){
   \*********************************************************************************************/
 void rulesProcessing(String& event)
 {
+  if (!Settings.UseRules) return;
   checkRAM(F("rulesProcessing"));
   unsigned long timer = millis();
   if (loglevelActiveFor(LOG_LEVEL_INFO)) {
@@ -2208,8 +2402,9 @@ void rulesProcessing(String& event)
 /********************************************************************************************\
   Rules processing
   \*********************************************************************************************/
-String rulesProcessingFile(String fileName, String& event)
+String rulesProcessingFile(const String& fileName, String& event)
 {
+  if (!Settings.UseRules) return "";
   checkRAM(F("rulesProcessingFile"));
   if (Settings.SerialLogLevel == LOG_LEVEL_DEBUG_DEV){
     Serial.print(F("RuleDebug Processing:"));
@@ -2271,6 +2466,7 @@ String rulesProcessingFile(String fileName, String& event)
       }
     }
   }
+  if (f) f.close();
 
   nestingLevel--;
   checkRAM(F("rulesProcessingFile2"));
@@ -2504,19 +2700,17 @@ void processMatchedRule(
       {
         String tmpString = event.substring(equalsPos + 1);
 
-        char command[INPUT_COMMAND_SIZE];
-        command[0] = 0;
-        char tmpParam[INPUT_COMMAND_SIZE];
+        char* tmpParam = new char[INPUT_COMMAND_SIZE];
         tmpParam[0] = 0;
-        tmpString.toCharArray(command, INPUT_COMMAND_SIZE);
 
-        if (GetArgv(command,tmpParam,1)) {
+        if (GetArgv(tmpString.c_str(),tmpParam,1)) {
            action.replace(F("%eventvalue%"), tmpParam); // for compatibility issues
            action.replace(F("%eventvalue1%"), tmpParam); // substitute %eventvalue1% in actions with the actual value from the event
         }
-        if (GetArgv(command,tmpParam,2)) action.replace(F("%eventvalue2%"), tmpParam); // substitute %eventvalue2% in actions with the actual value from the event
-        if (GetArgv(command,tmpParam,3)) action.replace(F("%eventvalue3%"), tmpParam); // substitute %eventvalue3% in actions with the actual value from the event
-        if (GetArgv(command,tmpParam,4)) action.replace(F("%eventvalue4%"), tmpParam); // substitute %eventvalue4% in actions with the actual value from the event
+        if (GetArgv(tmpString.c_str(),tmpParam,2)) action.replace(F("%eventvalue2%"), tmpParam); // substitute %eventvalue2% in actions with the actual value from the event
+        if (GetArgv(tmpString.c_str(),tmpParam,3)) action.replace(F("%eventvalue3%"), tmpParam); // substitute %eventvalue3% in actions with the actual value from the event
+        if (GetArgv(tmpString.c_str(),tmpParam,4)) action.replace(F("%eventvalue4%"), tmpParam); // substitute %eventvalue4% in actions with the actual value from the event
+        delete[] tmpParam;
       }
     }
 
@@ -2532,7 +2726,7 @@ void processMatchedRule(
     // FIXME TD-er: This part seems a bit strange.
     // It can't schedule a call to PLUGIN_WRITE.
     // Maybe ExecuteCommand can be scheduled?
-    yield();
+    delay(0);
     // Use a tmp string to call PLUGIN_WRITE, since PluginCall may inadvertenly alter the string.
     String tmpAction(action);
     if (!PluginCall(PLUGIN_WRITE, &TempEvent, tmpAction)) {
@@ -2547,7 +2741,7 @@ void processMatchedRule(
       }
       ExecuteCommand(VALUE_SOURCE_SYSTEM, action.c_str());
     }
-    yield();
+    delay(0);
   }
 }
 
@@ -2818,6 +3012,7 @@ boolean conditionMatch(const String& check)
   \*********************************************************************************************/
 void rulesTimers()
 {
+  if (!Settings.UseRules) return;
   for (byte x = 0; x < RULES_TIMER_MAX; x++)
   {
     if (!RulesTimer[x].paused && RulesTimer[x].timestamp != 0L) // timer active?
@@ -2840,6 +3035,7 @@ void rulesTimers()
 
 void createRuleEvents(byte TaskIndex)
 {
+  if (!Settings.UseRules) return;
   LoadTaskSettings(TaskIndex);
   byte BaseVarIndex = TaskIndex * VARS_PER_TASK;
   byte DeviceIndex = getDeviceIndex(Settings.TaskDeviceNumber[TaskIndex]);

src/Modbus.ino

@@ -70,7 +70,7 @@ bool Modbus::begin(uint8_t function, uint8_t ModbusID, uint16_t ModbusRegister,
   resultReceived = false;
   ModbusClient = new WiFiClient();
   ModbusClient->setNoDelay(true);
-  ModbusClient->setTimeout(200);
+  ModbusClient->setTimeout(CONTROLLER_CLIENTTIMEOUT_DFLT);
   timeout = millis();
   ModbusClient->flush();
 

src/Networking.ino

@@ -623,7 +623,7 @@ bool WiFiConnected(uint32_t timeout_ms) {
   uint32_t timer = millis() + (timeout_ms > 500 ? 500 : timeout_ms);
   uint32_t min_delay = timeout_ms / 20;
   if (min_delay < 10) {
-    yield(); // Allow at least once time for backgroundtasks
+    delay(0); // Allow at least once time for backgroundtasks
     min_delay = 10;
   }
   // Apparently something needs network, perform check to see if it is ready now.

src/Scheduler.ino

@@ -41,19 +41,26 @@ unsigned long getMixedId(unsigned long timerType, unsigned long id) {
 \*********************************************************************************************/
 void handle_schedule() {
   unsigned long timer;
-  const unsigned long mixed_id = msecTimerHandler.getNextId(timer);
+  unsigned long mixed_id = 0;
+  if (timePassedSince(last_system_event_run) < 500) {
+    // Make sure system event queue will be looked at every now and then.
+    mixed_id = msecTimerHandler.getNextId(timer);
+  }
   if (mixed_id == 0) {
     // No id ready to run right now.
     // Events are not that important to run immediately.
     // Make sure normal scheduled jobs run at higher priority.
     backgroundtasks();
     process_system_event_queue();
+    last_system_event_run = millis();
     return;
   }
   const unsigned long timerType = (mixed_id >> TIMER_ID_SHIFT);
   const unsigned long mask = (1 << TIMER_ID_SHIFT) -1;
   const unsigned long id = mixed_id & mask;
 
+  delay(0); // See: https://github.com/letscontrolit/ESPEasy/issues/1818#issuecomment-425351328
+
   switch (timerType) {
     case CONST_INTERVAL_TIMER:
       process_interval_timer(id, timer);
@@ -262,11 +269,11 @@ void process_plugin_task_timer(unsigned long id) {
   log += id;
   addLog(LOG_LEVEL_INFO, log);
 */
+  systemTimers.erase(id);
   if (y >= 0) {
     String dummy;
     Plugin_ptr[y](PLUGIN_TIMER_IN, &TempEvent, dummy);
-  }
-  systemTimers.erase(id);
+  }  
   STOP_TIMER(PROC_SYS_TIMER);
 }
 
@@ -427,9 +434,9 @@ void process_system_event_queue() {
             EventQueue.front().cmd.c_str(),
             &EventQueue.front().event,
             EventQueue.front().line.c_str());
-        yield();
+        delay(0);
         SendStatus(EventQueue.front().event.Source, status);
-        yield();
+        delay(0);
         break;
       }
   }

src/Serial.ino

@@ -11,7 +11,7 @@ void serial()
 {
   while (Serial.available())
   {
-    yield();
+    delay(0);
     SerialInByte = Serial.read();
     if (SerialInByte == 255) // binary data...
     {

src/StringConverter.ino

@@ -131,7 +131,7 @@ String toString(float value, byte decimals)
 
 String toString(WiFiMode_t mode)
 {
-  String result = F("Undefinited");
+  String result = F("Undefined");
   switch (mode)
   {
     case WIFI_OFF:
@@ -165,11 +165,13 @@ String doFormatUserVar(byte TaskIndex, byte rel_index, bool mustCheck, bool& isv
   const byte DeviceIndex = getDeviceIndex(Settings.TaskDeviceNumber[TaskIndex]);
   if (Device[DeviceIndex].ValueCount <= rel_index) {
     isvalid = false;
-    String log = F("No sensor value for TaskIndex: ");
-    log += TaskIndex;
-    log += F(" varnumber: ");
-    log += rel_index;
-    addLog(LOG_LEVEL_ERROR, log);
+    if (loglevelActiveFor(LOG_LEVEL_ERROR)) {
+      String log = F("No sensor value for TaskIndex: ");
+      log += TaskIndex;
+      log += F(" varnumber: ");
+      log += rel_index;
+      addLog(LOG_LEVEL_ERROR, log);
+    }
     return "";
   }
   if (Device[DeviceIndex].VType == SENSOR_TYPE_LONG) {
@@ -178,11 +180,13 @@ String doFormatUserVar(byte TaskIndex, byte rel_index, bool mustCheck, bool& isv
   float f(UserVar[BaseVarIndex + rel_index]);
   if (mustCheck && !isValidFloat(f)) {
     isvalid = false;
-    String log = F("Invalid float value for TaskIndex: ");
-    log += TaskIndex;
-    log += F(" varnumber: ");
-    log += rel_index;
-    addLog(LOG_LEVEL_DEBUG, log);
+    if (loglevelActiveFor(LOG_LEVEL_DEBUG)) {
+      String log = F("Invalid float value for TaskIndex: ");
+      log += TaskIndex;
+      log += F(" varnumber: ");
+      log += rel_index;
+      addLog(LOG_LEVEL_DEBUG, log);
+    }
     f = 0;
   }
   return toString(f, ExtraTaskSettings.TaskDeviceValueDecimals[rel_index]);
@@ -210,13 +214,11 @@ String formatUserVar(struct EventStruct *event, byte rel_index, bool& isvalid)
 /*********************************************************************************************\
    Wrap a string with given pre- and postfix string.
   \*********************************************************************************************/
-String wrap_String(const String& string, const String& wrap) {
-  String result;
-  result.reserve(string.length() + 2* wrap.length());
-  result = wrap;
+
+void wrap_String(const String& string, const String& wrap, String& result) {
+  result += wrap;
   result += string;
   result += wrap;
-  return result;
 }
 
 /*********************************************************************************************\
@@ -225,19 +227,25 @@ String wrap_String(const String& string, const String& wrap) {
 String to_json_object_value(const String& object, const String& value) {
   String result;
   result.reserve(object.length() + value.length() + 6);
-  result = wrap_String(object, F("\""));
+  wrap_String(object, F("\""), result);
   result += F(":");
-  if (value.length() == 0 || !isFloat(value)) {
-    if (value.indexOf('\n') == -1 && value.indexOf('"') == -1 && value.indexOf(F("Pragma")) == -1) {
-      result += wrap_String(value, F("\""));
-    } else {
+  if (value.length() == 0) {
+    // Empty string
+    result += F("\"\"");
+  } else if (!isFloat(value)) {
+    // Is not a numerical value, thus wrap with quotes
+    if (value.indexOf('\n') != -1 || value.indexOf('\r') != -1 || value.indexOf('"') != -1) {
+      // Must replace characters, so make a deepcopy
       String tmpValue(value);
       tmpValue.replace('\n', '^');
+      tmpValue.replace('\r', '^');
       tmpValue.replace('"', '\'');
-      tmpValue.replace(F("Pragma"), F("Bugje!"));
-      result += wrap_String(tmpValue, F("\""));
+      wrap_String(tmpValue, F("\""), result);
+    } else {
+      wrap_String(value, F("\""), result);
     }
   } else {
+    // It is a numerical
     result += value;
   }
   return result;
@@ -280,6 +288,26 @@ String stripQuotes(const String& text) {
   return text;
 }
 
+bool safe_strncpy(char* dest, const String& source, size_t max_size) {
+  return safe_strncpy(dest, source.c_str(), max_size);
+}
+
+bool safe_strncpy(char* dest, const char* source, size_t max_size) {
+  if (max_size < 1) return false;
+  if (dest == NULL) return false;
+  if (source == NULL) return false;
+  bool result = true;
+  memset(dest, 0, max_size);
+  size_t str_length = strlen(source);
+  if (str_length >= max_size) {
+    str_length = max_size;
+    result = false;
+  }
+  strncpy(dest, source, str_length);
+  dest[max_size - 1] = 0;
+  return result;
+}
+
 /*********************************************************************************************\
    Parse a string and get the xth command or parameter in lower case
   \*********************************************************************************************/
@@ -373,8 +401,32 @@ void htmlEscape(String & html)
   html.replace("'",  F("&#039;"));
   html.replace("<",  F("&lt;"));
   html.replace(">",  F("&gt;"));
+  html.replace("/", F("&#047;"));
 }
 
+void htmlStrongEscape(String & html)
+{
+  String escaped;
+  escaped.reserve(html.length());
+  for (unsigned i = 0; i < html.length(); ++i)
+  {
+    if ((html[i] >= 'a' && html[i] <= 'z') || (html[i] >= 'A' && html[i] <= 'Z') || (html[i] >= '0' && html[i] <= '9'))
+    {
+      escaped += html[i];
+    }
+    else
+    {
+      char s [4];
+      sprintf(s, "%03d", static_cast<int>(html[i]));
+      escaped += "&#";
+      escaped += s;
+      escaped += ";";
+    }
+  }
+  html = escaped;
+}
+
+
 /********************************************************************************************\
   replace other system variables like %sysname%, %systime%, %ip%
   \*********************************************************************************************/
@@ -508,6 +560,8 @@ void parseSystemVariables(String& s, boolean useURLencode)
     SMART_REPL(F("%systm_hm_am%"), getTimeString_ampm(':', false))
     SMART_REPL(F("%systime%"), getTimeString(':'))
     SMART_REPL(F("%systime_am%"), getTimeString_ampm(':'))
+    SMART_REPL(F("%sysbuild_date%"), String(CRCValues.compileDate))
+    SMART_REPL(F("%sysbuild_time%"), String(CRCValues.compileTime))
     repl(F("%sysname%"), Settings.Name, s, useURLencode);
 
     // valueString is being used by the macro.
@@ -540,17 +594,34 @@ void parseSystemVariables(String& s, boolean useURLencode)
   SMART_REPL(F("%unixtime%"), String(getUnixTime()))
   SMART_REPL_T(F("%sunset"), replSunSetTimeString)
   SMART_REPL_T(F("%sunrise"), replSunRiseTimeString)
+
+  if (s.indexOf(F("%is")) != -1) {
+    SMART_REPL(F("%ismqtt%"), String(MQTTclient_connected));
+    SMART_REPL(F("%iswifi%"), String(wifiStatus)); //0=disconnected, 1=connected, 2=got ip, 3=services initialized
+    SMART_REPL(F("%isntp%"), String(statusNTPInitialized));
+    #ifdef USES_P037
+    SMART_REPL(F("%ismqttimp%"), String(P037_MQTTImport_connected));
+    #endif // USES_P037
+  }
+  const int v_index = s.indexOf("%v");
+  if (v_index != -1 && isDigit(s[v_index+2])) {
+    for (byte i = 0; i < CUSTOM_VARS_MAX; ++i) {
+      SMART_REPL("%v"+toString(i+1,0)+'%', String(customFloatVar[i]))
+    }
+  }
 }
 
 String getReplacementString(const String& format, String& s) {
   int startpos = s.indexOf(format);
   int endpos = s.indexOf('%', startpos + 1);
   String R = s.substring(startpos, endpos + 1);
-  String log = F("ReplacementString SunTime: ");
-  log += R;
-  log += F(" offset: ");
-  log += getSecOffset(R);
-  addLog(LOG_LEVEL_DEBUG, log);
+  if (loglevelActiveFor(LOG_LEVEL_DEBUG)) {
+    String log = F("ReplacementString SunTime: ");
+    log += R;
+    log += F(" offset: ");
+    log += getSecOffset(R);
+    addLog(LOG_LEVEL_DEBUG, log);
+  }
   return R;
 }
 

src/TimeESPeasy.ino

@@ -147,20 +147,6 @@ void breakTime(unsigned long timeInput, struct timeStruct &tm) {
   tm.Day = time + 1;     // day of month
 }
 
-void setTime(unsigned long t) {
-  sysTime = (uint32_t)t;
-  applyTimeZone(t);
-  nextSyncTime = (uint32_t)t + syncInterval;
-  prevMillis = millis();  // restart counting from now (thanks to Korman for this fix)
-  if (Settings.UseRules)
-  {
-    static bool firstUpdate = true;
-    String event = firstUpdate ? F("Time#Initialized") : F("Time#Set");
-    firstUpdate = false;
-    rulesProcessing(event);
-  }
-}
-
 uint32_t getUnixTime() {
   return sysTime;
 }
@@ -222,13 +208,22 @@ unsigned long now() {
     unsigned long  t = getNtpTime();
     if (t != 0) {
       timeSynced = true;
-      setTime(t);
+			sysTime = (uint32_t)t;
+			applyTimeZone(t);
+			nextSyncTime = (uint32_t)t + syncInterval;
+			prevMillis = millis();  // restart counting from now (thanks to Korman for this fix)
     }
   }
   uint32_t localSystime = toLocal(sysTime);
   breakTime(localSystime, tm);
   if (timeSynced) {
     calcSunRiseAndSet();
+		if (Settings.UseRules)
+		{
+      String event = statusNTPInitialized ? F("Time#Set") : F("Time#Initialized");
+      rulesProcessing(event);
+		}
+    statusNTPInitialized = true; //@giig1967g: setting system variable %isntp%
   }
   return (unsigned long)localSystime;
 }

src/WebStaticData.h

@@ -237,7 +237,7 @@ static const char pgDefaultCSS[] PROGMEM = {
       "table.multirow tr:nth-child(even){background-color: #DEE6FF; }"
     "table.multirow {color: #000; width: 100%; min-width: 420px; border-collapse: collapse; }"
     // Highlight row
-    "tr.highlight td { background-color: #dbff0075; }"    
+    "tr.highlight td { background-color: #dbff0075; }"
     // inside a form
     ".note {color: #444; font-style: italic; }"
     //header with title and menu
@@ -415,8 +415,12 @@ static const char jsUpdateSensorValuesDevicePage[] PROGMEM = {
                                     "tempValue = data.Sensors[c].TaskValues[k].Value;"
                                     "decimalsValue = data.Sensors[c].TaskValues[k].NrDecimals;"
                                     "tempValue = parseFloat(tempValue).toFixed(decimalsValue);"
-                                    "document.getElementById('value_' + (data.Sensors[c].TaskNumber - 1) + '_' + (data.Sensors[c].TaskValues[k].ValueNumber - 1)).innerHTML = tempValue;"
-                                    "document.getElementById('valuename_' + (data.Sensors[c].TaskNumber - 1) + '_' + (data.Sensors[c].TaskValues[k].ValueNumber - 1)).innerHTML = data.Sensors[c].TaskValues[k].Name + ':';"
+                                    "var valueID = 'value_' + (data.Sensors[c].TaskNumber - 1) + '_' + (data.Sensors[c].TaskValues[k].ValueNumber - 1);"
+                                    "var valueNameID = 'valuename_' + (data.Sensors[c].TaskNumber - 1) + '_' + (data.Sensors[c].TaskValues[k].ValueNumber - 1);"
+                                    "var valueElement = document.getElementById(valueID);"
+                                    "var valueNameElement = document.getElementById(valueNameID);"
+                                    "if (valueElement !== null) { valueElement.innerHTML = tempValue; }"
+                                    "if (valueNameElement !== null) { valueNameElement.innerHTML = data.Sensors[c].TaskValues[k].Name + ':'; }"
                                 "}"
                             "}"
                         "}"

src/_C001.ino

@@ -33,7 +33,7 @@ boolean CPlugin_001(byte function, struct EventStruct *event, String& string)
 
     case CPLUGIN_INIT:
       {
-        ControllerSettingsStruct ControllerSettings;
+        MakeControllerSettings(ControllerSettings);
         LoadControllerSettings(event->ControllerIndex, ControllerSettings);
         C001_DelayHandler.configureControllerSettings(ControllerSettings);
         break;
@@ -118,7 +118,7 @@ bool do_process_c001_delay_queue(int controller_number, const C001_queue_element
   String request = create_http_request_auth(controller_number, element.controller_idx, ControllerSettings, F("GET"), element.txt);
 
   addLog(LOG_LEVEL_DEBUG, element.txt);
-  return send_via_http(controller_number, client, request);
+  return send_via_http(controller_number, client, request, ControllerSettings.MustCheckReply);
 }
 
 #endif

src/_C002.ino

@@ -35,7 +35,7 @@ boolean CPlugin_002(byte function, struct EventStruct *event, String& string)
 
     case CPLUGIN_INIT:
       {
-        ControllerSettingsStruct ControllerSettings;
+        MakeControllerSettings(ControllerSettings);
         LoadControllerSettings(event->ControllerIndex, ControllerSettings);
         MQTTDelayHandler.configureControllerSettings(ControllerSettings);
         break;
@@ -145,7 +145,7 @@ boolean CPlugin_002(byte function, struct EventStruct *event, String& string)
       {
         if (event->idx != 0)
         {
-          ControllerSettingsStruct ControllerSettings;
+          MakeControllerSettings(ControllerSettings);
           LoadControllerSettings(event->ControllerIndex, ControllerSettings);
 /*
           if (!ControllerSettings.checkHostReachable(true)) {

src/_C003.ino

@@ -32,7 +32,7 @@ boolean CPlugin_003(byte function, struct EventStruct *event, String& string)
 
     case CPLUGIN_INIT:
       {
-        ControllerSettingsStruct ControllerSettings;
+        MakeControllerSettings(ControllerSettings);
         LoadControllerSettings(event->ControllerIndex, ControllerSettings);
         C003_DelayHandler.configureControllerSettings(ControllerSettings);
         break;
@@ -78,7 +78,7 @@ bool do_process_c003_delay_queue(int controller_number, const C003_queue_element
   client.print(" \n");
 
   unsigned long timer = millis() + 200;
-  while (!client.available() && !timeOutReached(timer))
+  while (!client_available(client) && !timeOutReached(timer))
     delay(1);
 
   timer = millis() + 1000;
@@ -102,7 +102,7 @@ bool do_process_c003_delay_queue(int controller_number, const C003_queue_element
   addLog(LOG_LEVEL_DEBUG, log);
   client.println(SecuritySettings.ControllerPassword[element.controller_idx]);
   delay(100);
-  while (client.available())
+  while (client_available(client))
     client.read();
 
   strcpy_P(log, PSTR("TELNT: Sending cmd"));

src/_C004.ino

@@ -32,7 +32,7 @@ boolean CPlugin_004(byte function, struct EventStruct *event, String& string)
 
     case CPLUGIN_INIT:
       {
-        ControllerSettingsStruct ControllerSettings;
+        MakeControllerSettings(ControllerSettings);
         LoadControllerSettings(event->ControllerIndex, ControllerSettings);
         C004_DelayHandler.configureControllerSettings(ControllerSettings);
         break;
@@ -94,6 +94,6 @@ bool do_process_c004_delay_queue(int controller_number, const C004_queue_element
     postDataStr.length());
   postStr += postDataStr;
 
-  return send_via_http(controller_number, client, postStr);
+  return send_via_http(controller_number, client, postStr, ControllerSettings.MustCheckReply);
 }
 #endif

src/_C005.ino

@@ -33,7 +33,7 @@ boolean CPlugin_005(byte function, struct EventStruct *event, String& string)
 
     case CPLUGIN_INIT:
       {
-        ControllerSettingsStruct ControllerSettings;
+        MakeControllerSettings(ControllerSettings);
         LoadControllerSettings(event->ControllerIndex, ControllerSettings);
         MQTTDelayHandler.configureControllerSettings(ControllerSettings);
         break;
@@ -92,7 +92,7 @@ boolean CPlugin_005(byte function, struct EventStruct *event, String& string)
 
     case CPLUGIN_PROTOCOL_SEND:
       {
-        ControllerSettingsStruct ControllerSettings;
+        MakeControllerSettings(ControllerSettings);
         LoadControllerSettings(event->ControllerIndex, ControllerSettings);
         if (!ControllerSettings.checkHostReachable(true)) {
             success = false;
@@ -100,7 +100,7 @@ boolean CPlugin_005(byte function, struct EventStruct *event, String& string)
         }
         statusLED(true);
 
-        if (ExtraTaskSettings.TaskDeviceValueNames[0][0] == 0)
+        if (ExtraTaskSettings.TaskIndex != event->TaskIndex)
           PluginCall(PLUGIN_GET_DEVICEVALUENAMES, event, dummyString);
 
         String pubname = ControllerSettings.Publish;

src/_C006.ino

@@ -33,7 +33,7 @@ boolean CPlugin_006(byte function, struct EventStruct *event, String& string)
 
     case CPLUGIN_INIT:
       {
-        ControllerSettingsStruct ControllerSettings;
+        MakeControllerSettings(ControllerSettings);
         LoadControllerSettings(event->ControllerIndex, ControllerSettings);
         MQTTDelayHandler.configureControllerSettings(ControllerSettings);
         break;
@@ -90,12 +90,12 @@ boolean CPlugin_006(byte function, struct EventStruct *event, String& string)
           success = false;
           break;
         }
-        ControllerSettingsStruct ControllerSettings;
+        MakeControllerSettings(ControllerSettings);
         LoadControllerSettings(event->ControllerIndex, ControllerSettings);
 
         statusLED(true);
 
-        if (ExtraTaskSettings.TaskDeviceValueNames[0][0] == 0)
+        if (ExtraTaskSettings.TaskIndex != event->TaskIndex)
           PluginCall(PLUGIN_GET_DEVICEVALUENAMES, event, dummyString);
 
         String pubname = ControllerSettings.Publish;

src/_C007.ino

@@ -32,7 +32,7 @@ boolean CPlugin_007(byte function, struct EventStruct *event, String& string)
 
     case CPLUGIN_INIT:
       {
-        ControllerSettingsStruct ControllerSettings;
+        MakeControllerSettings(ControllerSettings);
         LoadControllerSettings(event->ControllerIndex, ControllerSettings);
         C007_DelayHandler.configureControllerSettings(ControllerSettings);
         break;
@@ -78,6 +78,7 @@ bool do_process_c007_delay_queue(int controller_number, const C007_queue_element
     Serial.println(url);
 
   return send_via_http(controller_number, client,
-    create_http_get_request(controller_number, ControllerSettings, url));
+    create_http_get_request(controller_number, ControllerSettings, url),
+    ControllerSettings.MustCheckReply);
 }
 #endif

src/_C008.ino

@@ -34,7 +34,7 @@ boolean CPlugin_008(byte function, struct EventStruct *event, String& string)
 
     case CPLUGIN_INIT:
       {
-        ControllerSettingsStruct ControllerSettings;
+        MakeControllerSettings(ControllerSettings);
         LoadControllerSettings(event->ControllerIndex, ControllerSettings);
         C008_DelayHandler.configureControllerSettings(ControllerSettings);
         break;
@@ -52,10 +52,10 @@ boolean CPlugin_008(byte function, struct EventStruct *event, String& string)
         // Collect the values at the same run, to make sure all are from the same sample
         byte valueCount = getValueCountFromSensorType(event->sensorType);
         C008_queue_element element(event, valueCount);
-        if (ExtraTaskSettings.TaskDeviceValueNames[0][0] == 0)
+        if (ExtraTaskSettings.TaskIndex != event->TaskIndex)
           PluginCall(PLUGIN_GET_DEVICEVALUENAMES, event, dummyString);
 
-        ControllerSettingsStruct ControllerSettings;
+        MakeControllerSettings(ControllerSettings);
         LoadControllerSettings(event->ControllerIndex, ControllerSettings);
 
         for (byte x = 0; x < valueCount; x++)
@@ -97,7 +97,7 @@ bool do_process_c008_delay_queue(int controller_number, const C008_queue_element
     return false;
 
   String request = create_http_request_auth(controller_number, element.controller_idx, ControllerSettings, F("GET"), element.txt[element.valuesSent]);
-  return element.checkDone(send_via_http(controller_number, client, request));
+  return element.checkDone(send_via_http(controller_number, client, request, ControllerSettings.MustCheckReply));
 }
 
 #endif

src/_C009.ino

@@ -57,60 +57,17 @@ boolean CPlugin_009(byte function, struct EventStruct *event, String& string)
 
     case CPLUGIN_PROTOCOL_SEND:
       {
-        if (!WiFiConnected(100)) {
-          success = false;
-          break;
-        }
-        if (ExtraTaskSettings.TaskDeviceValueNames[0][0] == 0)
-          PluginCall(PLUGIN_GET_DEVICEVALUENAMES, event, dummyString);
-
-        // We now create a URI for the request
-        String url = F("/ESPEasy");
-
-        // Create json root object
-        DynamicJsonBuffer jsonBuffer;
-        JsonObject& root = jsonBuffer.createObject();
-        root[F("module")] = String(F("ESPEasy"));
-        root[F("version")] = String(F("1.04"));
-
-        // Create nested objects
-        JsonObject& data = root.createNestedObject(String(F("data")));
-        JsonObject& ESP = data.createNestedObject(String(F("ESP")));
-        ESP[F("name")] = Settings.Name;
-        ESP[F("unit")] = Settings.Unit;
-        ESP[F("version")] = Settings.Version;
-        ESP[F("build")] = Settings.Build;
-        ESP[F("build_notes")] = String(F(BUILD_NOTES));
-        ESP[F("build_git")] = String(F(BUILD_GIT));
-        ESP[F("node_type_id")] = NODE_TYPE_ID;
-        ESP[F("sleep")] = Settings.deepSleep;
-
-        // embed IP, important if there is NAT/PAT
-        // char ipStr[20];
-        // IPAddress ip = WiFi.localIP();
-        // sprintf_P(ipStr, PSTR("%u.%u.%u.%u"), ip[0], ip[1], ip[2], ip[3]);
-        ESP[F("ip")] = WiFi.localIP().toString();
-
-        // Create nested SENSOR json object
-        JsonObject& SENSOR = data.createNestedObject(String(F("SENSOR")));
         byte valueCount = getValueCountFromSensorType(event->sensorType);
-        // char itemNames[valueCount][2];
+        C009_queue_element element(event);
+
+        MakeControllerSettings(ControllerSettings);
+        LoadControllerSettings(event->ControllerIndex, ControllerSettings);
+
         for (byte x = 0; x < valueCount; x++)
         {
-          // Each sensor value get an own object (0..n)
-          // sprintf(itemNames[x],"%d",x);
-          JsonObject& val = SENSOR.createNestedObject(String(x));
-          val[F("deviceName")] = getTaskDeviceName(event->TaskIndex);
-          val[F("valueName")]  = ExtraTaskSettings.TaskDeviceValueNames[x];
-          val[F("type")]       = event->sensorType;
-          val[F("value")]      = formatUserVarNoCheck(event, x);
+          element.txt[x] = formatUserVarNoCheck(event, x);
         }
-
-        // Create json buffer
-        String jsonString;
-        root.printTo(jsonString);
-
-        success = C009_DelayHandler.addToQueue(C009_queue_element(event->ControllerIndex, url, jsonString));
+        success = C009_DelayHandler.addToQueue(element);
         scheduleNextDelayQueue(TIMER_C009_DELAY_QUEUE, C009_DelayHandler.getNextScheduleTime());
         break;
       }
@@ -126,11 +83,58 @@ bool do_process_c009_delay_queue(int controller_number, const C009_queue_element
   if (!try_connect_host(controller_number, client, ControllerSettings))
     return false;
 
+  LoadTaskSettings(element.TaskIndex);
+  String jsonString;
+  {
+    // Create json root object
+    DynamicJsonBuffer jsonBuffer;
+    JsonObject& root = jsonBuffer.createObject();
+    root[F("module")] = String(F("ESPEasy"));
+    root[F("version")] = String(F("1.04"));
+
+    // Create nested objects
+    JsonObject& data = root.createNestedObject(String(F("data")));
+    JsonObject& ESP = data.createNestedObject(String(F("ESP")));
+    ESP[F("name")] = Settings.Name;
+    ESP[F("unit")] = Settings.Unit;
+    ESP[F("version")] = Settings.Version;
+    ESP[F("build")] = Settings.Build;
+    ESP[F("build_notes")] = String(F(BUILD_NOTES));
+    ESP[F("build_git")] = String(F(BUILD_GIT));
+    ESP[F("node_type_id")] = NODE_TYPE_ID;
+    ESP[F("sleep")] = Settings.deepSleep;
+
+    // embed IP, important if there is NAT/PAT
+    // char ipStr[20];
+    // IPAddress ip = WiFi.localIP();
+    // sprintf_P(ipStr, PSTR("%u.%u.%u.%u"), ip[0], ip[1], ip[2], ip[3]);
+    ESP[F("ip")] = WiFi.localIP().toString();
+
+    // Create nested SENSOR json object
+    JsonObject& SENSOR = data.createNestedObject(String(F("SENSOR")));
+    byte valueCount = getValueCountFromSensorType(element.sensorType);
+    // char itemNames[valueCount][2];
+    for (byte x = 0; x < valueCount; x++)
+    {
+      // Each sensor value get an own object (0..n)
+      // sprintf(itemNames[x],"%d",x);
+      JsonObject& val = SENSOR.createNestedObject(String(x));
+      val[F("deviceName")] = getTaskDeviceName(element.TaskIndex);
+      val[F("valueName")]  = ExtraTaskSettings.TaskDeviceValueNames[x];
+      val[F("type")]       = element.sensorType;
+      val[F("value")]      = element.txt[x];
+    }
+
+    // Create json buffer
+    root.printTo(jsonString);
+  }
+
+  // We now create a URI for the request
   String request = create_http_request_auth(
       controller_number, element.controller_idx, ControllerSettings,
-      F("POST"), element.url, element.json.length());
-  request += element.json;
+      F("POST"), F("/ESPEasy"), jsonString.length());
+  request += jsonString;
 
-  return send_via_http(controller_number, client, request);
+  return send_via_http(controller_number, client, request, ControllerSettings.MustCheckReply);
 }
 #endif

src/_C010.ino

@@ -42,10 +42,10 @@ boolean CPlugin_010(byte function, struct EventStruct *event, String& string)
       {
         byte valueCount = getValueCountFromSensorType(event->sensorType);
         C010_queue_element element(event, valueCount);
-        if (ExtraTaskSettings.TaskDeviceValueNames[0][0] == 0)
+        if (ExtraTaskSettings.TaskIndex != event->TaskIndex)
           PluginCall(PLUGIN_GET_DEVICEVALUENAMES, event, dummyString);
 
-        ControllerSettingsStruct ControllerSettings;
+        MakeControllerSettings(ControllerSettings);
         LoadControllerSettings(event->ControllerIndex, ControllerSettings);
 
         for (byte x = 0; x < valueCount; x++)
@@ -85,13 +85,18 @@ bool do_process_c010_delay_queue(int controller_number, const C010_queue_element
     if (element.checkDone(true))
       return true;
   }
-
-  if (!try_connect_host(controller_number, portUDP, ControllerSettings))
+  WiFiUDP C010_portUDP;
+  if (!beginWiFiUDP_randomPort(C010_portUDP)) return false;
+  if (!try_connect_host(controller_number, C010_portUDP, ControllerSettings))
     return false;
 
-  portUDP.write(
+  C010_portUDP.write(
     (uint8_t*)element.txt[element.valuesSent].c_str(),
               element.txt[element.valuesSent].length());
-  return element.checkDone(portUDP.endPacket() != 0);
+  bool reply = C010_portUDP.endPacket();
+  C010_portUDP.stop();
+  if (ControllerSettings.MustCheckReply)
+    return element.checkDone(reply);
+  return element.checkDone(true);
 }
 #endif

src/_C011.ino

@@ -133,7 +133,7 @@ bool do_process_c011_delay_queue(int controller_number, const C011_queue_element
   if (!try_connect_host(controller_number, client, ControllerSettings))
     return false;
 
-  return send_via_http(controller_number, client, element.txt);
+  return send_via_http(controller_number, client, element.txt, ControllerSettings.MustCheckReply);
 }
 
 
@@ -147,7 +147,7 @@ boolean Create_schedule_HTTP_C011(struct EventStruct *event)
   if (!WiFiConnected(100)) {
     return false;
   }
-  ControllerSettingsStruct ControllerSettings;
+  MakeControllerSettings(ControllerSettings);
   LoadControllerSettings(event->ControllerIndex, ControllerSettings);
 
   C011_ConfigStruct customConfig;
@@ -158,7 +158,7 @@ boolean Create_schedule_HTTP_C011(struct EventStruct *event)
   if (!try_connect_host(controller_number, client, ControllerSettings))
     return false;
 
-  if (ExtraTaskSettings.TaskDeviceValueNames[0][0] == 0)
+  if (ExtraTaskSettings.TaskIndex != event->TaskIndex)
     PluginCall(PLUGIN_GET_DEVICEVALUENAMES, event, dummyString);
 
   String payload = create_http_request_auth(

src/_C012.ino

@@ -37,10 +37,10 @@ boolean CPlugin_012(byte function, struct EventStruct *event, String& string)
         // Collect the values at the same run, to make sure all are from the same sample
         byte valueCount = getValueCountFromSensorType(event->sensorType);
         C012_queue_element element(event, valueCount);
-        if (ExtraTaskSettings.TaskDeviceValueNames[0][0] == 0)
+        if (ExtraTaskSettings.TaskIndex != event->TaskIndex)
           PluginCall(PLUGIN_GET_DEVICEVALUENAMES, event, dummyString);
 
-        ControllerSettingsStruct ControllerSettings;
+        MakeControllerSettings(ControllerSettings);
         LoadControllerSettings(event->ControllerIndex, ControllerSettings);
 
         for (byte x = 0; x < valueCount; x++)
@@ -73,16 +73,15 @@ bool do_process_c012_delay_queue(int controller_number, const C012_queue_element
     if (element.checkDone(true))
       return true;
   }
+  if (wifiStatus != ESPEASY_WIFI_SERVICES_INITIALIZED) {
+    return false;
+  }
   return element.checkDone(Blynk_get(element.txt[element.valuesSent], element.controller_idx));
 }
 
 boolean Blynk_get(const String& command, byte controllerIndex, float *data )
 {
-  if (wifiStatus != ESPEASY_WIFI_SERVICES_INITIALIZED) {
-    return false;
-  }
-
-  ControllerSettingsStruct ControllerSettings;
+  MakeControllerSettings(ControllerSettings);
   LoadControllerSettings(controllerIndex, ControllerSettings);
 
   if ((SecuritySettings.ControllerPassword[controllerIndex][0] == 0)) {
@@ -104,58 +103,58 @@ boolean Blynk_get(const String& command, byte controllerIndex, float *data )
             ControllerSettings.getHost().c_str());
   addLog(LOG_LEVEL_DEBUG, request);
   client.print(request);
+  boolean success = !ControllerSettings.MustCheckReply;
+  if (ControllerSettings.MustCheckReply || data) {
+    unsigned long timer = millis() + 200;
+    while (!client_available(client) && !timeOutReached(timer))
+      delay(1);
 
-  unsigned long timer = millis() + 200;
-  while (!client.available() && !timeOutReached(timer))
-    yield();
+    char log[80] = {0};
 
-  boolean success = false;
-  char log[80] = {0};
-
-  // Read all the lines of the reply from server and log them
-  while (client_available(client)) {
-    String line;
-    safeReadStringUntil(client, line, '\n');
-    addLog(LOG_LEVEL_DEBUG_MORE, line);
-    // success ?
-    if (line.substring(0, 15) == F("HTTP/1.1 200 OK")) {
-      strcpy_P(log, PSTR("HTTP : Success"));
-      success = true;
-    }
-    else if (line.substring(0, 24) == F("HTTP/1.1 400 Bad Request")) {
-      strcpy_P(log, PSTR("HTTP : Unauthorized"));
-    }
-    else if (line.substring(0, 25) == F("HTTP/1.1 401 Unauthorized")) {
-      strcpy_P(log, PSTR("HTTP : Unauthorized"));
-    }
-    addLog(LOG_LEVEL_DEBUG, log);
-
-    // data only
-    if (data && line.startsWith("["))
-    {
-      String strValue = line;
-      byte pos = strValue.indexOf('"',2);
-      strValue = strValue.substring(2, pos);
-      strValue.trim();
-      float value = strValue.toFloat();
-      *data = value;
-      success = true;
-
-      char value_char[5] = {0};
-      strValue.toCharArray(value_char, 5);
-      sprintf_P(log, PSTR("Blynk get - %s => %s"),command.c_str(), value_char   );
+    // Read all the lines of the reply from server and log them
+    while (client_available(client)) {
+      String line;
+      safeReadStringUntil(client, line, '\n');
+      addLog(LOG_LEVEL_DEBUG_MORE, line);
+      // success ?
+      if (line.substring(0, 15) == F("HTTP/1.1 200 OK")) {
+        strcpy_P(log, PSTR("HTTP : Success"));
+        success = true;
+      }
+      else if (line.substring(0, 24) == F("HTTP/1.1 400 Bad Request")) {
+        strcpy_P(log, PSTR("HTTP : Unauthorized"));
+      }
+      else if (line.substring(0, 25) == F("HTTP/1.1 401 Unauthorized")) {
+        strcpy_P(log, PSTR("HTTP : Unauthorized"));
+      }
       addLog(LOG_LEVEL_DEBUG, log);
+
+      // data only
+      if (data && line.startsWith("["))
+      {
+        String strValue = line;
+        byte pos = strValue.indexOf('"',2);
+        strValue = strValue.substring(2, pos);
+        strValue.trim();
+        float value = strValue.toFloat();
+        *data = value;
+        success = true;
+
+        char value_char[5] = {0};
+        strValue.toCharArray(value_char, 5);
+        sprintf_P(log, PSTR("Blynk get - %s => %s"),command.c_str(), value_char   );
+        addLog(LOG_LEVEL_DEBUG, log);
+      }
+      delay(0);
     }
-    yield();
   }
-  strcpy_P(log, PSTR("HTTP : closing connection (012)"));
-  addLog(LOG_LEVEL_DEBUG, log);
+  addLog(LOG_LEVEL_DEBUG, F("HTTP : closing connection (012)"));
 
   client.flush();
   client.stop();
 
   // important - backgroundtasks - free mem
-  timer = millis() + Settings.MessageDelay;
+  unsigned long timer = millis() + Settings.MessageDelay;
   while (!timeOutReached(timer))
               backgroundtasks();
 

src/_CPlugin_Helper.h

@@ -126,10 +126,10 @@ public:
     return total;
   }
 
+  String txt[VARS_PER_TASK];
   int controller_idx;
   byte TaskIndex;
   int idx;
-  String txt[VARS_PER_TASK];
   mutable byte valuesSent;  // Value must be set by const function checkDone()
   byte valueCount;
 };
@@ -146,19 +146,29 @@ public:
 \*********************************************************************************************/
 class C009_queue_element {
 public:
-  C009_queue_element() : controller_idx(0) {}
-  C009_queue_element(int ctrl_idx, const String& URI, const String& JSON) :
-     controller_idx(ctrl_idx), url(URI), json(JSON) {}
+  C009_queue_element() : controller_idx(0), TaskIndex(0), idx(0), sensorType(0) {}
+  C009_queue_element(const struct EventStruct* event) :
+    controller_idx(event->ControllerIndex),
+    TaskIndex(event->TaskIndex),
+    idx(event->idx),
+    sensorType(event->sensorType) {}
 
   size_t getSize() const {
-    return sizeof(this) + url.length() + json.length();
+    size_t total = sizeof(this);
+    for (int i = 0; i < VARS_PER_TASK; ++i) {
+      total += txt[i].length();
+    }
+    return total;
   }
 
+  String txt[VARS_PER_TASK];
   int controller_idx;
-  String url;
-  String json;
+  byte TaskIndex;
+  int idx;
+  byte sensorType;
 };
 
+
 /*********************************************************************************************\
  * C010_queue_element for queueing requests for 010: Generic UDP
  * Using queue_element_single_value_base
@@ -189,13 +199,15 @@ struct ControllerDelayHandlerStruct {
       max_queue_depth(CONTROLLER_DELAY_QUEUE_DEPTH_DFLT),
       attempt(0),
       max_retries(CONTROLLER_DELAY_QUEUE_RETRY_DFLT),
-      delete_oldest(false) {}
+      delete_oldest(false),
+      must_check_reply(false) {}
 
   void configureControllerSettings(const ControllerSettingsStruct& settings) {
     minTimeBetweenMessages = settings.MinimalTimeBetweenMessages;
     max_queue_depth = settings.MaxQueueDepth;
     max_retries = settings.MaxRetry;
     delete_oldest = settings.DeleteOldest;
+    must_check_reply = settings.MustCheckReply;
     // Set some sound limits when not configured
     if (max_queue_depth == 0) max_queue_depth = CONTROLLER_DELAY_QUEUE_DEPTH_DFLT;
     if (max_retries == 0) max_retries = CONTROLLER_DELAY_QUEUE_RETRY_DFLT;
@@ -251,15 +263,14 @@ struct ControllerDelayHandlerStruct {
 
   // Get the next element.
   // Remove front element when max_retries is reached.
-  bool getNext(T& element) {
-    if (sendQueue.empty()) return false;
+  T* getNext() {
+    if (sendQueue.empty()) return NULL;
     if (attempt > max_retries) {
       sendQueue.pop_front();
       attempt = 0;
-      if (sendQueue.empty()) return false;
+      if (sendQueue.empty()) return NULL;
     }
-    element = sendQueue.front();
-    return true;
+    return &sendQueue.front();
   }
 
   // Mark as processed and return time to schedule for next process.
@@ -302,6 +313,7 @@ struct ControllerDelayHandlerStruct {
   byte attempt;
   byte max_retries;
   bool delete_oldest;
+  bool must_check_reply;
 };
 
 ControllerDelayHandlerStruct<MQTT_queue_element> MQTTDelayHandler;
@@ -321,17 +333,17 @@ ControllerDelayHandlerStruct<MQTT_queue_element> MQTTDelayHandler;
                 ControllerDelayHandlerStruct<C##NNN##_queue_element> C##NNN##_DelayHandler; \
                 bool do_process_c##NNN##_delay_queue(int controller_number, const C##NNN##_queue_element& element, ControllerSettingsStruct& ControllerSettings); \
                 void process_c##NNN##_delay_queue() { \
-                  C##NNN##_queue_element element; \
-                  if (!C##NNN##_DelayHandler.getNext(element)) return; \
-                  ControllerSettingsStruct ControllerSettings; \
-                  LoadControllerSettings(element.controller_idx, ControllerSettings); \
+                  C##NNN##_queue_element* element(C##NNN##_DelayHandler.getNext()); \
+                  if (element == NULL) return; \
+                  MakeControllerSettings(ControllerSettings); \
+                  LoadControllerSettings(element->controller_idx, ControllerSettings); \
                   C##NNN##_DelayHandler.configureControllerSettings(ControllerSettings); \
                   if (!WiFiConnected(100)) { \
                     scheduleNextDelayQueue(TIMER_C##NNN##_DELAY_QUEUE, C##NNN##_DelayHandler.getNextScheduleTime()); \
                     return; \
                   } \
                   START_TIMER; \
-                  C##NNN##_DelayHandler.markProcessed(do_process_c##NNN##_delay_queue(M, element, ControllerSettings)); \
+                  C##NNN##_DelayHandler.markProcessed(do_process_c##NNN##_delay_queue(M, *element, ControllerSettings)); \
                   STOP_TIMER(C##NNN##_DELAY_QUEUE); \
                   scheduleNextDelayQueue(TIMER_C##NNN##_DELAY_QUEUE, C##NNN##_DelayHandler.getNextScheduleTime()); \
                 }
@@ -382,33 +394,37 @@ bool safeReadStringUntil(Stream &input, String &str, char terminator, unsigned i
 	int c;
   const unsigned long start = millis();
 	const unsigned long timer = start + timeout;
-  unsigned long backgroundtasks_timer = start + 100;
+  unsigned long backgroundtasks_timer = start + 10;
 	str = "";
 
 	do {
 		//read character
-		c = input.read();
-		if (c >= 0) {
-			//found terminator, we're ok
-			if (c == terminator) {
-				return(true);
-			}
-			//found character, add to string
-			else{
-				str += char(c);
-				//string at max size?
-				if (str.length() >= maxSize) {
-					addLog(LOG_LEVEL_ERROR, F("Not enough bufferspace to read all input data!"));
-					return(false);
-				}
-			}
-		}
-    // We must run the backgroundtasks every now and then.
-    if (timeOutReached(backgroundtasks_timer)) {
-      backgroundtasks_timer += 100;
-      backgroundtasks();
+    if (input.available()) {
+  		c = input.read();
+  		if (c >= 0) {
+  			//found terminator, we're ok
+  			if (c == terminator) {
+  				return(true);
+  			}
+  			//found character, add to string
+  			else{
+  				str += char(c);
+  				//string at max size?
+  				if (str.length() >= maxSize) {
+  					addLog(LOG_LEVEL_ERROR, F("Not enough bufferspace to read all input data!"));
+  					return(false);
+  				}
+  			}
+  		}
+      // We must run the backgroundtasks every now and then.
+      if (timeOutReached(backgroundtasks_timer)) {
+        backgroundtasks_timer += 10;
+        backgroundtasks();
+      } else {
+        delay(0);
+      }
     } else {
-      yield();
+      delay(0);
     }
 	} while (!timeOutReached(timer));
 
@@ -584,6 +600,7 @@ bool count_connection_results(bool success, const String& prefix, int controller
 }
 
 bool try_connect_host(int controller_number, WiFiUDP& client, ControllerSettingsStruct& ControllerSettings) {
+  client.setTimeout(ControllerSettings.ClientTimeout);
   log_connecting_to(F("UDP  : "), controller_number, ControllerSettings);
   bool success = ControllerSettings.beginPacket(client) != 0;
   return count_connection_results(
@@ -593,6 +610,7 @@ bool try_connect_host(int controller_number, WiFiUDP& client, ControllerSettings
 
 bool try_connect_host(int controller_number, WiFiClient& client, ControllerSettingsStruct& ControllerSettings) {
   // Use WiFiClient class to create TCP connections
+  client.setTimeout(ControllerSettings.ClientTimeout);
   log_connecting_to(F("HTTP : "), controller_number, ControllerSettings);
   bool success = ControllerSettings.connectToHost(client);
   return count_connection_results(
@@ -604,52 +622,57 @@ bool try_connect_host(int controller_number, WiFiClient& client, ControllerSetti
 // See: https://github.com/esp8266/Arduino/pull/5113
 //      https://github.com/esp8266/Arduino/pull/1829
 bool client_available(WiFiClient& client) {
+  delay(0);
   return client.available() || client.connected();
 }
 
-bool send_via_http(const String& logIdentifier, WiFiClient& client, const String& postStr) {
-  bool success = false;
+bool send_via_http(const String& logIdentifier, WiFiClient& client, const String& postStr, bool must_check_reply) {
+  bool success = !must_check_reply;
   // This will send the request to the server
   client.print(postStr);
 
-  unsigned long timer = millis() + 200;
-  while (!client.available() && !timeOutReached(timer))
-    delay(1);
-
-  // Read all the lines of the reply from server and print them to Serial
-  while (client_available(client) && !success) {
-    //   String line = client.readStringUntil('\n');
-    String line;
-    safeReadStringUntil(client, line, '\n');
-
-    if (loglevelActiveFor(LOG_LEVEL_DEBUG_MORE)) {
-      if (line.length() > 80) {
-        addLog(LOG_LEVEL_DEBUG_MORE, line.substring(0, 80));
-      } else {
-        addLog(LOG_LEVEL_DEBUG_MORE, line);
-      }
+  if (must_check_reply) {
+    unsigned long timer = millis() + 200;
+    while (!client_available(client)) {
+      if (timeOutReached(timer)) return false;
+      delay(1);
     }
-    if (line.startsWith(F("HTTP/1.1 2")))
-    {
-      success = true;
-      if (loglevelActiveFor(LOG_LEVEL_DEBUG)) {
-        String log = F("HTTP : ");
-        log += logIdentifier;
-        log += F(" Success! ");
-        log += line;
-        addLog(LOG_LEVEL_DEBUG, log);
+
+    // Read all the lines of the reply from server and print them to Serial
+    while (client_available(client) && !success) {
+      //   String line = client.readStringUntil('\n');
+      String line;
+      safeReadStringUntil(client, line, '\n');
+
+      if (loglevelActiveFor(LOG_LEVEL_DEBUG_MORE)) {
+        if (line.length() > 80) {
+          addLog(LOG_LEVEL_DEBUG_MORE, line.substring(0, 80));
+        } else {
+          addLog(LOG_LEVEL_DEBUG_MORE, line);
+        }
       }
-    } else if (line.startsWith(F("HTTP/1.1 4"))) {
-      if (loglevelActiveFor(LOG_LEVEL_ERROR)) {
-        String log = F("HTTP : ");
-        log += logIdentifier;
-        log += F(" Error: ");
-        log += line;
-        addLog(LOG_LEVEL_ERROR, log);
+      if (line.startsWith(F("HTTP/1.1 2")))
+      {
+        success = true;
+        if (loglevelActiveFor(LOG_LEVEL_DEBUG)) {
+          String log = F("HTTP : ");
+          log += logIdentifier;
+          log += F(" Success! ");
+          log += line;
+          addLog(LOG_LEVEL_DEBUG, log);
+        }
+      } else if (line.startsWith(F("HTTP/1.1 4"))) {
+        if (loglevelActiveFor(LOG_LEVEL_ERROR)) {
+          String log = F("HTTP : ");
+          log += logIdentifier;
+          log += F(" Error: ");
+          log += line;
+          addLog(LOG_LEVEL_ERROR, log);
+        }
+        addLog(LOG_LEVEL_DEBUG_MORE, postStr);
       }
-      addLog(LOG_LEVEL_DEBUG_MORE, postStr);
+      delay(0);
     }
-    yield();
   }
   if (loglevelActiveFor(LOG_LEVEL_DEBUG)) {
     String log = F("HTTP : ");
@@ -663,8 +686,8 @@ bool send_via_http(const String& logIdentifier, WiFiClient& client, const String
   return success;
 }
 
-bool send_via_http(int controller_number, WiFiClient& client, const String& postStr) {
-  return send_via_http(get_formatted_Controller_number(controller_number), client, postStr);
+bool send_via_http(int controller_number, WiFiClient& client, const String& postStr, bool must_check_reply) {
+  return send_via_http(get_formatted_Controller_number(controller_number), client, postStr, must_check_reply);
 }
 
 

src/_N001_Email.ino

@@ -38,8 +38,8 @@ boolean NPlugin_001(byte function, struct EventStruct *event, String& string)
 	//
 	//     if (command == F("email"))
 	//     {
-	//       NotificationSettingsStruct NotificationSettings;
-	//       LoadNotificationSettings(event->NotificationIndex, (byte*)&NotificationSettings, sizeof(NotificationSettings));
+	//       MakeNotificationSettings(NotificationSettings);
+	//       LoadNotificationSettings(event->NotificationIndex, (byte*)&NotificationSettings, sizeof(NotificationSettingsStruct));
 	//       NPlugin_001_send(NotificationSettings.Domain, NotificationSettings.Receiver, NotificationSettings.Sender, NotificationSettings.Subject, NotificationSettings.Body, NotificationSettings.Server, NotificationSettings.Port);
 	//       success = true;
 	//     }
@@ -48,8 +48,8 @@ boolean NPlugin_001(byte function, struct EventStruct *event, String& string)
 
 	case NPLUGIN_NOTIFY:
 	{
-		NotificationSettingsStruct NotificationSettings;
-		LoadNotificationSettings(event->NotificationIndex, (byte*)&NotificationSettings, sizeof(NotificationSettings));
+		MakeNotificationSettings(NotificationSettings);
+		LoadNotificationSettings(event->NotificationIndex, (byte*)&NotificationSettings, sizeof(NotificationSettingsStruct));
 		String subject = NotificationSettings.Subject;
 		String body = "";
 		if (event->String1.length() > 0)
@@ -73,6 +73,7 @@ boolean NPlugin_001_send(const NotificationSettingsStruct& notificationsettings,
 
 	// Use WiFiClient class to create TCP connections
 	WiFiClient client;
+	client.setTimeout(CONTROLLER_CLIENTTIMEOUT_DFLT);
 	String aHost = notificationsettings.Server;
 	addLog(LOG_LEVEL_DEBUG, String(F("EMAIL: Connecting to ")) + aHost + notificationsettings.Port);
 	if (client.connect(aHost.c_str(), notificationsettings.Port) != 1) {
@@ -193,7 +194,7 @@ boolean NPlugin_001_MTA(WiFiClient& client, String aStr, const String &aWaitForP
 			return false;
 		}
 
-		yield();
+		delay(0);
 
 		// String line = client.readStringUntil('\n');
 		String line;

src/_N002_Buzzer.ino

@@ -35,8 +35,8 @@ boolean NPlugin_002(byte function, struct EventStruct *event, String& string)
     //
     //     if (command == F("buzzer"))
     //     {
-    //       NotificationSettingsStruct NotificationSettings;
-    //       LoadNotificationSettings(event->NotificationIndex, (byte*)&NotificationSettings, sizeof(NotificationSettings));
+    //       MakeNotificationSettings(NotificationSettings);
+    //       LoadNotificationSettings(event->NotificationIndex, (byte*)&NotificationSettings, sizeof(NotificationSettingsStruct));
     //       success = true;
     //     }
     //     break;
@@ -44,8 +44,8 @@ boolean NPlugin_002(byte function, struct EventStruct *event, String& string)
 
     case NPLUGIN_NOTIFY:
       {
-        NotificationSettingsStruct NotificationSettings;
-        LoadNotificationSettings(event->NotificationIndex, (byte*)&NotificationSettings, sizeof(NotificationSettings));
+        MakeNotificationSettings(NotificationSettings);
+        LoadNotificationSettings(event->NotificationIndex, (byte*)&NotificationSettings, sizeof(NotificationSettingsStruct));
         //this reserves IRAM and uninitialized RAM
         #ifndef ESP32
         // Buzzer not compatible with ESP32 due to lack of tone command.

src/_P001_Switch.ino

@@ -3,6 +3,31 @@
 //#################################### Plugin 001: Input Switch #########################################
 //#######################################################################################################
 
+/**************************************************\
+CONFIG
+TaskDevicePluginConfig settings:
+0: button type (switch or dimmer)
+1: dim value
+2: button option (normal, push high, push low)
+3: send boot state (true,false)
+4: use doubleclick (0,1,2,3)
+5: use longpress (0,1,2,3)
+6: LP fired (true,false)
+7: doubleclick counter (=0,1,2,3)
+
+TaskDevicePluginConfigFloat settings:
+0: debounce interval ms
+1: doubleclick interval ms
+2: longpress interval ms
+3:
+
+TaskDevicePluginConfigLong settings:
+0: clickTime debounce ms
+1: clickTime doubleclick ms
+2: clickTime longpress ms
+3:
+\**************************************************/
+
 #define PLUGIN_001
 #define PLUGIN_ID_001         1
 #define PLUGIN_NAME_001       "Switch input - Switch"
@@ -18,6 +43,18 @@
 #define PLUGIN_001_BUTTON_TYPE_NORMAL_SWITCH 0
 #define PLUGIN_001_BUTTON_TYPE_PUSH_ACTIVE_LOW 1
 #define PLUGIN_001_BUTTON_TYPE_PUSH_ACTIVE_HIGH 2
+#define PLUGIN_001_DOUBLECLICK_MIN_INTERVAL 1000
+#define PLUGIN_001_DOUBLECLICK_MAX_INTERVAL 3000
+#define PLUGIN_001_LONGPRESS_MIN_INTERVAL 1000
+#define PLUGIN_001_LONGPRESS_MAX_INTERVAL 5000
+#define PLUGIN_001_DC_DISABLED 0
+#define PLUGIN_001_DC_LOW 1
+#define PLUGIN_001_DC_HIGH 2
+#define PLUGIN_001_DC_BOTH 3
+#define PLUGIN_001_LONGPRESS_DISABLED 0
+#define PLUGIN_001_LONGPRESS_LOW 1
+#define PLUGIN_001_LONGPRESS_HIGH 2
+#define PLUGIN_001_LONGPRESS_BOTH 3
 
 boolean Plugin_001_read_switch_state(struct EventStruct *event) {
   return digitalRead(Settings.TaskDevicePin1[event->TaskIndex]) == HIGH;
@@ -26,8 +63,8 @@ boolean Plugin_001_read_switch_state(struct EventStruct *event) {
 boolean Plugin_001(byte function, struct EventStruct *event, String& string)
 {
   boolean success = false;
-  static boolean switchstate[TASKS_MAX];
-  static boolean outputstate[TASKS_MAX];
+  static byte switchstate[TASKS_MAX];
+  static byte outputstate[TASKS_MAX];
   static int8_t PinMonitor[GPIO_MAX];
   static int8_t PinMonitorState[GPIO_MAX];
 
@@ -89,6 +126,47 @@ boolean Plugin_001(byte function, struct EventStruct *event, String& string)
         addFormCheckBox(F("Send Boot state"),F("plugin_001_boot"),
         		Settings.TaskDevicePluginConfig[event->TaskIndex][3]);
 
+        addFormSubHeader(F("Advanced event management"));
+
+        addFormNumericBox(F("De-bounce (ms)"), F("plugin_001_debounce"), round(Settings.TaskDevicePluginConfigFloat[event->TaskIndex][0]), 0, 250);
+
+        //set minimum value for doubleclick MIN max speed
+        if (Settings.TaskDevicePluginConfigFloat[event->TaskIndex][1] < PLUGIN_001_DOUBLECLICK_MIN_INTERVAL)
+          Settings.TaskDevicePluginConfigFloat[event->TaskIndex][1] = PLUGIN_001_DOUBLECLICK_MIN_INTERVAL;
+
+        byte choiceDC = Settings.TaskDevicePluginConfig[event->TaskIndex][4];
+        String buttonDC[4];
+        buttonDC[0] = F("Disabled");
+        buttonDC[1] = F("Active only on LOW (EVENT=3)");
+        buttonDC[2] = F("Active only on HIGH (EVENT=3)");
+        buttonDC[3] = F("Active on LOW & HIGH (EVENT=3)");
+        int buttonDCValues[4] = {PLUGIN_001_DC_DISABLED, PLUGIN_001_DC_LOW, PLUGIN_001_DC_HIGH,PLUGIN_001_DC_BOTH};
+
+        addFormSelector(F("Doubleclick event"), F("plugin_001_dc"), 4, buttonDC, buttonDCValues, choiceDC);
+
+        //addFormCheckBox(F("Doubleclick event (3)"), F("plugin_001_dc"), Settings.TaskDevicePluginConfig[event->TaskIndex][4]);
+        addFormNumericBox(F("Doubleclick max. interval (ms)"), F("plugin_001_dcmaxinterval"), round(Settings.TaskDevicePluginConfigFloat[event->TaskIndex][1]), PLUGIN_001_DOUBLECLICK_MIN_INTERVAL, PLUGIN_001_DOUBLECLICK_MAX_INTERVAL);
+
+        //set minimum value for longpress MIN max speed
+        if (Settings.TaskDevicePluginConfigFloat[event->TaskIndex][2] < PLUGIN_001_LONGPRESS_MIN_INTERVAL)
+          Settings.TaskDevicePluginConfigFloat[event->TaskIndex][2] = PLUGIN_001_LONGPRESS_MIN_INTERVAL;
+
+        byte choiceLP = Settings.TaskDevicePluginConfig[event->TaskIndex][5];
+        String buttonLP[4];
+        buttonLP[0] = F("Disabled");
+        buttonLP[1] = F("Active only on LOW (EVENT= 10 [NORMAL] or 11 [INVERSED])");
+        buttonLP[2] = F("Active only on HIGH (EVENT= 11 [NORMAL] or 10 [INVERSED])");
+        buttonLP[3] = F("Active on LOW & HIGH (EVENT= 10 or 11)");
+        int buttonLPValues[4] = {PLUGIN_001_LONGPRESS_DISABLED, PLUGIN_001_LONGPRESS_LOW, PLUGIN_001_LONGPRESS_HIGH,PLUGIN_001_LONGPRESS_BOTH};
+        addFormSelector(F("Longpress event"), F("plugin_001_lp"), 4, buttonLP, buttonLPValues, choiceLP);
+
+        //addFormCheckBox(F("Longpress event (10 & 11)"), F("plugin_001_lp"), Settings.TaskDevicePluginConfig[event->TaskIndex][5]);
+        addFormNumericBox(F("Longpress min. interval (ms)"), F("plugin_001_lpmininterval"), round(Settings.TaskDevicePluginConfigFloat[event->TaskIndex][2]), PLUGIN_001_LONGPRESS_MIN_INTERVAL, PLUGIN_001_LONGPRESS_MAX_INTERVAL);
+
+        //TO-DO: add Extra-Long Press event
+        //addFormCheckBox(F("Extra-Longpress event (20 & 21)"), F("plugin_001_elp"), Settings.TaskDevicePluginConfigLong[event->TaskIndex][1]);
+        //addFormNumericBox(F("Extra-Longpress min. interval (ms)"), F("plugin_001_elpmininterval"), Settings.TaskDevicePluginConfigLong[event->TaskIndex][2], 500, 2000);
+
         success = true;
         break;
       }
@@ -105,6 +183,18 @@ boolean Plugin_001(byte function, struct EventStruct *event, String& string)
 
         Settings.TaskDevicePluginConfig[event->TaskIndex][3] = isFormItemChecked(F("plugin_001_boot"));
 
+        Settings.TaskDevicePluginConfigFloat[event->TaskIndex][0] = getFormItemInt(F("plugin_001_debounce"));
+
+        Settings.TaskDevicePluginConfig[event->TaskIndex][4] = getFormItemInt(F("plugin_001_dc"));
+        Settings.TaskDevicePluginConfigFloat[event->TaskIndex][1] = getFormItemInt(F("plugin_001_dcmaxinterval"));
+
+        Settings.TaskDevicePluginConfig[event->TaskIndex][5] = getFormItemInt(F("plugin_001_lp"));
+        Settings.TaskDevicePluginConfigFloat[event->TaskIndex][2] = getFormItemInt(F("plugin_001_lpmininterval"));
+
+        //TO-DO: add Extra-Long Press event
+        //Settings.TaskDevicePluginConfigLong[event->TaskIndex][1] = isFormItemChecked(F("plugin_001_elp"));
+        //Settings.TaskDevicePluginConfigLong[event->TaskIndex][2] = getFormItemInt(F("plugin_001_elpmininterval"));
+
         success = true;
         break;
       }
@@ -121,30 +211,62 @@ boolean Plugin_001(byte function, struct EventStruct *event, String& string)
         else
           pinMode(Settings.TaskDevicePin1[event->TaskIndex], INPUT);
 
+        // @giig1967g-20181022: if it is in the device list we assume it's an input pin
         setPinState(PLUGIN_ID_001, Settings.TaskDevicePin1[event->TaskIndex], PIN_MODE_INPUT, 0);
 
+        // read and store current state to prevent switching at boot time
         switchstate[event->TaskIndex] = Plugin_001_read_switch_state(event);
         outputstate[event->TaskIndex] = switchstate[event->TaskIndex];
 
         // if boot state must be send, inverse default state
+        // this is done to force the trigger in PLUGIN_TEN_PER_SECOND
         if (Settings.TaskDevicePluginConfig[event->TaskIndex][3])
         {
           switchstate[event->TaskIndex] = !switchstate[event->TaskIndex];
           outputstate[event->TaskIndex] = !outputstate[event->TaskIndex];
         }
+
+        // set initial UserVar of the switch
+        if (Settings.TaskDevicePin1Inversed[event->TaskIndex]){
+          UserVar[event->BaseVarIndex] = !switchstate[event->TaskIndex];
+        } else {
+          UserVar[event->BaseVarIndex] = switchstate[event->TaskIndex];
+        }
+
+        // counter = 0
+        Settings.TaskDevicePluginConfig[event->TaskIndex][7]=0;
+
+        //used to track if LP has fired
+        Settings.TaskDevicePluginConfig[event->TaskIndex][6]=false;
+
+        //store millis for debounce, doubleclick and long press
+        Settings.TaskDevicePluginConfigLong[event->TaskIndex][0]=millis(); //debounce timer
+        Settings.TaskDevicePluginConfigLong[event->TaskIndex][1]=millis(); //doubleclick timer
+        Settings.TaskDevicePluginConfigLong[event->TaskIndex][2]=millis(); //longpress timer
+
+        //set minimum value for doubleclick MIN interval speed
+        if (Settings.TaskDevicePluginConfigFloat[event->TaskIndex][1] < PLUGIN_001_DOUBLECLICK_MIN_INTERVAL)
+          Settings.TaskDevicePluginConfigFloat[event->TaskIndex][1] = PLUGIN_001_DOUBLECLICK_MIN_INTERVAL;
+
+        //set minimum value for longpress MIN interval speed
+        if (Settings.TaskDevicePluginConfigFloat[event->TaskIndex][2] < PLUGIN_001_LONGPRESS_MIN_INTERVAL)
+          Settings.TaskDevicePluginConfigFloat[event->TaskIndex][2] = PLUGIN_001_LONGPRESS_MIN_INTERVAL;
+
         success = true;
         break;
       }
 
     case PLUGIN_REQUEST:
       {
-        String device = parseString(string, 1);
-        String command = parseString(string, 2);
-        String strPar1 = parseString(string, 3);
-        if (device == F("gpio") && command == F("pinstate"))
+        //String device = parseString(string, 1);
+        //String command = parseString(string, 2);
+        //String strPar1 = parseString(string, 3);
+
+        // returns pin value using syntax: [plugin#gpio#pinstate#xx]
+        if (string.length()>=13 && string.substring(0,13).equalsIgnoreCase(F("gpio,pinstate")))
         {
           int par1;
-          if (validIntFromString(strPar1, par1)) {
+            if (validIntFromString(parseString(string, 3), par1)) {
             string = digitalRead(par1);
           }
           success = true;
@@ -161,7 +283,7 @@ boolean Plugin_001(byte function, struct EventStruct *event, String& string)
              if (PinMonitorState[x] != state){
                String eventString = F("GPIO#");
                eventString += x;
-               eventString += F("=");
+               eventString += '=';
                eventString += state;
                rulesProcessing(eventString);
                PinMonitorState[x] = state;
@@ -173,51 +295,179 @@ boolean Plugin_001(byte function, struct EventStruct *event, String& string)
     case PLUGIN_TEN_PER_SECOND:
       {
         const boolean state = Plugin_001_read_switch_state(event);
+
+        /**************************************************************************\
+        20181009 - @giig1967g: new doubleclick logic is:
+        if there is a 'state' change, check debounce period.
+        Then if doubleclick interval exceeded, reset Settings.TaskDevicePluginConfig[event->TaskIndex][7] to 0
+        Settings.TaskDevicePluginConfig[event->TaskIndex][7] contains the current status for doubleclick:
+        0: start counting
+        1: 1st click
+        2: 2nd click
+        3: 3rd click = doubleclick event if inside interval (calculated as: '3rd click time' minus '1st click time')
+
+        Returned EVENT value is = 3 always for doubleclick
+        In rules this can be checked:
+        on Button#Switch=3 do //will fire if doubleclick
+        \**************************************************************************/
+
         if (state != switchstate[event->TaskIndex])
         {
-          switchstate[event->TaskIndex] = state;
-          const boolean currentOutputState = outputstate[event->TaskIndex];
-          boolean new_outputState = currentOutputState;
-          switch(Settings.TaskDevicePluginConfig[event->TaskIndex][2]) {
-            case PLUGIN_001_BUTTON_TYPE_NORMAL_SWITCH:
-                new_outputState = state;
-              break;
-            case PLUGIN_001_BUTTON_TYPE_PUSH_ACTIVE_LOW:
-              if (!state)
-                new_outputState = !currentOutputState;
-              break;
-            case PLUGIN_001_BUTTON_TYPE_PUSH_ACTIVE_HIGH:
-              if (state)
-                new_outputState = !currentOutputState;
-              break;
-          }
+          //reset timer for long press
+          Settings.TaskDevicePluginConfigLong[event->TaskIndex][2]=millis();
+          Settings.TaskDevicePluginConfig[event->TaskIndex][6] = false;
 
-          // send if output needs to be changed
-          if (currentOutputState != new_outputState)
+          const unsigned long debounceTime = timePassedSince(Settings.TaskDevicePluginConfigLong[event->TaskIndex][0]);
+          if (debounceTime >= (unsigned long)lround(Settings.TaskDevicePluginConfigFloat[event->TaskIndex][0])) //de-bounce check
           {
-            outputstate[event->TaskIndex] = new_outputState;
-            boolean sendState = new_outputState;
-            if (Settings.TaskDevicePin1Inversed[event->TaskIndex])
-              sendState = !sendState;
-
-            byte output_value = sendState ? 1 : 0;
-            event->sensorType = SENSOR_TYPE_SWITCH;
-            if (P001_getSwitchType(event) == PLUGIN_001_TYPE_DIMMER) {
-              if (sendState) {
-                output_value = Settings.TaskDevicePluginConfig[event->TaskIndex][1];
-                // Only set type to being dimmer when setting a value else it is "switched off".
-                event->sensorType = SENSOR_TYPE_DIMMER;
-              }
+            const unsigned long deltaDC = timePassedSince(Settings.TaskDevicePluginConfigLong[event->TaskIndex][1]);
+            if ((deltaDC >= (unsigned long)lround(Settings.TaskDevicePluginConfigFloat[event->TaskIndex][1])) ||
+                 Settings.TaskDevicePluginConfig[event->TaskIndex][7]==3)
+            {
+              //reset timer for doubleclick
+              Settings.TaskDevicePluginConfig[event->TaskIndex][7]=0;
+              Settings.TaskDevicePluginConfigLong[event->TaskIndex][1]=millis();
             }
-            UserVar[event->BaseVarIndex] = output_value;
-            String log = F("SW   : Switch state ");
-            log += state ? F("1") : F("0");
-            log += F(" Output value ");
-            log += output_value;
-            addLog(LOG_LEVEL_INFO, log);
-            sendData(event);
+
+//just to simplify the reading of the code
+#define COUNTER Settings.TaskDevicePluginConfig[event->TaskIndex][7]
+#define DC Settings.TaskDevicePluginConfig[event->TaskIndex][4]
+
+              //check settings for doubleclick according to the settings
+              if ( COUNTER!=0 || ( COUNTER==0 && (DC==3 || (DC==1 && state==0) || (DC==2 && state==1))) )
+                Settings.TaskDevicePluginConfig[event->TaskIndex][7]++;
+#undef DC
+#undef COUNTER
+
+            switchstate[event->TaskIndex] = state;
+            const boolean currentOutputState = outputstate[event->TaskIndex];
+            boolean new_outputState = currentOutputState;
+            switch(Settings.TaskDevicePluginConfig[event->TaskIndex][2])
+            {
+              case PLUGIN_001_BUTTON_TYPE_NORMAL_SWITCH:
+                  new_outputState = state;
+                break;
+              case PLUGIN_001_BUTTON_TYPE_PUSH_ACTIVE_LOW:
+                if (!state)
+                  new_outputState = !currentOutputState;
+                break;
+              case PLUGIN_001_BUTTON_TYPE_PUSH_ACTIVE_HIGH:
+                if (state)
+                  new_outputState = !currentOutputState;
+                break;
+            }
+
+            // send if output needs to be changed
+            if (currentOutputState != new_outputState)
+            {
+              byte output_value;
+              outputstate[event->TaskIndex] = new_outputState;
+              boolean sendState = new_outputState;
+
+              if (Settings.TaskDevicePin1Inversed[event->TaskIndex])
+                sendState = !sendState;
+
+              if (Settings.TaskDevicePluginConfig[event->TaskIndex][7]==3 && Settings.TaskDevicePluginConfig[event->TaskIndex][4]>0)
+              {
+                output_value = 3; //double click
+              } else {
+                output_value = sendState ? 1 : 0; //single click
+              }
+              event->sensorType = SENSOR_TYPE_SWITCH;
+              if (P001_getSwitchType(event) == PLUGIN_001_TYPE_DIMMER) {
+                if (sendState) {
+                  output_value = Settings.TaskDevicePluginConfig[event->TaskIndex][1];
+                  // Only set type to being dimmer when setting a value else it is "switched off".
+                  event->sensorType = SENSOR_TYPE_DIMMER;
+                }
+              }
+              UserVar[event->BaseVarIndex] = output_value;
+
+              String log = F("SW  : GPIO=");
+              log += Settings.TaskDevicePin1[event->TaskIndex];
+              log += F(" State=");
+              log += state ? '1' : '0';
+              log += output_value==3 ? F(" Doubleclick=") : F(" Output value=");
+              log += output_value;
+              addLog(LOG_LEVEL_INFO, log);
+              sendData(event);
+
+              //reset Userdata so it displays the correct state value in the web page
+              UserVar[event->BaseVarIndex] = sendState ? 1 : 0;
+            }
+            Settings.TaskDevicePluginConfigLong[event->TaskIndex][0] = millis();
           }
         }
+
+//just to simplify the reading of the code
+#define LP Settings.TaskDevicePluginConfig[event->TaskIndex][5]
+#define FIRED Settings.TaskDevicePluginConfig[event->TaskIndex][6]
+
+        //check if LP is enabled and if LP has not fired yet
+        else if (!FIRED && (LP==3 ||(LP==1 && state==0)||(LP==2 && state==1) ) ) {
+
+#undef LP
+#undef FIRED
+
+          /**************************************************************************\
+          20181009 - @giig1967g: new longpress logic is:
+          if there is no 'state' change, check if longpress interval reached
+          When reached send longpress event.
+          Returned Event value = state + 10
+          So if state = 0 => EVENT longpress = 10
+          if state = 1 => EVENT longpress = 11
+          So we can trigger longpress for high or low contact
+
+          In rules this can be checked:
+          on Button#Switch=10 do //will fire if longpress when state = 0
+          on Button#Switch=11 do //will fire if longpress when state = 1
+          \**************************************************************************/
+          const unsigned long deltaLP = timePassedSince(Settings.TaskDevicePluginConfigLong[event->TaskIndex][2]);
+          if (deltaLP >= (unsigned long)lround(Settings.TaskDevicePluginConfigFloat[event->TaskIndex][2]))
+          {
+            byte output_value;
+            byte needToSendEvent = false;
+
+            Settings.TaskDevicePluginConfig[event->TaskIndex][6] = true;
+
+            switch(Settings.TaskDevicePluginConfig[event->TaskIndex][2])
+            {
+              case PLUGIN_001_BUTTON_TYPE_NORMAL_SWITCH:
+                  needToSendEvent = true;
+                break;
+              case PLUGIN_001_BUTTON_TYPE_PUSH_ACTIVE_LOW:
+                if (!state)
+                  needToSendEvent = true;
+                break;
+              case PLUGIN_001_BUTTON_TYPE_PUSH_ACTIVE_HIGH:
+                if (state)
+                  needToSendEvent = true;
+                break;
+            }
+
+            if (needToSendEvent) {
+              boolean sendState = state;
+              if (Settings.TaskDevicePin1Inversed[event->TaskIndex])
+                sendState = !sendState;
+              output_value = sendState ? 1 : 0;
+              output_value = output_value + 10;
+
+              UserVar[event->BaseVarIndex] = output_value;
+              String log = F("SW  : LongPress: GPIO= ");
+              log += Settings.TaskDevicePin1[event->TaskIndex];
+              log += F(" State=");
+              log += state ? '1' : '0';
+              log += F(" Output value=");
+              log += output_value;
+              addLog(LOG_LEVEL_INFO, log);
+              sendData(event);
+
+              //reset Userdata so it displays the correct state value in the web page
+              UserVar[event->BaseVarIndex] = sendState ? 1 : 0;
+            }
+          }
+        }
+
         success = true;
         break;
       }
@@ -257,6 +507,32 @@ boolean Plugin_001(byte function, struct EventStruct *event, String& string)
           }
         }
 
+        if (command == F("gpiotoggle"))
+        {
+          success = true;
+          byte mode;
+          uint16_t currentState;
+
+          if (event->Par1 >= 0 && event->Par1 <= PIN_D_MAX)
+          {
+            if (hasPinState(PLUGIN_ID_001,event->Par1)) {
+              getPinState(PLUGIN_ID_001, event->Par1, &mode, &currentState);
+            } else {
+              currentState = (digitalRead(event->Par1) == HIGH);
+              mode = PIN_MODE_OUTPUT;
+            }
+
+            if (mode != PIN_MODE_INPUT) { //toggle only output pins
+              pinMode(event->Par1, OUTPUT);
+              digitalWrite(event->Par1, !currentState);
+              setPinState(PLUGIN_ID_001, event->Par1, PIN_MODE_OUTPUT, !currentState);
+              log = String(F("SW   : Toggle GPIO ")) + String(event->Par1) + String(F(" Set to ")) + String(!currentState);
+              addLog(LOG_LEVEL_INFO, log);
+              SendStatus(event->Source, getPinStateJSON(SEARCH_PIN_STATE, PLUGIN_ID_001, event->Par1, log, 0));
+            }
+          }
+        }
+
         if (command == F("pwm"))
         {
           success = true;

src/_P004_Dallas.ino

@@ -90,7 +90,7 @@ boolean Plugin_004(byte function, struct EventStruct * event, String& string)
                   resolutionChoice = Plugin_004_DS_getResolution(savedAddress);
               else
                   resolutionChoice = 9;
-              String resultsOptions[4] = { "9", "10", "11", "12" };
+              String resultsOptions[4] = { F("9"), F("10"), F("11"), F("12") };
               int resultsOptionValues[4] = { 9, 10, 11, 12 };
               addFormSelector(F("Device Resolution"), F("plugin_004_res"), 4, resultsOptions, resultsOptionValues, resolutionChoice);
               addHtml(F(" Bit"));
@@ -105,7 +105,6 @@ boolean Plugin_004(byte function, struct EventStruct * event, String& string)
 
             // save the address for selected device and store into extra tasksettings
             Plugin_004_DallasPin = Settings.TaskDevicePin1[event->TaskIndex];
-            // byte devCount =
             if (Plugin_004_DallasPin != -1){
               Plugin_004_DS_scan(getFormItemInt(F("plugin_004_dev")), addr);
               for (byte x = 0; x < 8; x++)
@@ -124,11 +123,12 @@ boolean Plugin_004(byte function, struct EventStruct * event, String& string)
             {
                 if (x != 0)
                     string += "-";
-                // string += String(ExtraTaskSettings.TaskDevicePluginConfigLong[x], HEX);
+                string += String(ExtraTaskSettings.TaskDevicePluginConfigLong[x], HEX);
             }
             success = true;
             break;
         }
+
         case PLUGIN_INIT:
         {
             Plugin_004_DallasPin = Settings.TaskDevicePin1[event->TaskIndex];
@@ -169,7 +169,7 @@ boolean Plugin_004(byte function, struct EventStruct * event, String& string)
                 for (byte x = 0; x < 8; x++)
                 {
                     if (x != 0)
-                        log += "-";
+                        log += '-';
                     log += String(ExtraTaskSettings.TaskDevicePluginConfigLong[x], HEX);
                 }
 

src/_P009_MCP.ino

@@ -3,15 +3,52 @@
 //#################################### Plugin 009: MCP23017 input #######################################
 //#######################################################################################################
 
+/**************************************************\
+CONFIG
+TaskDevicePluginConfig settings:
+0: send boot state (true,false)
+1:
+2:
+3:
+4: use doubleclick (0,1,2,3)
+5: use longpress (0,1,2,3)
+6: LP fired (true,false)
+7: doubleclick counter (=0,1,2,3)
+
+TaskDevicePluginConfigFloat settings:
+0: debounce interval ms
+1: doubleclick interval ms
+2: longpress interval ms
+3:
+
+TaskDevicePluginConfigLong settings:
+0: clickTime debounce ms
+1: clickTime doubleclick ms
+2: clickTime longpress ms
+3:
+\**************************************************/
+
 #define PLUGIN_009
 #define PLUGIN_ID_009         9
 #define PLUGIN_NAME_009       "Switch input - MCP23017"
 #define PLUGIN_VALUENAME1_009 "Switch"
+#define PLUGIN_009_DOUBLECLICK_MIN_INTERVAL 1000
+#define PLUGIN_009_DOUBLECLICK_MAX_INTERVAL 3000
+#define PLUGIN_009_LONGPRESS_MIN_INTERVAL 1000
+#define PLUGIN_009_LONGPRESS_MAX_INTERVAL 5000
+#define PLUGIN_009_DC_DISABLED 0
+#define PLUGIN_009_DC_LOW 1
+#define PLUGIN_009_DC_HIGH 2
+#define PLUGIN_009_DC_BOTH 3
+#define PLUGIN_009_LONGPRESS_DISABLED 0
+#define PLUGIN_009_LONGPRESS_LOW 1
+#define PLUGIN_009_LONGPRESS_HIGH 2
+#define PLUGIN_009_LONGPRESS_BOTH 3
 
 boolean Plugin_009(byte function, struct EventStruct *event, String& string)
 {
   boolean success = false;
-  static byte switchstate[TASKS_MAX];
+  static int8_t switchstate[TASKS_MAX];
 
   switch (function)
   {
@@ -23,7 +60,7 @@ boolean Plugin_009(byte function, struct EventStruct *event, String& string)
         Device[deviceCount].VType = SENSOR_TYPE_SWITCH;
         Device[deviceCount].Ports = 16;
         Device[deviceCount].PullUpOption = false;
-        Device[deviceCount].InverseLogicOption = false;
+        Device[deviceCount].InverseLogicOption = true;
         Device[deviceCount].FormulaOption = false;
         Device[deviceCount].ValueCount = 1;
         Device[deviceCount].SendDataOption = true;
@@ -49,6 +86,42 @@ boolean Plugin_009(byte function, struct EventStruct *event, String& string)
       {
         addFormCheckBox(F("Send Boot state") ,F("plugin_009_boot"), Settings.TaskDevicePluginConfig[event->TaskIndex][0]);
 
+        //@giig1967-20181022
+        addFormSubHeader(F("Advanced event management"));
+
+        addFormNumericBox(F("De-bounce (ms)"), F("plugin_009_debounce"), round(Settings.TaskDevicePluginConfigFloat[event->TaskIndex][0]), 0, 250);
+
+        //set minimum value for doubleclick MIN max speed
+        if (Settings.TaskDevicePluginConfigFloat[event->TaskIndex][1] < PLUGIN_009_DOUBLECLICK_MIN_INTERVAL)
+          Settings.TaskDevicePluginConfigFloat[event->TaskIndex][1] = PLUGIN_009_DOUBLECLICK_MIN_INTERVAL;
+
+        byte choiceDC = Settings.TaskDevicePluginConfig[event->TaskIndex][4];
+        String buttonDC[4];
+        buttonDC[0] = F("Disabled");
+        buttonDC[1] = F("Active only on LOW (EVENT=3)");
+        buttonDC[2] = F("Active only on HIGH (EVENT=3)");
+        buttonDC[3] = F("Active on LOW & HIGH (EVENT=3)");
+        int buttonDCValues[4] = {PLUGIN_009_DC_DISABLED, PLUGIN_009_DC_LOW, PLUGIN_009_DC_HIGH,PLUGIN_009_DC_BOTH};
+        addFormSelector(F("Doubleclick event"), F("plugin_009_dc"), 4, buttonDC, buttonDCValues, choiceDC);
+
+        addFormNumericBox(F("Doubleclick max. interval (ms)"), F("plugin_009_dcmaxinterval"), round(Settings.TaskDevicePluginConfigFloat[event->TaskIndex][1]), PLUGIN_009_DOUBLECLICK_MIN_INTERVAL, PLUGIN_009_DOUBLECLICK_MAX_INTERVAL);
+
+        //set minimum value for longpress MIN max speed
+        if (Settings.TaskDevicePluginConfigFloat[event->TaskIndex][2] < PLUGIN_009_LONGPRESS_MIN_INTERVAL)
+          Settings.TaskDevicePluginConfigFloat[event->TaskIndex][2] = PLUGIN_009_LONGPRESS_MIN_INTERVAL;
+
+        byte choiceLP = Settings.TaskDevicePluginConfig[event->TaskIndex][5];
+        String buttonLP[4];
+        buttonLP[0] = F("Disabled");
+        buttonLP[1] = F("Active only on LOW (EVENT= 10 [NORMAL] or 11 [INVERSED])");
+        buttonLP[2] = F("Active only on HIGH (EVENT= 11 [NORMAL] or 10 [INVERSED])");
+        buttonLP[3] = F("Active on LOW & HIGH (EVENT= 10 or 11)");
+
+        int buttonLPValues[4] = {PLUGIN_009_LONGPRESS_DISABLED, PLUGIN_009_LONGPRESS_LOW, PLUGIN_009_LONGPRESS_HIGH,PLUGIN_009_LONGPRESS_BOTH};
+        addFormSelector(F("Longpress event"), F("plugin_009_lp"), 4, buttonLP, buttonLPValues, choiceLP);
+
+        addFormNumericBox(F("Longpress min. interval (ms)"), F("plugin_009_lpmininterval"), round(Settings.TaskDevicePluginConfigFloat[event->TaskIndex][2]), PLUGIN_009_LONGPRESS_MIN_INTERVAL, PLUGIN_009_LONGPRESS_MAX_INTERVAL);
+
         success = true;
         break;
       }
@@ -57,6 +130,15 @@ boolean Plugin_009(byte function, struct EventStruct *event, String& string)
       {
         Settings.TaskDevicePluginConfig[event->TaskIndex][0] = isFormItemChecked(F("plugin_009_boot"));
 
+        //@giig1967-20181022
+        Settings.TaskDevicePluginConfigFloat[event->TaskIndex][0] = getFormItemInt(F("plugin_009_debounce"));
+
+        Settings.TaskDevicePluginConfig[event->TaskIndex][4] = getFormItemInt(F("plugin_009_dc"));
+        Settings.TaskDevicePluginConfigFloat[event->TaskIndex][1] = getFormItemInt(F("plugin_009_dcmaxinterval"));
+
+        Settings.TaskDevicePluginConfig[event->TaskIndex][5] = getFormItemInt(F("plugin_009_lp"));
+        Settings.TaskDevicePluginConfigFloat[event->TaskIndex][2] = getFormItemInt(F("plugin_009_lpmininterval"));
+
         success = true;
         break;
       }
@@ -67,32 +149,185 @@ boolean Plugin_009(byte function, struct EventStruct *event, String& string)
         Plugin_009_Config(Settings.TaskDevicePort[event->TaskIndex], 1);
 
         // read and store current state to prevent switching at boot time
+        // "state" could be -1, 0 or 1
         switchstate[event->TaskIndex] = Plugin_009_Read(Settings.TaskDevicePort[event->TaskIndex]);
 
         // if boot state must be send, inverse default state
+        // this is done to force the trigger in PLUGIN_TEN_PER_SECOND
         if (Settings.TaskDevicePluginConfig[event->TaskIndex][0])
           switchstate[event->TaskIndex] = !switchstate[event->TaskIndex];
 
+        // @giig1967g-20181022: set initial UserVar of the switch
+        if (switchstate[event->TaskIndex] != -1 && Settings.TaskDevicePin1Inversed[event->TaskIndex]) {
+          UserVar[event->BaseVarIndex] = !switchstate[event->TaskIndex];
+        } else {
+          UserVar[event->BaseVarIndex] = switchstate[event->TaskIndex];
+        }
+
+        // @giig1967g-20181022: doubleclick counter = 0
+        Settings.TaskDevicePluginConfig[event->TaskIndex][7]=0;
+
+        // @giig1967g-20181022: used to track if LP has fired
+        Settings.TaskDevicePluginConfig[event->TaskIndex][6]=false;
+
+        // @giig1967g-20181022: store millis for debounce, doubleclick and long press
+        Settings.TaskDevicePluginConfigLong[event->TaskIndex][0]=millis(); //debounce timer
+        Settings.TaskDevicePluginConfigLong[event->TaskIndex][1]=millis(); //doubleclick timer
+        Settings.TaskDevicePluginConfigLong[event->TaskIndex][2]=millis(); //longpress timer
+
+        // @giig1967g-20181022: set minimum value for doubleclick MIN max speed
+        if (Settings.TaskDevicePluginConfigFloat[event->TaskIndex][1] < PLUGIN_009_DOUBLECLICK_MIN_INTERVAL)
+          Settings.TaskDevicePluginConfigFloat[event->TaskIndex][1] = PLUGIN_009_DOUBLECLICK_MIN_INTERVAL;
+
+        // @giig1967g-20181022: set minimum value for longpress MIN max speed
+        if (Settings.TaskDevicePluginConfigFloat[event->TaskIndex][2] < PLUGIN_009_LONGPRESS_MIN_INTERVAL)
+          Settings.TaskDevicePluginConfigFloat[event->TaskIndex][2] = PLUGIN_009_LONGPRESS_MIN_INTERVAL;
+
         setPinState(PLUGIN_ID_009, Settings.TaskDevicePort[event->TaskIndex], PIN_MODE_INPUT, 0);
+
         success = true;
         break;
       }
 
     case PLUGIN_TEN_PER_SECOND:
       {
-        int state = Plugin_009_Read(Settings.TaskDevicePort[event->TaskIndex]);
-        if (state != -1)
-        {
-          if (state != switchstate[event->TaskIndex])
-          {
-            String log = F("MCP  : State ");
-            log += state;
-            addLog(LOG_LEVEL_INFO, log);
-            switchstate[event->TaskIndex] = state;
-            UserVar[event->BaseVarIndex] = state;
-            event->sensorType = SENSOR_TYPE_SWITCH;
-            sendData(event);
+        const int8_t state = Plugin_009_Read(Settings.TaskDevicePort[event->TaskIndex]);
+        /**************************************************************************\
+        20181022 - @giig1967g: new doubleclick logic is:
+        if there is a 'state' change, check debounce period.
+        Then if doubleclick interval exceeded, reset Settings.TaskDevicePluginConfig[event->TaskIndex][7] to 0
+        Settings.TaskDevicePluginConfig[event->TaskIndex][7] contains the current status for doubleclick:
+        0: start counting
+        1: 1st click
+        2: 2nd click
+        3: 3rd click = doubleclick event if inside interval (calculated as: '3rd click time' minus '1st click time')
+
+        Returned EVENT value is = 3 always for doubleclick
+        In rules this can be checked:
+        on Button#Switch=3 do //will fire if doubleclick
+        \**************************************************************************/
+        if (state != -1) {
+          if (state != switchstate[event->TaskIndex]) {
+            //@giig1967g20181022: reset timer for long press
+            Settings.TaskDevicePluginConfigLong[event->TaskIndex][2]=millis();
+            Settings.TaskDevicePluginConfig[event->TaskIndex][6] = false;
+
+            const unsigned long debounceTime = timePassedSince(Settings.TaskDevicePluginConfigLong[event->TaskIndex][0]);
+            if (debounceTime >= (unsigned long)lround(Settings.TaskDevicePluginConfigFloat[event->TaskIndex][0])) //de-bounce check
+            {
+              const unsigned long deltaDC = timePassedSince(Settings.TaskDevicePluginConfigLong[event->TaskIndex][1]);
+              if ((deltaDC >= (unsigned long)lround(Settings.TaskDevicePluginConfigFloat[event->TaskIndex][1])) ||
+                   Settings.TaskDevicePluginConfig[event->TaskIndex][7]==3)
+              {
+                //reset timer for doubleclick
+                Settings.TaskDevicePluginConfig[event->TaskIndex][7]=0;
+                Settings.TaskDevicePluginConfigLong[event->TaskIndex][1]=millis();
+              }
+
+//just to simplify the reading of the code
+#define COUNTER Settings.TaskDevicePluginConfig[event->TaskIndex][7]
+#define DC Settings.TaskDevicePluginConfig[event->TaskIndex][4]
+
+              //check settings for doubleclick according to the settings
+              if ( COUNTER!=0 || ( COUNTER==0 && (DC==3 || (DC==1 && state==0) || (DC==2 && state==1))) )
+                Settings.TaskDevicePluginConfig[event->TaskIndex][7]++;
+#undef DC
+#undef COUNTER
+
+              switchstate[event->TaskIndex] = state;
+
+              byte output_value;
+              boolean sendState = switchstate[event->TaskIndex];
+
+              if (Settings.TaskDevicePin1Inversed[event->TaskIndex])
+                sendState = !sendState;
+
+              if (Settings.TaskDevicePluginConfig[event->TaskIndex][7]==3 && Settings.TaskDevicePluginConfig[event->TaskIndex][4]>0)
+              {
+                output_value = 3; //double click
+              } else {
+                output_value = sendState ? 1 : 0; //single click
+              }
+
+              UserVar[event->BaseVarIndex] = output_value;
+
+              String log = F("MCP  : Port=");
+              log += Settings.TaskDevicePort[event->TaskIndex];
+              log += F(" State=");
+              log += state;
+              log += output_value==3 ? F(" Doubleclick=") : F(" Output value=");
+              log += output_value;
+              addLog(LOG_LEVEL_INFO, log);
+
+              event->sensorType = SENSOR_TYPE_SWITCH;
+              sendData(event);
+
+              //reset Userdata so it displays the correct state value in the web page
+              UserVar[event->BaseVarIndex] = sendState ? 1 : 0;
+
+              Settings.TaskDevicePluginConfigLong[event->TaskIndex][0] = millis();
+            }
           }
+
+//just to simplify the reading of the code
+#define LP Settings.TaskDevicePluginConfig[event->TaskIndex][5]
+#define FIRED Settings.TaskDevicePluginConfig[event->TaskIndex][6]
+
+          //check if LP is enabled and if LP has not fired yet
+          else if (!FIRED && (LP==3 ||(LP==1 && state==0)||(LP==2 && state==1) ) ) {
+
+#undef LP
+#undef FIRED
+
+            /**************************************************************************\
+            20181022 - @giig1967g: new longpress logic is:
+            if there is no 'state' change, check if longpress interval reached
+            When reached send longpress event.
+            Returned Event value = state + 10
+            So if state = 0 => EVENT longpress = 10
+            if state = 1 => EVENT longpress = 11
+            So we can trigger longpress for high or low contact
+
+            In rules this can be checked:
+            on Button#Switch=10 do //will fire if longpress when state = 0
+            on Button#Switch=11 do //will fire if longpress when state = 1
+            \**************************************************************************/
+            const unsigned long deltaLP = timePassedSince(Settings.TaskDevicePluginConfigLong[event->TaskIndex][2]);
+            if (deltaLP >= (unsigned long)lround(Settings.TaskDevicePluginConfigFloat[event->TaskIndex][2]))
+            {
+              byte output_value;
+              Settings.TaskDevicePluginConfig[event->TaskIndex][6] = true; //fired = true
+
+              boolean sendState = state;
+              if (Settings.TaskDevicePin1Inversed[event->TaskIndex])
+                sendState = !sendState;
+
+              output_value = sendState ? 1 : 0;
+              output_value = output_value + 10;
+
+              UserVar[event->BaseVarIndex] = output_value;
+              String log = F("MCP  : LongPress: Port=");
+              log += Settings.TaskDevicePort[event->TaskIndex];
+              log += F(" State=");
+              log += state ? '1' : '0';
+              log += F(" Output value=");
+              log += output_value;
+              addLog(LOG_LEVEL_INFO, log);
+              sendData(event);
+
+              //reset Userdata so it displays the correct state value in the web page
+              UserVar[event->BaseVarIndex] = sendState ? 1 : 0;
+            }
+          }
+        } else if (state != switchstate[event->TaskIndex]) {
+          //set UserVar and switchState = -1 and send EVENT to notify user
+          UserVar[event->BaseVarIndex] = state;
+          switchstate[event->TaskIndex] = state;
+          String log = F("MCP  : Port=");
+          log += Settings.TaskDevicePort[event->TaskIndex];
+          log += F(" is offline (EVENT= -1)");
+          addLog(LOG_LEVEL_INFO, log);
+          sendData(event);
         }
         success = true;
         break;
@@ -102,13 +337,33 @@ boolean Plugin_009(byte function, struct EventStruct *event, String& string)
       {
         // We do not actually read the pin state as this is already done 10x/second
         // Instead we just send the last known state stored in Uservar
-        String log = F("MCP   : State ");
+        String log = F("MCP   : Port=");
+        log += Settings.TaskDevicePort[event->TaskIndex];
+        log += F(" State=");
         log += UserVar[event->BaseVarIndex];
         addLog(LOG_LEVEL_INFO, log);
         success = true;
         break;
       }
 
+    case PLUGIN_REQUEST:
+      {
+        //parseString(string, 1) = device
+        //parseString(string, 2) = command
+        //parseString(string, 3) = gpio number
+
+        // returns pin value using syntax: [plugin#mcpgpio#pinstate#xx]
+        if (string.length()>=16 && string.substring(0,16).equalsIgnoreCase(F("mcpgpio,pinstate")))
+        {
+          int par1;
+          if (validIntFromString(parseString(string, 3), par1)) {
+            string = Plugin_009_Read(par1);
+          }
+          success = true;
+        }
+        break;
+      }
+
     case PLUGIN_WRITE:
       {
         String log = "";
@@ -124,6 +379,28 @@ boolean Plugin_009(byte function, struct EventStruct *event, String& string)
           SendStatus(event->Source, getPinStateJSON(SEARCH_PIN_STATE, PLUGIN_ID_009, event->Par1, log, 0));
         }
 
+        if (command == F("mcpgpiotoggle"))
+        {
+          success = true;
+          byte mode;
+          uint16_t currentState;
+
+          if (hasPinState(PLUGIN_ID_009,event->Par1)) {
+            getPinState(PLUGIN_ID_009, event->Par1, &mode, &currentState);
+          } else {
+            currentState = Plugin_009_Read(event->Par1);
+            mode = PIN_MODE_OUTPUT;
+          }
+
+          if (mode != PIN_MODE_INPUT) {
+            setPinState(PLUGIN_ID_009, event->Par1, PIN_MODE_OUTPUT, !currentState);
+            Plugin_009_Write(event->Par1, !currentState);
+            log = String(F("MCP  : Toggle GPIO ")) + String(event->Par1) + String(F(" Set to ")) + String(!currentState);
+            addLog(LOG_LEVEL_INFO, log);
+            SendStatus(event->Source, getPinStateJSON(SEARCH_PIN_STATE, PLUGIN_ID_009, event->Par1, log, 0));
+          }
+        }
+
         if (command == F("mcppulse"))
         {
           success = true;

src/_P012_LCD.ino

@@ -21,6 +21,9 @@ int Plugin_012_mode = 1;
 #define PLUGIN_NAME_012       "Display - LCD2004"
 #define PLUGIN_VALUENAME1_012 "LCD"
 
+#define P12_Nlines 4        // The number of different lines which can be displayed
+#define P12_Nchars 80
+
 boolean Plugin_012(byte function, struct EventStruct *event, String& string)
 {
   boolean success = false;
@@ -81,9 +84,9 @@ boolean Plugin_012(byte function, struct EventStruct *event, String& string)
         addFormSelector(F("Display Size"), F("plugin_012_size"), 2, options2, optionValues2, choice2);
 
 
-        char deviceTemplate[4][80];
+        char deviceTemplate[P12_Nlines][P12_Nchars];
         LoadCustomTaskSettings(event->TaskIndex, (byte*)&deviceTemplate, sizeof(deviceTemplate));
-        for (byte varNr = 0; varNr < 4; varNr++)
+        for (byte varNr = 0; varNr < P12_Nlines; varNr++)
         {
           addHtml(F("<TR><TD>Line "));
           addHtml(String(varNr + 1));
@@ -122,17 +125,19 @@ boolean Plugin_012(byte function, struct EventStruct *event, String& string)
         Settings.TaskDevicePluginConfig[event->TaskIndex][2] = getFormItemInt(F("plugin_12_timer"));
         Settings.TaskDevicePluginConfig[event->TaskIndex][3] = getFormItemInt(F("plugin_012_mode"));
 
-        char deviceTemplate[4][80];
-        for (byte varNr = 0; varNr < 4; varNr++)
+        char deviceTemplate[P12_Nlines][P12_Nchars];
+        String error;
+        for (byte varNr = 0; varNr < P12_Nlines; varNr++)
         {
-          char argc[25];
-          String arg = F("Plugin_012_template");
-          arg += varNr + 1;
-          arg.toCharArray(argc, 25);
-          String tmpString = WebServer.arg(argc);
-          strncpy(deviceTemplate[varNr], tmpString.c_str(), sizeof(deviceTemplate[varNr]));
+          String argName = F("Plugin_012_template");
+          argName += varNr + 1;
+          if (!safe_strncpy(deviceTemplate[varNr], WebServer.arg(argName), P12_Nchars)) {
+            error += getCustomTaskSettingsError(varNr);
+          }
+        }
+        if (error.length() > 0) {
+          addHtmlError(error);
         }
-
         SaveCustomTaskSettings(event->TaskIndex, (byte*)&deviceTemplate, sizeof(deviceTemplate));
         success = true;
         break;
@@ -194,7 +199,7 @@ boolean Plugin_012(byte function, struct EventStruct *event, String& string)
 
     case PLUGIN_READ:
       {
-        char deviceTemplate[4][80];
+        char deviceTemplate[P12_Nlines][P12_Nchars];
         LoadCustomTaskSettings(event->TaskIndex, (byte*)&deviceTemplate, sizeof(deviceTemplate));
 
         for (byte x = 0; x < Plugin_012_rows; x++)

src/_P013_HCSR04.ino

@@ -10,9 +10,21 @@
 
 #include <Arduino.h>
 #include <map>
-//#include <shared_ptr>
 #include <NewPingESP8266.h>
 
+// PlugIn specific defines
+// operatingMode
+#define OPMODE_VALUE        (0)
+#define OPMODE_STATE        (1)
+
+// measuringUnit
+#define UNIT_CM             (0)
+#define UNIT_INCH           (1)
+
+// filterType
+#define FILTER_NONE         (0)
+#define FILTER_MEDIAN       (1)
+
 // map of sensors
 std::map<unsigned int, std::shared_ptr<NewPingESP8266> > P_013_sensordefs;
 
@@ -36,6 +48,7 @@ boolean Plugin_013(byte function, struct EventStruct *event, String& string)
         Device[deviceCount].SendDataOption = true;
         Device[deviceCount].TimerOption = true;
         Device[deviceCount].GlobalSyncOption = true;
+
         break;
       }
 
@@ -54,20 +67,51 @@ boolean Plugin_013(byte function, struct EventStruct *event, String& string)
 
     case PLUGIN_WEBFORM_LOAD:
       {
-        byte choice = Settings.TaskDevicePluginConfig[event->TaskIndex][0];
-        String options[2];
-        options[0] = F("Value");
-        options[1] = F("State");
-        int optionValues[2] = { 1, 2 };
-        addFormSelector(F("Mode"), F("plugin_013_mode"), 2, options, optionValues, choice);
+        int16_t operatingMode = Settings.TaskDevicePluginConfig[event->TaskIndex][0];
+        int16_t threshold = Settings.TaskDevicePluginConfig[event->TaskIndex][1];
+        int16_t max_distance = Settings.TaskDevicePluginConfig[event->TaskIndex][2];
+        int16_t measuringUnit = Settings.TaskDevicePluginConfig[event->TaskIndex][3];
+        int16_t filterType = Settings.TaskDevicePluginConfig[event->TaskIndex][4];
+        int16_t filterSize = Settings.TaskDevicePluginConfig[event->TaskIndex][5];
 
-        if (Settings.TaskDevicePluginConfig[event->TaskIndex][0] == 2)
-        {
-        	addFormNumericBox(F("Threshold"), F("plugin_013_threshold"), Settings.TaskDevicePluginConfig[event->TaskIndex][1]);
-          addUnit(F("cm"));
+        // default filtersize = 5
+        if (filterSize == 0) {
+          filterSize = 5;
+          Settings.TaskDevicePluginConfig[event->TaskIndex][5] = filterSize;
         }
-        addFormNumericBox(F("Max Distance"), F("plugin_013_max_distance"), Settings.TaskDevicePluginConfig[event->TaskIndex][2], 0, 500);
-        addUnit(F("cm"));
+
+
+        String strUnit = (measuringUnit == UNIT_CM) ? F("cm") : F("inch");
+
+        String optionsOpMode[2];
+        int optionValuesOpMode[2] = { 0, 1 };
+        optionsOpMode[0] = F("Value");
+        optionsOpMode[1] = F("State");
+        addFormSelector(F("Mode"), F("plugin_013_mode"), 2, optionsOpMode, optionValuesOpMode, operatingMode);
+
+        if (operatingMode == OPMODE_STATE)
+        {
+        	addFormNumericBox(F("Threshold"), F("plugin_013_threshold"), threshold);
+          addUnit(strUnit);
+        }
+        addFormNumericBox(F("Max Distance"), F("plugin_013_max_distance"), max_distance, 0, 500);
+        addUnit(strUnit);
+
+        String optionsUnit[2];
+        int optionValuesUnit[2] = { 0, 1 };
+        optionsUnit[0] = F("Metric");
+        optionsUnit[1] = F("Imperial");
+        addFormSelector(F("Unit"), F("plugin_013_Unit"), 2, optionsUnit, optionValuesUnit, measuringUnit);
+
+        String optionsFilter[2];
+        int optionValuesFilter[2] = { 0, 1 };
+        optionsFilter[0] = F("None");
+        optionsFilter[1] = F("Median");
+        addFormSelector(F("Filter"), F("plugin_013_FilterType"), 2, optionsFilter, optionValuesFilter, filterType);
+
+        // enable filtersize option if filter is used,
+        if (filterType != FILTER_NONE)
+        	addFormNumericBox(F("Filter size"), F("plugin_013_FilterSize"), filterSize, 2, 20);
 
         success = true;
         break;
@@ -75,34 +119,60 @@ boolean Plugin_013(byte function, struct EventStruct *event, String& string)
 
     case PLUGIN_WEBFORM_SAVE:
       {
+        int16_t operatingMode = Settings.TaskDevicePluginConfig[event->TaskIndex][0];
+        int16_t filterType = Settings.TaskDevicePluginConfig[event->TaskIndex][4];
+
         Settings.TaskDevicePluginConfig[event->TaskIndex][0] = getFormItemInt(F("plugin_013_mode"));
-        if (Settings.TaskDevicePluginConfig[event->TaskIndex][0] == 2)
-        {
+        if (operatingMode == OPMODE_STATE)
           Settings.TaskDevicePluginConfig[event->TaskIndex][1] = getFormItemInt(F("plugin_013_threshold"));
-        }
         Settings.TaskDevicePluginConfig[event->TaskIndex][2] = getFormItemInt(F("plugin_013_max_distance"));
+
+        Settings.TaskDevicePluginConfig[event->TaskIndex][3] = getFormItemInt(F("plugin_013_Unit"));
+        Settings.TaskDevicePluginConfig[event->TaskIndex][4] = getFormItemInt(F("plugin_013_FilterType"));
+        if (filterType != FILTER_NONE)
+          Settings.TaskDevicePluginConfig[event->TaskIndex][5] = getFormItemInt(F("plugin_013_FilterSize"));
+
         success = true;
         break;
       }
 
     case PLUGIN_INIT:
       {
-        byte Plugin_013_TRIG_Pin = Settings.TaskDevicePin1[event->TaskIndex];
-        byte Plugin_013_IRQ_Pin = Settings.TaskDevicePin2[event->TaskIndex];
-        int16_t max_cm_distance = Settings.TaskDevicePluginConfig[event->TaskIndex][2];
+        int16_t max_distance = Settings.TaskDevicePluginConfig[event->TaskIndex][2];
+        int16_t measuringUnit = Settings.TaskDevicePluginConfig[event->TaskIndex][3];
+        int16_t filterType = Settings.TaskDevicePluginConfig[event->TaskIndex][4];
+        int16_t filterSize = Settings.TaskDevicePluginConfig[event->TaskIndex][5];
+
+        int8_t Plugin_013_TRIG_Pin = Settings.TaskDevicePin1[event->TaskIndex];
+        int8_t Plugin_013_IRQ_Pin = Settings.TaskDevicePin2[event->TaskIndex];
+        int16_t max_distance_cm = (measuringUnit == UNIT_CM) ? max_distance : (float)max_distance * 2.54f;
+
+        // create sensor instance and add to std::map
         P_013_sensordefs.erase(event->TaskIndex);
         P_013_sensordefs[event->TaskIndex] =
-          std::shared_ptr<NewPingESP8266> (new NewPingESP8266(Plugin_013_TRIG_Pin, Plugin_013_IRQ_Pin, max_cm_distance));
+          std::shared_ptr<NewPingESP8266> (new NewPingESP8266(Plugin_013_TRIG_Pin, Plugin_013_IRQ_Pin, max_distance_cm));
+
         String log = F("ULTRASONIC : TaskNr: ");
         log += event->TaskIndex +1;
         log += F(" TrigPin: ");
         log += Plugin_013_TRIG_Pin;
         log += F(" IRQ_Pin: ");
         log += Plugin_013_IRQ_Pin;
-        log += F(" max dist cm: ");
-        log += max_cm_distance;
+        log += F(" max dist ");
+        log += (measuringUnit == UNIT_CM) ? F("[cm]: ") : F("[inch]: ");
+        log += max_distance;
         log += F(" max echo: ");
         log += P_013_sensordefs[event->TaskIndex]->getMaxEchoTime();
+        log += F(" Filter: ");
+        if (filterType == FILTER_NONE)
+          log += F("none");
+        else
+          if (filterType == FILTER_MEDIAN) {
+            log += F("Median size: ");
+            log += filterSize;
+          }
+          else
+            log += F("invalid!");
         log += F(" nr_tasks: ");
         log += P_013_sensordefs.size();
         addLog(LOG_LEVEL_INFO, log);
@@ -120,7 +190,6 @@ boolean Plugin_013(byte function, struct EventStruct *event, String& string)
         log += F(" usec, ");
         addLog(LOG_LEVEL_INFO, log);
 
-
         success = true;
         break;
       }
@@ -133,39 +202,48 @@ boolean Plugin_013(byte function, struct EventStruct *event, String& string)
 
     case PLUGIN_READ: // If we select value mode, read and send the value based on global timer
       {
-        if (Settings.TaskDevicePluginConfig[event->TaskIndex][0] == 1)
+        int16_t operatingMode = Settings.TaskDevicePluginConfig[event->TaskIndex][0];
+        int16_t measuringUnit = Settings.TaskDevicePluginConfig[event->TaskIndex][3];
+
+        if (operatingMode == OPMODE_VALUE)
         {
           float value = Plugin_013_read(event->TaskIndex);
           String log = F("ULTRASONIC : TaskNr: ");
           log += event->TaskIndex +1;
           log += F(" Distance: ");
-          if (value > 0)
+          UserVar[event->BaseVarIndex] = value;
+          log += UserVar[event->BaseVarIndex];
+          log += (measuringUnit == UNIT_CM) ? F(" cm ") : F(" inch ");
+          if (value == NO_ECHO)
           {
-            UserVar[event->BaseVarIndex] = value;
-            log += UserVar[event->BaseVarIndex];
-            success = true;
+             log += F(" Error: ");
+             log += Plugin_013_getErrorStatusString(event->TaskIndex);
           }
-          else
-            log += F("No reading!");
 
-        addLog(LOG_LEVEL_INFO,log);
+          addLog(LOG_LEVEL_INFO,log);
         }
+        success = true;
         break;
       }
 
     case PLUGIN_TEN_PER_SECOND: // If we select state mode, do more frequent checks and send only state changes
       {
-        if (Settings.TaskDevicePluginConfig[event->TaskIndex][0] == 2)
+        int16_t operatingMode = Settings.TaskDevicePluginConfig[event->TaskIndex][0];
+        int16_t threshold = Settings.TaskDevicePluginConfig[event->TaskIndex][1];
+
+        if (operatingMode == OPMODE_STATE)
         {
           byte state = 0;
           float value = Plugin_013_read(event->TaskIndex);
-          if (value > 0)
+          if (value != NO_ECHO)
           {
-            if (value < Settings.TaskDevicePluginConfig[event->TaskIndex][1])
+            if (value < threshold)
               state = 1;
             if (state != switchstate[event->TaskIndex])
             {
-              String log = F("ULTRASONIC : State ");
+              String log = F("ULTRASONIC : TaskNr: ");
+              log += event->TaskIndex +1;
+              log += F(" state: ");
               log += state;
               addLog(LOG_LEVEL_INFO,log);
               switchstate[event->TaskIndex] = state;
@@ -174,6 +252,14 @@ boolean Plugin_013(byte function, struct EventStruct *event, String& string)
               sendData(event);
             }
           }
+          else {
+            String log = F("ULTRASONIC : TaskNr: ");
+            log += event->TaskIndex +1;
+            log += F(" Error: ");
+            log += Plugin_013_getErrorStatusString(event->TaskIndex);
+            addLog(LOG_LEVEL_INFO,log);
+          }
+
         }
         success = true;
         break;
@@ -186,10 +272,82 @@ boolean Plugin_013(byte function, struct EventStruct *event, String& string)
 float Plugin_013_read(unsigned int taskIndex)
 /*********************************************************************/
 {
-  if (P_013_sensordefs.count(taskIndex) == 0) return 0;
-  delay(1);
-  float distance = (P_013_sensordefs[taskIndex])->ping_cm();
-  delay(1);
-  return distance;
+  if (P_013_sensordefs.count(taskIndex) == 0)
+    return 0;
+
+  int16_t max_distance = Settings.TaskDevicePluginConfig[taskIndex][2];
+  int16_t measuringUnit = Settings.TaskDevicePluginConfig[taskIndex][3];
+  int16_t filterType = Settings.TaskDevicePluginConfig[taskIndex][4];
+  int16_t filterSize = Settings.TaskDevicePluginConfig[taskIndex][5];
+  int16_t max_distance_cm = (measuringUnit == UNIT_CM) ? max_distance : (float)max_distance * 2.54f;
+
+  unsigned int echoTime = 0;
+
+  switch  (filterType) {
+    case FILTER_NONE:
+      echoTime = (P_013_sensordefs[taskIndex])->ping();
+      break;
+    case FILTER_MEDIAN:
+      echoTime = (P_013_sensordefs[taskIndex])->ping_median(filterSize, max_distance_cm);
+      break;
+    default:
+      addLog(LOG_LEVEL_INFO, F("invalid Filter Type setting!"));
+  }
+
+  if (measuringUnit == UNIT_CM)
+    return NewPingESP8266::convert_cm_F(echoTime);
+  else
+    return NewPingESP8266::convert_in_F(echoTime);
+}
+
+/*********************************************************************/
+String Plugin_013_getErrorStatusString(unsigned int taskIndex)
+/*********************************************************************/
+{
+  if (P_013_sensordefs.count(taskIndex) == 0)
+    return String(F("invalid taskindex"));
+
+  switch ((P_013_sensordefs[taskIndex])->getErrorState()) {
+    case NewPingESP8266::STATUS_SENSOR_READY: {
+      return String(F("Sensor ready"));
+      break;
+    }
+
+    case NewPingESP8266::STATUS_MEASUREMENT_VALID: {
+      return String(F("no error, measurement valid"));
+      break;
+    }
+
+    case NewPingESP8266::STATUS_ECHO_TRIGGERED: {
+      return String(F("Echo triggered, waiting for Echo end"));
+      break;
+    }
+
+    case NewPingESP8266::STATUS_ECHO_STATE_ERROR: {
+      return String(F("Echo pulse error, Echopin not low on trigger"));
+      break;
+    }
+
+    case NewPingESP8266::STATUS_ECHO_START_TIMEOUT_50ms: {
+      return String(F("Echo timeout error, no echo start whithin 50 ms"));
+      break;
+    }
+
+    case NewPingESP8266::STATUS_ECHO_START_TIMEOUT_DISTANCE: {
+      return String(F("Echo timeout error, no echo start whithin time for max. distance"));
+      break;
+    }
+
+    case NewPingESP8266::STATUS_MAX_DISTANCE_EXCEEDED: {
+      return String(F("Echo too late, maximum distance exceeded"));
+      break;
+    }
+
+    default: {
+      return String(F("unknown error"));
+      break;
+    }
+
+  }
 }
 #endif // USES_P013

src/_P016_IR.ino

@@ -41,6 +41,9 @@ decode_results results;
 #define PLUGIN_NAME_016       "Communication - TSOP4838"
 #define PLUGIN_VALUENAME1_016 "IR"
 
+// A lot of the following code has been taken directly (with permission) from the IRrecvDumpV2.ino example code
+// of the IRremoteESP8266 library. (https://github.com/markszabo/IRremoteESP8266)
+
 // ==================== start of TUNEABLE PARAMETERS ====================
 // As this program is a special purpose capture/decoder, let us use a larger
 // than normal buffer so we can handle Air Conditioner remote codes.
@@ -165,6 +168,8 @@ boolean Plugin_016(byte function, struct EventStruct *event, String& string)
           // Display the basic output of what we found.
           log += resultToHumanReadableBasic(&results);
           addLog(LOG_LEVEL_INFO, log);
+          displayRawToReadableB32Hex();
+
           // Display any extra A/C info if we have it.
           // Display the human readable state of an A/C message if we can.
           log = "";
@@ -233,4 +238,130 @@ boolean Plugin_016(byte function, struct EventStruct *event, String& string)
   return success;
 }
 
+
+#define PCT_TOLERANCE       7u
+#define pct_tolerance(v)    ((v) / (100u / PCT_TOLERANCE))
+//#define MIN_TOLERANCE       10u
+//#define get_tolerance(v)    (pct_tolerance(v) > MIN_TOLERANCE? pct_tolerance(v) : MIN_TOLERANCE)
+#define get_tolerance(v)    (pct_tolerance(v))
+#define MIN_VIABLE_DIV      40u
+#define to_32hex(c)         ((c) < 10 ? (c) + '0' : (c) + 'A' - 10)
+
+// This function attempts to convert the raw IR timings buffer to a short string that can be sent over as
+// an IRSEND HTTP/MQTT command. It analyzes the timings, and searches for a common denominator which can be
+// used to compress the values. If found, it then produces a string consisting of B32 Hex digit for each
+// timing value, appended by the denominators for Pulse and Blank. This string can then be used in an
+// IRSEND command. An important advantage of this string over the current IRSEND RAW B32 format implemented 
+// by GusPS is that it allows easy inspections and modifications after the code is constructed.
+//     
+// Author: Gilad Raz (jazzgil)  23sep2018
+
+void displayRawToReadableB32Hex() {
+    String line;
+    uint16_t div[2];
+
+    // print the values: either pulses or blanks
+    for (uint16_t i = 1; i < results.rawlen; i++)
+        line += uint64ToString(results.rawbuf[i] * RAWTICK, 10) + ",";
+    addLog(LOG_LEVEL_DEBUG, line);
+
+    // Find a common denominator divisor for odd indexes (pulses) and then even indexes (blanks). 
+    for (uint16_t p = 0; p < 2; p++) {
+        uint16_t cd = 0xFFFFU;      // current divisor
+        // find the lowest value to start the divisor with.
+        for (uint16_t i = 1 + p; i < results.rawlen; i += 2) {
+            uint16_t val = results.rawbuf[i] * RAWTICK;
+            if (cd > val) cd = val;
+        }
+        
+        uint16_t bstDiv = -1, bstAvg = 0xFFFFU;
+        float bstMul = 5000;
+        cd += get_tolerance(cd) + 1;
+        //Serial.println(String("p="+ uint64ToString(p, 10) + " start cd=" + uint64ToString(cd, 10)).c_str());
+        // find the best divisor based on lowest avg err, within allowed tolerance.
+        while (--cd >= MIN_VIABLE_DIV) {
+            uint32_t avg = 0;
+            uint16_t totTms = 0;
+            // calculate average error for current divisor, and verify it's within tolerance for all timings.
+            for (uint16_t i = 1 + p; i < results.rawlen; i += 2) {
+                uint16_t val = results.rawbuf[i] * RAWTICK;
+                uint16_t rmdr = val >= cd ? val % cd : cd - val;
+                if (rmdr > get_tolerance(val)) { avg = 0xFFFFU; break; }
+                avg += rmdr;
+                totTms += val / cd + (cd > val? 1 : 0);
+            }
+            if (avg == 0xFFFFU) continue;
+            avg /= results.rawlen / 2;
+            float avgTms = (float)totTms / (results.rawlen / 2);
+            if (avgTms <= bstMul && avg < bstAvg) {
+                bstMul = avgTms;
+                bstAvg = avg;
+                bstDiv = cd;
+                //Serial.println(String("p="+ uint64ToString(p, 10) + " cd=" + uint64ToString(cd, 10) +"  avgErr=" + uint64ToString(avg, 10) + " totTms="+ uint64ToString(totTms, 10) + " avgTms="+ uint64ToString((uint16_t)(avgTms*10), 10) ).c_str());
+            }
+        }
+        if (bstDiv == 0xFFFFU) {
+            addLog(LOG_LEVEL_INFO, "No proper divisor found. Try again...");
+            return;
+        }
+        div[p] = bstDiv;
+
+        line = String(p? "Blank: " : "Pulse: ") + " divisor=" + uint64ToString(bstDiv, 10)
+            +"  avgErr=" + uint64ToString(bstAvg, 10) + " avgMul="+ uint64ToString((uint16_t)bstMul, 10)
+            +'.'+ ((char)((bstMul - (uint16_t)bstMul) * 10 )+ '0');
+        addLog(LOG_LEVEL_DEBUG, line);
+    }
+
+    // Generate the B32 Hex string, per the divisors found.
+    uint16_t total = results.rawlen - 1, tmOut[total];
+    //line = "Timing muls ("+ uint64ToString(total, 10) + "): ";
+
+    for (unsigned int i = 0; i < total; i++) {
+        uint16_t val = results.rawbuf[i+1] * RAWTICK;
+        unsigned int dv = div[(i) & 1];
+        unsigned int tm = val / dv + (val % dv > dv / 2? 1 : 0);
+        tmOut[i] = tm;
+        //line += uint64ToString(tm, 10) + ",";
+    }
+    //Serial.println(line);
+
+    char out[total];
+    unsigned int iOut = 0, s = 2, d = 0;
+    for (; s+1 < total; d = s, s += 2) {
+        unsigned int vals = 2;
+        while (s+1 < total && tmOut[s] == tmOut[d] && tmOut[s+1] == tmOut[d+1]) {
+            vals += 2;
+            s += 2;
+        }
+        if (iOut + 5 > sizeof(out) || tmOut[d] >= 32*32 || tmOut[d+1] >= 32*32 || vals >= 64) {
+            addLog(LOG_LEVEL_INFO, "Raw code too long. Try again...");
+            return;
+        }
+
+        if (vals > 4 || (vals == 4 && (tmOut[d] >= 32 || tmOut[d+1] >= 32))) {
+            out[iOut++] = '*';
+            out[iOut++] = to_32hex(vals / 2);
+            vals = 2;
+        }
+        while (vals--)
+            iOut = storeB32Hex(out, iOut, tmOut[d++]);
+    }
+    while (d < total)
+        iOut = storeB32Hex(out, iOut, tmOut[d++]);
+
+    out[iOut] = 0;
+    line = "IRSEND,RAW2," + String(out) + ",38," + uint64ToString(div[0], 10) +','+ uint64ToString(div[1], 10);
+    addLog(LOG_LEVEL_INFO, line);
+}
+
+unsigned int storeB32Hex(char out[], unsigned int iOut, unsigned int val) {
+    if (val >= 32) {
+        out[iOut++] = '^';
+        out[iOut++] = to_32hex(val/32);
+        val %= 32;
+    }
+    out[iOut++] = to_32hex(val);
+    return iOut;
+}
+
 #endif // USES_P016

src/_P019_PCF8574.ino

@@ -3,15 +3,52 @@
 //#################################### Plugin 019: PCF8574 ##############################################
 //#######################################################################################################
 
+/**************************************************\
+CONFIG
+TaskDevicePluginConfig settings:
+0: send boot state (true,false)
+1:
+2:
+3:
+4: use doubleclick (0,1,2,3)
+5: use longpress (0,1,2,3)
+6: LP fired (true,false)
+7: doubleclick counter (=0,1,2,3)
+
+TaskDevicePluginConfigFloat settings:
+0: debounce interval ms
+1: doubleclick interval ms
+2: longpress interval ms
+3:
+
+TaskDevicePluginConfigLong settings:
+0: clickTime debounce ms
+1: clickTime doubleclick ms
+2: clickTime longpress ms
+3:
+\**************************************************/
+
 #define PLUGIN_019
 #define PLUGIN_ID_019         19
 #define PLUGIN_NAME_019       "Switch input - PCF8574"
 #define PLUGIN_VALUENAME1_019 "Switch"
+#define PLUGIN_019_DOUBLECLICK_MIN_INTERVAL 1000
+#define PLUGIN_019_DOUBLECLICK_MAX_INTERVAL 3000
+#define PLUGIN_019_LONGPRESS_MIN_INTERVAL 1000
+#define PLUGIN_019_LONGPRESS_MAX_INTERVAL 5000
+#define PLUGIN_019_DC_DISABLED 0
+#define PLUGIN_019_DC_LOW 1
+#define PLUGIN_019_DC_HIGH 2
+#define PLUGIN_019_DC_BOTH 3
+#define PLUGIN_019_LONGPRESS_DISABLED 0
+#define PLUGIN_019_LONGPRESS_LOW 1
+#define PLUGIN_019_LONGPRESS_HIGH 2
+#define PLUGIN_019_LONGPRESS_BOTH 3
 
 boolean Plugin_019(byte function, struct EventStruct *event, String& string)
 {
   boolean success = false;
-  static byte switchstate[TASKS_MAX];
+  static int8_t switchstate[TASKS_MAX];
 
   switch (function)
   {
@@ -23,7 +60,7 @@ boolean Plugin_019(byte function, struct EventStruct *event, String& string)
         Device[deviceCount].VType = SENSOR_TYPE_SWITCH;
         Device[deviceCount].Ports = 8;
         Device[deviceCount].PullUpOption = false;
-        Device[deviceCount].InverseLogicOption = false;
+        Device[deviceCount].InverseLogicOption = true;
         Device[deviceCount].FormulaOption = false;
         Device[deviceCount].ValueCount = 1;
         Device[deviceCount].SendDataOption = true;
@@ -49,6 +86,41 @@ boolean Plugin_019(byte function, struct EventStruct *event, String& string)
       {
         addFormCheckBox(F("Send Boot state"), F("plugin_019_boot"), Settings.TaskDevicePluginConfig[event->TaskIndex][0]);
 
+        //@giig1967-20181022
+        addFormSubHeader(F("Advanced event management"));
+
+        addFormNumericBox(F("De-bounce (ms)"), F("plugin_019_debounce"), round(Settings.TaskDevicePluginConfigFloat[event->TaskIndex][0]), 0, 250);
+
+        //set minimum value for doubleclick MIN max speed
+        if (Settings.TaskDevicePluginConfigFloat[event->TaskIndex][1] < PLUGIN_019_DOUBLECLICK_MIN_INTERVAL)
+          Settings.TaskDevicePluginConfigFloat[event->TaskIndex][1] = PLUGIN_019_DOUBLECLICK_MIN_INTERVAL;
+
+        byte choiceDC = Settings.TaskDevicePluginConfig[event->TaskIndex][4];
+        String buttonDC[4];
+        buttonDC[0] = F("Disabled");
+        buttonDC[1] = F("Active only on LOW (EVENT=3)");
+        buttonDC[2] = F("Active only on HIGH (EVENT=3)");
+        buttonDC[3] = F("Active on LOW & HIGH (EVENT=3)");
+        int buttonDCValues[4] = {PLUGIN_019_DC_DISABLED, PLUGIN_019_DC_LOW, PLUGIN_019_DC_HIGH,PLUGIN_019_DC_BOTH};
+        addFormSelector(F("Doubleclick event"), F("plugin_019_dc"), 4, buttonDC, buttonDCValues, choiceDC);
+
+        addFormNumericBox(F("Doubleclick max. interval (ms)"), F("plugin_019_dcmaxinterval"), round(Settings.TaskDevicePluginConfigFloat[event->TaskIndex][1]), PLUGIN_019_DOUBLECLICK_MIN_INTERVAL, PLUGIN_019_DOUBLECLICK_MAX_INTERVAL);
+
+        //set minimum value for longpress MIN max speed
+        if (Settings.TaskDevicePluginConfigFloat[event->TaskIndex][2] < PLUGIN_019_LONGPRESS_MIN_INTERVAL)
+          Settings.TaskDevicePluginConfigFloat[event->TaskIndex][2] = PLUGIN_019_LONGPRESS_MIN_INTERVAL;
+
+        byte choiceLP = Settings.TaskDevicePluginConfig[event->TaskIndex][5];
+        String buttonLP[4];
+        buttonLP[0] = F("Disabled");
+        buttonLP[1] = F("Active only on LOW (EVENT= 10 [NORMAL] or 11 [INVERSED])");
+        buttonLP[2] = F("Active only on HIGH (EVENT= 11 [NORMAL] or 10 [INVERSED])");
+        buttonLP[3] = F("Active on LOW & HIGH (EVENT= 10 or 11)");
+        int buttonLPValues[4] = {PLUGIN_019_LONGPRESS_DISABLED, PLUGIN_019_LONGPRESS_LOW, PLUGIN_019_LONGPRESS_HIGH,PLUGIN_019_LONGPRESS_BOTH};
+        addFormSelector(F("Longpress event"), F("plugin_019_lp"), 4, buttonLP, buttonLPValues, choiceLP);
+
+        addFormNumericBox(F("Longpress min. interval (ms)"), F("plugin_019_lpmininterval"), round(Settings.TaskDevicePluginConfigFloat[event->TaskIndex][2]), PLUGIN_019_LONGPRESS_MIN_INTERVAL, PLUGIN_019_LONGPRESS_MAX_INTERVAL);
+
         success = true;
         break;
       }
@@ -57,6 +129,15 @@ boolean Plugin_019(byte function, struct EventStruct *event, String& string)
       {
         Settings.TaskDevicePluginConfig[event->TaskIndex][0] = isFormItemChecked(F("plugin_019_boot"));
 
+        //@giig1967-20181022
+        Settings.TaskDevicePluginConfigFloat[event->TaskIndex][0] = getFormItemInt(F("plugin_019_debounce"));
+
+        Settings.TaskDevicePluginConfig[event->TaskIndex][4] = getFormItemInt(F("plugin_019_dc"));
+        Settings.TaskDevicePluginConfigFloat[event->TaskIndex][1] = getFormItemInt(F("plugin_019_dcmaxinterval"));
+
+        Settings.TaskDevicePluginConfig[event->TaskIndex][5] = getFormItemInt(F("plugin_019_lp"));
+        Settings.TaskDevicePluginConfigFloat[event->TaskIndex][2] = getFormItemInt(F("plugin_019_lpmininterval"));
+
         success = true;
         break;
       }
@@ -64,31 +145,186 @@ boolean Plugin_019(byte function, struct EventStruct *event, String& string)
     case PLUGIN_INIT:
       {
         // read and store current state to prevent switching at boot time
+        // "state" could be -1, 0 or 1
         switchstate[event->TaskIndex] = Plugin_019_Read(Settings.TaskDevicePort[event->TaskIndex]);
 
         // if boot state must be send, inverse default state
+        // this is done to force the trigger in PLUGIN_TEN_PER_SECOND
         if (Settings.TaskDevicePluginConfig[event->TaskIndex][0])
           switchstate[event->TaskIndex] = !switchstate[event->TaskIndex];
 
+        // @giig1967g-20181022: set initial UserVar of the switch
+        if (switchstate[event->TaskIndex] != -1 && Settings.TaskDevicePin1Inversed[event->TaskIndex]) {
+          UserVar[event->BaseVarIndex] = !switchstate[event->TaskIndex];
+        } else {
+          UserVar[event->BaseVarIndex] = switchstate[event->TaskIndex];
+        }
+
+        // @giig1967g-20181022: doubleclick counter = 0
+        Settings.TaskDevicePluginConfig[event->TaskIndex][7]=0;
+
+        // @giig1967g-20181022: used to track if LP has fired
+        Settings.TaskDevicePluginConfig[event->TaskIndex][6]=false;
+
+        // @giig1967g-20181022: store millis for debounce, doubleclick and long press
+        Settings.TaskDevicePluginConfigLong[event->TaskIndex][0]=millis(); //debounce timer
+        Settings.TaskDevicePluginConfigLong[event->TaskIndex][1]=millis(); //doubleclick timer
+        Settings.TaskDevicePluginConfigLong[event->TaskIndex][2]=millis(); //longpress timer
+
+        // @giig1967g-20181022: set minimum value for doubleclick MIN max speed
+        if (Settings.TaskDevicePluginConfigFloat[event->TaskIndex][1] < PLUGIN_019_DOUBLECLICK_MIN_INTERVAL)
+          Settings.TaskDevicePluginConfigFloat[event->TaskIndex][1] = PLUGIN_019_DOUBLECLICK_MIN_INTERVAL;
+
+        // @giig1967g-20181022: set minimum value for longpress MIN max speed
+        if (Settings.TaskDevicePluginConfigFloat[event->TaskIndex][2] < PLUGIN_019_LONGPRESS_MIN_INTERVAL)
+          Settings.TaskDevicePluginConfigFloat[event->TaskIndex][2] = PLUGIN_019_LONGPRESS_MIN_INTERVAL;
+
+        // @giig1967g-20181022: if it is in the device list we assume it's an input pin
+        setPinState(PLUGIN_ID_019, Settings.TaskDevicePort[event->TaskIndex], PIN_MODE_INPUT, 0);
+
         success = true;
         break;
       }
 
     case PLUGIN_TEN_PER_SECOND:
+
       {
-        int state = Plugin_019_Read(Settings.TaskDevicePort[event->TaskIndex]);
-        if (state != -1)
-        {
-          if (state != switchstate[event->TaskIndex])
-          {
-            String log = F("PCF  : State ");
-            log += state;
-            addLog(LOG_LEVEL_INFO, log);
-            switchstate[event->TaskIndex] = state;
-            UserVar[event->BaseVarIndex] = state;
-            event->sensorType = SENSOR_TYPE_SWITCH;
-            sendData(event);
+        const int8_t state = Plugin_019_Read(Settings.TaskDevicePort[event->TaskIndex]);
+        /**************************************************************************\
+        20181022 - @giig1967g: new doubleclick logic is:
+        if there is a 'state' change, check debounce period.
+        Then if doubleclick interval exceeded, reset Settings.TaskDevicePluginConfig[event->TaskIndex][7] to 0
+        Settings.TaskDevicePluginConfig[event->TaskIndex][7] contains the current status for doubleclick:
+        0: start counting
+        1: 1st click
+        2: 2nd click
+        3: 3rd click = doubleclick event if inside interval (calculated as: '3rd click time' minus '1st click time')
+
+        Returned EVENT value is = 3 always for doubleclick
+        In rules this can be checked:
+        on Button#Switch=3 do //will fire if doubleclick
+        \**************************************************************************/
+        if (state != -1) {
+          if (state != switchstate[event->TaskIndex]) {
+            //@giig1967g20181022: reset timer for long press
+            Settings.TaskDevicePluginConfigLong[event->TaskIndex][2]=millis();
+            Settings.TaskDevicePluginConfig[event->TaskIndex][6] = false;
+
+            const unsigned long debounceTime = timePassedSince(Settings.TaskDevicePluginConfigLong[event->TaskIndex][0]);
+            if (debounceTime >= (unsigned long)lround(Settings.TaskDevicePluginConfigFloat[event->TaskIndex][0])) //de-bounce check
+            {
+              const unsigned long deltaDC = timePassedSince(Settings.TaskDevicePluginConfigLong[event->TaskIndex][1]);
+              if ((deltaDC >= (unsigned long)lround(Settings.TaskDevicePluginConfigFloat[event->TaskIndex][1])) ||
+                   Settings.TaskDevicePluginConfig[event->TaskIndex][7]==3)
+              {
+                //reset timer for doubleclick
+                Settings.TaskDevicePluginConfig[event->TaskIndex][7]=0;
+                Settings.TaskDevicePluginConfigLong[event->TaskIndex][1]=millis();
+              }
+
+//just to simplify the reading of the code
+#define COUNTER Settings.TaskDevicePluginConfig[event->TaskIndex][7]
+#define DC Settings.TaskDevicePluginConfig[event->TaskIndex][4]
+
+              //check settings for doubleclick according to the settings
+              if ( COUNTER!=0 || ( COUNTER==0 && (DC==3 || (DC==1 && state==0) || (DC==2 && state==1))) )
+                Settings.TaskDevicePluginConfig[event->TaskIndex][7]++;
+#undef DC
+#undef COUNTER
+
+              switchstate[event->TaskIndex] = state;
+
+              byte output_value;
+              boolean sendState = switchstate[event->TaskIndex];
+
+              if (Settings.TaskDevicePin1Inversed[event->TaskIndex])
+                sendState = !sendState;
+
+              if (Settings.TaskDevicePluginConfig[event->TaskIndex][7]==3 && Settings.TaskDevicePluginConfig[event->TaskIndex][4]>0)
+              {
+                output_value = 3; //double click
+              } else {
+                output_value = sendState ? 1 : 0; //single click
+              }
+
+              UserVar[event->BaseVarIndex] = output_value;
+
+              String log = F("PCF  : Port=");
+              log += Settings.TaskDevicePort[event->TaskIndex];
+              log += F(" State=");
+              log += state;
+              log += output_value==3 ? F(" Doubleclick=") : F(" Output value=");
+              log += output_value;
+              addLog(LOG_LEVEL_INFO, log);
+
+              event->sensorType = SENSOR_TYPE_SWITCH;
+              sendData(event);
+
+              //reset Userdata so it displays the correct state value in the web page
+              UserVar[event->BaseVarIndex] = sendState ? 1 : 0;
+
+              Settings.TaskDevicePluginConfigLong[event->TaskIndex][0] = millis();
+            }
           }
+
+//just to simplify the reading of the code
+#define LP Settings.TaskDevicePluginConfig[event->TaskIndex][5]
+#define FIRED Settings.TaskDevicePluginConfig[event->TaskIndex][6]
+
+          //check if LP is enabled and if LP has not fired yet
+          else if (!FIRED && (LP==3 ||(LP==1 && state==0)||(LP==2 && state==1) ) ) {
+
+#undef LP
+#undef FIRED
+            /**************************************************************************\
+            20181022 - @giig1967g: new longpress logic is:
+            if there is no 'state' change, check if longpress interval reached
+            When reached send longpress event.
+            Returned Event value = state + 10
+            So if state = 0 => EVENT longpress = 10
+            if state = 1 => EVENT longpress = 11
+            So we can trigger longpress for high or low contact
+
+            In rules this can be checked:
+            on Button#Switch=10 do //will fire if longpress when state = 0
+            on Button#Switch=11 do //will fire if longpress when state = 1
+            \**************************************************************************/
+            const unsigned long deltaLP = timePassedSince(Settings.TaskDevicePluginConfigLong[event->TaskIndex][2]);
+            if (deltaLP >= (unsigned long)lround(Settings.TaskDevicePluginConfigFloat[event->TaskIndex][2]))
+            {
+              byte output_value;
+              Settings.TaskDevicePluginConfig[event->TaskIndex][6] = true; //fired = true
+
+              boolean sendState = state;
+              if (Settings.TaskDevicePin1Inversed[event->TaskIndex])
+                sendState = !sendState;
+
+              output_value = sendState ? 1 : 0;
+              output_value = output_value + 10;
+
+              UserVar[event->BaseVarIndex] = output_value;
+              String log = F("PCF  : LongPress: Port= ");
+              log += Settings.TaskDevicePort[event->TaskIndex];
+              log += F(" State=");
+              log += state ? '1' : '0';
+              log += F(" Output value=");
+              log += output_value;
+              addLog(LOG_LEVEL_INFO, log);
+              sendData(event);
+
+              //reset Userdata so it displays the correct state value in the web page
+              UserVar[event->BaseVarIndex] = sendState ? 1 : 0;
+            }
+          }
+        } else if (state != switchstate[event->TaskIndex]) {
+          //set UserVar and switchState = -1 and send EVENT to notify user
+          UserVar[event->BaseVarIndex] = state;
+          switchstate[event->TaskIndex] = state;
+          String log = F("PCF  : Port=");
+          log += Settings.TaskDevicePort[event->TaskIndex];
+          log += F(" is offline (EVENT= -1)");
+          addLog(LOG_LEVEL_INFO, log);
+          sendData(event);
         }
         success = true;
         break;
@@ -105,6 +341,24 @@ boolean Plugin_019(byte function, struct EventStruct *event, String& string)
         break;
       }
 
+    case PLUGIN_REQUEST:
+      {
+        //parseString(string, 1) = device
+        //parseString(string, 2) = command
+        //parseString(string, 3) = gpio number
+
+        // returns pin value using syntax: [plugin#pcfgpio#pinstate#xx]
+        if (string.length()>=16 && string.substring(0,16).equalsIgnoreCase(F("pcfgpio,pinstate")))
+        {
+          int par1;
+          if (validIntFromString(parseString(string, 3), par1)) {
+            string = Plugin_019_Read(par1);
+          }
+          success = true;
+        }
+        break;
+      }
+
     case PLUGIN_WRITE:
       {
         String log = "";
@@ -128,6 +382,28 @@ boolean Plugin_019(byte function, struct EventStruct *event, String& string)
           SendStatus(event->Source, getPinStateJSON(SEARCH_PIN_STATE, PLUGIN_ID_019, event->Par1, log, 0));
         }
 
+        if (command == F("pcfgpiotoggle"))
+        {
+          success = true;
+          byte mode;
+          uint16_t currentState;
+
+          if (hasPinState(PLUGIN_ID_019,event->Par1)) {
+            getPinState(PLUGIN_ID_019, event->Par1, &mode, &currentState);
+          } else {
+            currentState = Plugin_019_Read(event->Par1);
+            mode = PIN_MODE_OUTPUT;
+          }
+
+          if (mode != PIN_MODE_INPUT) {
+            setPinState(PLUGIN_ID_019, event->Par1, PIN_MODE_OUTPUT, !currentState);
+            Plugin_019_Write(event->Par1, !currentState);
+            log = String(F("PCF  : Toggle GPIO ")) + String(event->Par1) + String(F(" Set to ")) + String(!currentState);
+            addLog(LOG_LEVEL_INFO, log);
+            SendStatus(event->Source, getPinStateJSON(SEARCH_PIN_STATE, PLUGIN_ID_019, event->Par1, log, 0));
+          }
+        }
+
         if (command == F("pcfpulse"))
         {
           success = true;
@@ -187,7 +463,8 @@ boolean Plugin_019(byte function, struct EventStruct *event, String& string)
 //********************************************************************************
 // PCF8574 read
 //********************************************************************************
-int Plugin_019_Read(byte Par1)
+//@giig1967g-20181023: changed to int8_t
+int8_t Plugin_019_Read(byte Par1)
 {
   int8_t state = -1;
   byte unit = (Par1 - 1) / 8;

src/_P020_Ser2Net.ino

@@ -189,6 +189,8 @@ boolean Plugin_020(byte function, struct EventStruct *event, String& string)
 
     case PLUGIN_SERIAL_IN:
       {
+        if (Plugin_020_init)
+        {
         uint8_t serial_buf[P020_BUFFER_SIZE];
         int RXWait = Settings.TaskDevicePluginConfig[event->TaskIndex][0];
         if (RXWait == 0)
@@ -279,6 +281,7 @@ boolean Plugin_020(byte function, struct EventStruct *event, String& string)
         success = true;
         break;
       }
+      }
 
     case PLUGIN_WRITE:
       {

src/_P023_OLED.ino

@@ -15,6 +15,9 @@
 #define PLUGIN_VALUENAME1_023 "OLED"
 #define PLUGIN_023_MAX_DYSPALY 2
 
+#define P23_Nlines 8        // The number of different lines which can be displayed
+#define P23_Nchars 64
+
 struct Plugin_023_OLED_SettingStruct
 {
   Plugin_023_OLED_SettingStruct(): address(0)
@@ -94,7 +97,7 @@ boolean Plugin_023(byte function, struct EventStruct *event, String& string)
         int optionValues4[2] = { 1, 2 };
         addFormSelector(F("Font Width"), F("plugin_023_font_width"), 2, options4, optionValues4, choice4);
 
-        char deviceTemplate[8][64];
+        char deviceTemplate[P23_Nlines][P23_Nchars];
         LoadCustomTaskSettings(event->TaskIndex, (byte*)&deviceTemplate, sizeof(deviceTemplate));
         for (byte varNr = 0; varNr < 8; varNr++)
         {
@@ -117,16 +120,19 @@ boolean Plugin_023(byte function, struct EventStruct *event, String& string)
         Settings.TaskDevicePluginConfig[event->TaskIndex][3] = getFormItemInt(F("plugin_023_size"));
         Settings.TaskDevicePluginConfig[event->TaskIndex][4] = getFormItemInt(F("plugin_023_font_width"));
 
-        char deviceTemplate[8][64];
-        for (byte varNr = 0; varNr < 8; varNr++)
+        char deviceTemplate[P23_Nlines][P23_Nchars];
+        String error;
+        for (byte varNr = 0; varNr < P23_Nlines; varNr++)
         {
-          String arg = F("Plugin_023_template");
-          arg += varNr + 1;
-          String tmpString = WebServer.arg(arg);
-          strncpy(deviceTemplate[varNr], tmpString.c_str(), sizeof(deviceTemplate[varNr])-1);
-          deviceTemplate[varNr][63]=0;
+          String argName = F("Plugin_023_template");
+          argName += varNr + 1;
+          if (!safe_strncpy(deviceTemplate[varNr], WebServer.arg(argName), P23_Nchars)) {
+            error += getCustomTaskSettingsError(varNr);
+          }
+        }
+        if (error.length() > 0) {
+          addHtmlError(error);
         }
-
         SaveCustomTaskSettings(event->TaskIndex, (byte*)&deviceTemplate, sizeof(deviceTemplate));
         success = true;
         break;
@@ -203,7 +209,7 @@ boolean Plugin_023(byte function, struct EventStruct *event, String& string)
 
     case PLUGIN_READ:
       {
-        char deviceTemplate[8][64];
+        char deviceTemplate[P23_Nlines][P23_Nchars];
         LoadCustomTaskSettings(event->TaskIndex, (byte*)&deviceTemplate, sizeof(deviceTemplate));
         int index = Settings.TaskDevicePluginConfig[event->TaskIndex][0] == 0x3C
           ? 0
@@ -228,8 +234,10 @@ boolean Plugin_023(byte function, struct EventStruct *event, String& string)
           ? 0
           : 1;
         String arguments = String(string);
+
+        //Fixed bug #1864
         int dotPos = arguments.indexOf('.');
-        if(dotPos > -1)
+        if(dotPos > -1 && arguments.substring(dotPos,dotPos+4).equalsIgnoreCase(F("oled")))
         {
           LoadTaskSettings(event->TaskIndex);
           String name = arguments.substring(0,dotPos);
@@ -245,6 +253,7 @@ boolean Plugin_023(byte function, struct EventStruct *event, String& string)
           }
         }
 
+
         int argIndex = arguments.indexOf(',');
         if (argIndex)
           arguments = arguments.substring(0, argIndex);

src/_P026_Sysinfo.ino

@@ -41,7 +41,7 @@ boolean Plugin_026(byte function, struct EventStruct *event, String& string)
     case PLUGIN_WEBFORM_LOAD:
       {
         byte choice = Settings.TaskDevicePluginConfig[event->TaskIndex][0];
-        String options[10];
+        String options[11];
         options[0] = F("Uptime");
         options[1] = F("Free RAM");
         options[2] = F("Wifi RSSI");
@@ -52,7 +52,8 @@ boolean Plugin_026(byte function, struct EventStruct *event, String& string)
         options[7] = F("IP 3.Octet");
         options[8] = F("IP 4.Octet");
         options[9] = F("Web activity");
-        addFormSelector(F("Indicator"), F("plugin_026"), 10, options, NULL, choice);
+        options[10] = F("Free Stack");
+        addFormSelector(F("Indicator"), F("plugin_026"), 11, options, NULL, choice);
 
         success = true;
         break;
@@ -124,6 +125,11 @@ boolean Plugin_026(byte function, struct EventStruct *event, String& string)
             value = (millis()-lastWeb)/1000; // respond in seconds
             break;
           }
+          case 10:
+          {
+            value = getCurrentFreeStack();
+            break;
+          }
         }
         UserVar[event->BaseVarIndex] = value;
         String log = F("SYS  : ");

src/_P035_IRTX.ino

@@ -16,6 +16,8 @@ IRsend *Plugin_035_irSender;
 #define PLUGIN_ID_035         35
 #define PLUGIN_NAME_035       "Communication - IR Transmit"
 
+#define from_32hex(c) ((((c) | ('A' ^ 'a')) - '0') % 39)
+
 boolean Plugin_035(byte function, struct EventStruct *event, String& string)
 {
   boolean success = false;
@@ -86,7 +88,7 @@ boolean Plugin_035(byte function, struct EventStruct *event, String& string)
 
           if (GetArgv(command, TmpStr1, 100, 2)) IrType = TmpStr1;
 
-          if (IrType.equalsIgnoreCase(F("RAW"))) {
+          if (IrType.equalsIgnoreCase(F("RAW")) || IrType.equalsIgnoreCase(F("RAW2"))) {
             String IrRaw;
             uint16_t IrHz=0; 
             unsigned int IrPLen=0;
@@ -115,86 +117,120 @@ boolean Plugin_035(byte function, struct EventStruct *event, String& string)
 
             uint16_t buf[200]; 
             uint16_t idx = 0;
-            unsigned int c0 = 0; //count consecutives 0s
-            unsigned int c1 = 0; //count consecutives 1s
+            if (IrType.equalsIgnoreCase(F("RAW"))) {
+                unsigned int c0 = 0; //count consecutives 0s
+                unsigned int c1 = 0; //count consecutives 1s
 
-            printWebString += F("Interpreted RAW Code: ");
-            //Loop throught every char in RAW string
-            for(unsigned int i = 0; i < IrRaw.length(); i++)
-            {
-              //Get the decimal value from base32 table
-              //See: https://en.wikipedia.org/wiki/Base32#base32hex
-              char c = ((IrRaw[i] | ('A' ^ 'a')) - '0') % 39;
+                printWebString += F("Interpreted RAW Code: ");
+                //Loop throught every char in RAW string
+                for(unsigned int i = 0; i < IrRaw.length(); i++)
+                {
+                  //Get the decimal value from base32 table
+                  //See: https://en.wikipedia.org/wiki/Base32#base32hex
+                  char c = from_32hex(IrRaw[i]);
 
-              //Loop through 5 LSB (bits 16, 8, 4, 2, 1)
-              for (unsigned int shft = 1; shft < 6; shft++)
-              {
-                //if bit is 1 (5th position - 00010000 = 16)
-                if ((c & 16) != 0) {
-                  //add 1 to counter c1
-                  c1++;
-                  //if we already have any 0s in counting (the previous
-                  //bit was 0)
-                  if (c0 > 0) {
-                    //add the total ms into the buffer (number of 0s multiplied
-                    //by defined blank length ms)
-                    buf[idx++] = c0 * IrBLen;
-                    //print the number of 0s just for debuging/info purpouses
-                    for (uint t = 0; t < c0; t++)
-                      printWebString += F("0");
-                  }
-                  //So, as we receive a "1", and processed the counted 0s
-                  //sending them as a ms timing into the buffer, we clear
-                  //the 0s counter
-                  c0 = 0;
-                } else {
-                  //So, bit is 0
+                  //Loop through 5 LSB (bits 16, 8, 4, 2, 1)
+                  for (unsigned int shft = 1; shft < 6; shft++)
+                  {
+                    //if bit is 1 (5th position - 00010000 = 16)
+                    if ((c & 16) != 0) {
+                      //add 1 to counter c1
+                      c1++;
+                      //if we already have any 0s in counting (the previous
+                      //bit was 0)
+                      if (c0 > 0) {
+                        //add the total ms into the buffer (number of 0s multiplied
+                        //by defined blank length ms)
+                        buf[idx++] = c0 * IrBLen;
+                        //print the number of 0s just for debuging/info purpouses
+                        for (uint t = 0; t < c0; t++)
+                          printWebString += F("0");
+                      }
+                      //So, as we receive a "1", and processed the counted 0s
+                      //sending them as a ms timing into the buffer, we clear
+                      //the 0s counter
+                      c0 = 0;
+                    } else {
+                      //So, bit is 0
 
-                  //On first call, ignore 0s (suppress left-most 0s)
-                  if (c0+c1 != 0) {
-                    //add 1 to counter c0
-                    c0++;
-                    //if we already have any 1s in counting (the previous
-                    //bit was 1)
-                    if (c1 > 0) {
-                      //add the total ms into the buffer (number of 1s
-                      //multiplied by defined pulse length ms)
-                      buf[idx++] = c1 * IrPLen;
-                      //print the number of 1s just for debugging/info purposes
-                      for (uint t = 0; t < c1; t++)
-                        printWebString += F("1");
+                      //On first call, ignore 0s (suppress left-most 0s)
+                      if (c0+c1 != 0) {
+                        //add 1 to counter c0
+                        c0++;
+                        //if we already have any 1s in counting (the previous
+                        //bit was 1)
+                        if (c1 > 0) {
+                          //add the total ms into the buffer (number of 1s
+                          //multiplied by defined pulse length ms)
+                          buf[idx++] = c1 * IrPLen;
+                          //print the number of 1s just for debugging/info purposes
+                          for (uint t = 0; t < c1; t++)
+                            printWebString += F("1");
+                        }
+                        //So, as we receive a "0", and processed the counted 1s
+                        //sending them as a ms timing into the buffer, we clear
+                        //the 1s counter
+                        c1 = 0;
+                      }
                     }
-                    //So, as we receive a "0", and processed the counted 1s
-                    //sending them as a ms timing into the buffer, we clear
-                    //the 1s counter
-                    c1 = 0;
+                    //shift to left the "c" variable to process the next bit that is
+                    //in 5th position (00010000 = 16)
+                    c <<= 1;
                   }
                 }
-                //shift to left the "c" variable to process the next bit that is
-                //in 5th position (00010000 = 16)
-                c <<= 1;
-              }
+
+                //Finally, we need to process the last counted bit that we were
+                //processing
+
+                //If we have pendings 0s
+                if (c0 > 0) {
+                  buf[idx++] = c0 * IrBLen;
+                  for (uint t = 0; t < c0; t++)
+                    printWebString += F("0");
+                }
+                //If we have pendings 1s
+                if (c1 > 0) {
+                  buf[idx++] = c1 * IrPLen;
+                  for (uint t = 0; t < c1; t++)
+                    printWebString += F("1");
+                }
+
+                printWebString += F("<BR>");
+
+            } else {        // RAW2
+                for (unsigned int i = 0, total = IrRaw.length(), gotRep = 0, rep = 0; i < total;) {
+                   char c = IrRaw[i++];
+                   if (c == '*') {
+                       if (i+2 >= total || idx + (rep = from_32hex(IrRaw[i++])) * 2 > sizeof(buf))
+                           return addErrorTrue("Invalid RAW2 B32 encoding!");
+                       gotRep = 2;
+                   } else {
+                       if ((c == '^' && i+1 >= total) || idx == sizeof(buf))
+                           return addErrorTrue("Invalid RAW2 B32 encoding!");
+
+                       uint16_t irLen = (idx & 1)? IrBLen : IrPLen;
+                       if (c == '^') {
+                           buf[idx++] = (from_32hex(IrRaw[i]) * 32 + from_32hex(IrRaw[i+1])) * irLen;
+                           i += 2;
+                       } else
+                           buf[idx++] = from_32hex(c) * irLen;
+
+                       if (--gotRep == 0) {
+                           while (--rep) {
+                               buf[idx] = buf[idx-2];
+                               buf[idx+1] = buf[idx-1];
+                               idx += 2;
+                           }
+                       }
+                   }
+                }
             }
 
-            //Finally, we need to process the last counted bit that we were
-            //processing
-
-            //If we have pendings 0s
-            if (c0 > 0) {
-              buf[idx] = c0 * IrBLen;
-              for (uint t = 0; t < c0; t++)
-                printWebString += F("0");
-            }
-            //If we have pendings 1s
-            if (c1 > 0) {
-              buf[idx] = c1 * IrPLen;
-              for (uint t = 0; t < c1; t++)
-                printWebString += F("1");
-            }
-
-            printWebString += F("<BR>");
-
-            Plugin_035_irSender->sendRaw(buf, idx+1, IrHz);
+            Plugin_035_irSender->sendRaw(buf, idx, IrHz);
+            //String line = "";
+            //for (int i = 0; i < idx; i++)
+            //    line += uint64ToString(buf[i], 10) + ",";
+            //Serial.println(line);
 
             //sprintf_P(log, PSTR("IR Params1: Hz:%u - PLen: %u - BLen: %u"), IrHz, IrPLen, IrBLen);
             //addLog(LOG_LEVEL_INFO, log);
@@ -205,7 +241,7 @@ boolean Plugin_035(byte function, struct EventStruct *event, String& string)
           //  unsigned long IrSecondCode=0UL;
             char ircodestr[100];
             if (GetArgv(command, TmpStr1,100, 2)) IrType = TmpStr1;
-                       if (GetArgv(command, TmpStr1, 100, 3)){ IrCode = strtoul(TmpStr1, NULL, 16);
+                       if (GetArgv(command, TmpStr1, 100, 3)){ IrCode = strtoull(TmpStr1, NULL, 16);
                                                           memcpy(ircodestr, TmpStr1, sizeof(TmpStr1[0])*100);
                                                         }
             //if (GetArgv(command, TmpStr1, 100, 4)) IrBits = str2int(TmpStr1); //not needed any more... leave it for reverce compatibility or remove it and break existing instalations?
@@ -256,7 +292,7 @@ boolean Plugin_035(byte function, struct EventStruct *event, String& string)
             if (IrType.equalsIgnoreCase(F("GICable"))) Plugin_035_irSender->sendGICable(IrCode);
           }
 
-          addLog(LOG_LEVEL_INFO, F("IRTX :IR Code Sent"));
+          addLog(LOG_LEVEL_INFO, (String("IRTX :IR Code Sent: ") + IrType).c_str());
           if (printToWeb)
           {
             printWebString += F("IR Code Sent ");
@@ -274,7 +310,13 @@ boolean Plugin_035(byte function, struct EventStruct *event, String& string)
   return success;
 }
 
+boolean addErrorTrue(const char *str) {
+    addLog(LOG_LEVEL_ERROR, str);
+    return true;
+}
 
+// A lot of the following code has been taken directly (with permission) from the IRMQTTServer.ino example code
+// of the IRremoteESP8266 library. (https://github.com/markszabo/IRremoteESP8266)
 // Parse an Air Conditioner A/C Hex String/code and send it.
 // Args:
 //   irType: Nr. of the protocol we need to send.
@@ -615,4 +657,4 @@ uint16_t countValuesInStr(const String str, char sep) {
 //  }
 //  return result;
 //}
-#endif // USES_P035
+#endif // USES_P035

src/_P036_FrameOLED.ino

@@ -180,15 +180,18 @@ boolean Plugin_036(byte function, struct EventStruct *event, String& string)
         Settings.TaskDevicePluginConfig[event->TaskIndex][5] = getFormItemInt(F("plugin_036_controler"));
         Settings.TaskDevicePluginConfig[event->TaskIndex][6] = getFormItemInt(F("plugin_036_contrast"));
 
-        String argName;
-
+        String error;
         for (byte varNr = 0; varNr < P36_Nlines; varNr++)
         {
-          argName = F("Plugin_036_template");
+          String argName = F("Plugin_036_template");
           argName += varNr + 1;
-          strncpy(P036_deviceTemplate[varNr], WebServer.arg(argName).c_str(), sizeof(P036_deviceTemplate[varNr]));
+          if (!safe_strncpy(P036_deviceTemplate[varNr], WebServer.arg(argName), P36_Nchars)) {
+            error += getCustomTaskSettingsError(varNr);
+          }
+        }
+        if (error.length() > 0) {
+          addHtmlError(error);
         }
-
         SaveCustomTaskSettings(event->TaskIndex, (byte*)&P036_deviceTemplate, sizeof(P036_deviceTemplate));
 
         success = true;

src/_P037_MQTTImport.ino

@@ -41,6 +41,7 @@ void Plugin_037_try_connect() {
   if (MQTTclient_037_connected) return;
   // workaround see: https://github.com/esp8266/Arduino/issues/4497#issuecomment-373023864
   espclient_037 = WiFiClient();
+  espclient_037.setTimeout(CONTROLLER_CLIENTTIMEOUT_DFLT);
 
   if (MQTTclient_037 == NULL) {
     MQTTclient_037 = new PubSubClient(espclient_037);
@@ -62,6 +63,8 @@ void Plugin_037_update_connect_status() {
   }
   if (MQTTclient_037_connected != connected) {
     MQTTclient_037_connected = !MQTTclient_037_connected;
+    P037_MQTTImport_connected  = MQTTclient_037_connected;
+
     if (Settings.UseRules) {
       String event = connected ? F("MQTTimport#Connected") : F("MQTTimport#Disconnected");
       rulesProcessing(event);
@@ -69,6 +72,7 @@ void Plugin_037_update_connect_status() {
     if (!connected) {
       // workaround see: https://github.com/esp8266/Arduino/issues/4497#issuecomment-373023864
       espclient_037 = WiFiClient();
+      espclient_037.setTimeout(CONTROLLER_CLIENTTIMEOUT_DFLT);
       ++reconnectCount;
       addLog(LOG_LEVEL_ERROR, F("IMPT : MQTT 037 Connection lost"));
     }
@@ -390,7 +394,7 @@ boolean MQTTConnect_037()
     Plugin_037_update_connect_status();
     return false; // Not connected, so no use in wasting time to connect to a host.
   }
-  ControllerSettingsStruct ControllerSettings;
+  MakeControllerSettings(ControllerSettings);
   LoadControllerSettings(enabledMqttController, ControllerSettings);
   if (ControllerSettings.UseDNS) {
     MQTTclient_037->setServer(ControllerSettings.getHost().c_str(), ControllerSettings.Port);

src/_P059_Encoder.ino

@@ -22,7 +22,7 @@
 
 #include <QEIx4.h>
 
-QEIx4* Plugin_059_QE = NULL;
+std::map<unsigned int, std::shared_ptr<QEIx4> > P_059_sensordefs;
 
 #ifndef CONFIG
 #define CONFIG(n) (Settings.TaskDevicePluginConfig[event->TaskIndex][n])
@@ -108,12 +108,13 @@ boolean Plugin_059(byte function, struct EventStruct *event, String& string)
 
     case PLUGIN_INIT:
       {
-        if (!Plugin_059_QE)
-          Plugin_059_QE = new QEIx4;
+        // create sensor instance and add to std::map
+        P_059_sensordefs.erase(event->TaskIndex);
+        P_059_sensordefs[event->TaskIndex] = std::shared_ptr<QEIx4>(new QEIx4);
 
-        Plugin_059_QE->begin(PIN(0),PIN(1),PIN(2),CONFIG(0));
-        Plugin_059_QE->setLimit(CONFIG_L(0), CONFIG_L(1));
-        Plugin_059_QE->setIndexTrigger(true);
+        P_059_sensordefs[event->TaskIndex]->begin(PIN(0),PIN(1),PIN(2),CONFIG(0));
+        P_059_sensordefs[event->TaskIndex]->setLimit(CONFIG_L(0), CONFIG_L(1));
+        P_059_sensordefs[event->TaskIndex]->setIndexTrigger(true);
 
         ExtraTaskSettings.TaskDeviceValueDecimals[event->BaseVarIndex] = 0;
 
@@ -135,13 +136,19 @@ boolean Plugin_059(byte function, struct EventStruct *event, String& string)
         break;
       }
 
+    case PLUGIN_EXIT:
+      {
+        P_059_sensordefs.erase(event->TaskIndex);
+        break;
+      }
+
     case PLUGIN_TEN_PER_SECOND:
       {
-        if (Plugin_059_QE)
+        if (P_059_sensordefs.count(event->TaskIndex) != 0)
         {
-          if (Plugin_059_QE->hasChanged())
+          if (P_059_sensordefs[event->TaskIndex]->hasChanged())
           {
-            long c = Plugin_059_QE->read();
+            long c = P_059_sensordefs[event->TaskIndex]->read();
             UserVar[event->BaseVarIndex] = (float)c;
             event->sensorType = SENSOR_TYPE_SWITCH;
 
@@ -159,9 +166,9 @@ boolean Plugin_059(byte function, struct EventStruct *event, String& string)
 
     case PLUGIN_READ:
       {
-        if (Plugin_059_QE)
+        if (P_059_sensordefs.count(event->TaskIndex) != 0)
         {
-          UserVar[event->BaseVarIndex] = (float)Plugin_059_QE->read();
+          UserVar[event->BaseVarIndex] = (float)P_059_sensordefs[event->TaskIndex]->read();
         }
         success = true;
         break;
@@ -169,7 +176,7 @@ boolean Plugin_059(byte function, struct EventStruct *event, String& string)
 
     case PLUGIN_WRITE:
       {
-        if (Plugin_059_QE)
+        if (P_059_sensordefs.count(event->TaskIndex) != 0)
         {
             String log = "";
             String command = parseString(string, 1);
@@ -179,7 +186,7 @@ boolean Plugin_059(byte function, struct EventStruct *event, String& string)
               {
                 log = String(F("QEI  : ")) + string;
                 addLog(LOG_LEVEL_INFO, log);
-                Plugin_059_QE->write(event->Par1);
+                P_059_sensordefs[event->TaskIndex]->write(event->Par1);
               }
               success = true; // Command is handled.
             }

src/_P067_HX711_Load_Cell.ino

@@ -1,4 +1,4 @@
-#ifdef USES_P067
+#ifdef USES_P067
 //#######################################################################################################
 //#################################### Plugin 063: _P067_HX711_Load_Cell ################################
 //#######################################################################################################
@@ -28,8 +28,8 @@
 #define PIN(n) (Settings.TaskDevicePin[n][event->TaskIndex])
 #endif
 
-int32_t Plugin_067_OversamplingValue = 0;
-int16_t Plugin_067_OversamplingCount = 0;
+std::map<byte, int32_t> Plugin_067_OversamplingValue;
+std::map<byte, int16_t> Plugin_067_OversamplingCount;
 
 
 void initHX711(int16_t pinSCL, int16_t pinDOUT)
@@ -157,8 +157,8 @@ boolean Plugin_067(byte function, struct EventStruct *event, String& string)
         if (isFormItemChecked(F("tare")))
         {
           Settings.TaskDevicePluginConfigFloat[event->TaskIndex][3] = -UserVar[event->BaseVarIndex + 1];
-          Plugin_067_OversamplingValue = 0;
-          Plugin_067_OversamplingCount = 0;
+          Plugin_067_OversamplingValue[event->TaskIndex] = 0;
+          Plugin_067_OversamplingCount[event->TaskIndex] = 0;
         }
         else
         {
@@ -190,6 +190,8 @@ boolean Plugin_067(byte function, struct EventStruct *event, String& string)
 
         if (pinSCL >= 0 && pinDOUT >= 0)
         {
+          Plugin_067_OversamplingValue[event->TaskIndex]=0;
+          Plugin_067_OversamplingCount[event->TaskIndex]=0;
           initHX711(pinSCL, pinDOUT);
         }
 
@@ -202,7 +204,7 @@ boolean Plugin_067(byte function, struct EventStruct *event, String& string)
         int16_t pinSCL = PIN(0);
         int16_t pinDOUT = PIN(1);
 
-        if (Plugin_067_OversamplingCount < 250)
+        if (Plugin_067_OversamplingCount[event->TaskIndex] < 250)
         if (pinSCL >= 0 && pinDOUT >= 0)
         if (isReadyHX711(pinSCL, pinDOUT))
         {
@@ -210,13 +212,13 @@ boolean Plugin_067(byte function, struct EventStruct *event, String& string)
 
           if (CONFIG(0))   //Oversampling?
           {
-            Plugin_067_OversamplingValue += value;
-            Plugin_067_OversamplingCount ++;
+            Plugin_067_OversamplingValue[event->TaskIndex] += value;
+            Plugin_067_OversamplingCount[event->TaskIndex] ++;
           }
           else   //use last value
           {
-            Plugin_067_OversamplingValue = value;
-            Plugin_067_OversamplingCount = 1;
+            Plugin_067_OversamplingValue[event->TaskIndex] = value;
+            Plugin_067_OversamplingCount[event->TaskIndex] = 1;
           }
         }
 
@@ -228,11 +230,11 @@ boolean Plugin_067(byte function, struct EventStruct *event, String& string)
       {
         String log = F("HX711: Value: ");
 
-        if (Plugin_067_OversamplingCount > 0)
+        if (Plugin_067_OversamplingCount[event->TaskIndex] > 0)
         {
-          UserVar[event->BaseVarIndex + 1] = (float)Plugin_067_OversamplingValue / Plugin_067_OversamplingCount;
-          Plugin_067_OversamplingValue = 0;
-          Plugin_067_OversamplingCount = 0;
+          UserVar[event->BaseVarIndex + 1] = (float)Plugin_067_OversamplingValue[event->TaskIndex] / Plugin_067_OversamplingCount[event->TaskIndex];
+          Plugin_067_OversamplingValue[event->TaskIndex] = 0;
+          Plugin_067_OversamplingCount[event->TaskIndex] = 0;
 
           UserVar[event->BaseVarIndex] = UserVar[event->BaseVarIndex + 1] + Settings.TaskDevicePluginConfigFloat[event->TaskIndex][3];   //Offset
 
@@ -272,8 +274,8 @@ boolean Plugin_067(byte function, struct EventStruct *event, String& string)
           String log = F("HX711: tare");
 
           Settings.TaskDevicePluginConfigFloat[event->TaskIndex][3] = -UserVar[event->BaseVarIndex + 1];
-          Plugin_067_OversamplingValue = 0;
-          Plugin_067_OversamplingCount = 0;
+          Plugin_067_OversamplingValue[event->TaskIndex] = 0;
+          Plugin_067_OversamplingCount[event->TaskIndex] = 0;
 
           addLog(LOG_LEVEL_INFO, log);
           success = true;
@@ -281,8 +283,15 @@ boolean Plugin_067(byte function, struct EventStruct *event, String& string)
         break;
       }
 
+    case PLUGIN_EXIT:
+      {
+        Plugin_067_OversamplingValue.erase(event->TaskIndex);
+        Plugin_067_OversamplingCount.erase(event->TaskIndex);
+        break;
+      }
+
   }
   return success;
 }
 
-#endif // USES_P067
+#endif // USES_P067

src/_P075_Nextion.ino

@@ -2,11 +2,16 @@
 //#######################################################################################################
 //################################### Plugin 075: Nextion <info@sensorio.cz>  ###########################
 //###################################   Created on the work of  majklovec     ###########################
-//###################################    Revisions by BertB and ThomasB       ########################### 
-//###################################    Last Revision: Aug-03-2018 (TB)      ###########################
+//###################################    Revisions by BertB and ThomasB       ###########################
+//###################################    Last Revision: Oct-03-2018 (TB)      ###########################
 //#######################################################################################################
 //
-// Updated: Aug-03-2018, ThomasB.
+// Updated: Oct-03-2018, ThomasB.
+// Added DEBUG_LOG define to reduce info log messages and prevent serial log flooding.
+// Added SendStatus() to post log message on browser to acknowledge HTTP write.
+// Added reserve() to minimize string memory allocations.
+//
+// Aug-03-2018 change log summary:
 // This updated Nextion Plugin introduces hardware (UART) serial as an alternative to SoftSerial.
 // Hardware serial offers more reliable communication with the Nextion display.
 // Created on the experimental Serial.swap() work of BertB.
@@ -19,6 +24,9 @@
 // Defines start here
 // *****************************************************************************************************
 
+//#define DEBUG_LOG             // Enable this to include additional info messages in log output.
+
+
 // Plug-In defines
 #define PLUGIN_075
 #define PLUGIN_ID_075 75
@@ -28,18 +36,18 @@
 #define PLUGIN_VALUENAME2_075 "value"
 
 // Configuration Settings. Custom Configuration Memory must be less than 1024 Bytes (per TD'er findings).
-//#define Nlines 12             // Custom Config, Number of user entered Command Statment Lines. DO NOT USE!
-//#define Lenlines 64           // Custom Config, Length of user entered Command Statment Lines. DO NOT USE!
-#define Nlines 10               // Custom Config, Number of user entered Command Statments. 
-#define Lenlines 51             // Custom Config, Length of user entered Command Statments.
+//#define P75_Nlines 12             // Custom Config, Number of user entered Command Statment Lines. DO NOT USE!
+//#define P75_Nchars 64           // Custom Config, Length of user entered Command Statment Lines. DO NOT USE!
+#define P75_Nlines 10               // Custom Config, Number of user entered Command Statments.
+#define P75_Nchars 51             // Custom Config, Length of user entered Command Statments.
 
 // Nextion defines
-#define RXBUFFSZ  64            // Serial RxD buffer (Local staging buffer and ESPeasySoftwareSerial).  
+#define RXBUFFSZ  64            // Serial RxD buffer (Local staging buffer and ESPeasySoftwareSerial).
 #define RXBUFFWARN RXBUFFSZ-16  // Warning, Rx buffer close to being full.
 #define TOUCH_BASE 500          // Base offset for 0X65 Touch Event Send Component ID.
 
 // Serial defines
-#define B9600    0  
+#define B9600    0
 #define B38400   1
 #define B57600   2
 #define B115200  3
@@ -50,7 +58,7 @@
 
 // Global vars
 ESPeasySoftwareSerial *SoftSerial = NULL;
-char deviceTemplate[Nlines][Lenlines]; 
+char deviceTemplate[P75_Nlines][P75_Nchars];
 int rxPin = -1;
 int txPin = -1;
 
@@ -59,10 +67,10 @@ int txPin = -1;
 // PlugIn starts here
 // *****************************************************************************************************
 
-boolean Plugin_075(byte function, struct EventStruct *event, String& string) 
+boolean Plugin_075(byte function, struct EventStruct *event, String& string)
 {
   boolean success = false;
-  static uint8_t BaudCode = 0;                          // Web GUI baud rate drop down. 9600 if 0, See array for other rates. 
+  static uint8_t BaudCode = 0;                          // Web GUI baud rate drop down. 9600 if 0, See array for other rates.
   static boolean HwSerial = SOFTSERIAL;                 // Serial mode, hardware uart or softserial.
   static boolean AdvHwSerial = false;                   // Web GUI checkbox flag; false = softserial mode, true = hardware UART serial.
   static boolean IncludeValues = false;                 // Web GUI checkbox flag; false = don't send idx & value data at interval.
@@ -126,7 +134,7 @@ boolean Plugin_075(byte function, struct EventStruct *event, String& string)
       if (!((rxPin == 3 && txPin == 1) || (rxPin == 13 && txPin == 15))) { // Hardware Serial Compatible?
         Settings.TaskDevicePluginConfig[event->TaskIndex][0] = false;      // Not HW serial compatible, Reset Check Box.
       }
-      
+
       if (rxPin == 3 && txPin == 1) {                                      // UART USB Port?
         if(Settings.TaskDevicePluginConfig[event->TaskIndex][0]==false &&  // Hardware serial currently disabled.
          Settings.TaskDeviceEnabled[event->TaskIndex] == true) {           // Plugin is enabled.
@@ -134,10 +142,10 @@ boolean Plugin_075(byte function, struct EventStruct *event, String& string)
         }
       }
 
-      if (Settings.TaskDevicePluginConfig[event->TaskIndex][0] == false) { // SoftSerial mode. 
+      if (Settings.TaskDevicePluginConfig[event->TaskIndex][0] == false) { // SoftSerial mode.
         Settings.TaskDevicePluginConfig[event->TaskIndex][1] = B9600;      // Reset to 9600 baud.
       }
-      
+
       if(rxPin <0 || txPin <0) {                                            // Missing serial I/O pins!
         addFormNote(F("Please configure the RX and TX sensor pins before enabling this plugin."));
         addFormSubHeader(F("")); // Blank line, vertical space.
@@ -153,13 +161,13 @@ boolean Plugin_075(byte function, struct EventStruct *event, String& string)
       options[1] = F("38400");
       options[2] = F("57600");
       options[3] = F("115200");
-      
-      addFormSelector(F("Baud Rate"), F("plugin_075_baud"), 4, options, NULL, choice);      
+
+      addFormSelector(F("Baud Rate"), F("plugin_075_baud"), 4, options, NULL, choice);
       addFormNote(F("Un-check box for Soft Serial communication (low performance mode, 9600 Baud)."));
       addFormNote(F("Hardware Serial is available when the GPIO pins are RX=D7 and TX=D8."));
       addFormNote(F("D8 (GPIO-15) requires a Buffer Circuit (PNP transistor) or ESP boot may fail."));
       addFormNote(F("Do <b>NOT</b> enable the Serial Log file on Tools->Advanced->Serial Port."));
-      
+
 //    ** DEVELOPER DEBUG MESSAGE AREA **
 //    int datax = (int)(Settings.TaskDeviceEnabled[event->TaskIndex]); // Debug value.
 //    String Data = "Debug. Plugin Enable State: ";
@@ -168,12 +176,12 @@ boolean Plugin_075(byte function, struct EventStruct *event, String& string)
 
       addFormSubHeader(F(""));                          // Blank line, vertical space.
       addFormHeader(F("Nextion Command Statements (Optional)"));
-      
-      char deviceTemplate[Nlines][Lenlines];
+
+      char deviceTemplate[P75_Nlines][P75_Nchars];
       LoadCustomTaskSettings(event->TaskIndex, (byte*)&deviceTemplate, sizeof(deviceTemplate));
-      for (byte varNr = 0; varNr < Nlines; varNr++) {
-        addFormTextBox(String(F("Line ")) + (varNr + 1), String(F("Plugin_075_template")) + (varNr + 1), deviceTemplate[varNr], Lenlines-1);
-  
+      for (byte varNr = 0; varNr < P75_Nlines; varNr++) {
+        addFormTextBox(String(F("Line ")) + (varNr + 1), String(F("Plugin_075_template")) + (varNr + 1), deviceTemplate[varNr], P75_Nchars-1);
+
       }
       if( Settings.TaskDeviceTimer[event->TaskIndex]==0) { // Is interval timer disabled?
         if(IncludeValues) {
@@ -194,17 +202,18 @@ boolean Plugin_075(byte function, struct EventStruct *event, String& string)
 
 
     case PLUGIN_WEBFORM_SAVE: {
-
-        String argName;
-
-        char deviceTemplate[Nlines][Lenlines];
-        for (byte varNr = 0; varNr < Nlines; varNr++)
+        char deviceTemplate[P75_Nlines][P75_Nchars];
+        String error;
+        for (byte varNr = 0; varNr < P75_Nlines; varNr++)
         {
-          String arg = F("Plugin_075_template");
-          arg += varNr + 1;
-          String tmpString = WebServer.arg(arg);
-          strncpy(deviceTemplate[varNr], tmpString.c_str(), sizeof(deviceTemplate[varNr])-1);
-            deviceTemplate[varNr][Lenlines-1]=0;
+          String argName = F("Plugin_075_template");
+          argName += varNr + 1;
+          if (!safe_strncpy(deviceTemplate[varNr], WebServer.arg(argName), P75_Nchars)) {
+            error += getCustomTaskSettingsError(varNr);
+          }
+        }
+        if (error.length() > 0) {
+          addHtmlError(error);
         }
         if(getTaskDeviceName(event->TaskIndex) == "") {         // Check to see if user entered device name.
             strcpy(ExtraTaskSettings.TaskDeviceName,PLUGIN_DEFAULT_NAME); // Name missing, populate default name.
@@ -236,12 +245,14 @@ boolean Plugin_075(byte function, struct EventStruct *event, String& string)
         txPin = Settings.TaskDevicePin2[event->TaskIndex];
       }
 
-      if (SoftSerial != NULL) { 
+      if (SoftSerial != NULL) {
         delete SoftSerial;
         SoftSerial = NULL;
       }
 
-      String log = F("NEXTION075 : serial pin config RX:");
+      String log;
+      log.reserve(80);                                 // Prevent re-allocation
+      log = F("NEXTION075 : serial pin config RX:");
       log += rxPin;
       log += F(", TX:");
       log += txPin;
@@ -283,7 +294,7 @@ boolean Plugin_075(byte function, struct EventStruct *event, String& string)
             HwSerial = SOFTSERIAL;
             if (SoftSerial == NULL) {
                 SoftSerial = new ESPeasySoftwareSerial(rxPin, txPin, false, RXBUFFSZ);
-            } 
+            }
             SoftSerial->begin(9600);
             SoftSerial->flush();
         }
@@ -295,8 +306,8 @@ boolean Plugin_075(byte function, struct EventStruct *event, String& string)
     }
 
 
-    case PLUGIN_READ: {    
-        char deviceTemplate[Nlines][Lenlines];
+    case PLUGIN_READ: {
+        char deviceTemplate[P75_Nlines][P75_Nchars];
         int RssiIndex;
         String newString;
         String tmpString;
@@ -305,7 +316,7 @@ boolean Plugin_075(byte function, struct EventStruct *event, String& string)
         LoadCustomTaskSettings(event->TaskIndex, (byte*)&deviceTemplate, sizeof(deviceTemplate));
 
 // Get optional LINE command statements. Special RSSIBAR bargraph keyword is supported.
-        for (byte x = 0; x < Nlines; x++) {
+        for (byte x = 0; x < P75_Nlines; x++) {
           tmpString = deviceTemplate[x];
           if (tmpString.length()) {
             UcTmpString = deviceTemplate[x];
@@ -313,6 +324,7 @@ boolean Plugin_075(byte function, struct EventStruct *event, String& string)
             RssiIndex = UcTmpString.indexOf(F("RSSIBAR"));  // RSSI bargraph Keyword found, wifi value in dBm.
             if(RssiIndex >= 0) {
               int barVal;
+              newString.reserve(P75_Nchars+10);               // Prevent re-allocation
               newString = tmpString.substring(0, RssiIndex);
               int nbars = WiFi.RSSI();
               if (nbars < -100 || nbars >= 0)
@@ -345,55 +357,64 @@ boolean Plugin_075(byte function, struct EventStruct *event, String& string)
             }
 
             sendCommand(newString.c_str(), HwSerial);
-            
-            String log = F("NEXTION075 : Cmd Statement Line-");
-            log += String(x+1);
-            log += F(" Sent: ");
-            log += newString;
-            addLog(LOG_LEVEL_INFO, log);
+            #ifdef DEBUG_LOG
+              String log;
+              log.reserve(P75_Nchars+50);                 // Prevent re-allocation
+              log = F("NEXTION075 : Cmd Statement Line-");
+              log += String(x+1);
+              log += F(" Sent: ");
+              log += newString;
+              addLog(LOG_LEVEL_INFO, log);
+            #endif
           }
         }
 
         // At Interval timer, send idx & value data only if user enabled "values" interval mode.
         if(IncludeValues) {
-/* 
-            String log = F("NEXTION075: Interval values data enabled, resending idx=");
-            log += String(UserVar[event->BaseVarIndex]);
-            log += F(", value=");
-            log += String(UserVar[event->BaseVarIndex+1]);
-            addLog(LOG_LEVEL_INFO, log);
-*/
+            #ifdef DEBUG_LOG
+             String log;
+             log.reserve(120);                          // Prevent re-allocation
+             log = F("NEXTION075: Interval values data enabled, resending idx=");
+             log += String(UserVar[event->BaseVarIndex]);
+             log += F(", value=");
+             log += String(UserVar[event->BaseVarIndex+1]);
+             addLog(LOG_LEVEL_INFO, log);
+            #endif
+
             success = true;
         }
         else {
-/*
-            String log = F("NEXTION075: Interval values data disabled, idx & value not resent");
-            addLog(LOG_LEVEL_INFO, log);
-*/
+            #ifdef DEBUG_LOG
+             String log = F("NEXTION075: Interval values data disabled, idx & value not resent");
+             addLog(LOG_LEVEL_INFO, log);
+            #endif
+
             success = false;
-        } 
+        }
 
         break;
     }
 
-// Nextion commands received from events (including http) get processed here. PLUGIN_WRITE 
+// Nextion commands received from events (including http) get processed here. PLUGIN_WRITE
 // does NOT process publish commands that are sent.
     case PLUGIN_WRITE: {
-        
+
         String tmpString = string;
         int argIndex = tmpString.indexOf(',');
         if (argIndex) tmpString = tmpString.substring(0, argIndex);
-        
+
 // Enable addLog() code below to help debug plugin write problems.
 /*
+        String log;
+        log.reserve(140);                               // Prevent re-allocation
         String log = F("Nextion arg0: ");
-        log += tmpString; 
+        log += tmpString;
         log += F(", TaskDeviceName: ");
         log += getTaskDeviceName(event->TaskIndex);
         log += F(", event->TaskIndex: ");
-        log += String(event->TaskIndex); 
+        log += String(event->TaskIndex);
         log += F(", cmd str: ");
-        log += string;      
+        log += string;
         addLog(LOG_LEVEL_INFO, log);
 */
         if (tmpString.equalsIgnoreCase(getTaskDeviceName(event->TaskIndex)) == true) { // If device names match we have a command to write.
@@ -401,11 +422,14 @@ boolean Plugin_075(byte function, struct EventStruct *event, String& string)
             tmpString = string.substring(argIndex + 1);
             sendCommand(tmpString.c_str(), HwSerial);
 
-            String log = F("NEXTION075 : WRITE, ");
-            log += F("Command is ");
-            log += (tmpString.c_str());
-            addLog(LOG_LEVEL_INFO, log);
-
+            String log;
+            log.reserve(110);                           // Prevent re-allocation
+            log = F("NEXTION075 : WRITE = ");
+            log += tmpString;
+            #ifdef DEBUG_LOG
+              addLog(LOG_LEVEL_INFO, log);
+            #endif
+            SendStatus(event->Source, log);             // Reply (echo) to sender. This will print message on browser.
             success = true;                             // Set true only if plugin found a command to execute.
         }
         break;
@@ -434,20 +458,19 @@ boolean Plugin_075(byte function, struct EventStruct *event, String& string)
         break;
     }
 
-    
+
     case PLUGIN_TEN_PER_SECOND: {
       uint16_t i;
       uint8_t c;
       uint8_t charCount;
-      String log;
       String Vidx;
       String Nvalue;
       String Svalue;
       String Nswitch;
       char __buffer[RXBUFFSZ+1];                        // Staging buffer.
-      
+
       if(rxPin < 0) {
-        String log = F("NEXTION075 : Missing RxD Pin Number, aborted serial receive");
+        String log = F("NEXTION075 : Missing RxD Pin, aborted serial receive");
         addLog(LOG_LEVEL_INFO, log);
         break;
       }
@@ -455,6 +478,8 @@ boolean Plugin_075(byte function, struct EventStruct *event, String& string)
       if(HwSerial == UARTSERIAL) {
         charCount = Serial.available();                 // Prime the Hardware Serial engine.
         if(charCount >= RXBUFFWARN) {                   // ESP8266 has 128 byte circular Rx buffer.
+            String log;
+            log.reserve(70);                           // Prevent re-allocation
             log = F("NEXTION075 : RxD UART Buffer capacity warning,");
             log += String(charCount);
             log += F(" bytes");
@@ -465,6 +490,8 @@ boolean Plugin_075(byte function, struct EventStruct *event, String& string)
         if(SoftSerial == NULL) break;                   // SoftSerial missing, exit.
         charCount = SoftSerial->available();            // Prime the Soft Serial engine.
         if(charCount >= RXBUFFWARN) {
+            String log;
+            log.reserve(70);                           // Prevent re-allocation
             log = F("NEXTION075 : RxD SoftSerial Buffer capacity warning, ");
             log += String(charCount);
             log += F(" bytes");
@@ -495,16 +522,20 @@ boolean Plugin_075(byte function, struct EventStruct *event, String& string)
               UserVar[event->BaseVarIndex + 1] = __buffer[3];
               sendData(event);
 
-              log = F("NEXTION075 : code: ");
-              log += __buffer[1];
-              log += ",";
-              log += __buffer[2];
-              log += ",";
-              log += __buffer[3];
-              addLog(LOG_LEVEL_INFO, log);
+              #ifdef DEBUG_LOG
+                String log;
+                log.reserve(70);                        // Prevent re-allocation
+                log = F("NEXTION075 : code: ");
+                log += __buffer[1];
+                log += ",";
+                log += __buffer[2];
+                log += ",";
+                log += __buffer[3];
+                addLog(LOG_LEVEL_INFO, log);
+              #endif
             }
           }
-        } 
+        }
         else {
           if (c == '|') {
             __buffer[0] = c;                                  // Store in staging buffer.
@@ -515,7 +546,7 @@ boolean Plugin_075(byte function, struct EventStruct *event, String& string)
             else charCount = SoftSerial->available();
 
             if(HwSerial == UARTSERIAL) {
-                i = 1;            
+                i = 1;
                 while (Serial.available() > 0 && i<RXBUFFSZ) { // Copy global serial buffer to local buffer.
                   __buffer[i] = Serial.read();
                   if (__buffer[i]==0x0a || __buffer[i]==0x0d) break;
@@ -523,7 +554,7 @@ boolean Plugin_075(byte function, struct EventStruct *event, String& string)
                 }
             }
             else {
-                i = 1;            
+                i = 1;
                 while (SoftSerial->available() > 0 && i<RXBUFFSZ) { // Copy global serial buffer to local buffer.
                   __buffer[i] = SoftSerial->read();
                   if (__buffer[i]==0x0a || __buffer[i]==0x0d) break;
@@ -532,11 +563,16 @@ boolean Plugin_075(byte function, struct EventStruct *event, String& string)
             }
 
             __buffer[i] = 0x00;
-            
+
             String tmpString = __buffer;
-            log = F("NEXTION075 : code: ");
-            log += tmpString;
-            addLog(LOG_LEVEL_INFO, log);
+
+            #ifdef DEBUG_LOG
+              String log;
+              log.reserve(50);                          // Prevent re-allocation
+              log = F("NEXTION075 : Code = ");
+              log += tmpString;
+              addLog(LOG_LEVEL_INFO, log);
+            #endif
 
             int argIndex = tmpString.indexOf(F(",i"));
             int argEnd = tmpString.indexOf(',', argIndex + 1);
@@ -568,14 +604,21 @@ boolean Plugin_075(byte function, struct EventStruct *event, String& string)
                 UserVar[event->BaseVarIndex+1] = Svalue.toFloat();
                 sendData(event);
 
-                log = F("NEXTION075 : Pipe Command Sent: ");
-                log += __buffer;
-                log += UserVar[event->BaseVarIndex];
+                #ifdef DEBUG_LOG
+                 String log;
+                 log.reserve(80);                       // Prevent re-allocation
+                 log = F("NEXTION075 : Pipe Command Sent: ");
+                 log += __buffer;
+                 log += UserVar[event->BaseVarIndex];
+                 addLog(LOG_LEVEL_INFO, log);
+                #endif
             }
             else {
-                log = F("NEXTION075 : Unknown Pipe Command, skipped");
+                #ifdef DEBUG_LOG
+                 String log = F("NEXTION075 : Unknown Pipe Command, skipped");
+                 addLog(LOG_LEVEL_INFO, log);
+                #endif
             }
-            addLog(LOG_LEVEL_INFO, log);
           }
         }
         if(HwSerial == UARTSERIAL) charCount = Serial.available();
@@ -590,7 +633,7 @@ boolean Plugin_075(byte function, struct EventStruct *event, String& string)
 }
 
 
-void sendCommand(const char *cmd, boolean SerialMode) 
+void sendCommand(const char *cmd, boolean SerialMode)
 {
     if(txPin < 0) {
         String log = F("NEXTION075 : Missing TxD Pin Number, aborted sendCommand");

src/_P077_CSE7766.ino

@@ -39,12 +39,14 @@ long cf_pulses = 0;
 long cf_pulses_last_time = CSE_PULSES_NOT_INITIALIZED;
 long cf_frequency = 0;
 uint8_t serial_in_buffer[32];
-uint8_t serial_in_byte_counter = 0;
-uint8_t serial_in_byte = 0;
+uint8_t P077_checksum = 0;
 float energy_voltage = 0;         // 123.1 V
 float energy_current = 0;         // 123.123 A
 float energy_power = 0;           // 123.1 W
 
+//stats
+long P077_t_max = 0, P077_t_all = 0, P077_t_pkt=0, P077_t_pkt_tmp = 0;
+uint16_t P077_count_bytes = 0, P077_count_max = 0, P077_count_pkt = 0;
 
 boolean Plugin_077(byte function, struct EventStruct *event, String& string)
 {
@@ -118,7 +120,7 @@ boolean Plugin_077(byte function, struct EventStruct *event, String& string)
         disableSerialLog(); // disable logging on serial port (used for CSE7766 communication)
         Settings.BaudRate = 4800; // set BaudRate for CSE7766
         Serial.flush();
-        Serial.begin(Settings.BaudRate);
+        Serial.begin(Settings.BaudRate,SERIAL_8E1);
         success = true;
         break;
       }
@@ -165,40 +167,64 @@ boolean Plugin_077(byte function, struct EventStruct *event, String& string)
     case PLUGIN_SERIAL_IN:
       {
         if (Plugin_077_init) {
-          if (Serial.available() > 0) {
-            serial_in_byte = Serial.read();
-            success = true;
+          success = true;
+          /* ONLINE CHECKSUMMING by Bartłomiej Zimoń */
+          bool P077_found = false;
+          long t_start = millis();
+          while (Serial.available()>0 && !P077_found){ // if we have data try to find good checksum
+            uint8_t serial_in_byte = Serial.read();
+            P077_count_bytes++;
+            P077_checksum -= serial_in_buffer[2]; // substract from checksum data to be removed
+            memmove(serial_in_buffer,serial_in_buffer+1,sizeof(serial_in_buffer)-1); // scroll buffer
+            serial_in_buffer[25] = serial_in_byte; // add new data
+            P077_checksum += serial_in_buffer[22]; // add online checksum
+            if (P077_checksum == serial_in_buffer[23] && serial_in_buffer[1] == 0x5A){
+              P077_found = true;
+              P077_count_pkt++;
+              addLog(LOG_LEVEL_DEBUG, F("CSE: packet found"));
+              CseReceived(event);
 
-            if (cse_receive_flag) {
-              serial_in_buffer[serial_in_byte_counter++] = serial_in_byte;
-              if (24 == serial_in_byte_counter) {
-                addLog(LOG_LEVEL_DEBUG_DEV, F("CSE: packet received"));
-                CseReceived(event);
-                cse_receive_flag = 0;
-                serial_in_byte_counter = 0;
-                // new packet received, update values
-                UserVar[event->BaseVarIndex] = energy_voltage;
-                UserVar[event->BaseVarIndex + 1] = energy_power;
-                UserVar[event->BaseVarIndex + 2] = energy_current;
-                UserVar[event->BaseVarIndex + 3] = cf_pulses;
-//                break;
-              }
-            } else {
-              if (0x5A == serial_in_byte) { // 0x5A - Packet header 2
-                cse_receive_flag = 1;
-                addLog(LOG_LEVEL_DEBUG_DEV, F("CSE: Header received"));
-              } else {
-                serial_in_byte_counter = 0;
-              }
-              serial_in_buffer[serial_in_byte_counter++] = serial_in_byte;
+              // new packet received, update values
+              UserVar[event->BaseVarIndex] = energy_voltage;
+              UserVar[event->BaseVarIndex + 1] = energy_power;
+              UserVar[event->BaseVarIndex + 2] = energy_current;
+              UserVar[event->BaseVarIndex + 3] = cf_pulses;
             }
-            serial_in_byte = 0;           // Discard
+          }
 
+          long t_diff = millis()-t_start;
+          P077_t_all += t_diff;
 
-            //          String log = F("Variable: Tag: ");
-            //          log += key;
-            //          addLog(LOG_LEVEL_INFO, log);
-            //          success = true;
+          if (P077_count_pkt > 10) // bypass first 10 pkts
+            P077_t_max = max(P077_t_max, t_diff);
+          
+          if (P077_found) {
+            P077_count_max = max(P077_count_max, P077_count_bytes);
+            P077_t_pkt = t_start - P077_t_pkt_tmp;
+            P077_t_pkt_tmp = t_start;
+
+            if (loglevelActiveFor(LOG_LEVEL_DEBUG)) {
+              String log = F("CSE: time ");
+              log += P077_t_max;
+              log += '/';
+              log += P077_t_pkt;
+              log += '/';
+              log += P077_t_all;
+              addLog(LOG_LEVEL_DEBUG, log);
+              log = F("CSE: bytes ");
+              log += P077_count_bytes;
+              log += '/';
+              log += P077_count_max;
+              log += '/';
+              log += Serial.available();
+              addLog(LOG_LEVEL_DEBUG, log);
+              log = F("CSE: nr ");
+              log += P077_count_pkt;
+              addLog(LOG_LEVEL_DEBUG, log);
+            }
+
+            P077_t_all = 0;
+            P077_count_bytes = 0;
           }
         }
         break;
@@ -215,14 +241,6 @@ void CseReceived(struct EventStruct *event)
     return;
   }
 
-  // Calculate checksum
-  uint8_t checksum = 0;
-  for (byte i = 2; i < 23; i++) checksum += serial_in_buffer[i];
-  if (checksum != serial_in_buffer[23]) {
-    addLog(LOG_LEVEL_DEBUG, F("CSE: Checksum Failure"));
-    return;
-  }
-
 
   // Get chip calibration data (coefficients) and use as initial defaults
   if (HLW_UREF_PULSE == Settings.TaskDevicePluginConfig[event->TaskIndex][0]) {
@@ -318,7 +336,7 @@ void CseReceived(struct EventStruct *event)
     log = F("CSE current: ");
     log += energy_current;
     addLog(LOG_LEVEL_DEBUG, log);
-    log = F("CSE piulses: ");
+    log = F("CSE pulses: ");
     log += cf_pulses;
     addLog(LOG_LEVEL_DEBUG, log);
   }

src/_P079_Wemos_Motorshield.ino

@@ -219,7 +219,7 @@ void WemosMotor::setfreq(uint32_t freq)
 	Wire.write((byte)(freq >> 8));
 	Wire.write((byte)freq);
 	Wire.endTransmission();     // stop transmitting
-	yield();
+	delay(0);
 }
 
 /* setmotor() -- set motor
@@ -271,7 +271,7 @@ void WemosMotor::setmotor(uint8_t dir, float pwm_val)
 	Wire.write((byte)_pwm_val);
 	Wire.endTransmission();     // stop transmitting
 
-	yield();
+	delay(0);
 }
 
 void WemosMotor::setmotor(uint8_t dir)

src/__Plugin.ino

@@ -1252,11 +1252,10 @@ byte PluginCall(byte Function, struct EventStruct *event, String& str)
             // Schedule the plugin to be read.
             schedule_task_device_timer_at_init(event->TaskIndex);
           }
-          if (Function != PLUGIN_GET_DEVICEVALUENAMES) {
+          if (ExtraTaskSettings.TaskIndex != event->TaskIndex) {
             // LoadTaskSettings may call PLUGIN_GET_DEVICEVALUENAMES.
             LoadTaskSettings(event->TaskIndex);
           }
-
           event->BaseVarIndex = event->TaskIndex * VARS_PER_TASK;
           checkRAM(F("PluginCall_init"),x);
           START_TIMER;

src/define_plugin_sets.h

@@ -26,6 +26,8 @@ To create/register a plugin, you have to :
  * BUILD Configs *******************************************************************
 \******************************************************************************/
 
+
+
 // IR library is large, so make a separate build including stable plugins and IR.
 #ifdef PLUGIN_BUILD_DEV_IR
     #define PLUGIN_BUILD_DEV       // add dev
@@ -78,6 +80,7 @@ To create/register a plugin, you have to :
 // #define DECODE_TOSHIBA_AC      true
 // #define SEND_TOSHIBA_AC        true
 #ifdef PLUGIN_BUILD_IR
+    #define PLUGIN_DESCR  "IR"
     #define USES_P016      // IR
     #define USES_P035      // IRTX
 #endif
@@ -89,19 +92,29 @@ To create/register a plugin, you have to :
 
 // Itead ----------------------------
 #ifdef PLUGIN_SET_SONOFF_BASIC
+    #define PLUGIN_DESCR  "Sonoff Basic"
     #define PLUGIN_SET_ONLY_SWITCH
+
+    // Pre-defined setup parameters
+    #define GPIO_KEY1     0              // Button
+    #define GPIO_REL1     12             // Red Led and Relay (0 = Off, 1 = On)
+    #define DEFAULT_PIN_STATUS_LED 13    // Green Led (0 = On, 1 = Off)
 #endif
 
-#ifdef PLUGIN_SET_SONOFF_TH10
-    #define PLUGIN_SET_ONLY_SWITCH
-#endif
-
-#ifdef PLUGIN_SET_SONOFF_TH16
+#ifdef PLUGIN_SET_SONOFF_TH1x
+    #define PLUGIN_DESCR  "Sonoff TH10/TH16"
     #define PLUGIN_SET_ONLY_SWITCH
     #define PLUGIN_SET_ONLY_TEMP_HUM
+
+    // Pre-defined setup parameters
+    #define GPIO_KEY1     0              // Button
+    #define GPIO_REL1     12             // Red Led and Relay (0 = Off, 1 = On)
+    #define DEFAULT_PIN_STATUS_LED 13    // Green Led (0 = On, 1 = Off)
 #endif
 
 #ifdef PLUGIN_SET_SONOFF_POW
+    #define PLUGIN_DESCR  "Sonoff POW R1"
+
     // Undef first to prevent compiler warnings
     #undef DEFAULT_PIN_I2C_SDA
     #undef DEFAULT_PIN_I2C_SCL
@@ -111,33 +124,67 @@ To create/register a plugin, you have to :
     #define USES_P076
     #define DEFAULT_PIN_I2C_SDA    4
     #define DEFAULT_PIN_I2C_SCL    2  // GPIO5 conflicts with HLW8012 Sel output
-    #define DEFAULT_PIN_STATUS_LED 15 // GPIO15 Blue Led (0 = On, 1 = Off)
+
+    // Pre-defined setup parameters
+    #define GPIO_KEY1     0           // Button
+    #define GPIO_REL1     12          // Red Led and Relay (0 = Off, 1 = On)
+    #define DEFAULT_PIN_STATUS_LED 15 // Blue Led (0 = On, 1 = Off)
 #endif
 
 #ifdef PLUGIN_SET_SONOFF_POW_R2
+    #define PLUGIN_DESCR  "Sonoff POW R2"
+
     // Undef first to prevent compiler warnings
     #undef DEFAULT_PIN_STATUS_LED
 
     #define PLUGIN_SET_ONLY_SWITCH
     // Needs CSE7766 Energy sensor, via Serial RXD 4800 baud 8E1 (GPIO1), TXD (GPIO3)
     #define USES_P077	// CSE7766
-    #define DEFAULT_PIN_STATUS_LED 13 // GPIO13 Blue Led (0 = On, 1 = Off)
+
+    // Pre-defined setup parameters
+    #define GPIO_KEY1     0              // Button
+    #define GPIO_REL1     12             // Red Led and Relay (0 = Off, 1 = On)
+    #define DEFAULT_PIN_STATUS_LED 13    // Blue Led (0 = On, 1 = Off)
 #endif
 
-#ifdef PLUGIN_SET_SONOFF_S20
+#ifdef PLUGIN_SET_SONOFF_S2x
+    #define PLUGIN_DESCR  "Sonoff S20/22/26"
     #define PLUGIN_SET_ONLY_SWITCH
+
+    // Pre-defined setup parameters
+    #define GPIO_KEY1     0              // Button
+    #define GPIO_REL1     12             // Red Led and Relay (0 = Off, 1 = On)
+    #define DEFAULT_PIN_STATUS_LED 13    // Green Led (0 = On, 1 = Off)
 #endif
 
 #ifdef PLUGIN_SET_SONOFF_4CH
+    #define PLUGIN_DESCR  "Sonoff 4CH"
     #define PLUGIN_SET_ONLY_SWITCH
+
+    #define DEFAULT_PIN_I2C_SDA    3  // GPIO4 conflicts with GPIO_REL3
+    #define DEFAULT_PIN_I2C_SCL    2  // GPIO5 conflicts with GPIO_REL2
+
+    // Pre-defined setup parameters
+    #define GPIO_KEY1     0           // Button 1
+    #define GPIO_KEY2     9           // Button 2
+    #define GPIO_KEY3     10          // Button 3
+    #define GPIO_KEY4     14          // Button 4
+    #define GPIO_REL1     12          // Red Led and Relay1 (0 = Off, 1 = On)
+    #define GPIO_REL2     5           // Red Led and Relay2 (0 = Off, 1 = On)
+    #define GPIO_REL3     4           // Red Led and Relay3 (0 = Off, 1 = On)
+    #define GPIO_REL4     15          // Red Led and Relay4 (0 = Off, 1 = On)
+    #define DEFAULT_PIN_STATUS_LED 13 // Blue Led (0 = On, 1 = Off)
 #endif
 
 #ifdef PLUGIN_SET_SONOFF_TOUCH
+    #define PLUGIN_DESCR  "Sonoff Touch"
     #define PLUGIN_SET_ONLY_SWITCH
 #endif
 
 // Shelly ----------------------------
 #ifdef PLUGIN_SET_SHELLY_1
+    #define PLUGIN_DESCR  "Shelly 1"
+
     #define PLUGIN_SET_ONLY_SWITCH
     #define CONTROLLER_SET_STABLE
     #define NOTIFIER_SET_STABLE
@@ -150,10 +197,12 @@ To create/register a plugin, you have to :
 
 // Easy ----------------------------
 #ifdef PLUGIN_SET_EASY_TEMP
+    #define PLUGIN_DESCR  "Temp Hum"
     #define PLUGIN_SET_ONLY_TEMP_HUM
 #endif
 
 #ifdef PLUGIN_SET_EASY_CARBON
+    #define PLUGIN_DESCR  "Carbon"
     #define PLUGIN_SET_NONE
     #define USES_P052   // SenseAir
 #endif
@@ -196,6 +245,8 @@ To create/register a plugin, you have to :
 
 // Generic ESP32 -----------------------------
 #ifdef PLUGIN_SET_GENERIC_ESP32
+    #define PLUGIN_DESCR  "Generic ESP32"
+
     #ifndef ESP32
         #define ESP32
     #endif
@@ -209,6 +260,7 @@ To create/register a plugin, you have to :
 #endif
 
 #ifdef PLUGIN_SET_TEST_ESP32
+    #define PLUGIN_DESCR  "TEST ESP32"
     #ifndef ESP32
         #define ESP32
     #endif