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

Update from Tasmota 

Update from Tasmota
This commit is contained in:
ascillato 2018-05-16 14:49:07 -03:00
parent f4904df1a2 25ba74cfb4
commit de78f5cd99
7 changed files with 36 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
platformio.ini
View File

@ -33,11 +33,15 @@ src_dir = sonoff
;env_default = sonoff-TW ;env_default = sonoff-TW
[common] ; ************************************************************ [common] ; ************************************************************
; *** Esp8266 core for Arduino version ; *** Esp8266 core for Arduino version 2.3.0
platform = espressif8266@1.5.0 ; v2.3.0 platform = espressif8266@1.5.0
;platform = espressif8266@1.6.0 ; v2.4.0 ; *** Esp8266 core for Arduino version 2.4.0
;platform = espressif8266@1.7.0 ; v2.4.1 ;platform = espressif8266@1.6.0
; *** Esp8266 core for Arduino version 2.4.1
;platform = espressif8266@1.7.0
; *** Esp8266 core for Arduino version latest beta
;platform = https://github.com/platformio/platform-espressif8266.git#feature/stage ;platform = https://github.com/platformio/platform-espressif8266.git#feature/stage
; *** Esp8266 core for Arduino current version
;platform = espressif8266 ;platform = espressif8266
framework = arduino framework = arduino
@ -69,7 +73,7 @@ build_flags_4MB =
extra_scripts = pio/strip-floats.py extra_scripts = pio/strip-floats.py
; *** Serial Monitor options ; *** Serial Monitor options
monitor_baud = 115200 monitor_speed = 115200
; *** Upload Serial reset method for Wemos and NodeMCU ; *** Upload Serial reset method for Wemos and NodeMCU
upload_speed = 115200 upload_speed = 115200
@ -96,7 +100,7 @@ board = ${common.board}
board_flash_mode = ${common.board_flash_mode} board_flash_mode = ${common.board_flash_mode}
build_unflags = ${common.build_unflags} build_unflags = ${common.build_unflags}
build_flags = ${common.build_flags_4MB} -DMY_LANGUAGE=de-DE build_flags = ${common.build_flags_4MB} -DMY_LANGUAGE=de-DE
monitor_baud = ${common.monitor_baud} monitor_speed = ${common.monitor_baud}
upload_speed = ${common.upload_speed} upload_speed = ${common.upload_speed}
upload_port = ${common.upload_port} upload_port = ${common.upload_port}
extra_scripts = ${common.extra_scripts} extra_scripts = ${common.extra_scripts}
@ -108,7 +112,7 @@ board = ${common.board}
board_flash_mode = ${common.board_flash_mode} board_flash_mode = ${common.board_flash_mode}
build_unflags = ${common.build_unflags} build_unflags = ${common.build_unflags}
build_flags = ${common.build_flags_4MB} build_flags = ${common.build_flags_4MB}
monitor_baud = ${common.monitor_baud} monitor_speed = ${common.monitor_baud}
upload_speed = ${common.upload_speed} upload_speed = ${common.upload_speed}
upload_resetmethod = ${common.upload_resetmethod} upload_resetmethod = ${common.upload_resetmethod}
upload_port = ${common.upload_port} upload_port = ${common.upload_port}
@ -121,7 +125,7 @@ board = ${common.board}
board_flash_mode = ${common.board_flash_mode} board_flash_mode = ${common.board_flash_mode}
build_unflags = ${common.build_unflags} build_unflags = ${common.build_unflags}
build_flags = ${common.build_flags_4MB} -DMY_LANGUAGE=es-AR build_flags = ${common.build_flags_4MB} -DMY_LANGUAGE=es-AR
monitor_baud = ${common.monitor_baud} monitor_speed = ${common.monitor_baud}
upload_speed = ${common.upload_speed} upload_speed = ${common.upload_speed}
upload_resetmethod = ${common.upload_resetmethod} upload_resetmethod = ${common.upload_resetmethod}
upload_port = ${common.upload_port} upload_port = ${common.upload_port}
@ -134,7 +138,7 @@ board = ${common.board}
board_flash_mode = ${common.board_flash_mode} board_flash_mode = ${common.board_flash_mode}
build_unflags = ${common.build_unflags} build_unflags = ${common.build_unflags}
build_flags = ${common.build_flags} -DBE_MINIMAL build_flags = ${common.build_flags} -DBE_MINIMAL
monitor_baud = ${common.monitor_baud} monitor_speed = ${common.monitor_baud}
upload_speed = ${common.upload_speed} upload_speed = ${common.upload_speed}
upload_port = ${common.upload_port} upload_port = ${common.upload_port}
extra_scripts = ${common.extra_scripts} extra_scripts = ${common.extra_scripts}
@ -146,7 +150,7 @@ board = ${common.board}
board_flash_mode = ${common.board_flash_mode} board_flash_mode = ${common.board_flash_mode}
build_unflags = ${common.build_unflags} build_unflags = ${common.build_unflags}
build_flags = ${common.build_flags} -DMY_LANGUAGE=bg-BG build_flags = ${common.build_flags} -DMY_LANGUAGE=bg-BG
monitor_baud = ${common.monitor_baud} monitor_speed = ${common.monitor_speed}
upload_speed = ${common.upload_speed} upload_speed = ${common.upload_speed}
upload_port = ${common.upload_port} upload_port = ${common.upload_port}
extra_scripts = ${common.extra_scripts} extra_scripts = ${common.extra_scripts}
@ -158,7 +162,7 @@ board = ${common.board}
board_flash_mode = ${common.board_flash_mode} board_flash_mode = ${common.board_flash_mode}
build_unflags = ${common.build_unflags} build_unflags = ${common.build_unflags}
build_flags = ${common.build_flags} -DMY_LANGUAGE=pt-BR build_flags = ${common.build_flags} -DMY_LANGUAGE=pt-BR
monitor_baud = ${common.monitor_baud} monitor_speed = ${common.monitor_speed}
upload_speed = ${common.upload_speed} upload_speed = ${common.upload_speed}
upload_port = ${common.upload_port} upload_port = ${common.upload_port}
extra_scripts = ${common.extra_scripts} extra_scripts = ${common.extra_scripts}
@ -170,7 +174,7 @@ board = ${common.board}
board_flash_mode = ${common.board_flash_mode} board_flash_mode = ${common.board_flash_mode}
build_unflags = ${common.build_unflags} build_unflags = ${common.build_unflags}
build_flags = ${common.build_flags} -DMY_LANGUAGE=zh-CN build_flags = ${common.build_flags} -DMY_LANGUAGE=zh-CN
monitor_baud = ${common.monitor_baud} monitor_speed = ${common.monitor_speed}
upload_speed = ${common.upload_speed} upload_speed = ${common.upload_speed}
upload_port = ${common.upload_port} upload_port = ${common.upload_port}
extra_scripts = ${common.extra_scripts} extra_scripts = ${common.extra_scripts}
@ -182,7 +186,7 @@ board = ${common.board}
board_flash_mode = ${common.board_flash_mode} board_flash_mode = ${common.board_flash_mode}
build_unflags = ${common.build_unflags} build_unflags = ${common.build_unflags}
build_flags = ${common.build_flags} -DMY_LANGUAGE=cs-CZ build_flags = ${common.build_flags} -DMY_LANGUAGE=cs-CZ
monitor_baud = ${common.monitor_baud} monitor_speed = ${common.monitor_speed}
upload_speed = ${common.upload_speed} upload_speed = ${common.upload_speed}
upload_port = ${common.upload_port} upload_port = ${common.upload_port}
extra_scripts = ${common.extra_scripts} extra_scripts = ${common.extra_scripts}
@ -194,7 +198,7 @@ board = ${common.board}
board_flash_mode = ${common.board_flash_mode} board_flash_mode = ${common.board_flash_mode}
build_unflags = ${common.build_unflags} build_unflags = ${common.build_unflags}
build_flags = ${common.build_flags} -DMY_LANGUAGE=de-DE build_flags = ${common.build_flags} -DMY_LANGUAGE=de-DE
monitor_baud = ${common.monitor_baud} monitor_speed = ${common.monitor_speed}
upload_speed = ${common.upload_speed} upload_speed = ${common.upload_speed}
upload_port = ${common.upload_port} upload_port = ${common.upload_port}
extra_scripts = ${common.extra_scripts} extra_scripts = ${common.extra_scripts}
@ -219,7 +223,7 @@ board = ${common.board}
board_flash_mode = ${common.board_flash_mode} board_flash_mode = ${common.board_flash_mode}
build_unflags = ${common.build_unflags} build_unflags = ${common.build_unflags}
build_flags = ${common.build_flags} -DMY_LANGUAGE=es-AR build_flags = ${common.build_flags} -DMY_LANGUAGE=es-AR
monitor_baud = ${common.monitor_baud} monitor_speed = ${common.monitor_speed}
upload_speed = ${common.upload_speed} upload_speed = ${common.upload_speed}
upload_port = ${common.upload_port} upload_port = ${common.upload_port}
extra_scripts = ${common.extra_scripts} extra_scripts = ${common.extra_scripts}
@ -231,7 +235,7 @@ board = ${common.board}
board_flash_mode = ${common.board_flash_mode} board_flash_mode = ${common.board_flash_mode}
build_unflags = ${common.build_unflags} build_unflags = ${common.build_unflags}
build_flags = ${common.build_flags} -DMY_LANGUAGE=fr-FR build_flags = ${common.build_flags} -DMY_LANGUAGE=fr-FR
monitor_baud = ${common.monitor_baud} monitor_speed = ${common.monitor_speed}
upload_speed = ${common.upload_speed} upload_speed = ${common.upload_speed}
upload_port = ${common.upload_port} upload_port = ${common.upload_port}
extra_scripts = ${common.extra_scripts} extra_scripts = ${common.extra_scripts}
@ -243,7 +247,7 @@ board = ${common.board}
board_flash_mode = ${common.board_flash_mode} board_flash_mode = ${common.board_flash_mode}
build_unflags = ${common.build_unflags} build_unflags = ${common.build_unflags}
build_flags = ${common.build_flags} -DMY_LANGUAGE=el-GR build_flags = ${common.build_flags} -DMY_LANGUAGE=el-GR
monitor_baud = ${common.monitor_baud} monitor_speed = ${common.monitor_speed}
upload_speed = ${common.upload_speed} upload_speed = ${common.upload_speed}
upload_port = ${common.upload_port} upload_port = ${common.upload_port}
extra_scripts = ${common.extra_scripts} extra_scripts = ${common.extra_scripts}
@ -255,7 +259,7 @@ board = ${common.board}
board_flash_mode = ${common.board_flash_mode} board_flash_mode = ${common.board_flash_mode}
build_unflags = ${common.build_unflags} build_unflags = ${common.build_unflags}
build_flags = ${common.build_flags} -DMY_LANGUAGE=hu-HU build_flags = ${common.build_flags} -DMY_LANGUAGE=hu-HU
monitor_baud = ${common.monitor_baud} monitor_speed = ${common.monitor_speed}
upload_speed = ${common.upload_speed} upload_speed = ${common.upload_speed}
upload_port = ${common.upload_port} upload_port = ${common.upload_port}
extra_scripts = ${common.extra_scripts} extra_scripts = ${common.extra_scripts}
@ -267,7 +271,7 @@ board = ${common.board}
board_flash_mode = ${common.board_flash_mode} board_flash_mode = ${common.board_flash_mode}
build_unflags = ${common.build_unflags} build_unflags = ${common.build_unflags}
build_flags = ${common.build_flags} -DMY_LANGUAGE=it-IT build_flags = ${common.build_flags} -DMY_LANGUAGE=it-IT
monitor_baud = ${common.monitor_baud} monitor_speed = ${common.monitor_speed}
upload_speed = ${common.upload_speed} upload_speed = ${common.upload_speed}
upload_port = ${common.upload_port} upload_port = ${common.upload_port}
extra_scripts = ${common.extra_scripts} extra_scripts = ${common.extra_scripts}
@ -279,7 +283,7 @@ board = ${common.board}
board_flash_mode = ${common.board_flash_mode} board_flash_mode = ${common.board_flash_mode}
build_unflags = ${common.build_unflags} build_unflags = ${common.build_unflags}
build_flags = ${common.build_flags} -DMY_LANGUAGE=nl-NL build_flags = ${common.build_flags} -DMY_LANGUAGE=nl-NL
monitor_baud = ${common.monitor_baud} monitor_speed = ${common.monitor_speed}
upload_speed = ${common.upload_speed} upload_speed = ${common.upload_speed}
upload_port = ${common.upload_port} upload_port = ${common.upload_port}
extra_scripts = ${common.extra_scripts} extra_scripts = ${common.extra_scripts}
@ -291,7 +295,7 @@ board = ${common.board}
board_flash_mode = ${common.board_flash_mode} board_flash_mode = ${common.board_flash_mode}
build_unflags = ${common.build_unflags} build_unflags = ${common.build_unflags}
build_flags = ${common.build_flags} -DMY_LANGUAGE=pl-PL build_flags = ${common.build_flags} -DMY_LANGUAGE=pl-PL
monitor_baud = ${common.monitor_baud} monitor_speed = ${common.monitor_speed}
upload_speed = ${common.upload_speed} upload_speed = ${common.upload_speed}
upload_port = ${common.upload_port} upload_port = ${common.upload_port}
extra_scripts = ${common.extra_scripts} extra_scripts = ${common.extra_scripts}
@ -303,7 +307,7 @@ board = ${common.board}
board_flash_mode = ${common.board_flash_mode} board_flash_mode = ${common.board_flash_mode}
build_unflags = ${common.build_unflags} build_unflags = ${common.build_unflags}
build_flags = ${common.build_flags} -DMY_LANGUAGE=pt-PT build_flags = ${common.build_flags} -DMY_LANGUAGE=pt-PT
monitor_baud = ${common.monitor_baud} monitor_speed = ${common.monitor_speed}
upload_speed = ${common.upload_speed} upload_speed = ${common.upload_speed}
upload_port = ${common.upload_port} upload_port = ${common.upload_port}
extra_scripts = ${common.extra_scripts} extra_scripts = ${common.extra_scripts}
@ -315,7 +319,7 @@ board = ${common.board}
board_flash_mode = ${common.board_flash_mode} board_flash_mode = ${common.board_flash_mode}
build_unflags = ${common.build_unflags} build_unflags = ${common.build_unflags}
build_flags = ${common.build_flags} -DMY_LANGUAGE=ru-RU build_flags = ${common.build_flags} -DMY_LANGUAGE=ru-RU
monitor_baud = ${common.monitor_baud} monitor_speed = ${common.monitor_speed}
upload_speed = ${common.upload_speed} upload_speed = ${common.upload_speed}
upload_port = ${common.upload_port} upload_port = ${common.upload_port}
extra_scripts = ${common.extra_scripts} extra_scripts = ${common.extra_scripts}
@ -327,7 +331,7 @@ board = ${common.board}
board_flash_mode = ${common.board_flash_mode} board_flash_mode = ${common.board_flash_mode}
build_unflags = ${common.build_unflags} build_unflags = ${common.build_unflags}
build_flags = ${common.build_flags} -DMY_LANGUAGE=zh-TW build_flags = ${common.build_flags} -DMY_LANGUAGE=zh-TW
monitor_baud = ${common.monitor_baud} monitor_speed = ${common.monitor_speed}
upload_speed = ${common.upload_speed} upload_speed = ${common.upload_speed}
upload_port = ${common.upload_port} upload_port = ${common.upload_port}
extra_scripts = ${common.extra_scripts} extra_scripts = ${common.extra_scripts}

