From 53b496fd006a42a91062a602878da98786e99f0f Mon Sep 17 00:00:00 2001 From: Thomas Basler Date: Wed, 6 Nov 2024 19:39:24 +0100 Subject: [PATCH] Replace multiline print by printf --- src/InverterSettings.cpp | 8 ++++---- src/MqttSettings.cpp | 3 +-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/InverterSettings.cpp b/src/InverterSettings.cpp index 7e7a5f86..4b5d52e7 100644 --- a/src/InverterSettings.cpp +++ b/src/InverterSettings.cpp @@ -60,10 +60,10 @@ void InverterSettingsClass::init(Scheduler& scheduler) for (uint8_t i = 0; i < INV_MAX_COUNT; i++) { if (config.Inverter[i].Serial > 0) { - MessageOutput.print(" Adding inverter: "); - MessageOutput.print(config.Inverter[i].Serial, HEX); - MessageOutput.print(" - "); - MessageOutput.print(config.Inverter[i].Name); + MessageOutput.printf(" Adding inverter: %0" PRIx32 "%08" PRIx32 " - %s", + static_cast((config.Inverter[i].Serial >> 32) & 0xFFFFFFFF), + static_cast(config.Inverter[i].Serial & 0xFFFFFFFF), + config.Inverter[i].Name); auto inv = Hoymiles.addInverter( config.Inverter[i].Name, config.Inverter[i].Serial); diff --git a/src/MqttSettings.cpp b/src/MqttSettings.cpp index b86c51f5..c547e0db 100644 --- a/src/MqttSettings.cpp +++ b/src/MqttSettings.cpp @@ -91,8 +91,7 @@ void MqttSettingsClass::onMqttDisconnect(espMqttClientTypes::DisconnectReason re void MqttSettingsClass::onMqttMessage(const espMqttClientTypes::MessageProperties& properties, const char* topic, const uint8_t* payload, const size_t len, const size_t index, const size_t total) { - MessageOutput.print("Received MQTT message on topic: "); - MessageOutput.println(topic); + MessageOutput.printf("Received MQTT message on topic: %s\r\n", topic); _mqttSubscribeParser.handle_message(properties, topic, payload, len, index, total); }