Added new pulse conversion rate for L

Changed switch to check msg.unit for diferent pulse sensors before conversion
Randers-Kommune-Digitalisering · May 31, 2024 · bf0a109 · bf0a109
1 parent 3c47ff3
commit bf0a109
Show file tree

Hide file tree

Showing 9 changed files with 73 additions and 11 deletions.
diff --git a/node-red/flows_js/_order.json b/node-red/flows_js/_order.json
@@ -27,6 +27,7 @@
   "junction.f95e5611728b1e83.flows.js",
   "junction.3150c301cadb8a59.flows.js",
   "junction.6afc07dac143d279.flows.js",
+  "junction.028c44fb899568ec.flows.js",
   "prometheus_metric_config.7a80158bbfee95fe.flows.js",
   "prometheus_metric_config.e47b437e1ecdc573.flows.js",
   "prometheus_metric_config.36feaadaa1b1982a.flows.js",
@@ -35,6 +36,7 @@
   "change.968a0d7d993a1719.flows.js",
   "switch.4a02547fe228c1a9.flows.js",
   "change.603b599ad5e95714.flows.js",
+  "change.8384db191bf875a1.flows.js",
   "debug.071a7a3c275c82f7.flows.js",
   "catch.91e8aa626025470f.flows.js",
   "status.c3049ebe67d10519.flows.js",

diff --git a/node-red/flows_js/change.603b599ad5e95714.flows.js b/node-red/flows_js/change.603b599ad5e95714.flows.js
@@ -8,7 +8,7 @@ const Node = {
       "t": "set",
       "p": "data",
       "pt": "msg",
-      "to": "data ~> | $.values | {\t    \"value\": value * 0.1\t} |",
+      "to": "data ~> | $.values | {\t\t    /* 1 pulse = 0.1 m3 */\t    \"value\": value * 0.1\t} |",
       "tot": "jsonata"
     }
   ],
@@ -17,7 +17,7 @@ const Node = {
   "from": "",
   "to": "",
   "reg": false,
-  "x": 630,
+  "x": 650,
   "y": 140,
   "wires": [
     []

diff --git a/node-red/flows_js/change.8384db191bf875a1.flows.js b/node-red/flows_js/change.8384db191bf875a1.flows.js
@@ -0,0 +1,27 @@
+const Node = {
+  "id": "8384db191bf875a1",
+  "type": "change",
+  "z": "f93fc1e5c4176e6a",
+  "name": "Multiply values for L conversion",
+  "rules": [
+    {
+      "t": "set",
+      "p": "data",
+      "pt": "msg",
+      "to": "data ~> | $.values | {\t    \t    /* 1 pulse = 10 liter */\t    \"value\": value * 10\t} |",
+      "tot": "jsonata"
+    }
+  ],
+  "action": "",
+  "property": "",
+  "from": "",
+  "to": "",
+  "reg": false,
+  "x": 650,
+  "y": 180,
+  "wires": [
+    []
+  ]
+}
+
+module.exports = Node;
diff --git a/node-red/flows_js/change.89e54413776207ed.flows.js b/node-red/flows_js/change.89e54413776207ed.flows.js
@@ -19,6 +19,13 @@ const Node = {
       "to": "data.productType",
       "tot": "msg",
       "dc": true
+    },
+    {
+      "t": "set",
+      "p": "unit",
+      "pt": "msg",
+      "to": "data.unit",
+      "tot": "msg"
     }
   ],
   "action": "",

diff --git a/node-red/flows_js/change.968a0d7d993a1719.flows.js b/node-red/flows_js/change.968a0d7d993a1719.flows.js
@@ -28,7 +28,7 @@ const Node = {
   "to": "",
   "reg": false,
   "x": 190,
-  "y": 160,
+  "y": 180,
   "wires": [
     [
       "4a02547fe228c1a9"

diff --git a/node-red/flows_js/junction.028c44fb899568ec.flows.js b/node-red/flows_js/junction.028c44fb899568ec.flows.js
@@ -0,0 +1,12 @@
+const Node = {
+  "id": "028c44fb899568ec",
+  "type": "junction",
+  "z": "f93fc1e5c4176e6a",
+  "x": 780,
+  "y": 220,
+  "wires": [
+    []
+  ]
+}
+
+module.exports = Node;
diff --git a/node-red/flows_js/junction.8bfbbd8a03d0531e.flows.js b/node-red/flows_js/junction.8bfbbd8a03d0531e.flows.js
@@ -2,10 +2,12 @@ const Node = {
   "id": "8bfbbd8a03d0531e",
   "type": "junction",
   "z": "f93fc1e5c4176e6a",
-  "x": 500,
-  "y": 180,
+  "x": 520,
+  "y": 220,
   "wires": [
-    []
+    [
+      "028c44fb899568ec"
+    ]
   ]
 }
 

diff --git a/node-red/flows_js/subflow.f93fc1e5c4176e6a.flows.js b/node-red/flows_js/subflow.f93fc1e5c4176e6a.flows.js
@@ -25,7 +25,11 @@ const Node = {
           "port": 0
         },
         {
-          "id": "8bfbbd8a03d0531e",
+          "id": "8384db191bf875a1",
+          "port": 0
+        },
+        {
+          "id": "028c44fb899568ec",
           "port": 0
         }
       ]

diff --git a/node-red/flows_js/switch.4a02547fe228c1a9.flows.js b/node-red/flows_js/switch.4a02547fe228c1a9.flows.js
@@ -3,12 +3,17 @@ const Node = {
   "type": "switch",
   "z": "f93fc1e5c4176e6a",
   "name": "",
-  "property": "productType",
+  "property": "unit",
   "propertyType": "msg",
   "rules": [
     {
       "t": "eq",
-      "v": "pulse",
+      "v": "m3",
+      "vt": "str"
+    },
+    {
+      "t": "eq",
+      "v": "L",
       "vt": "str"
     },
     {
@@ -17,13 +22,16 @@ const Node = {
   ],
   "checkall": "true",
   "repair": false,
-  "outputs": 2,
+  "outputs": 3,
   "x": 390,
-  "y": 160,
+  "y": 180,
   "wires": [
     [
       "603b599ad5e95714"
     ],
+    [
+      "8384db191bf875a1"
+    ],
     [
       "8bfbbd8a03d0531e"
     ]