Skip to content

Commit f90b162

Browse files
committed
Version 0.7
1 parent da28a76 commit f90b162

File tree

8 files changed

+42
-27
lines changed

8 files changed

+42
-27
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ To provide an easy to use, fully-featured, scalable, and portable SCADA/IoT syst
4444
* Standard IT tools applied to SCADA/IoT (MongoDB, PostgreSQL/TimescaleDB,Node.js, C#, Golang, Grafana, etc.).
4545
* MongoDB as the real-time core database, persistence layer, config store, SOE historian.
4646
* Portability and interoperability over Linux, Windows, Mac OSX, x86/64, ARM.
47-
* Windows installer available in the [releases section](https://github.com/riclolsen/json-scada/releases/tag/V0.6-alpha).
47+
* Windows installer available in the [releases section](https://github.com/riclolsen/json-scada/releases/tag/V0.7-alpha).
4848
* Horizontal scalability, from a single computer to big clusters (MongoDB-sharding), Docker containers, VMs, Kubernetes, cloud, or hybrid deployments.
4949
* Unlimited tags, servers, and users.
5050
* 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.

platform-windows/json-scada.nsi

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
; json-scada.nsi
22
; {json:scada} installer script
3-
; Copyright 2020 - Ricardo L. Olsen
3+
; Copyright 2020-2021 - Ricardo L. Olsen
44

55
; NSIS (Nullsoft Scriptable Install System) - http://nsis.sourceforge.net/Main_Page
66

@@ -15,8 +15,8 @@ RequestExecutionLevel admin
1515

1616
;--------------------------------
1717

18-
!define VERSION "v.0.6"
19-
!define VERSION_ "0.6.0.0"
18+
!define VERSION "v.0.7"
19+
!define VERSION_ "0.7.0.0"
2020

2121
Function .onInit
2222
System::Call 'keexrnel32::CreateMutexA(i 0, i 0, t "MutexJsonScadaInstall") i .r1 ?e'
@@ -310,6 +310,9 @@ SetRegView 64
310310
SetOutPath $INSTDIR\src\oshmi2json
311311
File /a /r "..\src\oshmi2json\*.*"
312312

313+
SetOutPath $INSTDIR\src\oshmi_sync
314+
File /a /r "..\src\oshmi_sync\*.*"
315+
313316
SetOutPath $INSTDIR\src\cs_data_processor
314317
File /a /r "..\src\cs_data_processor\*.*"
315318

@@ -359,6 +362,7 @@ SetRegView 64
359362
File /a "..\conf-templates\nginx_http.conf"
360363
File /a "..\conf-templates\nginx_https.conf"
361364
File /a "..\conf-templates\json-scada.json"
365+
File /a "..\conf-templates\Opc.Ua.DefaultClient.Config.xml"
362366

363367
; Aqui ficam todos os atalhos no Desktop, apagando os antigos
364368
Delete "$DESKTOP\JSON-SCADA\*.*"

platform-windows/release_notes.txt

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,19 @@ Inkscape+SAGE:
121121

122122
-------------------------------------------------------------------
123123

124+
Notes for version 0.7:
125+
126+
- PostgreSQL updated to 12.6.
127+
- TimescaleDB updated to 2.0.1.
128+
- Experimental OPC UA client driver.
129+
130+
Requirements:
131+
132+
- Windows 10 64 bits or Server 2016, Windows PowerShell.
133+
- Open SSL binaries for 64-bit Windows, https://slproweb.com/products/Win32OpenSSL.html.
134+
135+
-------------------------------------------------------------------
136+
124137
Notes for version 0.6:
125138

126139
- DotNet 5.0.3 runtime added to installer.

src/htdocs-admin/src/components/ProtocolConnections.vue

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -345,28 +345,11 @@
345345
</v-dialog>
346346
</v-list-item>
347347

348-
<v-list-item
349-
v-if="
350-
[
351-
'OPC-UA'
352-
].includes(selected.protocolDriver)
353-
"
354-
>
355-
<v-switch
356-
v-model="selected.useSecurity"
357-
inset
358-
color="primary"
359-
:label="`Use security (certificates, encryption)`"
360-
@change="updateProtocolConnection"
361-
></v-switch>
362-
</v-list-item>
363-
364-
<v-list-item
348+
<v-list-item
365349
v-if="
366350
[
367351
'OPC-UA'
368352
].includes(selected.protocolDriver)
369-
&& selected.useSecurity
370353
">
371354
<template v-slot:default="{ active }">
372355
<v-list-item-action>
@@ -387,8 +370,23 @@
387370
>
388371
</v-list-item-content>
389372
</template>
390-
</v-list-item>
373+
</v-list-item>
391374

375+
<v-list-item
376+
v-if="
377+
[
378+
'OPC-UA'
379+
].includes(selected.protocolDriver)
380+
"
381+
>
382+
<v-switch
383+
v-model="selected.useSecurity"
384+
inset
385+
color="primary"
386+
:label="`Use security (certificates, encryption)`"
387+
@change="updateProtocolConnection"
388+
></v-switch>
389+
</v-list-item>
392390

393391
<v-list-item
394392
v-if="

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.6',
7+
VersaoProduto: '0.7',
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.6',
7+
VersaoProduto: '0.7',
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.6',
7+
VersaoProduto: '0.7',
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.6',
7+
VersaoProduto: '0.7',
88

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

0 commit comments

Comments
 (0)