diff --git a/README.md b/README.md index 9950989539..ec7a6a85b4 100644 --- a/README.md +++ b/README.md @@ -1,39 +1,33 @@ # ESPEasy (mega branch) -Build status: [![Build Status](https://travis-ci.org/letscontrolit/ESPEasy.svg?branch=v2.0)](https://travis-ci.org/letscontrolit/ESPEasy) +Build status: [![Build Status](https://travis-ci.org/letscontrolit/ESPEasy.svg?branch=mega)](https://travis-ci.org/letscontrolit/ESPEasy) Introduction and wiki: https://www.letscontrolit.com/wiki/index.php/ESPEasy#Introduction -This is the development branch for the next upcoming release (2.0.0). This is also known as ESPEasyMega. +This is the development branch of ESPEasy. All new untested features go into this branch. Fixes from stable branches will also be merged in this one. Check here to learn how to use this branch and help us improving ESPEasy: http://www.letscontrolit.com/wiki/index.php/ESPEasy#Source_code_development -## Versions -* v2.0.0-devX: these are the current development releases. use these if you want bleeding edge features, or if you want to help us testing and developing. new release every month. -* v2.0.0-betaX: as soon as we think its stable/complete enough for real testing, we will start numbering beta's. -* v2.0.0-rcX: release candidates (probably stable) -* v2.0.0: This will be the first stable release. After this we will use more standard numbering. Next bugfix release will probably be 2.0.1. +## Automated binary releases -## Firmware binary releases +Every night our build-bot will build a new binary release: https://github.com/letscontrolit/ESPEasy/releases -Binary development releases are here: https://github.com/letscontrolit/ESPEasy/releases +The releases are named something like 'mega-01022018' (last number is the build date) -Depending on your needs, we release different types of files. - -For version 2.0.0-dev13 and higer: +Depending on your needs, we release different types of files: Firmware name | Hardware | Included plugins | ----------------------------------------------|-------------------------|-----------------------------| -ESPEasy_v2.0.0-dev13_normal_ESP8266_1024.bin | ESP8266 with 1Mb flash | Stable | -ESPEasy_v2.0.0-dev13_test_ESP8266_1024.bin | ESP8266 with 1Mb flash | Stable + Test | -ESPEasy_v2.0.0-dev13_dev_ESP8266_1024.bin | ESP8266 with 1Mb flash | Stable + Test + Development | -ESPEasy_v2.0.0-dev13_normal_ESP8266_4096.bin | ESP8266 with 4Mb flash | Stable | -ESPEasy_v2.0.0-dev13_test_ESP8266_4096.bin | ESP8266 with 4Mb flash | Stable + Test | -ESPEasy_v2.0.0-dev13_dev_ESP8266_4096.bin | ESP8266 with 4Mb flash | Stable + Test + Development | -ESPEasy_v2.0.0-dev13_normal_ESP8285_1024.bin | ESP8285 with 1Mb flash | Stable | -ESPEasy_v2.0.0-dev13_test_ESP8285_1024.bin | ESP8285 with 1Mb flash | Stable + Test | -ESPEasy_v2.0.0-dev13_dev_ESP8285_1024.bin | ESP8285 with 1Mb flash | Stable + Test + Development | +ESPEasy_mega-01022018_normal_ESP8266_1024.bin | ESP8266 with 1Mb flash | Stable | +ESPEasy_mega-01022018_test_ESP8266_1024.bin | ESP8266 with 1Mb flash | Stable + Test | +ESPEasy_mega-01022018_dev_ESP8266_1024.bin | ESP8266 with 1Mb flash | Stable + Test + Development | +ESPEasy_mega-01022018_normal_ESP8266_4096.bin | ESP8266 with 4Mb flash | Stable | +ESPEasy_mega-01022018_test_ESP8266_4096.bin | ESP8266 with 4Mb flash | Stable + Test | +ESPEasy_mega-01022018_dev_ESP8266_4096.bin | ESP8266 with 4Mb flash | Stable + Test + Development | +ESPEasy_mega-01022018_normal_ESP8285_1024.bin | ESP8285 with 1Mb flash | Stable | +ESPEasy_mega-01022018_test_ESP8285_1024.bin | ESP8285 with 1Mb flash | Stable + Test | +ESPEasy_mega-01022018_dev_ESP8285_1024.bin | ESP8285 with 1Mb flash | Stable + Test + Development | ## More info