diff --git a/evcharger-app/deviceconnection.cpp b/evcharger-app/deviceconnection.cpp index ca2025e..d0b21dd 100644 --- a/evcharger-app/deviceconnection.cpp +++ b/evcharger-app/deviceconnection.cpp @@ -133,7 +133,9 @@ void DeviceConnection::messageReceived(const QVariant &variant) const auto &type = typeVariant.toString(); qDebug() << type; - bool omitLog{}; + + if (type != "fullStatus" && type != "deltaStatus") + emit logMessage(tr("Received message type %0 %1").arg(type).arg(QJsonDocument::fromVariant(variant).toJson())); if (type == "hello") { @@ -276,8 +278,6 @@ void DeviceConnection::messageReceived(const QVariant &variant) } else if (type == "fullStatus") { - omitLog = true; - emit hideDisturbed(); bool partial{}; @@ -319,8 +319,6 @@ void DeviceConnection::messageReceived(const QVariant &variant) } else if (type == "deltaStatus") { - omitLog = true; - auto iter = map.find("status"); if (iter == std::cend(map)) { @@ -367,11 +365,6 @@ void DeviceConnection::messageReceived(const QVariant &variant) emit showDisturbed(); } - if (!omitLog) - { - emit logMessage(tr("Received message type %0 %1").arg(type).arg(QJsonDocument::fromVariant(variant).toJson())); - } - if (auto iter = map.find("requestId"); iter != std::cend(map)) { const auto &requestIdVariant = *iter; diff --git a/evcharger-app/i18n/qml_de.ts b/evcharger-app/i18n/qml_de.ts index 2891a21..54e9f5e 100644 --- a/evcharger-app/i18n/qml_de.ts +++ b/evcharger-app/i18n/qml_de.ts @@ -981,42 +981,42 @@ - + Received hello without serial! - + Received hello with a non-string serial! - + Received hello with a non-bool secured! - + Received hello without manufacturer! - + Received hello with a non-string manufacturer! - + Received hello without friendly_name! - + Received hello with a non-string friendly_name! - + Received hello without devicetype! @@ -1031,27 +1031,27 @@ - + Received hello with a non-string devicetype! - + Received authRequired without token1! - + Received authRequired with a non-string token1! - + Received authRequired without token2! - + Received authRequired with a non-string token2! @@ -1081,92 +1081,92 @@ - + Received deltaStatus without a status! - + Received deltaStatus with a non-object status! - + Received message type %0 %1 - + Received message with a non-string requestId! - + Sending %0 - + Connected! Verbunden! - + Disconnected! Verbindung verloren! - + Reconnecting to %0 Verbinde wieder zu %0 - + state changed: %0 - + could not parse received json: %0 at offset %1 - + unknown binary message type %0 received - + error occured: %0 - + ssl peer verify error - + ssl errors - + ssl alert sent level=%0 type=%1 description=%2 - + ssl alert received level=%0 type=%1 description=%2 - + ssl handshake interrupted on error - + unknown response type %0