Mirrors/OpenDTU
2
0
Fork 0
mirror of https://github.com/tbnobody/OpenDTU.git synced 2025-12-16 23:31:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

MqttSettings: Replace all print and println with printf

Browse Source
This commit is contained in:
Thomas Basler
2025-04-11 21:00:31 +02:00
parent 7f922f849a
commit 5cb7fcd854
1 changed files with 21 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/MqttSettings.cpp
View File

@@ -5,6 +5,8 @@
#include "MqttSettings.h" #include "MqttSettings.h"
#include "Configuration.h" #include "Configuration.h"
#include "MessageOutput.h" #include "MessageOutput.h"
#include <frozen/map.h>
#include <frozen/string.h>
MqttSettingsClass::MqttSettingsClass() MqttSettingsClass::MqttSettingsClass()
{ {
@@ -14,11 +16,11 @@ void MqttSettingsClass::NetworkEvent(network_event event)
{ {
switch (event) { switch (event) {
case network_event::NETWORK_GOT_IP: case network_event::NETWORK_GOT_IP:
MessageOutput.println("Network connected"); MessageOutput.printf("Network connected\r\n");
performConnect(); performConnect();
break; break;
case network_event::NETWORK_DISCONNECTED: case network_event::NETWORK_DISCONNECTED:
MessageOutput.println("Network lost connection"); MessageOutput.printf("Network lost connection\r\n");
_mqttReconnectTimer.detach(); // ensure we don't reconnect to MQTT while reconnecting to Wi-Fi _mqttReconnectTimer.detach(); // ensure we don't reconnect to MQTT while reconnecting to Wi-Fi
break; break;
default: default:
@@ -28,7 +30,7 @@ void MqttSettingsClass::NetworkEvent(network_event event)
void MqttSettingsClass::onMqttConnect(const bool sessionPresent) void MqttSettingsClass::onMqttConnect(const bool sessionPresent)
{ {
MessageOutput.println("Connected to MQTT."); MessageOutput.printf("Connected to MQTT.\r\n");
const CONFIG_T& config = Configuration.get(); const CONFIG_T& config = Configuration.get();
publish(config.Mqtt.Lwt.Topic, config.Mqtt.Lwt.Value_Online); publish(config.Mqtt.Lwt.Topic, config.Mqtt.Lwt.Value_Online);
@@ -60,31 +62,22 @@ void MqttSettingsClass::unsubscribe(const String& topic)
void MqttSettingsClass::onMqttDisconnect(espMqttClientTypes::DisconnectReason reason) void MqttSettingsClass::onMqttDisconnect(espMqttClientTypes::DisconnectReason reason)
{ {
MessageOutput.println("Disconnected from MQTT."); static constexpr frozen::map<espMqttClientTypes::DisconnectReason, frozen::string, 8> reasons = {
{ espMqttClientTypes::DisconnectReason::USER_OK, "USER_OK" },
{ espMqttClientTypes::DisconnectReason::MQTT_UNACCEPTABLE_PROTOCOL_VERSION, "MQTT_UNACCEPTABLE_PROTOCOL_VERSION" },
{ espMqttClientTypes::DisconnectReason::MQTT_IDENTIFIER_REJECTED, "MQTT_IDENTIFIER_REJECTED" },
{ espMqttClientTypes::DisconnectReason::MQTT_SERVER_UNAVAILABLE, "MQTT_SERVER_UNAVAILABLE" },
{ espMqttClientTypes::DisconnectReason::MQTT_MALFORMED_CREDENTIALS, "MQTT_MALFORMED_CREDENTIALS" },
{ espMqttClientTypes::DisconnectReason::MQTT_NOT_AUTHORIZED, "MQTT_NOT_AUTHORIZED" },
{ espMqttClientTypes::DisconnectReason::TLS_BAD_FINGERPRINT, "TLS_BAD_FINGERPRINT" },
{ espMqttClientTypes::DisconnectReason::TCP_DISCONNECTED, "TCP_DISCONNECTED" },
};
auto it = reasons.find(reason);
const char* reasonStr = (it != reasons.end()) ? it->second.data() : "Unknown";
MessageOutput.printf("Disconnected from MQTT. Reason: %s\r\n", reasonStr);
MessageOutput.print("Disconnect reason:");
switch (reason) {
case espMqttClientTypes::DisconnectReason::TCP_DISCONNECTED:
MessageOutput.println("TCP_DISCONNECTED");
break;
case espMqttClientTypes::DisconnectReason::MQTT_UNACCEPTABLE_PROTOCOL_VERSION:
MessageOutput.println("MQTT_UNACCEPTABLE_PROTOCOL_VERSION");
break;
case espMqttClientTypes::DisconnectReason::MQTT_IDENTIFIER_REJECTED:
MessageOutput.println("MQTT_IDENTIFIER_REJECTED");
break;
case espMqttClientTypes::DisconnectReason::MQTT_SERVER_UNAVAILABLE:
MessageOutput.println("MQTT_SERVER_UNAVAILABLE");
break;
case espMqttClientTypes::DisconnectReason::MQTT_MALFORMED_CREDENTIALS:
MessageOutput.println("MQTT_MALFORMED_CREDENTIALS");
break;
case espMqttClientTypes::DisconnectReason::MQTT_NOT_AUTHORIZED:
MessageOutput.println("MQTT_NOT_AUTHORIZED");
break;
default:
MessageOutput.println("Unknown");
}
_mqttReconnectTimer.once( _mqttReconnectTimer.once(
2, +[](MqttSettingsClass* instance) { instance->performConnect(); }, this); 2, +[](MqttSettingsClass* instance) { instance->performConnect(); }, this);
} }
@@ -111,7 +104,7 @@ void MqttSettingsClass::performConnect()
return; return;
} }
MessageOutput.println("Connecting to MQTT..."); MessageOutput.printf("Connecting to MQTT...\r\n");
const CONFIG_T& config = Configuration.get(); const CONFIG_T& config = Configuration.get();
const String willTopic = getPrefix() + config.Mqtt.Lwt.Topic; const String willTopic = getPrefix() + config.Mqtt.Lwt.Topic;
String clientId = getClientId(); String clientId = getClientId();