SSR MQTT: Timestamp reform

diff --git a/ssr/host/burrow-ssrd.c b/ssr/host/burrow-ssrd.c
index 53042605ee7da81de84900f65fea1c84925fb8e8..2a46b624edc9635a1098dd34f65c87f0ea8cb001 100644 (file)
--- a/ssr/host/burrow-ssrd.c
+++ b/ssr/host/burrow-ssrd.c
@@ -108,7 +108,7 @@ static void mqtt_setup(void)
        if (mosquitto_subscribe(mosq, NULL, "burrow/loft/#", 1) != MOSQ_ERR_SUCCESS)
                die("Mosquitto: subscribe failed");
 
-       mqtt_publish("burrow/loft/status", "ok");
+       mqtt_publish("status/loft-ssr", "ok");
 }
 
 static void mqtt_log_callback(struct mosquitto *mosq UNUSED, void *obj UNUSED, int level, const char *message)
@@ -207,7 +207,7 @@ int main(int argc UNUSED, char **argv)
        mosquitto_log_callback_set(mosq, mqtt_log_callback);
        mosquitto_message_callback_set(mosq, mqtt_msg_callback);
 
-       if (mosquitto_will_set(mosq, "burrow/loft/status", 4, "dead", 0, true) != MOSQ_ERR_SUCCESS)
+       if (mosquitto_will_set(mosq, "status/loft-ssr", 4, "dead", 0, true) != MOSQ_ERR_SUCCESS)
                die("Mosquitto: unable to set will");
 
        if (mosquitto_connect(mosq, "127.0.0.1", 1883, 60) != MOSQ_ERR_SUCCESS)
@@ -238,7 +238,6 @@ int main(int argc UNUSED, char **argv)
                int t = get_u32_be(resp+4);
                msg(L_DEBUG, "Measured raw temperature %d", t);
 
-               mqtt_publish("burrow/loft/temperature", "%.3f", t / 1000.);
-               mqtt_publish("burrow/loft/temperature_timestamp", "%llu", (unsigned long long) now);
+               mqtt_publish("burrow/loft/temperature", "%.3f %llu", t / 1000., (unsigned long long) now);
        }
 }