Merge branch 'main' of https://github.com/umati/UA-for-Industrial-Joi…

…ning-Technologies
umati · Feb 1, 2024 · 70d5400 · 70d5400
2 parents abb702d + c00b562
commit 70d5400
Show file tree

Hide file tree

Showing 8 changed files with 1,114 additions and 1,004 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,3 +7,8 @@ OPC_UA_Servers/Release1/IJT_OPC_UA_Server_Simulator/Opc.Ua.Machinery.NodeSet2.xm
 OPC_UA_Servers/Release1/IJT_OPC_UA_Server_Simulator/Opc.Ua.NodeSet2_1_04.xml
 OPC_UA_Servers/Release1/IJT_OPC_UA_Server_Simulator/tighteningapplication.xml
 OPC_UA_Servers/Release1/IJT_OPC_UA_Server_Simulator/Usage_IJT_OPC_UA_Server_Simulator.pdf
+
+node_modules
+node_modules/
+.vscode
+*.exe
diff --git a/.hintrc b/.hintrc
diff --git a/OPC_UA_Clients/Release1/NodeOPCUA_IJT_Client/package-lock.json b/OPC_UA_Clients/Release1/NodeOPCUA_IJT_Client/package-lock.json
diff --git a/OPC_UA_Clients/Release1/NodeOPCUA_IJT_Client/package.json b/OPC_UA_Clients/Release1/NodeOPCUA_IJT_Client/package.json
@@ -12,8 +12,8 @@
   "dependencies": {
     "chart.js": "^4.2.1",
     "express": "^4.18.2",
-    "node-opcua": "^2.91.1",
-    "node-opcua-nodeset-ijt": "^2.91.0",
+    "node-opcua": "^2.120.0",
+    "node-opcua-nodeset-ijt": "^2.120.0",
     "opcua": "^1.0.0",
     "socket.io": "^4.6.1",
     "source-map-support": "^0.5.21"

diff --git a/OPC_UA_Clients/Release1/README.md b/OPC_UA_Clients/Release1/README.md
@@ -1,7 +1,49 @@
-**Author:** Joakim Gustafsson
+# NodeOPCUA_IJTClient
 
-**Email:** [email protected]
+## Author
 
-This version of the client works with the Release 1 OPC UA Server Simulator available in : **\OPC_UA_Servers\Release1**.
+Joakim Gustafsson
+Email: [email protected]
 
+## Coordinator/Maintanence
+
+Mohit Agarwal
+Email: [email protected]
+
+## NodeOPCUA related
+
+Etienne Rossignon
+Email: [email protected]
+
+## Overview
+
+This application uses the open source NodeOPCUA Stack. The purpose of this application is to consume the data from any OPC UA server based on the OPC 40451-1 UA CS for Tightening Systems 1.00.
+
+This client will be updated based on the newer versions of the companion standards developed by VDMA Industrial Joining Technologies Working Group.
+
+## Pre-requisites
+
+1. Fork or clone the repository
+2. Go to OPCUA_Clients\NodeOPCUA_IJT_Client folder
+3. Run  `npm install`
+
+## How to run?
+
+1. Run the following command: `node index.js`
+2. The above command will start the socket.io server at `http://localhost:3000`
+3. Open the `http://localhost:3000` in the browser and start using the client.
+
+## OPC UA Server
+
+1. Use the following OPC UA Server to utilize the OPC UA Client: <https://github.com/umati/UA-for-Industrial-Joining-Technologies>
+2. Select Servers -> Local in the OPC UA Client to connect to the local OPC UA Server.
+
+## Tips
+
+* To update existing node-opcua modules, run the following commands:
+
+```bash
+npx npm-check-updates -u -f 'node-opcua*'
+npm install
+```
 
diff --git a/OPC_UA_Clients/Release1/README2.md b/OPC_UA_Clients/Release1/README2.md
diff --git a/OPC_UA_Clients/Release1/basic_node_opcua/package.json b/OPC_UA_Clients/Release1/basic_node_opcua/package.json
@@ -1,6 +1,6 @@
 {
     "dependencies": {
-        "node-opcua": "2.91.1",
-        "node-opcua-nodeset-ijt": "2.91.0"
+        "node-opcua": "2.120.0",
+        "node-opcua-nodeset-ijt": "2.120.0"
     }
 }
diff --git a/README.md b/README.md
@@ -2,14 +2,15 @@
 The purpose of the **VDMA Industrial Joining Technologies (IJT)** Working Group is to define standard information model for various **joining** **technologies** such as Tightening, Gluing, Riveting, Flow Drill Fastening, etc.
 The **Joining** **Specification** **(OPC 40450)** is the **Base** part for the joining technologies.
 
-- OPC UA **Reference** Server based on the following specifications:
-  * OPC **40450-1** UA CS for **Joining** Systems 1.00.0 **RC** and OPC **40451-1** UA CS for **Tightening** Systems **2.00.0** **RC** is available in the following location:
+- OPC UA **Reference** Client and Server based on OPC **40450-1** UA CS for **Joining** Systems 1.00.0 **RC** and OPC **40451-1** UA CS for **Tightening** Systems **2.00.0** **RC** are available in the following location:
 
-    * OPC_UA_Servers/**Release2**/**OPC_UA_IJT_Server_Simulator.zip**
+    * **Server:** OPC_UA_Servers/**Release2**/**OPC_UA_IJT_Server_Simulator.zip**
+    * **Client:** OPC_UA_Clients/**Release2**/**IJT_Web_Client**
 
-- OPC UA **Reference** Server based on OPC **40451-1** UA CS for **Tightening** Systems **1.00.0** is available in the following location:
+- OPC UA **Reference** Client and Server based on OPC **40451-1** UA CS for **Tightening** Systems **1.00.0** are available in the following location:
 
-   * OPC_UA_Servers/**Release1**/**IJT_OPC_UA_Server_Simulator.zip**
+   * **Server:** OPC_UA_Servers/**Release1**/**IJT_OPC_UA_Server_Simulator.zip**
+   * **Client:** OPC_UA_Clients/**Release2**/**NodeOPCUA_IJT_Client**