From 2447d57301498e700e8f1cb825fde66ce8475fa6 Mon Sep 17 00:00:00 2001 From: Thomas Basler Date: Tue, 4 Oct 2022 23:33:09 +0200 Subject: [PATCH] Fixed printf format strings --- src/MqttHassPublishing.cpp | 2 +- src/MqttPublishing.cpp | 4 ++-- src/WebApi_devinfo.cpp | 2 +- src/WebApi_dtu.cpp | 2 +- src/WebApi_eventlog.cpp | 2 +- src/WebApi_inverter.cpp | 2 +- src/WebApi_limit.cpp | 2 +- src/WebApi_power.cpp | 2 +- src/WebApi_ws_live.cpp | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/MqttHassPublishing.cpp b/src/MqttHassPublishing.cpp index c18829b..aaa50d9 100644 --- a/src/MqttHassPublishing.cpp +++ b/src/MqttHassPublishing.cpp @@ -74,7 +74,7 @@ void MqttHassPublishingClass::publishField(std::shared_ptr inv } char serial[sizeof(uint64_t) * 8 + 1]; - snprintf(serial, sizeof(serial), "%0lx%08lx", + snprintf(serial, sizeof(serial), "%0x%08x", ((uint32_t)((inv->serial() >> 32) & 0xFFFFFFFF)), ((uint32_t)(inv->serial() & 0xFFFFFFFF))); diff --git a/src/MqttPublishing.cpp b/src/MqttPublishing.cpp index 0e722f6..9d56901 100644 --- a/src/MqttPublishing.cpp +++ b/src/MqttPublishing.cpp @@ -34,7 +34,7 @@ void MqttPublishingClass::loop() auto inv = Hoymiles.getInverterByPos(i); char buffer[sizeof(uint64_t) * 8 + 1]; - snprintf(buffer, sizeof(buffer), "%0lx%08lx", + snprintf(buffer, sizeof(buffer), "%0x%08x", ((uint32_t)((inv->serial() >> 32) & 0xFFFFFFFF)), ((uint32_t)(inv->serial() & 0xFFFFFFFF))); String subtopic = String(buffer); @@ -106,7 +106,7 @@ String MqttPublishingClass::getTopic(std::shared_ptr inv, uint } char buffer[sizeof(uint64_t) * 8 + 1]; - snprintf(buffer, sizeof(buffer), "%0lx%08lx", + snprintf(buffer, sizeof(buffer), "%0x%08x", ((uint32_t)((inv->serial() >> 32) & 0xFFFFFFFF)), ((uint32_t)(inv->serial() & 0xFFFFFFFF))); String invSerial = String(buffer); diff --git a/src/WebApi_devinfo.cpp b/src/WebApi_devinfo.cpp index b497b26..c9a1843 100644 --- a/src/WebApi_devinfo.cpp +++ b/src/WebApi_devinfo.cpp @@ -31,7 +31,7 @@ void WebApiDevInfoClass::onDevInfoStatus(AsyncWebServerRequest* request) // Inverter Serial is read as HEX char buffer[sizeof(uint64_t) * 8 + 1]; - snprintf(buffer, sizeof(buffer), "%0lx%08lx", + snprintf(buffer, sizeof(buffer), "%0x%08x", ((uint32_t)((inv->serial() >> 32) & 0xFFFFFFFF)), ((uint32_t)(inv->serial() & 0xFFFFFFFF))); diff --git a/src/WebApi_dtu.cpp b/src/WebApi_dtu.cpp index 65c6858..b832c26 100644 --- a/src/WebApi_dtu.cpp +++ b/src/WebApi_dtu.cpp @@ -30,7 +30,7 @@ void WebApiDtuClass::onDtuAdminGet(AsyncWebServerRequest* request) // DTU Serial is read as HEX char buffer[sizeof(uint64_t) * 8 + 1]; - snprintf(buffer, sizeof(buffer), "%0lx%08lx", + snprintf(buffer, sizeof(buffer), "%0x%08x", ((uint32_t)((config.Dtu_Serial >> 32) & 0xFFFFFFFF)), ((uint32_t)(config.Dtu_Serial & 0xFFFFFFFF))); root[F("dtu_serial")] = buffer; diff --git a/src/WebApi_eventlog.cpp b/src/WebApi_eventlog.cpp index b73b72e..edff3bb 100644 --- a/src/WebApi_eventlog.cpp +++ b/src/WebApi_eventlog.cpp @@ -36,7 +36,7 @@ void WebApiEventlogClass::onEventlogStatus(AsyncWebServerRequest* request) if (inv != nullptr) { // Inverter Serial is read as HEX char buffer[sizeof(uint64_t) * 8 + 1]; - snprintf(buffer, sizeof(buffer), "%0lx%08lx", + snprintf(buffer, sizeof(buffer), "%0x%08x", ((uint32_t)((inv->serial() >> 32) & 0xFFFFFFFF)), ((uint32_t)(inv->serial() & 0xFFFFFFFF))); diff --git a/src/WebApi_inverter.cpp b/src/WebApi_inverter.cpp index 411c4c7..bcf6b4c 100644 --- a/src/WebApi_inverter.cpp +++ b/src/WebApi_inverter.cpp @@ -42,7 +42,7 @@ void WebApiInverterClass::onInverterList(AsyncWebServerRequest* request) // Inverter Serial is read as HEX char buffer[sizeof(uint64_t) * 8 + 1]; - snprintf(buffer, sizeof(buffer), "%0lx%08lx", + snprintf(buffer, sizeof(buffer), "%0x%08x", ((uint32_t)((config.Inverter[i].Serial >> 32) & 0xFFFFFFFF)), ((uint32_t)(config.Inverter[i].Serial & 0xFFFFFFFF))); obj[F("serial")] = buffer; diff --git a/src/WebApi_limit.cpp b/src/WebApi_limit.cpp index af9a377..56a3f0f 100644 --- a/src/WebApi_limit.cpp +++ b/src/WebApi_limit.cpp @@ -31,7 +31,7 @@ void WebApiLimitClass::onLimitStatus(AsyncWebServerRequest* request) // Inverter Serial is read as HEX char buffer[sizeof(uint64_t) * 8 + 1]; - snprintf(buffer, sizeof(buffer), "%0lx%08lx", + snprintf(buffer, sizeof(buffer), "%0x%08x", ((uint32_t)((inv->serial() >> 32) & 0xFFFFFFFF)), ((uint32_t)(inv->serial() & 0xFFFFFFFF))); diff --git a/src/WebApi_power.cpp b/src/WebApi_power.cpp index cb63e00..30aacf8 100644 --- a/src/WebApi_power.cpp +++ b/src/WebApi_power.cpp @@ -31,7 +31,7 @@ void WebApiPowerClass::onPowerStatus(AsyncWebServerRequest* request) // Inverter Serial is read as HEX char buffer[sizeof(uint64_t) * 8 + 1]; - snprintf(buffer, sizeof(buffer), "%0lx%08lx", + snprintf(buffer, sizeof(buffer), "%0x%08x", ((uint32_t)((inv->serial() >> 32) & 0xFFFFFFFF)), ((uint32_t)(inv->serial() & 0xFFFFFFFF))); diff --git a/src/WebApi_ws_live.cpp b/src/WebApi_ws_live.cpp index 6764be9..ab098fa 100644 --- a/src/WebApi_ws_live.cpp +++ b/src/WebApi_ws_live.cpp @@ -78,7 +78,7 @@ void WebApiWsLiveClass::generateJsonResponse(JsonVariant& root) auto inv = Hoymiles.getInverterByPos(i); char buffer[sizeof(uint64_t) * 8 + 1]; - snprintf(buffer, sizeof(buffer), "%0lx%08lx", + snprintf(buffer, sizeof(buffer), "%0x%08x", ((uint32_t)((inv->serial() >> 32) & 0xFFFFFFFF)), ((uint32_t)(inv->serial() & 0xFFFFFFFF)));