Bump version to v11.1.0.4

- Restructure tasmota

Author: arendst

include/tasmota_options.h

@@ -21,6 +21,6 @@
 #define __TASMOTA_INCLUDE__
 
 #include "../tasmota/my_user_config.h"
-#include "../tasmota/tasmota_configurations.h"
+#include "../tasmota/include/tasmota_configurations.h"
 
 #endif // __TASMOTA_INCLUDE__

lib/libesp32/berry/default/berry_conf.h

@@ -12,7 +12,7 @@
 
 #ifdef COMPILE_BERRY_LIB
   #include "my_user_config.h"
-  #include "tasmota_configurations.h"
+  #include "include/tasmota_configurations.h"
 #endif
 
 /* Macro: BE_DEBUG

pio-tools/pre_source_dir.py

@@ -6,7 +6,7 @@
 def FindInoNodes(env):
     src_dir = glob.escape(env.subst("$PROJECT_SRC_DIR"))
     return env.Glob(os.path.join(src_dir, "*.ino")) + env.Glob(
-        os.path.join(src_dir, "ino_*", "*.ino")
+        os.path.join(src_dir, "tasmota_*", "*.ino")
     )
 
 env.AddMethod(FindInoNodes)

tasmota/berry/berry_tasmota_config.h

@@ -1,4 +1,4 @@
  // Configuration
 
 #include "my_user_config.h"
-#include "tasmota_configurations.h"
+#include "include/tasmota_configurations.h"

tasmota/i18n.h tasmota/include/i18n.h

@@ -37,15 +37,15 @@ Be sure to generate both files: local_ca_data.h, and local_ca_descriptor.h
 //
 // this is what the result will look like, except there will be
 // a lot of data bytes defined in the first three arrays 
-//
-static const unsigned char PROGMEM TA0_DN[] = {
-	// variable number of bytes go here (typically 100-140 or so) for the DN
-};
-
-static const unsigned char PROGMEM TA0_RSA_N[] = {
-	// 256 bytes go here for the public key modulus
-};
-
-static const unsigned char PROGMEM TA0_RSA_E[] = {
-	// 3 bytes go here for the public key exponent
-};
+//
+static const unsigned char PROGMEM TA0_DN[] = {
+	// variable number of bytes go here (typically 100-140 or so) for the DN
+};
+
+static const unsigned char PROGMEM TA0_RSA_N[] = {
+	// 256 bytes go here for the public key modulus
+};
+
+static const unsigned char PROGMEM TA0_RSA_E[] = {
+	// 3 bytes go here for the public key exponent
+};

tasmota/local_ca_data_sample.h tasmota/include/local_ca_data_sample.h

@@ -37,14 +37,14 @@ Be sure to generate both files: local_ca_data.h, and local_ca_descriptor.h
 //
 // this is what the result will look like
 //
-	{
-		{ (unsigned char *)TA0_DN, sizeof TA0_DN },
-		BR_X509_TA_CA,
-		{
-			BR_KEYTYPE_RSA,
-			{ .rsa = {
-				(unsigned char *)TA0_RSA_N, sizeof TA0_RSA_N,
-				(unsigned char *)TA0_RSA_E, sizeof TA0_RSA_E,
-			} }
-		}
-	}
+	{
+		{ (unsigned char *)TA0_DN, sizeof TA0_DN },
+		BR_X509_TA_CA,
+		{
+			BR_KEYTYPE_RSA,
+			{ .rsa = {
+				(unsigned char *)TA0_RSA_N, sizeof TA0_RSA_N,
+				(unsigned char *)TA0_RSA_E, sizeof TA0_RSA_E,
+			} }
+		}
+	}

tasmota/local_ca_descriptor_sample.h tasmota/include/local_ca_descriptor_sample.h

@@ -63,7 +63,7 @@ String EthernetMacAddress(void);
  * Preconfigured configurations
 \*********************************************************************************************/
 
