Skip to content

Commit 0fce397

Browse files
authored
Merge pull request #169 from json-scada/master
Version 0.40-alpha.
2 parents e795a5e + 75360ce commit 0fce397

30 files changed

+1249
-968
lines changed

README.md

+2-2
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.39-alpha).
51+
- Windows installer available in the [releases section](https://github.com/riclolsen/json-scada/releases/tag/V0.40-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.
@@ -89,7 +89,7 @@ To provide an easy to use, fully-featured, scalable, and portable SCADA/IIoT-I4.
8989
## Documentation
9090

9191
- [Generic Install Guide](https://github.com/riclolsen/json-scada/blob/master/docs/install.md)
92-
- [Windows Installer](https://github.com/riclolsen/json-scada/releases/tag/V0.39-alpha)
92+
- [Windows Installer](https://github.com/riclolsen/json-scada/releases/tag/V0.40-alpha)
9393
- [RedHat/Rocky Linux Installer](https://github.com/riclolsen/json-scada/blob/master/docs/install.md#rhel94-and-compatible-systems-automated-installation)
9494
- [Docker Demo](https://github.com/riclolsen/json-scada/blob/master/demo-docker/README.md)
9595
- [Schema Documentation](https://github.com/riclolsen/json-scada/blob/master/docs/schema.md)

index.md

+2-2
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.39-alpha).
51+
- Windows installer available in the [releases section](https://github.com/riclolsen/json-scada/releases/tag/V0.40-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.
@@ -89,7 +89,7 @@ To provide an easy to use, fully-featured, scalable, and portable SCADA/IIoT-I4.
8989
## Documentation
9090

9191
- [Generic Install Guide](docs/install.md)
92-
- [Windows Installer](https://github.com/riclolsen/json-scada/releases/tag/V0.39-alpha)
92+
- [Windows Installer](https://github.com/riclolsen/json-scada/releases/tag/V0.40-alpha)
9393
- [RedHat/Rocky Linux Installer](docs/install.md#rhel94-and-compatible-systems-automated-installation)
9494
- [Install Guide](docs/install.md)
9595
- [Docker Demo](demo-docker/README.md)

platform-windows/json-scada.nsi

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ RequestExecutionLevel admin
1717

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

20-
!define VERSION "v.0.39"
21-
!define VERSION_ "0.39.0.0"
20+
!define VERSION "v.0.40"
21+
!define VERSION_ "0.40.0.0"
2222

2323
Function .onInit
2424
System::Call 'keexrnel32::CreateMutexA(i 0, i 0, t "MutexJsonScadaInstall") i .r1 ?e'

platform-windows/release_notes.txt

+24
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,30 @@ Inkscape+SAGE:
135135

136136
-------------------------------------------------------------------
137137

138+
Notes for version 0.40:
139+
140+
* ATTENTION: The default SVG folder was moved to "c:\json-scada\svg\".
141+
142+
* Default login credentials: username=admin password=jsonscada.
143+
* Metabase credentials: [email protected] password=jsonscada123.
144+
* Fixed problems with some new AdminUI dialogs. *
145+
* NPM packages updated.
146+
* MongoDB Community Server updated to 8.0.3.
147+
* MongoDB Compass updated to 1.44.6.
148+
* Grafana updated to 11.3.0.
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+
138162
Notes for version 0.39:
139163

140164
* ATTENTION: The default SVG folder was moved to "c:\json-scada\svg\".

platform-windows/start_services.bat

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ net start JSON_SCADA_process_hist
2222
REM net start JSON_SCADA_config_server_excel
2323
REM net start JSON_SCADA_alarm_beep
2424

25-
call start_protocols.bat
25+
call \json-scada\platform-windows\start_protocols.bat
2626

2727
ping -n 3 127.0.0.1
2828

platform-windows/stop_services.bat

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ net stop JSON_SCADA_alarm_beep
1414
net stop JSON_SCADA_config_server_excel
1515

1616
REM STOP PROTOCOL DRIVERS
17-
call stop_protocols.bat
17+
call \json-scada\platform-windows\stop_protocols.bat
1818
ping -n 2
1919

2020
REM STOP OTHER PROCESSES

0 commit comments

Comments
 (0)