Merge branch 'development' of https://github.com/arendst/Sonoff-Tasmota into feature/led_gamma_10_bits

This commit is contained in:
Stephan Hadinger 2019-05-04 17:37:05 +02:00
commit 4b3c826a0e
2 changed files with 2 additions and 2 deletions

View File

@ -43,7 +43,7 @@ Download one of the released binaries from https://github.com/arendst/Sonoff-Tas
If you want to compile Sonoff-Tasmota yourself keep in mind the following: If you want to compile Sonoff-Tasmota yourself keep in mind the following:
- Only Flash Mode **DOUT** is supported. Do not use Flash Mode DIO / QIO / QOUT as it might seem to brick your device. See [Wiki](https://github.com/arendst/Sonoff-Tasmota/wiki/Theo's-Tasmota-Tips) for background information. - Only Flash Mode **DOUT** is supported. Do not use Flash Mode DIO / QIO / QOUT as it might seem to brick your device. See [Wiki](https://github.com/arendst/Sonoff-Tasmota/wiki/Theo's-Tasmota-Tips) for background information.
- Sonoff-Tasmota uses a 1M linker script WITHOUT spiffs **1M (no SPIFFS)** for optimal code space. If you compile using ESP/Arduino library 2.3.0 then download the provided new linker script to your Arduino IDE or Platformio base folder. Later version of ESP/Arduino library already contain the correct linker script. See [Wiki > Prerequisite](https://github.com/arendst/Sonoff-Tasmota/wiki/Prerequisite). - Sonoff-Tasmota uses a 1M linker script WITHOUT spiffs **1M (no SPIFFS)** for optimal code space. If you compile using ESP/Arduino library 2.3.0 then download the provided new linker script to your Arduino IDE or Platformio base folder. Later version of ESP/Arduino library already contain the correct linker script. See [Wiki > Prerequisites](https://github.com/arendst/Sonoff-Tasmota/wiki/Prerequisites).
- To make compile time changes to Sonoff-Tasmota it can use the ``user_config_override.h`` file. It assures keeping your settings when you download and compile a new version. To use ``user_config.override.h`` you will have to make a copy of the provided ``user_config_override_sample.h`` file and add your setting overrides. To enable the override file you will need to use a compile define as documented in the ``user_config_override_sample.h`` file. - To make compile time changes to Sonoff-Tasmota it can use the ``user_config_override.h`` file. It assures keeping your settings when you download and compile a new version. To use ``user_config.override.h`` you will have to make a copy of the provided ``user_config_override_sample.h`` file and add your setting overrides. To enable the override file you will need to use a compile define as documented in the ``user_config_override_sample.h`` file.
### Version Information ### Version Information

View File

@ -54,7 +54,7 @@
#define D_ADMIN "Admin" #define D_ADMIN "Admin"
#define D_AIR_QUALITY "Luftqualität" #define D_AIR_QUALITY "Luftqualität"
#define D_AP "AP" // Access Point #define D_AP "AP" // Access Point
#define D_AS "wie" #define D_AS "als"
#define D_AUTO "AUTO" #define D_AUTO "AUTO"
#define D_BLINK "Blinken" #define D_BLINK "Blinken"
#define D_BLINKOFF "BlinkenAus" #define D_BLINKOFF "BlinkenAus"