diff --git a/.gitignore b/.gitignore index eabba8255..b6460347b 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,6 @@ .DS_Store .fuse_hidden* - ## Project files ###### .pioenvs .piolibdeps @@ -10,3 +9,6 @@ .gcc-flags.json sonoff/user_config_override.h build + +## Visual Studio Code specific ###### +.vscode diff --git a/README.md b/README.md index 8c55a841e..3eca78b2b 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ If you like **Sonoff-Tasmota**, give it a star, or fork it and contribute! ### Development [![Build Status](https://img.shields.io/travis/arendst/Sonoff-Tasmota.svg)](https://travis-ci.org/arendst/Sonoff-Tasmota) -Current version is **5.13.1c** - See [sonoff/_releasenotes.ino](https://github.com/arendst/Sonoff-Tasmota/blob/development/sonoff/_releasenotes.ino) for change information. +Current version is **5.14.0a** - See [sonoff/_releasenotes.ino](https://github.com/arendst/Sonoff-Tasmota/blob/development/sonoff/_releasenotes.ino) for change information. ### Quick install Download one of the released binaries from https://github.com/arendst/Sonoff-Tasmota/releases and flash it to your hardware as documented in the wiki. @@ -108,6 +108,7 @@ Different firmware images are released based on Features and Sensors selection g | USE_BH1750 | x | x | - | x | x | | USE_VEML6070 | - | - | - | - | x | | USE_TSL2561 | - | - | - | - | x | +| USE_SI1145 | - | - | - | - | x | | USE_ADS1115 | - | - | - | - | x | | USE_ADS1115_I2CDEV | - | - | - | - | - | | USE_INA219 | - | - | - | - | x | @@ -119,6 +120,7 @@ Different firmware images are released based on Features and Sensors selection g | USE_NOVA_SDS | x | - | - | x | x | | USE_PZEM004T | x | x | - | x | x | | USE_SERIAL_BRIDGE | x | - | - | x | x | +| USE_SDM120 | - | - | - | - | x | | USE_IR_REMOTE | x | x | - | x | x | | USE_IR_HVAC | - | - | - | - | x | | USE_IR_RECEIVE | x | - | - | x | x | @@ -129,11 +131,11 @@ Different firmware images are released based on Features and Sensors selection g #### Typical file size -| ESP/Arduino library version | sonoff | classic | minimal | knx | allsensors | -|--------------------------------|--------|---------|---------|------|------------| -| ESP/Arduino lib v2.3.0 | 526k | 488k | 427k | 535k | 549k | -| ESP/Arduino lib v2.4.0 | 531k | 496k | 435k | 540k | 552k | -| ESP/Arduino lib v2.4.1 | 534k | 499k | 437k | 543k | 555k | +| ESP/Arduino library version | sonoff | classic | minimal | knx | allsensors | +|-----------------------------|--------|---------|---------|------|------------| +| ESP/Arduino lib v2.3.0 | 529k | 490k | 429k | 538k | 554k | +| ESP/Arduino lib v2.4.0 | 534k | 498k | 436k | 542k | 558k | +| ESP/Arduino lib v2.4.1 | 536k | 501k | 439k | 545k | 560k | ### Contribute You can contribute to Sonoff-Tasmota by @@ -182,7 +184,7 @@ People helping to keep the show on the road: - Gerhard Mutz for his SGP30 and Sunrise/Sunset driver - Nuno Ferreira for his HC-SR04 driver - Adrian Scillato for his (security)fixes and implementing and maintaining KNX -- Gennaro Tortone for his Eastron SDM120 driver +- Gennaro Tortone for implementing and maintaining Eastron drivers - Raymond Mouthaan for managing Wemos Wiki information - Norbert Richter, Frogmore42 and Jason2866 for providing many issue answers - Many more providing Tips, Pocs or PRs diff --git a/platformio.ini b/platformio.ini index 5ac5a1941..233f36553 100644 --- a/platformio.ini +++ b/platformio.ini @@ -11,12 +11,13 @@ src_dir = sonoff ; *** Uncomment one of the lines below to build/upload only one environment -;env_default = sonoff +env_default = sonoff ;env_default = sonoff-minimal ;env_default = sonoff-classic ;env_default = sonoff-knx ;env_default = sonoff-allsensors ;env_default = sonoff-BG +;env_default = sonoff-BR ;env_default = sonoff-CN ;env_default = sonoff-CZ ;env_default = sonoff-DE @@ -33,11 +34,11 @@ src_dir = sonoff [common] ; ************************************************************ ; *** Esp8266 core for Arduino version -;platform = espressif8266@1.5.0 ; v2.3.0 +platform = espressif8266@1.5.0 ; v2.3.0 ;platform = espressif8266@1.6.0 ; v2.4.0 ;platform = espressif8266@1.7.0 ; v2.4.1 ;platform = https://github.com/platformio/platform-espressif8266.git#feature/stage -platform = espressif8266 +;platform = espressif8266 framework = arduino board = esp01_1m @@ -147,6 +148,18 @@ upload_speed = ${common.upload_speed} upload_port = ${common.upload_port} extra_scripts = ${common.extra_scripts} +[env:sonoff-BR] +platform = ${common.platform} +framework = ${common.framework} +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} +upload_speed = ${common.upload_speed} +upload_port = ${common.upload_port} +extra_scripts = ${common.extra_scripts} + [env:sonoff-CN] platform = ${common.platform} framework = ${common.framework} diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino index 892ab94ce..dafa7a55a 100644 --- a/sonoff/_releasenotes.ino +++ b/sonoff/_releasenotes.ino @@ -1,9 +1,12 @@ -/* 5.13.1c - * Add user entry DST/STD using commands TimeStd and TimeDst with options like 0,0,3,1,2,120 (#2721) - * Add more user input validation to commands TimeStd and TimeDst +/* 5.14.0a + * Updated to latest release * - * 5.13.1a - * Change user_config.h otaurl to http://sonoff.maddox.co.uk/tasmota/sonoff.bin (#2588, #2602) + * 5.14.0 20180515 + * Update language files + * Update TasmotaSerial to 2.0.0 allowing Hardware Serial Fallback when correct connections are configured + * Change command handling + * Change user_config(_override).h defines TIME_STD and TIME_DST + * Change user_config(_override).h otaurl to http://sonoff.maddox.co.uk/tasmota/sonoff.bin (#2588, #2602) * Fix configuration restore regression from 5.13.1 * Fix compile error when ADC is enabled and Rules are disabled (#2608) * Fix rule power trigger when no backlog command is used (#2613) @@ -12,20 +15,18 @@ * Fix sensor MHZ-19 vanishing data over time (#2659) * Fix KNX reconnection issue (#2679) * Fix DST and STD time for Southern Hemisphere (#2684, #2714) - * Add SetOption26 to enforce use of indexes even when only one relay is present (#1055) * Add Portuguese in Brazil language file + * Add SetOption26 to enforce use of indexes even when only one relay is present (#1055) + * Add support for sensor SI1145 UV Index / IR / Visible light (#2496) * Add rule state test for On/Off in addition to 0/1 (#2613) * Add hardware serial option to MHZ-19 sensor (#2659) * Add Eastron SDM120 energy meter (#2694) - * Add support for sensor SI1145 UV Index / IR / Visible light (#2496) - * Updated Italian language file (#2618) - * Update TasmotaSerial to 2.0.0 allowing Hardware Serial Fallback when correct connections are configured - * Optimize command handling + * Add user entry DST/STD using commands TimeStd and TimeDst (See wiki for parameter syntax) (#2721) * * 5.13.1 20180501 * Fix JSON buffers size too small for execution in some situations (#2580) - * Add define MODULE for user selecting default model although it preferably should not be changed (#569, #2589) * Fix configuration restore (#2591) + * Add define MODULE for user selecting default model although it preferably should not be changed (#569, #2589) * * 5.13.0 20180430 * Change platformio option sonoff-ds18x20 to sonoff-allsensors enabling ds18x20 and all other sensors in one image diff --git a/sonoff/sonoff.ino b/sonoff/sonoff.ino index 740207585..d8e6eb2f5 100644 --- a/sonoff/sonoff.ino +++ b/sonoff/sonoff.ino @@ -25,7 +25,7 @@ - Select IDE Tools - Flash Size: "1M (no SPIFFS)" ====================================================*/ -#define VERSION 0x050D0103 // 5.13.1c +#define VERSION 0x050E0001 // 5.14.0a // Location specific includes #include // Arduino_Esp8266 version information (ARDUINO_ESP8266_RELEASE and ARDUINO_ESP8266_RELEASE_2_3_0)