diff --git a/platformio.ini b/platformio.ini index bbc4f9fb5..798848017 100644 --- a/platformio.ini +++ b/platformio.ini @@ -33,11 +33,15 @@ src_dir = sonoff ;env_default = sonoff-TW [common] ; ************************************************************ -; *** Esp8266 core for Arduino version -platform = espressif8266@1.5.0 ; v2.3.0 -;platform = espressif8266@1.6.0 ; v2.4.0 -;platform = espressif8266@1.7.0 ; v2.4.1 +; *** Esp8266 core for Arduino version 2.3.0 +platform = espressif8266@1.5.0 +; *** Esp8266 core for Arduino version 2.4.0 +;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 +; *** Esp8266 core for Arduino current version ;platform = espressif8266 framework = arduino @@ -69,7 +73,7 @@ build_flags_4MB = extra_scripts = pio/strip-floats.py ; *** Serial Monitor options -monitor_baud = 115200 +monitor_speed = 115200 ; *** Upload Serial reset method for Wemos and NodeMCU upload_speed = 115200 @@ -96,7 +100,7 @@ board = ${common.board} board_flash_mode = ${common.board_flash_mode} build_unflags = ${common.build_unflags} 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_port = ${common.upload_port} extra_scripts = ${common.extra_scripts} @@ -108,7 +112,7 @@ board = ${common.board} board_flash_mode = ${common.board_flash_mode} build_unflags = ${common.build_unflags} build_flags = ${common.build_flags_4MB} -monitor_baud = ${common.monitor_baud} +monitor_speed = ${common.monitor_baud} upload_speed = ${common.upload_speed} upload_resetmethod = ${common.upload_resetmethod} upload_port = ${common.upload_port} @@ -121,7 +125,7 @@ board = ${common.board} board_flash_mode = ${common.board_flash_mode} build_unflags = ${common.build_unflags} 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_resetmethod = ${common.upload_resetmethod} upload_port = ${common.upload_port} @@ -134,7 +138,7 @@ board = ${common.board} board_flash_mode = ${common.board_flash_mode} build_unflags = ${common.build_unflags} build_flags = ${common.build_flags} -DBE_MINIMAL -monitor_baud = ${common.monitor_baud} +monitor_speed = ${common.monitor_baud} upload_speed = ${common.upload_speed} upload_port = ${common.upload_port} extra_scripts = ${common.extra_scripts} @@ -146,7 +150,7 @@ board = ${common.board} board_flash_mode = ${common.board_flash_mode} build_unflags = ${common.build_unflags} 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_port = ${common.upload_port} extra_scripts = ${common.extra_scripts} @@ -158,7 +162,7 @@ board = ${common.board} board_flash_mode = ${common.board_flash_mode} build_unflags = ${common.build_unflags} 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_port = ${common.upload_port} extra_scripts = ${common.extra_scripts} @@ -170,7 +174,7 @@ board = ${common.board} board_flash_mode = ${common.board_flash_mode} build_unflags = ${common.build_unflags} 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_port = ${common.upload_port} extra_scripts = ${common.extra_scripts} @@ -182,7 +186,7 @@ board = ${common.board} board_flash_mode = ${common.board_flash_mode} build_unflags = ${common.build_unflags} 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_port = ${common.upload_port} extra_scripts = ${common.extra_scripts} @@ -194,7 +198,7 @@ board = ${common.board} board_flash_mode = ${common.board_flash_mode} build_unflags = ${common.build_unflags} 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_port = ${common.upload_port} extra_scripts = ${common.extra_scripts} @@ -219,7 +223,7 @@ board = ${common.board} board_flash_mode = ${common.board_flash_mode} build_unflags = ${common.build_unflags} 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_port = ${common.upload_port} extra_scripts = ${common.extra_scripts} @@ -231,7 +235,7 @@ board = ${common.board} board_flash_mode = ${common.board_flash_mode} build_unflags = ${common.build_unflags} 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_port = ${common.upload_port} extra_scripts = ${common.extra_scripts} @@ -243,7 +247,7 @@ board = ${common.board} board_flash_mode = ${common.board_flash_mode} build_unflags = ${common.build_unflags} 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_port = ${common.upload_port} extra_scripts = ${common.extra_scripts} @@ -255,7 +259,7 @@ board = ${common.board} board_flash_mode = ${common.board_flash_mode} build_unflags = ${common.build_unflags} 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_port = ${common.upload_port} extra_scripts = ${common.extra_scripts} @@ -267,7 +271,7 @@ board = ${common.board} board_flash_mode = ${common.board_flash_mode} build_unflags = ${common.build_unflags} 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_port = ${common.upload_port} extra_scripts = ${common.extra_scripts} @@ -279,7 +283,7 @@ board = ${common.board} board_flash_mode = ${common.board_flash_mode} build_unflags = ${common.build_unflags} 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_port = ${common.upload_port} extra_scripts = ${common.extra_scripts} @@ -291,7 +295,7 @@ board = ${common.board} board_flash_mode = ${common.board_flash_mode} build_unflags = ${common.build_unflags} 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_port = ${common.upload_port} extra_scripts = ${common.extra_scripts} @@ -303,7 +307,7 @@ board = ${common.board} board_flash_mode = ${common.board_flash_mode} build_unflags = ${common.build_unflags} 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_port = ${common.upload_port} extra_scripts = ${common.extra_scripts} @@ -315,7 +319,7 @@ board = ${common.board} board_flash_mode = ${common.board_flash_mode} build_unflags = ${common.build_unflags} 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_port = ${common.upload_port} extra_scripts = ${common.extra_scripts} @@ -327,7 +331,7 @@ board = ${common.board} board_flash_mode = ${common.board_flash_mode} build_unflags = ${common.build_unflags} 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_port = ${common.upload_port} extra_scripts = ${common.extra_scripts} diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino index c8a76e970..02ea82c75 100644 --- a/sonoff/_releasenotes.ino +++ b/sonoff/_releasenotes.ino @@ -1,5 +1,7 @@ /* 5.14.0a * 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 * Update language files diff --git a/sonoff/language/en-GB.h b/sonoff/language/en-GB.h index 7814f8446..3e5b0a0c0 100644 --- a/sonoff/language/en-GB.h +++ b/sonoff/language/en-GB.h @@ -28,7 +28,7 @@ * Use online command StateText to translate ON, OFF, HOLD and TOGGLE. * 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) diff --git a/sonoff/language/es-AR.h b/sonoff/language/es-AR.h index fa96a9304..d9c37fa0e 100644 --- a/sonoff/language/es-AR.h +++ b/sonoff/language/es-AR.h @@ -28,7 +28,7 @@ * Use online command StateText to translate ON, OFF, HOLD and TOGGLE. * 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) diff --git a/sonoff/language/nl-NL.h b/sonoff/language/nl-NL.h index c61257797..df970798f 100644 --- a/sonoff/language/nl-NL.h +++ b/sonoff/language/nl-NL.h @@ -28,7 +28,7 @@ * Use online command StateText to translate ON, OFF, HOLD and TOGGLE. * 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) @@ -400,7 +400,7 @@ #define D_KNX_COMMAND_OTHER "Overige" #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_ENHANCEMENT "Communication Enhancement" +#define D_KNX_ENHANCEMENT "Verbeter verbinding" // xdrv_03_energy.ino #define D_ENERGY_TODAY "Verbruik vandaag" diff --git a/sonoff/settings.h b/sonoff/settings.h index 9faf10186..c174ecc55 100644 --- a/sonoff/settings.h +++ b/sonoff/settings.h @@ -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 knx_enabled : 1; // bit 25 (v5.12.0l) KNX 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 spare29 : 1; uint32_t spare30 : 1; diff --git a/sonoff/xdrv_09_timers.ino b/sonoff/xdrv_09_timers.ino index 889a92937..7528dcfad 100644 --- a/sonoff/xdrv_09_timers.ino +++ b/sonoff/xdrv_09_timers.ino @@ -262,7 +262,7 @@ void TimerEverySecond() { if (RtcTime.valid) { 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; int16_t time = (RtcTime.hour *60) + RtcTime.minute; uint8_t days = 1 << (RtcTime.day_of_week -1);