diff --git a/README.md b/README.md index 8d5a1e696..c0b26ce70 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ In addition to the [release webpage](https://github.com/arendst/Tasmota/releases ## Development -[![Dev Version](https://img.shields.io/badge/development%20version-v7.0.0.x-blue.svg)](https://github.com/arendst/Tasmota) +[![Dev Version](https://img.shields.io/badge/development%20version-v7.1.0.x-blue.svg)](https://github.com/arendst/Tasmota) [![Download Dev](https://img.shields.io/badge/download-development-yellow.svg)](http://thehackbox.org/tasmota/) [![Build Status](https://img.shields.io/travis/arendst/Tasmota.svg)](https://travis-ci.org/arendst/Tasmota) @@ -74,9 +74,26 @@ See [wiki migration path](https://tasmota.github.io/docs/#/Upgrading?id=migratio For a database of supported devices see [Tasmota Device Templates Repository](https://blakadder.github.io/templates) -See [Wiki](https://tasmota.github.io/docs) for use instructions and how-to's. -See [Community](https://groups.google.com/d/forum/sonoffusers) for forum. -Visit [Discord Chat](https://discord.gg/Ks2Kzd4) for discussions and troubleshooting. +If you're looking for support on **Tasmota** there are some options available: + +### Documentation: + +* [Documentation Site](https://tasmota.github.io/docs): For information on how to flash Tasmota, configure, use and expand it +* [FAQ and Troubleshooting](https://tasmota.github.io/docs/#/help/): For information on common problems and solutions. +* [Commands Information](https://tasmota.github.io/docs/#/Commands): For information on all the commands supported by Tasmota. + +### Support's Community: + +* [Tasmota Forum](https://groups.google.com/d/forum/sonoffusers): For usage and discussions. +* [Tasmota Support Chat](https://discord.gg/Ks2Kzd4): For support, troubleshooting and general questions. You have better chances to get fast answers from members of the Tasmota Community. +* [Search in Issues](https://github.com/arendst/Tasmota/issues): You might find an answer to your question by searching current or closed issues. + +### Developers' Community: + +* [Bug Report](https://github.com/arendst/Tasmota/issues/new?template=Bug_report.md): For reporting Bugs of Tasmota Software. +* [Feature Request](https://github.com/arendst/Tasmota/issues/new?template=Feature_request.md): For requesting features/functions to Tasmota Software. +* [Troubleshooting](https://github.com/arendst/Tasmota/issues/new?template=Custom.md): As a last resort, you can open new *Troubleshooting* issue on GitHub if the solution could not be found using the other channels. Just remember: the more info you provide the more chances you'll have to get an accurate answer. +* [Issue a question](https://github.com/arendst/Tasmota/issues/new/choose): As a last resort, you can open a new *Question* issue on GitHub if the answer could not be found using the other channels. Just remember: the more info you provide the more chances you'll have to get an accurate answer. ## Contribute diff --git a/SUPPORT.md b/SUPPORT.md deleted file mode 100644 index d26baa615..000000000 --- a/SUPPORT.md +++ /dev/null @@ -1,24 +0,0 @@ - - -# Support - -If you're looking for support on **Tasmota** there are some options available: - -## Documentation: - -* [Documentation Site](https://tasmota.github.io/docs): For information on how to flash Tasmota, configure, use and expand it -* [FAQ and Troubleshooting](https://tasmota.github.io/docs/#/help/): For information on common problems and solutions. -* [Commands Information](https://tasmota.github.io/docs/#/Commands): For information on all the commands supported by Tasmota. - -## Support's Community: - -* [Tasmota Forum](https://groups.google.com/d/forum/sonoffusers): For usage and discussions. -* [Tasmota Support Chat](https://discord.gg/Ks2Kzd4): For support, troubleshooting and general questions. You have better chances to get fast answers from members of the Tasmota Community. -* [Search in Issues](https://github.com/arendst/Tasmota/issues): You might find an answer to your question by searching current or closed issues. - -## Developers' Community: - -* [Bug Report](https://github.com/arendst/Tasmota/issues/new?template=Bug_report.md): For reporting Bugs of Tasmota Software. -* [Feature Request](https://github.com/arendst/Tasmota/issues/new?template=Feature_request.md): For requesting features/functions to Tasmota Software. -* [Troubleshooting](https://github.com/arendst/Tasmota/issues/new?template=Custom.md): As a last resort, you can open new *Troubleshooting* issue on GitHub if the solution could not be found using the other channels. Just remember: the more info you provide the more chances you'll have to get an accurate answer. -* [Issue a question](https://github.com/arendst/Tasmota/issues/new/choose): As a last resort, you can open a new *Question* issue on GitHub if the answer could not be found using the other channels. Just remember: the more info you provide the more chances you'll have to get an accurate answer. diff --git a/platformio_override_sample.ini b/platformio_override_sample.ini index d94903d0e..9827447dd 100644 --- a/platformio_override_sample.ini +++ b/platformio_override_sample.ini @@ -1,9 +1,9 @@ -; *** Example PlatformIO Project Configuration Override File *** -; *** Changes done here overrides settings in platformio.ini *** -; -; **************************************************************** -; *** to activate rename this fie to platformio_override.ini *** -; **************************************************************** +; *** Example PlatformIO Project Configuration Override File *** +; *** Changes done here override settings in platformio.ini *** +; +; ***************************************************************** +; *** to activate rename this file to platformio_override.ini *** +; ***************************************************************** ; ; Please visit documentation for the options and examples ; http://docs.platformio.org/en/stable/projectconf.html @@ -13,7 +13,7 @@ [platformio] ; *** Build/upload environment -default_envs = +default_envs = ; *** Uncomment the line(s) below to select version(s) tasmota ; tasmota-debug @@ -29,7 +29,7 @@ default_envs = [common] platform = ${core_active.platform} build_flags = ${core_active.build_flags} -; *** Use settings from file user_config_override.h +; *** Use settings from file user_config_override.h -DUSE_CONFIG_OVERRIDE ; *** Optional Firmware configurations @@ -57,7 +57,7 @@ extra_scripts = ${scripts_defaults.extra_scripts} ; *** Upload file to OTA server using SCP ;upload_port = user@host:/path -;extra_scripts = ${scripts_defaults.extra_scripts} +;extra_scripts = ${scripts_defaults.extra_scripts} ; pio/strip-floats.py, pio/sftp-uploader.py ; *** Upload file to OTA server in folder api/arduino using HTTP @@ -178,7 +178,7 @@ build_flags = ${esp82xx_defaults.build_flags} ; NONOSDK22x_191024 ; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_191024 ; NONOSDK22x_191105 -; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_191105 +; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_191105 ; NONOSDK3V0 (known issues) ; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK3 ; lwIP 1.4 diff --git a/tasmota/CHANGELOG.md b/tasmota/CHANGELOG.md index 2ab00d9ba..259095dc3 100644 --- a/tasmota/CHANGELOG.md +++ b/tasmota/CHANGELOG.md @@ -1,5 +1,12 @@ ## Unreleased (development) + +## Released + +### 7.1.0 20191129 + +- Release + ### 7.0.0.6 20191122 - Add colorpicker to WebUI by Christian Staars (#6984) @@ -65,8 +72,6 @@ - Add support for Tuya battery powered devices (#6735) - Change repository name from Sonoff-Tasmota to Tasmota and all code references from Sonoff to Tasmota -## Released - ### 6.7.1 20191026 - Release diff --git a/tasmota/tasmota_version.h b/tasmota/tasmota_version.h index 4e674bf6c..bb71cb5f2 100644 --- a/tasmota/tasmota_version.h +++ b/tasmota/tasmota_version.h @@ -20,6 +20,6 @@ #ifndef _TASMOTA_VERSION_H_ #define _TASMOTA_VERSION_H_ -const uint32_t VERSION = 0x07000006; +const uint32_t VERSION = 0x07010000; #endif // _TASMOTA_VERSION_H_