refactor(progmem)

tspopp · Jun 15, 2024 · d0c99c4 · d0c99c4
1 parent b43fd4d
commit d0c99c4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/tools/AquaDebug/include/mqtt/MQTTDefinitions.h b/tools/AquaDebug/include/mqtt/MQTTDefinitions.h
@@ -1,15 +1,13 @@
 #ifndef AQUAMQTT_MQTTDEFINITIONS_H
 #define AQUAMQTT_MQTTDEFINITIONS_H
 
-#include "pgmspace.h"
-
 namespace aquamqtt
 {
 namespace mqtt
 {
 
-const char BASE_TOPIC[] PROGMEM = { "aquadbg/" };
-const char DEBUG[] PROGMEM      = { "debug" };
+constexpr char BASE_TOPIC[] = { "aquadbg/" };
+constexpr char DEBUG[]      = { "debug" };
 
 }  // namespace mqtt
 }  // namespace aquamqtt

diff --git a/tools/AquaDebug/src/main.cpp b/tools/AquaDebug/src/main.cpp
@@ -86,7 +86,7 @@ void loop()
                 mBuffer.pop(retVal);
                 mTempBuffer[i] = retVal;
             }
-            sprintf(reinterpret_cast<char*>(mTopicBuffer), "%s%S%S", config::mqttPrefix, BASE_TOPIC, DEBUG);
+            sprintf(reinterpret_cast<char*>(mTopicBuffer), "%s%s%s", config::mqttPrefix, BASE_TOPIC, DEBUG);
             toHexStr(mTempBuffer, BUFFER_SIZE, reinterpret_cast<char*>(mPayloadBuffer));
             mMQTTClient.publish(reinterpret_cast<char*>(mTopicBuffer), reinterpret_cast<char*>(mPayloadBuffer));
         }