Skip to content

Commit c6b8380

Browse files
riclolsenriclolsen
authored
Merge pull request #218 from json-scada/master
Version 0.53-alpha
2 parents 696c919 + 84a33bc commit c6b8380

File tree

22 files changed

+2821
-358
lines changed

22 files changed

+2821
-358
lines changed

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ To provide an easy to use, fully-featured, scalable, and portable SCADA/IIoT-I4.
4848
- MongoDB as the real-time core database, persistence layer, config store, SOE historian.
4949
- Event-based realtime async data processing with MongoDB Change Streams.
5050
- Portability and modular interoperability over Linux, Windows, Mac OSX, x86/64, ARM.
51-
- Windows installer available in the [releases section](https://github.com/riclolsen/json-scada/releases/tag/V0.52-alpha).
51+
- Windows installer available in the [releases section](https://github.com/riclolsen/json-scada/releases/tag/V0.53-alpha).
5252
- Unlimited tags, servers, and users.
5353
- Horizontal scalability, from a single computer to big clusters (MongoDB-sharding), Docker containers, VMs, Kubernetes, cloud, or hybrid deployments.
5454
- Modular distributed architecture. Lightweight redundant data acquisition nodes can connect securely over TLS to the database server. E.g. a Raspberry PI can be a data acquisition node.
@@ -90,7 +90,7 @@ To provide an easy to use, fully-featured, scalable, and portable SCADA/IIoT-I4.
9090
## Documentation
9191

9292
- [Generic Install Guide](https://github.com/riclolsen/json-scada/blob/master/docs/install.md)
93-
- [Windows Installer](https://github.com/riclolsen/json-scada/releases/tag/V0.52-alpha)
93+
- [Windows Installer](https://github.com/riclolsen/json-scada/releases/tag/V0.53-alpha)
9494
- [RedHat/Rocky Linux Installer Script](https://github.com/riclolsen/json-scada/blob/master/docs/install.md#rhel94-and-compatible-systems-automated-installation)
9595
- [Ubuntu Linux Installer Script](https://github.com/riclolsen/json-scada/blob/master/docs/install.md#ubuntu-2404-scripted-installation)
9696
- [Generic Install Guide](https://github.com/riclolsen/json-scada/blob/master/docs/install.md)

‎demo-docker/mongo_seed/files/demo_connections.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{"_id":{"$oid":"5f1090143d8adfd3eccb206f"},"protocolDriver":"IEC60870-5-104","protocolDriverInstanceNumber":1,"protocolConnectionNumber":61,"name":"IEC104DEMO","description":"Demo via IEC60870-5-104","enabled":true,"commandsEnabled":true,"ipAddressLocalBind":"","ipAddresses":["129.153.76.210:2404","150.230.171.172:2404"],"localLinkAddress":2.0,"remoteLinkAddress":1.0,"giInterval":250.0,"testCommandInterval":60.0,"timeSyncInterval":650.0,"sizeOfCOT":2.0,"sizeOfCA":2.0,"sizeOfIOA":3.0,"k":12.0,"w":8.0,"t0":10.0,"t1":15.0,"t2":10.0,"t3":20.0,"stats":null}
33
{"_id":{"$oid":"5ff3512268d80d68205b403f"},"protocolDriver":"OPC-UA","protocolDriverInstanceNumber":1,"protocolConnectionNumber":1003,"name":"OPCUA1","description":"OPC Client 1","enabled":true,"commandsEnabled":true,"endpointURLs":["opc.tcp://opcua.demo-this.com:51210/UA/SampleServer"],"configFileName":"c:\\json-scada\\conf\\Opc.Ua.DefaultClient.Config.xml","autoCreateTags":true,"useSecurity":false,"stats":null, "giInterval": 300,"hoursShift": 0,"topics": []}
44
{"_id":{"$oid":"6773eb87695a6bf138194e45"},"protocolDriver":"OPC-UA","protocolDriverInstanceNumber":1,"protocolConnectionNumber":1004,"name":"OPCUA2","description":"OPC Client 2","enabled":true,"commandsEnabled":true,"endpointURLs":["opc.tcp://opcuademo.sterfive.com:26543"],"configFileName":"c:\\json-scada\\conf\\Opc.Ua.DefaultClient.Config.xml","autoCreateTags":true,"useSecurity":false,"stats":null, "giInterval": 300,"hoursShift": 0,"topics": []}
5-
{"_id":{"$oid":"606c93aa46fda805647cce53"},"protocolDriver":"MQTT-SPARKPLUG-B","protocolDriverInstanceNumber":1,"protocolConnectionNumber":1200,"name":"MQTT-BROKER","description":"MQTT Demo","enabled":true,"commandsEnabled":true,"autoCreateTags":true,"endpointURLs":["mqtt://broker.hivemq.com:1883"],"topics":["spBv1.0/Edge Nodes/#","spBv1.0/Axxela/#","testtopic/munich/$.*~"],"groupId":"","edgeNodeId":"","deviceId":"","scadaHostId":"","username":"","password":"","useSecurity":false,"chainValidation":true,"rootCertFilePath":"","localCertFilePath":"","privateKeyFilePath":"","pfxFilePath":"","passphrase":"","allowTLSv10":false,"allowTLSv11":false,"allowTLSv12":true,"allowTLSv13":true,"cipherList":"","publishTopicRoot":"","topicsAsFiles":[],"topicsScripted":[],"clientId":"","stats":null}
5+
{"_id":{"$oid":"606c93aa46fda805647cce53"},"protocolDriver":"MQTT-SPARKPLUG-B","protocolDriverInstanceNumber":1,"protocolConnectionNumber":1200,"name":"MQTT-BROKER","description":"MQTT Demo","enabled":true,"commandsEnabled":true,"autoCreateTags":true,"endpointURLs":["mqtt://broker.hivemq.com:1883"],"topics":["spBv1.0/MIMIC/#","spBv1.0/IcoMS/#","test/dht11/$.*~"],"groupId":"","edgeNodeId":"","deviceId":"","scadaHostId":"","username":"","password":"","useSecurity":false,"chainValidation":true,"rootCertFilePath":"","localCertFilePath":"","privateKeyFilePath":"","pfxFilePath":"","passphrase":"","allowTLSv10":false,"allowTLSv11":false,"allowTLSv12":true,"allowTLSv13":true,"cipherList":"","publishTopicRoot":"","topicsAsFiles":[],"topicsScripted":[],"clientId":"","stats":null}
66
{"_id":{"$oid":"60da25c2040e43523c8f4f57"},"protocolDriver":"OPC-UA_SERVER","protocolDriverInstanceNumber":1,"protocolConnectionNumber":123,"name":"OPC-UA DIST","description":"Test distribution of OPC-UA","enabled":true,"commandsEnabled":true,"ipAddressLocalBind":"0.0.0.0:4840","ipAddresses":[],"groupId":"UA/Test","topics":["KOR1","KAW2"],"stats":null}
77
{"_id":{"$oid":"6053887ea2e672638cc751d4"},"protocolDriver":"TELEGRAF-LISTENER","protocolDriverInstanceNumber":1,"protocolConnectionNumber":2001,"name":"TELEGRAFDEMO","description":"TELEGRAF Demo","enabled": true,"commandsEnabled":false,"ipAddresses":["127.0.0.1"],"ipAddressLocalBind":"0.0.0.0:51920","stats":null}
88
{"_id":{"$oid":"6675d176e2f7917450d7585b"},"protocolDriver":"PLC4X","protocolDriverInstanceNumber":1,"protocolConnectionNumber":2003,"name":"PLC1","description":"PLC #1 MODBUS","enabled":true,"commandsEnabled":true,"topics":["MBPLC1_HR1|holding-register:1:UINT","MBPLC1_10HRS|holding-register:2:INT[10]"],"autoCreateTags": true,"endpointURLs":["modbus-tcp://localhost:5001?unit-identifier=2"],"giInterval": 1.5,"stats":null}

‎demo-docker/mongo_seed/files/demo_connections_linux.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{"_id":{"$oid":"5f1090143d8adfd3eccb206f"},"protocolDriver":"IEC60870-5-104","protocolDriverInstanceNumber":1,"protocolConnectionNumber":61,"name":"IEC104DEMO","description":"Demo via IEC60870-5-104","enabled":true,"commandsEnabled":true,"ipAddressLocalBind":"","ipAddresses":["129.153.76.210:2404","150.230.171.172:2404"],"localLinkAddress":2.0,"remoteLinkAddress":1.0,"giInterval":250.0,"testCommandInterval":60.0,"timeSyncInterval":650.0,"sizeOfCOT":2.0,"sizeOfCA":2.0,"sizeOfIOA":3.0,"k":12.0,"w":8.0,"t0":10.0,"t1":15.0,"t2":10.0,"t3":20.0,"stats":null}
33
{"_id":{"$oid":"5ff3512268d80d68205b403f"},"protocolDriver":"OPC-UA","protocolDriverInstanceNumber":1,"protocolConnectionNumber":1003,"name":"OPCUA1","description":"OPC Client 1","enabled":true,"commandsEnabled":true,"endpointURLs":["opc.tcp://opcua.demo-this.com:51210/UA/SampleServer"],"configFileName":"../conf/Opc.Ua.DefaultClient.Config.xml","autoCreateTags":true,"useSecurity":false,"stats":null, "giInterval": 300,"hoursShift": 0,"topics": []}
44
{"_id":{"$oid":"6773eb87695a6bf138194e45"},"protocolDriver":"OPC-UA","protocolDriverInstanceNumber":1,"protocolConnectionNumber":1004,"name":"OPCUA2","description":"OPC Client 2","enabled":true,"commandsEnabled":true,"endpointURLs":["opc.tcp://opcuademo.sterfive.com:26543"],"configFileName":"../conf/Opc.Ua.DefaultClient.Config.xml","autoCreateTags":true,"useSecurity":false,"stats":null, "giInterval": 300,"hoursShift": 0,"topics": []}
5-
{"_id":{"$oid":"606c93aa46fda805647cce53"},"protocolDriver":"MQTT-SPARKPLUG-B","protocolDriverInstanceNumber":1,"protocolConnectionNumber":1200,"name":"MQTT-BROKER","description":"MQTT Demo","enabled":true,"commandsEnabled":true,"autoCreateTags":true,"endpointURLs":["mqtt://broker.hivemq.com:1883"],"topics":["spBv1.0/Edge Nodes/#","spBv1.0/Axxela/#","testtopic/munich/$.*~"],"groupId":"","edgeNodeId":"","deviceId":"","scadaHostId":"","username":"","password":"","useSecurity":false,"chainValidation":true,"rootCertFilePath":"","localCertFilePath":"","privateKeyFilePath":"","pfxFilePath":"","passphrase":"","allowTLSv10":false,"allowTLSv11":false,"allowTLSv12":true,"allowTLSv13":true,"cipherList":"","publishTopicRoot":"","topicsAsFiles":[],"topicsScripted":[],"clientId":"","stats":null}
5+
{"_id":{"$oid":"606c93aa46fda805647cce53"},"protocolDriver":"MQTT-SPARKPLUG-B","protocolDriverInstanceNumber":1,"protocolConnectionNumber":1200,"name":"MQTT-BROKER","description":"MQTT Demo","enabled":true,"commandsEnabled":true,"autoCreateTags":true,"endpointURLs":["mqtt://broker.hivemq.com:1883"],"topics":["spBv1.0/MIMIC/#","spBv1.0/IcoMS/#","test/dht11/$.*~"],"groupId":"","edgeNodeId":"","deviceId":"","scadaHostId":"","username":"","password":"","useSecurity":false,"chainValidation":true,"rootCertFilePath":"","localCertFilePath":"","privateKeyFilePath":"","pfxFilePath":"","passphrase":"","allowTLSv10":false,"allowTLSv11":false,"allowTLSv12":true,"allowTLSv13":true,"cipherList":"","publishTopicRoot":"","topicsAsFiles":[],"topicsScripted":[],"clientId":"","stats":null}
66
{"_id":{"$oid":"60da25c2040e43523c8f4f57"},"protocolDriver":"OPC-UA_SERVER","protocolDriverInstanceNumber":1,"protocolConnectionNumber":123,"name":"OPC-UA DIST","description":"Test distribution of OPC-UA","enabled":true,"commandsEnabled":true,"ipAddressLocalBind":"0.0.0.0:4840","ipAddresses":[],"groupId":"UA/Test","topics":["KOR1","KAW2"],"stats":null}
77
{"_id":{"$oid":"6053887ea2e672638cc751d4"},"protocolDriver":"TELEGRAF-LISTENER","protocolDriverInstanceNumber":1,"protocolConnectionNumber":2001,"name": "TELEGRAFDEMO","description":"TELEGRAF Demo","enabled": true,"commandsEnabled":false,"ipAddresses":[],"ipAddressLocalBind":"0.0.0.0:51920","stats":null}
88
{"_id":{"$oid":"6675d176e2f7917450d7585b"},"protocolDriver":"PLC4X","protocolDriverInstanceNumber":1,"protocolConnectionNumber":2003,"name":"PLC1","description":"PLC #1 MODBUS","enabled":true,"commandsEnabled":true,"topics":["MBPLC1_HR1|holding-register:1:UINT","MBPLC1_10HRS|holding-register:2:INT[10]"],"autoCreateTags": true,"endpointURLs":["modbus-tcp://localhost:5001?unit-identifier=2"],"giInterval": 1.5,"stats":null}

‎index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ To provide an easy to use, fully-featured, scalable, and portable SCADA/IIoT-I4.
4848
- MongoDB as the real-time core database, persistence layer, config store, SOE historian.
4949
- Event-based realtime async data processing with MongoDB Change Streams.
5050
- Portability and modular interoperability over Linux, Windows, Mac OSX, x86/64, ARM.
51-
- Windows installer available in the [releases section](https://github.com/riclolsen/json-scada/releases/tag/V0.52-alpha).
51+
- Windows installer available in the [releases section](https://github.com/riclolsen/json-scada/releases/tag/V0.53-alpha).
5252
- Unlimited tags, servers, and users.
5353
- Horizontal scalability, from a single computer to big clusters (MongoDB-sharding), Docker containers, VMs, Kubernetes, cloud, or hybrid deployments.
5454
- Modular distributed architecture. Lightweight redundant data acquisition nodes can connect securely over TLS to the database server. E.g. a Raspberry PI can be a data acquisition node.
@@ -90,7 +90,7 @@ To provide an easy to use, fully-featured, scalable, and portable SCADA/IIoT-I4.
9090
## Documentation
9191

9292
- [Generic Install Guide](docs/install.md)
93-
- [Windows Installer](https://github.com/riclolsen/json-scada/releases/tag/V0.52-alpha)
93+
- [Windows Installer](https://github.com/riclolsen/json-scada/releases/tag/V0.53-alpha)
9494
- [RedHat/Rocky Linux Installer Script](docs/install.md#rhel94-and-compatible-systems-automated-installation)
9595
- [Ubuntu Linux Installer Script](docs/install.md#ubuntu-2404-scripted-installation)
9696
- [Generic Install Guide](docs/install.md)

‎platform-windows/inkscape-extension/scada.inx

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<inkscape-extension>
3+
<_name>SCADA</_name>
4+
<id>org.inkscape.gui.scada20250615</id>
5+
<effect needs-live-preview="true" implements-custom-gui="true">
6+
<object-type>all</object-type>
7+
</effect>
8+
9+
<script>
10+
<command reldir="extensions" interpreter="python">scada.py</command>
11+
</script>
12+
13+
</inkscape-extension>

0 commit comments

Comments
 (0)