From e680ae6066694cf566eba3d5d7deae13c21fa379 Mon Sep 17 00:00:00 2001 From: Susis Strolch Date: Mon, 29 Jul 2019 10:00:52 +0200 Subject: [PATCH] =?UTF-8?q?=C2=B0=20fix=20compile=20time=20error=20in=20em?= =?UTF-8?q?s.cpp=20(missing=20comment)=20=C2=B0=20show=20'echo:telegram'?= =?UTF-8?q?=20msg=20only=20in=20jabber=20mode=20=C2=B0=20fix=20wrong=20val?= =?UTF-8?q?ue=20when=20applying=20'log=20j'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/ems-esp.cpp | 2 +- src/ems.cpp | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/ems-esp.cpp b/src/ems-esp.cpp index 3632f6644..d3468c2e1 100644 --- a/src/ems-esp.cpp +++ b/src/ems-esp.cpp @@ -1468,7 +1468,7 @@ void TelnetCommandCallback(uint8_t wc, const char * commandLine) { ems_setLogging(EMS_SYS_LOGGING_NONE); ok = true; } else if (strcmp(second_cmd, "j") == 0) { - ems_setLogging(EMS_SYS_LOGGING_NONE); + ems_setLogging(EMS_SYS_LOGGING_JABBER); ok = true; } } diff --git a/src/ems.cpp b/src/ems.cpp index 6bc10ddf9..dbe01ac2d 100644 --- a/src/ems.cpp +++ b/src/ems.cpp @@ -879,7 +879,7 @@ void ems_parseTelegram(uint8_t * telegram, uint8_t length) { // ignore anything that doesn't resemble a proper telegram package // minimal is 5 bytes, excluding CRC at the end if (length <= 4) { - _debugPrintTelegram("Noisy data:", &EMS_RxTelegram, COLOR_RED); + // _debugPrintTelegram("Noisy data:", &EMS_RxTelegram, COLOR_RED); return; } @@ -1122,7 +1122,8 @@ void _processType(_EMS_RxTelegram * EMS_RxTelegram) { // if its an echo of ourselves from the master UBA, ignore. This should never happen mind you if (EMS_RxTelegram->src == EMS_ID_ME) { - _debugPrintTelegram("echo:", EMS_RxTelegram, COLOR_WHITE); + if (EMS_Sys_Status.emsLogging == EMS_SYS_LOGGING_JABBER) + _debugPrintTelegram("echo:", EMS_RxTelegram, COLOR_WHITE); return; }