automatically updated release notes for mega-20180927

Merge pull request #1804 from TD-er/bugfix/ESP32_partition_build
[ESP32] Split new partition layout to separate build
2026-07-28 12:17:05 +00:00 · 2018-09-27 04:00:17 +02:00 · 2018-09-26 22:52:30 +02:00 · 2018-09-26 22:49:30 +02:00 · 2018-09-26 21:55:02 +02:00 · 2018-09-26 09:05:44 +02:00
43 changed files with 1006 additions and 243 deletions
@@ -18,3 +18,7 @@ lib/readme.txt
 src/Custom.h
 /ESPEasy
 test/output_export.cpp
+.vscode
+.vscode/.browse.c_cpp.db*
+.vscode/c_cpp_properties.json
+.vscode/launch.json
@@ -1,8 +1,8 @@
-|Latest Nightly  | Build Status | Patreon | Ko-Fi |
-|-------|-------|-------|-------|
-| [![GitHub version](https://img.shields.io/github/release/letscontrolit/ESPEasy/all.svg)](https://github.com/letscontrolit/ESPEasy/releases/latest) | [![Build Status](https://travis-ci.org/letscontrolit/ESPEasy.svg?branch=mega)](https://travis-ci.org/letscontrolit/ESPEasy) | [![donate](https://img.shields.io/badge/donate-Patreon-blue.svg)](https://www.patreon.com/GrovkillenTDer) | [![donate](https://img.shields.io/badge/donate-KoFi-blue.svg)](https://ko-fi.com/grovkillentder) |
+|Latest Nightly  | Build Status | Patreon | Ko-Fi | PayPal |
+|-------|-------|-------|-------|-------|
+| [![GitHub version](https://img.shields.io/github/release/letscontrolit/ESPEasy/all.svg)](https://github.com/letscontrolit/ESPEasy/releases/latest) | [![Build Status](https://travis-ci.org/letscontrolit/ESPEasy.svg?branch=mega)](https://travis-ci.org/letscontrolit/ESPEasy) | [![donate](https://img.shields.io/badge/donate-Patreon-blue.svg)](https://www.patreon.com/GrovkillenTDer) | [![donate](https://img.shields.io/badge/donate-KoFi-blue.svg)](https://ko-fi.com/grovkillentder) | [![donate](https://img.shields.io/badge/donate-PayPal-blue.svg)](https://www.paypal.me/espeasy) |

-For ways to *support* us, see [this announcement on the forum](https://www.letscontrolit.com/forum/viewtopic.php?f=14&t=5787), or have a look at the [Patreon](https://www.patreon.com/GrovkillenTDer) or [Ko-Fi](https://ko-fi.com/grovkillentder) links above.
+For ways to *support* us, see [this announcement on the forum](https://www.letscontrolit.com/forum/viewtopic.php?f=14&t=5787), or have a look at the [Patreon](https://www.patreon.com/GrovkillenTDer), [Ko-Fi](https://ko-fi.com/grovkillentder) or [PayPal](https://www.paypal.me/espeasy) links above.

 # ESPEasy (development branch)

@@ -22,7 +22,8 @@ for ENV in \
  dev_ESP8266PUYA_1024_VCC\
  hard_SONOFF_POW\
  hard_Shelly_1\
-  esp32dev;\
+  esp32dev\
+  esp32test_1M8_partition;\
 do
  echo
  echo "### Deploying environment $ENV for version $VERSION"
@@ -0,0 +1,61 @@
+  _____ ____  ____
+ | ____/ ___||  _ \ ___  __ _ ___ _   _
+ |  _| \___ \| |_) / _ \/ _` / __| | | |
+ | |___ ___) |  __/  __/ (_| \__ \ |_| |
+ |_____|____/|_|   \___|\__,_|___/\__, |
+                                  |___/
+
+
+This is the distribution folder for ESPeasy.
+In here you will find a flash tool to program the ESP module.
+
+Also a number of binary images is included.
+
+The filename is quite descriptive:
+  ESP_Easy_mega-<date>_<buildType>_<chip>_<memorySize>.bin
+
+Build type can be:  (differ in included plugins)
+- normal  => Only Stable plugins and controllers
+- test    => Stable + Testing
+- dev     => Stable + Testing + Development
+
+There is also a number of special builds:
+- normal_IR => "Normal" + IR receiver/transmitter plugins and library
+- hard_xxxxx => Special builds for some off-the-shelf hardware.
+
+Chip can be:
+- ESP8266      => Most likely option
+- ESP8285      => Used in some Sonoff modules
+- ESP32        => Experimental support at this moment
+- ESP8266PUYA  => For ESP modules with a flash chip labeled "PUYA" (often 1 MB)
+
+The "PUYA" version deserves a bit more attention.
+If you cannot save settings, better try to see if the flash chip has "PUYA" written on it.
+If so, try the "PUYA" build.
+
+MemorySize can be:
+- 1024  => 1 MB flash modules (e.g. almost all Sonoff modules)
+- 2048  => 2 MB flash modules (e.g. Shelly1/WROOM02)
+- 4096  => 4 MB flash modules (e.g. NodeMCU/ESP32)
+
+ESP32 now has 2 builds:
+- esp32dev   Using the default partition layout (1.4 MB for the sketch)
+- esp32test_1M8_partition   Larger sketch partition (1.8MB) smaller SPIFFS (316 kB)
+
+Please note that changing between those versions will destroy the settings!
+The SPIFFS partition will be lost and that contains all settings.
+
+
+To help recover from a bad flash, there are also blank images included.
+- blank_1MB.bin
+- blank_2MB.bin
+- blank_4MB.bin
+
+When the wrong image is flashed, or the module behaves unstable, or is in a reboot loop,
+flash these images first and then the right image for the module.
+
+Another great flash tool can be found here: (Windows only)
+  https://github.com/Grovkillen/ESP_Easy_Flasher
+
+For more information, see: https://github.com/letscontrolit/ESPEasy
+Or our forum: https://www.letscontrolit.com/forum/
@@ -1,3 +1,171 @@
+-------------------------------------------------
+Changes in release mega-20180927 (since mega-20180924)
+-------------------------------------------------
+
+Release date: Thu Sep 27 04:00:17 CEST 2018
+
+TD-er (7):
+      [ESP32] Change partition size (will clear all settings) and add plugins
+      [Travis] Uninitialized variable in P073_7DGT
+      [Stack] Move Settings from stack to heap
+      [ESP32] RTOS move handle_schedule() to core1 and increase stack
+      [Info] Add board name to the sysinfo page.
+      [ESP32] Split new partition layout to separate build
+      [Build] Add esp32test_1M8_partition build and warning on ESP32 partition
+
+
+-------------------------------------------------
+Changes in release mega-20180924 (since mega-20180923)
+-------------------------------------------------
+
+Release date: Mon Sep 24 04:00:20 CEST 2018
+
+Benno Eigenmann (1):
+      Fix platformio
+
+TD-er (2):
+      [MQTT] Work around for lost MQTT connection
+      [ESP32] Fix I2C handling to allow I2C devices to work
+
+sakinit (1):
+      change to platform version core_esp32_1_3_0
+
+stefan (1):
+      Change type of sensor for MCP and PCF devices
+
+
+-------------------------------------------------
+Changes in release mega-20180923 (since mega-20180922)
+-------------------------------------------------
+
+Release date: Sun Sep 23 04:00:12 CEST 2018
+
+TD-er (2):
+      [MQTT import] Fix crash at boot when plugin is enabled
+      [BME280] Fix slow reading of BME280 causing watchdog resets
+
+sakinit (5):
+      ESP32 build issues fixed
+      Fix ESP32 stack overflow in addPinSelect when called from P1WifiGateway
+      ESP32: Split webserver spiffs filelist into pages
+      Reverted Webserver change
+      ESP32 platform updated to 1.2.0; Webserver replaced by platform one
+
+
+-------------------------------------------------
+Changes in release mega-20180922 (since mega-20180916)
+-------------------------------------------------
+
+Release date: Sat Sep 22 04:00:22 CEST 2018
+
+Gijs Noorlander (1):
+      Revert "Revert "Added 2 new operators in Calculate() function""
+
+TD-er (2):
+      Revert "[Scheduler] Disable command scheduler"
+      Revert "Revert "Fix elseif & Add if-elseif-else nesting levels""
+
+
+-------------------------------------------------
+Changes in release mega-20180916 (since mega-20180915)
+-------------------------------------------------
+
+Release date: Sun Sep 16 04:00:11 CEST 2018
+
+Gijs Noorlander (3):
+      Revert "Added 2 new operators in Calculate() function"
+      Revert "Fix elseif & Add if-elseif-else nesting levels"
+      Added warning to release notes 20180915
+
+TD-er (1):
+      [HW Watchdog] Backgroundtasks instead of yield during rules handling
+
+
+-------------------------------------------------
+Changes in release mega-20180915 (since mega-20180914)
+-------------------------------------------------
+
+Release date: Sat Sep 15 04:00:15 CEST 2018
+Known issue:
+      Causes reboots. (see [#1748](https://github.com/letscontrolit/ESPEasy/issues/1748) )
+
+
+Plebs (1):
+      Added 2 new operators in Calculate
+
+TD-er (4):
+      [Scheduler] Disable command scheduler
+      [Controller settings] Validate settings on load/save
+      [#1713] Make hostname-unitnumber optional & validate settings
+      [#1698] Incorrect sunrise value southern hemisphere
+
+svmac (4):
+      Fix elseif & Add if-elseif-else nesting levels
+      reenabled code about !
+      some code optimization
+      fix mistake
+
+
+-------------------------------------------------
+Changes in release mega-20180914 (since mega-20180910)
+-------------------------------------------------
+
+Release date: Fri Sep 14 04:00:17 CEST 2018
+
+Gijs Noorlander (1):
+      Added PayPal link
+
+giddyhup (1):
+      Fix IR plugin passing received code
+
+Plebs (7):
+      Use parameters inside rules when calling commands
+      few changes
+      fixed ESP32 compatibility issue
+      fixed calls to F-macro
+      adding more parameters to EVENT
+      final version with '=' sign as a prefix to identify the formula in rules
+      added %eventvalue4%
+
+TD-er (2):
+      [Flash tools] Add blank files and README.txt
+      [CrashRecover] Disable failing step based on failed boot count
+
+sakinit (1):
+      Feature: Split webserver spiffs filelist into pages
+
+
+-------------------------------------------------
+Changes in release mega-20180910 (since mega-20180909)
+-------------------------------------------------
+
+Release date: Mon Sep 10 04:00:22 CEST 2018
+
+TD-er (2):
+      [HTTP] Command SendToHttp cannot connect
+      [Domoticz IDX] Allow for IDX of > 9999
+
+sakinit (1):
+      Reduced buffer size to prevent stack overflow
+
+
+-------------------------------------------------
+Changes in release mega-20180909 (since mega-20180908)
+-------------------------------------------------
+
+Release date: Sun Sep  9 04:00:14 CEST 2018
+
+Gijs Noorlander (1):
+      Revert [WDT] Add watchdog feed to backgroundtasks()
+
+TD-er (5):
+      [#1720] WiFi read all lines from slow servers
+      Add forward declaration for void backgroundtasks()
+      [Serial Log] Limit serial log to prevent buffer overflow
+      [ESP32] Fix Build, ESP32 doesn't have the availableForWrite
+      [Serial log] Use buffer to prevent Serial buffer to overflow
+
+
 -------------------------------------------------
 Changes in release mega-20180908 (since mega-20180904)
 -------------------------------------------------
@@ -0,0 +1,7 @@
+# Name,   Type, SubType, Offset,  Size, Flags
+nvs,      data, nvs,     0x9000,  0x5000,
+otadata,  data, ota,     0xe000,  0x2000,
+app0,     app,  ota_0,   0x10000, 0x1D0000,
+app1,     app,  ota_1,   0x1E0000,0x1D0000,
+eeprom,   data, 0x99,    0x3B0000,0x1000,
+spiffs,   data, spiffs,  0x3B1000,0x4F000,
@@ -65,6 +65,7 @@ platform                  = https://github.com/platformio/platform-espressif8266

 [core_esp32_0_12_0]
 platform                  = espressif32@0.12.0
+lib_deps                  = "ESP32WebServer"

 [core_esp32_1_2_0]
 platform                  = espressif32@1.2.0
@@ -76,16 +77,16 @@ platform                  = espressif32@1.3.0
 platform                  = https://github.com/platformio/platform-espressif32.git#feature/stage

 [core_esp32]
-platform                  = ${core_esp32_0_12_0.platform}
+platform                  = ${core_esp32_1_3_0.platform}
 build_unflags             = -Wall
 build_flags               = -D BUILD_GIT='"${sysenv.TRAVIS_TAG}"'
-                            -lstdc++ -lsupc++
 lib_ignore                = AS_BH1750, ESP8266WiFi, ESP8266Ping, ESP8266WebServer, ESP8266HTTPUpdateServer, ESP8266mDNS, IRremoteESP8266, ESPEasy_ESP8266Ping, SerialSensors, SDM
-lib_deps                  = ESP32WebServer
+lib_deps                  = ""
 monitor_speed             = 115200



+
 ; Build Flags:
 ;  -DUSE_CONFIG_OVERRIDE
 ; lwIP 1.4 (Default)
@@ -104,7 +105,7 @@ monitor_speed             = 115200

 [common]
 board_build.f_cpu         = 80000000L
-build_unflags             = ""
+build_unflags             =
 build_flags               = -D BUILD_GIT='"${sysenv.TRAVIS_TAG}"'
                   -D NDEBUG
                   -lstdc++ -lsupc++
@@ -206,6 +207,21 @@ framework                 = ${common.framework}
 upload_speed              = ${common.upload_speed}
 monitor_speed             = ${common.monitor_speed}

+[env:esp32test_1M8_partition]
+platform                  = ${core_esp32.platform}
+board                     = esp32dev
+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}
+monitor_speed             = ${common.monitor_speed}
+board_build.partitions    = esp32_partition_app1810k_spiffs316k.csv
+board_upload.maximum_size = 1900544
+

 ;;; NORMAL (STABLE) ; ****; ****; ****; ****; ****; ****; ****; ****; ****; ****; ****;;;;
 ; normal version with stable plugins                                                     ;
@@ -216,11 +216,11 @@ void ExecuteCommand(byte source, const char *Line)
 	// since commands can originate from anywhere.
 	TempEvent.Source = source;
 	GetArgv(Line, cmd, 1);
-	if (GetArgv(Line, TmpStr1, 2)) TempEvent.Par1 = str2int(TmpStr1);
-	if (GetArgv(Line, TmpStr1, 3)) TempEvent.Par2 = str2int(TmpStr1);
-	if (GetArgv(Line, TmpStr1, 4)) TempEvent.Par3 = str2int(TmpStr1);
-	if (GetArgv(Line, TmpStr1, 5)) TempEvent.Par4 = str2int(TmpStr1);
-	if (GetArgv(Line, TmpStr1, 6)) TempEvent.Par5 = str2int(TmpStr1);
+  if (GetArgv(Line, TmpStr1, 2)) TempEvent.Par1 = CalculateParam(TmpStr1);
+	if (GetArgv(Line, TmpStr1, 3)) TempEvent.Par2 = CalculateParam(TmpStr1);
+	if (GetArgv(Line, TmpStr1, 4)) TempEvent.Par3 = CalculateParam(TmpStr1);
+	if (GetArgv(Line, TmpStr1, 5)) TempEvent.Par4 = CalculateParam(TmpStr1);
+	if (GetArgv(Line, TmpStr1, 6)) TempEvent.Par5 = CalculateParam(TmpStr1);

  if (source == VALUE_SOURCE_WEB_FRONTEND) {
    // Must run immediately, to see result in web frontend
@@ -24,7 +24,8 @@ String Command_HTTP_SendToHTTP(struct EventStruct *event, const char* Line)
 		}
 		WiFiClient client;
 		const int port_int = port.toInt();
-		if (client.connect(host.c_str(), port_int) != 1) {
+		const bool connected = client.connect(host.c_str(), port_int) == 1;
+		if (connected) {
 			String hostportString = host;
 			if (port_int != 0 && port_int != 80) {
 				hostportString += ':';
@@ -133,7 +133,7 @@ bool MQTTConnect(int controller_idx)
 {
  ++mqtt_reconnect_count;
  ControllerSettingsStruct ControllerSettings;
-  LoadControllerSettings(controller_idx, (byte*)&ControllerSettings, sizeof(ControllerSettings));
+  LoadControllerSettings(controller_idx, ControllerSettings);
  if (!ControllerSettings.checkHostReachable(true))
    return false;
  if (MQTTclient.connected()) {
@@ -161,6 +161,15 @@ bool MQTTConnect(int controller_idx)
    clientid = F("ESPClient_");
    clientid += WiFi.macAddress();
  }
+  // Work-around for 'lost connections' to the MQTT broker.
+  // If the broker thinks the connection is still alive, a reconnect from the
+  // client will be refused.
+  // To overcome this issue, append the number of reconnects to the client ID to
+  // make it different from the previous one.
+  if (wifi_reconnects >= 1) {
+    clientid += F("_");
+    clientid += wifi_reconnects;
+  }

  String LWTTopic = ControllerSettings.MQTTLwtTopic;
  if(LWTTopic.length() == 0)
@@ -309,7 +318,7 @@ void MQTTStatus(String& status)
  ControllerSettingsStruct ControllerSettings;
  int enabledMqttController = firstEnabledMQTTController();
  if (enabledMqttController >= 0) {
-    LoadControllerSettings(enabledMqttController, (byte*)&ControllerSettings, sizeof(ControllerSettings));
+    LoadControllerSettings(enabledMqttController, ControllerSettings);
    String pubname = ControllerSettings.Subscribe;
    pubname.replace(F("/#"), F("/status"));
    parseSystemVariables(pubname, false);
@@ -297,7 +297,11 @@
 #if defined(PLUGIN_BUILD_TESTING) || defined(PLUGIN_BUILD_DEV)
  #define DEVICES_MAX                      75
 #else
-  #define DEVICES_MAX                      50
+  #ifdef ESP32
+    #define DEVICES_MAX                      75
+  #else
+    #define DEVICES_MAX                      50
+  #endif
 #endif

 #if defined(ESP8266)
@@ -325,6 +329,8 @@
 #define RULESETS_MAX                        4
 #define RULES_BUFFER_SIZE                  64
 #define NAME_FORMULA_LENGTH_MAX            40
+#define RULES_IF_MAX_NESTING_LEVEL          4
+
 #define UDP_PACKETSIZE_MAX               2048

 #define PIN_MODE_UNDEFINED                  0
@@ -357,6 +363,9 @@
 #define SENSOR_TYPE_LONG                   20
 #define SENSOR_TYPE_WIND                   21

+#define UNIT_NUMBER_MAX                  9999  // Stored in Settings.Unit
+#define DOMOTICZ_MAX_IDX            999999999  // Looks like it is an unsigned int, so could be up to 4 bln.
+
 #define VALUE_SOURCE_SYSTEM                 1
 #define VALUE_SOURCE_SERIAL                 2
 #define VALUE_SOURCE_HTTP                   3
@@ -393,13 +402,18 @@
 #endif

 // Forward declaration
+struct ControllerSettingsStruct;
 void scheduleNextDelayQueue(unsigned long id, unsigned long nextTime);
-String LoadControllerSettings(int ControllerIndex, byte* memAddress, int datasize);
+String LoadControllerSettings(int ControllerIndex, ControllerSettingsStruct& controller_settings);
 String get_formatted_Controller_number(int controller_index);
 bool loglevelActiveFor(byte logLevel);
 void addToLog(byte loglevel, const String& string);
 void addToLog(byte logLevel, const __FlashStringHelper* flashString);
 void statusLED(boolean traffic);
+void backgroundtasks();
+
+bool getBitFromUL(uint32_t number, byte bitnr);
+void setBitToUL(uint32_t& number, byte bitnr, bool value);

 enum SettingsType {
  BasicSettings_Type = 0,
@@ -443,6 +457,7 @@ bool showSettingsFileLayout = false;
 #include "I2CTypes.h"
 #include <I2Cdev.h>
 #include <map>
+#include <deque>

 #define FS_NO_GLOBALS
 #if defined(ESP8266)
@@ -510,10 +525,10 @@ bool showSettingsFileLayout = false;
  #define FILE_RULES        "/rules1.txt"
  #include <WiFi.h>
  #include  "esp32_ping.h"
-  #include <ESP32WebServer.h>
+  #include <WebServer.h>
  #include "SPIFFS.h"
  #include <rom/rtc.h>
-  ESP32WebServer WebServer(80);
+  WebServer WebServer(80);
  #ifdef FEATURE_MDNS
    #include <ESPmDNS.h>
  #endif
@@ -657,6 +672,18 @@ struct SettingsStruct
    clearAll();
  }

+  // VariousBits1 defaults to 0, keep in mind when adding bit lookups.
+  bool appendUnitToHostname() {  return !getBitFromUL(VariousBits1, 1); }
+  void appendUnitToHostname(bool value) { setBitToUL(VariousBits1, 1, !value); }
+
+  void validate() {
+    if (UDPPort > 65535) UDPPort = 0;
+
+    if (Latitude  < -90.0  || Latitude > 90.0) Latitude = 0.0;
+    if (Longitude < -180.0 || Longitude > 180.0) Longitude = 0.0;
+    if (VariousBits1 > (1 << 30)) VariousBits1 = 0;
+  }
+
  void clearAll() {
    PID = 0;
    Version = 0;
@@ -699,6 +726,9 @@ struct SettingsStruct
    SyslogFacility = DEFAULT_SYSLOG_FACILITY;
    StructSize = 0;
    MQTTUseUnitNameAsClientId = 0;
+    Latitude = 0.0;
+    Longitude = 0.0;
+    VariousBits1 = 0;

    for (byte i = 0; i < CONTROLLER_MAX; ++i) {
      Protocol[i] = 0;
@@ -825,14 +855,17 @@ struct SettingsStruct
  //TODO: document config.dat somewhere here
  float         Latitude;
  float         Longitude;
+  uint32_t      VariousBits1;

  // FIXME @TD-er: As discussed in #1292, the CRC for the settings is now disabled.
  // make sure crc is the last value in the struct
  // Try to extend settings to make the checksum 4-byte aligned.
 //  uint8_t       ProgmemMd5[16]; // crc of the binary that last saved the struct to file.
 //  uint8_t       md5[16];
-} Settings;
+};

+SettingsStruct* SettingsStruct_ptr = new SettingsStruct;
+SettingsStruct& Settings = *SettingsStruct_ptr;

 /*********************************************************************************************\
 * ControllerSettingsStruct
@@ -865,6 +898,14 @@ struct ControllerSettingsStruct
  unsigned int  MaxRetry;
  boolean       DeleteOldest; // Action to perform when buffer full, delete oldest, or ignore newest.

+  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;
+  }
+
  IPAddress getIP() const {
    IPAddress host(IP[0], IP[1], IP[2], IP[3]);
    return host;
@@ -1240,6 +1281,9 @@ struct LogStruct {

 } Logging;

+std::deque<char> serialLogBuffer;
+unsigned long last_serial_log_emptied = 0;
+
 byte highest_active_log_level = 0;
 bool log_to_serial_disabled = false;
 // Do this in a template to prevent casting to String when not needed.
@@ -1374,18 +1418,20 @@ struct pinStatesStruct
 //max 40 bytes: ( 74 - 64 ) * 4
 struct RTCStruct
 {
+  RTCStruct() : ID1(0), ID2(0), unused1(false), factoryResetCounter(0),
+                deepSleepState(0), bootFailedCount(0), flashDayCounter(0),
+                flashCounter(0), bootCounter(0) {}
  byte ID1;
  byte ID2;
  boolean unused1;
  byte factoryResetCounter;
  byte deepSleepState;
-  byte unused2;
+  byte bootFailedCount;
  byte flashDayCounter;
  unsigned long flashCounter;
  unsigned long bootCounter;
 } RTC;

-
 int deviceCount = -1;
 int protocolCount = -1;
 int notificationCount = -1;
@@ -158,6 +158,7 @@ void setup()
  //warm boot
  if (readFromRTC())
  {
+    RTC.bootFailedCount++;
    RTC.bootCounter++;
    readUserVarFromRTC();

@@ -193,6 +194,16 @@ void setup()
  fileSystemCheck();
  progMemMD5check();
  LoadSettings();
+  if (RTC.bootFailedCount > 10 && RTC.bootCounter > 10) {
+    byte toDisable = RTC.bootFailedCount - 10;
+    toDisable = disablePlugin(toDisable);
+    if (toDisable != 0) {
+      toDisable = disableController(toDisable);
+    }
+    if (toDisable != 0) {
+      toDisable = disableNotification(toDisable);
+    }
+  }

 //  setWifiMode(WIFI_STA);
  checkRuleSets();
@@ -304,9 +315,17 @@ void setup()
    if(UseRTOSMultitasking){
      log = F("RTOS : Launching tasks");
      addLog(LOG_LEVEL_INFO, log);
-      xTaskCreatePinnedToCore(RTOS_TaskServers, "RTOS_TaskServers", 8192, NULL, 1, NULL, 1);
+      xTaskCreatePinnedToCore(RTOS_TaskServers, "RTOS_TaskServers", 16384, NULL, 1, NULL, 1);
      xTaskCreatePinnedToCore(RTOS_TaskSerial, "RTOS_TaskSerial", 8192, NULL, 1, NULL, 1);
      xTaskCreatePinnedToCore(RTOS_Task10ps, "RTOS_Task10ps", 8192, NULL, 1, NULL, 1);
+      xTaskCreatePinnedToCore(
+                    RTOS_HandleSchedule,   /* Function to implement the task */
+                    "RTOS_HandleSchedule", /* Name of the task */
+                    16384,      /* Stack size in words */
+                    NULL,       /* Task input parameter */
+                    1,          /* Priority of the task */
+                    NULL,       /* Task handle. */
+                    1);         /* Core where the task should run */
    }
  #endif

@@ -353,6 +372,14 @@ void RTOS_Task10ps( void * parameter )
    run10TimesPerSecond();
 }
 }
+
+void RTOS_HandleSchedule( void * parameter )
+{
+ while (true){
+    handle_schedule();
+ }
+}
+
 #endif

 int firstEnabledMQTTController() {
@@ -465,7 +492,10 @@ void loop()
     firstLoop = false;
     timerAwakeFromDeepSleep = millis(); // Allow to run for "awake" number of seconds, now we have wifi.
     // schedule_all_task_device_timers(); Disabled for now, since we are now using queues for controllers.
-   }
+
+     RTC.bootFailedCount = 0;
+     saveToRTC();
+  }

  // Deep sleep mode, just run all tasks one (more) time and go back to sleep as fast as possible
  if ((firstLoopConnectionsEstablished || readyForSleep()) && isDeepSleepEnabled())
@@ -480,7 +510,10 @@ void loop()
  //normal mode, run each task when its time
  else
  {
-    handle_schedule();
+    if (!UseRTOSMultitasking) {
+      // On ESP32 the schedule is executed on the 2nd core.
+      handle_schedule();
+    }
  }

  backgroundtasks();
@@ -828,11 +861,16 @@ void backgroundtasks()
  //checkRAM(F("backgroundtasks"));
  //always start with a yield
  yield();
+/*
+  // Remove this watchdog feed for now.
+  // See https://github.com/letscontrolit/ESPEasy/issues/1722#issuecomment-419659193
+
  #ifdef ESP32
  // Have to find a similar function to call ESP32's esp_task_wdt_feed();
  #else
  ESP.wdtFeed();
  #endif
+*/

  //prevent recursion!
  if (runningBackgroundTasks)
@@ -844,7 +882,7 @@ void backgroundtasks()
  #if defined(ESP8266)
    tcpCleanup();
  #endif
-
+  process_serialLogBuffer();
  if(!UseRTOSMultitasking){
    if (Settings.UseSerial)
      if (Serial.available())
@@ -147,6 +147,7 @@ String SaveSettings(void)
    // Settings have changed, save to file.
    memcpy(Settings.md5, tmp_md5, 16);
 */
+    Settings.validate();
    err=SaveToFile((char*)FILE_CONFIG, 0, (byte*)&Settings, sizeof(Settings));
    if (err.length())
     return(err);
@@ -182,6 +183,7 @@ String LoadSettings()
  err=LoadFromFile((char*)FILE_CONFIG, 0, (byte*)&Settings, sizeof( SettingsStruct));
  if (err.length())
    return(err);
+  Settings.validate();

    // FIXME @TD-er: As discussed in #1292, the CRC for the settings is now disabled.
 /*
@@ -219,6 +221,51 @@ String LoadSettings()
  return(err);
 }

+/********************************************************************************************\
+  Disable Plugin, based on bootFailedCount
+  \*********************************************************************************************/
+byte disablePlugin(byte bootFailedCount) {
+  for (byte i = 0; i < TASKS_MAX && bootFailedCount > 0; ++i) {
+    if (Settings.TaskDeviceEnabled[i]) {
+      --bootFailedCount;
+      if (bootFailedCount == 0) {
+        Settings.TaskDeviceEnabled[i] = false;
+      }
+    }
+  }
+  return bootFailedCount;
+}
+
+/********************************************************************************************\
+  Disable Controller, based on bootFailedCount
+  \*********************************************************************************************/
+byte disableController(byte bootFailedCount) {
+  for (byte i = 0; i < CONTROLLER_MAX && bootFailedCount > 0; ++i) {
+    if (Settings.ControllerEnabled[i]) {
+      --bootFailedCount;
+      if (bootFailedCount == 0) {
+        Settings.ControllerEnabled[i] = false;
+      }
+    }
+  }
+  return bootFailedCount;
+}
+
+/********************************************************************************************\
+  Disable Notification, based on bootFailedCount
+  \*********************************************************************************************/
+byte disableNotification(byte bootFailedCount) {
+  for (byte i = 0; i < NOTIFICATION_MAX && bootFailedCount > 0; ++i) {
+    if (Settings.NotificationEnabled[i]) {
+      --bootFailedCount;
+      if (bootFailedCount == 0) {
+        Settings.NotificationEnabled[i] = false;
+      }
+    }
+  }
+  return bootFailedCount;
+}
+
 /********************************************************************************************\
  Offsets in settings files
  \*********************************************************************************************/
@@ -388,20 +435,25 @@ String LoadCustomTaskSettings(int TaskIndex, byte* memAddress, int datasize)
 /********************************************************************************************\
  Save Controller settings to SPIFFS
  \*********************************************************************************************/
-String SaveControllerSettings(int ControllerIndex, byte* memAddress, int datasize)
+String SaveControllerSettings(int ControllerIndex, ControllerSettingsStruct& controller_settings)
 {
  checkRAM(F("SaveControllerSettings"));
-  return SaveToFile(ControllerSettings_Type, ControllerIndex, (char*)FILE_CONFIG, memAddress, datasize);
+  controller_settings.validate(); // Make sure the saved controller settings have proper values.
+  return SaveToFile(ControllerSettings_Type, ControllerIndex,
+                    (char*)FILE_CONFIG, (byte*)&controller_settings, sizeof(controller_settings));
 }


 /********************************************************************************************\
  Load Controller settings to SPIFFS
  \*********************************************************************************************/
-String LoadControllerSettings(int ControllerIndex, byte* memAddress, int datasize)
-{
+String LoadControllerSettings(int ControllerIndex, ControllerSettingsStruct& controller_settings) {
  checkRAM(F("LoadControllerSettings"));
-  return(LoadFromFile(ControllerSettings_Type, ControllerIndex, (char*)FILE_CONFIG, memAddress, datasize));
+  String result =
+    LoadFromFile(ControllerSettings_Type, ControllerIndex,
+                 (char*)FILE_CONFIG, (byte*)&controller_settings, sizeof(controller_settings));
+  controller_settings.validate(); // Make sure the loaded controller settings have proper values.
+  return result;
 }


@@ -418,8 +418,10 @@ void setWifiMode(WiFiMode_t wifimode) {
 String WifiGetAPssid()
 {
  String ssid(Settings.Name);
-  ssid+=F("_");
-  ssid+=Settings.Unit;
+  if (Settings.appendUnitToHostname()) {
+    ssid+=F("_");
+    ssid+=Settings.Unit;
+  }
  return (ssid);
 }

@@ -11,6 +11,12 @@ bool I2C_read_words(uint8_t i2caddr, I2Cdata_words& data) {
  return size == i2cdev.readWords(i2caddr, data.getRegister(), size, data.get());
 }

+// See https://github.com/platformio/platform-espressif32/issues/126
+#ifdef ESP32
+  #define END_TRANSMISSION_FLAG true
+#else
+  #define END_TRANSMISSION_FLAG false
+#endif

 //**************************************************************************/
 // Wake up I2C device
@@ -66,7 +72,7 @@ uint8_t I2C_read8_reg(uint8_t i2caddr, byte reg, bool * is_ok) {

  Wire.beginTransmission(i2caddr);
  Wire.write((uint8_t)reg);
-  Wire.endTransmission(false);
+  Wire.endTransmission(END_TRANSMISSION_FLAG);
  byte count = Wire.requestFrom(i2caddr, (byte)1);
  if (is_ok != NULL) {
    *is_ok = (count == 1);
@@ -84,7 +90,7 @@ uint16_t I2C_read16_reg(uint8_t i2caddr, byte reg) {

  Wire.beginTransmission(i2caddr);
  Wire.write((uint8_t)reg);
-  Wire.endTransmission(false);
+  Wire.endTransmission(END_TRANSMISSION_FLAG);
  Wire.requestFrom(i2caddr, (byte)2);
  value = (Wire.read() << 8) | Wire.read();

@@ -99,7 +105,7 @@ int32_t I2C_read24_reg(uint8_t i2caddr, byte reg) {

  Wire.beginTransmission(i2caddr);
  Wire.write((uint8_t)reg);
-  Wire.endTransmission(false);
+  Wire.endTransmission(END_TRANSMISSION_FLAG);
  Wire.requestFrom(i2caddr, (byte)3);
  value = (((int32_t)Wire.read()) << 16) | (Wire.read() << 8) | Wire.read();

@@ -114,7 +120,7 @@ int32_t I2C_read32_reg(uint8_t i2caddr, byte reg) {

  Wire.beginTransmission(i2caddr);
  Wire.write((uint8_t)reg);
-  Wire.endTransmission(false);
+  Wire.endTransmission(END_TRANSMISSION_FLAG);
  Wire.requestFrom(i2caddr, (byte)3);
  value = (((int32_t)Wire.read()) <<24) | (((uint32_t)Wire.read()) << 16) | (Wire.read() << 8) | Wire.read();

@@ -139,3 +145,5 @@ int16_t I2C_readS16_reg(uint8_t i2caddr, byte reg) {
 int16_t I2C_readS16_LE_reg(uint8_t i2caddr, byte reg) {
  return (int16_t)I2C_read16_LE_reg(i2caddr, reg);
 }
+
+#undef END_TRANSMISSION_FLAG
@@ -206,6 +206,19 @@ boolean hasPinState(byte plugin, byte index)
 }


+/*********************************************************************************************\
+   Bitwise operators
+  \*********************************************************************************************/
+bool getBitFromUL(uint32_t number, byte bitnr) {
+  return (number >> bitnr) & 1UL;
+}
+
+void setBitToUL(uint32_t& number, byte bitnr, bool value) {
+  uint32_t newbit = value ? 1UL : 0UL;
+  number ^= (-newbit ^ number) & (1UL << bitnr);
+}
+
+
 /*********************************************************************************************\
   report pin mode & state (info table) using json
  \*********************************************************************************************/
@@ -365,11 +378,11 @@ void parseCommandString(struct EventStruct *event, const String& string)
  event->Par4 = 0;
  event->Par5 = 0;

-  if (GetArgv(command, TmpStr1, 2)) event->Par1 = str2int(TmpStr1);
-  if (GetArgv(command, TmpStr1, 3)) event->Par2 = str2int(TmpStr1);
-  if (GetArgv(command, TmpStr1, 4)) event->Par3 = str2int(TmpStr1);
-  if (GetArgv(command, TmpStr1, 5)) event->Par4 = str2int(TmpStr1);
-  if (GetArgv(command, TmpStr1, 6)) event->Par5 = str2int(TmpStr1);
+  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);
 }

 /********************************************************************************************\
@@ -768,7 +781,7 @@ void ResetFactory(void)
  str2ip((char*)DEFAULT_SERVER, ControllerSettings.IP);
  ControllerSettings.HostName[0]=0;
  ControllerSettings.Port = DEFAULT_PORT;
-  SaveControllerSettings(0, (byte*)&ControllerSettings, sizeof(ControllerSettings));
+  SaveControllerSettings(0, ControllerSettings);
 #endif
  checkRAM(F("ResetFactory2"));
  Serial.println(F("RESET: Succesful, rebooting. (you might need to press the reset button if you've justed flashed the firmware)"));
@@ -1162,10 +1175,23 @@ boolean loglevelActive(byte logLevel, byte logLevelSettings) {

 void addToLog(byte logLevel, const char *line)
 {
+  const size_t line_length = strlen(line);
  if (loglevelActiveFor(LOG_TO_SERIAL, logLevel)) {
-    Serial.print(millis());
-    Serial.print(F(" : "));
-    Serial.println(line);
+    int roomLeft = ESP.getFreeHeap() - 5000;
+    if (roomLeft > 0) {
+      String timestamp_log(millis());
+      timestamp_log += F(" : ");
+      for (size_t i = 0; i < timestamp_log.length(); ++i) {
+        serialLogBuffer.push_back(timestamp_log[i]);
+      }
+      size_t pos = 0;
+      while (pos < line_length && pos < static_cast<size_t>(roomLeft)) {
+        serialLogBuffer.push_back(line[pos]);
+        ++pos;
+      }
+      serialLogBuffer.push_back('\r');
+      serialLogBuffer.push_back('\n');
+    }
  }
  if (loglevelActiveFor(LOG_TO_SYSLOG, logLevel)) {
    syslog(logLevel, line);
@@ -1184,6 +1210,25 @@ void addToLog(byte logLevel, const char *line)
 #endif
 }

+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();
+  }
+}

 /********************************************************************************************\
  Delayed reboot, in case of issues, do not reboot with high frequency as it might not help...
@@ -1655,7 +1700,8 @@ float globalstack[STACK_SIZE];
 float *sp = globalstack - 1;
 float *sp_max = &globalstack[STACK_SIZE - 1];

-#define is_operator(c)  (c == '+' || c == '-' || c == '*' || c == '/' || c == '^')
+#define is_operator(c)  (c == '+' || c == '-' || c == '*' || c == '/' || c == '^' || c == '%')
+#define is_unary_operator(c)  (c == '!')

 int push(float value)
 {
@@ -1688,6 +1734,8 @@ float apply_operator(char op, float first, float second)
      return first * second;
    case '/':
      return first / second;
+    case '%':
+      return round(first) % round(second);
    case '^':
      return pow(first, second);
    default:
@@ -1695,6 +1743,17 @@ float apply_operator(char op, float first, float second)
  }
 }

+float apply_unary_operator(char op, float first)
+{
+  switch (op)
+  {
+    case '!':
+      return (round(first) == 0) ? 1 : 0;
+    default:
+      return 0;
+  }
+}
+
 char *next_token(char *linep)
 {
  while (isspace(*(linep++)));
@@ -1714,8 +1773,14 @@ int RPNCalculate(char* token)

    if (push(apply_operator(token[0], first, second)))
      return CALCULATE_ERROR_STACK_OVERFLOW;
-  }
-  else // Als er nog een is, dan deze ophalen
+  } else if (is_unary_operator(token[0]) && token[1] == 0)
+  {
+    float first = pop();
+
+    if (push(apply_unary_operator(token[0], first)))
+      return CALCULATE_ERROR_STACK_OVERFLOW;
+
+  } else // Als er nog een is, dan deze ophalen
    if (push(atof(token))) // is het een waarde, dan op de stack plaatsen
      return CALCULATE_ERROR_STACK_OVERFLOW;

@@ -1731,10 +1796,13 @@ int op_preced(const char c)
 {
  switch (c)
  {
+    case '!':
+      return 4;
    case '^':
      return 3;
    case '*':
    case '/':
+    case '%':
      return 2;
    case '+':
    case '-':
@@ -1752,8 +1820,10 @@ bool op_left_assoc(const char c)
    case '/':
    case '+':
    case '-':
+    case '%':
      return true;     // left to right
-      //case '!': return false;    // right to left
+    case '!':
+      return false;    // right to left
  }
  return false;
 }
@@ -1767,8 +1837,10 @@ unsigned int op_arg_count(const char c)
    case '/':
    case '+':
    case '-':
+    case '%':
      return 2;
-      //case '!': return 1;
+    case '!':
+      return 1;
  }
  return 0;
 }
@@ -1788,6 +1860,12 @@ int Calculate(const char *input, float* result)
  //*sp=0; // bug, it stops calculating after 50 times
  sp = globalstack - 1;
  oc=c=0;
+
+  if (input[0] == '=') {
+    ++strpos;
+    c = *strpos;
+  }
+
  while (strpos < strend)
  {
    // read one token from the input stream
@@ -1803,7 +1881,7 @@ int Calculate(const char *input, float* result)
      }

      // If the token is an operator, op1, then:
-      else if (is_operator(c))
+      else if (is_operator(c) || is_unary_operator(c))
      {
        *(TokenPos) = 0;
        error = RPNCalculate(token);
@@ -1913,6 +1991,56 @@ int Calculate(const char *input, float* result)
  return CALCULATE_OK;
 }

+int CalculateParam(char *TmpStr) {
+  int returnValue;
+
+  // Minimize calls to the Calulate function.
+  // Only if TmpStr starts with '=' then call Calculate(). Otherwise do not call it
+  if (TmpStr[0] != '=') {
+    returnValue=str2int(TmpStr);
+  } else {
+    float param=0;
+    TmpStr[0] = ' '; //replace '=' with space
+    int returnCode=Calculate(TmpStr, &param);
+    if (returnCode!=CALCULATE_OK) {
+      String errorDesc;
+      switch (returnCode) {
+        case CALCULATE_ERROR_STACK_OVERFLOW:
+          errorDesc = F("Stack Overflow");
+          break;
+        case CALCULATE_ERROR_BAD_OPERATOR:
+          errorDesc = F("Bad Operator");
+          break;
+        case CALCULATE_ERROR_PARENTHESES_MISMATCHED:
+          errorDesc = F("Parenthesis mismatch");
+          break;
+        case CALCULATE_ERROR_UNKNOWN_TOKEN:
+          errorDesc = F("Unknown token");
+          break;
+        default:
+          errorDesc = F("Unknown error");
+          break;
+        }
+        String log = String(F("CALCULATE PARAM ERROR: ")) + errorDesc;
+        addLog(LOG_LEVEL_ERROR, log);
+        log = F("CALCULATE PARAM ERROR details: ");
+        log += TmpStr;
+        log += F(" = ");
+        log += round(param);
+        addLog(LOG_LEVEL_ERROR, log);
+      } else {
+      if (loglevelActiveFor(LOG_LEVEL_DEBUG)) {
+        String log = F("CALCULATE PARAM: ");
+        log += TmpStr;
+        log += F(" = ");
+        log += round(param);
+        addLog(LOG_LEVEL_DEBUG, log);
+      }
+    }
+    returnValue=round(param); //return integer only as it's valid only for device and task id
+  }
+  return returnValue;
+}

 void checkRuleSets(){
 for (byte x=0; x < RULESETS_MAX; x++){
@@ -2008,10 +2136,10 @@ String rulesProcessingFile(String fileName, String& event)
  bool match = false;
  bool codeBlock = false;
  bool isCommand = false;
-  bool conditional = false;
-  bool condition = false;
-  bool ifBranche = false;
-  bool ifBrancheJustMatch = false;
+  bool condition[RULES_IF_MAX_NESTING_LEVEL];
+  bool ifBranche[RULES_IF_MAX_NESTING_LEVEL];
+  byte ifBlock = 0;
+  byte fakeIfBlock = 0;

  byte buf[RULES_BUFFER_SIZE];
  int len = 0;
@@ -2034,9 +2162,9 @@ String rulesProcessingFile(String fileName, String& event)
          parseCompleteNonCommentLine(
            line, event, log,
            match, codeBlock, isCommand,
-            conditional, condition,
-            ifBranche, ifBrancheJustMatch);
-          yield();
+            condition, ifBranche,
+            ifBlock, fakeIfBlock);
+          backgroundtasks();
        }

        line = "";
@@ -2056,10 +2184,11 @@ void parseCompleteNonCommentLine(
    bool& match,
    bool& codeBlock,
    bool& isCommand,
-    bool& conditional,
-    bool& condition,
-    bool& ifBranche,
-    bool& ifBrancheJustMatch) {
+    bool condition[],
+    bool ifBranche[],
+    byte& ifBlock,
+    byte& fakeIfBlock)
+{
  isCommand = true;

  // Strip comments
@@ -2071,6 +2200,23 @@ void parseCompleteNonCommentLine(
    // only parse [xxx#yyy] if we have a matching ruleblock or need to eval the "on" (no codeBlock)
    // This to avoid waisting CPU time...
    line = parseTemplate(line, line.length());
+
+    if (match && !fakeIfBlock) {
+      // substitution of %eventvalue% is made here so it can be used on if statement too
+      if (event.charAt(0) == '!')
+      {
+        line.replace(F("%eventvalue%"), event); // substitute %eventvalue% with literal event string if starting with '!'
+      }
+      else
+      {
+        int equalsPos = event.indexOf("=");
+        if (equalsPos > 0)
+        {
+          String tmpString = event.substring(equalsPos + 1);
+          line.replace(F("%eventvalue%"), tmpString); // substitute %eventvalue% with the actual value from the event
+        }
+      }
+    }
  }
  line.trim();

@@ -2085,6 +2231,8 @@ void parseCompleteNonCommentLine(
  {
    if (line.startsWith(F("on ")))
    {
+      ifBlock = 0;
+      fakeIfBlock = 0;
      line = line.substring(3);
      int split = line.indexOf(F(" do"));
      if (split != -1)
@@ -2121,6 +2269,8 @@ void parseCompleteNonCommentLine(
    isCommand = false;
    codeBlock = false;
    match = false;
+    ifBlock = 0;
+    fakeIfBlock = 0;
  }

  if (Settings.SerialLogLevel == LOG_LEVEL_DEBUG_DEV){
@@ -2137,8 +2287,8 @@ void parseCompleteNonCommentLine(
    processMatchedRule(
      lcAction, action, event, log,
      match, codeBlock, isCommand,
-      conditional, condition,
-      ifBranche, ifBrancheJustMatch);
+      condition, ifBranche,
+      ifBlock, fakeIfBlock);
  }
 }

@@ -2147,70 +2297,101 @@ void processMatchedRule(
  bool& match,
  bool& codeBlock,
  bool& isCommand,
-  bool& conditional,
-  bool& condition,
-  bool& ifBranche,
-  bool& ifBrancheJustMatch)
+  bool condition[],
+  bool ifBranche[],
+  byte& ifBlock,
+  byte& fakeIfBlock)
 {
-  int split = lcAction.indexOf(F("if ")); // check for optional "if" condition
-  if (!lcAction.startsWith(F("elseif "))) {
-    if (split != -1)
-    { // There is some 'if ' in the string.
-      conditional = true;
-      String check = lcAction.substring(split + 3);
-
-      log = F("[if ");
-      log += check;
-      log += F("]=");
-      condition = ifBrancheJustMatch == false && conditionMatchExtended(check);
-      if(condition == true)
-      {
-         ifBrancheJustMatch = true;
-      }
-      ifBranche = true;
+  if (fakeIfBlock)
+    isCommand = false;
+  else if (ifBlock)
+    if (condition[ifBlock-1] != ifBranche[ifBlock-1])
      isCommand = false;
-      log += toString(condition);
-      addLog(LOG_LEVEL_DEBUG, log);
+  int split = lcAction.indexOf(F("elseif ")); // check for optional "elseif" condition
+  if (split != -1)
+  {
+    isCommand = false;
+    if (ifBlock && !fakeIfBlock)
+    {
+      if (ifBranche[ifBlock-1])
+      {
+        if (condition[ifBlock-1])
+          ifBranche[ifBlock-1] = false;
+        else
+        {
+          String check = lcAction.substring(split + 7);
+          log = F("Lev.");
+          log += String(ifBlock);
+          log += F(": [elseif ");
+          log += check;
+          log += "]=";
+          condition[ifBlock-1] = conditionMatchExtended(check);
+          log += toString(condition[ifBlock-1]);
+          addLog(LOG_LEVEL_DEBUG, log);
+        }
+      }
    }
  }
  else
-  { // Starts with 'elseif '
-    String check = lcAction.substring(7);
-    log = F("[elseif ");
-    log += check;
-    log += "]=";
-    condition = ifBrancheJustMatch == false && conditionMatchExtended(check);
-    if(condition == true)
+  {
+    split = lcAction.indexOf(F("if ")); // check for optional "if" condition
+    if (split != -1)
    {
-       ifBrancheJustMatch = true;
+      if (ifBlock < RULES_IF_MAX_NESTING_LEVEL)
+      {
+        if (isCommand)
+        {
+          ifBlock++;
+          String check = lcAction.substring(split + 3);
+          log = F("Lev.");
+          log += String(ifBlock);
+          log += F(": [if ");
+          log += check;
+          log += F("]=");
+          condition[ifBlock-1] = conditionMatchExtended(check);
+          ifBranche[ifBlock-1] = true;
+          log += toString(condition[ifBlock-1]);
+          addLog(LOG_LEVEL_DEBUG, log);
+        }
+        else
+          fakeIfBlock++;
+      }
+      else
+      {
+        fakeIfBlock++;
+        log = F("Lev.");
+        log += String(ifBlock);
+        log = F(": Error: IF Nesting level exceeded!");
+        addLog(LOG_LEVEL_ERROR, log);
+      }
+      isCommand = false;
    }
-    ifBranche = true;
-    isCommand = false;
-    log += toString(condition);
-    addLog(LOG_LEVEL_DEBUG, log);
  }

-  if (lcAction == "else") // in case of an "else" block of actions, set ifBranche to false
+  if ((lcAction == F("else")) && !fakeIfBlock) // in case of an "else" block of actions, set ifBranche to false
  {
-    ifBranche = false;
+    ifBranche[ifBlock-1] = false;
    isCommand = false;
    if (loglevelActiveFor(LOG_LEVEL_DEBUG)) {
-      String log = F("else = ");
-      log += toString(conditional && (condition == ifBranche));
+      log = F("Lev.");
+      log += String(ifBlock);
+      log += F(": [else]=");
+      log += toString(condition[ifBlock-1] == ifBranche[ifBlock-1]);
      addLog(LOG_LEVEL_DEBUG, log);
    }
  }

-  if (lcAction == "endif") // conditional block ends here
+  if (lcAction == F("endif")) // conditional block ends here
  {
-    conditional = false;
+    if (fakeIfBlock)
+      fakeIfBlock--;
+    else if (ifBlock)
+      ifBlock--;
    isCommand = false;
-    ifBranche = false;
-    ifBrancheJustMatch = false;
  }

  // process the action if it's a command and unconditional, or conditional and the condition matches the if or else block.
-  if (isCommand && ((!conditional) || (conditional && (condition == ifBranche))))
+  if (isCommand)
  {
    if (event.charAt(0) == '!')
    {
@@ -2222,7 +2403,20 @@ void processMatchedRule(
      if (equalsPos > 0)
      {
        String tmpString = event.substring(equalsPos + 1);
-        action.replace(F("%eventvalue%"), tmpString); // substitute %eventvalue% in actions with the actual value from the event
+
+        char command[INPUT_COMMAND_SIZE];
+        command[0] = 0;
+        char tmpParam[INPUT_COMMAND_SIZE];
+        tmpParam[0] = 0;
+        tmpString.toCharArray(command, INPUT_COMMAND_SIZE);
+
+        if (GetArgv(command,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
      }
    }

@@ -2274,19 +2468,21 @@ boolean ruleMatch(String& event, String& rule)
  // Special handling of literal string events, they should start with '!'
  if (event.charAt(0) == '!')
  {
-    int pos = rule.indexOf('#');
-    if (pos == -1) // no # sign in rule, use 'wildcard' match on event 'source'
-      {
-        tmpEvent = event.substring(0,rule.length());
-        tmpRule = rule;
-      }
-
-    pos = rule.indexOf('*');
+    int pos = rule.indexOf('*');
    if (pos != -1) // a * sign in rule, so use a'wildcard' match on message
      {
        tmpEvent = event.substring(0,pos-1);
        tmpRule = rule.substring(0,pos-1);
      }
+    else
+      {
+        pos = rule.indexOf('#');
+        if (pos == -1) // no # sign in rule, use 'wildcard' match on event 'source'
+          {
+            tmpEvent = event.substring(0,rule.length());
+            tmpRule = rule;
+          }
+      }

    if (tmpEvent.equalsIgnoreCase(tmpRule))
      return true;
@@ -61,8 +61,8 @@ void calcSunRiseAndSet() {
 	float eqt = equationOfTime(doy);
 	float dec = sunDeclination(doy);
 	float da = diurnalArc(dec, Settings.Latitude);
-	float rise = 12 - da - eqt - Settings.Longitude / 15.0;
-	float set = 12 + da - eqt - Settings.Longitude / 15.0;
+	float rise = 12 - da - eqt;
+	float set = 12 + da - eqt;
  tsRise.Hour = (int)rise;
  tsRise.Minute = (rise - (int)rise) * 60.0;
  tsSet.Hour = (int)set;
@@ -70,6 +70,10 @@ void calcSunRiseAndSet() {
  tsRise.Day = tsSet.Day = tm.Day;
  tsRise.Month = tsSet.Month = tm.Month;
  tsRise.Year = tsSet.Year = tm.Year;
+  // Now apply the longitude
+	int secOffset_longitude = -1.0 * (Settings.Longitude / 15.0) * 3600;
+	tsSet = addSeconds(tsSet, secOffset_longitude, false);
+	tsRise = addSeconds(tsRise, secOffset_longitude, false);
  breakTime(toLocal(makeTime(tsRise)), sunRise);
  breakTime(toLocal(makeTime(tsSet)), sunSet);
 }
@@ -1033,6 +1033,7 @@ void handle_config() {
      MQTTclient_should_reconnect = true;
    }
    strncpy(Settings.Name, name.c_str(), sizeof(Settings.Name));
+    Settings.appendUnitToHostname(isFormItemChecked(F("appendunittohostname")));
    //strncpy(SecuritySettings.Password, password.c_str(), sizeof(SecuritySettings.Password));
    copyFormPassword(F("password"), SecuritySettings.Password, sizeof(SecuritySettings.Password));
    strncpy(SecuritySettings.WifiSSID, ssid.c_str(), sizeof(SecuritySettings.WifiSSID));
@@ -1082,7 +1083,8 @@ void handle_config() {
  Settings.Name[25] = 0;
  SecuritySettings.Password[25] = 0;
  addFormTextBox( F("Unit Name"), F("name"), Settings.Name, 25);
-  addFormNumericBox( F("Unit Number"), F("unit"), Settings.Unit, 0, 9999);
+  addFormNumericBox( F("Unit Number"), F("unit"), Settings.Unit, 0, UNIT_NUMBER_MAX);
+  addFormCheckBox(F("Append Unit Number to hostname"), F("appendunittohostname"), Settings.appendUnitToHostname());
  addFormPasswordBox(F("Admin Password"), F("password"), SecuritySettings.Password, 25);

  addFormSubHeader(F("Wifi Settings"));
@@ -1262,7 +1264,7 @@ void handle_controllers() {
        CPlugin_ptr[ProtocolIndex](CPLUGIN_INIT, &TempEvent, dummyString);
      }
    }
-    addHtmlError(SaveControllerSettings(controllerindex, (byte*)&ControllerSettings, sizeof(ControllerSettings)));
+    addHtmlError(SaveControllerSettings(controllerindex, ControllerSettings));
    addHtmlError(SaveSettings());
  }

@@ -1276,7 +1278,7 @@ void handle_controllers() {
    ControllerSettingsStruct ControllerSettings;
    for (byte x = 0; x < CONTROLLER_MAX; x++)
    {
-      LoadControllerSettings(x, (byte*)&ControllerSettings, sizeof(ControllerSettings));
+      LoadControllerSettings(x, ControllerSettings);
      html_TR_TD();
      TXBuffer += F("<a class='button link' href=\"controllers?index=");
      TXBuffer += x + 1;
@@ -1332,7 +1334,7 @@ void handle_controllers() {
    if (Settings.Protocol[controllerindex])
    {
      ControllerSettingsStruct ControllerSettings;
-      LoadControllerSettings(controllerindex, (byte*)&ControllerSettings, sizeof(ControllerSettings));
+      LoadControllerSettings(controllerindex, ControllerSettings);
      byte choice = ControllerSettings.UseDNS;
      String options[2];
      options[0] = F("Use IP address");
@@ -2283,7 +2285,7 @@ void handle_devices() {
              html_TR_TD(); TXBuffer += F("IDX:<TD>");
              id = F("TDID");   //="taskdeviceid"
              id += controllerNr + 1;
-              addNumericBox(id, Settings.TaskDeviceID[controllerNr][taskIndex], 0, 999999999); // Looks like it is an unsigned int, so could be up to 4 bln.
+              addNumericBox(id, Settings.TaskDeviceID[controllerNr][taskIndex], 0, DOMOTICZ_MAX_IDX);
            }
          }
        }
@@ -2598,8 +2600,8 @@ void addPinSelect(boolean forI2C, String name,  int choice)
 //********************************************************************************
 void addPinSelect(boolean forI2C, String name,  int choice)
 {
-  String options[PIN_D_MAX+1];
-  int optionValues[PIN_D_MAX+1];
+  String * options = new String[PIN_D_MAX+1];
+  int * optionValues = new int[PIN_D_MAX+1];
  options[0] = F("- None -");
  optionValues[0] = -1;
  for(byte x=1; x < PIN_D_MAX+1; x++)
@@ -2609,6 +2611,8 @@ void addPinSelect(boolean forI2C, String name,  int choice)
    optionValues[x] = x;
  }
  renderHTMLForPinSelect(options, optionValues, forI2C, name, choice, PIN_D_MAX+1);
+  delete[] optionValues;
+  delete[] options;
 }
 #endif

@@ -4569,18 +4573,40 @@ void handle_filelist() {
    checkRuleSets();
  }

+  const int pageSize = 25;
+  int startIdx = 0;

+  String fstart = WebServer.arg(F("start"));
+  if (fstart.length() > 0)
+  {
+    startIdx = atoi(fstart.c_str());
+  }
+  int endIdx = startIdx + pageSize - 1;

  TXBuffer += F("<table class='multirow' border=1px frame='box' rules='all'><TH style='width:50px;'><TH>Filename<TH style='width:80px;'>Size");

  fs::Dir dir = SPIFFS.openDir("");
+
+  int count = -1;
  while (dir.next())
  {
+    ++count;
+
+    if (count < startIdx)
+    {
+      continue;
+    }
+
    html_TR_TD();
    if (dir.fileName() != F(FILE_CONFIG) && dir.fileName() != F(FILE_SECURITY) && dir.fileName() != F(FILE_NOTIFICATION))
    {
      TXBuffer += F("<a class='button link' href=\"filelist?delete=");
      TXBuffer += dir.fileName();
+      if (startIdx > 0)
+      {
+        TXBuffer += F("&start=");
+        TXBuffer += startIdx;
+      }
      TXBuffer += F("\">Del</a>");
    }

@@ -4592,11 +4618,28 @@ void handle_filelist() {
    fs::File f = dir.openFile("r");
    html_TD();
    TXBuffer += f.size();
+    if (count >= endIdx)
+    {
+      break;
+    }
  }
  TXBuffer += F("</table></form>");
-  TXBuffer += F("<BR><a class='button link' href=\"/upload\">Upload</a><BR><BR>");
-    sendHeadandTail(F("TmplStd"),true);
-    TXBuffer.endStream();
+  TXBuffer += F("<BR><a class='button link' href=\"/upload\">Upload</a>");
+  if (startIdx > 0)
+  {
+    TXBuffer += F("<a class='button link' href=\"/filelist?start=");
+    TXBuffer += max(0, startIdx - pageSize);
+    TXBuffer += F("\">Previous</a>");
+  }
+  if (count >= endIdx and dir.next())
+  {
+    TXBuffer += F("<a class='button link' href=\"/filelist?start=");
+    TXBuffer += endIdx + 1;
+    TXBuffer += F("\">Next</a>");
+  }
+  TXBuffer += F("<BR><BR>");
+  sendHeadandTail(F("TmplStd"),true);
+  TXBuffer.endStream();
 #endif
 #if defined(ESP32)
  String fdelete = WebServer.arg(F("delete"));
@@ -4607,35 +4650,67 @@ void handle_filelist() {
    // flashCount();
  }

+  const int pageSize = 25;
+  int startIdx = 0;

+  String fstart = WebServer.arg(F("start"));
+  if (fstart.length() > 0)
+  {
+    startIdx = atoi(fstart.c_str());
+  }
+  int endIdx = startIdx + pageSize - 1;

  TXBuffer += F("<table class='multirow' border=1px frame='box' rules='all'><TH><TH>Filename<TH>Size");

  File root = SPIFFS.open("/");
  File file = root.openNextFile();
-  while (file)
+  int count = -1;
+  while (file and count < endIdx)
  {
    if(!file.isDirectory()){
-      html_TR_TD();
-      if (strcmp(file.name(), FILE_CONFIG) != 0 && strcmp(file.name(), FILE_SECURITY) != 0 && strcmp(file.name(), FILE_NOTIFICATION) != 0)
-      {
-        TXBuffer += F("<a class='button link' href=\"filelist?delete=");
-        TXBuffer += file.name();
-        TXBuffer += F("\">Del</a>");
-      }
+      ++count;

-      TXBuffer += F("<TD><a href=\"");
-      TXBuffer += file.name();
-      TXBuffer += F("\">");
-      TXBuffer += file.name();
-      TXBuffer += F("</a>");
-      html_TD();
-      TXBuffer += file.size();
-      file = root.openNextFile();
+      if (count >= startIdx)
+      {
+        html_TR_TD();
+        if (strcmp(file.name(), FILE_CONFIG) != 0 && strcmp(file.name(), FILE_SECURITY) != 0 && strcmp(file.name(), FILE_NOTIFICATION) != 0)
+        {
+          TXBuffer += F("<a class='button link' href=\"filelist?delete=");
+          TXBuffer += file.name();
+          if (startIdx > 0)
+          {
+            TXBuffer += F("&start=");
+            TXBuffer += startIdx;
+          }
+          TXBuffer += F("\">Del</a>");
+        }
+
+        TXBuffer += F("<TD><a href=\"");
+        TXBuffer += file.name();
+        TXBuffer += F("\">");
+        TXBuffer += file.name();
+        TXBuffer += F("</a>");
+        html_TD();
+        TXBuffer += file.size();
+      }
    }
+    file = root.openNextFile();
  }
  TXBuffer += F("</table></form>");
-  TXBuffer += F("<BR><a class='button link' href=\"/upload\">Upload</a><BR><BR>");
+  TXBuffer += F("<BR><a class='button link' href=\"/upload\">Upload</a>");
+  if (startIdx > 0)
+  {
+    TXBuffer += F("<a class='button link' href=\"/filelist?start=");
+    TXBuffer += startIdx < pageSize ? 0 : startIdx - pageSize;
+    TXBuffer += F("\">Previous</a>");
+  }
+  if (count >= endIdx and file)
+  {
+    TXBuffer += F("<a class='button link' href=\"/filelist?start=");
+    TXBuffer += endIdx + 1;
+    TXBuffer += F("\">Next</a>");
+  }
+  TXBuffer += F("<BR><BR>");
    sendHeadandTail(F("TmplStd"),true);
    TXBuffer.endStream();
 #endif
@@ -5342,6 +5417,8 @@ void handle_sysinfo() {
     TXBuffer += ESP.getCpuFreqMHz();
     TXBuffer += F(" MHz");
  #endif
+  html_TR_TD(); TXBuffer += F("ESP Board Name:<TD>");
+  TXBuffer += ARDUINO_BOARD;


   addTableSeparator(F("Storage"), 2, 3);
@@ -34,7 +34,7 @@ boolean CPlugin_001(byte function, struct EventStruct *event, String& string)
    case CPLUGIN_INIT:
      {
        ControllerSettingsStruct ControllerSettings;
-        LoadControllerSettings(event->ControllerIndex, (byte*)&ControllerSettings, sizeof(ControllerSettings));
+        LoadControllerSettings(event->ControllerIndex, ControllerSettings);
        C001_DelayHandler.configureControllerSettings(ControllerSettings);
        break;
      }
@@ -36,7 +36,7 @@ boolean CPlugin_002(byte function, struct EventStruct *event, String& string)
    case CPLUGIN_INIT:
      {
        ControllerSettingsStruct ControllerSettings;
-        LoadControllerSettings(event->ControllerIndex, (byte*)&ControllerSettings, sizeof(ControllerSettings));
+        LoadControllerSettings(event->ControllerIndex, ControllerSettings);
        MQTTDelayHandler.configureControllerSettings(ControllerSettings);
        break;
      }
@@ -146,7 +146,7 @@ boolean CPlugin_002(byte function, struct EventStruct *event, String& string)
        if (event->idx != 0)
        {
          ControllerSettingsStruct ControllerSettings;
-          LoadControllerSettings(event->ControllerIndex, (byte*)&ControllerSettings, sizeof(ControllerSettings));
+          LoadControllerSettings(event->ControllerIndex, ControllerSettings);
 /*
          if (!ControllerSettings.checkHostReachable(true)) {
            success = false;
@@ -33,7 +33,7 @@ boolean CPlugin_003(byte function, struct EventStruct *event, String& string)
    case CPLUGIN_INIT:
      {
        ControllerSettingsStruct ControllerSettings;
-        LoadControllerSettings(event->ControllerIndex, (byte*)&ControllerSettings, sizeof(ControllerSettings));
+        LoadControllerSettings(event->ControllerIndex, ControllerSettings);
        C003_DelayHandler.configureControllerSettings(ControllerSettings);
        break;
      }
@@ -82,7 +82,7 @@ bool do_process_c003_delay_queue(int controller_number, const C003_queue_element
    delay(1);

  timer = millis() + 1000;
-  while (client.available() && !timeOutReached(timer) && !success)
+  while (client_available(client) && !timeOutReached(timer) && !success)
  {

    //   String line = client.readStringUntil('\n');
@@ -109,7 +109,7 @@ bool do_process_c003_delay_queue(int controller_number, const C003_queue_element
  addLog(LOG_LEVEL_DEBUG, log);
  client.print(element.txt);
  delay(10);
-  while (client.available())
+  while (client_available(client))
    client.read();

  strcpy_P(log, PSTR("TELNT: closing connection"));
@@ -33,7 +33,7 @@ boolean CPlugin_004(byte function, struct EventStruct *event, String& string)
    case CPLUGIN_INIT:
      {
        ControllerSettingsStruct ControllerSettings;
-        LoadControllerSettings(event->ControllerIndex, (byte*)&ControllerSettings, sizeof(ControllerSettings));
+        LoadControllerSettings(event->ControllerIndex, ControllerSettings);
        C004_DelayHandler.configureControllerSettings(ControllerSettings);
        break;
      }
@@ -34,7 +34,7 @@ boolean CPlugin_005(byte function, struct EventStruct *event, String& string)
    case CPLUGIN_INIT:
      {
        ControllerSettingsStruct ControllerSettings;
-        LoadControllerSettings(event->ControllerIndex, (byte*)&ControllerSettings, sizeof(ControllerSettings));
+        LoadControllerSettings(event->ControllerIndex, ControllerSettings);
        MQTTDelayHandler.configureControllerSettings(ControllerSettings);
        break;
      }
@@ -93,7 +93,7 @@ boolean CPlugin_005(byte function, struct EventStruct *event, String& string)
    case CPLUGIN_PROTOCOL_SEND:
      {
        ControllerSettingsStruct ControllerSettings;
-        LoadControllerSettings(event->ControllerIndex, (byte*)&ControllerSettings, sizeof(ControllerSettings));
+        LoadControllerSettings(event->ControllerIndex, ControllerSettings);
        if (!ControllerSettings.checkHostReachable(true)) {
            success = false;
            break;
@@ -34,7 +34,7 @@ boolean CPlugin_006(byte function, struct EventStruct *event, String& string)
    case CPLUGIN_INIT:
      {
        ControllerSettingsStruct ControllerSettings;
-        LoadControllerSettings(event->ControllerIndex, (byte*)&ControllerSettings, sizeof(ControllerSettings));
+        LoadControllerSettings(event->ControllerIndex, ControllerSettings);
        MQTTDelayHandler.configureControllerSettings(ControllerSettings);
        break;
      }
@@ -91,7 +91,7 @@ boolean CPlugin_006(byte function, struct EventStruct *event, String& string)
          break;
        }
        ControllerSettingsStruct ControllerSettings;
-        LoadControllerSettings(event->ControllerIndex, (byte*)&ControllerSettings, sizeof(ControllerSettings));
+        LoadControllerSettings(event->ControllerIndex, ControllerSettings);

        statusLED(true);

@@ -33,7 +33,7 @@ boolean CPlugin_007(byte function, struct EventStruct *event, String& string)
    case CPLUGIN_INIT:
      {
        ControllerSettingsStruct ControllerSettings;
-        LoadControllerSettings(event->ControllerIndex, (byte*)&ControllerSettings, sizeof(ControllerSettings));
+        LoadControllerSettings(event->ControllerIndex, ControllerSettings);
        C007_DelayHandler.configureControllerSettings(ControllerSettings);
        break;
      }
@@ -35,7 +35,7 @@ boolean CPlugin_008(byte function, struct EventStruct *event, String& string)
    case CPLUGIN_INIT:
      {
        ControllerSettingsStruct ControllerSettings;
-        LoadControllerSettings(event->ControllerIndex, (byte*)&ControllerSettings, sizeof(ControllerSettings));
+        LoadControllerSettings(event->ControllerIndex, ControllerSettings);
        C008_DelayHandler.configureControllerSettings(ControllerSettings);
        break;
      }
@@ -56,7 +56,7 @@ boolean CPlugin_008(byte function, struct EventStruct *event, String& string)
          PluginCall(PLUGIN_GET_DEVICEVALUENAMES, event, dummyString);

        ControllerSettingsStruct ControllerSettings;
-        LoadControllerSettings(event->ControllerIndex, (byte*)&ControllerSettings, sizeof(ControllerSettings));
+        LoadControllerSettings(event->ControllerIndex, ControllerSettings);

        for (byte x = 0; x < valueCount; x++)
        {
@@ -24,7 +24,7 @@
 - removed obsolete http get url code
 - v1.04
 - added build options and node_type_id to JSON/device
- /******************************************************************************/
+ ******************************************************************************/

 #define CPLUGIN_009
 #define CPLUGIN_ID_009         9
@@ -46,7 +46,7 @@ boolean CPlugin_010(byte function, struct EventStruct *event, String& string)
          PluginCall(PLUGIN_GET_DEVICEVALUENAMES, event, dummyString);

        ControllerSettingsStruct ControllerSettings;
-        LoadControllerSettings(event->ControllerIndex, (byte*)&ControllerSettings, sizeof(ControllerSettings));
+        LoadControllerSettings(event->ControllerIndex, ControllerSettings);

        for (byte x = 0; x < valueCount; x++)
        {
@@ -148,7 +148,7 @@ boolean Create_schedule_HTTP_C011(struct EventStruct *event)
    return false;
  }
  ControllerSettingsStruct ControllerSettings;
-  LoadControllerSettings(event->ControllerIndex, (byte*)&ControllerSettings, sizeof(ControllerSettings));
+  LoadControllerSettings(event->ControllerIndex, ControllerSettings);

  C011_ConfigStruct customConfig;
  LoadCustomControllerSettings(event->ControllerIndex,(byte*)&customConfig, sizeof(customConfig));
@@ -41,7 +41,7 @@ boolean CPlugin_012(byte function, struct EventStruct *event, String& string)
          PluginCall(PLUGIN_GET_DEVICEVALUENAMES, event, dummyString);

        ControllerSettingsStruct ControllerSettings;
-        LoadControllerSettings(event->ControllerIndex, (byte*)&ControllerSettings, sizeof(ControllerSettings));
+        LoadControllerSettings(event->ControllerIndex, ControllerSettings);

        for (byte x = 0; x < valueCount; x++)
        {
@@ -83,7 +83,7 @@ boolean Blynk_get(const String& command, byte controllerIndex, float *data )
  }

  ControllerSettingsStruct ControllerSettings;
-  LoadControllerSettings(controllerIndex, (byte*)&ControllerSettings, sizeof(ControllerSettings));
+  LoadControllerSettings(controllerIndex, ControllerSettings);

  if ((SecuritySettings.ControllerPassword[controllerIndex][0] == 0)) {
    addLog(LOG_LEVEL_ERROR, F("Blynk : No password set"));
@@ -113,7 +113,7 @@ boolean Blynk_get(const String& command, byte controllerIndex, float *data )
  char log[80] = {0};

  // Read all the lines of the reply from server and log them
-  while (client.available()) {
+  while (client_available(client)) {
    String line;
    safeReadStringUntil(client, line, '\n');
    addLog(LOG_LEVEL_DEBUG_MORE, line);
@@ -154,7 +154,7 @@ boolean Blynk_get(const String& command, byte controllerIndex, float *data )
  client.flush();
  client.stop();

-  // important - backgroudtasks - free mem
+  // important - backgroundtasks - free mem
  timer = millis() + Settings.MessageDelay;
  while (!timeOutReached(timer))
              backgroundtasks();
@@ -324,7 +324,7 @@ ControllerDelayHandlerStruct<MQTT_queue_element> MQTTDelayHandler;
                  C##NNN##_queue_element element; \
                  if (!C##NNN##_DelayHandler.getNext(element)) return; \
                  ControllerSettingsStruct ControllerSettings; \
-                  LoadControllerSettings(element.controller_idx, (byte*)&ControllerSettings, sizeof(ControllerSettings)); \
+                  LoadControllerSettings(element.controller_idx, ControllerSettings); \
                  C##NNN##_DelayHandler.configureControllerSettings(ControllerSettings); \
                  if (!WiFiConnected(100)) { \
                    scheduleNextDelayQueue(TIMER_C##NNN##_DELAY_QUEUE, C##NNN##_DelayHandler.getNextScheduleTime()); \
@@ -380,7 +380,9 @@ ControllerDelayHandlerStruct<MQTT_queue_element> MQTTDelayHandler;
 bool safeReadStringUntil(Stream &input, String &str, char terminator, unsigned int maxSize = 1024, unsigned int timeout = 1000)
 {
 	int c;
-	const unsigned long timer = millis() + timeout;
+  const unsigned long start = millis();
+	const unsigned long timer = start + timeout;
+  unsigned long backgroundtasks_timer = start + 100;
 	str = "";

 	do {
@@ -401,7 +403,13 @@ bool safeReadStringUntil(Stream &input, String &str, char terminator, unsigned i
 				}
 			}
 		}
-		yield();
+    // We must run the backgroundtasks every now and then.
+    if (timeOutReached(backgroundtasks_timer)) {
+      backgroundtasks_timer += 100;
+      backgroundtasks();
+    } else {
+      yield();
+    }
 	} while (!timeOutReached(timer));

 	addLog(LOG_LEVEL_ERROR, F("Timeout while reading input data!"));
@@ -592,6 +600,13 @@ bool try_connect_host(int controller_number, WiFiClient& client, ControllerSetti
      F("HTTP : "), controller_number, ControllerSettings);
 }

+// Use "client.available() || client.connected()" to read all lines from slow servers.
+// See: https://github.com/esp8266/Arduino/pull/5113
+//      https://github.com/esp8266/Arduino/pull/1829
+bool client_available(WiFiClient& client) {
+  return client.available() || client.connected();
+}
+
 bool send_via_http(const String& logIdentifier, WiFiClient& client, const String& postStr) {
  bool success = false;
  // This will send the request to the server
@@ -602,7 +617,7 @@ bool send_via_http(const String& logIdentifier, WiFiClient& client, const String
    delay(1);

  // Read all the lines of the reply from server and print them to Serial
-  while (client.available() && !success) {
+  while (client_available(client) && !success) {
    //   String line = client.readStringUntil('\n');
    String line;
    safeReadStringUntil(client, line, '\n');
@@ -20,7 +20,7 @@ boolean Plugin_009(byte function, struct EventStruct *event, String& string)
      {
        Device[++deviceCount].Number = PLUGIN_ID_009;
        Device[deviceCount].Type = DEVICE_TYPE_I2C;
-        Device[deviceCount].VType = SENSOR_TYPE_SINGLE;
+        Device[deviceCount].VType = SENSOR_TYPE_SWITCH;
        Device[deviceCount].Ports = 16;
        Device[deviceCount].PullUpOption = false;
        Device[deviceCount].InverseLogicOption = false;
@@ -155,7 +155,10 @@ boolean Plugin_016(byte function, struct EventStruct *event, String& string)
      {
        if (irReceiver->decode(&results))
        {
+          unsigned long IRcode = results.value;
          irReceiver->resume();
+          UserVar[event->BaseVarIndex] = (IRcode & 0xFFFF);
+          UserVar[event->BaseVarIndex + 1] = ((IRcode >> 16) & 0xFFFF);
          String log = "IR: ";
          if (results.overflow)
            log += F("WARNING: IR code is too big for buffer. This result shouldn't be trusted until this is resolved. Edit & increase CAPTURE_BUFFER_SIZE.\n");
@@ -20,7 +20,7 @@ boolean Plugin_019(byte function, struct EventStruct *event, String& string)
      {
        Device[++deviceCount].Number = PLUGIN_ID_019;
        Device[deviceCount].Type = DEVICE_TYPE_I2C;
-        Device[deviceCount].VType = SENSOR_TYPE_SINGLE;
+        Device[deviceCount].VType = SENSOR_TYPE_SWITCH;
        Device[deviceCount].Ports = 8;
        Device[deviceCount].PullUpOption = false;
        Device[deviceCount].InverseLogicOption = false;
@@ -382,8 +382,10 @@ bool Plugin_028_update_measurements(const uint8_t i2cAddress, float tempOffset,
    return false;
  }

-  if (!timeOutReached(sensor.last_measurement + 1000)) {
-    // Must wait one second to make sure the filtered values stabilize.
+  // It takes at least 1.587 sec for valit measurements to complete.
+  // The datasheet names this the "T63" moment.
+  // 1 second = 63% of the time needed to perform a measurement.
+  if (!timeOutReached(sensor.last_measurement + 1587)) {
    return false;
  }
  if (!Plugin_028_readUncompensatedData(i2cAddress)) {
@@ -510,7 +512,7 @@ bool Plugin_028_begin(uint8_t i2cAddress) {
  I2C_write8_reg(i2cAddress, BMx280_REGISTER_SOFTRESET, 0xB6);
  delay(2);  // Startup time is 2 ms (datasheet)
  Plugin_028_readCoefficients(i2cAddress);
-  delay(65); //May be needed here as well to fix first wrong measurement?
+//  delay(65); //May be needed here as well to fix first wrong measurement?
  return true;
 }

@@ -548,8 +550,8 @@ void Plugin_028_readCoefficients(uint8_t i2cAddress)
 bool Plugin_028_readUncompensatedData(uint8_t i2cAddress) {
  // wait until measurement has been completed, otherwise we would read
  // the values from the last measurement
-  while (I2C_read8_reg(i2cAddress, BMx280_REGISTER_STATUS) & 0x08)
-    delay(1);
+  if (I2C_read8_reg(i2cAddress, BMx280_REGISTER_STATUS) & 0x08)
+    return false;

  I2Cdata_bytes BME280_data(BME280_P_T_H_DATA_LEN, BME280_DATA_ADDR);
  bool allDataRead = I2C_read_bytes(i2cAddress, BME280_data);
@@ -642,13 +644,6 @@ float Plugin_028_readHumidity(uint8_t i2cAddress)
    // No support for humidity
    return 0.0;
  }
-  // It takes at least 1.587 sec for valit measurements to complete.
-  // The datasheet names this the "T63" moment.
-  // 1 second = 63% of the time needed to perform a measurement.
-  unsigned long difTime = millis() - sensor.last_measurement;
-  if (difTime < 1587) {
-    delay(1587 - difTime);
-  }
  int32_t adc_H = sensor.uncompensated.humidity;

  int32_t v_x1_u32r;
@@ -53,7 +53,7 @@ boolean Plugin_029(byte function, struct EventStruct *event, String& string)
        addHtml(F("<TR><TD>IDX:<TD>"));
        String id = F("TDID");   //="taskdeviceid"
        id += controllerNr + 1;
-        addNumericBox(id, Settings.TaskDeviceID[controllerNr][event->TaskIndex], 0, 9999);
+        addNumericBox(id, Settings.TaskDeviceID[controllerNr][event->TaskIndex], 0, DOMOTICZ_MAX_IDX);
        success = true;
        break;
      }
@@ -24,6 +24,36 @@
 WiFiClient espclient_037;
 PubSubClient *MQTTclient_037 = NULL;
 bool MQTTclient_037_connected = false;
+int reconnectCount = 0;
+
+String getClientName() {
+  //
+  // Generate the MQTT import client name from the system name and a suffix
+  //
+  String tmpClientName = F("%sysname%-Import");
+  String ClientName = parseTemplate(tmpClientName, 20);
+  if (reconnectCount != 0) ClientName += reconnectCount;
+  return ClientName;
+}
+
+void Plugin_037_try_connect() {
+  Plugin_037_update_connect_status();
+  if (MQTTclient_037_connected) return;
+  // workaround see: https://github.com/esp8266/Arduino/issues/4497#issuecomment-373023864
+  espclient_037 = WiFiClient();
+
+  if (MQTTclient_037 == NULL) {
+    MQTTclient_037 = new PubSubClient(espclient_037);
+  }
+  if (MQTTConnect_037())
+  {
+    //		Subscribe to ALL the topics from ALL instance of this import module
+    MQTTSubscribe_037();
+  } else {
+    MQTTclient_037->disconnect();
+  }
+  Plugin_037_update_connect_status();
+}

 void Plugin_037_update_connect_status() {
  bool connected = false;
@@ -39,6 +69,7 @@ void Plugin_037_update_connect_status() {
    if (!connected) {
      // workaround see: https://github.com/esp8266/Arduino/issues/4497#issuecomment-373023864
      espclient_037 = WiFiClient();
+      ++reconnectCount;
      addLog(LOG_LEVEL_ERROR, F("IMPT : MQTT 037 Connection lost"));
    }
  }
@@ -49,11 +80,6 @@ boolean Plugin_037(byte function, struct EventStruct *event, String& string)
  boolean success = false;

  char deviceTemplate[4][41];		// variable for saving the subscription topics
-  //
-  // Generate the MQTT import client name from the system name and a suffix
-  //
-  String tmpClientName = F("%sysname%-Import");
-  String ClientName = parseTemplate(tmpClientName, 20);

  switch (function)
  {
@@ -121,30 +147,23 @@ boolean Plugin_037(byte function, struct EventStruct *event, String& string)

    case PLUGIN_INIT:
      {
-        if (!MQTTclient_037) {
-          MQTTclient_037 = new PubSubClient(espclient_037);
-        }
-
+        success = false;
        //    When we edit the subscription data from the webserver, the plugin is called again with init.
        //    In order to resubscribe we have to disconnect and reconnect in order to get rid of any obsolete subscriptions
-
-        MQTTclient_037->disconnect();
-
-        if (MQTTConnect_037(ClientName))
-        {
-          //		Subscribe to ALL the topics from ALL instance of this import module
-          MQTTSubscribe_037();
-          success = true;
-        }
-        else
-        {
-          success = false;
+        if (MQTTclient_037 != NULL) {
+          MQTTclient_037->disconnect();
+          if (MQTTConnect_037())
+          {
+            //		Subscribe to ALL the topics from ALL instance of this import module
+            MQTTSubscribe_037();
+            success = true;
+          }
        }
      }

    case PLUGIN_TEN_PER_SECOND:
      {
-        if (!MQTTclient_037->loop()) {		// Listen out for callbacks
+        if (MQTTclient_037 != NULL && !MQTTclient_037->loop()) {		// Listen out for callbacks
          Plugin_037_update_connect_status();
        }
        success = true;
@@ -154,25 +173,26 @@ boolean Plugin_037(byte function, struct EventStruct *event, String& string)
    case PLUGIN_ONCE_A_SECOND:
      {
        //  Here we check that the MQTT client is alive.
+        Plugin_037_try_connect();
+        if (MQTTclient_037 != NULL) {
+          if (!MQTTclient_037->connected() || MQTTclient_should_reconnect) {
+            if (MQTTclient_should_reconnect) {
+              addLog(LOG_LEVEL_ERROR, F("IMPT : MQTT 037 Intentional reconnect"));
+            }

-        if (!MQTTclient_037->connected() || MQTTclient_should_reconnect) {
-          if (MQTTclient_should_reconnect) {
-            addLog(LOG_LEVEL_ERROR, F("IMPT : MQTT 037 Intentional reconnect"));
+            MQTTclient_037->disconnect();
+            Plugin_037_update_connect_status();
+            delay(250);
+
+            if (! MQTTConnect_037()) {
+              success = false;
+              break;
+            }
+
+            MQTTSubscribe_037();
          }
-
-          MQTTclient_037->disconnect();
-          Plugin_037_update_connect_status();
-          delay(250);
-
-          if (! MQTTConnect_037(ClientName)) {
-            success = false;
-            break;
-          }
-
-          MQTTSubscribe_037();
+          success = true;
        }
-
-        success = true;
        break;
      }

@@ -260,6 +280,7 @@ boolean Plugin_037(byte function, struct EventStruct *event, String& string)
 }
 boolean MQTTSubscribe_037()
 {
+  if (!MQTTclient_037_connected) return false;

  // Subscribe to the topics requested by ALL calls to this plugin.
  // We do this because if the connection to the broker is lost, we want to resubscribe for all instances.
@@ -283,7 +304,7 @@ boolean MQTTSubscribe_037()
        if (subscribeTo.length() > 0)
        {
          parseSystemVariables(subscribeTo, false);
-          if (MQTTclient_037->subscribe(subscribeTo.c_str()))
+          if (MQTTclient_037 != NULL && MQTTclient_037->subscribe(subscribeTo.c_str()))
          {
            String log = F("IMPT : [");
            LoadTaskSettings(y);
@@ -350,9 +371,11 @@ void mqttcallback_037(char* c_topic, byte* b_payload, unsigned int length)
 // For some reason this seems to failduring the call in INIT- however it succeeds later during recovery
 // It would be nice to understand this....

-boolean MQTTConnect_037(String clientid)
+boolean MQTTConnect_037()
 {
  boolean result = false;
+  if (MQTTclient_037 == NULL) return false;
+  String clientid = getClientName();
  // @ToDo TD-er: Plugin allows for more than one MQTT controller, but we're now using only the first enabled one.
  int enabledMqttController = firstEnabledMQTTController();
  if (enabledMqttController < 0) {
@@ -368,7 +391,7 @@ boolean MQTTConnect_037(String clientid)
    return false; // Not connected, so no use in wasting time to connect to a host.
  }
  ControllerSettingsStruct ControllerSettings;
-  LoadControllerSettings(enabledMqttController, (byte*)&ControllerSettings, sizeof(ControllerSettings));
+  LoadControllerSettings(enabledMqttController, ControllerSettings);
  if (ControllerSettings.UseDNS) {
    MQTTclient_037->setServer(ControllerSettings.getHost().c_str(), ControllerSettings.Port);
  } else {
@@ -16,7 +16,7 @@

 #define P044_STATUS_LED 12
 #define P044_BUFFER_SIZE 1024
-#define P044_NETBUF_SIZE 600
+#define P044_NETBUF_SIZE 128
 #define P044_DISABLED 0
 #define P044_WAITING 1
 #define P044_READING 2
@@ -31,7 +31,7 @@ boolean CRCcheck = false;
 unsigned int currCRC = 0;
 int checkI = 0;

-WiFiServer *P1GatewayServer;
+WiFiServer *P1GatewayServer = nullptr;
 WiFiClient P1GatewayClient;

 boolean Plugin_044(byte function, struct EventStruct *event, String& string)
@@ -125,7 +125,11 @@ boolean Plugin_044(byte function, struct EventStruct *event, String& string)
          #if defined(ESP32)
            Serial.begin(ExtraTaskSettings.TaskDevicePluginConfigLong[1], serialconfig);
          #endif
-          if (P1GatewayServer) P1GatewayServer->close();
+          if (P1GatewayServer)
+          {
+            P1GatewayServer->close();
+            delete P1GatewayServer;
+          }
          P1GatewayServer = new WiFiServer(ExtraTaskSettings.TaskDevicePluginConfigLong[0]);
          P1GatewayServer->begin();

@@ -164,7 +168,7 @@ boolean Plugin_044(byte function, struct EventStruct *event, String& string)
      {
        if (P1GatewayServer) {
          P1GatewayServer->close();
-          //FIXME: shouldnt P1P1GatewayServer be deleted?
+          delete P1GatewayServer;
          P1GatewayServer = NULL;
        }
        success = true;
@@ -175,7 +179,6 @@ boolean Plugin_044(byte function, struct EventStruct *event, String& string)
      {
        if (Plugin_044_init)
        {
-          size_t bytes_read;
          if (P1GatewayServer->hasClient())
          {
            if (P1GatewayClient) P1GatewayClient.stop();
@@ -186,24 +189,25 @@ boolean Plugin_044(byte function, struct EventStruct *event, String& string)
          if (P1GatewayClient.connected())
          {
            connectionState = 1;
-            uint8_t net_buf[P044_BUFFER_SIZE];
+            uint8_t net_buf[P044_NETBUF_SIZE];
            int count = P1GatewayClient.available();
            if (count > 0)
            {
-              if (count > P044_BUFFER_SIZE)
-                count = P044_BUFFER_SIZE;
-              bytes_read = P1GatewayClient.read(net_buf, count);
-              Serial.write(net_buf, bytes_read);
+              size_t net_bytes_read;
+              if (count > P044_NETBUF_SIZE)
+                count = P044_NETBUF_SIZE;
+              net_bytes_read = P1GatewayClient.read(net_buf, count);
+              Serial.write(net_buf, net_bytes_read);
              Serial.flush(); // Waits for the transmission of outgoing serial data to complete

-              if (count == P044_BUFFER_SIZE) // if we have a full buffer, drop the last position to stuff with string end marker
+              if (count == P044_NETBUF_SIZE) // if we have a full buffer, drop the last position to stuff with string end marker
              {
                count--;
                // and log buffer full situation
                addLog(LOG_LEVEL_ERROR, F("P1   : Error: network buffer full!"));
              }
              net_buf[count] = 0; // before logging as a char array, zero terminate the last position to be safe.
-              char log[P044_BUFFER_SIZE + 40];
+              char log[P044_NETBUF_SIZE + 40];
              sprintf_P(log, PSTR("P1   : Error: N>: %s"), (char*)net_buf);
              addLog(LOG_LEVEL_DEBUG, log);
            }
@@ -458,6 +458,7 @@ void p073_FillBufferWithTemp(long temperature)
  int p073_numlenght = strlen(p073_digit);
  byte p073_dispdigit;
  for (int i=0;i<p073_numlenght;i++) {
+    p073_dispdigit = 10;           // default is space
    if (p073_digit[i] > 47 && p073_digit[i] < 58)
      p073_dispdigit = p073_digit[i]-48;
    else if (p073_digit[i] == 32)  // space
@@ -206,10 +206,25 @@ To create/register a plugin, you have to :
    #define USES_P036   // FrameOLED
    #define USES_P027   // INA219
    #define USES_P028   // BME280
-
-    // TODO : Add list of compatible plugins for ESP32 board.
 #endif

+#ifdef PLUGIN_SET_TEST_ESP32
+    #ifndef ESP32
+        #define ESP32
+    #endif
+    #ifdef ESP8266
+        #undef ESP8266
+    #endif
+//    #define PLUGIN_SET_ONLY_SWITCH
+
+    #define  PLUGIN_SET_TESTING
+    #define  CONTROLLER_SET_STABLE
+    #define  NOTIFIER_SET_STABLE
+    #define  PLUGIN_SET_STABLE     // add stable
+    // See also PLUGIN_SET_TEST_ESP32 section at end,
+    // where incompatible plugins will be disabled.
+    // TODO : Check compatibility of plugins for ESP32 board.
+#endif


 // Generic ------------------------------------
@@ -585,8 +600,22 @@ To create/register a plugin, you have to :
 #ifdef NOTIFIER_SET_EXPERIMENTAL
 #endif

+/******************************************************************************\
+ * Remove incompatible plugins ************************************************
+\******************************************************************************/
+#ifdef PLUGIN_SET_TEST_ESP32
+  #undef USES_P010   // BH1750          (doesn't work yet on ESP32)
+  #undef USES_P049   // MHZ19           (doesn't work yet on ESP32)

+  #undef USES_P052   // SenseAir        (doesn't work yet on ESP32)
+  #undef USES_P053   // PMSx003

+  #undef USES_P056   // SDS011-Dust     (doesn't work yet on ESP32)
+  #undef USES_P065   // DRF0299
+  #undef USES_P071   // Kamstrup401
+  #undef USES_P075   // Nextion
+  #undef USES_P078   // Eastron Modbus Energy meters (doesn't work yet on ESP32)
+#endif


 /******************************************************************************\
Author	SHA1	Message	Date
ESPEasy release bot	30f5c5cb7d	automatically updated release notes for mega-20180927	2018-09-27 04:00:17 +02:00
Gijs NoorlanderandGitHub	ae1db543ce	Merge pull request #1804 from TD-er/bugfix/ESP32_partition_build [ESP32] Split new partition layout to separate build	2018-09-26 22:52:30 +02:00
TD-er	947e1e0343	[Build] Add esp32test_1M8_partition build and warning on ESP32 partition	2018-09-26 22:49:30 +02:00
TD-er	0578d720f4	[ESP32] Split new partition layout to separate build See "ESP32 not start after last upgrade" #1802	2018-09-26 21:55:02 +02:00
Gijs NoorlanderandGitHub	211d79bbd5	Merge pull request #1792 from TD-er/feature/ESP32_partition_table [ESP32] Change partition size (will clear all settings) and add plugins	2018-09-26 09:05:44 +02:00
TD-er	91c5d60af9	[Info] Add board name to the sysinfo page.	2018-09-25 00:19:17 +02:00
TD-er	0d9bc8027d	[ESP32] RTOS move handle_schedule() to core1 and increase stack Enable RTOS flag in advanced settings (and reboot) to create separate threads on the 2nd ESP32 core, which will handle the scheduler. This lowers stack usage and CPU load. Also the ESP will no longer crash when saving large settings like for the Framed OLED plugin.	2018-09-25 00:18:46 +02:00
TD-er	bd2bdab95c	[Stack] Move Settings from stack to heap	2018-09-24 22:08:02 +02:00
TD-er	c4f98fbc8e	[Travis] Uninitialized variable in P073_7DGT	2018-09-24 20:13:24 +02:00
ESPEasy release bot	b332a513b5	automatically updated release notes for mega-20180924	2018-09-24 04:00:20 +02:00
TD-er	e36bb714f1	[ESP32] Change partition size (will clear all settings) and add plugins The last update to > 0.12 increased the binary size a lot. This is mainly due to the added BLE support. This makes it almost impossible to use the default partition table layout. This changes the app partitions to 1.8 MB and reduces the SPIFFS to 320 k. Changing the partition table will clear all settings, so make a backup of the settings. Also added all plugins that would compile (not tested) for ESP32. Known issue: ESP32 might crash due to stack overflow when saving settings of plugins. (e.g. OLED framed plugin)	2018-09-24 00:23:45 +02:00
Gijs NoorlanderandGitHub	6e1cde343f	Merge pull request #1791 from TD-er/bugfix/ESP32_I2C [ESP32] Fix I2C handling to allow I2C devices to work	2018-09-23 22:14:43 +02:00
TD-er	cce9ddd2dc	[ESP32] Fix I2C handling to allow I2C devices to work See this issue: [I2C repeated start broken](https://github.com/platformio/platform-espressif32/issues/126)	2018-09-23 21:17:55 +02:00
Gijs NoorlanderandGitHub	51be17a436	Merge pull request #1780 from clumsy-stefan/sensor_type_change Change type of sensor for MCP and PCF devices	2018-09-23 20:18:38 +02:00
Gijs NoorlanderandGitHub	66d27a6697	Merge pull request #1776 from beigenmann/mega Fix platformio	2018-09-23 20:17:33 +02:00
Gijs NoorlanderandGitHub	a033e458fb	Merge pull request #1782 from TD-er/bugfix/MQTT_reconnect_name [MQTT] Work around for lost MQTT connection	2018-09-23 20:17:07 +02:00
Gijs NoorlanderandGitHub	494436bbff	Merge pull request #1789 from sakinit/ESP32-to-core_esp32_1_3_0 ESP32: change to platform version core_esp32_1_3_0	2018-09-23 20:16:52 +02:00
sakinit	23bacd0762	change to platform version core_esp32_1_3_0	2018-09-23 17:49:47 +02:00
ESPEasy release bot	f131254853	automatically updated release notes for mega-20180923	2018-09-23 04:00:12 +02:00
TD-er	657d15d962	[MQTT] Work around for lost MQTT connection Maybe a fix for #1525 Meant to be a fix for #1530 It looks like the MQTT broker is refusing to accept a new connection from a specific client ID, as long as the broker thinks a client with that ID is still connected. This work around adds the number of wifi reconnects to the clientID, to make the ID unique when a reconnect has to be made.	2018-09-23 00:54:55 +02:00
Gijs NoorlanderandGitHub	60910da48d	Merge pull request #1749 from sakinit/ESP32-P1WifiGateway-updates Esp32 p1 wifi gateway updates	2018-09-22 20:59:32 +02:00
Gijs NoorlanderandGitHub	6cee2d0f32	Merge pull request #1779 from TD-er/bugfix/BME280_slow_reading [BME280] Fix slow reading of BME280 causing watchdog resets	2018-09-22 20:45:20 +02:00
stefan	533cb88a64	Change type of sensor for MCP and PCF devices MCP and PCF devices should be of type SWNSOR_TYPE_SWITCH instead of SENSOR_TYPE_SINGLE so that the controllers can identify them correctly as switches (for GPIO related functions)	2018-09-22 20:41:53 +02:00
TD-er	ffa32fe851	[BME280] Fix slow reading of BME280 causing watchdog resets The plugin still had some delay and an active polling to see if the reading was ready. This took more than 1.5 sec per reading, which could trigger a Watchdog reset.	2018-09-22 20:34:56 +02:00
Gijs NoorlanderandGitHub	b900cc9389	Merge pull request #1777 from TD-er/bugfix/MQTTimport [MQTT import] Fix crash at boot when plugin is enabled	2018-09-22 19:13:25 +02:00
TD-er	8e11c19af6	[MQTT import] Fix crash at boot when plugin is enabled See #1722 Inspired by [this comment](https://github.com/letscontrolit/ESPEasy/issues/1722#issuecomment-422191721) of @kainhofer	2018-09-22 16:39:16 +02:00
Benno Eigenmann	f33ca6df78	Fix platformio	2018-09-22 15:57:09 +02:00
ESPEasy release bot	194a230d20	automatically updated release notes for mega-20180922	2018-09-22 04:00:22 +02:00
Gijs NoorlanderandGitHub	7a5a432016	Merge pull request #1773 from TD-er/reapply_reverts Reapply reverts	2018-09-22 02:04:30 +02:00
TD-er	07511fe144	Revert "Revert "Fix elseif & Add if-elseif-else nesting levels"" This reverts commit `a4fe8d42d2`.	2018-09-21 22:15:13 +02:00
Gijs Noorlander	9a390136f9	Revert "Revert "Added 2 new operators in Calculate() function"" This reverts commit `fa42cadfa1`.	2018-09-21 22:14:30 +02:00
Gijs NoorlanderandGitHub	27a03f166a	Merge pull request #1770 from TD-er/bugfix/revert_disable_command_scheduler_0915 Revert "[Scheduler] Disable command scheduler"	2018-09-21 22:10:50 +02:00
TD-er	0a63aeb8f0	Revert "[Scheduler] Disable command scheduler" This reverts commit `38af765935`.	2018-09-20 23:20:19 +02:00
sakinit	22c10ac615	ESP32 platform updated to 1.2.0; Webserver replaced by platform one	2018-09-16 16:44:25 +02:00
ESPEasy release bot	ac83cfa249	automatically updated release notes for mega-20180916	2018-09-16 04:00:11 +02:00
Gijs NoorlanderandGitHub	6ef0c08bc4	Merge pull request #1754 from TD-er/bugfix/backgroundtasks_rules [HW Watchdog] Backgroundtasks instead of yield during rules handling	2018-09-16 01:19:47 +02:00
TD-er	1ee965067d	[HW Watchdog] Backgroundtasks instead of yield during rules handling	2018-09-16 01:19:14 +02:00
Gijs NoorlanderandGitHub	e46a873fce	Merge pull request #1753 from letscontrolit/revert-1641-mega Revert "Fix elseif & Add if-elseif-else nesting levels"	2018-09-16 01:15:04 +02:00
Gijs NoorlanderandGitHub	784e956c96	Merge pull request #1752 from letscontrolit/revert-1742-new/not Revert "Added 2 new operators in Calculate() function"	2018-09-16 01:14:32 +02:00
Gijs NoorlanderandGitHub	b6eebb330a	Added warning to release notes 20180915	2018-09-16 01:13:49 +02:00
Gijs NoorlanderandGitHub	a4fe8d42d2	Revert "Fix elseif & Add if-elseif-else nesting levels"	2018-09-16 01:08:42 +02:00
Gijs NoorlanderandGitHub	fa42cadfa1	Revert "Added 2 new operators in Calculate() function"	2018-09-16 01:04:37 +02:00
sakinit	17dc6fa859	Reverted Webserver change	2018-09-15 16:22:58 +02:00
sakinit	1432726dec	ESP32: Split webserver spiffs filelist into pages	2018-09-15 12:14:33 +02:00
sakinit	7ba6ffa407	Fix ESP32 stack overflow in addPinSelect when called from P1WifiGateway In addFormPinSelect move local variables from the stack to the heap because when it is called from the P1WifiGateway there is not enough stack space resulting in a stack overflow.	2018-09-15 12:14:27 +02:00
sakinit	ab555e4d6b	ESP32 build issues fixed - Compiler issue of comment within comment - ESP32Webserver renamed to Webserver in ESP32 Arduino library	2018-09-15 12:14:22 +02:00
ESPEasy release bot	d4259f4e23	automatically updated release notes for mega-20180915	2018-09-15 04:00:15 +02:00
Gijs NoorlanderandGitHub	aef45c06f6	Merge pull request #1747 from TD-er/bugfix/sunrise [#1698] Incorrect sunrise value southern hemisphere	2018-09-15 00:19:42 +02:00
Gijs NoorlanderandGitHub	828f9e6a30	Merge pull request #1746 from TD-er/feature/hostname_settings Validate settings + hostname format option	2018-09-15 00:14:30 +02:00
TD-er	e79d778cf4	[#1698 ] Incorrect sunrise value southern hemisphere See #1698	2018-09-15 00:10:45 +02:00
TD-er	965eb2d994	[#1713 ] Make hostname-unitnumber optional & validate settings See #1713 Also added validation check for some values in the settings at load/save of settings. This could be extended later on for task settings.	2018-09-14 23:44:58 +02:00
Gijs NoorlanderandGitHub	657fccf49f	Merge pull request #1641 from svmac/mega Fix elseif & Add if-elseif-else nesting levels	2018-09-14 23:27:00 +02:00
Gijs NoorlanderandGitHub	228b41a1ac	Merge pull request #1742 from giig1967g/new/not Added 2 new operators in Calculate() function	2018-09-14 23:26:25 +02:00
Gijs NoorlanderandGitHub	3bba294eb7	Merge pull request #1745 from TD-er/bugfix/commands_not_using_scheduler [Scheduler] Disable command scheduler	2018-09-14 23:22:21 +02:00
TD-er	0254181b3e	[Controller settings] Validate settings on load/save Make sure new values are set to proper defaults and within valid range.	2018-09-14 22:54:23 +02:00
Gijs NoorlanderandGitHub	3b67282abb	Merge branch 'mega' into mega	2018-09-14 21:26:21 +02:00
TD-er	38af765935	[Scheduler] Disable command scheduler For now the commands will no longer use the scheduler. Commands running asynchronous is causing too much issues.	2018-09-14 21:23:09 +02:00
Plebs	ff180b085c	Added 2 new operators in Calculate hi, added 2 new operators for calculations: !: Logical NOT: returns 1 if operand is = 0 returns 0 if operand is != 0 %: MOD: converts operands in integers and calculates the remainder of the division	2018-09-14 16:44:11 +02:00
ESPEasy release bot	e0785eb796	automatically updated release notes for mega-20180914	2018-09-14 04:00:17 +02:00
Gijs NoorlanderandGitHub	75a83787a4	Merge pull request #1740 from TD-er/bugfix/disable_failing_plugin [CrashRecover] Disable failing step based on failed boot count	2018-09-14 00:18:48 +02:00
Gijs NoorlanderandGitHub	65bea6343c	Merge pull request #1734 from giig1967g/new/eventvalue adding more parameters to EVENT	2018-09-14 00:15:41 +02:00
Gijs NoorlanderandGitHub	6fe61411a0	Added PayPal link	2018-09-14 00:10:48 +02:00
Gijs NoorlanderandGitHub	4552e91022	Merge pull request #1731 from giig1967g/new/calculate Use parameters inside rules when calling commands	2018-09-14 00:06:13 +02:00
Gijs NoorlanderandGitHub	cc94d70e6c	Merge pull request #1730 from sakinit/feature-webserver-spiffs-filelist-multiple-pages Feature: Split webserver spiffs filelist into pages	2018-09-13 23:50:11 +02:00
Gijs NoorlanderandGitHub	2435078f76	Merge pull request #1732 from TD-er/feature/flash_tools [Flash tools] Add blank files and README.txt to dist folder	2018-09-13 23:49:43 +02:00
Gijs NoorlanderandGitHub	dd2cd50d4b	Merge pull request #1738 from giddyhup/mega Fix IR plugin passing received code	2018-09-13 23:48:46 +02:00
TD-er	fe38eb629d	[CrashRecover] Disable failing step based on failed boot count When the node gets locked in a boot loop, the only recovery is to erase it and start all over. This fix will count the number of failed boots and above a certain threshold it will start disabling plugin, then controller and then notification. Only one will be disabled at once, so the user can see which one is giving issues. The disabled state will not be saved, so make sure to save the failing part when it is accessible again.	2018-09-13 23:44:24 +02:00
Plebs	e961507456	added %eventvalue4%	2018-09-13 19:14:13 +02:00
Plebs	e5ee5644bf	final version with '=' sign as a prefix to identify the formula in rules	2018-09-12 22:48:44 +02:00
Gijs NoorlanderandGitHub	ac6d85e214	Merge branch 'mega' into mega	2018-09-12 21:54:50 +02:00
Markus Gloede	39c2d54aee	Fix IR plugin passing received code	2018-09-12 21:09:05 +02:00
Plebs	68efd5ff9e	adding more parameters to EVENT Hi, adding the possibility to have 3 parameters when calling an event: event,eventname=p1,p2,p3 The variable name are: param 1: %eventvalue% or %eventvalue1% param 2: %eventvalue2% param 3: %eventvalue3%	2018-09-11 17:38:47 +02:00
Plebs	627f516f85	fixed calls to F-macro	2018-09-11 16:03:35 +02:00
Plebs	a45fadf42e	fixed ESP32 compatibility issue	2018-09-11 14:38:14 +02:00
Plebs	2ae52b849c	few changes optimized the call to CALCULATE only when needed and description of error codes.	2018-09-11 13:10:00 +02:00
TD-er	1d8b6d346b	[Flash tools] Add blank files and README.txt	2018-09-10 23:02:38 +02:00
Plebs	2a5ac327d3	Use parameters inside rules when calling commands Hi, here is a PR for using parameters when calling commands from inside the rules. The scope is to be able to use formulas instead of an integer when calling a command inside the rules. Example: taskvalueset,1,%eventvalue%+65,[Relay1#r1]+1 Usage could be: Assuming you have a PCF8574 with ports from 65 to 72. You can write a rule: on turnOnRelay do pcfgpio,%eventvalue%+64,0 endon And to turn on port65, the rule can be called like this: event,turnOn=1	2018-09-10 22:59:50 +02:00
sakinit	886101d4d4	Feature: Split webserver spiffs filelist into pages	2018-09-10 17:37:05 +02:00
ESPEasy release bot	8fc6486855	automatically updated release notes for mega-20180910	2018-09-10 04:00:23 +02:00
Gijs NoorlanderandGitHub	eeb1cc71b3	Merge pull request #1728 from TD-er/bugfix/command_send_http Bugfix/command SendToHTTP & Domoticz IDX > 9999	2018-09-10 01:02:58 +02:00
TD-er	13837830e8	[Domoticz IDX] Allow for IDX of > 9999	2018-09-09 23:00:16 +02:00
Gijs NoorlanderandGitHub	f86ff46a82	Merge pull request #1727 from sakinit/P1WifiGatewayModuleBufSize Reduced buffer size to prevent stack overflow	2018-09-09 22:53:23 +02:00
TD-er	e901bc957a	[HTTP] Command SendToHttp cannot connect Incorrect check for return value. As suggested via the [forum](https://www.letscontrolit.com/forum/viewtopic.php?f=6&t=5794&p=31203#p31181)	2018-09-09 21:58:14 +02:00
sakinit	e7e10c5305	Reduced buffer size to prevent stack overflow	2018-09-09 19:54:23 +02:00
ESPEasy release bot	466ddfbe88	automatically updated release notes for mega-20180909	2018-09-09 04:00:14 +02:00
Gijs NoorlanderandGitHub	c8f02d2a4c	Merge pull request #1721 from TD-er/bugfix/wifi_connection_slow_server [#1720] WiFi read all lines from slow servers	2018-09-08 23:14:33 +02:00
TD-er	af1d9b38c9	[Serial log] Use buffer to prevent Serial buffer to overflow Write the log lines to a std::deque and write that buffer to the serial port without overflow of the Serial buffer. This flushing is done during background task.	2018-09-08 20:48:29 +02:00
Gijs NoorlanderandGitHub	7294217489	Revert [WDT] Add watchdog feed to backgroundtasks() See comment: https://github.com/letscontrolit/ESPEasy/issues/1722#issuecomment-419659193	2018-09-08 20:31:16 +02:00
TD-er	208fa8a3aa	[ESP32] Fix Build, ESP32 doesn't have the availableForWrite	2018-09-08 18:24:48 +02:00
TD-er	b3b8eff127	[Serial Log] Limit serial log to prevent buffer overflow As suggested here: https://github.com/letscontrolit/ESPEasy/issues/1625#issuecomment-411558353 by @thomastech	2018-09-08 16:19:58 +02:00
TD-er	c6a90ab2d0	Add forward declaration for void backgroundtasks()	2018-09-08 16:00:06 +02:00
TD-er	e7d28e8576	[#1720 ] WiFi read all lines from slow servers See #1720	2018-09-08 15:20:39 +02:00
svmac	5511ee9f38	fix mistake	2018-08-15 05:22:27 +02:00
svmac	427a22d23b	some code optimization	2018-08-15 04:54:29 +02:00
svmac	d271898968	reenabled code about !	2018-08-14 03:52:29 +02:00
svmac	4051f0bd2e	Fix elseif & Add if-elseif-else nesting levels - The implementation of elseif is not correct. See this example: Rule: On SYSVAL do if %syssec% < 10 publish %sysname%/IP,%ip% elseif %syssec% < 20 publish %sysname%/Uptime/min,%uptime% elseif %syssec% < 30 publish %sysname%/Systime/time,%systime% elseif %syssec% < 40 publish %sysname%/RSSI/dB,%rssi% elseif %syssec% < 50 publish %sysname%/Sunrise/time,%sunrise% else publish %sysname%/Sunset/time,%sunset-30m% endif endon Result: 109360661 : EVENT: SYSVAL 109360668 : [if 11 < 10]=false 109360675 : [elseif 11 < 20]=true //THIS IS CORRECT 109360677 : ACT : publish Wemos51/Uptime/min,1823 109360686 : Command: publish 109360692 : [elseif 11 < 30]=false 109360697 : [elseif 11 < 40]=false 109360703 : [elseif 11 < 50]=false 109360705 : ReplacementString SunTime: %sunrise% offset: 0 109360708 : else = true //THIS IS NOT CORRECT 109360710 : ReplacementString SunTime: %sunset-30m% offset: -1800 109360712 : ACT : publish Wemos51/Sunset/time,20:46 109360723 : Command: publish 109360729 : EVENT: SYSVAL Processing time:68 milliSeconds - Added also nesting levels to if-elseif-else clausules define in RULES_IF_MAX_NESTING_LEVEL declaration. Example: Rule: On SYSVAL do if %eventvalue% > 1 publish %sysname%/Sunrise/time,%sunrise+1h% else if %syssec% < 10 publish %sysname%/IP,%ip% elseif %syssec% < 20 publish %sysname%/Uptime/min,%uptime% elseif %syssec% < 30 publish %sysname%/Systime/time,%systime% elseif %syssec% < 40 publish %sysname%/eventvalue,%eventvalue% elseif %syssec% < 50 publish %sysname%/Sunrise/time,%sunrise% else publish %sysname%/Sunset/time,%sunset-30m% endif endif endon Result: >event,SYSVAL=-5 4977875 : Command: event 4977876 : EVENT: SYSVAL=-5 4977883 : Lev.1: [if -5 > 1]=false 4977886 : ReplacementString SunTime: %sunrise+1h% offset: 3600 4977889 : Lev.1: [else]=true 4977893 : Lev.2: [if 30 < 10]=false 4977900 : Lev.2: [elseif 30 < 20]=false 4977906 : Lev.2: [elseif 30 < 30]=false 4977913 : Lev.2: [elseif 30 < 40]=true 4977916 : ACT : publish Wemos49/eventvalue,-5 4977932 : ReplacementString SunTime: %sunrise% offset: 0 4977935 : Lev.2: [else]=false 4977938 : ReplacementString SunTime: %sunset-30m% offset: -1800 4977944 : EVENT: SYSVAL=-5 Processing time:67 milliSeconds - Finally, the substitution of %eventvalue% is done earlier so that it can be used in if sentence too.	2018-08-11 16:51:56 +02:00