2
sonoff/_releasenotes.ino
View File

@ -1,5 +1,7 @@
/* 5.14.0a /* 5.14.0a
* Add Eastron SDM630 energy meter (#2735) * Add Eastron SDM630 energy meter (#2735)
* Add KNX communication enhancement (#2742)
* Fix timer re-trigger within one minute after restart (#2744)
* *
* 5.14.0 20180515 * 5.14.0 20180515
* Update language files * Update language files

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

@ -28,7 +28,7 @@
* Use online command StateText to translate ON, OFF, HOLD and TOGGLE. * Use online command StateText to translate ON, OFF, HOLD and TOGGLE.
* Use online command Prefix to translate cmnd, stat and tele. * Use online command Prefix to translate cmnd, stat and tele.
* *
* Updated until v5.14.0 * Updated until v5.14.0a
\*********************************************************************/ \*********************************************************************/
//#define LANGUAGE_MODULE_NAME // Enable to display "Module Generic" (ie Spanish), Disable to display "Generic Module" (ie English) //#define LANGUAGE_MODULE_NAME // Enable to display "Module Generic" (ie Spanish), Disable to display "Generic Module" (ie English)

2
sonoff/language/es-AR.h
View File

@ -28,7 +28,7 @@
* Use online command StateText to translate ON, OFF, HOLD and TOGGLE. * Use online command StateText to translate ON, OFF, HOLD and TOGGLE.
* Use online command Prefix to translate cmnd, stat and tele. * Use online command Prefix to translate cmnd, stat and tele.
* *
* Updated until v5.14.0 * Updated until v5.14.0a
\*********************************************************************/ \*********************************************************************/
#define LANGUAGE_MODULE_NAME // Enable to display "Module Generic" (ie Spanish), Disable to display "Generic Module" (ie English) #define LANGUAGE_MODULE_NAME // Enable to display "Module Generic" (ie Spanish), Disable to display "Generic Module" (ie English)

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

