diff --git a/software/dashboard/grafana/grafana.db b/software/dashboard/grafana/grafana.db index b08c151..714b4f5 100755 Binary files a/software/dashboard/grafana/grafana.db and b/software/dashboard/grafana/grafana.db differ diff --git a/software/database/influxdb2/influxd.bolt b/software/database/influxdb2/influxd.bolt old mode 100644 new mode 100755 index 90f56b3..1690670 Binary files a/software/database/influxdb2/influxd.bolt and b/software/database/influxdb2/influxd.bolt differ 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",