From 9e34d16e9a3989a55be1c63c3690d2dd7a926a61 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Mon, 30 Jul 2018 12:29:56 +0200
Subject: [PATCH 1/2] Fix sonoff-minimal

Fix sonoff-minimal from using default settings
---
 sonoff/_changelog.ino | 1 +
 sonoff/settings.ino   | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/sonoff/_changelog.ino b/sonoff/_changelog.ino
index 690fe4438..7dcbd0821 100644
--- a/sonoff/_changelog.ino
+++ b/sonoff/_changelog.ino
@@ -1,4 +1,5 @@
 /* 6.1.1c
+ * Fix sonoff-minimal from using default settings
  * Add option + to command Rule to concatenate new rule with existing rules (#3365)
  * Add initial support for sensor MPU6050 (#3352)
  * Add command SerialSend4 to send binary serial data (#3345)
diff --git a/sonoff/settings.ino b/sonoff/settings.ino
index 10fbd10ed..1e04128b9 100644
--- a/sonoff/settings.ino
+++ b/sonoff/settings.ino
@@ -286,8 +286,10 @@ void SettingsLoad()
   snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_CONFIG D_LOADED_FROM_FLASH_AT " %X, " D_COUNT " %d"), settings_location, Settings.save_flag);
   AddLog(LOG_LEVEL_DEBUG);
 
+#ifndef BE_MINIMAL
   if (bad_crc || (Settings.cfg_holder != (uint16_t)CFG_HOLDER)) { SettingsDefault(); }
   settings_crc = GetSettingsCrc();
+#endif  // BE_MINIMAL
 
   RtcSettingsLoad();
 }

From 6f455e2c006324c0c404436a59463bcf73914656 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Tue, 31 Jul 2018 11:49:23 +0200
Subject: [PATCH 2/2] Update debug info

Update debug info
---
 sonoff/support.ino     | 13 +++++++++++++
 tools/decode-status.py |  6 +++---
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/sonoff/support.ino b/sonoff/support.ino
index 5cc9b0611..3c2238be7 100644
--- a/sonoff/support.ino
+++ b/sonoff/support.ino
@@ -919,6 +919,19 @@ void GetFeatures()
 /*********************************************************************************************/
 
   feature_sns2 = 0x00000000;
+
+#ifdef USE_MCP230xx
+  feature_sns2 |= 0x00000001;  // xsns_29_mcp230xx.ino
+#endif
+#ifdef USE_MPR121
+  feature_sns2 |= 0x00000002;  // xsns_30_mpr121.ino
+#endif
+#ifdef USE_CCS811
+  feature_sns2 |= 0x00000004;  // xsns_31_ccs811.ino
+#endif
+#ifdef USE_MPU6050
+  feature_sns2 |= 0x00000008;  // xsns_32_mpu6050.ino
+#endif
 }
 
 /*********************************************************************************************\
diff --git a/tools/decode-status.py b/tools/decode-status.py
index 7fc7ba4e1..48a08ef9a 100644
--- a/tools/decode-status.py
+++ b/tools/decode-status.py
@@ -72,7 +72,7 @@ a_setoption = [[
     "Do not control Power with Dimmer",
     "Energy monitoring while powered off",
     "MQTT serial",
-    "Rules until 5.14.0b",
+    "MQTT serial binary",
     "Rules once mode until 5.14.0b",
     "KNX enabled",
     "Use Power device index on single relay devices",
@@ -121,7 +121,7 @@ a_features = [[
     "USE_SGP30","USE_SR04","USE_SDM120","USE_SI1145",
     "USE_SDM630","USE_LM75AD","USE_APDS9960","USE_TM1638"
     ],[
-    "","","","",
+    "USE_MCP230xx","USE_MPR121","USE_CCS811","USE_MPU6050",
     "","","","",
     "","","","",
     "","","","",
@@ -155,7 +155,7 @@ else:
     fp.close()
 
 def StartDecode():
-    print ("\n*** decode-status.py v20180725 by Theo Arends ***")
+    print ("\n*** decode-status.py v20180730 by Theo Arends ***")
 
 #    print("Decoding\n{}".format(obj))