@ -28,7 +28,7 @@
* Use online command StateText to translate ON, OFF, HOLD and TOGGLE. * Use online command StateText to translate ON, OFF, HOLD and TOGGLE.
* Use online command Prefix to translate cmnd, stat and tele. * Use online command Prefix to translate cmnd, stat and tele.
* *
* Updated until v5.14.0 * Updated until v5.14.0a
\*********************************************************************/ \*********************************************************************/
//#define LANGUAGE_MODULE_NAME // Enable to display "Module Generic" (ie Spanish), Disable to display "Generic Module" (ie English) //#define LANGUAGE_MODULE_NAME // Enable to display "Module Generic" (ie Spanish), Disable to display "Generic Module" (ie English)
@ -400,7 +400,7 @@
#define D_KNX_COMMAND_OTHER "Overige" #define D_KNX_COMMAND_OTHER "Overige"
#define D_SENT_TO "verzend naar" #define D_SENT_TO "verzend naar"
#define D_KNX_WARNING "Groep adres (0/0/0) is gereserveerd en mag niet worden gebruikt." #define D_KNX_WARNING "Groep adres (0/0/0) is gereserveerd en mag niet worden gebruikt."
#define D_KNX_ENHANCEMENT "Communication Enhancement" #define D_KNX_ENHANCEMENT "Verbeter verbinding"
// xdrv_03_energy.ino // xdrv_03_energy.ino
#define D_ENERGY_TODAY "Verbruik vandaag" #define D_ENERGY_TODAY "Verbruik vandaag"

