From 2bf387727861ab03a7e325be4455dedf9f33f881 Mon Sep 17 00:00:00 2001 From: Juan Manuel Grados Luyando Date: Mon, 6 Mar 2023 12:16:33 +0100 Subject: [PATCH] Adding all changes made during the the conference --- software/dashboard/grafana/grafana.db | Bin 1105920 -> 1187840 bytes software/database/influxdb2/influxd.bolt | Bin 131072 -> 131072 bytes software/flow/flows.json | 22 +++++++++++----------- 3 files changed, 11 insertions(+), 11 deletions(-) mode change 100644 => 100755 software/database/influxdb2/influxd.bolt mode change 100755 => 100644 software/flow/flows.json diff --git a/software/dashboard/grafana/grafana.db b/software/dashboard/grafana/grafana.db index b08c151fc431178027bf7618fbdd7f7a87821551..714b4f5ef873b1cfa6698f117de0aa8029619f30 100755 GIT binary patch delta 8464 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 WYf8S-i|5`O#J4@>3n475{NSIBhINDh delta 3842 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 delta 1030 zcmZo@;Am*zn4rMOHT`2eqqu}T0|d-tgwTcNJkOu6-F|kn zdoYiIA%Y2&@6HV2t3cIfvq1PCHuo0jGHyOlWXQ7la|JK^#smxINevu=0t`T>0)ZIR zJn_wv3!d{&n!qugqkz%G$^d8#$fS)xV>y8|$Z8OO7m&{bq!pn2Yd}5+68|0Z^s)lR zy6rKAj24Wk>7lNH1qDgIK2erI!J$rB-fmtNx}n)dfo3l8p6(&#{)Qoj#b%Kv@urC> zNm==Y$;si7#a=}@{!ZRSNonyVzClJF=BAcTg)Vt!1;v?327$?89_hBW28qc@Nr@@O z$%aOWCetStF?xlehMY9eNgyYKKsFGAd0@ang^7kcF?gw!ft!6J7X>HWPvU=K~pPZODiKYJquGK zLnBKw3zNwQOJy)cxBF-@&Xn1H^%>)Nu4xI3!1U3;D8L9wF4GDap#id4a>8@|X+W9D z0t+}exgbHpAhunxf$_UNFjomK5Z`RD-~vClEL2K>fqgpn0Y+6$aj1aAX2S)?`Gw`+ v^4wq+FkYu~H!#W?3PB}=p)@FpKmZh#AOKIu5H5qn_J_|HA? diff --git a/software/flow/flows.json b/software/flow/flows.json old mode 100755 new mode 100644 index ebecfbd..7dcb665 --- a/software/flow/flows.json +++ b/software/flow/flows.json @@ -57,7 +57,7 @@ "id": "7ce136dbb8c897d1", "type": "mqtt-broker", "name": "pi-mqtt-server:1833", - "broker": "pi-mqtt-server", + "broker": "192.168.178.21", "port": "1883", "clientid": "", "autoConnect": true, @@ -695,7 +695,7 @@ "type": "function", "z": "325e309897bf4538", "name": "parse power data", - "func": "var power = Number(msg.payload);\n\nif (power != 0){\n return {\n payload: power\n }\n}", + "func": "var power = Number(msg.payload);\n\nif (power != 0){\n return {\n payload: 90*power\n }\n}", "outputs": 1, "noerr": 0, "initialize": "", @@ -715,7 +715,7 @@ "type": "debug", "z": "325e309897bf4538", "name": "power 3dprinter", - "active": false, + "active": true, "tosidebar": true, "console": false, "tostatus": false, @@ -1268,7 +1268,7 @@ "z": "325e309897bf4538", "influxdb": "d61a7da6caeb26aa", "name": "energy2Influx", - "measurement": "energy", + "measurement": "totalEnergy", "precision": "", "retentionPolicy": "", "database": "database", @@ -1521,7 +1521,7 @@ "type": "function", "z": "47e5443dc1c29bcd", "name": "parse power data", - "func": "var power = Number(msg.payload);\n\nif (power != 0) {\n return {\n payload: power\n }\n}", + "func": "var power = Number(msg.payload);\n\nif (power != 0) {\n return {\n payload: 25*power\n }\n}", "outputs": 1, "noerr": 0, "initialize": "", @@ -2017,7 +2017,7 @@ "type": "function", "z": "47e5443dc1c29bcd", "name": "parse power data", - "func": "return {\n payload: Number(msg.payload),\n topic: \"energy\"\n}", + "func": "return {\n payload: Number(msg.payload) * 12,\n topic: \"energy\"\n}", "outputs": 1, "noerr": 0, "initialize": "", @@ -2094,7 +2094,7 @@ "z": "47e5443dc1c29bcd", "influxdb": "d61a7da6caeb26aa", "name": "energy2Influx", - "measurement": "energy", + "measurement": "totalEnergy", "precision": "", "retentionPolicy": "", "database": "database", @@ -2132,7 +2132,7 @@ "type": "function", "z": "8ef0902d5920bef2", "name": "parse power data", - "func": "var power = Number(msg.payload);\n\nif (power != 0) {\n return {\n payload: power\n }\n}", + "func": "var power = Number(msg.payload);\n\nif (power != 0) {\n return {\n payload: 15*power\n }\n}", "outputs": 1, "noerr": 0, "initialize": "", @@ -2152,7 +2152,7 @@ "type": "debug", "z": "8ef0902d5920bef2", "name": "power cnc", - "active": true, + "active": false, "tosidebar": true, "console": false, "tostatus": false, @@ -2228,7 +2228,7 @@ "type": "debug", "z": "8ef0902d5920bef2", "name": "state cnc", - "active": false, + "active": true, "tosidebar": true, "console": false, "tostatus": false, @@ -2545,7 +2545,7 @@ "z": "8ef0902d5920bef2", "influxdb": "d61a7da6caeb26aa", "name": "energy2Influx", - "measurement": "energy", + "measurement": "totalEnergy", "precision": "", "retentionPolicy": "", "database": "database",