From 03ae4098b590e1ed508d698f320a3830a92399a6 Mon Sep 17 00:00:00 2001
From: Theo Arends <mhtarends@gmail.com>
Date: Fri, 29 Jun 2018 13:48:19 +0200
Subject: [PATCH] Add support for Sonoff S26 Smart Socket

Add support for Sonoff S26 Smart Socket (#2808)
---
 README.md                |  3 ++-
 sonoff/_releasenotes.ino |  1 +
 sonoff/sonoff_template.h | 10 +++++-----
 tools/decode-status.py   |  4 ++--
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 2bf2f1b0f..ff5825586 100644
--- a/README.md
+++ b/README.md
@@ -52,8 +52,9 @@ The following devices are supported:
 - [iTead Sonoff Pow R2 with Energy Monitoring](https://www.itead.cc/sonoff-pow-r2.html)
 - [iTead Sonoff 4CH (R2)](https://www.itead.cc/smart-home/sonoff-4ch.html)
 - [iTead Sonoff 4CH Pro (R2)](https://www.itead.cc/smart-home/sonoff-4ch-pro.html)
-- [iTead S20 Smart Socket](https://www.itead.cc/smart-socket.html)
+- [iTead Sonoff S20 Smart Socket](https://www.itead.cc/smart-socket.html)
 - [Sonoff S22 Smart Socket](https://github.com/arendst/Sonoff-Tasmota/issues/627)
+- [iTead Sonoff S26 Smart Socket](https://www.itead.cc/sonoff-s26-wifi-smart-plug.html)
 - [iTead Sonoff S31 Smart Socket with Energy Monitoring](https://www.itead.cc/sonoff-s31.html)
 - [iTead Slampher](https://www.itead.cc/slampher.html)
 - [iTead Sonoff Touch](https://www.itead.cc/sonoff-touch.html)
diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino
index d28b6cf9a..33310253c 100644
--- a/sonoff/_releasenotes.ino
+++ b/sonoff/_releasenotes.ino
@@ -1,4 +1,5 @@
 /* 6.0.0b
+ * Add support for Sonoff S26 Smart Socket (#2808)
  * Add command SetOption30 to enforce Hass discovery as light group (#1784)
  * Add decimal values support for commands ADD, SUB, MULT and SCALE (#3083, #3089)
  * Add experimental (untested) TM1638 switch support (#2226)
diff --git a/sonoff/sonoff_template.h b/sonoff/sonoff_template.h
index 38fadf086..9583bc6d4 100644
--- a/sonoff/sonoff_template.h
+++ b/sonoff/sonoff_template.h
@@ -163,7 +163,7 @@ enum SupportedModules {
   SONOFF_DUAL,
   SONOFF_POW,
   SONOFF_4CH,
-  S20,
+  SONOFF_S2X,
   SLAMPHER,
   SONOFF_TOUCH,
   SONOFF_LED,
@@ -229,7 +229,7 @@ const uint8_t kNiceList[MAXMODULE] PROGMEM = {
   SONOFF_4CHPRO,
   SONOFF_SV,
   SONOFF_DEV,
-  S20,
+  SONOFF_S2X,
   SLAMPHER,
   SONOFF_TOUCH,
   SONOFF_T11,
@@ -365,15 +365,15 @@ const mytmplt kModules[MAXMODULE] PROGMEM = {
      GPIO_REL4,        // GPIO15 Red Led and Relay 4 (0 = Off, 1 = On)
      0, 0
   },
-  { "S20 Socket",      // S20 Smart Socket (ESP8266)
+  { "Sonoff S2X",      // Sonoff S20, S22 and S26 Smart Socket (ESP8266)
      GPIO_KEY1,        // GPIO00 Button
      GPIO_USER,        // GPIO01 Serial RXD and Optional sensor
-     0,
+     GPIO_USER,        // GPIO02 Optional sensor
      GPIO_USER,        // GPIO03 Serial TXD and Optional sensor
      0, 0,
      0, 0, 0, 0, 0, 0, // Flash connection
      GPIO_REL1,        // GPIO12 Red Led and Relay (0 = Off, 1 = On)
-     GPIO_LED1_INV,    // GPIO13 Green Led (0 = On, 1 = Off)
+     GPIO_LED1_INV,    // GPIO13 Green/Blue Led (0 = On, 1 = Off)
      0, 0, 0, 0
   },
   { "Slampher",        // Slampher (ESP8266)
diff --git a/tools/decode-status.py b/tools/decode-status.py
index 65d688f3e..0e3ae1bd0 100644
--- a/tools/decode-status.py
+++ b/tools/decode-status.py
@@ -72,8 +72,8 @@ a_setoption = [
     "Do not control Power with Dimmer",
     "Energy monitoring while powered off",
     "MQTT serial",
-    "Rules",
-    "Rules once mode",
+    "Rules until 5.14.0b",
+    "Rules once mode until 5.14.0b",
     "KNX",
     "Use Power device index on single relay devices",
     "KNX enhancement",