2
sonoff/settings.h
View File

@ -52,7 +52,7 @@ typedef union { // Restricted by MISRA-C Rule 18.4 bu
uint32_t rules_once : 1; // bit 24 (v5.12.0k) uint32_t rules_once : 1; // bit 24 (v5.12.0k)
uint32_t knx_enabled : 1; // bit 25 (v5.12.0l) KNX uint32_t knx_enabled : 1; // bit 25 (v5.12.0l) KNX
uint32_t device_index_enable : 1; // bit 26 (v5.13.1a) uint32_t device_index_enable : 1; // bit 26 (v5.13.1a)
uint32_t knx_enable_enhancement : 1; // bit 27 (v5.14.1b) KNX uint32_t knx_enable_enhancement : 1; // bit 27 (v5.14.0a) KNX
uint32_t spare28 : 1; uint32_t spare28 : 1;
uint32_t spare29 : 1; uint32_t spare29 : 1;
uint32_t spare30 : 1; uint32_t spare30 : 1;

2
sonoff/xdrv_09_timers.ino
View File

@ -262,7 +262,7 @@ void TimerEverySecond()
{ {
if (RtcTime.valid) { if (RtcTime.valid) {
if (!RtcTime.hour && !RtcTime.minute && !RtcTime.second) { TimerSetRandomWindows(); } // Midnight if (!RtcTime.hour && !RtcTime.minute && !RtcTime.second) { TimerSetRandomWindows(); } // Midnight
if (RtcTime.minute != timer_last_minute) { // Execute every minute only once if ((uptime > 60) && (RtcTime.minute != timer_last_minute)) { // Execute from one minute after restart every minute only once
timer_last_minute = RtcTime.minute; timer_last_minute = RtcTime.minute;
int16_t time = (RtcTime.hour *60) + RtcTime.minute; int16_t time = (RtcTime.hour *60) + RtcTime.minute;
uint8_t days = 1 << (RtcTime.day_of_week -1); uint8_t days = 1 << (RtcTime.day_of_week -1);