MQTT Message new content and format

ampel-firmware/ampel-firmware.ino

@@ -139,7 +139,7 @@ void loop() {
     }
 
     if (config::is_wifi_on && config::is_mqtt_active()) {
-      mqtt::publishIfTimeHasCome(sensor::timestamp, sensor::co2, sensor::temperature, sensor::humidity);
+      mqtt::publishIfTimeHasCome(ampel.macAddress, sensor::timestamp, sensor::co2, sensor::temperature, sensor::humidity);
     }
 
 #if defined(ESP32)

ampel-firmware/mqtt.cpp

@@ -38,7 +38,7 @@ namespace mqtt {
   char last_successful_publish[23] = "";
 
   void initialize(const char *sensorId) {
-    json_sensor_format = PSTR("{\"time\":\"%s\", \"co2\":%d, \"temp\":%.1f, \"rh\":%.1f}");
+    json_sensor_format = PSTR("{\"metadata\":{\"mac-address\":\"%s\", \"time\":\"%s\"}, \"co2\":%d, \"temp\":%.1f, \"rh\":%.1f}");
     snprintf(publish_topic, sizeof(publish_topic), "%s%s", config::mqtt_topic_prefix, sensorId);
 
     if (config::mqtt_encryption) {
@@ -59,15 +59,15 @@ namespace mqtt {
         F("(Sends local IP and SSID via MQTT. Can be useful to find sensor)"));
   }
 
-  void publish(const char *timestamp, int16_t co2, float temperature, float humidity) {
+  void publish(const char *macaddress ,const char *timestamp, int16_t co2, float temperature, float humidity) {
     if (wifi::connected() && mqttClient.connected()) {
       led_effects::onBoardLEDOn();
       Serial.print(F("MQTT - Publishing message to '"));
       Serial.print(publish_topic);
       Serial.print(F("' ... "));
 
-      char payload[75]; // Should be enough for json...
-      snprintf(payload, sizeof(payload), json_sensor_format, timestamp, co2, temperature, humidity);
+      char payload[130]; // Should be enough for json...
+      snprintf(payload, sizeof(payload), json_sensor_format, macaddress, timestamp, co2, temperature, humidity);
       // Topic is 'MQTT_TOPIC_PREFIX/ESP123456'
       if (mqttClient.publish(publish_topic, payload)) {
         Serial.println(F("OK"));
@@ -154,12 +154,12 @@ namespace mqtt {
     }
   }
 
-  void publishIfTimeHasCome(const char *timestamp, const int16_t &co2, const float &temp, const float &hum) {
+  void publishIfTimeHasCome(const char *macaddress, const char *timestamp, const int16_t &co2, const float &temp, const float &hum) {
     // Send message via MQTT according to sending interval
     unsigned long now = seconds();
     if (now - last_sent_at > config::mqtt_sending_interval) {
       last_sent_at = now;
-      publish(timestamp, co2, temp, hum);
+      publish(macaddress, timestamp, co2, temp, hum);
     }
   }
 

ampel-firmware/mqtt.h

@@ -8,7 +8,7 @@ namespace mqtt {
   extern bool connected;
   void initialize(const char *sensorId);
   void keepConnection();
-  void publishIfTimeHasCome(const char *timestamp, const int16_t &co2, const float &temp, const float &hum);
+  void publishIfTimeHasCome(const char *macaddress, const char *timestamp, const int16_t &co2, const float &temp, const float &hum);
 
   void setMQTTinterval(int32_t sending_interval);
   void sendInfoAboutLocalNetwork();