merge upstream

Reviewed-on: #5

.gitmodules

@@ -1,7 +1,7 @@
 
 [submodule "nodes/machineGroupControl"]
 	path = nodes/machineGroupControl
-	url = https://gitea.centraal.wbd-rd.nl/RnD/machineGroupControl.git
+	url = https://gitea.centraal.wbd-rd.nl/woutverheijen/machineGroupControl.git
 [submodule "nodes/generalFunctions"]
 	path = nodes/generalFunctions
 	url = https://gitea.centraal.wbd-rd.nl/RnD/generalFunctions.git
@@ -13,13 +13,13 @@
 	url = https://gitea.centraal.wbd-rd.nl/RnD/valve.git
 [submodule "nodes/rotatingMachine"]
 	path = nodes/rotatingMachine
-	url = https://gitea.centraal.wbd-rd.nl/RnD/rotatingMachine.git
+	url = https://gitea.centraal.wbd-rd.nl/woutverheijen/rotatingMachine.git
 [submodule "nodes/monster"]
 	path = nodes/monster
 	url = https://gitea.centraal.wbd-rd.nl/RnD/monster.git
 [submodule "nodes/measurement"]
 	path = nodes/measurement
-	url = https://gitea.centraal.wbd-rd.nl/RnD/measurement.git
+	url = https://gitea.centraal.wbd-rd.nl/woutverheijen/measurement.git
 [submodule "nodes/diffuser"]
 	path = nodes/diffuser
 	url = https://gitea.centraal.wbd-rd.nl/RnD/diffuser.git
@@ -29,3 +29,9 @@
 [submodule "nodes/reactor"]
 	path = nodes/reactor
 	url = https://gitea.centraal.wbd-rd.nl/RnD/reactor.git
+[submodule "nodes/pumpingStation"]
+	path = nodes/pumpingStation
+	url = https://gitea.centraal.wbd-rd.nl/RnD/pumpingStation
+[submodule "nodes/settler"]
+	path = nodes/settler
+	url = https://gitea.centraal.wbd-rd.nl/RnD/settler.git

README.md

@@ -2,7 +2,8 @@
 
 ## Over
 
-Dit bouwblok is ontwikkeld door het R&D-team van Waterschap Brabantse Delta voor gebruik in Node-RED. Het is bedoeld voor hergebruik binnen **niet-commerciële toepassingen**.
+Dit bouwblok is ontwikkeld door het R&D-team van Waterschap Brabantse Delta voor gebruik in Node-RED.
+
 
 > *[Voeg hier een korte toelichting toe over de specifieke functionele werking van dit bouwblok]*
 

package-lock.json

@@ -242,12 +242,12 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "24.5.2",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-24.5.2.tgz",
-      "integrity": "sha512-FYxk1I7wPv3K2XBaoyH2cTnocQEu8AOZ60hPbsyukMPLv5/5qr7V1i8PLHdl6Zf87I+xZXFvPCXYjiTFq+YSDQ==",
+      "version": "24.7.1",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-24.7.1.tgz",
+      "integrity": "sha512-CmyhGZanP88uuC5GpWU9q+fI61j2SkhO3UGMUdfYRE6Bcy0ccyzn1Rqj9YAB/ZY4kOXmNf0ocah5GtphmLMP6Q==",
       "license": "MIT",
       "dependencies": {
-        "undici-types": "~7.12.0"
+        "undici-types": "~7.14.0"
       }
     },
     "node_modules/@types/node-fetch": {
@@ -535,9 +535,9 @@
       "license": "MIT"
     },
     "node_modules/detect-libc": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.0.tgz",
-      "integrity": "sha512-vEtk+OcP7VBRtQZ1EJ3bdgzSfBjgnEalLTp5zjJrS+2Z1w2KZly4SBdac/WDU3hhsNAZ9E8SC96ME4Ey8MZ7cg==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.2.tgz",
+      "integrity": "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==",
       "license": "Apache-2.0",
       "engines": {
         "node": ">=8"
@@ -729,7 +729,7 @@
     },
     "node_modules/generalFunctions": {
       "version": "1.0.0",
-      "resolved": "git+https://gitea.centraal.wbd-rd.nl/RnD/generalFunctions.git#efc97d6cd17399391b011298e47e8c1b1599592d",
+      "resolved": "git+https://gitea.centraal.wbd-rd.nl/RnD/generalFunctions.git#2fb73e671341bea610aaf7ea6303b60d1415432c",
       "license": "SEE LICENSE"
     },
     "node_modules/get-caller-file": {
@@ -1216,9 +1216,9 @@
       "license": "MIT"
     },
     "node_modules/semver": {
-      "version": "7.7.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
-      "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
+      "version": "7.7.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz",
+      "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==",
       "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
@@ -1331,9 +1331,9 @@
       }
     },
     "node_modules/undici-types": {
-      "version": "7.12.0",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.12.0.tgz",
-      "integrity": "sha512-goOacqME2GYyOZZfb5Lgtu+1IDmAlAEu5xnD3+xTzS10hT0vzpf0SPjkXwAw9Jm+4n/mQGDP3LO8CPbYROeBfQ==",
+      "version": "7.14.0",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.14.0.tgz",
+      "integrity": "sha512-QQiYxHuyZ9gQUIrmPo3IA+hUl4KYk8uSA7cHrcKd/l3p1OTpZcM0Tbp9x7FAtXdAYhlasd60ncPpgu6ihG6TOA==",
       "license": "MIT"
     },
     "node_modules/util-deprecate": {

package.json

@@ -15,13 +15,15 @@
       "machineGroupControl": "nodes/machineGroupControl/mgc.js",
       "measurement": "nodes/measurement/measurement.js",
       "monster": "nodes/monster/monster.js",
+      "pumpingstation": "nodes/pumpingStation/pumpingStation.js",
       "reactor": "nodes/reactor/reactor.js",
       "rotatingMachine": "nodes/rotatingMachine/rotatingMachine.js",
+      "settler": "nodes/settler/settler.js",
       "valve": "nodes/valve/valve.js",
       "valveGroupControl": "nodes/valveGroupControl/vgc.js"
     }
   },
-  "author": "Rene De Ren, Pim Moerman, Janneke Tack, Sjoerd Fijnje, Dieke Gabriels",
+  "author": "Rene De Ren, Pim Moerman, Janneke Tack, Sjoerd Fijnje, Dieke Gabriels, pieter van der wilt",
   "license": "SEE LICENSE",
   "dependencies": {
     "@tensorflow/tfjs": "^4.22.0",