From 03a2955f81225defab5bd584ad0b4d596e355d26 Mon Sep 17 00:00:00 2001
From: Norbert Richter <norbert.richter@prsolution.eu>
Date: Tue, 12 Dec 2023 16:07:33 +0100
Subject: [PATCH 01/21] Bump to v13.3.0.1

---
 README.md        | 2 +-
 decode-config.py | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 8440d9b..e469bce 100644
--- a/README.md
+++ b/README.md
@@ -43,7 +43,7 @@ Comparing backup files created by **decode-config** and [.dmp](#dmp-format) file
 Using the latest development version of decode-config is only necessary if you also use the latest development version of Tasmota.
 
 <!-- markdownlint-disable MD033 -->
-[![development version](https://img.shields.io/badge/development-v13.3.0.0-blue.svg)](https://github.com/tasmota/decode-config/tree/development)
+[![development version](https://img.shields.io/badge/development-v13.3.0.1-blue.svg)](https://github.com/tasmota/decode-config/tree/development)
 
 ## Table of contents
 <details>
diff --git a/decode-config.py b/decode-config.py
index 41ba000..069911f 100755
--- a/decode-config.py
+++ b/decode-config.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import print_function
 METADATA = {
-    'VERSION': '13.3.0.0',
+    'VERSION': '13.3.0.1',
     'DESCRIPTION': 'Backup/restore and decode configuration tool for Tasmota',
     'CLASSIFIER': 'Development Status :: 4 - Beta',
     'URL': 'https://github.com/tasmota/decode-config',
@@ -2798,10 +2798,10 @@ def match(self, setting_hardware, config_version):
         'neopool_outputsensitive':  (HARDWARE.ESP,   '<L', (0xF74,1,11), (None, None,                           ('SetOption',   '"SO157 {}".format($)')) ),
                                     })
 # ======================================================================
-SETTING_13_3_0_0 = copy.copy(SETTING_13_2_0_1)
+SETTING_13_3_0_1 = copy.copy(SETTING_13_2_0_1)
 # ======================================================================
 SETTINGS = [
-            (0x0D030000,0x1000, SETTING_13_3_0_0),
+            (0x0D030001,0x1000, SETTING_13_3_0_1),
             (0x0D020001,0x1000, SETTING_13_2_0_1),
             (0x0D010004,0x1000, SETTING_13_1_0_4),
             (0x0D010002,0x1000, SETTING_13_1_0_2),

From 886cca6d69e54343e4ed498ae41ca489bd3c4193 Mon Sep 17 00:00:00 2001
From: Norbert Richter <norbert.richter@prsolution.eu>
Date: Thu, 14 Dec 2023 09:32:34 +0100
Subject: [PATCH 02/21] Fix prefix change from Domoticz to Dz (#80)

---
 decode-config.py | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/decode-config.py b/decode-config.py
index 069911f..ded0885 100755
--- a/decode-config.py
+++ b/decode-config.py
@@ -1938,6 +1938,11 @@ def match(self, setting_hardware, config_version):
     'scripting_compressed':         (HARDWARE.ESP,   'B',  (0x4A0,1,6),  (None, None,                           ('Rules',       None)), (False, False)),
     'script_enabled':               (HARDWARE.ESP,   'B',  (0x49F,1,0),  (None, None,                           ('Rules',       '"Script {}".format($)')), isscript),
     'script':                       (HARDWARE.ESP,  '1536s',0x800,       (None, None,                           ('Rules',       None)), (scriptread, scriptwrite)),
+    'domoticz_update_timer':        (HARDWARE.ESP,   '<H',  0x340,       (None, '0 <= $ <= 3600',               ('Domoticz',    '"DzUpdateTimer {}".format($)')) ),
+    'domoticz_relay_idx':           (HARDWARE.ESP,   '<L',  0x344,       ([4],  None,                           ('Domoticz',    '"DzIdx{} {}".format(#+1,$)')) ),
+    'domoticz_key_idx':             (HARDWARE.ESP,   '<L',  0x354,       ([4],  None,                           ('Domoticz',    '"DzKeyIdx{} {}".format(#+1,$)')) ),
+    'domoticz_switch_idx':          (HARDWARE.ESP,   '<H',  0x454,       ([4],  None,                           ('Domoticz',    '"DzSwitchIdx{} {}".format(#+1,$)')) ),
+    'domoticz_sensor_idx':          (HARDWARE.ESP,   '<H',  0x45C,       ([12], None,                           ('Domoticz',    '"DzSensorIdx{} {}".format(#+1,$)')) ),
                                     })
 SETTING_8_3_1_7['flag4'][1].update  ({
         'remove_zbreceived':        (HARDWARE.ESP,   '<L', (0xEF8,1,18), (None, None,                           ('SetOption',   '"SO100 {}".format($)')) ),
@@ -2418,13 +2423,13 @@ def match(self, setting_hardware, config_version):
     'sleep_esp32s3':                (HARDWARE.ESP32S3,
                                                      'B',   0x469,       (None, '0 <= $ <= 250',                ('Management',  '"Sleep {}".format($)')) ),
     'domoticz_switch_idx':          (HARDWARE.ESP82_32ex,
-                                                     '<H',  0x454,       ([4],  None,                           ('Domoticz',    '"DomoticzSwitchIdx{} {}".format(#+1,$)')) ),
+                                                     '<H',  0x454,       ([4],  None,                           ('Domoticz',    '"DzSwitchIdx{} {}".format(#+1,$)')) ),
     'domoticz_switch_idx_esp32s3':  (HARDWARE.ESP32S3,
-                                                     '<H',  0x46A,       ([4],  None,                           ('Domoticz',    '"DomoticzSwitchIdx{} {}".format(#+1,$)')) ),
+                                                     '<H',  0x46A,       ([4],  None,                           ('Domoticz',    '"DzSwitchIdx{} {}".format(#+1,$)')) ),
     'domoticz_sensor_idx':          (HARDWARE.ESP82_32ex,
-                                                     '<H',  0x45C,       ([12], None,                           ('Domoticz',    '"DomoticzSensorIdx{} {}".format(#+1,$)')) ),
+                                                     '<H',  0x45C,       ([12], None,                           ('Domoticz',    '"DzSensorIdx{} {}".format(#+1,$)')) ),
     'domoticz_sensor_idx_esp32s3':  (HARDWARE.ESP32S3,
-                                                     '<H',  0x472,       ([12], None,                           ('Domoticz',    '"DomoticzSensorIdx{} {}".format(#+1,$)')) ),
+                                                     '<H',  0x472,       ([12], None,                           ('Domoticz',    '"DzSensorIdx{} {}".format(#+1,$)')) ),
     'ws_color':                     (HARDWARE.ESP82_32ex,
                                                      'B',   0x475,       ([4,3],None,                           ('Light',       None)) ),
     'ws_color_esp32s3':             (HARDWARE.ESP32S3,

From aa5599e4b77a17a2e40c4213fe5f9d8c588ff461 Mon Sep 17 00:00:00 2001
From: Norbert Richter <norbert.richter@prsolution.eu>
Date: Sat, 16 Dec 2023 17:36:14 +0100
Subject: [PATCH 03/21] Fix download error using mqtt source

---
 decode-config.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/decode-config.py b/decode-config.py
index ded0885..cc09241 100755
--- a/decode-config.py
+++ b/decode-config.py
@@ -4208,6 +4208,7 @@ def on_message(client, userdata, msg):
         try:
             root = json.loads(msg.payload.decode(STR_CODING))
             if root:
+                time.sleep(0.01)
                 if "FileDownload" in root:
                     rcv_code = root["FileDownload"]
                     if "Aborted" in rcv_code:
@@ -4255,6 +4256,7 @@ def on_message(client, userdata, msg):
             dobj = bytearray()
         else:
             if use_base64 and file_id > 0 and file_id != rcv_id:
+                err_str = "File ID mismatch"
                 err_flag = True
                 return
 
@@ -4303,7 +4305,7 @@ def on_connect(client, userdata, flags, rc):
     def wait_for_connect():
         nonlocal conn_flag
 
-        timeout = 200
+        timeout = MQTT_TIMEOUT/10
         while not conn_flag and timeout > 0:
             time.sleep(0.01)
             timeout = timeout -1
@@ -4418,6 +4420,7 @@ def on_message(client, userdata, msg):
         try:
             root = json.loads(msg.payload.decode(STR_CODING))
             if root:
+                time.sleep(0.01)
                 if "FileUpload" in root:
                     rcv_code = root["FileUpload"]
                     if "Aborted" in rcv_code:

From d17027ec706b97bda39c5ff8af1f881f15dbc399 Mon Sep 17 00:00:00 2001
From: Norbert Richter <norbert.richter@prsolution.eu>
Date: Sun, 17 Dec 2023 14:02:11 +0100
Subject: [PATCH 04/21] Revert "Fix download error using mqtt source"

This reverts commit aa5599e4b77a17a2e40c4213fe5f9d8c588ff461.
---
 decode-config.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/decode-config.py b/decode-config.py
index cc09241..ded0885 100755
--- a/decode-config.py
+++ b/decode-config.py
@@ -4208,7 +4208,6 @@ def on_message(client, userdata, msg):
         try:
             root = json.loads(msg.payload.decode(STR_CODING))
             if root:
-                time.sleep(0.01)
                 if "FileDownload" in root:
                     rcv_code = root["FileDownload"]
                     if "Aborted" in rcv_code:
@@ -4256,7 +4255,6 @@ def on_message(client, userdata, msg):
             dobj = bytearray()
         else:
             if use_base64 and file_id > 0 and file_id != rcv_id:
-                err_str = "File ID mismatch"
                 err_flag = True
                 return
 
@@ -4305,7 +4303,7 @@ def on_connect(client, userdata, flags, rc):
     def wait_for_connect():
         nonlocal conn_flag
 
-        timeout = MQTT_TIMEOUT/10
+        timeout = 200
         while not conn_flag and timeout > 0:
             time.sleep(0.01)
             timeout = timeout -1
@@ -4420,7 +4418,6 @@ def on_message(client, userdata, msg):
         try:
             root = json.loads(msg.payload.decode(STR_CODING))
             if root:
-                time.sleep(0.01)
                 if "FileUpload" in root:
                     rcv_code = root["FileUpload"]
                     if "Aborted" in rcv_code:

From 83911e9620350e1f951859f37b29e6df9d1676da Mon Sep 17 00:00:00 2001
From: Norbert Richter <norbert.richter@prsolution.eu>
Date: Sun, 17 Dec 2023 14:03:37 +0100
Subject: [PATCH 05/21] Fix download timeout using slow mqtt source

---
 decode-config.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/decode-config.py b/decode-config.py
index ded0885..b62e22e 100755
--- a/decode-config.py
+++ b/decode-config.py
@@ -4229,6 +4229,8 @@ def on_message(client, userdata, msg):
                                     err_str ="Receive code "+rcv_code
                         err_flag = True
                         return
+                    if "Done" in rcv_code:
+                        time.sleep(0.1)
                 if "Command" in root:
                     rcv_code = root["Command"]
                     if rcv_code == "Error":
@@ -4443,6 +4445,8 @@ def on_message(client, userdata, msg):
                                     err_str ="Receive code "+rcv_code
                         err_flag = True
                         return
+                    if "Done" in rcv_code:
+                        time.sleep(0.1)
                 if "Command" in root:
                     rcv_code = root["Command"]
                     if rcv_code == "Error":

From a8f939e20cd87c3dc5a27d92bccc3ba241cb0561 Mon Sep 17 00:00:00 2001
From: Sen Haerens <sen@senhaerens.be>
Date: Sat, 23 Dec 2023 12:49:19 +0100
Subject: [PATCH 06/21] Fix Linux batch processing command in README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e469bce..e9ebbbc 100644
--- a/README.md
+++ b/README.md
@@ -671,7 +671,7 @@ decode-config -s mqtts://mqttuser:myBrokerPaszxwo!z@mybroker.example.com/tele/ta
 Linux
 
 ```bash
-for device in tasmota1 tasmota2 tasmota3; do ./decode-config -c my.conf -s $device -o Config_@d_@v
+for device in tasmota1 tasmota2 tasmota3; do ./decode-config -c my.conf -s $device -o Config_@d_@v; done
 ```
 
 under Windows

From 21729f2aaebcdd91fdd43b92574d15a80f687491 Mon Sep 17 00:00:00 2001
From: Zsombor Welker <flaktack@users.noreply.github.com>
Date: Tue, 2 Jan 2024 10:44:07 +0100
Subject: [PATCH 07/21] README: Update <detail> usage for formatting

An empty line is required for Github to format content after <details> correctly.
---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index e9ebbbc..e4bc91e 100644
--- a/README.md
+++ b/README.md
@@ -921,6 +921,7 @@ These Tasmota commands are used for immediate action and do not change settings
 These Tasmota commands are unsupported and not implemented in **decode-config**
 
 <details>
+  
   | Group          | Supported                   | *Ad hoc*               |`Unsupported`|
   |----------------|-----------------------------|------------------------|-------------|
   | **Control**    | BlinkCount                  | *Backlog*              |             |
@@ -1239,6 +1240,7 @@ These Tasmota commands are unsupported and not implemented in **decode-config**
 
 ## Program return codes
 <details>
+  
   **decode-config** returns the following codes:
 
   * **0** - successful:  

From 8c6840fe4f18a26f4e10cace2b2b10143c820e9e Mon Sep 17 00:00:00 2001
From: Norbert Richter <norbert.richter@prsolution.eu>
Date: Wed, 3 Jan 2024 13:57:26 +0100
Subject: [PATCH 08/21] Bump to v13.3.0.2

---
 README.md        | 2 +-
 decode-config.py | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index e4bc91e..39ab3c9 100644
--- a/README.md
+++ b/README.md
@@ -43,7 +43,7 @@ Comparing backup files created by **decode-config** and [.dmp](#dmp-format) file
 Using the latest development version of decode-config is only necessary if you also use the latest development version of Tasmota.
 
 <!-- markdownlint-disable MD033 -->
-[![development version](https://img.shields.io/badge/development-v13.3.0.1-blue.svg)](https://github.com/tasmota/decode-config/tree/development)
+[![development version](https://img.shields.io/badge/development-v13.3.0.2-blue.svg)](https://github.com/tasmota/decode-config/tree/development)
 
 ## Table of contents
 <details>
diff --git a/decode-config.py b/decode-config.py
index b62e22e..116656b 100755
--- a/decode-config.py
+++ b/decode-config.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import print_function
 METADATA = {
-    'VERSION': '13.3.0.1',
+    'VERSION': '13.3.0.2',
     'DESCRIPTION': 'Backup/restore and decode configuration tool for Tasmota',
     'CLASSIFIER': 'Development Status :: 4 - Beta',
     'URL': 'https://github.com/tasmota/decode-config',
@@ -13,7 +13,7 @@
 """
     decode-config.py - Backup/Restore Tasmota configuration data
 
-    Copyright (C) 2023 Norbert Richter <nr@prsolution.eu>
+    Copyright (C) 2024 Norbert Richter <nr@prsolution.eu>
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -2803,10 +2803,10 @@ def match(self, setting_hardware, config_version):
         'neopool_outputsensitive':  (HARDWARE.ESP,   '<L', (0xF74,1,11), (None, None,                           ('SetOption',   '"SO157 {}".format($)')) ),
                                     })
 # ======================================================================
-SETTING_13_3_0_1 = copy.copy(SETTING_13_2_0_1)
+SETTING_13_3_0_2 = copy.copy(SETTING_13_2_0_1)
 # ======================================================================
 SETTINGS = [
-            (0x0D030001,0x1000, SETTING_13_3_0_1),
+            (0x0D030002,0x1000, SETTING_13_3_0_2),
             (0x0D020001,0x1000, SETTING_13_2_0_1),
             (0x0D010004,0x1000, SETTING_13_1_0_4),
             (0x0D010002,0x1000, SETTING_13_1_0_2),

From 4dfb9ff5d30137c4d2f635a8c3dcebe1dd0da998 Mon Sep 17 00:00:00 2001
From: Norbert Richter <norbert.richter@prsolution.eu>
Date: Tue, 16 Jan 2024 10:53:52 +0100
Subject: [PATCH 09/21] Update v13.3.0.2 settings

---
 README.md        | 7 +++++++
 decode-config.py | 3 +++
 2 files changed, 10 insertions(+)

diff --git a/README.md b/README.md
index 39ab3c9..068f793 100644
--- a/README.md
+++ b/README.md
@@ -1140,6 +1140,13 @@ These Tasmota commands are unsupported and not implemented in **decode-config**
   |                | VoltageLow                  |                        |             |
   |                | VoltRes                     |                        |             |
   |                | WattRes                     |                        |             |
+  | **Usf**        | UsfFTP                      |                        | `UsfType`   |
+  |                |                             |                        | `UsfSize`   |
+  |                |                             |                        | `UsfFree`   |
+  |                |                             |                        | `UsfDelete` |
+  |                |                             |                        | `UsfRename` |
+  |                |                             |                        | `UsfRun`    |
+  |                |                             |                        | `UsfServe`  |
   | **Light**      | DimmerRange                 | *Channel<x\>*          | `Color<x>`  |
   |                | DimmerStep                  | *CT*                   | `Dimmer`    |
   |                | Fade                        | *CTRange*              |             |
diff --git a/decode-config.py b/decode-config.py
index 116656b..1263903 100755
--- a/decode-config.py
+++ b/decode-config.py
@@ -2804,6 +2804,9 @@ def match(self, setting_hardware, config_version):
                                     })
 # ======================================================================
 SETTING_13_3_0_2 = copy.copy(SETTING_13_2_0_1)
+SETTING_13_3_0_2['mbflag2'][1].update({
+        'FTP_Mode':                 (HARDWARE.ESP,   '<L', (0xFD8,2,24), (None, '0 <= $ <= 2',                  ('Usf',         '"UfsFTP {}".format($)')) ),
+                                    })
 # ======================================================================
 SETTINGS = [
             (0x0D030002,0x1000, SETTING_13_3_0_2),

From 5bfdcb7564454a2016f8580ee5d5377f3eb3dfaf Mon Sep 17 00:00:00 2001
From: Norbert Richter <norbert.richter@prsolution.eu>
Date: Tue, 16 Jan 2024 10:55:13 +0100
Subject: [PATCH 10/21] Bump to v13.3.0.3

---
 README.md        | 2 +-
 decode-config.py | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 068f793..b41cebe 100644
--- a/README.md
+++ b/README.md
@@ -43,7 +43,7 @@ Comparing backup files created by **decode-config** and [.dmp](#dmp-format) file
 Using the latest development version of decode-config is only necessary if you also use the latest development version of Tasmota.
 
 <!-- markdownlint-disable MD033 -->
-[![development version](https://img.shields.io/badge/development-v13.3.0.2-blue.svg)](https://github.com/tasmota/decode-config/tree/development)
+[![development version](https://img.shields.io/badge/development-v13.3.0.3-blue.svg)](https://github.com/tasmota/decode-config/tree/development)
 
 ## Table of contents
 <details>
diff --git a/decode-config.py b/decode-config.py
index 1263903..5a1c30e 100755
--- a/decode-config.py
+++ b/decode-config.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import print_function
 METADATA = {
-    'VERSION': '13.3.0.2',
+    'VERSION': '13.3.0.3',
     'DESCRIPTION': 'Backup/restore and decode configuration tool for Tasmota',
     'CLASSIFIER': 'Development Status :: 4 - Beta',
     'URL': 'https://github.com/tasmota/decode-config',
@@ -2808,7 +2808,10 @@ def match(self, setting_hardware, config_version):
         'FTP_Mode':                 (HARDWARE.ESP,   '<L', (0xFD8,2,24), (None, '0 <= $ <= 2',                  ('Usf',         '"UfsFTP {}".format($)')) ),
                                     })
 # ======================================================================
+SETTING_13_3_0_3 = copy.copy(SETTING_13_3_0_2)
+# ======================================================================
 SETTINGS = [
+            (0x0D030003,0x1000, SETTING_13_3_0_3),
             (0x0D030002,0x1000, SETTING_13_3_0_2),
             (0x0D020001,0x1000, SETTING_13_2_0_1),
             (0x0D010004,0x1000, SETTING_13_1_0_4),

From 98ca66786b06347fa04505728f616d9ccf5c44e0 Mon Sep 17 00:00:00 2001
From: Norbert Richter <norbert.richter@prsolution.eu>
Date: Tue, 16 Jan 2024 16:17:33 +0100
Subject: [PATCH 11/21] Fix ESP32 S2/S3/C3 settings (#83)

---
 decode-config.py | 72 ++++++++++++++++++++++++------------------------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/decode-config.py b/decode-config.py
index 5a1c30e..33bd375 100755
--- a/decode-config.py
+++ b/decode-config.py
@@ -679,7 +679,7 @@ def str(self, config_version):
         Create hardware string
 
         @param config_version:
-            config_version vvalue from Tasmota configuration
+            config_version value from Tasmota configuration
 
         @return:
             hardware string
@@ -2354,38 +2354,38 @@ def match(self, setting_hardware, config_version):
     'web_time_start':               (HARDWARE.ESP,   'B',   0x33C,       (None, None,                           ('Management',  '"WebTime {},{}".format($,@["web_time_end"])')) ),
     'web_time_end':                 (HARDWARE.ESP,   'B',   0x33D,       (None, None,                           ('Management',  None)) ),
     'pwm_value_ext':                (HARDWARE.ESP32, '<H',  0x560,       ([11], '0 <= $ <= 1023',               ('Management',  '"Pwm{} {}".format(#+1+5,$)')) ),
-    'eth_type':                     (HARDWARE.ESP32ex,
+    'eth_type':                     (HARDWARE.ESP32 ^ HARDWARE.ESP32S3,
                                                      'B',   0x446,       (None, '0 <= $ <= 1',                  ('Wifi',        '"EthType {}".format($)')) ),
     'eth_type_esp32s3':             (HARDWARE.ESP32S3,
                                                      'B',   0x40E,       (None, '0 <= $ <= 1',                  ('Wifi',        '"EthType {}".format($)')) ),
-    'eth_clk_mode':                 (HARDWARE.ESP32ex,
+    'eth_clk_mode':                 (HARDWARE.ESP32 ^ HARDWARE.ESP32S3,
                                                      'B',   0x447,       (None, '0 <= $ <= 3',                  ('Wifi',        '"EthClockMode {}".format($)')) ),
     'eth_clk_mode_esp32s3':         (HARDWARE.ESP32S3,
                                                      'B',   0x40F,       (None, '0 <= $ <= 3',                  ('Wifi',        '"EthClockMode {}".format($)')) ),
-    'eth_address':                  (HARDWARE.ESP32ex,
+    'eth_address':                  (HARDWARE.ESP32 ^ HARDWARE.ESP32S3,
                                                      'B',   0x450,       (None, '0 <= $ <= 31',                 ('Wifi',        '"EthAddress {}".format($)')) ),
     'eth_address_esp32s3':          (HARDWARE.ESP32S3,
                                                      'B',   0x45E,       (None, '0 <= $ <= 31',                 ('Wifi',        '"EthAddress {}".format($)')) ),
-    'module':                       (HARDWARE.ESP82_32ex,
+    'module':                       (HARDWARE.ESP32 ^ HARDWARE.ESP32C3,
                                                      'B',   0x474,       (None, None,                           ('Management',  '"Module {}".format($)')) ),
     'module_esp32s3':               (HARDWARE.ESP32S3,
                                                      'B',   0x45F,       (None, None,                           ('Management',  '"Module {}".format($)')) ),
-    'webcam_config':                (HARDWARE.ESP32ex, {
-        'stream':                   (HARDWARE.ESP32ex,
+    'webcam_config':                (HARDWARE.ESP32 ^ HARDWARE.ESP32S3, {
+        'stream':                   (HARDWARE.ESP32 ^ HARDWARE.ESP32S3,
                                                      '<L', (0x44C,1, 0), (None, None,                           ('Control',     '"WCStream {}".format($)')) ),
-        'mirror':                   (HARDWARE.ESP32ex,
+        'mirror':                   (HARDWARE.ESP32 ^ HARDWARE.ESP32S3,
                                                      '<L', (0x44C,1, 1), (None, None,                           ('Control',     '"WCMirror {}".format($)')) ),
-        'flip':                     (HARDWARE.ESP32ex,
+        'flip':                     (HARDWARE.ESP32 ^ HARDWARE.ESP32S3,
                                                      '<L', (0x44C,1, 2), (None, None,                           ('Control',     '"WCFlip {}".format($)')) ),
-        'rtsp':                     (HARDWARE.ESP32ex,
+        'rtsp':                     (HARDWARE.ESP32 ^ HARDWARE.ESP32S3,
                                                      '<L', (0x44C,1, 3), (None, None,                           ('Control',     '"WCRtsp {}".format($)')) ),
-        'contrast':                 (HARDWARE.ESP32ex,
+        'contrast':                 (HARDWARE.ESP32 ^ HARDWARE.ESP32S3,
                                                      '<l', (0x44C,3,18), (None, '0 <= $ <= 4',                  ('Control',     '"WCContrast {}".format($-2)')) ),
-        'brightness':               (HARDWARE.ESP32ex,
+        'brightness':               (HARDWARE.ESP32 ^ HARDWARE.ESP32S3,
                                                      '<l', (0x44C,3,22), (None, '0 <= $ <= 4',                  ('Control',     '"WCBrightness {}".format($-2)')) ),
-        'saturation':               (HARDWARE.ESP32ex,
+        'saturation':               (HARDWARE.ESP32 ^ HARDWARE.ESP32S3,
                                                      '<l', (0x44C,3,25), (None, '0 <= $ <= 4',                  ('Control',     '"WCSaturation {}".format($-2)')) ),
-        'resolution':               (HARDWARE.ESP32ex,
+        'resolution':               (HARDWARE.ESP32 ^ HARDWARE.ESP32S3,
                                                      '<l', (0x44C,4,28), (None, '0 <= $ <= 10',                 ('Control',     '"WCResolution {}".format($)')) ),
                                     },                      0x44C,       (None, None,                           (VIRTUAL,       None)), (None, None) ),
     'webcam_config_esp32s3':        (HARDWARE.ESP32S3, {
@@ -2406,35 +2406,35 @@ def match(self, setting_hardware, config_version):
         'resolution':               (HARDWARE.ESP32S3,
                                                      '<L', (0x460,4,28), (None, '0 <= $ <= 10',                 ('Control',     '"WCResolution {}".format($)')) ),
                                     },                      0x460,       (None, None,                           (VIRTUAL,       None)), (None, None) ),
-    'ws_width':                     (HARDWARE.ESP82_32ex,
+    'ws_width':                     (HARDWARE.ESP ^ HARDWARE.ESP32S3,
                                                      'B',   0x481,       ([3],  None,                           ('Light',       None)) ),
     'ws_width_esp32s3':             (HARDWARE.ESP32S3,
                                                      'B',   0x464,       ([3],  None,                           ('Light',       None)) ),
-    'serial_delimiter':             (HARDWARE.ESP82_32ex,
+    'serial_delimiter':             (HARDWARE.ESP ^ HARDWARE.ESP32S3,
                                                      'B',   0x451,       (None, None,                           ('Serial',      '"SerialDelimiter {}".format($)')) ),
     'serial_delimiter_esp32s3':     (HARDWARE.ESP32S3,
                                                      'B',   0x467,       (None, None,                           ('Serial',      '"SerialDelimiter {}".format($)')) ),
-    'seriallog_level':              (HARDWARE.ESP82_32ex,
+    'seriallog_level':              (HARDWARE.ESP ^ HARDWARE.ESP32S3,
                                                      'B',   0x452,       (None, '0 <= $ <= 4',                  ('Management',  '"SerialLog {}".format($)')) ),
     'seriallog_level_esp32s3':      (HARDWARE.ESP32S3,
                                                      'B',   0x468,       (None, '0 <= $ <= 4',                  ('Management',  '"SerialLog {}".format($)')) ),
-    'sleep':                        (HARDWARE.ESP82_32ex,
+    'sleep':                        (HARDWARE.ESP ^ HARDWARE.ESP32S3,
                                                      'B',   0x453,       (None, '0 <= $ <= 250',                ('Management',  '"Sleep {}".format($)')) ),
     'sleep_esp32s3':                (HARDWARE.ESP32S3,
                                                      'B',   0x469,       (None, '0 <= $ <= 250',                ('Management',  '"Sleep {}".format($)')) ),
-    'domoticz_switch_idx':          (HARDWARE.ESP82_32ex,
+    'domoticz_switch_idx':          (HARDWARE.ESP ^ HARDWARE.ESP32S3,
                                                      '<H',  0x454,       ([4],  None,                           ('Domoticz',    '"DzSwitchIdx{} {}".format(#+1,$)')) ),
     'domoticz_switch_idx_esp32s3':  (HARDWARE.ESP32S3,
                                                      '<H',  0x46A,       ([4],  None,                           ('Domoticz',    '"DzSwitchIdx{} {}".format(#+1,$)')) ),
-    'domoticz_sensor_idx':          (HARDWARE.ESP82_32ex,
+    'domoticz_sensor_idx':          (HARDWARE.ESP ^ HARDWARE.ESP32S3,
                                                      '<H',  0x45C,       ([12], None,                           ('Domoticz',    '"DzSensorIdx{} {}".format(#+1,$)')) ),
     'domoticz_sensor_idx_esp32s3':  (HARDWARE.ESP32S3,
                                                      '<H',  0x472,       ([12], None,                           ('Domoticz',    '"DzSensorIdx{} {}".format(#+1,$)')) ),
-    'ws_color':                     (HARDWARE.ESP82_32ex,
+    'ws_color':                     (HARDWARE.ESP ^ HARDWARE.ESP32S3,
                                                      'B',   0x475,       ([4,3],None,                           ('Light',       None)) ),
     'ws_color_esp32s3':             (HARDWARE.ESP32S3,
                                                      'B',   0x48A,       ([4,3],None,                           ('Light',       None)) ),
-    'my_gp_esp32':                  (HARDWARE.ESP32ex,
+    'my_gp_esp32':                  (HARDWARE.ESP ^ (HARDWARE.ESP32S2 | HARDWARE.ESP32S3 | HARDWARE.ESP32C3),
                                                      '<H',  0x3AC,       ([40], None,                           ('Management',  '"Gpio{} {}".format(#, $)')) ),
     'my_gp_esp32c3':                (HARDWARE.ESP32C3,
                                                      '<H',  0x3AC,       ([22], None,                           ('Management',  '"Gpio{} {}".format(#, $)')) ),
@@ -2444,11 +2444,11 @@ def match(self, setting_hardware, config_version):
                                                      '<H',  0x3AC,       ([49], None,                           ('Management',  '"Gpio{} {}".format(#, $)')) ),
                                     })
 SETTING_10_1_0_6['user_template_esp32'][1].update({
-        'base':                     (HARDWARE.ESP32ex,
+        'base':                     (HARDWARE.ESP32 ^ (HARDWARE.ESP32S2 | HARDWARE.ESP32S3 | HARDWARE.ESP32C3),
                                                      'B',   0x71F,       (None, None,                           ('Management',  '"Template {{\\\"NAME\\\":\\\"{}\\\",\\\"GPIO\\\":{},\\\"FLAG\\\":{},\\\"BASE\\\":{}}}".format(@["templatename"],@["user_template_esp32"]["gpio"],@["user_template_esp32"]["flag"],$)')), ('$+1','$-1') ),
-        'gpio':                     (HARDWARE.ESP32ex,
+        'gpio':                     (HARDWARE.ESP32 ^ (HARDWARE.ESP32S2 | HARDWARE.ESP32S3 | HARDWARE.ESP32C3),
                                                      '<H',  0x3FC,       ([36], None,                           ('Management',  None)), ('1 if $==65504 else $','65504 if $==1 else $')),
-        'flag':                     (HARDWARE.ESP32ex,
+        'flag':                     (HARDWARE.ESP32 ^ (HARDWARE.ESP32S2 | HARDWARE.ESP32S3 | HARDWARE.ESP32C3),
                                                      '<H',  0x3FC+(2*36),(None, None,                           ('Management',  None)) ),
         'base_esp32c3':             (HARDWARE.ESP32C3,
                                                      'B',   0x71F,       (None, None,                           ('Management',  '"Template {{\\\"NAME\\\":\\\"{}\\\",\\\"GPIO\\\":{},\\\"FLAG\\\":{},\\\"BASE\\\":{}}}".format(@["templatename"],@["user_template_esp32"]["gpio_esp32c3"],@["user_template_esp32"]["flag_esp32c3"],$)')), ('$+1','$-1') ),
@@ -2565,27 +2565,27 @@ def match(self, setting_hardware, config_version):
                                     },                      0x730,       (None, None,                           (VIRTUAL,       None)), (None, None) ),
                                     })
 SETTING_11_1_0_2['webcam_config'][1].update({
-        'awb':                      (HARDWARE.ESP32ex,
+        'awb':                      (HARDWARE.ESP32 ^ HARDWARE.ESP32S3,
                                                      '<L', (0x44C,1, 4), (None, None,                           ('Control',     '"WCAWB {}".format($)')) ),
-        'awb_gain':                 (HARDWARE.ESP32ex,
+        'awb_gain':                 (HARDWARE.ESP32 ^ HARDWARE.ESP32S3,
                                                      '<L', (0x44C,1, 5), (None, None,                           ('Control',     '"WCAWBGain {}".format($)')) ),
-        'aec':                      (HARDWARE.ESP32ex,
+        'aec':                      (HARDWARE.ESP32 ^ HARDWARE.ESP32S3,
                                                      '<L', (0x44C,1, 6), (None, None,                           ('Control',     '"WCAEC {}".format($)')) ),
-        'aec2':                     (HARDWARE.ESP32ex,
+        'aec2':                     (HARDWARE.ESP32 ^ HARDWARE.ESP32S3,
                                                      '<L', (0x44C,1, 7), (None, None,                           ('Control',     '"WCAECDSP {}".format($)')) ),
-        'raw_gma':                  (HARDWARE.ESP32ex,
+        'raw_gma':                  (HARDWARE.ESP32 ^ HARDWARE.ESP32S3,
                                                      '<L', (0x44C,1, 8), (None, None,                           ('Control',     '"WCGammaCorrect {}".format($)')) ),
-        'lenc':                     (HARDWARE.ESP32ex,
+        'lenc':                     (HARDWARE.ESP32 ^ HARDWARE.ESP32S3,
                                                      '<L', (0x44C,1, 9), (None, None,                           ('Control',     '"WCLensCorrect {}".format($)')) ),
-        'colorbar':                 (HARDWARE.ESP32ex,
+        'colorbar':                 (HARDWARE.ESP32 ^ HARDWARE.ESP32S3,
                                                      '<L', (0x44C,1,10), (None, None,                           ('Control',     '"WCColorbar {}".format($)')) ),
-        'wpc':                      (HARDWARE.ESP32ex,
+        'wpc':                      (HARDWARE.ESP32 ^ HARDWARE.ESP32S3,
                                                      '<L', (0x44C,1,11), (None, None,                           ('Control',     '"WCWPC {}".format($)')) ),
-        'dcw':                      (HARDWARE.ESP32ex,
+        'dcw':                      (HARDWARE.ESP32 ^ HARDWARE.ESP32S3,
                                                      '<L', (0x44C,1,12), (None, None,                           ('Control',     '"WCDCW {}".format($)')) ),
-        'bpc':                      (HARDWARE.ESP32ex,
+        'bpc':                      (HARDWARE.ESP32 ^ HARDWARE.ESP32S3,
                                                      '<L', (0x44C,1,13), (None, None,                           ('Control',     '"WCBPC {}".format($)')) ),
-        'feature':                  (HARDWARE.ESP32ex,
+        'feature':                  (HARDWARE.ESP32 ^ HARDWARE.ESP32S3,
                                                      '<L', (0x44C,2,16), (None, '0 <= $ <= 2',                  ('Control',     '"WCFeature {}".format($)')) ),
                                     })
 SETTING_11_1_0_2['webcam_config_esp32s3'][1].update({

From 37ccac748897710ad4db2c26e46762e9139acf7c Mon Sep 17 00:00:00 2001
From: Norbert Richter <norbert.richter@prsolution.eu>
Date: Wed, 17 Jan 2024 09:09:52 +0100
Subject: [PATCH 12/21] Revert "Fix ESP32 S2/S3/C3 settings (#83)"

This reverts commit 98ca66786b06347fa04505728f616d9ccf5c44e0.
---
 decode-config.py | 72 ++++++++++++++++++++++++------------------------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/decode-config.py b/decode-config.py
index 33bd375..5a1c30e 100755
--- a/decode-config.py
+++ b/decode-config.py
@@ -679,7 +679,7 @@ def str(self, config_version):
         Create hardware string
 
         @param config_version:
-            config_version value from Tasmota configuration
+            config_version vvalue from Tasmota configuration
 
         @return:
             hardware string
@@ -2354,38 +2354,38 @@ def match(self, setting_hardware, config_version):
     'web_time_start':               (HARDWARE.ESP,   'B',   0x33C,       (None, None,                           ('Management',  '"WebTime {},{}".format($,@["web_time_end"])')) ),
     'web_time_end':                 (HARDWARE.ESP,   'B',   0x33D,       (None, None,                           ('Management',  None)) ),
     'pwm_value_ext':                (HARDWARE.ESP32, '<H',  0x560,       ([11], '0 <= $ <= 1023',               ('Management',  '"Pwm{} {}".format(#+1+5,$)')) ),
-    'eth_type':                     (HARDWARE.ESP32 ^ HARDWARE.ESP32S3,
+    'eth_type':                     (HARDWARE.ESP32ex,
                                                      'B',   0x446,       (None, '0 <= $ <= 1',                  ('Wifi',        '"EthType {}".format($)')) ),
     'eth_type_esp32s3':             (HARDWARE.ESP32S3,
                                                      'B',   0x40E,       (None, '0 <= $ <= 1',                  ('Wifi',        '"EthType {}".format($)')) ),
-    'eth_clk_mode':                 (HARDWARE.ESP32 ^ HARDWARE.ESP32S3,
+    'eth_clk_mode':                 (HARDWARE.ESP32ex,
                                                      'B',   0x447,       (None, '0 <= $ <= 3',                  ('Wifi',        '"EthClockMode {}".format($)')) ),
     'eth_clk_mode_esp32s3':         (HARDWARE.ESP32S3,
                                                      'B',   0x40F,       (None, '0 <= $ <= 3',                  ('Wifi',        '"EthClockMode {}".format($)')) ),
-    'eth_address':                  (HARDWARE.ESP32 ^ HARDWARE.ESP32S3,
+    'eth_address':                  (HARDWARE.ESP32ex,
                                                      'B',   0x450,       (None, '0 <= $ <= 31',                 ('Wifi',        '"EthAddress {}".format($)')) ),
     'eth_address_esp32s3':          (HARDWARE.ESP32S3,
                                                      'B',   0x45E,       (None, '0 <= $ <= 31',                 ('Wifi',        '"EthAddress {}".format($)')) ),
-    'module':                       (HARDWARE.ESP32 ^ HARDWARE.ESP32C3,
+    'module':                       (HARDWARE.ESP82_32ex,
                                                      'B',   0x474,       (None, None,                           ('Management',  '"Module {}".format($)')) ),
     'module_esp32s3':               (HARDWARE.ESP32S3,
                                                      'B',   0x45F,       (None, None,                           ('Management',  '"Module {}".format($)')) ),
-    'webcam_config':                (HARDWARE.ESP32 ^ HARDWARE.ESP32S3, {
-        'stream':                   (HARDWARE.ESP32 ^ HARDWARE.ESP32S3,
+    'webcam_config':                (HARDWARE.ESP32ex, {
+        'stream':                   (HARDWARE.ESP32ex,
                                                      '<L', (0x44C,1, 0), (None, None,                           ('Control',     '"WCStream {}".format($)')) ),
-        'mirror':                   (HARDWARE.ESP32 ^ HARDWARE.ESP32S3,
+        'mirror':                   (HARDWARE.ESP32ex,
                                                      '<L', (0x44C,1, 1), (None, None,                           ('Control',     '"WCMirror {}".format($)')) ),
-        'flip':                     (HARDWARE.ESP32 ^ HARDWARE.ESP32S3,
+        'flip':                     (HARDWARE.ESP32ex,
                                                      '<L', (0x44C,1, 2), (None, None,                           ('Control',     '"WCFlip {}".format($)')) ),
-        'rtsp':                     (HARDWARE.ESP32 ^ HARDWARE.ESP32S3,
+        'rtsp':                     (HARDWARE.ESP32ex,
                                                      '<L', (0x44C,1, 3), (None, None,                           ('Control',     '"WCRtsp {}".format($)')) ),
-        'contrast':                 (HARDWARE.ESP32 ^ HARDWARE.ESP32S3,
+        'contrast':                 (HARDWARE.ESP32ex,
                                                      '<l', (0x44C,3,18), (None, '0 <= $ <= 4',                  ('Control',     '"WCContrast {}".format($-2)')) ),
-        'brightness':               (HARDWARE.ESP32 ^ HARDWARE.ESP32S3,
+        'brightness':               (HARDWARE.ESP32ex,
                                                      '<l', (0x44C,3,22), (None, '0 <= $ <= 4',                  ('Control',     '"WCBrightness {}".format($-2)')) ),
-        'saturation':               (HARDWARE.ESP32 ^ HARDWARE.ESP32S3,
+        'saturation':               (HARDWARE.ESP32ex,
                                                      '<l', (0x44C,3,25), (None, '0 <= $ <= 4',                  ('Control',     '"WCSaturation {}".format($-2)')) ),
-        'resolution':               (HARDWARE.ESP32 ^ HARDWARE.ESP32S3,
+        'resolution':               (HARDWARE.ESP32ex,
                                                      '<l', (0x44C,4,28), (None, '0 <= $ <= 10',                 ('Control',     '"WCResolution {}".format($)')) ),
                                     },                      0x44C,       (None, None,                           (VIRTUAL,       None)), (None, None) ),
     'webcam_config_esp32s3':        (HARDWARE.ESP32S3, {
@@ -2406,35 +2406,35 @@ def match(self, setting_hardware, config_version):
         'resolution':               (HARDWARE.ESP32S3,
                                                      '<L', (0x460,4,28), (None, '0 <= $ <= 10',                 ('Control',     '"WCResolution {}".format($)')) ),
                                     },                      0x460,       (None, None,                           (VIRTUAL,       None)), (None, None) ),
-    'ws_width':                     (HARDWARE.ESP ^ HARDWARE.ESP32S3,
+    'ws_width':                     (HARDWARE.ESP82_32ex,
                                                      'B',   0x481,       ([3],  None,                           ('Light',       None)) ),
     'ws_width_esp32s3':             (HARDWARE.ESP32S3,
                                                      'B',   0x464,       ([3],  None,                           ('Light',       None)) ),
-    'serial_delimiter':             (HARDWARE.ESP ^ HARDWARE.ESP32S3,
+    'serial_delimiter':             (HARDWARE.ESP82_32ex,
                                                      'B',   0x451,       (None, None,                           ('Serial',      '"SerialDelimiter {}".format($)')) ),
     'serial_delimiter_esp32s3':     (HARDWARE.ESP32S3,
                                                      'B',   0x467,       (None, None,                           ('Serial',      '"SerialDelimiter {}".format($)')) ),
-    'seriallog_level':              (HARDWARE.ESP ^ HARDWARE.ESP32S3,
+    'seriallog_level':              (HARDWARE.ESP82_32ex,
                                                      'B',   0x452,       (None, '0 <= $ <= 4',                  ('Management',  '"SerialLog {}".format($)')) ),
     'seriallog_level_esp32s3':      (HARDWARE.ESP32S3,
                                                      'B',   0x468,       (None, '0 <= $ <= 4',                  ('Management',  '"SerialLog {}".format($)')) ),
-    'sleep':                        (HARDWARE.ESP ^ HARDWARE.ESP32S3,
+    'sleep':                        (HARDWARE.ESP82_32ex,
                                                      'B',   0x453,       (None, '0 <= $ <= 250',                ('Management',  '"Sleep {}".format($)')) ),
     'sleep_esp32s3':                (HARDWARE.ESP32S3,
                                                      'B',   0x469,       (None, '0 <= $ <= 250',                ('Management',  '"Sleep {}".format($)')) ),
-    'domoticz_switch_idx':          (HARDWARE.ESP ^ HARDWARE.ESP32S3,
+    'domoticz_switch_idx':          (HARDWARE.ESP82_32ex,
                                                      '<H',  0x454,       ([4],  None,                           ('Domoticz',    '"DzSwitchIdx{} {}".format(#+1,$)')) ),
     'domoticz_switch_idx_esp32s3':  (HARDWARE.ESP32S3,
                                                      '<H',  0x46A,       ([4],  None,                           ('Domoticz',    '"DzSwitchIdx{} {}".format(#+1,$)')) ),
-    'domoticz_sensor_idx':          (HARDWARE.ESP ^ HARDWARE.ESP32S3,
+    'domoticz_sensor_idx':          (HARDWARE.ESP82_32ex,
                                                      '<H',  0x45C,       ([12], None,                           ('Domoticz',    '"DzSensorIdx{} {}".format(#+1,$)')) ),
     'domoticz_sensor_idx_esp32s3':  (HARDWARE.ESP32S3,
                                                      '<H',  0x472,       ([12], None,                           ('Domoticz',    '"DzSensorIdx{} {}".format(#+1,$)')) ),
-    'ws_color':                     (HARDWARE.ESP ^ HARDWARE.ESP32S3,
+    'ws_color':                     (HARDWARE.ESP82_32ex,
                                                      'B',   0x475,       ([4,3],None,                           ('Light',       None)) ),
     'ws_color_esp32s3':             (HARDWARE.ESP32S3,
                                                      'B',   0x48A,       ([4,3],None,                           ('Light',       None)) ),
-    'my_gp_esp32':                  (HARDWARE.ESP ^ (HARDWARE.ESP32S2 | HARDWARE.ESP32S3 | HARDWARE.ESP32C3),
+    'my_gp_esp32':                  (HARDWARE.ESP32ex,
                                                      '<H',  0x3AC,       ([40], None,                           ('Management',  '"Gpio{} {}".format(#, $)')) ),
     'my_gp_esp32c3':                (HARDWARE.ESP32C3,
                                                      '<H',  0x3AC,       ([22], None,                           ('Management',  '"Gpio{} {}".format(#, $)')) ),
@@ -2444,11 +2444,11 @@ def match(self, setting_hardware, config_version):
                                                      '<H',  0x3AC,       ([49], None,                           ('Management',  '"Gpio{} {}".format(#, $)')) ),
                                     })
 SETTING_10_1_0_6['user_template_esp32'][1].update({
-        'base':                     (HARDWARE.ESP32 ^ (HARDWARE.ESP32S2 | HARDWARE.ESP32S3 | HARDWARE.ESP32C3),
+        'base':                     (HARDWARE.ESP32ex,
                                                      'B',   0x71F,       (None, None,                           ('Management',  '"Template {{\\\"NAME\\\":\\\"{}\\\",\\\"GPIO\\\":{},\\\"FLAG\\\":{},\\\"BASE\\\":{}}}".format(@["templatename"],@["user_template_esp32"]["gpio"],@["user_template_esp32"]["flag"],$)')), ('$+1','$-1') ),
-        'gpio':                     (HARDWARE.ESP32 ^ (HARDWARE.ESP32S2 | HARDWARE.ESP32S3 | HARDWARE.ESP32C3),
+        'gpio':                     (HARDWARE.ESP32ex,
                                                      '<H',  0x3FC,       ([36], None,                           ('Management',  None)), ('1 if $==65504 else $','65504 if $==1 else $')),
-        'flag':                     (HARDWARE.ESP32 ^ (HARDWARE.ESP32S2 | HARDWARE.ESP32S3 | HARDWARE.ESP32C3),
+        'flag':                     (HARDWARE.ESP32ex,
                                                      '<H',  0x3FC+(2*36),(None, None,                           ('Management',  None)) ),
         'base_esp32c3':             (HARDWARE.ESP32C3,
                                                      'B',   0x71F,       (None, None,                           ('Management',  '"Template {{\\\"NAME\\\":\\\"{}\\\",\\\"GPIO\\\":{},\\\"FLAG\\\":{},\\\"BASE\\\":{}}}".format(@["templatename"],@["user_template_esp32"]["gpio_esp32c3"],@["user_template_esp32"]["flag_esp32c3"],$)')), ('$+1','$-1') ),
@@ -2565,27 +2565,27 @@ def match(self, setting_hardware, config_version):
                                     },                      0x730,       (None, None,                           (VIRTUAL,       None)), (None, None) ),
                                     })
 SETTING_11_1_0_2['webcam_config'][1].update({
-        'awb':                      (HARDWARE.ESP32 ^ HARDWARE.ESP32S3,
+        'awb':                      (HARDWARE.ESP32ex,
                                                      '<L', (0x44C,1, 4), (None, None,                           ('Control',     '"WCAWB {}".format($)')) ),
-        'awb_gain':                 (HARDWARE.ESP32 ^ HARDWARE.ESP32S3,
+        'awb_gain':                 (HARDWARE.ESP32ex,
                                                      '<L', (0x44C,1, 5), (None, None,                           ('Control',     '"WCAWBGain {}".format($)')) ),
-        'aec':                      (HARDWARE.ESP32 ^ HARDWARE.ESP32S3,
+        'aec':                      (HARDWARE.ESP32ex,
                                                      '<L', (0x44C,1, 6), (None, None,                           ('Control',     '"WCAEC {}".format($)')) ),
-        'aec2':                     (HARDWARE.ESP32 ^ HARDWARE.ESP32S3,
+        'aec2':                     (HARDWARE.ESP32ex,
                                                      '<L', (0x44C,1, 7), (None, None,                           ('Control',     '"WCAECDSP {}".format($)')) ),
-        'raw_gma':                  (HARDWARE.ESP32 ^ HARDWARE.ESP32S3,
+        'raw_gma':                  (HARDWARE.ESP32ex,
                                                      '<L', (0x44C,1, 8), (None, None,                           ('Control',     '"WCGammaCorrect {}".format($)')) ),
-        'lenc':                     (HARDWARE.ESP32 ^ HARDWARE.ESP32S3,
+        'lenc':                     (HARDWARE.ESP32ex,
                                                      '<L', (0x44C,1, 9), (None, None,                           ('Control',     '"WCLensCorrect {}".format($)')) ),
-        'colorbar':                 (HARDWARE.ESP32 ^ HARDWARE.ESP32S3,
+        'colorbar':                 (HARDWARE.ESP32ex,
                                                      '<L', (0x44C,1,10), (None, None,                           ('Control',     '"WCColorbar {}".format($)')) ),
-        'wpc':                      (HARDWARE.ESP32 ^ HARDWARE.ESP32S3,
+        'wpc':                      (HARDWARE.ESP32ex,
                                                      '<L', (0x44C,1,11), (None, None,                           ('Control',     '"WCWPC {}".format($)')) ),
-        'dcw':                      (HARDWARE.ESP32 ^ HARDWARE.ESP32S3,
+        'dcw':                      (HARDWARE.ESP32ex,
                                                      '<L', (0x44C,1,12), (None, None,                           ('Control',     '"WCDCW {}".format($)')) ),
-        'bpc':                      (HARDWARE.ESP32 ^ HARDWARE.ESP32S3,
+        'bpc':                      (HARDWARE.ESP32ex,
                                                      '<L', (0x44C,1,13), (None, None,                           ('Control',     '"WCBPC {}".format($)')) ),
-        'feature':                  (HARDWARE.ESP32 ^ HARDWARE.ESP32S3,
+        'feature':                  (HARDWARE.ESP32ex,
                                                      '<L', (0x44C,2,16), (None, '0 <= $ <= 2',                  ('Control',     '"WCFeature {}".format($)')) ),
                                     })
 SETTING_11_1_0_2['webcam_config_esp32s3'][1].update({

From 2b8a4598a14141ca53d34ebb5f1ebbf4cceb0101 Mon Sep 17 00:00:00 2001
From: Norbert Richter <norbert.richter@prsolution.eu>
Date: Wed, 17 Jan 2024 09:11:29 +0100
Subject: [PATCH 13/21] Fix ESP32 S2/S3/C3 settings (#83)

---
 decode-config.py | 72 ++++++++++++++++++++++++------------------------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/decode-config.py b/decode-config.py
index 5a1c30e..3b25b2f 100755
--- a/decode-config.py
+++ b/decode-config.py
@@ -679,7 +679,7 @@ def str(self, config_version):
         Create hardware string
 
         @param config_version:
-            config_version vvalue from Tasmota configuration
+            config_version value from Tasmota configuration
 
         @return:
             hardware string
@@ -2354,38 +2354,38 @@ def match(self, setting_hardware, config_version):
     'web_time_start':               (HARDWARE.ESP,   'B',   0x33C,       (None, None,                           ('Management',  '"WebTime {},{}".format($,@["web_time_end"])')) ),
     'web_time_end':                 (HARDWARE.ESP,   'B',   0x33D,       (None, None,                           ('Management',  None)) ),
     'pwm_value_ext':                (HARDWARE.ESP32, '<H',  0x560,       ([11], '0 <= $ <= 1023',               ('Management',  '"Pwm{} {}".format(#+1+5,$)')) ),
-    'eth_type':                     (HARDWARE.ESP32ex,
+    'eth_type':                     (HARDWARE.ESP32 ^ HARDWARE.ESP32S3,
                                                      'B',   0x446,       (None, '0 <= $ <= 1',                  ('Wifi',        '"EthType {}".format($)')) ),
     'eth_type_esp32s3':             (HARDWARE.ESP32S3,
                                                      'B',   0x40E,       (None, '0 <= $ <= 1',                  ('Wifi',        '"EthType {}".format($)')) ),
-    'eth_clk_mode':                 (HARDWARE.ESP32ex,
+    'eth_clk_mode':                 (HARDWARE.ESP32 ^ HARDWARE.ESP32S3,
                                                      'B',   0x447,       (None, '0 <= $ <= 3',                  ('Wifi',        '"EthClockMode {}".format($)')) ),
     'eth_clk_mode_esp32s3':         (HARDWARE.ESP32S3,
                                                      'B',   0x40F,       (None, '0 <= $ <= 3',                  ('Wifi',        '"EthClockMode {}".format($)')) ),
-    'eth_address':                  (HARDWARE.ESP32ex,
+    'eth_address':                  (HARDWARE.ESP32 ^ HARDWARE.ESP32S3,
                                                      'B',   0x450,       (None, '0 <= $ <= 31',                 ('Wifi',        '"EthAddress {}".format($)')) ),
     'eth_address_esp32s3':          (HARDWARE.ESP32S3,
                                                      'B',   0x45E,       (None, '0 <= $ <= 31',                 ('Wifi',        '"EthAddress {}".format($)')) ),
-    'module':                       (HARDWARE.ESP82_32ex,
+    'module':                       (HARDWARE.ESP32 ^ HARDWARE.ESP32S3,
                                                      'B',   0x474,       (None, None,                           ('Management',  '"Module {}".format($)')) ),
     'module_esp32s3':               (HARDWARE.ESP32S3,
                                                      'B',   0x45F,       (None, None,                           ('Management',  '"Module {}".format($)')) ),
-    'webcam_config':                (HARDWARE.ESP32ex, {
-        'stream':                   (HARDWARE.ESP32ex,
+    'webcam_config':                (HARDWARE.ESP32 ^ HARDWARE.ESP32S3, {
+        'stream':                   (HARDWARE.ESP32 ^ HARDWARE.ESP32S3,
                                                      '<L', (0x44C,1, 0), (None, None,                           ('Control',     '"WCStream {}".format($)')) ),
-        'mirror':                   (HARDWARE.ESP32ex,
+        'mirror':                   (HARDWARE.ESP32 ^ HARDWARE.ESP32S3,
                                                      '<L', (0x44C,1, 1), (None, None,                           ('Control',     '"WCMirror {}".format($)')) ),
-        'flip':                     (HARDWARE.ESP32ex,
+        'flip':                     (HARDWARE.ESP32 ^ HARDWARE.ESP32S3,
                                                      '<L', (0x44C,1, 2), (None, None,                           ('Control',     '"WCFlip {}".format($)')) ),
-        'rtsp':                     (HARDWARE.ESP32ex,
+        'rtsp':                     (HARDWARE.ESP32 ^ HARDWARE.ESP32S3,
                                                      '<L', (0x44C,1, 3), (None, None,                           ('Control',     '"WCRtsp {}".format($)')) ),
-        'contrast':                 (HARDWARE.ESP32ex,
+        'contrast':                 (HARDWARE.ESP32 ^ HARDWARE.ESP32S3,
                                                      '<l', (0x44C,3,18), (None, '0 <= $ <= 4',                  ('Control',     '"WCContrast {}".format($-2)')) ),
-        'brightness':               (HARDWARE.ESP32ex,
+        'brightness':               (HARDWARE.ESP32 ^ HARDWARE.ESP32S3,
                                                      '<l', (0x44C,3,22), (None, '0 <= $ <= 4',                  ('Control',     '"WCBrightness {}".format($-2)')) ),
-        'saturation':               (HARDWARE.ESP32ex,
+        'saturation':               (HARDWARE.ESP32 ^ HARDWARE.ESP32S3,
                                                      '<l', (0x44C,3,25), (None, '0 <= $ <= 4',                  ('Control',     '"WCSaturation {}".format($-2)')) ),
-        'resolution':               (HARDWARE.ESP32ex,
+        'resolution':               (HARDWARE.ESP32 ^ HARDWARE.ESP32S3,
                                                      '<l', (0x44C,4,28), (None, '0 <= $ <= 10',                 ('Control',     '"WCResolution {}".format($)')) ),
                                     },                      0x44C,       (None, None,                           (VIRTUAL,       None)), (None, None) ),
     'webcam_config_esp32s3':        (HARDWARE.ESP32S3, {
@@ -2406,35 +2406,35 @@ def match(self, setting_hardware, config_version):
         'resolution':               (HARDWARE.ESP32S3,
                                                      '<L', (0x460,4,28), (None, '0 <= $ <= 10',                 ('Control',     '"WCResolution {}".format($)')) ),
                                     },                      0x460,       (None, None,                           (VIRTUAL,       None)), (None, None) ),
-    'ws_width':                     (HARDWARE.ESP82_32ex,
+    'ws_width':                     (HARDWARE.ESP ^ HARDWARE.ESP32S3,
                                                      'B',   0x481,       ([3],  None,                           ('Light',       None)) ),
     'ws_width_esp32s3':             (HARDWARE.ESP32S3,
                                                      'B',   0x464,       ([3],  None,                           ('Light',       None)) ),
-    'serial_delimiter':             (HARDWARE.ESP82_32ex,
+    'serial_delimiter':             (HARDWARE.ESP ^ HARDWARE.ESP32S3,
                                                      'B',   0x451,       (None, None,                           ('Serial',      '"SerialDelimiter {}".format($)')) ),
     'serial_delimiter_esp32s3':     (HARDWARE.ESP32S3,
                                                      'B',   0x467,       (None, None,                           ('Serial',      '"SerialDelimiter {}".format($)')) ),
-    'seriallog_level':              (HARDWARE.ESP82_32ex,
+    'seriallog_level':              (HARDWARE.ESP ^ HARDWARE.ESP32S3,
                                                      'B',   0x452,       (None, '0 <= $ <= 4',                  ('Management',  '"SerialLog {}".format($)')) ),
     'seriallog_level_esp32s3':      (HARDWARE.ESP32S3,
                                                      'B',   0x468,       (None, '0 <= $ <= 4',                  ('Management',  '"SerialLog {}".format($)')) ),
-    'sleep':                        (HARDWARE.ESP82_32ex,
+    'sleep':                        (HARDWARE.ESP ^ HARDWARE.ESP32S3,
                                                      'B',   0x453,       (None, '0 <= $ <= 250',                ('Management',  '"Sleep {}".format($)')) ),
     'sleep_esp32s3':                (HARDWARE.ESP32S3,
                                                      'B',   0x469,       (None, '0 <= $ <= 250',                ('Management',  '"Sleep {}".format($)')) ),
-    'domoticz_switch_idx':          (HARDWARE.ESP82_32ex,
+    'domoticz_switch_idx':          (HARDWARE.ESP ^ HARDWARE.ESP32S3,
                                                      '<H',  0x454,       ([4],  None,                           ('Domoticz',    '"DzSwitchIdx{} {}".format(#+1,$)')) ),
     'domoticz_switch_idx_esp32s3':  (HARDWARE.ESP32S3,
                                                      '<H',  0x46A,       ([4],  None,                           ('Domoticz',    '"DzSwitchIdx{} {}".format(#+1,$)')) ),
-    'domoticz_sensor_idx':          (HARDWARE.ESP82_32ex,
+    'domoticz_sensor_idx':          (HARDWARE.ESP ^ HARDWARE.ESP32S3,
                                                      '<H',  0x45C,       ([12], None,                           ('Domoticz',    '"DzSensorIdx{} {}".format(#+1,$)')) ),
     'domoticz_sensor_idx_esp32s3':  (HARDWARE.ESP32S3,
                                                      '<H',  0x472,       ([12], None,                           ('Domoticz',    '"DzSensorIdx{} {}".format(#+1,$)')) ),
-    'ws_color':                     (HARDWARE.ESP82_32ex,
+    'ws_color':                     (HARDWARE.ESP ^ HARDWARE.ESP32S3,
                                                      'B',   0x475,       ([4,3],None,                           ('Light',       None)) ),
     'ws_color_esp32s3':             (HARDWARE.ESP32S3,
                                                      'B',   0x48A,       ([4,3],None,                           ('Light',       None)) ),
-    'my_gp_esp32':                  (HARDWARE.ESP32ex,
+    'my_gp_esp32':                  (HARDWARE.ESP ^ (HARDWARE.ESP32S2 | HARDWARE.ESP32S3 | HARDWARE.ESP32C3),
                                                      '<H',  0x3AC,       ([40], None,                           ('Management',  '"Gpio{} {}".format(#, $)')) ),
     'my_gp_esp32c3':                (HARDWARE.ESP32C3,
                                                      '<H',  0x3AC,       ([22], None,                           ('Management',  '"Gpio{} {}".format(#, $)')) ),
@@ -2444,11 +2444,11 @@ def match(self, setting_hardware, config_version):
                                                      '<H',  0x3AC,       ([49], None,                           ('Management',  '"Gpio{} {}".format(#, $)')) ),
                                     })
 SETTING_10_1_0_6['user_template_esp32'][1].update({
-        'base':                     (HARDWARE.ESP32ex,
+        'base':                     (HARDWARE.ESP32 ^ (HARDWARE.ESP32S2 | HARDWARE.ESP32S3 | HARDWARE.ESP32C3),
                                                      'B',   0x71F,       (None, None,                           ('Management',  '"Template {{\\\"NAME\\\":\\\"{}\\\",\\\"GPIO\\\":{},\\\"FLAG\\\":{},\\\"BASE\\\":{}}}".format(@["templatename"],@["user_template_esp32"]["gpio"],@["user_template_esp32"]["flag"],$)')), ('$+1','$-1') ),
-        'gpio':                     (HARDWARE.ESP32ex,
+        'gpio':                     (HARDWARE.ESP32 ^ (HARDWARE.ESP32S2 | HARDWARE.ESP32S3 | HARDWARE.ESP32C3),
                                                      '<H',  0x3FC,       ([36], None,                           ('Management',  None)), ('1 if $==65504 else $','65504 if $==1 else $')),
-        'flag':                     (HARDWARE.ESP32ex,
+        'flag':                     (HARDWARE.ESP32 ^ (HARDWARE.ESP32S2 | HARDWARE.ESP32S3 | HARDWARE.ESP32C3),
                                                      '<H',  0x3FC+(2*36),(None, None,                           ('Management',  None)) ),
         'base_esp32c3':             (HARDWARE.ESP32C3,
                                                      'B',   0x71F,       (None, None,                           ('Management',  '"Template {{\\\"NAME\\\":\\\"{}\\\",\\\"GPIO\\\":{},\\\"FLAG\\\":{},\\\"BASE\\\":{}}}".format(@["templatename"],@["user_template_esp32"]["gpio_esp32c3"],@["user_template_esp32"]["flag_esp32c3"],$)')), ('$+1','$-1') ),
@@ -2565,27 +2565,27 @@ def match(self, setting_hardware, config_version):
                                     },                      0x730,       (None, None,                           (VIRTUAL,       None)), (None, None) ),
                                     })
 SETTING_11_1_0_2['webcam_config'][1].update({
-        'awb':                      (HARDWARE.ESP32ex,
+        'awb':                      (HARDWARE.ESP32 ^ HARDWARE.ESP32S3,
                                                      '<L', (0x44C,1, 4), (None, None,                           ('Control',     '"WCAWB {}".format($)')) ),
-        'awb_gain':                 (HARDWARE.ESP32ex,
+        'awb_gain':                 (HARDWARE.ESP32 ^ HARDWARE.ESP32S3,
                                                      '<L', (0x44C,1, 5), (None, None,                           ('Control',     '"WCAWBGain {}".format($)')) ),
-        'aec':                      (HARDWARE.ESP32ex,
+        'aec':                      (HARDWARE.ESP32 ^ HARDWARE.ESP32S3,
                                                      '<L', (0x44C,1, 6), (None, None,                           ('Control',     '"WCAEC {}".format($)')) ),
-        'aec2':                     (HARDWARE.ESP32ex,
+        'aec2':                     (HARDWARE.ESP32 ^ HARDWARE.ESP32S3,
                                                      '<L', (0x44C,1, 7), (None, None,                           ('Control',     '"WCAECDSP {}".format($)')) ),
-        'raw_gma':                  (HARDWARE.ESP32ex,
+        'raw_gma':                  (HARDWARE.ESP32 ^ HARDWARE.ESP32S3,
                                                      '<L', (0x44C,1, 8), (None, None,                           ('Control',     '"WCGammaCorrect {}".format($)')) ),
-        'lenc':                     (HARDWARE.ESP32ex,
+        'lenc':                     (HARDWARE.ESP32 ^ HARDWARE.ESP32S3,
                                                      '<L', (0x44C,1, 9), (None, None,                           ('Control',     '"WCLensCorrect {}".format($)')) ),
-        'colorbar':                 (HARDWARE.ESP32ex,
+        'colorbar':                 (HARDWARE.ESP32 ^ HARDWARE.ESP32S3,
                                                      '<L', (0x44C,1,10), (None, None,                           ('Control',     '"WCColorbar {}".format($)')) ),
-        'wpc':                      (HARDWARE.ESP32ex,
+        'wpc':                      (HARDWARE.ESP32 ^ HARDWARE.ESP32S3,
                                                      '<L', (0x44C,1,11), (None, None,                           ('Control',     '"WCWPC {}".format($)')) ),
-        'dcw':                      (HARDWARE.ESP32ex,
+        'dcw':                      (HARDWARE.ESP32 ^ HARDWARE.ESP32S3,
                                                      '<L', (0x44C,1,12), (None, None,                           ('Control',     '"WCDCW {}".format($)')) ),
-        'bpc':                      (HARDWARE.ESP32ex,
+        'bpc':                      (HARDWARE.ESP32 ^ HARDWARE.ESP32S3,
                                                      '<L', (0x44C,1,13), (None, None,                           ('Control',     '"WCBPC {}".format($)')) ),
-        'feature':                  (HARDWARE.ESP32ex,
+        'feature':                  (HARDWARE.ESP32 ^ HARDWARE.ESP32S3,
                                                      '<L', (0x44C,2,16), (None, '0 <= $ <= 2',                  ('Control',     '"WCFeature {}".format($)')) ),
                                     })
 SETTING_11_1_0_2['webcam_config_esp32s3'][1].update({

From 8aa7436c8f404dd821cb9c976e825acdb42803a9 Mon Sep 17 00:00:00 2001
From: Norbert Richter <norbert.richter@prsolution.eu>
Date: Wed, 17 Jan 2024 14:14:45 +0100
Subject: [PATCH 14/21] Fix v11.1.0.1 settings

---
 decode-config.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/decode-config.py b/decode-config.py
index 3b25b2f..cc907ef 100755
--- a/decode-config.py
+++ b/decode-config.py
@@ -2537,7 +2537,7 @@ def match(self, setting_hardware, config_version):
 SETTING_11_1_0_1.update             ({
     'influxdb_rp':                  (HARDWARE.ESP82, '699s',(0x017,'SET_INFLUXDB_RP'),
                                                                          (None,  None,                          ('Management',  '"IfxRP {}".format("\\"" if len($) == 0 else $$)')) ),
-    'influxdb_rp':                  (HARDWARE.ESP32, '699s',(0x017,'SET_INFLUXDB_RP'),
+    'influxdb_rp32':                (HARDWARE.ESP32, '699s',(0x017,'SET_INFLUXDB_RP'),
                                                                          (None,  None,                          ('Management',  '"IfxRP {}".format("\\"" if len($) == 0 else $)')) ),
                                     })
 

From c31405b6a6034f67b08c216c9a90179b05503914 Mon Sep 17 00:00:00 2001
From: Norbert Richter <norbert.richter@prsolution.eu>
Date: Wed, 17 Jan 2024 14:15:36 +0100
Subject: [PATCH 15/21] Update v13.2.0.3 settings

---
 decode-config.py | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/decode-config.py b/decode-config.py
index cc907ef..da901d1 100755
--- a/decode-config.py
+++ b/decode-config.py
@@ -2803,7 +2803,24 @@ def match(self, setting_hardware, config_version):
         'neopool_outputsensitive':  (HARDWARE.ESP,   '<L', (0xF74,1,11), (None, None,                           ('SetOption',   '"SO157 {}".format($)')) ),
                                     })
 # ======================================================================
-SETTING_13_3_0_2 = copy.copy(SETTING_13_2_0_1)
+SETTING_13_2_0_3 = copy.copy(SETTING_13_2_0_1)
+SETTING_13_2_0_3[SETTINGVAR][HARDWARE.hstr(HARDWARE.ESP)].pop()    # SET_MAX
+SETTING_13_2_0_3[SETTINGVAR][HARDWARE.hstr(HARDWARE.ESP32)].pop()  # SET_MAX
+SETTING_13_2_0_3[SETTINGVAR][HARDWARE.hstr(HARDWARE.ESP82)].pop()  # SET_MAX
+SETTING_13_2_0_3[SETTINGVAR][HARDWARE.hstr(HARDWARE.ESP)].extend(['SET_CANVAS'])
+SETTING_13_2_0_3[SETTINGVAR][HARDWARE.hstr(HARDWARE.ESP82)].extend(['SET_CANVAS'])
+SETTING_13_2_0_3[SETTINGVAR][HARDWARE.hstr(HARDWARE.ESP32)].extend(['SET_CANVAS'])
+SETTING_13_2_0_3[SETTINGVAR][HARDWARE.hstr(HARDWARE.ESP)].extend(['SET_MAX'])
+SETTING_13_2_0_3[SETTINGVAR][HARDWARE.hstr(HARDWARE.ESP82)].extend(['SET_MAX'])
+SETTING_13_2_0_3[SETTINGVAR][HARDWARE.hstr(HARDWARE.ESP32)].extend(['SET_MAX'])
+SETTING_13_2_0_3.update             ({
+    'webcanvas':                    (HARDWARE.ESP82, '699s',(0x017,'SET_CANVAS'),
+                                                                         (None,  None,                          ('Wifi',        '"WebCanvas {}".format("\\"" if len($) == 0 else $$)')) ),
+    'webcanvas32':                  (HARDWARE.ESP32, '699s',(0x017,'SET_CANVAS'),
+                                                                         (None,  None,                          ('Wifi',        '"WebCanvas {}".format("\\"" if len($) == 0 else $)')) ),
+                                    })
+# ======================================================================
+SETTING_13_3_0_2 = copy.copy(SETTING_13_2_0_3)
 SETTING_13_3_0_2['mbflag2'][1].update({
         'FTP_Mode':                 (HARDWARE.ESP,   '<L', (0xFD8,2,24), (None, '0 <= $ <= 2',                  ('Usf',         '"UfsFTP {}".format($)')) ),
                                     })
@@ -2813,6 +2830,7 @@ def match(self, setting_hardware, config_version):
 SETTINGS = [
             (0x0D030003,0x1000, SETTING_13_3_0_3),
             (0x0D030002,0x1000, SETTING_13_3_0_2),
+            (0x0D020003,0x1000, SETTING_13_2_0_3),
             (0x0D020001,0x1000, SETTING_13_2_0_1),
             (0x0D010004,0x1000, SETTING_13_1_0_4),
             (0x0D010002,0x1000, SETTING_13_1_0_2),

From 338ff66aab6fd283aa0ac554d4dde19641fee468 Mon Sep 17 00:00:00 2001
From: Norbert Richter <norbert.richter@prsolution.eu>
Date: Wed, 24 Jan 2024 19:48:14 +0100
Subject: [PATCH 16/21] Bump to v13.3.0.4

---
 README.md        | 2 +-
 decode-config.py | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index b41cebe..3729d8e 100644
--- a/README.md
+++ b/README.md
@@ -43,7 +43,7 @@ Comparing backup files created by **decode-config** and [.dmp](#dmp-format) file
 Using the latest development version of decode-config is only necessary if you also use the latest development version of Tasmota.
 
 <!-- markdownlint-disable MD033 -->
-[![development version](https://img.shields.io/badge/development-v13.3.0.3-blue.svg)](https://github.com/tasmota/decode-config/tree/development)
+[![development version](https://img.shields.io/badge/development-v13.3.0.4-blue.svg)](https://github.com/tasmota/decode-config/tree/development)
 
 ## Table of contents
 <details>
diff --git a/decode-config.py b/decode-config.py
index da901d1..ce38781 100755
--- a/decode-config.py
+++ b/decode-config.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import print_function
 METADATA = {
-    'VERSION': '13.3.0.3',
+    'VERSION': '13.3.0.4',
     'DESCRIPTION': 'Backup/restore and decode configuration tool for Tasmota',
     'CLASSIFIER': 'Development Status :: 4 - Beta',
     'URL': 'https://github.com/tasmota/decode-config',
@@ -2825,10 +2825,10 @@ def match(self, setting_hardware, config_version):
         'FTP_Mode':                 (HARDWARE.ESP,   '<L', (0xFD8,2,24), (None, '0 <= $ <= 2',                  ('Usf',         '"UfsFTP {}".format($)')) ),
                                     })
 # ======================================================================
-SETTING_13_3_0_3 = copy.copy(SETTING_13_3_0_2)
+SETTING_13_3_0_4 = copy.copy(SETTING_13_3_0_2)
 # ======================================================================
 SETTINGS = [
-            (0x0D030003,0x1000, SETTING_13_3_0_3),
+            (0x0D030004,0x1000, SETTING_13_3_0_4),
             (0x0D030002,0x1000, SETTING_13_3_0_2),
             (0x0D020003,0x1000, SETTING_13_2_0_3),
             (0x0D020001,0x1000, SETTING_13_2_0_1),

From e2141f2e4af12d207d69ec49dbc941021daacc2d Mon Sep 17 00:00:00 2001
From: Norbert Richter <norbert.richter@prsolution.eu>
Date: Mon, 5 Feb 2024 14:11:42 +0100
Subject: [PATCH 17/21] Bump to v13.3.0.5

---
 README.md        | 2 +-
 decode-config.py | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 3729d8e..1d8db0d 100644
--- a/README.md
+++ b/README.md
@@ -43,7 +43,7 @@ Comparing backup files created by **decode-config** and [.dmp](#dmp-format) file
 Using the latest development version of decode-config is only necessary if you also use the latest development version of Tasmota.
 
 <!-- markdownlint-disable MD033 -->
-[![development version](https://img.shields.io/badge/development-v13.3.0.4-blue.svg)](https://github.com/tasmota/decode-config/tree/development)
+[![development version](https://img.shields.io/badge/development-v13.3.0.5-blue.svg)](https://github.com/tasmota/decode-config/tree/development)
 
 ## Table of contents
 <details>
diff --git a/decode-config.py b/decode-config.py
index ce38781..12f06c7 100755
--- a/decode-config.py
+++ b/decode-config.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import print_function
 METADATA = {
-    'VERSION': '13.3.0.4',
+    'VERSION': '13.3.0.5',
     'DESCRIPTION': 'Backup/restore and decode configuration tool for Tasmota',
     'CLASSIFIER': 'Development Status :: 4 - Beta',
     'URL': 'https://github.com/tasmota/decode-config',
@@ -2825,10 +2825,10 @@ def match(self, setting_hardware, config_version):
         'FTP_Mode':                 (HARDWARE.ESP,   '<L', (0xFD8,2,24), (None, '0 <= $ <= 2',                  ('Usf',         '"UfsFTP {}".format($)')) ),
                                     })
 # ======================================================================
-SETTING_13_3_0_4 = copy.copy(SETTING_13_3_0_2)
+SETTING_13_3_0_5 = copy.copy(SETTING_13_3_0_2)
 # ======================================================================
 SETTINGS = [
-            (0x0D030004,0x1000, SETTING_13_3_0_4),
+            (0x0D030005,0x1000, SETTING_13_3_0_5),
             (0x0D030002,0x1000, SETTING_13_3_0_2),
             (0x0D020003,0x1000, SETTING_13_2_0_3),
             (0x0D020001,0x1000, SETTING_13_2_0_1),

From 853e9840a122bbee7fbbdbe0c7b92e9dca538d18 Mon Sep 17 00:00:00 2001
From: Norbert Richter <norbert.richter@prsolution.eu>
Date: Wed, 7 Feb 2024 16:54:14 +0100
Subject: [PATCH 18/21] Update v13.3.0.5 settings

---
 decode-config.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/decode-config.py b/decode-config.py
index 12f06c7..cddf7b4 100755
--- a/decode-config.py
+++ b/decode-config.py
@@ -2826,6 +2826,9 @@ def match(self, setting_hardware, config_version):
                                     })
 # ======================================================================
 SETTING_13_3_0_5 = copy.copy(SETTING_13_3_0_2)
+SETTING_13_3_0_5['flag6'][1].update ({
+        'mqtt_disable_modbus':      (HARDWARE.ESP,   '<L', (0xF74,1,12), (None, None,                           ('SetOption',   '"SO158 {}".format($)')) ),
+                                    })
 # ======================================================================
 SETTINGS = [
             (0x0D030005,0x1000, SETTING_13_3_0_5),

From 4cc173b3afec5c20aba29dc3a5322cd06da5c523 Mon Sep 17 00:00:00 2001
From: Norbert Richter <norbert.richter@prsolution.eu>
Date: Wed, 14 Feb 2024 09:39:43 +0100
Subject: [PATCH 19/21] Fix error restoring script based json into rules based
 config (#85)

---
 decode-config.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/decode-config.py b/decode-config.py
index cddf7b4..81f8efe 100755
--- a/decode-config.py
+++ b/decode-config.py
@@ -5577,7 +5577,7 @@ def set_field(dobj, config_version, fieldname, fielddef, restoremapping, addroff
             else:
                 value = write_converter(restoremapping.encode(STR_CODING), fielddef)
             err_text = "string length exceeding"
-            if value is not None:
+            if value is not None and not isinstance(value, bool):
                 max_ -= 1
                 valid = min_ <= len(value) <= max_
             else:

From 5c3497441db6e54529f9d57321ed7297149d52a5 Mon Sep 17 00:00:00 2001
From: Norbert Richter <norbert.richter@prsolution.eu>
Date: Wed, 14 Feb 2024 12:00:59 +0100
Subject: [PATCH 20/21] Update v13.3.0.5 settings

---
 decode-config.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/decode-config.py b/decode-config.py
index 81f8efe..47af071 100755
--- a/decode-config.py
+++ b/decode-config.py
@@ -2828,6 +2828,7 @@ def match(self, setting_hardware, config_version):
 SETTING_13_3_0_5 = copy.copy(SETTING_13_3_0_2)
 SETTING_13_3_0_5['flag6'][1].update ({
         'mqtt_disable_modbus':      (HARDWARE.ESP,   '<L', (0xF74,1,12), (None, None,                           ('SetOption',   '"SO158 {}".format($)')) ),
+        'counter_both_edges':       (HARDWARE.ESP,   '<L', (0xF74,1,13), (None, None,                           ('SetOption',   '"SO159 {}".format($)')) ),
                                     })
 # ======================================================================
 SETTINGS = [

From 519ccd5696f64b44d0dc2813a9f18ff723b1252d Mon Sep 17 00:00:00 2001
From: Norbert Richter <norbert.richter@prsolution.eu>
Date: Wed, 14 Feb 2024 18:28:33 +0100
Subject: [PATCH 21/21] Prep release v13.4.0

---
 README.md        | 12 ++++++------
 decode-config.py |  5 ++++-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 1d8db0d..646d8bc 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@ Convert, backup and restore configuration data of devices flashed with [Tasmota
 <img src="https://github.com/tasmota/decode-config/blob/master/media/pic/decode-config.png" alt="Overview" title="decode-config Overview" width="600">
 
 <!-- markdownlint-disable MD033 -->
-[![master](https://img.shields.io/badge/master-v13.3.0.0-blue.svg)](https://github.com/tasmota/decode-config/tree/master)
+[![master](https://img.shields.io/badge/master-v13.4.0.0-blue.svg)](https://github.com/tasmota/decode-config/tree/master)
 [![GitHub download](https://img.shields.io/github/downloads/tasmota/decode-config/total.svg)](https://github.com/tasmota/decode-config/releases/latest)
 [![PyPI version](https://badge.fury.io/py/decode-config.svg)](https://badge.fury.io/py/decode-config)
 ![PyPI downloads](https://img.shields.io/pypi/dm/decode-config?label=pypi%20downloads)
@@ -43,7 +43,7 @@ Comparing backup files created by **decode-config** and [.dmp](#dmp-format) file
 Using the latest development version of decode-config is only necessary if you also use the latest development version of Tasmota.
 
 <!-- markdownlint-disable MD033 -->
-[![development version](https://img.shields.io/badge/development-v13.3.0.5-blue.svg)](https://github.com/tasmota/decode-config/tree/development)
+[![development version](https://img.shields.io/badge/development-v13.4.0.0-blue.svg)](https://github.com/tasmota/decode-config/tree/development)
 
 ## Table of contents
 <details>
@@ -337,7 +337,7 @@ Example:
 decode-config -c my.conf -s tasmota-4281 --backup-file Config_@d_@v
 ```
 
-This will create a file like `Config_Tasmota_13.3.json` (the part `Tasmota` and `13.3` will choosen related to your device configuration).
+This will create a file like `Config_Tasmota_13.4.json` (the part `Tasmota` and `13.4` will choosen related to your device configuration).
 
 #### Save multiple backup at once
 
@@ -349,7 +349,7 @@ decode-config -c my.conf -s tasmota-4281 -o Config_@d_@v -o Backup_@H.json -o Ba
 
 creates three backup files:
 
-* `Config_Tasmota_13.3.json` using JSON format
+* `Config_Tasmota_13.4.json` using JSON format
 * `Backup_tasmota-4281.json` using JSON format
 * `Backup_tasmota-4281.dmp` using Tasmota configuration file format
 
@@ -357,10 +357,10 @@ creates three backup files:
 
 Reading back a previously saved backup file, use the `--restore-file <filename>` parameter.
 
-To restore the previously save backup file `Config_Tasmota_13.3.json` to device `tasmota-4281` use:
+To restore the previously save backup file `Config_Tasmota_13.4.json` to device `tasmota-4281` use:
 
 ```bash
-decode-config -c my.conf -s tasmota-4281 --restore-file Config_Tasmota_13.3
+decode-config -c my.conf -s tasmota-4281 --restore-file Config_Tasmota_13.4
 ```
 
 Restore operation also allows placeholders **@v**, **@d**, **@f**, **@h** or **@H** like in backup filenames so we can use the same naming as for the backup process:
diff --git a/decode-config.py b/decode-config.py
index 47af071..caeffcc 100755
--- a/decode-config.py
+++ b/decode-config.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import print_function
 METADATA = {
-    'VERSION': '13.3.0.5',
+    'VERSION': '13.4.0.0',
     'DESCRIPTION': 'Backup/restore and decode configuration tool for Tasmota',
     'CLASSIFIER': 'Development Status :: 4 - Beta',
     'URL': 'https://github.com/tasmota/decode-config',
@@ -2831,7 +2831,10 @@ def match(self, setting_hardware, config_version):
         'counter_both_edges':       (HARDWARE.ESP,   '<L', (0xF74,1,13), (None, None,                           ('SetOption',   '"SO159 {}".format($)')) ),
                                     })
 # ======================================================================
+SETTING_13_4_0_0 = copy.copy(SETTING_13_3_0_5)
+# ======================================================================
 SETTINGS = [
+            (0x0D040000,0x1000, SETTING_13_4_0_0),
             (0x0D030005,0x1000, SETTING_13_3_0_5),
             (0x0D030002,0x1000, SETTING_13_3_0_2),
             (0x0D020003,0x1000, SETTING_13_2_0_3),