From 0351a56ea49f21e4125f8f175d6c7ce03bcb7817 Mon Sep 17 00:00:00 2001 From: Martin Mares Date: Mon, 27 Aug 2018 20:36:04 +0200 Subject: [PATCH] Home: Relocating sensors... --- arexxd.c | 18 ++++++++---------- web/rh-12h.cgi | 2 +- web/rh-48h.cgi | 2 +- web/rh-month.cgi | 4 ++-- web/temp-12h.cgi | 18 +++++++++--------- web/temp-48h.cgi | 12 ++++++------ web/temp-month.cgi | 12 ++++++------ web/temp-quick.cgi | 6 +++--- 8 files changed, 36 insertions(+), 38 deletions(-) diff --git a/arexxd.c b/arexxd.c index c48efd1..1bde4a2 100644 --- a/arexxd.c +++ b/arexxd.c @@ -122,7 +122,7 @@ static void mqtt_publish(const char *topic, const char *fmt, ...) static void mqtt_conn_callback(struct mosquitto *mosq UNUSED, void *obj UNUSED, int status) { if (!status) - mqtt_publish("burrow/arexxd/status", "ok"); + mqtt_publish("status/arexxd", "ok"); } static void mqtt_init(void) @@ -132,7 +132,7 @@ static void mqtt_init(void) if (!mosq) die("Mosquitto: initialization failed"); - if (mosquitto_will_set(mosq, "burrow/arexxd/status", 4, "dead", 0, true) != MOSQ_ERR_SUCCESS) + if (mosquitto_will_set(mosq, "status/arexxd", 4, "dead", 0, true) != MOSQ_ERR_SUCCESS) die("Mosquitto: unable to set will"); mosquitto_connect_callback_set(mosq, mqtt_conn_callback); @@ -151,10 +151,8 @@ static void mqtt_point(time_t t, const char *name, double val, char *unit UNUSED return; char topic[64]; - snprintf(topic, sizeof(topic), "burrow/arexxd/%s", name); - mqtt_publish(topic, "%.3f", val); - snprintf(topic, sizeof(topic), "burrow/arexxd/%s_timestamp", name); - mqtt_publish(topic, "%llu", (unsigned long long) t); + snprintf(topic, sizeof(topic), "burrow/temp/%s", name); + mqtt_publish(topic, "%.3f %lld", val, (long long) t); } /*** RRD interface ***/ @@ -245,19 +243,19 @@ static double correct_point(uint id, double val, const char **name) */ switch (id) { case 10415: - *name = "ursarium"; + *name = "kitchen"; return val - 0.93; case 10707: *name = "catarium"; return val - 0.71; case 11699: - *name = "machinarium"; + *name = "garage"; return val; case 19246: - *name = "garage"; + *name = "ursarium"; return val + 0.49; case 19247: - *name = "garage-rh"; + *name = "ursarium-rh"; return val; case 12133: *name = "aquarium"; diff --git a/web/rh-12h.cgi b/web/rh-12h.cgi index 6c7313f..dc86be6 100755 --- a/web/rh-12h.cgi +++ b/web/rh-12h.cgi @@ -12,4 +12,4 @@ exec rrdtool graph - \ --right-axis 1:0 --right-axis-format "%3.0lf" \ --legend-position east \ --units-exponent 0 --lower-limit 0 --upper-limit 100 --rigid \ - DEF:a=$D/sensor-garage-rh.rrd:rh:AVERAGE 'LINE1:a#cc0000:Garage' + DEF:a=$D/sensor-ursarium-rh.rrd:rh:AVERAGE 'LINE1:a#cc0000:Ursarium' diff --git a/web/rh-48h.cgi b/web/rh-48h.cgi index 60248f9..688a61e 100755 --- a/web/rh-48h.cgi +++ b/web/rh-48h.cgi @@ -12,4 +12,4 @@ exec rrdtool graph - \ --right-axis 1:0 --right-axis-format "%3.0lf" \ --legend-position east \ --units-exponent 0 --lower-limit 0 --upper-limit 100 --rigid \ - DEF:a=$D/sensor-garage-rh.rrd:rh:AVERAGE 'LINE1:a#cc0000:Garage' + DEF:a=$D/sensor-ursarium-rh.rrd:rh:AVERAGE 'LINE1:a#cc0000:Ursarium' diff --git a/web/rh-month.cgi b/web/rh-month.cgi index 99aa014..64de7a7 100755 --- a/web/rh-month.cgi +++ b/web/rh-month.cgi @@ -12,5 +12,5 @@ exec rrdtool graph - \ --right-axis 1:0 --right-axis-format "%3.0lf" \ --legend-position east \ --units-exponent 0 --lower-limit 0 --upper-limit 100 --rigid \ - DEF:alo=$D/sensor-garage-rh.rrd:rh:MIN 'LINE1:alo#cc0000:Garage' \ - DEF:ahi=$D/sensor-garage-rh.rrd:rh:MAX 'LINE1:ahi#cc0000' + DEF:alo=$D/sensor-ursarium-rh.rrd:rh:MIN 'LINE1:alo#cc0000:Ursarium' \ + DEF:ahi=$D/sensor-ursarium-rh.rrd:rh:MAX 'LINE1:ahi#cc0000' diff --git a/web/temp-12h.cgi b/web/temp-12h.cgi index 432014d..1d52be6 100755 --- a/web/temp-12h.cgi +++ b/web/temp-12h.cgi @@ -24,30 +24,30 @@ exec rrdtool graph - \ --units-exponent 0 --lower-limit -20 --upper-limit 40 --rigid \ --legend-position east \ --pango-markup \ - DEF:g=$D/sensor-garage.rrd:temp:AVERAGE \ - DEF:u=$D/sensor-ursarium.rrd:temp:AVERAGE \ + DEF:g=$D/sensor-ursarium.rrd:temp:AVERAGE \ + DEF:u=$D/sensor-kitchen.rrd:temp:AVERAGE \ DEF:c=$D/sensor-catarium.rrd:temp:AVERAGE \ - DEF:m=$D/sensor-machinarium.rrd:temp:AVERAGE \ + DEF:m=$D/sensor-garage.rrd:temp:AVERAGE \ DEF:a=$D/sensor-aquarium.rrd:temp:AVERAGE \ 'AREA:u#7777cc' \ 'AREA:m#77cc77' \ 'AREA:c#cc77cc' \ 'AREA:g#cc7777' \ - 'LINE2:g#cc0000:Garage\n' \ - 'LINE2:u#0000cc:Ursarium\n' \ + 'LINE2:g#cc0000:Ursarium\n' \ + 'LINE2:u#0000cc:Kitchen\n' \ 'LINE2:a#00cccc:Aquarium\n' \ 'LINE2:c#cc00cc:Catarium\n' \ - 'LINE2:m#00cc00:Machinarium\n' \ + 'LINE2:m#00cc00:Garage\n' \ 'HRULE:0#0000ff' \ 'COMMENT:\s' \ 'COMMENT:\s' \ 'COMMENT:\s' \ - 'COMMENT:'"$(current $D/sensor-garage.rrd)"'\l' \ + 'COMMENT:'"$(current $D/sensor-ursarium.rrd)"'\l' \ 'COMMENT:\s' \ - 'COMMENT:'"$(current $D/sensor-ursarium.rrd)"'\l' \ + 'COMMENT:'"$(current $D/sensor-kitchen.rrd)"'\l' \ 'COMMENT:\s' \ 'COMMENT:'"$(current $D/sensor-aquarium.rrd)"'\l' \ 'COMMENT:\s' \ 'COMMENT:'"$(current $D/sensor-catarium.rrd)"'\l' \ 'COMMENT:\s' \ - 'COMMENT:'"$(current $D/sensor-machinarium.rrd)"'\l' \ + 'COMMENT:'"$(current $D/sensor-garage.rrd)"'\l' \ diff --git a/web/temp-48h.cgi b/web/temp-48h.cgi index fcec7e2..f6495e7 100755 --- a/web/temp-48h.cgi +++ b/web/temp-48h.cgi @@ -12,18 +12,18 @@ exec rrdtool graph - \ --right-axis 1:0 --right-axis-format "%3.0lf" \ --units-exponent 0 --lower-limit -20 --upper-limit 40 --rigid \ --legend-position east \ - DEF:g=$D/sensor-garage.rrd:temp:AVERAGE \ - DEF:u=$D/sensor-ursarium.rrd:temp:AVERAGE \ + DEF:g=$D/sensor-ursarium.rrd:temp:AVERAGE \ + DEF:u=$D/sensor-kitchen.rrd:temp:AVERAGE \ DEF:c=$D/sensor-catarium.rrd:temp:AVERAGE \ - DEF:m=$D/sensor-machinarium.rrd:temp:AVERAGE \ + DEF:m=$D/sensor-garage.rrd:temp:AVERAGE \ DEF:a=$D/sensor-aquarium.rrd:temp:AVERAGE \ 'AREA:u#7777cc' \ 'AREA:m#77cc77' \ 'AREA:c#cc77cc' \ 'AREA:g#cc7777' \ - 'LINE2:g#cc0000:Garage\n' \ - 'LINE2:u#0000cc:Ursarium\n' \ + 'LINE2:g#cc0000:Ursarium\n' \ + 'LINE2:u#0000cc:Kitchen\n' \ 'LINE2:a#00cccc:Aquarium\n' \ 'LINE2:c#cc00cc:Catarium\n' \ - 'LINE2:m#00cc00:Machinarium\n' \ + 'LINE2:m#00cc00:Garage\n' \ 'HRULE:0#0000ff' diff --git a/web/temp-month.cgi b/web/temp-month.cgi index a1c1d41..b90b6c5 100755 --- a/web/temp-month.cgi +++ b/web/temp-month.cgi @@ -12,12 +12,12 @@ exec rrdtool graph - \ --right-axis 1:0 --right-axis-format "%3.0lf" \ --units-exponent 0 --lower-limit -20 --upper-limit 40 --rigid \ --legend-position east \ - DEF:alo=$D/sensor-ursarium.rrd:temp:MIN 'LINE2:alo#0000cc:Ursarium\n' \ - DEF:ahi=$D/sensor-ursarium.rrd:temp:MAX 'LINE2:ahi#0000cc' \ - DEF:dlo=$D/sensor-garage.rrd:temp:MIN 'LINE2:dlo#cc0000:Garage\n' \ - DEF:dhi=$D/sensor-garage.rrd:temp:MAX 'LINE2:dhi#cc0000' \ + DEF:alo=$D/sensor-kitchen.rrd:temp:MIN 'LINE2:alo#0000cc:Kitchen\n' \ + DEF:ahi=$D/sensor-kitchen.rrd:temp:MAX 'LINE2:ahi#0000cc' \ + DEF:dlo=$D/sensor-ursarium.rrd:temp:MIN 'LINE2:dlo#cc0000:Ursarium\n' \ + DEF:dhi=$D/sensor-ursarium.rrd:temp:MAX 'LINE2:dhi#cc0000' \ DEF:clo=$D/sensor-catarium.rrd:temp:MIN 'LINE2:clo#cc00cc:Catarium\n' \ DEF:chi=$D/sensor-catarium.rrd:temp:MAX 'LINE2:chi#cc00cc' \ - DEF:blo=$D/sensor-machinarium.rrd:temp:MIN 'LINE2:blo#00cc00:Machinarium' \ - DEF:bhi=$D/sensor-machinarium.rrd:temp:MAX 'LINE2:bhi#00cc00' \ + DEF:blo=$D/sensor-garage.rrd:temp:MIN 'LINE2:blo#00cc00:Garage' \ + DEF:bhi=$D/sensor-garage.rrd:temp:MAX 'LINE2:bhi#00cc00' \ 'HRULE:0#0000ff' diff --git a/web/temp-quick.cgi b/web/temp-quick.cgi index 91eeb82..ff3947a 100755 --- a/web/temp-quick.cgi +++ b/web/temp-quick.cgi @@ -12,8 +12,8 @@ exec rrdtool graph - \ --right-axis 1:0 --right-axis-format "%3.0lf" \ --units-exponent 0 --lower-limit -20 --upper-limit 40 --rigid \ --legend-position east \ - DEF:a=$D/sensor-ursarium.rrd:temp:AVERAGE 'LINE2:a#0000cc:Ursarium\n' \ - DEF:d=$D/sensor-garage.rrd:temp:AVERAGE 'LINE2:d#cc0000:Garage\n' \ + DEF:a=$D/sensor-kitchen.rrd:temp:AVERAGE 'LINE2:a#0000cc:Kitchen\n' \ + DEF:d=$D/sensor-ursarium.rrd:temp:AVERAGE 'LINE2:d#cc0000:Ursarium\n' \ DEF:c=$D/sensor-catarium.rrd:temp:AVERAGE 'LINE2:c#cc00cc:Catarium\n' \ - DEF:b=$D/sensor-machinarium.rrd:temp:AVERAGE 'LINE2:b#00cc00:Machinarium' \ + DEF:b=$D/sensor-garage.rrd:temp:AVERAGE 'LINE2:b#00cc00:Garage' \ 'HRULE:0#0000ff' -- 2.39.2