Influx: Typo

[home-hw.git] / influx / burrow-influx.c

diff --git a/influx/burrow-influx.c b/influx/burrow-influx.c
index 95213003b4ca213ec04c15c8a83054d9bfa6588d..611f8da064f4b48a26a804cc8d21d6f782a26c16 100644 (file)
--- 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,66 @@ 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 = 660,
+       },
+       {
+               .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_active,circuit=1",
+               .value_name = "x",
+               .topic = "burrow/heating/circuit1/active",
+               .timeout = 660,
+       },
+       {
+               .metric = "heating_pump_active,circuit=1",
+               .value_name = "x",
+               .topic = "burrow/heating/circuit1/pump",
+               .timeout = 300,
+       },
+       {
+               .metric = "heating_room_temp,circuit=2",
+               .value_name = "t",
+               .topic = "burrow/heating/circuit2/room-temp",
+               .timeout = 300,
+       },
+       {
+               .metric = "heating_active,circuit=2",
+               .value_name = "x",
+               .topic = "burrow/heating/circuit2/active",
+               .timeout = 660,
+       },
+       {
+               .metric = "heating_active,circuit=water",
+               .value_name = "x",
+               .topic = "burrow/heating/water/active",
+               .timeout = 660,
+       },
 };
 
 /*** MQTT ***/
@@ -386,7 +447,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;
                        }