From: Martin Mares <mj@ucw.cz>
Date: Fri, 28 Feb 2020 17:02:48 +0000 (+0100)
Subject: Influx: Heating parameters
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=14f825fa3aa4a7a912454d50fceb2b566abf4527;p=home-hw.git

Influx: Heating parameters
---

diff --git a/influx/burrow-influx.c b/influx/burrow-influx.c
index 9521300..6894062 100644
--- a/influx/burrow-influx.c
+++ b/influx/burrow-influx.c
@@ -1,7 +1,7 @@
 /*
  *	A gateway between MQTT and InfluxDB
  *
- *	(c) 2018--2019 Martin Mares <mj@ucw.cz>
+ *	(c) 2018--2020 Martin Mares <mj@ucw.cz>
  */
 
 #include <ucw/lib.h>
@@ -34,6 +34,7 @@ struct attr {
 	const char *metric;
 	const char *value_name;
 	const char *topic;
+	uint timeout;
 };
 
 static const struct attr attr_table[] = {
@@ -183,6 +184,42 @@ static const struct attr attr_table[] = {
 		.value_name = "kVArh",
 		.topic = "burrow/power/reactive/energy",
 	},
+	{
+		.metric = "heating_water_pressure",
+		.value_name = "p",
+		.topic = "burrow/heating/water-pressure",
+		.timeout = 300,
+	},
+	{
+		.metric = "heating_outside_temp",
+		.value_name = "t",
+		.topic = "burrow/heating/outside-temp",
+		.timeout = 300,
+	},
+	{
+		.metric = "heating_room_temp,circuit=1",
+		.value_name = "t",
+		.topic = "burrow/heating/circuit1/room-temp",
+		.timeout = 300,
+	},
+	{
+		.metric = "heating_mix-temp,circuit=1",
+		.value_name = "t",
+		.topic = "burrow/heating/circuit1/mix-temp",
+		.timeout = 300,
+	},
+	{
+		.metric = "heating_mix-valve,circuit=1",
+		.value_name = "x",
+		.topic = "burrow/heating/circuit1/mix-valve",
+		.timeout = 300,
+	},
+	{
+		.metric = "heating_room_temp,circuit=2",
+		.value_name = "t",
+		.topic = "burrow/heating/circuit2/room-temp",
+		.timeout = 300,
+	},
 };
 
 /*** MQTT ***/
@@ -386,7 +423,8 @@ int main(int argc UNUSED, char **argv)
 				continue;
 			if (fields >= 2) {
 				time_t t = atoll(w[1]);
-				if (t < now - MEASUREMENT_TIMEOUT)
+				uint timeout = a->timeout ? : MEASUREMENT_TIMEOUT;
+				if (t < now - timeout)
 					continue;
 			}