Skip to content

Commit be4c37c

Browse files
committed
Version 0.37-alpha.
1 parent c797e37 commit be4c37c

File tree

9 files changed

+76
-26
lines changed

9 files changed

+76
-26
lines changed

README.md

Lines changed: 10 additions & 5 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.36-alpha).
51+
- Windows installer available in the [releases section](https://github.com/riclolsen/json-scada/releases/tag/V0.37-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.
@@ -88,7 +88,7 @@ To provide an easy to use, fully-featured, scalable, and portable SCADA/IIoT-I4.
8888
## Documentation
8989

9090
- [Generic Install Guide](https://github.com/riclolsen/json-scada/blob/master/docs/install.md)
91-
- [Windows Installer](https://github.com/riclolsen/json-scada/releases/tag/V0.36-alpha)
91+
- [Windows Installer](https://github.com/riclolsen/json-scada/releases/tag/V0.37-alpha)
9292
- [RedHat/Rocky Linux Installer](https://github.com/riclolsen/json-scada/blob/master/docs/install.md#rhel94-and-compatible-systems-automated-installation)
9393
- [Docker Demo](https://github.com/riclolsen/json-scada/blob/master/demo-docker/README.md)
9494
- [Schema Documentation](https://github.com/riclolsen/json-scada/blob/master/docs/schema.md)
@@ -104,6 +104,8 @@ To provide an easy to use, fully-featured, scalable, and portable SCADA/IIoT-I4.
104104
- [MQTT Sparkplug-B Client Driver](https://github.com/riclolsen/json-scada/blob/master/src/mqtt-sparkplug/README.md)
105105
- [OPC-UA Client Driver](https://github.com/riclolsen/json-scada/blob/master/src/OPC-UA-Client/README.md)
106106
- [OPC-UA Server Driver](https://github.com/riclolsen/json-scada/blob/master/src/OPC-UA-Server/README.md)
107+
- [OPC-DA Client Driver](https://github.com/riclolsen/json-scada/blob/master/src/OPC-DA-Client/README.md)
108+
- [PLC4X-GO Modbus Client Driver](https://github.com/riclolsen/json-scada/blob/master/src/plc4x-client/README.md)
107109
- [CIP Ethernet/IP PLCTags Client Driver](https://github.com/riclolsen/json-scada/blob/master/src/libplctag/PLCTagsClient/README.md)
108110
- [I104M Client Driver](https://github.com/riclolsen/json-scada/blob/master/src/i104m/README.md)
109111
- [Calculations](https://github.com/riclolsen/json-scada/blob/master/src/calculations/README.md)
@@ -126,13 +128,15 @@ To provide an easy to use, fully-featured, scalable, and portable SCADA/IIoT-I4.
126128
- [x] MQTT/Sparkplug-B Client
127129
- [x] Modbus Client via PLC4X-GO
128130
- [x] I104M (adapter for some OSHMI drivers)
129-
- [x] ICCP Client (via I104M)
131+
- [ ] ICCP Client
132+
- [ ] ICCP Server
130133
- [x] Telegraf Client (OPC-UA, MQTT, MODBUS, SNMP, ...)
131134
- [x] OPC UA Client
132135
- [x] OPC UA Server
133136
- [ ] OPC UA Historical Data Server
134-
- [ ] OPC DA Client
135-
- [ ] OPC DA Server
137+
- [x] OPC DA Client (Windows)
138+
- [ ] OPC AE Client (Windows)
139+
- [ ] OPC DA Server (Windows)
136140
- [x] IEC 61850 MMS Client
137141
- [ ] IEC 61850 MMS Server
138142
- [ ] IEC 61850 GOOSE Client
@@ -171,6 +175,7 @@ To provide an easy to use, fully-featured, scalable, and portable SCADA/IIoT-I4.
171175
- [ ] Alerta Integration (https://alerta.io/)
172176
- [x] PLC4X-GO Integration (https://plc4x.apache.org/)
173177
- [ ] Managed Cloud Service
178+
- [ ] Supported LTS versions
174179

175180
## Online Demo (substations simulation)
176181

index.md

Lines changed: 10 additions & 5 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.36-alpha).
51+
- Windows installer available in the [releases section](https://github.com/riclolsen/json-scada/releases/tag/V0.37-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.
@@ -88,7 +88,7 @@ To provide an easy to use, fully-featured, scalable, and portable SCADA/IIoT-I4.
8888
## Documentation
8989

9090
- [Generic Install Guide](docs/install.md)
91-
- [Windows Installer](https://github.com/riclolsen/json-scada/releases/tag/V0.36-alpha)
91+
- [Windows Installer](https://github.com/riclolsen/json-scada/releases/tag/V0.37-alpha)
9292
- [RedHat/Rocky Linux Installer](docs/install.md#rhel94-and-compatible-systems-automated-installation)
9393
- [Install Guide](docs/install.md)
9494
- [Docker Demo](demo-docker/README.md)
@@ -105,6 +105,8 @@ To provide an easy to use, fully-featured, scalable, and portable SCADA/IIoT-I4.
105105
- [MQTT Sparkplug-B Client Driver](src/mqtt-sparkplug/README.md)
106106
- [OPC-UA Client Driver](src/OPC-UA-Client/README.md)
107107
- [OPC-UA Server Driver](src/OPC-UA-Server/README.md)
108+
- [OPC-DA Client Driver](src/OPC-DA-Client/README.md)
109+
- [PLC4X-GO Modbus Client Driver](src/plc4x-client/README.md)
108110
- [CIP Ethernet/IP PLCTags Client Driver](src/libplctag/PLCTagsClient/README.md)
109111
- [I104M Client Driver](src/i104m/README.md)
110112
- [Calculations](src/calculations/README.md)
@@ -127,14 +129,16 @@ To provide an easy to use, fully-featured, scalable, and portable SCADA/IIoT-I4.
127129
- [x] MQTT/Sparkplug-B Client
128130
- [x] Modbus Client via PLC4X-GO
129131
- [x] I104M (adapter for some OSHMI drivers)
130-
- [x] ICCP Client (via I104M)
132+
- [ ] ICCP Client
133+
- [ ] ICCP Server
131134
- [x] Telegraf Client (many data sources available such as MQTT, MODBUS, SNMP, ...)
132135
- [x] OPC UA Client
133136
- [x] OPC UA Server
134137
- [ ] OPC UA Historical Data Server
135138
- [ ] OPC UA Server
136-
- [ ] OPC DA Client
137-
- [ ] OPC DA Server
139+
- [x] OPC DA Client (Windows)
140+
- [ ] OPC AE Client (Windows)
141+
- [ ] OPC DA Server (Windows)
138142
- [x] IEC 61850 MMS Client
139143
- [ ] IEC 61850 MMS Server
140144
- [ ] IEC 61850 GOOSE Client
@@ -171,6 +175,7 @@ To provide an easy to use, fully-featured, scalable, and portable SCADA/IIoT-I4.
171175
- [ ] Alerta Integration (https://alerta.io/)
172176
- [x] PLC4X-GO Integration (https://plc4x.apache.org/)
173177
- [ ] Managed Cloud Service
178+
- [ ] Supported LTS versions
174179

175180
## Online Demo (substations simulation)
176181

platform-windows/json-scada.nsi

Lines changed: 26 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ RequestExecutionLevel admin
1717

1818
;--------------------------------
1919

20-
!define VERSION "v.0.36"
21-
!define VERSION_ "0.36.0.0"
20+
!define VERSION "v.0.37"
21+
!define VERSION_ "0.37.0.0"
2222

2323
Function .onInit
2424
System::Call 'keexrnel32::CreateMutexA(i 0, i 0, t "MutexJsonScadaInstall") i .r1 ?e'
@@ -106,7 +106,6 @@ ${DisableX64FSRedirection}
106106

107107
SetRegView 64
108108

109-
110109
; Closes all processes
111110
nsExec::Exec 'net stop JSON_SCADA_grafana'
112111
nsExec::Exec 'net stop JSON_SCADA_metabase'
@@ -132,6 +131,7 @@ SetRegView 64
132131
nsExec::Exec 'net stop JSON_SCADA_plctags'
133132
nsExec::Exec 'net stop JSON_SCADA_dnp3client'
134133
nsExec::Exec 'net stop JSON_SCADA_opcuaclient'
134+
nsExec::Exec 'net stop JSON_SCADA_opcdaclient'
135135
nsExec::Exec 'net stop JSON_SCADA_opcuaserver'
136136
nsExec::Exec 'net stop JSON_SCADA_mqttsparkplugclient'
137137
nsExec::Exec 'net stop JSON_SCADA_plc4xclient'
@@ -245,7 +245,8 @@ SetRegView 64
245245
File /a "..\platform-windows\nssm.exe"
246246
File /a "..\platform-windows\sounder.exe"
247247
File /a "..\platform-windows\vc_redist.x64.exe"
248-
File /a "..\platform-windows\dotnet-runtime-6.0.32-win-x64.exe"
248+
File /a "..\platform-windows\dotnet-runtime-8.0.7-win-x64.exe"
249+
File /a "..\platform-windows\OPC Core Components Redistributable (x64) 3.00.108.msi"
249250
;File /a "..\platform-windows\gbda_aut.dll"
250251
;File /a "..\platform-windows\gbhda_aw.dll"
251252
;ExecWait `regsvr32 gbda_aut.dll`
@@ -261,10 +262,13 @@ SetRegView 64
261262
; ExecWait '"$INSTDIR\platform-windows\vc_redist.x64.exe" /q'
262263
;${EndIf}
263264
Sleep 1000
264-
Exec '"$INSTDIR\platform-windows\vc_redist.x64.exe" /install /passive /quiet'
265+
ExecWait '"$INSTDIR\platform-windows\vc_redist.x64.exe" /install /passive /quiet'
265266
Sleep 1000
266-
Exec '"$INSTDIR\platform-windows\dotnet-runtime-6.0.32-win-x64.exe" /install /passive /quiet'
267-
267+
ExecWait '"$INSTDIR\platform-windows\dotnet-runtime-8.0.7-win-x64.exe" /install /passive /quiet'
268+
Sleep 1000
269+
ExecWait 'msiexec /i "$INSTDIR\platform-windows\OPC Core Components Redistributable (x64) 3.00.108.msi" /qn'
270+
Sleep 1000
271+
268272
SetOutPath $INSTDIR\platform-windows\nodejs-runtime
269273
File /a /r "..\platform-windows\nodejs-runtime\*.*"
270274

@@ -278,7 +282,7 @@ SetRegView 64
278282
File /a /r "..\platform-windows\jdk-runtime\*.*"
279283

280284
SetOutPath $INSTDIR\platform-windows\metabase-runtime
281-
File /a /r "..\platform-windows\metabase-runtime\metabase.jar"
285+
File /a "..\platform-windows\metabase-runtime\metabase.jar"
282286

283287
SetOutPath $INSTDIR\platform-windows\grafana-runtime
284288
File /a /r "..\platform-windows\grafana-runtime\*.*"
@@ -327,13 +331,14 @@ SetRegView 64
327331

328332
SetOutPath $INSTDIR\src\htdocs
329333
File /a "..\src\htdocs\*.*"
334+
File /a ".\release_notes.txt"
330335
SetOutPath $INSTDIR\src\htdocs\sounds
331-
File /a /r "..\src\htdocs\sounds\critical.wav"
332-
File /a /r "..\src\htdocs\sounds\noncritical.wav"
336+
File /a "..\src\htdocs\sounds\critical.wav"
337+
File /a "..\src\htdocs\sounds\noncritical.wav"
333338
SetOutPath $INSTDIR\src\htdocs\scripts
334339
File /a /r "..\src\htdocs\scripts\*.*"
335340
SetOutPath $INSTDIR\src\htdocs\sage-cepel-displays
336-
File /a /r "..\src\htdocs\sage-cepel-displays\README.md"
341+
File /a "..\src\htdocs\sage-cepel-displays\README.md"
337342
SetOutPath $INSTDIR\src\htdocs\images
338343
File /a /r "..\src\htdocs\images\*.*"
339344
SetOutPath $INSTDIR\src\htdocs\charts
@@ -633,6 +638,11 @@ Section "Uninstall"
633638
ExecWait `"${SC}" delete "JSON_SCADA_opcuaclient"`
634639
ClearErrors
635640

641+
ExecWait `"${SC}" stop "JSON_SCADA_opcdaclient"`
642+
Sleep 50
643+
ExecWait `"${SC}" delete "JSON_SCADA_opcdaclient"`
644+
ClearErrors
645+
636646
ExecWait `"${SC}" stop "JSON_SCADA_telegraf_runtime"`
637647
Sleep 50
638648
ExecWait `"${SC}" delete "JSON_SCADA_telegraf_runtime"`
@@ -667,6 +677,11 @@ Section "Uninstall"
667677
Sleep 50
668678
ExecWait `"${SC}" delete "JSON_SCADA_opcuaserver"`
669679
ClearErrors
680+
681+
ExecWait `"${SC}" stop "JSON_SCADA_opcdaserver"`
682+
Sleep 50
683+
ExecWait `"${SC}" delete "JSON_SCADA_opcdaserver"`
684+
ClearErrors
670685

671686
ExecWait `"${SC}" stop "JSON_SCADA_cs_data_processor"`
672687
Sleep 50

platform-windows/release_notes.txt

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,31 @@ Inkscape+SAGE:
134134

135135
-------------------------------------------------------------------
136136

137+
Notes for version 0.37:
138+
139+
* Default login credentials: username=admin password=jsonscada.
140+
* Metabase credentials: [email protected] password=jsonscada123.
141+
* New OPC-DA Client driver.
142+
* OPC-UA Server: create branches from groups1/2/3, handle arrays and date types, fix errors.
143+
* Fix measurements with alias from EON nodes on MQTT/Sparkplug driver.
144+
* Fix environment variables on nodejs processes.
145+
* Dotnet projects targets 8.0 version, updated Mongodb drivers.
146+
* Grafana updated to 11.1.3.
147+
* Nodejs runtime updated to 20.16.0.
148+
* MongoDB Compass updated to 1.43.5.
149+
150+
Requirements and recommendations:
151+
152+
* Windows 10/11 64 bits or Server >=2019, Windows PowerShell. At least 20GB of free space in the "C:" drive.
153+
* Administrative rights. corporate Windows policies may cause problems with the creation of services and the opening of TCP ports.
154+
* Free TCP ports 6688, 6689, 27017, 5432, 80, 8080, 3000, 3001, 9000. Other ports may be required for optional services and protocols.
155+
* If the server already has MongoDB, PostgreSQL, Grafana, Metabase, Nginx or another webserver, please uninstall, disable or watch out for possible conflicts.
156+
* Do not update previously installed JSON-SCADA. Please uninstall previous JSON-SCADA versions before installing a new version.
157+
* If using VirtualBox configure "paravirtualization interface"=KVM, otherwise Nodejs errors may occur.
158+
* MongoDB requires AVX instructions on x86 CPU.
159+
160+
-------------------------------------------------------------------
161+
137162
Notes for version 0.36:
138163

139164
* Default login credentials: username=admin password=jsonscada.

platform-windows/start_services.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ REM nssm start JSON_SCADA_mongowr
3232
REM SELECT PROTOCOLS TO START
3333
nssm start JSON_SCADA_iec104client
3434
nssm start JSON_SCADA_mqttsparkplugclient
35-
nssm start JSON_SCADA_plc4xclient
35+
rem nssm start JSON_SCADA_plc4xclient
3636
nssm start JSON_SCADA_telegraf_listener
3737
net start JSON_SCADA_telegraf_runtime
3838
REM nssm start JSON_SCADA_iec104server

src/htdocs/i18n/messages_i18n-en_us.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
var Msg =
55
{
66
NomeProduto: '{json:scada}',
7-
VersaoProduto: '0.36',
7+
VersaoProduto: '0.37',
88

99
NomeVisorTelas: 'Display Viewer',
1010
NomeVisorEventos: 'Events Viewer',

src/htdocs/i18n/messages_i18n-pt_br.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
var Msg =
55
{
66
NomeProduto: '{json:scada}',
7-
VersaoProduto: '0.36',
7+
VersaoProduto: '0.37',
88

99
NomeVisorTelas: 'Visor de Telas',
1010
NomeVisorEventos: 'Visor de Eventos',

src/htdocs/i18n/messages_i18n-uk_ua.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
var Msg =
55
{
66
NomeProduto: '{json:scada}',
7-
VersaoProduto: '0.36',
7+
VersaoProduto: '0.37',
88

99
NomeVisorTelas: 'Перегляд ',
1010
NomeVisorEventos: 'Події',

src/htdocs/i18n/messages_i18n.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
var Msg =
55
{
66
NomeProduto: '{json:scada}',
7-
VersaoProduto: '0.36',
7+
VersaoProduto: '0.37',
88

99
NomeVisorTelas: 'Display Viewer',
1010
NomeVisorEventos: 'Events Viewer',

0 commit comments

Comments
 (0)