-#include "tasmota_configurations.h"            // Preconfigured configurations
+#include "include/tasmota_configurations.h"            // Preconfigured configurations
 
 /*********************************************************************************************\
  * ESP8266 specific parameters

tasmota/sendemail_ESP8266.h tasmota/include/sendemail_ESP8266.h

@@ -1239,7 +1239,7 @@ typedef struct MYTMPLT {
 //********************************************************************************************
 
 #ifdef ESP8266
-#include "tasmota_template_legacy.h"
+#include "include/tasmota_template_legacy.h"
 
 /********************************************************************************************\
  * ESP8266 Module Templates

tasmota/tasmota.h tasmota/include/tasmota.h

@@ -1,5 +1,5 @@
 /*
-  settings.h - setting variables for Tasmota
+  tasmota_types.h - setting variables for Tasmota
 
   Copyright (C) 2021  Theo Arends
 
@@ -17,10 +17,8 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef _SETTINGS_H_
-#define _SETTINGS_H_
-
-const uint8_t PARAM8_SIZE = 18;            // Number of param bytes (SetOption)
+#ifndef _TASMOTA_TYPES_H_
+#define _TASMOTA_TYPES_H_
 
 // Bitfield to be used for any SetOption0 .. SetOption31 persistent single bit
 typedef union {                            // Restricted by MISRA-C Rule 18.4 but so useful...
@@ -490,6 +488,7 @@ typedef union {
 
 const uint32_t settings_text_size = 699;   // Settings->text_pool[size] = Settings->display_model (2D2) - Settings->text_pool (017)
 const uint8_t MAX_TUYA_FUNCTIONS = 16;
+const uint8_t PARAM8_SIZE = 18;            // Number of param bytes (SetOption)
 
 typedef struct {
   uint16_t      cfg_holder;                // 000  v6 header
@@ -867,70 +866,6 @@ typedef struct {
 
 static_assert(sizeof(TSettings) == 4096, "TSettings Size is not correct");
 
-typedef struct {
-  uint16_t      valid;                     // 280  (RTC memory offset 100 - sizeof(RTCRBT))
-  uint8_t       fast_reboot_count;         // 282
-  uint8_t       free_003[1];               // 283
-} TRtcReboot;
-TRtcReboot RtcReboot;
-#ifdef ESP32
-RTC_NOINIT_ATTR TRtcReboot RtcDataReboot;
-#endif  // ESP32
-
-typedef struct {
-  uint16_t      valid;                     // 290  (RTC memory offset 100)
-  uint8_t       oswatch_blocked_loop;      // 292
-  uint8_t       ota_loader;                // 293
-  uint32_t      energy_kWhtoday;           // 294
-  uint32_t      energy_kWhtotal;           // 298
-  volatile uint32_t pulse_counter[MAX_COUNTERS];  // 29C - See #9521 why volatile
-  power_t       power;                     // 2AC
-  EnergyUsage   energy_usage;              // 2B0
-  uint32_t      nextwakeup;                // 2C8
-  uint32_t      baudrate;                  // 2CC
-  uint32_t      ultradeepsleep;            // 2D0
-  uint16_t      deepsleep_slip;            // 2D4
-  uint8_t       improv_state;              // 2D6
-
-  uint8_t       free_2d7[1];               // 2D7
-
-  int32_t       energy_kWhtoday_ph[3];     // 2D8
-  int32_t       energy_kWhtotal_ph[3];     // 2E4
-  int32_t       energy_kWhexport_ph[3];    // 2F0
-
-  uint8_t       free_2fc[4];               // 2FC
-} TRtcSettings;
-TRtcSettings RtcSettings;
-#ifdef ESP32
-RTC_NOINIT_ATTR TRtcSettings RtcDataSettings;
-#endif  // ESP32
-
-struct TIME_T {
-  uint8_t       second;
-  uint8_t       minute;
-  uint8_t       hour;
-  uint8_t       day_of_week;               // sunday is day 1
-  uint8_t       day_of_month;
-  uint8_t       month;
-  char          name_of_month[4];
-  uint16_t      day_of_year;
-  uint16_t      year;
-  uint32_t      days;
-  uint32_t      valid;
-} RtcTime;
-
-struct XDRVMAILBOX {
-  bool          grpflg;
-  bool          usridx;
-  uint16_t      command_code;
-  uint32_t      index;
-  uint32_t      data_len;
-  int32_t       payload;
-  char         *topic;
-  char         *data;
-  char         *command;
-} XdrvMailbox;
-
 typedef union {                            // Restricted by MISRA-C Rule 18.4 but so useful...
   uint16_t data;                           // Allow bit manipulation
   struct {
@@ -974,4 +909,4 @@ typedef union {
 #endif
 #endif
 
-#endif  // _SETTINGS_H_
+#endif  // _TASMOTA_TYPES_H_

tasmota/tasmota_compat.h tasmota/include/tasmota_compat.h

@@ -20,6 +20,6 @@
 #ifndef _TASMOTA_VERSION_H_
 #define _TASMOTA_VERSION_H_
 
-const uint32_t VERSION = 0x0B010003;   // 11.1.0.3
+const uint32_t VERSION = 0x0B010004;   // 11.1.0.4
 
 #endif  // _TASMOTA_VERSION_H_

tasmota/tasmota_configurations.h tasmota/include/tasmota_configurations.h

@@ -21,16 +21,16 @@
 #ifndef ESP32_STAGE                         // ESP32 Stage has no core_version.h file. Disable include via PlatformIO Option
 #include <core_version.h>                   // Arduino_Esp8266 version information (ARDUINO_ESP8266_RELEASE and ARDUINO_ESP8266_RELEASE_2_7_1)
 #endif // ESP32_STAGE
-#include "tasmota_compat.h"
-#include "tasmota_version.h"                // Tasmota version information
-#include "tasmota.h"                        // Enumeration used in my_user_config.h
+#include "include/tasmota_compat.h"
+#include "include/tasmota_version.h"        // Tasmota version information
+#include "include/tasmota.h"                // Enumeration used in my_user_config.h
 #include "my_user_config.h"                 // Fixed user configurable options
 #ifdef USE_TLS
   #include <t_bearssl.h>                    // We need to include before "tasmota_globals.h" to take precedence over the BearSSL version in Arduino
 #endif // USE_TLS
-#include "tasmota_globals.h"                // Function prototypes and global configuration
-#include "i18n.h"                           // Language support configured by my_user_config.h
-#include "tasmota_template.h"               // Hardware configuration
+#include "include/tasmota_globals.h"        // Function prototypes and global configuration
+#include "include/i18n.h"                   // Language support configured by my_user_config.h
+#include "include/tasmota_template.h"       // Hardware configuration
 
 // Libraries
 #include <ESP8266HTTPClient.h>              // Ota
@@ -83,7 +83,7 @@
 #endif  // USE_UFILESYS
 
 // Structs
-#include "settings.h"
+#include "include/tasmota_types.h"
 
 #ifdef CONFIG_IDF_TARGET_ESP32
 #include "soc/efuse_reg.h"
@@ -95,6 +95,70 @@
 
 const uint32_t VERSION_MARKER[] PROGMEM = { 0x5AA55AA5, 0xFFFFFFFF, 0xA55AA55A };
 
+typedef struct {
+  uint16_t      valid;                     // 280  (RTC memory offset 100 - sizeof(RTCRBT))
+  uint8_t       fast_reboot_count;         // 282
+  uint8_t       free_003[1];               // 283
+} TRtcReboot;
+TRtcReboot RtcReboot;
+#ifdef ESP32
+RTC_NOINIT_ATTR TRtcReboot RtcDataReboot;
+#endif  // ESP32
+
+typedef struct {
+  uint16_t      valid;                     // 290  (RTC memory offset 100)
+  uint8_t       oswatch_blocked_loop;      // 292
+  uint8_t       ota_loader;                // 293
+  uint32_t      energy_kWhtoday;           // 294
+  uint32_t      energy_kWhtotal;           // 298
+  volatile uint32_t pulse_counter[MAX_COUNTERS];  // 29C - See #9521 why volatile
+  power_t       power;                     // 2AC
+  EnergyUsage   energy_usage;              // 2B0
+  uint32_t      nextwakeup;                // 2C8
+  uint32_t      baudrate;                  // 2CC
+  uint32_t      ultradeepsleep;            // 2D0
+  uint16_t      deepsleep_slip;            // 2D4
+  uint8_t       improv_state;              // 2D6
+
+  uint8_t       free_2d7[1];               // 2D7
+
+  int32_t       energy_kWhtoday_ph[3];     // 2D8
+  int32_t       energy_kWhtotal_ph[3];     // 2E4
+  int32_t       energy_kWhexport_ph[3];    // 2F0
+
+  uint8_t       free_2fc[4];               // 2FC
+} TRtcSettings;
+TRtcSettings RtcSettings;
+#ifdef ESP32
+RTC_NOINIT_ATTR TRtcSettings RtcDataSettings;
+#endif  // ESP32
+
+struct TIME_T {
+  uint8_t       second;
+  uint8_t       minute;
+  uint8_t       hour;
+  uint8_t       day_of_week;               // sunday is day 1
+  uint8_t       day_of_month;
+  uint8_t       month;
+  char          name_of_month[4];
+  uint16_t      day_of_year;
+  uint16_t      year;
+  uint32_t      days;
+  uint32_t      valid;
+} RtcTime;
+
+struct XDRVMAILBOX {
+  bool          grpflg;
+  bool          usridx;
+  uint16_t      command_code;
+  uint32_t      index;
+  uint32_t      data_len;
+  int32_t       payload;
+  char         *topic;
+  char         *data;
+  char         *command;
+} XdrvMailbox;
+
 WiFiUDP PortUdp;                            // UDP Syslog and Alexa
 
 #ifdef ESP32

tasmota/tasmota_configurations_ESP32.h tasmota/include/tasmota_configurations_ESP32.h

@@ -1,6 +1,6 @@
 #ifdef ESP8266
 #ifdef USE_SENDMAIL
-#include "sendemail_ESP8266.h"
+#include "include/sendemail_ESP8266.h"
 
 // enable serial debugging
 //#define DEBUG_EMAIL_PORT