Skip to content

Commit

Permalink
Version 0.7
Browse files Browse the repository at this point in the history
  • Loading branch information
riclolsen committed Feb 25, 2021
1 parent da28a76 commit f90b162
Show file tree
Hide file tree
Showing 8 changed files with 42 additions and 27 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ To provide an easy to use, fully-featured, scalable, and portable SCADA/IoT syst
* Standard IT tools applied to SCADA/IoT (MongoDB, PostgreSQL/TimescaleDB,Node.js, C#, Golang, Grafana, etc.).
* MongoDB as the real-time core database, persistence layer, config store, SOE historian.
* Portability and interoperability over Linux, Windows, Mac OSX, x86/64, ARM.
* Windows installer available in the [releases section](https://github.com/riclolsen/json-scada/releases/tag/V0.6-alpha).
* Windows installer available in the [releases section](https://github.com/riclolsen/json-scada/releases/tag/V0.7-alpha).
* Horizontal scalability, from a single computer to big clusters (MongoDB-sharding), Docker containers, VMs, Kubernetes, cloud, or hybrid deployments.
* Unlimited tags, servers, and users.
* 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.
Expand Down
10 changes: 7 additions & 3 deletions platform-windows/json-scada.nsi
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
; json-scada.nsi
; {json:scada} installer script
; Copyright 2020 - Ricardo L. Olsen
; Copyright 2020-2021 - Ricardo L. Olsen

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

Expand All @@ -15,8 +15,8 @@ RequestExecutionLevel admin

;--------------------------------

!define VERSION "v.0.6"
!define VERSION_ "0.6.0.0"
!define VERSION "v.0.7"
!define VERSION_ "0.7.0.0"

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

SetOutPath $INSTDIR\src\oshmi_sync
File /a /r "..\src\oshmi_sync\*.*"

SetOutPath $INSTDIR\src\cs_data_processor
File /a /r "..\src\cs_data_processor\*.*"

Expand Down Expand Up @@ -359,6 +362,7 @@ SetRegView 64
File /a "..\conf-templates\nginx_http.conf"
File /a "..\conf-templates\nginx_https.conf"
File /a "..\conf-templates\json-scada.json"
File /a "..\conf-templates\Opc.Ua.DefaultClient.Config.xml"

; Aqui ficam todos os atalhos no Desktop, apagando os antigos
Delete "$DESKTOP\JSON-SCADA\*.*"
Expand Down
13 changes: 13 additions & 0 deletions platform-windows/release_notes.txt
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,19 @@ Inkscape+SAGE:

-------------------------------------------------------------------

Notes for version 0.7:

- PostgreSQL updated to 12.6.
- TimescaleDB updated to 2.0.1.
- Experimental OPC UA client driver.

Requirements:

- Windows 10 64 bits or Server 2016, Windows PowerShell.
- Open SSL binaries for 64-bit Windows, https://slproweb.com/products/Win32OpenSSL.html.

-------------------------------------------------------------------

Notes for version 0.6:

- DotNet 5.0.3 runtime added to installer.
Expand Down
36 changes: 17 additions & 19 deletions src/htdocs-admin/src/components/ProtocolConnections.vue
Original file line number Diff line number Diff line change
Expand Up @@ -345,28 +345,11 @@
</v-dialog>
</v-list-item>

<v-list-item
v-if="
[
'OPC-UA'
].includes(selected.protocolDriver)
"
>
<v-switch
v-model="selected.useSecurity"
inset
color="primary"
:label="`Use security (certificates, encryption)`"
@change="updateProtocolConnection"
></v-switch>
</v-list-item>

<v-list-item
<v-list-item
v-if="
[
'OPC-UA'
].includes(selected.protocolDriver)
&& selected.useSecurity
">
<template v-slot:default="{ active }">
<v-list-item-action>
Expand All @@ -387,8 +370,23 @@
>
</v-list-item-content>
</template>
</v-list-item>
</v-list-item>

<v-list-item
v-if="
[
'OPC-UA'
].includes(selected.protocolDriver)
"
>
<v-switch
v-model="selected.useSecurity"
inset
color="primary"
:label="`Use security (certificates, encryption)`"
@change="updateProtocolConnection"
></v-switch>
</v-list-item>

<v-list-item
v-if="
Expand Down
2 changes: 1 addition & 1 deletion src/htdocs/i18n/messages_i18n-en_us.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
var Msg =
{
NomeProduto: '{json:scada}',
VersaoProduto: '0.6',
VersaoProduto: '0.7',

NomeVisorTelas: 'Display Viewer',
NomeVisorEventos: 'Events Viewer',
Expand Down
2 changes: 1 addition & 1 deletion src/htdocs/i18n/messages_i18n-pt_br.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
var Msg =
{
NomeProduto: '{json:scada}',
VersaoProduto: '0.6',
VersaoProduto: '0.7',

NomeVisorTelas: 'Visor de Telas',
NomeVisorEventos: 'Visor de Eventos',
Expand Down
2 changes: 1 addition & 1 deletion src/htdocs/i18n/messages_i18n-uk_ua.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
var Msg =
{
NomeProduto: '{json:scada}',
VersaoProduto: '0.6',
VersaoProduto: '0.7',

NomeVisorTelas: 'Перегляд ',
NomeVisorEventos: 'Події',
Expand Down
2 changes: 1 addition & 1 deletion src/htdocs/i18n/messages_i18n.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
var Msg =
{
NomeProduto: '{json:scada}',
VersaoProduto: '0.6',
VersaoProduto: '0.7',

NomeVisorTelas: 'Display Viewer',
NomeVisorEventos: 'Events Viewer',
Expand Down

0 comments on commit f90b162

Please sign in to comment.