From 3a09b61685911530589b07fb688c7e55f56463ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Patrick=20Ha=C3=9Fel?= <git@patrick-hassel.de>
Date: Mon, 15 Apr 2024 14:30:29 +0200
Subject: [PATCH] data topic cleanup

---
 lib/patrix/data.h           | 10 ++++------
 lib/patrix/mqtt.cpp         |  6 ++----
 lib/patrix/mqtt.h           |  2 +-
 src/Fermenter/Fermenter.cpp |  2 +-
 4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/lib/patrix/data.h b/lib/patrix/data.h
index dc30243..f68ecb3 100644
--- a/lib/patrix/data.h
+++ b/lib/patrix/data.h
@@ -23,8 +23,6 @@ private:
     T data;
   };
 
-  const char *name;
-
   Entry buffer[size];
 
   Entry *bufferRead = buffer;
@@ -36,7 +34,7 @@ private:
 public:
 
   template<typename U = T, typename = ExtendsIData<U>>
-  explicit Cache(const char *name) : name(name) {
+  explicit Cache() {
     // -
   }
 
@@ -59,17 +57,17 @@ public:
     json["timestamp"] = correctTime(bufferRead->timestamp);
     JsonObject data = json["data"].to<JsonObject>();
     bufferRead->data.toJson(data);
-    if (mqttPublishData(name, json)) {
+    if (mqttPublishData(json)) {
       bufferRead = (bufferRead - buffer + 1) % size + buffer;
       usage--;
     }
   }
 
-  size_t getUsage() const {
+  [[nodiscard]] size_t getUsage() const {
     return usage;
   }
 
-  size_t getSize() const {
+  [[nodiscard]] size_t getSize() const {
     return size;
   }
 
diff --git a/lib/patrix/mqtt.cpp b/lib/patrix/mqtt.cpp
index 8973e30..26ca506 100644
--- a/lib/patrix/mqtt.cpp
+++ b/lib/patrix/mqtt.cpp
@@ -90,13 +90,11 @@ void mqttPublishLog(const char *datetime, const char *header, const char *messag
   }
 }
 
-bool mqttPublishData(const char *name, const JsonDocument &doc) {
+bool mqttPublishData(const JsonDocument &doc) {
   if (mqtt.connected()) {
-    char topic[128];
-    snprintf(topic, sizeof topic, TOPIC_DATA_FORMAT, HOSTNAME, name);
     char payload[512];
     const size_t size = serializeJson(doc, payload);
-    boolean result = mqtt.publish(topic, payload, size);
+    boolean result = mqtt.publish(HOSTNAME, payload, size);
     yield();
     return result;
   }
diff --git a/lib/patrix/mqtt.h b/lib/patrix/mqtt.h
index 13972d9..2985408 100644
--- a/lib/patrix/mqtt.h
+++ b/lib/patrix/mqtt.h
@@ -11,6 +11,6 @@ void mqttDisconnect();
 
 void mqttPublishLog(const char *datetime, const char *header, const char *message);
 
-bool mqttPublishData(const char *name, const JsonDocument &doc);
+bool mqttPublishData(const JsonDocument &doc);
 
 #endif
diff --git a/src/Fermenter/Fermenter.cpp b/src/Fermenter/Fermenter.cpp
index e55b3e8..b61573a 100644
--- a/src/Fermenter/Fermenter.cpp
+++ b/src/Fermenter/Fermenter.cpp
@@ -43,7 +43,7 @@ double temperatureCurrent = NAN;
 
 double heaterPWM = 0;
 
-Cache<FermenterData, 500> cache("data");
+Cache<FermenterData, 500> cache;
 
 void writeDecimal(int *digit, double value);