From f4f40395991b7e4c76ebedcfa36af4c08d5f1cb7 Mon Sep 17 00:00:00 2001 From: arendst Date: Mon, 8 Jan 2018 11:44:18 +0100 Subject: [PATCH] v5.11.1a Align with master --- README.md | 2 +- sonoff/_releasenotes.ino | 5 ++++- sonoff/i18n.h | 2 +- sonoff/language/de-DE.h | 3 ++- sonoff/language/en-GB.h | 3 ++- sonoff/language/it-IT.h | 3 ++- sonoff/language/nl-NL.h | 3 ++- sonoff/language/pl-PL.h | 3 ++- sonoff/sonoff.ino | 4 ++-- sonoff/{xsns_03_energy.ino => xdrv_03_energy.ino} | 2 +- 10 files changed, 19 insertions(+), 11 deletions(-) rename sonoff/{xsns_03_energy.ino => xdrv_03_energy.ino} (99%) diff --git a/README.md b/README.md index bd7844b9e..77598acc2 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ ## Sonoff-Tasmota Provide ESP8266 based Sonoff by [iTead Studio](https://www.itead.cc/) and ElectroDragon IoT Relay with Serial, Web and MQTT control allowing 'Over the Air' or OTA firmware updates using Arduino IDE. -Current version is **5.11.0a** - See [sonoff/_releasenotes.ino](https://github.com/arendst/Sonoff-Tasmota/blob/development/sonoff/_releasenotes.ino) for change information. +Current version is **5.11.1a** - See [sonoff/_releasenotes.ino](https://github.com/arendst/Sonoff-Tasmota/blob/development/sonoff/_releasenotes.ino) for change information. ### ATTENTION All versions diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino index aa3373ee6..b3d95b182 100644 --- a/sonoff/_releasenotes.ino +++ b/sonoff/_releasenotes.ino @@ -1,4 +1,7 @@ -/* 5.11.0a +/* 5.11.1a + * + * 5.11.1 20180107 + * Fix Sonoff Pow command handling (#1542) * * 5.11.0 20180107 * Minor webpage HTML optimizations (#1358) diff --git a/sonoff/i18n.h b/sonoff/i18n.h index c0f3b0c91..4508c3764 100644 --- a/sonoff/i18n.h +++ b/sonoff/i18n.h @@ -256,7 +256,7 @@ #define D_CMND_IRSEND "IRSend" #define D_CMND_IRHVAC "IRHVAC" -// Commands xsns_03_energy.ino +// Commands xdrv_03_energy.ino #define D_CMND_POWERLOW "PowerLow" #define D_CMND_POWERHIGH "PowerHigh" #define D_CMND_VOLTAGELOW "VoltageLow" diff --git a/sonoff/language/de-DE.h b/sonoff/language/de-DE.h index 0f5ef8142..9165dd8d7 100644 --- a/sonoff/language/de-DE.h +++ b/sonoff/language/de-DE.h @@ -364,7 +364,7 @@ #define D_DOMOTICZ_AIRQUALITY "AirQuality" #define D_DOMOTICZ_UPDATE_TIMER "Update timer" -// xsns_03_energy.ino +// xdrv_03_energy.ino #define D_ENERGY_TODAY "Energie heute" #define D_ENERGY_YESTERDAY "Energie gestern" #define D_ENERGY_TOTAL "Energie insgesamt" @@ -412,6 +412,7 @@ #define D_SENSOR_SPI_CS "SPI CS" #define D_SENSOR_SPI_DC "SPI DC" #define D_SENSOR_BACKLIGHT "BkLight" +#define D_SENSOR_PMS5003 "PMS5003" // Units #define D_UNIT_AMPERE "A" diff --git a/sonoff/language/en-GB.h b/sonoff/language/en-GB.h index 9d34546d7..feb3b5bdf 100644 --- a/sonoff/language/en-GB.h +++ b/sonoff/language/en-GB.h @@ -364,7 +364,7 @@ #define D_DOMOTICZ_AIRQUALITY "AirQuality" #define D_DOMOTICZ_UPDATE_TIMER "Update timer" -// xsns_03_energy.ino +// xdrv_03_energy.ino #define D_ENERGY_TODAY "Energy Today" #define D_ENERGY_YESTERDAY "Energy Yesterday" #define D_ENERGY_TOTAL "Energy Total" @@ -412,6 +412,7 @@ #define D_SENSOR_SPI_CS "SPI CS" #define D_SENSOR_SPI_DC "SPI DC" #define D_SENSOR_BACKLIGHT "BkLight" +#define D_SENSOR_PMS5003 "PMS5003" // Units #define D_UNIT_AMPERE "A" diff --git a/sonoff/language/it-IT.h b/sonoff/language/it-IT.h index 015443f37..942ba81ff 100644 --- a/sonoff/language/it-IT.h +++ b/sonoff/language/it-IT.h @@ -364,7 +364,7 @@ #define D_DOMOTICZ_AIRQUALITY "AirQuality" #define D_DOMOTICZ_UPDATE_TIMER "Intervallo di aggiornamento" -// xsns_03_energy.ino +// xdrv_03_energy.ino #define D_ENERGY_TODAY "Energia Oggi" #define D_ENERGY_YESTERDAY "Energia Ieri" #define D_ENERGY_TOTAL "Energia Totale" @@ -412,6 +412,7 @@ #define D_SENSOR_SPI_CS "SPI CS" #define D_SENSOR_SPI_DC "SPI DC" #define D_SENSOR_BACKLIGHT "BkLight" +#define D_SENSOR_PMS5003 "PMS5003" // Units #define D_UNIT_AMPERE "A" diff --git a/sonoff/language/nl-NL.h b/sonoff/language/nl-NL.h index 3de82d460..ad2feece8 100644 --- a/sonoff/language/nl-NL.h +++ b/sonoff/language/nl-NL.h @@ -364,7 +364,7 @@ #define D_DOMOTICZ_AIRQUALITY "AirQuality" #define D_DOMOTICZ_UPDATE_TIMER "Bijwerk timer" -// xsns_03_energy.ino +// xdrv_03_energy.ino #define D_ENERGY_TODAY "Verbruik vandaag" #define D_ENERGY_YESTERDAY "Verbruik gisteren" #define D_ENERGY_TOTAL "Verbruik totaal" @@ -412,6 +412,7 @@ #define D_SENSOR_SPI_CS "SPI CS" #define D_SENSOR_SPI_DC "SPI DC" #define D_SENSOR_BACKLIGHT "BkLight" +#define D_SENSOR_PMS5003 "PMS5003" // Units #define D_UNIT_AMPERE "A" diff --git a/sonoff/language/pl-PL.h b/sonoff/language/pl-PL.h index b77d381bc..f3a743cb1 100644 --- a/sonoff/language/pl-PL.h +++ b/sonoff/language/pl-PL.h @@ -364,7 +364,7 @@ #define D_DOMOTICZ_AIRQUALITY "AirQuality" #define D_DOMOTICZ_UPDATE_TIMER "Zaktualizuj czasomierz" -// xsns_03_energy.ino +// xdrv_03_energy.ino #define D_ENERGY_TODAY "Energia Dzisiaj" #define D_ENERGY_YESTERDAY "Energia Wczoraj" #define D_ENERGY_TOTAL "Energia suma" @@ -412,6 +412,7 @@ #define D_SENSOR_SPI_CS "SPI CS" #define D_SENSOR_SPI_DC "SPI DC" #define D_SENSOR_BACKLIGHT "BkLight" +#define D_SENSOR_PMS5003 "PMS5003" // Units #define D_UNIT_AMPERE "A" diff --git a/sonoff/sonoff.ino b/sonoff/sonoff.ino index 27b008ab1..dd1b3b0b2 100644 --- a/sonoff/sonoff.ino +++ b/sonoff/sonoff.ino @@ -25,8 +25,8 @@ - Select IDE Tools - Flash Size: "1M (no SPIFFS)" ====================================================*/ -#define VERSION 0x050B0001 -#define VERSION_STRING "5.11.0a" // Would be great to have a macro that fills this from VERSION ... +#define VERSION 0x050B0101 +#define VERSION_STRING "5.11.1a" // Would be great to have a macro that fills this from VERSION ... // Location specific includes #include "sonoff.h" // Enumaration used in user_config.h diff --git a/sonoff/xsns_03_energy.ino b/sonoff/xdrv_03_energy.ino similarity index 99% rename from sonoff/xsns_03_energy.ino rename to sonoff/xdrv_03_energy.ino index e0e7db308..3c06db271 100644 --- a/sonoff/xsns_03_energy.ino +++ b/sonoff/xdrv_03_energy.ino @@ -1,5 +1,5 @@ /* - xsns_03_energy.ino - HLW8012 (Sonoff Pow) and PZEM004T energy sensor support for Sonoff-Tasmota + xdrv_03_energy.ino - HLW8012 (Sonoff Pow) and PZEM004T energy sensor support for Sonoff-Tasmota Copyright (C) 2018 Theo Arends