From 8023304dc88fd5105e38044019215b71c1a77533 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xose=20P=C3=A9rez?= Date: Fri, 22 Sep 2017 23:50:26 +0200 Subject: [PATCH 1/4] Beta version --- code/espurna/config/version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/espurna/config/version.h b/code/espurna/config/version.h index 5a81991c..c0350890 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.9.4" +#define APP_VERSION "1.9.5b" #define APP_AUTHOR "xose.perez@gmail.com" #define APP_WEBSITE "http://tinkerman.cat" From f226a874c318e134265aee4a5bbb1f0ef91a9145 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xose=20P=C3=A9rez?= Date: Thu, 28 Sep 2017 17:33:03 +0200 Subject: [PATCH 2/4] Revert to JustWifi 1.1.4 --- code/platformio.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/platformio.ini b/code/platformio.ini index 36607ec8..912b203b 100644 --- a/code/platformio.ini +++ b/code/platformio.ini @@ -23,7 +23,7 @@ lib_deps = DallasTemperature Brzo I2C EspSoftwareSerial - https://bitbucket.org/xoseperez/justwifi.git#1.1.5 + https://bitbucket.org/xoseperez/justwifi.git#1.1.4 https://bitbucket.org/xoseperez/hlw8012.git#1.0.1 https://bitbucket.org/xoseperez/fauxmoesp.git#2.2.0 https://bitbucket.org/xoseperez/nofuss.git#0.2.5 From d2e889cda2273797b5b7ae3c24bf34892d98b9ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xose=20P=C3=A9rez?= Date: Thu, 28 Sep 2017 17:33:15 +0200 Subject: [PATCH 3/4] Typo fixes --- code/espurna/config/general.h | 2 +- code/espurna/config/hardware.h | 2 +- code/espurna/mqtt.ino | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/code/espurna/config/general.h b/code/espurna/config/general.h index e0dc83dc..3c73e814 100644 --- a/code/espurna/config/general.h +++ b/code/espurna/config/general.h @@ -468,7 +468,7 @@ PROGMEM const char* const custom_reset_string[] = { // Available light providers (do not change) #define LIGHT_PROVIDER_NONE 0 -#define LIGHT_PROVIDER_MY9192 1 +#define LIGHT_PROVIDER_MY9192 1 // works with MY9231 also (Sonoff B1) #define LIGHT_PROVIDER_DIMMER 2 // LIGHT_PROVIDER_DIMMER can have from 1 to 5 different channels. diff --git a/code/espurna/config/hardware.h b/code/espurna/config/hardware.h index 25796d15..13193a6f 100644 --- a/code/espurna/config/hardware.h +++ b/code/espurna/config/hardware.h @@ -869,7 +869,7 @@ #define MANUFACTURER "GENERIC" #define DEVICE "ECH1560" - // V9261F + // ECH1560 #define POWER_PROVIDER POWER_PROVIDER_ECH1560 #define ECH1560_CLK_PIN 4 #define ECH1560_MISO_PIN 5 diff --git a/code/espurna/mqtt.ino b/code/espurna/mqtt.ino index 4b6424d1..8e1a1a78 100644 --- a/code/espurna/mqtt.ino +++ b/code/espurna/mqtt.ino @@ -469,6 +469,8 @@ void mqttConfigure() { } _mqtt_use_json = (getSetting("mqttUseJson", MQTT_USE_JSON).toInt() == 1); + _mqtt_reconnect_delay = MQTT_RECONNECT_DELAY_MIN; + } #if MDNS_SUPPORT From 1000d032aef7ca4e1f793803687e7a2a761deac3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xose=20P=C3=A9rez?= Date: Thu, 28 Sep 2017 18:11:50 +0200 Subject: [PATCH 4/4] Version 1.9.5 --- CHANGELOG.md | 4 ++++ README.md | 2 +- code/espurna/config/version.h | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a7703cd7..8daf1e43 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). +## [1.9.5] 2017-09-28 +### Fixed +- Revert to JustWifi 1.1.4 (#228) + ## [1.9.4] 2017-09-22 ### Added - Added ESPurna specific mDNS text registers (app_name, app_version, device_name) diff --git a/README.md b/README.md index 1893d1de..93a19566 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.9.4**, read the [changelog](https://bitbucket.org/xoseperez/espurna/src/master/CHANGELOG.md). +> **Current Release Version is 1.9.5**, read the [changelog](https://bitbucket.org/xoseperez/espurna/src/master/CHANGELOG.md). > **NOTICE**: Default flash layout changed in 1.8.3, as an unpredicted consequence devices will not be able to persist/retrieve configuration if flashed with 1.8.3 via **OTA** from **PlatformIO**. Please check issue #187. diff --git a/code/espurna/config/version.h b/code/espurna/config/version.h index c0350890..59903d2e 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.9.5b" +#define APP_VERSION "1.9.5" #define APP_AUTHOR "xose.perez@gmail.com" #define APP_WEBSITE "http://tinkerman.cat"