andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-09 01:09:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev

Browse Source
This commit is contained in:
MichaelDvP
2023-03-15 07:16:34 +01:00
parent a92474bf37 432220dc86
commit 216e7e5307
152 changed files with 2121 additions and 2315 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/locale_translations.h
View File

@@ -1,7 +1,7 @@
/*
* EMS-ESP - https://github.com/emsesp/EMS-ESP
* Copyright 2020-2023 Paul Derbyshire
*
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
@@ -29,8 +29,7 @@
#define EMSESP_LOCALE_FR "fr"
#define EMSESP_LOCALE_TR "tr"
// IMPORTANT!
// translations are in the order: en, de, nl, sv, pl, no, fr, tr
// IMPORTANT! translations are in the order: en, de, nl, sv, pl, no, fr, tr
//
// if there is no translation, it will default to en
//

4
src/system.cpp
View File

@@ -531,8 +531,8 @@ void System::loop() {
void System::send_info_mqtt(const char * event_str, bool send_ntp) {
// use dynamic json becaues it is called from NTP-callback from lwip task with small stack
DynamicJsonDocument doc = DynamicJsonDocument(EMSESP_JSON_SIZE_MEDIUM);
doc["event"] = event_str;
doc["version"] = EMSESP_APP_VERSION;
doc["event"] = event_str;
doc["version"] = EMSESP_APP_VERSION;
// if NTP is enabled send the boot_time in local time in ISO 8601 format (eg: 2022-11-15 20:46:38)
// https://github.com/emsesp/EMS-ESP32/issues/751

2
src/version.h
View File

@@ -1 +1 @@
#define EMSESP_APP_VERSION "3.6.0-dev.6"
#define EMSESP_APP_VERSION "3.6.0-dev.7"