jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-28 13:16:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

v5.6.1k - Fix preprocessor language selection

Browse Source 
5.6.1k
* Fix preprocessor language selection
This commit is contained in:
arendst 2017-09-02 17:16:18 +02:00
parent 1facc146cc
commit 95d54230fc
6 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -1,7 +1,7 @@
## Sonoff-Tasmota ## Sonoff-Tasmota
Provide ESP8266 based Sonoff by [iTead Studio](https://www.itead.cc/) and ElectroDragon IoT Relay with Serial, Web and MQTT control allowing 'Over the Air' or OTA firmware updates using Arduino IDE. Provide ESP8266 based Sonoff by [iTead Studio](https://www.itead.cc/) and ElectroDragon IoT Relay with Serial, Web and MQTT control allowing 'Over the Air' or OTA firmware updates using Arduino IDE.
Current version is **5.6.1j** - See [sonoff/_releasenotes.ino](https://github.com/arendst/Sonoff-Tasmota/blob/development/sonoff/_releasenotes.ino) for change information. Current version is **5.6.1k** - See [sonoff/_releasenotes.ino](https://github.com/arendst/Sonoff-Tasmota/blob/development/sonoff/_releasenotes.ino) for change information.
### ATTENTION All versions ### ATTENTION All versions

5
sonoff/_releasenotes.ino
View File

@ -1,4 +1,7 @@
/* 5.6.1j /* 5.6.1k
* Fix preprocessor language selection
*
* 5.6.1j
* Fix compile error on Linux due to language folder name * Fix compile error on Linux due to language folder name
* *
* 5.6.1i * 5.6.1i

10
sonoff/i18n.h
View File

@ -17,10 +17,14 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef LANGUAGE #ifndef MY_LANGUAGE
#define LANGUAGE "language/en-GB.h" #include "language/en-GB.h"
#else
#define QUOTEME(x) QUOTEME_1(x)
#define QUOTEME_1(x) #x
#define INCLUDE_FILE(x) QUOTEME(language/x.h)
#include INCLUDE_FILE(MY_LANGUAGE)
#endif #endif
#include LANGUAGE
// Common // Common

3
sonoff/language/nl-NL.h
View File

@ -1,5 +1,5 @@
/* /*
i18n_nl-NL.h - localization for Dutch - Nederland for Sonoff-Tasmota nl-NL.h - localization for Dutch - Nederland for Sonoff-Tasmota
Copyright (C) 2017 Theo Arends Copyright (C) 2017 Theo Arends
@ -26,7 +26,6 @@
* *
\*********************************************************************/ \*********************************************************************/
// Time and Date managed by SDK will not be localized (yet)
// "2017-03-07T11:08:02" - ISO8601:2004 // "2017-03-07T11:08:02" - ISO8601:2004
#define D_YEAR_MONTH_SEPARATOR "-" #define D_YEAR_MONTH_SEPARATOR "-"
#define D_MONTH_DAY_SEPARATOR "-" #define D_MONTH_DAY_SEPARATOR "-"

2
sonoff/sonoff.ino
View File

@ -25,7 +25,7 @@
- Select IDE Tools - Flash Size: "1M (no SPIFFS)" - Select IDE Tools - Flash Size: "1M (no SPIFFS)"
====================================================*/ ====================================================*/
#define VERSION 0x0506010A // 5.6.1j #define VERSION 0x0506010B // 5.6.1k
enum log_t {LOG_LEVEL_NONE, LOG_LEVEL_ERROR, LOG_LEVEL_INFO, LOG_LEVEL_DEBUG, LOG_LEVEL_DEBUG_MORE, LOG_LEVEL_ALL}; enum log_t {LOG_LEVEL_NONE, LOG_LEVEL_ERROR, LOG_LEVEL_INFO, LOG_LEVEL_DEBUG, LOG_LEVEL_DEBUG_MORE, LOG_LEVEL_ALL};
enum week_t {Last, First, Second, Third, Fourth}; enum week_t {Last, First, Second, Third, Fourth};

4
sonoff/user_config.h
View File

@ -26,8 +26,8 @@
\*********************************************************************************************/ \*********************************************************************************************/
// -- Localization -------------------------------- // -- Localization --------------------------------
#define LANGUAGE "language/en-GB.h" //#define MY_LANGUAGE en-GB // Enabled by Default
//#define LANGUAGE "language/nl-NL.h" //#define MY_LANGUAGE nl-NL
// -- Project ------------------------------------- // -- Project -------------------------------------
#define PROJECT "sonoff" // PROJECT is used as the default topic delimiter and OTA file name #define PROJECT "sonoff" // PROJECT is used as the default topic delimiter and OTA file name