diff --git a/.gitmodules b/.gitmodules index dd31906..673cc8a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -5,18 +5,12 @@ [submodule "nodes/generalFunctions"] path = nodes/generalFunctions url = https://gitea.centraal.wbd-rd.nl/RnD/generalFunctions.git -[submodule "nodes/predict"] - path = nodes/predict - url = https://gitea.centraal.wbd-rd.nl/RnD/predict.git [submodule "nodes/valveGroupControl"] path = nodes/valveGroupControl url = https://gitea.centraal.wbd-rd.nl/RnD/valveGroupControl.git [submodule "nodes/valve"] path = nodes/valve url = https://gitea.centraal.wbd-rd.nl/RnD/valve.git -[submodule "nodes/thermalCollector"] - path = nodes/thermalCollector - url = https://gitea.centraal.wbd-rd.nl/RnD/thermalCollector.git [submodule "nodes/rotatingMachine"] path = nodes/rotatingMachine url = https://gitea.centraal.wbd-rd.nl/RnD/rotatingMachine.git @@ -26,30 +20,12 @@ [submodule "nodes/measurement"] path = nodes/measurement url = https://gitea.centraal.wbd-rd.nl/RnD/measurement.git -[submodule "nodes/linearActuator"] - path = nodes/linearActuator - url = https://gitea.centraal.wbd-rd.nl/RnD/linearActuator.git -[submodule "nodes/heatExchanger"] - path = nodes/heatExchanger - url = https://gitea.centraal.wbd-rd.nl/RnD/heatExchanger.git [submodule "nodes/diffuser"] path = nodes/diffuser url = https://gitea.centraal.wbd-rd.nl/RnD/diffuser.git [submodule "nodes/dashboardAPI"] path = nodes/dashboardAPI url = https://gitea.centraal.wbd-rd.nl/RnD/dashboardAPI.git -[submodule "nodes/convert"] - path = nodes/convert - url = https://gitea.centraal.wbd-rd.nl/RnD/convert.git [submodule "nodes/reactor"] path = nodes/reactor url = https://gitea.centraal.wbd-rd.nl/RnD/reactor.git -[submodule "nodes/asm1"] - path = nodes/asm1 - url = https://gitea.centraal.wbd-rd.nl/RnD/asm1.git -[submodule "flows"] - path = flows - url = https://gitea.centraal.wbd-rd.nl/RnD/flows -[submodule "nodes/gateGroupControl"] - path = nodes/gateGroupControl - url = https://gitea.centraal.wbd-rd.nl/RnD/gateGroupControl.git diff --git a/flows b/flows deleted file mode 160000 index 0126258..0000000 --- a/flows +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0126258b527c6baa0517ab4e63e6d17e973d8fa0 diff --git a/nodes/asm1 b/nodes/asm1 deleted file mode 160000 index f3454c0..0000000 --- a/nodes/asm1 +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f3454c0471a4132c642381f698e3cbd172f58f86 diff --git a/nodes/convert b/nodes/convert deleted file mode 160000 index c6ead8b..0000000 --- a/nodes/convert +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c6ead8b6979abee3c3845b9d281f0bd1465ae348 diff --git a/nodes/gateGroupControl b/nodes/gateGroupControl deleted file mode 160000 index bd65f86..0000000 --- a/nodes/gateGroupControl +++ /dev/null @@ -1 +0,0 @@ -Subproject commit bd65f86f536012fd568ede416340778bab37ddf0 diff --git a/nodes/heatExchanger b/nodes/heatExchanger deleted file mode 160000 index f53f62a..0000000 --- a/nodes/heatExchanger +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f53f62a5220ef39b529242b97561a1afe273aa09 diff --git a/nodes/linearActuator b/nodes/linearActuator deleted file mode 160000 index a7f42d8..0000000 --- a/nodes/linearActuator +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a7f42d89f58571959288cd7e120d1dcbd0355f04 diff --git a/nodes/monster b/nodes/monster index 6a2f25b..a061873 160000 --- a/nodes/monster +++ b/nodes/monster @@ -1 +1 @@ -Subproject commit 6a2f25bb444e52d3aee907cbefe8a9373065af77 +Subproject commit a061873537a2ecb70b325b9f3bcd11288116cbc0 diff --git a/nodes/predict b/nodes/predict deleted file mode 160000 index ce49506..0000000 --- a/nodes/predict +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ce495062f726a4f07f631d0da855dd954f872d12 diff --git a/nodes/thermalCollector b/nodes/thermalCollector deleted file mode 160000 index c0dc13b..0000000 --- a/nodes/thermalCollector +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c0dc13b69d23ec16caf1d5b32ecab8e9945e67fe diff --git a/package-lock.json b/package-lock.json index 26291cb..51297ef 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,9 +16,9 @@ } }, "node_modules/@babel/runtime": { - "version": "7.27.3", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.27.3.tgz", - "integrity": "sha512-7EYtGezsdiDMyY80+65EzwiGmcJqpmcZCojSXaRgdrBaGtWTgDZKq69cPIVped6MkIM78cTQ2GOiEYjwOlG4xw==", + "version": "7.28.4", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.28.4.tgz", + "integrity": "sha512-Q/N6JNWvIvPnLDvjlE1OUBLPQHH6l3CltCEsHIujp45zQUSSh8K+gHnaEX45yAT1nyngnINhvWtzN+Nb9D8RAQ==", "license": "MIT", "engines": { "node": ">=6.9.0" @@ -57,9 +57,9 @@ } }, "node_modules/@mapbox/node-pre-gyp/node_modules/debug": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz", - "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==", + "version": "4.4.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", + "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", "license": "MIT", "dependencies": { "ms": "^2.1.3" @@ -242,22 +242,22 @@ "license": "MIT" }, "node_modules/@types/node": { - "version": "22.15.21", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.15.21.tgz", - "integrity": "sha512-EV/37Td6c+MgKAbkcLG6vqZ2zEYHD7bvSrzqqs2RIhbA6w3x+Dqz8MZM3sP6kGTeLrdoOgKZe+Xja7tUB2DNkQ==", + "version": "24.5.2", + "resolved": "https://registry.npmjs.org/@types/node/-/node-24.5.2.tgz", + "integrity": "sha512-FYxk1I7wPv3K2XBaoyH2cTnocQEu8AOZ60hPbsyukMPLv5/5qr7V1i8PLHdl6Zf87I+xZXFvPCXYjiTFq+YSDQ==", "license": "MIT", "dependencies": { - "undici-types": "~6.21.0" + "undici-types": "~7.12.0" } }, "node_modules/@types/node-fetch": { - "version": "2.6.12", - "resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.6.12.tgz", - "integrity": "sha512-8nneRWKCg3rMtF69nLQJnOYUcbafYeFSjqkw3jCRLsqkWFlHaoQrr5mXmofFGOx3DKn7UfmBMyov8ySvLRVldA==", + "version": "2.6.13", + "resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.6.13.tgz", + "integrity": "sha512-QGpRVpzSaUs30JBSGPjOg4Uveu384erbHBoT1zeONvyCfwQxIkUshLAOqN/k9EjGviPRmWTTe6aH2qySWKTVSw==", "license": "MIT", "dependencies": { "@types/node": "*", - "form-data": "^4.0.0" + "form-data": "^4.0.4" } }, "node_modules/@types/offscreencanvas": { @@ -330,9 +330,9 @@ } }, "node_modules/aproba": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz", - "integrity": "sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.1.0.tgz", + "integrity": "sha512-tLIEcj5GuR2RSTnxNKdkK0dJ/GrC7P38sUkiDmDuHfsHmbagTFAxDVIBltoklXEVIQ/f14IL8IMJ5pn9Hez1Ew==", "license": "ISC" }, "node_modules/are-we-there-yet": { @@ -371,9 +371,9 @@ "license": "MIT" }, "node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "version": "1.1.12", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz", + "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==", "license": "MIT", "dependencies": { "balanced-match": "^1.0.0", @@ -514,9 +514,9 @@ } }, "node_modules/decimal.js": { - "version": "10.5.0", - "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.5.0.tgz", - "integrity": "sha512-8vDa8Qxvr/+d94hSh5P3IJwI5t8/c0KsMp+g8bNw9cY2icONa5aPfvKeieW1WlG0WQYwwhJ7mjui2xtiePQSXw==", + "version": "10.6.0", + "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.6.0.tgz", + "integrity": "sha512-YpgQiITW3JXGntzdUmyUR1V812Hn8T1YVXhCu+wO3OpS4eU9l4YdD3qjyiKdV6mvV29zapkMeD390UVEf2lkUg==", "license": "MIT" }, "node_modules/delayed-stream": { @@ -535,9 +535,9 @@ "license": "MIT" }, "node_modules/detect-libc": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.4.tgz", - "integrity": "sha512-3UDv+G9CsCKO1WKMGw9fwq/SWJYbI0c5Y7LU1AXYoDdbhE2AHQ6N6Nb34sG8Fj7T5APy8qXDCKuuIHd1BR0tVA==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.0.tgz", + "integrity": "sha512-vEtk+OcP7VBRtQZ1EJ3bdgzSfBjgnEalLTp5zjJrS+2Z1w2KZly4SBdac/WDU3hhsNAZ9E8SC96ME4Ey8MZ7cg==", "license": "Apache-2.0", "engines": { "node": ">=8" @@ -639,14 +639,15 @@ "license": "MIT" }, "node_modules/form-data": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.2.tgz", - "integrity": "sha512-hGfm/slu0ZabnNt4oaRZ6uREyfCj6P4fT/n6A1rGV+Z0VdGXjfOhVUpkn6qVQONHGIFwmveGXyDs75+nr6FM8w==", + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.4.tgz", + "integrity": "sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow==", "license": "MIT", "dependencies": { "asynckit": "^0.4.0", "combined-stream": "^1.0.8", "es-set-tostringtag": "^2.1.0", + "hasown": "^2.0.2", "mime-types": "^2.1.12" }, "engines": { @@ -728,7 +729,7 @@ }, "node_modules/generalFunctions": { "version": "1.0.0", - "resolved": "git+https://gitea.centraal.wbd-rd.nl/RnD/generalFunctions.git#26ed170932696cf9019ee46fec79d76c43ed5c25", + "resolved": "git+https://gitea.centraal.wbd-rd.nl/RnD/generalFunctions.git#efc97d6cd17399391b011298e47e8c1b1599592d", "license": "SEE LICENSE" }, "node_modules/get-caller-file": { @@ -1330,9 +1331,9 @@ } }, "node_modules/undici-types": { - "version": "6.21.0", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz", - "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==", + "version": "7.12.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.12.0.tgz", + "integrity": "sha512-goOacqME2GYyOZZfb5Lgtu+1IDmAlAEu5xnD3+xTzS10hT0vzpf0SPjkXwAw9Jm+4n/mQGDP3LO8CPbYROeBfQ==", "license": "MIT" }, "node_modules/util-deprecate": { diff --git a/package.json b/package.json index d71ef71..4631c53 100644 --- a/package.json +++ b/package.json @@ -11,19 +11,12 @@ ], "node-red": { "nodes": { - "asm1": "nodes/asm1/asm1.js", - "convert": "nodes/convert/convert.js", "dashboardapi": "nodes/dashboardAPI/dashboardapi.js", - "gateGroupControl": "nodes/gateGroupControl/ggc.js", - "heatexchanger": "nodes/heatExchanger/heatExchanger.js", - "linearActuator": "nodes/linearActuator/linearActuator.js", "machineGroupControl": "nodes/machineGroupControl/mgc.js", "measurement": "nodes/measurement/measurement.js", "monster": "nodes/monster/monster.js", - "predict": "nodes/predict/predict.js", "reactor": "nodes/reactor/reactor.js", "rotatingMachine": "nodes/rotatingMachine/rotatingMachine.js", - "thermalCollector": "nodes/thermalCollector/thermalCollector.js", "valve": "nodes/valve/valve.js", "valveGroupControl": "nodes/valveGroupControl/vgc.js" } @@ -33,7 +26,7 @@ "dependencies": { "@tensorflow/tfjs": "^4.22.0", "@tensorflow/tfjs-node": "^4.22.0", - "generalFunctions": "git+http://62.221.255.63:32768/RnD/generalFunctions.git", + "generalFunctions": "git+https://gitea.centraal.wbd-rd.nl/RnD/generalFunctions.git", "mathjs": "^13.2.0" } }