Browse Source

Merge commit '1000d032aef7ca4e1f793803687e7a2a761deac3' into ir_hsv

fastled
soif 7 years ago
parent
commit
294840a06c
7 changed files with 11 additions and 5 deletions
  1. +4
    -0
      CHANGELOG.md
  2. +1
    -1
      README.md
  3. +1
    -1
      code/espurna/config/general.h
  4. +1
    -1
      code/espurna/config/hardware.h
  5. +1
    -1
      code/espurna/config/version.h
  6. +2
    -0
      code/espurna/mqtt.ino
  7. +1
    -1
      code/platformio.ini

+ 4
- 0
CHANGELOG.md View File

@ -3,6 +3,10 @@
The format is based on [Keep a Changelog](http://keepachangelog.com/) The format is based on [Keep a Changelog](http://keepachangelog.com/)
and this project adheres to [Semantic Versioning](http://semver.org/). 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 ## [1.9.4] 2017-09-22
### Added ### Added
- Added ESPurna specific mDNS text registers (app_name, app_version, device_name) - Added ESPurna specific mDNS text registers (app_name, app_version, device_name)


+ 1
- 1
README.md View File

@ -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 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. 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. > **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.


+ 1
- 1
code/espurna/config/general.h View File

@ -468,7 +468,7 @@ PROGMEM const char* const custom_reset_string[] = {
// Available light providers (do not change) // Available light providers (do not change)
#define LIGHT_PROVIDER_NONE 0 #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 #define LIGHT_PROVIDER_DIMMER 2
// LIGHT_PROVIDER_DIMMER can have from 1 to 5 different channels. // LIGHT_PROVIDER_DIMMER can have from 1 to 5 different channels.


+ 1
- 1
code/espurna/config/hardware.h View File

@ -898,7 +898,7 @@
#define MANUFACTURER "GENERIC" #define MANUFACTURER "GENERIC"
#define DEVICE "ECH1560" #define DEVICE "ECH1560"
// V9261F
// ECH1560
#define POWER_PROVIDER POWER_PROVIDER_ECH1560 #define POWER_PROVIDER POWER_PROVIDER_ECH1560
#define ECH1560_CLK_PIN 4 #define ECH1560_CLK_PIN 4
#define ECH1560_MISO_PIN 5 #define ECH1560_MISO_PIN 5


+ 1
- 1
code/espurna/config/version.h View File

@ -1,4 +1,4 @@
#define APP_NAME "ESPURNA" #define APP_NAME "ESPURNA"
#define APP_VERSION "1.9.4"
#define APP_VERSION "1.9.5"
#define APP_AUTHOR "xose.perez@gmail.com" #define APP_AUTHOR "xose.perez@gmail.com"
#define APP_WEBSITE "http://tinkerman.cat" #define APP_WEBSITE "http://tinkerman.cat"

+ 2
- 0
code/espurna/mqtt.ino View File

@ -469,6 +469,8 @@ void mqttConfigure() {
} }
_mqtt_use_json = (getSetting("mqttUseJson", MQTT_USE_JSON).toInt() == 1); _mqtt_use_json = (getSetting("mqttUseJson", MQTT_USE_JSON).toInt() == 1);
_mqtt_reconnect_delay = MQTT_RECONNECT_DELAY_MIN;
} }
#if MDNS_SUPPORT #if MDNS_SUPPORT


+ 1
- 1
code/platformio.ini View File

@ -23,7 +23,7 @@ lib_deps =
DallasTemperature DallasTemperature
Brzo I2C Brzo I2C
EspSoftwareSerial 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/hlw8012.git#1.0.1
https://bitbucket.org/xoseperez/fauxmoesp.git#2.2.0 https://bitbucket.org/xoseperez/fauxmoesp.git#2.2.0
https://bitbucket.org/xoseperez/nofuss.git#0.2.5 https://bitbucket.org/xoseperez/nofuss.git#0.2.5


Loading…
Cancel
Save