From 01f9097acb08ae5b051321905e7cc3790984adaa Mon Sep 17 00:00:00 2001
From: s-hadinger <49731213+s-hadinger@users.noreply.github.com>
Date: Mon, 3 Jun 2024 22:53:13 +0200
Subject: [PATCH] Add default value for `SetOption151` (#21560)

---
 tasmota/my_user_config.h             | 7 +++++++
 tasmota/tasmota_support/settings.ino | 3 +++
 2 files changed, 10 insertions(+)

diff --git a/tasmota/my_user_config.h b/tasmota/my_user_config.h
index 8bc62baae..3692c6715 100644
--- a/tasmota/my_user_config.h
+++ b/tasmota/my_user_config.h
@@ -1014,6 +1014,9 @@
   #define USE_ZIGBEE_MAXTIME_LIGHT          60*60     // 1h
   #define USE_ZIGBEE_MAXTIME_LIFT           4*60*60   // 4h
 
+// -- Matter support (ESP32 and variants) ----------------------------
+#define MATTER_ENABLED    false                    // Is Matter enabled by default (ie `SO151 1`)
+
 // -- Other sensors/drivers -----------------------
 
 //#define USE_SHIFT595                             // Add support for 74xx595 8-bit shift registers (+0k7 code)
@@ -1239,6 +1242,10 @@
     // #define BE_LV_WIDGET_TABVIEW
     // #define BE_LV_WIDGET_TILEVIEW
 
+// -- Matter protocol ---------------------------------
+  // #define USE_MATTER_DEVICE                      // Enable Matter device support (+420KB)
+                                                    // Enabled by default in standard ESP32 binary
+
 #endif  // ESP32
 
 /*********************************************************************************************\
diff --git a/tasmota/tasmota_support/settings.ino b/tasmota/tasmota_support/settings.ino
index 24dc0d636..ca13e46a1 100644
--- a/tasmota/tasmota_support/settings.ino
+++ b/tasmota/tasmota_support/settings.ino
@@ -1425,6 +1425,9 @@ void SettingsDefaultSet2(void) {
   #endif
 #endif // FIRMWARE_MINIMAL
 
+  // Matter
+  flag6.matter_enabled |= MATTER_ENABLED;
+
   Settings->flag = flag;
   Settings->flag2 = flag2;
   Settings->flag3 = flag3;