Merge pull request 'dev-Rene' (#2 ) from dev-Rene into main

Reviewed-on: #2
Merge remote-tracking branch 'origin/main' into dev-Rene
2025-10-16 13:36:25 +00:00 · 2025-10-16 15:36:12 +02:00 · 2025-10-16 15:31:14 +02:00 · 2025-10-16 14:48:03 +02:00 · 2025-10-14 14:08:51 +02:00 · 2025-10-14 14:08:21 +02:00
14 changed files with 17 additions and 12 deletions
--- a/.gitmodules
+++ b/.gitmodules
@@ -29,3 +29,6 @@
 [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.git
--- a/EVOLV-1.0.41.tgz
+++ b/EVOLV-1.0.41.tgz
--- a/nodes/dashboardAPI
+++ b/nodes/dashboardAPI
--- a/nodes/generalFunctions
+++ b/nodes/generalFunctions
--- a/nodes/heatExchanger
+++ b/nodes/heatExchanger
--- a/nodes/machineGroupControl
+++ b/nodes/machineGroupControl
--- a/nodes/measurement
+++ b/nodes/measurement
--- a/nodes/monster
+++ b/nodes/monster
--- a/nodes/pumpingStation
+++ b/nodes/pumpingStation
--- a/nodes/reactor
+++ b/nodes/reactor
--- a/nodes/rotatingMachine
+++ b/nodes/rotatingMachine
--- a/nodes/valve
+++ b/nodes/valve
--- a/nodes/valveGroupControl
+++ b/nodes/valveGroupControl
--- a/package.json
+++ b/package.json
@@ -18,10 +18,12 @@
      "reactor": "nodes/reactor/reactor.js",
      "rotatingMachine": "nodes/rotatingMachine/rotatingMachine.js",
      "valve": "nodes/valve/valve.js",
-      "valveGroupControl": "nodes/valveGroupControl/vgc.js"
+      "valveGroupControl": "nodes/valveGroupControl/vgc.js",
+      "pumpingstation": "nodes/pumpingStation/pumpingStation.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",
Author	SHA1	Message	Date
renederen	72cdc45858	Merge pull request 'dev-Rene' (#2 ) from dev-Rene into main Reviewed-on: #2	2025-10-16 13:36:25 +00:00
znetsixe	84a7cf6b04	Merge remote-tracking branch 'origin/main' into dev-Rene	2025-10-16 15:36:12 +02:00
znetsixe	f464881047	latest commit	2025-10-16 15:31:14 +02:00
znetsixe	cba5f684bc	mods	2025-10-16 14:48:03 +02:00
znetsixe	1437431f83	updates	2025-10-14 14:08:51 +02:00
znetsixe	5348d92c7a	updates	2025-10-14 14:08:21 +02:00
znetsixe	11300921ef	added pumping station node	2025-10-14 13:53:05 +02:00
znetsixe	5a15df291b	Added pumping station node	2025-10-14 13:50:47 +02:00
znetsixe	a1423b2f7c	addin pumpingstation	2025-10-13 11:45:39 +02:00
znetsixe	5536af017f	Remove incorrect pumpingStation submodule	2025-10-13 11:43:10 +02:00
znetsixe	affa4ac7ea	updated missing .git	2025-10-13 11:38:36 +02:00
znetsixe	fd5f2c2d93	added pumpingstation	2025-10-13 11:33:42 +02:00
znetsixe	2d97f8d7eb	deleted package	2025-10-13 11:32:33 +02:00
znetsixe	f37d54ca39	Commit changes for dev branch	2025-10-13 09:37:53 +02:00
znetsixe	0275384bc4	Remove leftover heatExchanger submodule reference	2025-10-13 09:31:38 +02:00