mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

v5.11.1a 

Align with master
This commit is contained in:
arendst 2018-01-08 11:44:18 +01:00
parent 13c45d2b9a
commit f4f4039599
10 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -1,7 +1,7 @@
## Sonoff-Tasmota ## 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. 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 ### ATTENTION All versions

5
sonoff/_releasenotes.ino
View File

@ -1,4 +1,7 @@
/* 5.11.0a /* 5.11.1a
*
* 5.11.1 20180107
* Fix Sonoff Pow command handling (#1542)
* *
* 5.11.0 20180107 * 5.11.0 20180107
* Minor webpage HTML optimizations (#1358) * Minor webpage HTML optimizations (#1358)

2
sonoff/i18n.h
View File

@ -256,7 +256,7 @@
#define D_CMND_IRSEND "IRSend" #define D_CMND_IRSEND "IRSend"
#define D_CMND_IRHVAC "IRHVAC" #define D_CMND_IRHVAC "IRHVAC"
// Commands xsns_03_energy.ino // Commands xdrv_03_energy.ino
#define D_CMND_POWERLOW "PowerLow" #define D_CMND_POWERLOW "PowerLow"
#define D_CMND_POWERHIGH "PowerHigh" #define D_CMND_POWERHIGH "PowerHigh"
#define D_CMND_VOLTAGELOW "VoltageLow" #define D_CMND_VOLTAGELOW "VoltageLow"

3
sonoff/language/de-DE.h
View File

@ -364,7 +364,7 @@
#define D_DOMOTICZ_AIRQUALITY "AirQuality" #define D_DOMOTICZ_AIRQUALITY "AirQuality"
#define D_DOMOTICZ_UPDATE_TIMER "Update timer" #define D_DOMOTICZ_UPDATE_TIMER "Update timer"
// xsns_03_energy.ino // xdrv_03_energy.ino
#define D_ENERGY_TODAY "Energie heute" #define D_ENERGY_TODAY "Energie heute"
#define D_ENERGY_YESTERDAY "Energie gestern" #define D_ENERGY_YESTERDAY "Energie gestern"
#define D_ENERGY_TOTAL "Energie insgesamt" #define D_ENERGY_TOTAL "Energie insgesamt"
@ -412,6 +412,7 @@
#define D_SENSOR_SPI_CS "SPI CS" #define D_SENSOR_SPI_CS "SPI CS"
#define D_SENSOR_SPI_DC "SPI DC" #define D_SENSOR_SPI_DC "SPI DC"
#define D_SENSOR_BACKLIGHT "BkLight" #define D_SENSOR_BACKLIGHT "BkLight"
#define D_SENSOR_PMS5003 "PMS5003"
// Units // Units
#define D_UNIT_AMPERE "A" #define D_UNIT_AMPERE "A"

3
sonoff/language/en-GB.h
View File

@ -364,7 +364,7 @@
#define D_DOMOTICZ_AIRQUALITY "AirQuality" #define D_DOMOTICZ_AIRQUALITY "AirQuality"
#define D_DOMOTICZ_UPDATE_TIMER "Update timer" #define D_DOMOTICZ_UPDATE_TIMER "Update timer"
// xsns_03_energy.ino // xdrv_03_energy.ino
#define D_ENERGY_TODAY "Energy Today" #define D_ENERGY_TODAY "Energy Today"
#define D_ENERGY_YESTERDAY "Energy Yesterday" #define D_ENERGY_YESTERDAY "Energy Yesterday"
#define D_ENERGY_TOTAL "Energy Total" #define D_ENERGY_TOTAL "Energy Total"
@ -412,6 +412,7 @@
#define D_SENSOR_SPI_CS "SPI CS" #define D_SENSOR_SPI_CS "SPI CS"
#define D_SENSOR_SPI_DC "SPI DC" #define D_SENSOR_SPI_DC "SPI DC"
#define D_SENSOR_BACKLIGHT "BkLight" #define D_SENSOR_BACKLIGHT "BkLight"
#define D_SENSOR_PMS5003 "PMS5003"
// Units // Units
#define D_UNIT_AMPERE "A" #define D_UNIT_AMPERE "A"

3
sonoff/language/it-IT.h
View File

@ -364,7 +364,7 @@
#define D_DOMOTICZ_AIRQUALITY "AirQuality" #define D_DOMOTICZ_AIRQUALITY "AirQuality"
#define D_DOMOTICZ_UPDATE_TIMER "Intervallo di aggiornamento" #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_TODAY "Energia Oggi"
#define D_ENERGY_YESTERDAY "Energia Ieri" #define D_ENERGY_YESTERDAY "Energia Ieri"
#define D_ENERGY_TOTAL "Energia Totale" #define D_ENERGY_TOTAL "Energia Totale"
@ -412,6 +412,7 @@
#define D_SENSOR_SPI_CS "SPI CS" #define D_SENSOR_SPI_CS "SPI CS"
#define D_SENSOR_SPI_DC "SPI DC" #define D_SENSOR_SPI_DC "SPI DC"
#define D_SENSOR_BACKLIGHT "BkLight" #define D_SENSOR_BACKLIGHT "BkLight"
#define D_SENSOR_PMS5003 "PMS5003"
// Units // Units
#define D_UNIT_AMPERE "A" #define D_UNIT_AMPERE "A"

3
sonoff/language/nl-NL.h
View File

@ -364,7 +364,7 @@
#define D_DOMOTICZ_AIRQUALITY "AirQuality" #define D_DOMOTICZ_AIRQUALITY "AirQuality"
#define D_DOMOTICZ_UPDATE_TIMER "Bijwerk timer" #define D_DOMOTICZ_UPDATE_TIMER "Bijwerk timer"
// xsns_03_energy.ino // xdrv_03_energy.ino
#define D_ENERGY_TODAY "Verbruik vandaag" #define D_ENERGY_TODAY "Verbruik vandaag"
#define D_ENERGY_YESTERDAY "Verbruik gisteren" #define D_ENERGY_YESTERDAY "Verbruik gisteren"
#define D_ENERGY_TOTAL "Verbruik totaal" #define D_ENERGY_TOTAL "Verbruik totaal"
@ -412,6 +412,7 @@
#define D_SENSOR_SPI_CS "SPI CS" #define D_SENSOR_SPI_CS "SPI CS"
#define D_SENSOR_SPI_DC "SPI DC" #define D_SENSOR_SPI_DC "SPI DC"
#define D_SENSOR_BACKLIGHT "BkLight" #define D_SENSOR_BACKLIGHT "BkLight"
#define D_SENSOR_PMS5003 "PMS5003"
// Units // Units
#define D_UNIT_AMPERE "A" #define D_UNIT_AMPERE "A"

3
sonoff/language/pl-PL.h
View File

@ -364,7 +364,7 @@
#define D_DOMOTICZ_AIRQUALITY "AirQuality" #define D_DOMOTICZ_AIRQUALITY "AirQuality"
#define D_DOMOTICZ_UPDATE_TIMER "Zaktualizuj czasomierz" #define D_DOMOTICZ_UPDATE_TIMER "Zaktualizuj czasomierz"
// xsns_03_energy.ino // xdrv_03_energy.ino
#define D_ENERGY_TODAY "Energia Dzisiaj" #define D_ENERGY_TODAY "Energia Dzisiaj"
#define D_ENERGY_YESTERDAY "Energia Wczoraj" #define D_ENERGY_YESTERDAY "Energia Wczoraj"
#define D_ENERGY_TOTAL "Energia suma" #define D_ENERGY_TOTAL "Energia suma"
@ -412,6 +412,7 @@
#define D_SENSOR_SPI_CS "SPI CS" #define D_SENSOR_SPI_CS "SPI CS"
#define D_SENSOR_SPI_DC "SPI DC" #define D_SENSOR_SPI_DC "SPI DC"
#define D_SENSOR_BACKLIGHT "BkLight" #define D_SENSOR_BACKLIGHT "BkLight"
#define D_SENSOR_PMS5003 "PMS5003"
// Units // Units
#define D_UNIT_AMPERE "A" #define D_UNIT_AMPERE "A"

4
sonoff/sonoff.ino
View File

@ -25,8 +25,8 @@
- Select IDE Tools - Flash Size: "1M (no SPIFFS)" - Select IDE Tools - Flash Size: "1M (no SPIFFS)"
====================================================*/ ====================================================*/
#define VERSION 0x050B0001 #define VERSION 0x050B0101
#define VERSION_STRING "5.11.0a" // Would be great to have a macro that fills this from VERSION ... #define VERSION_STRING "5.11.1a" // Would be great to have a macro that fills this from VERSION ...
// Location specific includes // Location specific includes
#include "sonoff.h" // Enumaration used in user_config.h #include "sonoff.h" // Enumaration used in user_config.h

2
sonoff/xsns_03_energy.ino → sonoff/xdrv_03_energy.ino
View File

@ -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 Copyright (C) 2018 Theo Arends