Merge branch 'mega' into filter-weblog

README.md

@@ -4,6 +4,20 @@
 
 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, Automate (using) Common Sense, No AI.
+
+The main objective for ESPEasy is to make people realize they can easily control appliances and act on sensor data.
+
+Anyone can use it and you don't need AI. 
+Only requirement is common sense and appreciate the satisfaction of seeing things just work.
+
+If you can't build it yourself, you don't 'own' it.  
+So let's make sure YOU control it.
+
+We are more than willing to assist via our [forum](https://www.letscontrolit.com/forum).
+
+
 # ESPEasy (development branch)
 
 

src/src/CustomBuild/define_plugin_sets.h

@@ -3541,15 +3541,6 @@ To create/register a plugin, you have to :
   #endif
 #endif
 
-#if FEATURE_MQTT_TLS || FEATURE_EMAIL_TLS || FEATURE_HTTP_TLS
-  #if defined(FEATURE_TLS) && !FEATURE_TLS
-    #undef FEATURE_TLS
-  #endif
-  #ifndef FEATURE_TLS
-    #define FEATURE_TLS 1
-  #endif
-#endif
-
 
 #if !defined(FEATURE_MQTT_DISCOVER) && FEATURE_MQTT
   #if defined(LIMIT_BUILD_SIZE) || defined(ESP8266) // Must enable this explicitly for ESP8266 Custom build
@@ -3934,6 +3925,16 @@ To create/register a plugin, you have to :
   #endif
 #endif // ifndef FEATURE_HTTP_TLS
 
+#if FEATURE_MQTT_TLS || FEATURE_EMAIL_TLS || FEATURE_HTTP_TLS
+  #if defined(FEATURE_TLS) && !FEATURE_TLS
+    #undef FEATURE_TLS
+  #endif
+  #ifndef FEATURE_TLS
+    #define FEATURE_TLS 1
+  #endif
+#endif
+
+
 #ifndef FEATURE_AUTO_DARK_MODE
   #ifdef LIMIT_BUILD_SIZE
     #define FEATURE_AUTO_DARK_MODE            0

src/src/ESPEasyCore/Controller.cpp

@@ -34,6 +34,11 @@
 #include "../Helpers/PeriodicalActions.h"
 #include "../Helpers/PortStatus.h"
 
+# if FEATURE_MQTT_TLS
+  #  include <WiFiClientSecureLightBearSSL.h>
+  #  include "../CustomBuild/Certificate_CA.h"
+# endif // if FEATURE_MQTT_TLS
+
 
 constexpr pluginID_t PLUGIN_ID_MQTT_IMPORT(37);
 

src/src/Globals/MQTT.h

@@ -16,6 +16,7 @@
 
 # if FEATURE_MQTT_TLS
   #  include <WiFiClientSecureLightBearSSL.h>
+  #  include "../CustomBuild/Certificate_CA.h"
 # endif // if FEATURE_MQTT_TLS
 
 # if FEATURE_MQTT_CONNECT_BACKGROUND

src/src/WebServer/Markup.cpp

@@ -12,6 +12,7 @@
 #include "../Helpers/Convert.h"
 #include "../Helpers/ESPEasy_UnitOfMeasure.h"
 #include "../Helpers/Hardware_GPIO.h"
+#include "../Helpers/Hardware_device_info.h"
 #include "../Helpers/StringConverter_Numerical.h"
 #include "../Helpers/StringConverter.h"
 #include "../Helpers/StringGenerator_GPIO.h"

src/src/WebServer/Markup_Forms.cpp

@@ -8,6 +8,7 @@
 #include "../Globals/Settings.h"
 
 #include "../Helpers/Hardware_GPIO.h"
+#include "../Helpers/Hardware_device_info.h"
 #include "../Helpers/Numerical.h"
 #include "../Helpers/StringConverter.h"
 #include "../Helpers/StringGenerator_GPIO.h"