From aa88295d418ee7100eb19f62c8d1eb56339a27be Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Thu, 1 Aug 2019 15:42:58 +0200
Subject: [PATCH] Update feature lists

Update feature lists
---
 sonoff/support_features.ino | 29 ++++++++++++++++++++---------
 tools/decode-status.py      | 25 ++++++++++++++++---------
 2 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/sonoff/support_features.ino b/sonoff/support_features.ino
index 1a551ceaf..73c44a920 100644
--- a/sonoff/support_features.ino
+++ b/sonoff/support_features.ino
@@ -25,8 +25,9 @@ void GetFeatures(void)
 {
   feature_drv1 = 0x00000000;   // xdrv_02_mqtt.ino, xdrv_04_light.ino, xdrv_06_snfbridge.ino
 
-//  feature_drv1 |= 0x00000001;
-
+#ifdef USE_ENERGY_MARGIN_DETECTION
+  feature_drv1 |= 0x00000001;  // xdrv_03_energy.ino
+#endif
 #ifdef USE_LIGHT
   feature_drv1 |= 0x00000002;  // sonoff.ino, xdrv_04_light.ino
 #endif
@@ -117,8 +118,8 @@ void GetFeatures(void)
 #ifdef USE_SMARTCONFIG
   feature_drv1 |= 0x40000000;  // support.ino
 #endif
-#if (MQTT_LIBRARY_TYPE == MQTT_ARDUINOMQTT)
-//  feature_drv1 |= 0x80000000;  // xdrv_02_mqtt.ino
+#ifdef USE_ENERGY_POWER_LIMIT
+  feature_drv1 |= 0x80000000;  // xdrv_03_energy.ino
 #endif
 
 /*********************************************************************************************/
@@ -188,8 +189,10 @@ void GetFeatures(void)
 #ifdef USE_EMULATION_WEMO
   feature_drv2 |= 0x00100000;  // xdrv_21_wemo.ino
 #endif
+#ifdef USE_SONOFF_IFAN
+  feature_drv2 |= 0x00200000;
+#endif
 
-//  feature_drv2 |= 0x00200000;
 //  feature_drv2 |= 0x00400000;
 
 #ifdef NO_EXTRA_4K_HEAP
@@ -400,10 +403,18 @@ void GetFeatures(void)
 #ifdef USE_ADE7953
   feature_sns2 |= 0x01000000;  // xnrg_07_ade7953.ino
 #endif
-//  feature_sns2 |= 0x02000000;
-//  feature_sns2 |= 0x04000000;
-//  feature_sns2 |= 0x08000000;
-//  feature_sns2 |= 0x10000000;
+#ifdef USE_SPS30
+  feature_sns2 |= 0x02000000;
+#endif
+#ifdef USE_VL53L0X
+  feature_sns2 |= 0x04000000;
+#endif
+#ifdef USE_MLX90614
+  feature_sns2 |= 0x08000000;
+#endif
+#ifdef USE_MAX31865
+  feature_sns2 |= 0x10000000;
+#endif
 //  feature_sns2 |= 0x20000000;
 //  feature_sns2 |= 0x40000000;
 //  feature_sns2 |= 0x80000000;
diff --git a/tools/decode-status.py b/tools/decode-status.py
index 43ba0c6fb..ad86f46ad 100755
--- a/tools/decode-status.py
+++ b/tools/decode-status.py
@@ -90,7 +90,12 @@ a_setoption = [[
     "(not used) mDNS delayed start (Sec)",
     "Boot loop retry offset (0 = disable)",
     "RGBWW remap",
-    "","","","","","",
+    "IR Unknown threshold",
+    "CSE7766 invalid power margin",
+    "Ignore hold time (s)",
+    "Number of Tuya relays",
+    "Over temperature threshold (celsius)",
+    "",
     "","","","","","",
     ],[
     "Timers enabled",
@@ -108,33 +113,35 @@ a_setoption = [[
     "Do not use retain flag on HOLD messages",
     "Do not scan relay power state at restart",
     "Use _ instead of - as sensor index separator",
-    "",
-    "","","","",
+    "Disable Dimmer slider control",
+    "Disable Dimmer range 255 slider control",
+    "Enable buzzer when available",
+    "","",
     "","","","",
     "","","","",
     "","","",""
     ]]
 
 a_features = [[
-    "","","USE_I2C","USE_SPI",
+    "USE_ENERGY_MARGIN_DETECTION","USE_LIGHT","USE_I2C","USE_SPI",
     "USE_DISCOVERY","USE_ARDUINO_OTA","USE_MQTT_TLS","USE_WEBSERVER",
     "WEBSERVER_ADVERTISE","USE_EMULATION_HUE","MQTT_PUBSUBCLIENT","MQTT_TASMOTAMQTT",
     "MQTT_ESPMQTTARDUINO","MQTT_HOST_DISCOVERY","USE_ARILUX_RF","USE_WS2812",
     "USE_WS2812_DMA","USE_IR_REMOTE","USE_IR_HVAC","USE_IR_RECEIVE",
     "USE_DOMOTICZ","USE_DISPLAY","USE_HOME_ASSISTANT","USE_SERIAL_BRIDGE",
     "USE_TIMERS","USE_SUNRISE","USE_TIMERS_WEB","USE_RULES",
-    "USE_KNX","USE_WPS","USE_SMARTCONFIG","MQTT_ARDUINOMQTT"
+    "USE_KNX","USE_WPS","USE_SMARTCONFIG","USE_ENERGY_POWER_LIMIT"
     ],[
     "USE_CONFIG_OVERRIDE","FIRMWARE_MINIMAL","FIRMWARE_SENSORS","FIRMWARE_CLASSIC",
     "FIRMWARE_KNX_NO_EMULATION","USE_DISPLAY_MODES1TO5","USE_DISPLAY_GRAPH","USE_DISPLAY_LCD",
     "USE_DISPLAY_SSD1306","USE_DISPLAY_MATRIX","USE_DISPLAY_ILI9341","USE_DISPLAY_EPAPER",
     "USE_DISPLAY_SH1106","USE_MP3_PLAYER","USE_PCA9685","USE_TUYA_DIMMER",
     "USE_RC_SWITCH","USE_ARMTRONIX_DIMMERS","USE_SM16716","USE_SCRIPT",
-    "USE_EMULATION_WEMO","","","NO_EXTRA_4K_HEAP",
+    "USE_EMULATION_WEMO","USE_SONOFF_IFAN","","NO_EXTRA_4K_HEAP",
     "VTABLES_IN_IRAM","VTABLES_IN_DRAM","VTABLES_IN_FLASH","PIO_FRAMEWORK_ARDUINO_LWIP_HIGHER_BANDWIDTH",
     "PIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY","PIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH","DEBUG_THEO","USE_DEBUG_DRIVER"
     ],[
-    "","USE_ADC_VCC","USE_ENERGY_SENSOR","USE_PZEM004T",
+    "USE_COUNTER","USE_ADC_VCC","USE_ENERGY_SENSOR","USE_PZEM004T",
     "USE_DS18B20","USE_DS18x20_LEGACY","USE_DS18x20","USE_DHT",
     "USE_SHT","USE_HTU","USE_BMP","USE_BME680",
     "USE_BH1750","USE_VEML6070","USE_ADS1115_I2CDEV","USE_ADS1115",
@@ -149,8 +156,8 @@ a_features = [[
     "USE_PZEM_DC","USE_TX20_WIND_SENSOR","USE_MGC3130","USE_RF_SENSOR",
     "USE_THEO_V2","USE_ALECTO_V2","USE_AZ7798","USE_MAX31855",
     "USE_PN532_I2C","USE_MAX44009","USE_SCD30","USE_HRE",
-    "USE_ADE7953","","","",
-    "","","",""]]
+    "USE_ADE7953","USE_SPS30","USE_VL53L0X","USE_MLX90614",
+    "USE_MAX31865","","",""]]
 
 usage = "usage: decode-status {-d | -f} arg"
 parser = OptionParser(usage)