Fix merge conflict due to branching from master instead of dev

CHANGELOG.md

@@ -3,6 +3,35 @@
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.12.6] 2018-05-02
+### Fixed
+- Check NTP_SUPPORT for sensors (thanks to @mcspr)
+- Fix AM2302 sensor
+- Fix hostname truncated to 20 chars when advertised to DHCP ([#774](https://github.com/xoseperez/espurna/issues/774))
+- Decouple Serial object from Terminal, Debug modules ([#787](https://github.com/xoseperez/espurna/issues/787))
+- Fix Arilux LC-01 definitions ([#797](https://github.com/xoseperez/espurna/issues/797))
+- Do not uppercase hostname in web interface ([#799](https://github.com/xoseperez/espurna/issues/799))
+- Ensure scheduler has access to all channels independently of the color mode ([#807](https://github.com/xoseperez/espurna/issues/807))
+
+### Added
+- Support for IteadStudio Sonoff S31 ([#497](https://github.com/xoseperez/espurna/issues/497))
+- Option to ignore daylight saving in scheduler ([#783](https://github.com/xoseperez/espurna/issues/783))
+- Report last energy reset datetime in web interface ([#784](https://github.com/xoseperez/espurna/issues/784))
+- Added captive portal in AP mode
+- Support for IR toggle mode (thanks to @darshkpatel)
+- Support for IteadStudio Sonoff POW R2 (thanks to @ColinShorts)
+- Support for Luani HVIO (thanks to @wildwiz)
+- Support for Zhilde ZLD-EU55-W power strip (thanks to @wildwiz)
+- Support for RFB_DIRECT Sonoff Bridge EFM8BB1 bypass hack (thanks to @wildwiz)
+- Support for SenseAir S8 CO2 sensor (thanks to @Yonsm)
+- Support for PMS5003T/ST sensors (thanks to @Yonsm)
+
+### Changed
+- Updated JustWifi Library
+- Some cleanup in the web interface
+- Refactored configuration files (thanks to @lobradov, @mcspr)
+- Changes pre-commit hook (thanks to @mcspr)
+
 ## [1.12.5] 2018-04-08
 ### Fixed
 - Fixed expected power calibration ([#676](https://github.com/xoseperez/espurna/issues/676))

README.md

@@ -3,7 +3,7 @@
 ESPurna ("spark" in Catalan) is a custom firmware for ESP8285/ESP8266 based smart switches, lights and sensors.
 It uses the Arduino Core for ESP8266 framework and a number of 3rd party libraries.
 
-[![version](https://img.shields.io/badge/version-1.12.6a-brightgreen.svg)](CHANGELOG.md)
+[![version](https://img.shields.io/badge/version-1.12.6-brightgreen.svg)](CHANGELOG.md)
 [![branch](https://img.shields.io/badge/branch-dev-orange.svg)](https://github.org/xoseperez/espurna/tree/dev/)
 [![travis](https://travis-ci.org/xoseperez/espurna.svg?branch=dev)](https://travis-ci.org/xoseperez/espurna)
 [![codacy](https://img.shields.io/codacy/grade/c9496e25cf07434cba786b462cb15f49/dev.svg)](https://www.codacy.com/app/xoseperez/espurna/dashboard)
@@ -63,6 +63,7 @@ It uses the Arduino Core for ESP8266 framework and a number of 3rd party librari
     * Multiple virtual switches (tested with up to 16)
     * MQTT-to-RF two-way bridge (no need to learn codes)
     * Support for [https://github.com/Portisch/RF-Bridge-EFM8BB1](https://github.com/Portisch/RF-Bridge-EFM8BB1) custom firmware
+    * Support for [direct control of the encoder/decoder bypassing the EFM8BB1](https://github.com/xoseperez/espurna/wiki/Hardware-Itead-Sonoff-RF-Bridge---Direct-Hack)
 * Support for [different **sensors**](Sensors)
     * Environment
         * **DHT11 / DHT22 / DHT21 / AM2301 / Itead's SI7021**
@@ -72,7 +73,8 @@ It uses the Arduino Core for ESP8266 framework and a number of 3rd party librari
         * **AM2320** temperature and humidity sensor over I2C
         * **Dallas OneWire sensors** like the DS18B20
         * **MHZ19** CO2 sensor
-        * **PMSX003** dust sensor
+        * **SenseAir S8** CO2 sensor
+        * **PMSX003/PMS5003T/ST** dust sensors
         * **BH1750** luminosity sensor
         * **GUVAS12SD** UV sensor
     * Power monitoring
@@ -243,7 +245,7 @@ Here is the list of supported hardware. For more information please refer to the
 |**Generic DHT11 v1.0**|**Generic DS18B20 v1.0**||
 
 **Other supported boards:**
-*TODO*
+IteadStudio Sonoff S31, IteadStudio Sonoff POW R2, Zhilde ZLD-EU55-W, Luani HVIO
 
 ## License
 

code/espurna/config/arduino.h

@@ -19,6 +19,7 @@
 //#define ITEAD_S20
 //#define ITEAD_SONOFF_TOUCH
 //#define ITEAD_SONOFF_POW
+//#define ITEAD_SONOFF_POW_R2
 //#define ITEAD_SONOFF_DUAL
 //#define ITEAD_SONOFF_DUAL_R2
 //#define ITEAD_SONOFF_4CH
@@ -78,6 +79,7 @@
 //#define GENERIC_ESP01S_DS18B20_V10
 //#define HELTEC_TOUCHRELAY
 //#define ZHILDE_EU44_W
+//#define LUANI_HVIO
 //#define ALLNET_ESP8266_UP
 
 //--------------------------------------------------------------------------------

code/espurna/config/hardware.h

@@ -379,6 +379,31 @@
     #define HLW8012_CF1_PIN     13
     #define HLW8012_CF_PIN      14
 
+#elif defined(ITEAD_SONOFF_POW_R2)
+
+    // Info
+    #define MANUFACTURER        "ITEAD"
+    #define DEVICE              "SONOFF_POW_R2"
+
+    // Buttons
+    #define BUTTON1_PIN         0
+    #define BUTTON1_MODE        BUTTON_PUSHBUTTON | BUTTON_DEFAULT_HIGH
+    #define BUTTON1_RELAY       1
+
+    // Relays
+    #define RELAY1_PIN          12
+    #define RELAY1_TYPE         RELAY_TYPE_NORMAL
+
+    // LEDs
+    #define LED1_PIN            15
+    #define LED1_PIN_INVERSE    0
+
+    // CSE7766
+    #ifndef CSE7766_SUPPORT
+    #define CSE7766_SUPPORT     1
+    #endif
+    #define CSE7766_PIN         1
+
 #elif defined(ITEAD_SONOFF_DUAL)
 
     // Info
@@ -2004,6 +2029,39 @@
     #define BUTTON2_MODE            BUTTON_PUSHBUTTON
 
 
+// -----------------------------------------------------------------------------
+// Luani HVIO
+// https://luani.de/projekte/esp8266-hvio/
+// https://luani.de/blog/esp8266-230v-io-modul/
+// -----------------------------------------------------------------------------
+
+#elif defined(LUANI_HVIO)
+
+    // Info
+    #define MANUFACTURER            "LUANI"
+    #define DEVICE                  "HVIO"
+
+    // Buttons
+    #define BUTTON1_PIN             12
+    #define BUTTON1_RELAY           1
+    #define BUTTON1_MODE            BUTTON_PUSHBUTTON | BUTTON_DEFAULT_HIGH
+    #define BUTTON1_DBLCLICK        BUTTON_MODE_NONE
+
+    #define BUTTON2_PIN             13
+    #define BUTTON2_RELAY           2
+    #define BUTTON2_MODE            BUTTON_PUSHBUTTON | BUTTON_DEFAULT_HIGH
+
+
+    // Relays
+    #define RELAY1_PIN              4
+    #define RELAY2_PIN              5
+    #define RELAY1_TYPE             RELAY_TYPE_NORMAL
+    #define RELAY2_TYPE             RELAY_TYPE_NORMAL
+
+    // LEDs
+    #define LED1_PIN                15
+    #define LED1_PIN_INVERSE        0
+
 // -----------------------------------------------------------------------------
 // TEST boards (do not use!!)
 // -----------------------------------------------------------------------------

code/espurna/config/version.h

@@ -1,5 +1,5 @@
 #define APP_NAME                "ESPURNA"
-#define APP_VERSION             "1.12.6a"
+#define APP_VERSION             "1.12.6"
 #define APP_REVISION            ""
 #define APP_AUTHOR              "xose.perez@gmail.com"
 #define APP_WEBSITE             "http://tinkerman.cat"

code/espurna/ir.ino

@@ -14,6 +14,7 @@ Copyright (C) 2017-2018 by François Déchery
 
 IRrecv * _ir_recv;
 decode_results _ir_results;
+unsigned long _ir_last_toggle = 0;
 
 // -----------------------------------------------------------------------------
 // PRIVATE
@@ -42,9 +43,17 @@ void _irProcessCode(unsigned long code) {
             if (button_mode == IR_BUTTON_MODE_STATE) {
                 relayStatus(0, button_value);
             }
+
             if (button_mode == IR_BUTTON_MODE_TOGGLE) {
-                relayToggle(button_value);
+
+                if (millis() - _ir_last_toggle > 250){
+                    relayToggle(button_value);
+                    _ir_last_toggle = millis();
+                } else {
+                    DEBUG_MSG_P(PSTR("[IR] Ignoring repeated code\n"));
+                }
             }
+
             #if LIGHT_PROVIDER != LIGHT_PROVIDER_NONE
 
                 if (button_mode == IR_BUTTON_MODE_BRIGHTER) {

code/espurna/migrate.ino

@@ -905,9 +905,34 @@ void migrate() {
             setSetting("relayType", 3, RELAY_TYPE_NORMAL);
             setSetting("relayType", 4, RELAY_TYPE_NORMAL);
 
-        #elif defined(ALLNET_ESP8266_UP)
+        #elif defined(ITEAD_SONOFF_POW_R2)
 
             setSetting("board", 71);
+            setSetting("ledGPIO", 0, 15);
+            setSetting("ledLogic", 0, 1);
+            setSetting("btnGPIO", 0, 0);
+            setSetting("btnRelay", 0, 0);
+            setSetting("relayGPIO", 0, 12);
+            setSetting("relayType", 0, RELAY_TYPE_NORMAL);
+            setSetting("selGPIO", 5);
+            setSetting("cf1GPIO", 13);
+            setSetting("cfGPIO", 14);
+
+        #elif defined(LUANI_HVIO)
+
+            setSetting("board", 72);
+            setSetting("ledGPIO", 0, 15);
+            setSetting("ledLogic", 0, 0);
+            setSetting("btnGPIO", 0, 12);
+            setSetting("btnRelay", 0, 0);
+            setSetting("relayGPIO", 0, 4);
+            setSetting("relayType", 0, RELAY_TYPE_NORMAL);
+            setSetting("relayGPIO", 1, 5);
+            setSetting("relayType", 1, RELAY_TYPE_NORMAL);
+
+        #elif defined(ALLNET_ESP8266_UP)
+
+            setSetting("board", 73);
             setSetting("relayGPIO", 0, 14);
             setSetting("relayResetGPIO", 1, 12);
             setSetting("relayType", 0, RELAY_TYPE_LATCHED);

code/platformio.ini

@@ -447,6 +447,31 @@ upload_flags = ${common.upload_flags}
 monitor_baud = 115200
 extra_scripts = ${common.extra_scripts}
 
+[env:itead-sonoff-pow-r2]
+platform = ${common.platform}
+framework = arduino
+board = esp01_1m
+board_flash_mode = dout
+lib_deps = ${common.lib_deps}
+lib_ignore = ${common.lib_ignore}
+build_flags = ${common.build_flags_1m} -DITEAD_SONOFF_POW_R2
+monitor_baud = 115200
+extra_scripts = ${common.extra_scripts}
+
+[env:itead-sonoff-pow-r2-ota]
+platform = ${common.platform}
+framework = arduino
+board = esp01_1m
+board_flash_mode = dout
+lib_deps = ${common.lib_deps}
+lib_ignore = ${common.lib_ignore}
+build_flags = ${common.build_flags_1m} -DITEAD_SONOFF_POW_R2
+upload_speed = 115200
+upload_port = ${common.upload_port}
+upload_flags = ${common.upload_flags}
+monitor_baud = 115200
+extra_scripts = ${common.extra_scripts}
+
 [env:itead-sonoff-dual]
 platform = ${common.platform}
 framework = arduino
@@ -738,8 +763,8 @@ lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DITEAD_SONOFF_RFBRIDGE -DRFB_DIRECT
 upload_speed = 115200
-upload_port = "192.168.4.1"
-upload_flags = --auth=fibonacci --port 8266
+upload_port = "${env.ESPURNA_IP}"
+upload_flags = --auth=${env.ESPURNA_AUTH} --port 8266
 monitor_baud = 19200
 extra_scripts = ${common.extra_scripts}
 
@@ -888,8 +913,8 @@ board_flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DITEAD_SONOFF_S31
-upload_port = "192.168.4.1"
-upload_flags = --auth=fibonacci --port 8266
+upload_port = "${env.ESPURNA_IP}"
+upload_flags = --auth=${env.ESPURNA_AUTH} --port 8266
 monitor_baud = 115200
 extra_scripts = ${common.extra_scripts}
 
@@ -1926,8 +1951,33 @@ lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DZHILDE_EU44_W
 upload_speed = 115200
-upload_port = "192.168.4.1"
-upload_flags = --auth=fibonacci --port 8266
+upload_port = "${env.ESPURNA_IP}"
+upload_flags = --auth=${env.ESPURNA_AUTH} --port 8266
+monitor_baud = 115200
+extra_scripts = ${common.extra_scripts}
+
+[env:luani-hvio]
+platform = ${common.platform}
+framework = arduino
+board = esp07
+board_flash_mode = dout
+lib_deps = ${common.lib_deps}
+lib_ignore = ${common.lib_ignore}
+build_flags = ${common.build_flags_1m} -DLUANI_HVIO
+monitor_baud = 115200
+extra_scripts = ${common.extra_scripts}
+
+[env:luani-hvio-ota]
+platform = ${common.platform}
+framework = arduino
+board = esp07
+board_flash_mode = dout
+lib_deps = ${common.lib_deps}
+lib_ignore = ${common.lib_ignore}
+build_flags = ${common.build_flags_1m} -DZLUANI_HVIO
+upload_speed = 115200
+upload_port = "${env.ESPURNA_IP}"
+upload_flags = --auth=${env.ESPURNA_AUTH} --port 8266
 monitor_baud = 115200
 extra_scripts = ${common.extra_scripts}