From ff813268465f21ea938db1e36ad45df376378671 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xose=20P=C3=A9rez?= Date: Wed, 11 Jan 2017 14:29:05 +0100 Subject: [PATCH] Version and year bump --- CHANGELOG.md | 7 +++++++ README.md | 4 ++-- code/espurna/button.ino | 2 +- code/espurna/config/version.h | 2 +- code/espurna/dht.ino | 2 +- code/espurna/domoticz.ino | 2 +- code/espurna/ds18b20.ino | 2 +- code/espurna/emon.ino | 2 +- code/espurna/espurna.ino | 2 +- code/espurna/fauxmo.ino | 2 +- code/espurna/led.ino | 2 +- code/espurna/mqtt.ino | 2 +- code/espurna/nofuss.ino | 2 +- code/espurna/ntp.ino | 2 +- code/espurna/ota.ino | 2 +- code/espurna/pow.ino | 2 +- code/espurna/relay.ino | 2 +- code/espurna/rf.ino | 2 +- code/espurna/settings.ino | 2 +- code/espurna/web.ino | 2 +- code/espurna/wifi.ino | 2 +- 21 files changed, 28 insertions(+), 21 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b41f4a4d..5772eb7c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,14 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). +## [1.4.3] 2017-01-11 +### Fixed +- #6 Using forked Time library to prevent conflict with Arduino Core for ESP8266 time.h file in windows machines + ## [1.4.2] 2017-01-09 +### Added +- Support for inverse logic relays + ### Fixed - Fixed error in relay identification from MQTT messages (issue #31) diff --git a/README.md b/README.md index 4a9031c3..800d00d3 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ ESPurna ("spark" in Catalan) is a custom firmware for ESP8266 based smart switch It was originally developed with the **[IteadStudio Sonoff](https://www.itead.cc/sonoff-wifi-wireless-switch.html)** in mind but now it supports a growing number of ESP8266-based boards. It uses the Arduino Core for ESP8266 framework and a number of 3rd party libraries. -**Current Release Version is 1.4.2**, read the [changelog](CHANGELOG.md). +**Current Release Version is 1.4.3**, read the [changelog](CHANGELOG.md). ## Features @@ -48,7 +48,7 @@ For more information please refer to the [ESPurna Wiki](https://bitbucket.org/xo ## License -Copyright (C) 2016 by Xose Pérez (@xoseperez) +Copyright (C) 2016-2017 by Xose Pérez (@xoseperez) This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/code/espurna/button.ino b/code/espurna/button.ino index baaaca41..5edc3b99 100644 --- a/code/espurna/button.ino +++ b/code/espurna/button.ino @@ -3,7 +3,7 @@ ESPurna BUTTON MODULE -Copyright (C) 2016 by Xose Pérez +Copyright (C) 2016-2017 by Xose Pérez */ diff --git a/code/espurna/config/version.h b/code/espurna/config/version.h index 448d7a24..d380d7b4 100644 --- a/code/espurna/config/version.h +++ b/code/espurna/config/version.h @@ -1,4 +1,4 @@ #define APP_NAME "ESPurna" -#define APP_VERSION "1.4.2" +#define APP_VERSION "1.4.3" #define APP_AUTHOR "xose.perez@gmail.com" #define APP_WEBSITE "http://tinkerman.cat" diff --git a/code/espurna/dht.ino b/code/espurna/dht.ino index 4da26661..a556ae52 100644 --- a/code/espurna/dht.ino +++ b/code/espurna/dht.ino @@ -3,7 +3,7 @@ ESPurna DHT MODULE -Copyright (C) 2016 by Xose Pérez +Copyright (C) 2016-2017 by Xose Pérez */ diff --git a/code/espurna/domoticz.ino b/code/espurna/domoticz.ino index be9b4e59..0a5f0188 100644 --- a/code/espurna/domoticz.ino +++ b/code/espurna/domoticz.ino @@ -3,7 +3,7 @@ ESPurna DOMOTICZ MODULE -Copyright (C) 2016 by Xose Pérez +Copyright (C) 2016-2017 by Xose Pérez */ diff --git a/code/espurna/ds18b20.ino b/code/espurna/ds18b20.ino index 7ea03cf1..6c3cb311 100644 --- a/code/espurna/ds18b20.ino +++ b/code/espurna/ds18b20.ino @@ -3,7 +3,7 @@ ESPurna SD18B20 MODULE -Copyright (C) 2016 by Xose Pérez +Copyright (C) 2016-2017 by Xose Pérez */ diff --git a/code/espurna/emon.ino b/code/espurna/emon.ino index 7bb21e20..8ffe46df 100644 --- a/code/espurna/emon.ino +++ b/code/espurna/emon.ino @@ -3,7 +3,7 @@ ESPurna EMON MODULE -Copyright (C) 2016 by Xose Pérez +Copyright (C) 2016-2017 by Xose Pérez */ diff --git a/code/espurna/espurna.ino b/code/espurna/espurna.ino index e91a6d30..0031b9dc 100644 --- a/code/espurna/espurna.ino +++ b/code/espurna/espurna.ino @@ -1,7 +1,7 @@ /* ESPurna -Copyright (C) 2016 by Xose Pérez +Copyright (C) 2016-2017 by Xose Pérez This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/code/espurna/fauxmo.ino b/code/espurna/fauxmo.ino index 939f1e94..531dc3e0 100644 --- a/code/espurna/fauxmo.ino +++ b/code/espurna/fauxmo.ino @@ -3,7 +3,7 @@ ESPurna DHT MODULE -Copyright (C) 2016 by Xose Pérez +Copyright (C) 2016-2017 by Xose Pérez */ diff --git a/code/espurna/led.ino b/code/espurna/led.ino index 24d14ed8..b4549dfc 100644 --- a/code/espurna/led.ino +++ b/code/espurna/led.ino @@ -3,7 +3,7 @@ ESPurna LED MODULE -Copyright (C) 2016 by Xose Pérez +Copyright (C) 2016-2017 by Xose Pérez */ diff --git a/code/espurna/mqtt.ino b/code/espurna/mqtt.ino index d47d5f58..dd07cf88 100644 --- a/code/espurna/mqtt.ino +++ b/code/espurna/mqtt.ino @@ -3,7 +3,7 @@ ESPurna MQTT MODULE -Copyright (C) 2016 by Xose Pérez +Copyright (C) 2016-2017 by Xose Pérez */ diff --git a/code/espurna/nofuss.ino b/code/espurna/nofuss.ino index 35b1e20e..aa9ca360 100644 --- a/code/espurna/nofuss.ino +++ b/code/espurna/nofuss.ino @@ -3,7 +3,7 @@ ESPurna NOFUSS MODULE -Copyright (C) 2016 by Xose Pérez +Copyright (C) 2016-2017 by Xose Pérez */ diff --git a/code/espurna/ntp.ino b/code/espurna/ntp.ino index 7b6c158d..97839bb9 100644 --- a/code/espurna/ntp.ino +++ b/code/espurna/ntp.ino @@ -3,7 +3,7 @@ ESPURNA NTP MODULE -Copyright (C) 2016 by Xose Pérez +Copyright (C) 2016-2017 by Xose Pérez */ diff --git a/code/espurna/ota.ino b/code/espurna/ota.ino index 56048e0c..1ba8dd4a 100644 --- a/code/espurna/ota.ino +++ b/code/espurna/ota.ino @@ -3,7 +3,7 @@ ESPurna OTA MODULE -Copyright (C) 2016 by Xose Pérez +Copyright (C) 2016-2017 by Xose Pérez */ diff --git a/code/espurna/pow.ino b/code/espurna/pow.ino index bf820296..8aa5a4ea 100644 --- a/code/espurna/pow.ino +++ b/code/espurna/pow.ino @@ -4,7 +4,7 @@ ESPurna POW MODULE Support for Sonoff POW HLW8012-based power monitor -Copyright (C) 2016 by Xose Pérez +Copyright (C) 2016-2017 by Xose Pérez */ diff --git a/code/espurna/relay.ino b/code/espurna/relay.ino index ebe4d2ed..f2839447 100644 --- a/code/espurna/relay.ino +++ b/code/espurna/relay.ino @@ -3,7 +3,7 @@ ESPurna RELAY MODULE -Copyright (C) 2016 by Xose Pérez +Copyright (C) 2016-2017 by Xose Pérez */ diff --git a/code/espurna/rf.ino b/code/espurna/rf.ino index 817c0a8e..fc32697d 100644 --- a/code/espurna/rf.ino +++ b/code/espurna/rf.ino @@ -3,7 +3,7 @@ ESPurna RF MODULE -Copyright (C) 2016 by Xose Pérez +Copyright (C) 2016-2017 by Xose Pérez */ diff --git a/code/espurna/settings.ino b/code/espurna/settings.ino index b5093d72..7c643dd2 100644 --- a/code/espurna/settings.ino +++ b/code/espurna/settings.ino @@ -3,7 +3,7 @@ ESPurna SETTINGS MODULE -Copyright (C) 2016 by Xose Pérez +Copyright (C) 2016-2017 by Xose Pérez */ diff --git a/code/espurna/web.ino b/code/espurna/web.ino index ed9c29ea..c24dd109 100644 --- a/code/espurna/web.ino +++ b/code/espurna/web.ino @@ -3,7 +3,7 @@ ESPurna WEBSERVER MODULE -Copyright (C) 2016 by Xose Pérez +Copyright (C) 2016-2017 by Xose Pérez */ diff --git a/code/espurna/wifi.ino b/code/espurna/wifi.ino index 22ec197a..e7b78193 100644 --- a/code/espurna/wifi.ino +++ b/code/espurna/wifi.ino @@ -3,7 +3,7 @@ ESPurna WIFI MODULE -Copyright (C) 2016 by Xose Pérez +Copyright (C) 2016-2017 by Xose Pérez */