Skip to content

Commit f2af94d

Browse files
riclolsenriclolsen
committed
Version 0.1. Windows installer released.
1 parent 95b353f commit f2af94d

9 files changed

+88
-95
lines changed

‎grafana-dashboards/JSON SCADA Filtered Group1_2-1598966542370.json renamed to ‎conf-templates/grafana-dashboards/JSON SCADA Filtered Group1_2-1598966542370.json

File renamed without changes.

‎grafana-dashboards/JSON SCADA History-1598966522999.json renamed to ‎conf-templates/grafana-dashboards/JSON SCADA History-1598966522999.json

File renamed without changes.

‎platform-windows/json-scada.nsi

Lines changed: 57 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -134,30 +134,25 @@ SetRegView 64
134134
var /GLOBAL NAVVISTAB
135135
var /GLOBAL NAVVISANO
136136
var /GLOBAL NAVVISTEL
137-
var /GLOBAL NAVVISTRE
138-
var /GLOBAL NAVVISOVW
139-
var /GLOBAL NAVVISDOC
140-
var /GLOBAL NAVVISLOG
141137
var /GLOBAL NAVGRAFAN
142138
var /GLOBAL HTTPSRV
143139

144-
StrCpy $HTTPSRV "http://127.0.0.1:80"
140+
# PROTOCOL://IP:PORT
141+
StrCpy $HTTPSRV "http://127.0.0.1"
145142
#StrCpy $HTTPSRV "https://127.0.0.1"
146143
StrCpy $NAVWINCMD "platform-windows\browser-runtime\chrome.exe"
147-
StrCpy $NAVDATDIR "--user-data-dir=$INSTDIR\browser-data"
148-
StrCpy $NAVPREOPT "--process-per-site --no-sandbox"
149-
StrCpy $NAVPOSOPT "--disable-popup-blocking --no-proxy-server --bwsi --disable-extensions --disable-sync --no-first-run"
144+
StrCpy $NAVDATDIR "--user-data-dir=$INSTDIR\platform-windows\browser-data"
145+
#StrCpy $NAVPREOPT "--process-per-site --no-sandbox"
146+
StrCpy $NAVPREOPT "--process-per-site"
147+
#StrCpy $NAVPOSOPT "--disable-popup-blocking --no-proxy-server --bwsi --disable-extensions --disable-sync --no-first-run"
148+
StrCpy $NAVPOSOPT "--disable-popup-blocking --no-proxy-server --bwsi"
150149
StrCpy $NAVINDEX "/"
151-
StrCpy $NAVVISABO "/htdocs/about.html"
152-
StrCpy $NAVVISEVE "/htdocs/events.html"
153-
StrCpy $NAVVISHEV "/htdocs/events.html?MODO=4"
154-
StrCpy $NAVVISTAB "/htdocs/tabular.html"
155-
StrCpy $NAVVISANO "/htdocs/tabular.html?SELMODULO=TODOS_ANORMAIS"
156-
StrCpy $NAVVISTEL "/htdocs/display.html"
157-
StrCpy $NAVVISTRE "/htdocs/trend.html"
158-
StrCpy $NAVVISOVW "/htdocs/overview.html"
159-
StrCpy $NAVVISDOC "/htdocs/listdocs.php"
160-
StrCpy $NAVVISLOG "/htdocs/listlogs.php"
150+
StrCpy $NAVVISABO "/about.html"
151+
StrCpy $NAVVISEVE "/events.html"
152+
StrCpy $NAVVISHEV "/events.html?MODO=4"
153+
StrCpy $NAVVISTAB "/tabular.html"
154+
StrCpy $NAVVISANO "/tabular.html?SELMODULO=ALARMS_VIEWER"
155+
StrCpy $NAVVISTEL "/display.html"
161156
StrCpy $NAVGRAFAN "/grafana"
162157

163158
; write reg info
@@ -181,7 +176,6 @@ SetRegView 64
181176
CreateDirectory "$INSTDIR\bin"
182177
CreateDirectory "$INSTDIR\conf"
183178
CreateDirectory "$INSTDIR\docs"
184-
CreateDirectory "$INSTDIR\grafana-dashboards"
185179
CreateDirectory "$INSTDIR\log"
186180
CreateDirectory "$INSTDIR\mongo_seed"
187181
; CreateDirectory "$INSTDIR\sql"
@@ -222,9 +216,6 @@ SetRegView 64
222216
SetOutPath $INSTDIR\docs
223217
File /a /r "..\docs\*.*"
224218

225-
SetOutPath $INSTDIR\grafana-dashboards
226-
File /a /r "..\grafana-dashboards\*.*"
227-
228219
SetOutPath $INSTDIR\platform-windows\grafana-runtime
229220
File /a /r "..\platform-windows\grafana-runtime\*.*"
230221

@@ -328,44 +319,33 @@ SetRegView 64
328319
; Visual C redist: necessario para executar o timescaledb
329320
nsExec::Exec '"$INSTDIR\platform-windows\vc_redist.x64.exe" /q'
330321

331-
; chaves para o windows
332-
; WriteINIStr "$INSTDIR\conf\hmi.ini" "RUN" "EVENTS_VIEWER" '"$INSTDIR\$NAVWINCMD $NAVDATDIR --bopt --app=$HTTPSRV$NAVVISEVE"'
333-
; WriteINIStr "$INSTDIR\conf\hmi.ini" "RUN" "TABULAR_VIEWER" '"$INSTDIR\$NAVWINCMD $NAVDATDIR --bopt --app=$HTTPSRV$NAVVISTAB"'
334-
; WriteINIStr "$INSTDIR\conf\hmi.ini" "RUN" "SCREEN_VIEWER" '"$INSTDIR\$NAVWINCMD $NAVDATDIR --bopt --app=$HTTPSRV$NAVVISTEL"'
335-
; WriteINIStr "$INSTDIR\conf\hmi.ini" "RUN" "TREND_VIEWER" '"$INSTDIR\$NAVWINCMD $NAVDATDIR --bopt --app=$HTTPSRV$NAVVISTRE"'
336-
; WriteINIStr "$INSTDIR\conf\hmi.ini" "RUN" "DOCS_VIEWER" '"$INSTDIR\$NAVWINCMD $NAVDATDIR --bopt --app=$HTTPSRV$NAVVISDOC"'
337-
; WriteINIStr "$INSTDIR\conf\hmi.ini" "RUN" "LOGS_VIEWER" '"$INSTDIR\$NAVWINCMD $NAVDATDIR --bopt --app=$HTTPSRV$NAVVISLOG"'
338-
339322
; Aqui ficam todos os atalhos no Desktop, apagando os antigos
340323
Delete "$DESKTOP\JSON-SCADA\*.*"
341324
CreateDirectory "$DESKTOP\JSON-SCADA"
342325

343326
; Cria atalhos para os aplicativos
344327
CreateShortCut "$DESKTOP\JSON-SCADA\_Start_Services.lnk" "$INSTDIR\platform-windows\start_services.bat"
345328
CreateShortCut "$DESKTOP\JSON-SCADA\_Stop_Services.lnk" "$INSTDIR\platform-windows\stop_services.bat"
329+
CreateShortCut "$DESKTOP\JSON-SCADA\Windows Services.lnk" "services.msc"
330+
CreateShortCut "$DESKTOP\JSON-SCADA\_JSON SCADA WEB.lnk" "$INSTDIR\$NAVWINCMD" " $NAVDATDIR $NAVPREOPT --app=$HTTPSRV$NAVINDEX $NAVPOSOPT" "$INSTDIR\src\htdocs\images\j-s-256.ico"
346331

347332
; CreateShortCut "$DESKTOP\JSON-SCADA\Clean Browser Cache.lnk" "$INSTDIR\platform-windows\cache_clean.bat"
348-
349333
CreateShortCut "$DESKTOP\JSON-SCADA\Chromium Browser.lnk" "$INSTDIR\$NAVWINCMD" " $NAVDATDIR $NAVPREOPT $NAVPOSOPT"
350-
351-
CreateShortCut "$DESKTOP\JSON-SCADA\JSON SCADA WEB.lnk" "$INSTDIR\$NAVWINCMD" " $NAVDATDIR $NAVPREOPT --app=$HTTPSRV$NAVINDEX $NAVPOSOPT" "$INSTDIR\htdocs\images\j-s-256.ico"
352334

353-
CreateShortCut "$DESKTOP\JSON-SCADA\About.lnk" "$INSTDIR\$NAVWINCMD" " $NAVDATDIR $NAVPREOPT --app=$HTTPSRV$NAVVISABO $NAVPOSOPT" "$INSTDIR\htdocs\images\j-s-256.ico"
354-
CreateShortCut "$DESKTOP\JSON-SCADA\Display Viewer.lnk" "$INSTDIR\$NAVWINCMD" " $NAVDATDIR $NAVPREOPT --app=$HTTPSRV$NAVVISTEL $NAVPOSOPT" "$INSTDIR\htdocs\images\tela.ico"
355-
CreateShortCut "$DESKTOP\JSON-SCADA\Events Viewer.lnk" "$INSTDIR\$NAVWINCMD" " $NAVDATDIR $NAVPREOPT --app=$HTTPSRV$NAVVISEVE $NAVPOSOPT" "$INSTDIR\htdocs\images\chrono.ico"
356-
CreateShortCut "$DESKTOP\JSON-SCADA\Historical Events.lnk" "$INSTDIR\$NAVWINCMD" " $NAVDATDIR $NAVPREOPT --app=$HTTPSRV$NAVVISHEV $NAVPOSOPT" "$INSTDIR\htdocs\images\calendar.ico"
357-
CreateShortCut "$DESKTOP\JSON-SCADA\Tabular Viewer.lnk" "$INSTDIR\$NAVWINCMD" " $NAVDATDIR $NAVPREOPT --app=$HTTPSRV$NAVVISTAB $NAVPOSOPT" "$INSTDIR\htdocs\images\tabular.ico"
358-
CreateShortCut "$DESKTOP\JSON-SCADA\Alarms Viewer.lnk" "$INSTDIR\$NAVWINCMD" " $NAVDATDIR $NAVPREOPT --app=$HTTPSRV$NAVVISANO $NAVPOSOPT" "$INSTDIR\htdocs\images\firstaid.ico"
359-
CreateShortCut "$DESKTOP\JSON-SCADA\Grafana.lnk" "$INSTDIR\$NAVWINCMD" " $NAVDATDIR $NAVPREOPT --app=$HTTPSRV$NAVGRAFAN $NAVPOSOPT" "$INSTDIR\htdocs\images\grafana.ico"
335+
; CreateShortCut "$DESKTOP\JSON-SCADA\About.lnk" "$INSTDIR\$NAVWINCMD" " $NAVDATDIR $NAVPREOPT --app=$HTTPSRV$NAVVISABO $NAVPOSOPT" "$INSTDIR\src\htdocs\images\j-s-256.ico"
336+
337+
CreateShortCut "$DESKTOP\JSON-SCADA\Viewer - Display.lnk" "$INSTDIR\$NAVWINCMD" " $NAVDATDIR $NAVPREOPT --app=$HTTPSRV$NAVVISTEL $NAVPOSOPT" "$INSTDIR\src\htdocs\images\tela.ico"
338+
CreateShortCut "$DESKTOP\JSON-SCADA\Viewer - Events.lnk" "$INSTDIR\$NAVWINCMD" " $NAVDATDIR $NAVPREOPT --app=$HTTPSRV$NAVVISEVE $NAVPOSOPT" "$INSTDIR\src\htdocs\images\chrono.ico"
339+
CreateShortCut "$DESKTOP\JSON-SCADA\Viewer - Historical.lnk" "$INSTDIR\$NAVWINCMD" " $NAVDATDIR $NAVPREOPT --app=$HTTPSRV$NAVVISHEV $NAVPOSOPT" "$INSTDIR\src\htdocs\images\calendar.ico"
340+
CreateShortCut "$DESKTOP\JSON-SCADA\Viewer - Tabular.lnk" "$INSTDIR\$NAVWINCMD" " $NAVDATDIR $NAVPREOPT --app=$HTTPSRV$NAVVISTAB $NAVPOSOPT" "$INSTDIR\src\htdocs\images\tabular.ico"
341+
CreateShortCut "$DESKTOP\JSON-SCADA\Viewer - Alarms.lnk" "$INSTDIR\$NAVWINCMD" " $NAVDATDIR $NAVPREOPT --app=$HTTPSRV$NAVVISANO $NAVPOSOPT" "$INSTDIR\src\htdocs\images\firstaid.ico"
342+
CreateShortCut "$DESKTOP\JSON-SCADA\Viewer - Grafana.lnk" "$INSTDIR\$NAVWINCMD" " $NAVDATDIR $NAVPREOPT --app=$HTTPSRV$NAVGRAFAN $NAVPOSOPT" "$INSTDIR\src\htdocs\images\grafana.ico"
360343

361344
; CreateShortCut "$DESKTOP\JSON-SCADA\Operation Manual.lnk" "$INSTDIR\bin\operation_manual.bat"
362345
; CreateShortCut "$DESKTOP\JSON-SCADA\Configuration Manual.lnk" "$INSTDIR\bin\configuration_manual.bat"
363346

364347
CreateShortCut "$DESKTOP\JSON-SCADA\Compass (Mongodb GUI Client).lnk" "$INSTDIR\platform-windows\mongodb-compass-runtime\MongoDBCompass.exe"
365-
366348
CreateShortCut "$DESKTOP\JSON-SCADA\Inkscape SAGE (SVG Editor).lnk" "$INSTDIR\platform-windows\inkscape-runtime\inkscape.exe"
367-
CreateShortCut "$DESKTOP\JSON-SCADA\Nginx and PHP Start.lnk" "$INSTDIR\nginx_php-runtime\start_nginx_php.bat"
368-
369349
CreateShortCut "$DESKTOP\JSON-SCADA\Uninstall.lnk" "$INSTDIR\bt-uninst.exe"
370350

371351

@@ -397,10 +377,10 @@ SetRegView 64
397377
; SimpleFC::AddApplication "OSHMI ICCP" "$INSTDIR\bin\iccp_client.exe" 0 2 "" 1
398378
; Pop $0 ; return error(1)/success(0)
399379
;
400-
; SimpleFC::AddApplication "OSHMI NGINX" "$INSTDIR\nginx_php\nginx.exe" 0 2 "" 1
380+
; SimpleFC::AddApplication "OSHMI NGINX" "$INSTDIR\platform-windows\nginx_php-runtime\nginx.exe" 0 2 "" 1
401381
; Pop $0 ; return error(1)/success(0)
402382
;
403-
; SimpleFC::AddApplication "OSHMI PHP-CGI" "$INSTDIR\nginx_php\php\php-cgi.exe" 0 2 "" 1
383+
; SimpleFC::AddApplication "OSHMI PHP-CGI" "$INSTDIR\platform-windows\nginx_php-runtime\php\php-cgi.exe" 0 2 "" 1
404384
; Pop $0 ; return error(1)/success(0)
405385

406386
; SimpleFC::AddPort 65280 "OSHMI Webserver" 256 0 2 "" 1
@@ -501,7 +481,7 @@ IfFileExists "$INSTDIR\postgresql-data\base" pgDatabaseExists 0
501481

502482
pgDatabaseExists:
503483

504-
MessageBox MB_OK "JSON-SCADA Installed! To quickly run the system after installed: Open the JSON-SCADA desktop folder and execute the '_Start JSON-SCADA' shortcut."
484+
MessageBox MB_OK "Installation finished! To run the system: Open the JSON-SCADA desktop folder, execute the '_Start_Services' shortcut and then open '_JSON SCADA WEB'."
505485

506486
SectionEnd
507487

@@ -512,52 +492,47 @@ UninstallIcon "${NSISDIR}\Contrib\Graphics\Icons\nsis1-uninstall.ico"
512492

513493
Section "Uninstall"
514494

515-
; Fecha processos
516-
517-
; SetOutPath $INSTDIR\bin
518-
ExecWait '"$0" /C "$INSTDIR\platform-windows\mongodb-stop.bat"'
519-
ExecWait '"$0" /C "$INSTDIR\platform-windows\postgresql-stop.bat"'
520-
ExecWait '"$0" /C "$INSTDIR\platform-windows\stop_services.bat"'
521-
Sleep 3000
522-
ExecWait '"$0" /C "$INSTDIR\platform-windows\remove_services.bat"'
523-
nsExec::Exec `wmic PROCESS WHERE "COMMANDLINE LIKE '%c:\\json-scada\\bin\\%'" CALL TERMINATE`
524-
nsExec::Exec `wmic PROCESS WHERE "COMMANDLINE LIKE '%c:\\json-scada\\platform-windows\\browser-runtime\\%'" CALL TERMINATE`
525-
nsExec::Exec `wmic PROCESS WHERE "COMMANDLINE LIKE '%c:\\json-scada\\platform-windows\\nginx_php\\%'" CALL TERMINATE`
526-
nsExec::Exec `wmic PROCESS WHERE "COMMANDLINE LIKE '%c:\\json-scada\\platform-windows\\platform-windows\inkscape-runtime\\%'" CALL TERMINATE`
527-
nsExec::Exec `wmic PROCESS WHERE "COMMANDLINE LIKE '%c:\\json-scada\\platform-windows\\postgresql-runtime\\%'" CALL TERMINATE`
528-
nsExec::Exec `wmic PROCESS WHERE "COMMANDLINE LIKE '%c:\\json-scada\\platform-windows\\grafana-runtime\\%'" CALL TERMINATE`
529-
nsExec::Exec `wmic PROCESS WHERE "COMMANDLINE LIKE '%c:\\json-scada\\sql\\%'" CALL TERMINATE`
530-
531495
; Remove an application from the firewall exception list
532-
; SimpleFC::RemoveApplication "$INSTDIR\webserver.exe"
496+
; SimpleFC::RemoveApplication "$INSTDIR\bin\hmishell.exe"
533497
; Pop $0 ; return error(1)/success(0)
534-
; SimpleFC::RemoveApplication "$INSTDIR\hmishell.exe"
498+
; SimpleFC::RemoveApplication "$INSTDIR\bin\mon_proc.exe"
535499
; Pop $0 ; return error(1)/success(0)
536-
; SimpleFC::RemoveApplication "$INSTDIR\mon_proc.exe"
500+
; SimpleFC::RemoveApplication "$INSTDIR\bin\QTester104.exe"
537501
; Pop $0 ; return error(1)/success(0)
538-
; SimpleFC::RemoveApplication "$INSTDIR\QTester104.exe"
502+
; SimpleFC::RemoveApplication "$INSTDIR\bin\dnp3.exe"
539503
; Pop $0 ; return error(1)/success(0)
540-
; SimpleFC::RemoveApplication "$INSTDIR\dnp3.exe"
504+
; SimpleFC::RemoveApplication "$INSTDIR\bin\modbus.exe"
541505
; Pop $0 ; return error(1)/success(0)
542-
; SimpleFC::RemoveApplication "$INSTDIR\modbus.exe"
506+
; SimpleFC::RemoveApplication "$INSTDIR\bin\iccp_client.exe"
543507
; Pop $0 ; return error(1)/success(0)
544-
; SimpleFC::RemoveApplication "$INSTDIR\iccp_client.exe"
508+
; SimpleFC::RemoveApplication "$INSTDIR\platform-windows\nginx_php-runtime\nginx.exe"
545509
; Pop $0 ; return error(1)/success(0)
546-
; SimpleFC::RemoveApplication "$INSTDIR\nginx_php\nginx.exe"
510+
; SimpleFC::RemoveApplication "$INSTDIR\platform-windows\nginx_php-runtime\php\php-cgi.exe"
547511
; Pop $0 ; return error(1)/success(0)
548-
; SimpleFC::RemoveApplication "$INSTDIR\nginx_php\php\php-cgi.exe"
512+
; SimpleFC::RemoveApplication "$INSTDIR\bin\opc_client.exe"
549513
; Pop $0 ; return error(1)/success(0)
550-
; SimpleFC::RemoveApplication "$INSTDIR\opc_client.exe"
551-
; Pop $0 ; return error(1)/success(0)
552-
; SimpleFC::RemoveApplication "$INSTDIR\s7client.exe"
514+
; SimpleFC::RemoveApplication "$INSTDIR\bin\s7client.exe"
553515
; Pop $0 ; return error(1)/success(0)
554516

555-
DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\JSON_SCADA"
556-
DeleteRegKey HKLM "SOFTWARE\JSON_SCADA"
557-
;WriteRegStr HKCU "Software\Microsoft\Windows NT\CurrentVersion\Winlogon" "Shell" "explorer.exe"
558-
;WriteRegDword HKCU "Software\Microsoft\Windows\CurrentVersion\Policies\System" "DisableTaskMgr" 0x00
517+
; WriteRegStr HKCU "Software\Microsoft\Windows NT\CurrentVersion\Winlogon" "Shell" "explorer.exe"
518+
; WriteRegDword HKCU "Software\Microsoft\Windows\CurrentVersion\Policies\System" "DisableTaskMgr" 0x00
559519

560-
nsExec::Exec '$INSTDIR\etc\remove_services.bat'
520+
; Fecha processos
521+
522+
ExecWait '"$0" /C "$INSTDIR\platform-windows\mongodb-stop.bat"'
523+
ExecWait '"$0" /C "$INSTDIR\platform-windows\postgresql-stop.bat"'
524+
ExecWait '"$0" /C "$INSTDIR\platform-windows\stop_services.bat"'
525+
Sleep 5000
526+
ExecWait '"$0" /C "$INSTDIR\platform-windows\remove_services.bat"'
527+
Sleep 1000
528+
nsExec::Exec `wmic PROCESS WHERE "COMMANDLINE LIKE '%c:\\json-scada\\sql\\%'" CALL TERMINATE`
529+
Sleep 1000
530+
nsExec::Exec `wmic PROCESS WHERE "COMMANDLINE LIKE '%c:\\json-scada\\platform-windows\\browser-runtime\\%'" CALL TERMINATE`
531+
nsExec::Exec `wmic PROCESS WHERE "COMMANDLINE LIKE '%c:\\json-scada\\platform-windows\\mongodb-runtime\\%'" CALL TERMINATE`
532+
nsExec::Exec `wmic PROCESS WHERE "COMMANDLINE LIKE '%c:\\json-scada\\platform-windows\\inkscape-runtime\\%'" CALL TERMINATE`
533+
nsExec::Exec `wmic PROCESS WHERE "COMMANDLINE LIKE '%c:\\json-scada\\platform-windows\\%'" CALL TERMINATE`
534+
nsExec::Exec `wmic PROCESS WHERE "COMMANDLINE LIKE '%c:\\json-scada\\bin\\%'" CALL TERMINATE`
535+
Sleep 1000
561536

562537
RMDir /r "$INSTDIR\bin"
563538
RMDir /r "$INSTDIR\platform-windows"
@@ -566,6 +541,9 @@ Section "Uninstall"
566541
RMDir /r "$INSTDIR"
567542
RMDir /r "$DESKTOP\JSON-SCADA"
568543

544+
DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\JSON_SCADA"
545+
DeleteRegKey HKLM "SOFTWARE\JSON_SCADA"
546+
569547
SectionEnd
570548

571549

‎platform-windows/postgresql-initdb.bat

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
echo THIS WILL ERASE CURRENT CONTENTS OF POSTGRESQL DATABASE!
2-
echo PRESS CTRL+C to STOP or any othe key to proceed!
3-
pause
1+
echo THIS WILL INITIALIZE THE POSTGRESQL DATABASE!
2+
43
c:\json-scada\platform-windows\postgresql-runtime\bin\initdb.exe -D c:\json-scada\platform-windows\postgresql-data --username=postgres --auth=trust -E UTF8 --locale=en_US.UTF-8

‎platform-windows/release_notes.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,8 @@ QUICKSTART:
5656

5757
To quickly run the system after installed, open the JSON-SCADA desktop folder and:
5858

59-
- On the JSON-SCADA desktop folder: execute _Start_JSON_SCADA.
59+
- On the JSON-SCADA desktop folder: execute _Start_Services.
60+
- On the JSON-SCADA desktop folder: execute _JSON SCADA WEB.
6061

6162
The system is preconfigured to connect to a online demo simulation via IEC60870-5-104 protocol with an example point list and screens.
6263
To issue a command, click on a breaker and push the "Command" button then choose

‎platform-windows/remove_services.bat

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ nssm remove JSON_SCADA_server_realtime confirm
1818
nssm remove JSON_SCADA_calculations confirm
1919
nssm remove JSON_SCADA_process_rtdata confirm
2020
nssm remove JSON_SCADA_process_hist confirm
21+
nssm remove JSON_SCADA_alarm_beep confirm
2122

2223
nssm remove JSON_SCADA_nginx confirm
2324
nssm remove JSON_SCADA_php confirm

‎platform-windows/start_services.bat

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ nssm start JSON_SCADA_server_realtime
1616
nssm start JSON_SCADA_calculations
1717
nssm start JSON_SCADA_process_rtdata
1818
nssm start JSON_SCADA_process_hist
19+
REM nssm start JSON_SCADA_alarm_beep
1920

2021
nssm start JSON_SCADA_php
2122
nssm start JSON_SCADA_nginx

‎platform-windows/stop_services.bat

Lines changed: 24 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,35 @@ rem Stop services
88

99
cd \json-scada\platform-windows
1010

11-
net stop JSON_SCADA_postgresql
12-
nssm stop JSON_SCADA_grafana
13-
nssm stop JSON_SCADA_mongodb
14-
nssm stop JSON_SCADA_cs_data_processor
15-
nssm stop JSON_SCADA_server_realtime
16-
nssm stop JSON_SCADA_calculations
17-
nssm stop JSON_SCADA_process_rtdata
18-
nssm stop JSON_SCADA_process_hist
19-
11+
REM FIRST STOP USERS
2012
nssm stop JSON_SCADA_nginx
2113
nssm stop JSON_SCADA_php
14+
nssm stop JSON_SCADA_server_realtime
15+
nssm stop JSON_SCADA_alarm_beep
16+
ping -n 2
2217

23-
nssm stop JSON_SCADA_iec104server
18+
REM STOP PROTOCOL CLIENTS
2419
nssm stop JSON_SCADA_iec104client
25-
nssm stop JSON_SCADA_iec101server
2620
nssm stop JSON_SCADA_iec101client
2721
nssm stop JSON_SCADA_dnp3client
2822
nssm stop JSON_SCADA_i104m
2923
nssm stop JSON_SCADA_plctags
24+
ping -n 3
25+
26+
REM STOP PROTOCOL SERVERS
27+
nssm stop JSON_SCADA_iec104server
28+
nssm stop JSON_SCADA_iec101server
29+
ping -n 2
30+
31+
REM STOP OTHER PROCESSES
32+
nssm stop JSON_SCADA_calculations
33+
nssm stop JSON_SCADA_cs_data_processor
34+
ping -n 2
35+
nssm stop JSON_SCADA_process_rtdata
36+
nssm stop JSON_SCADA_process_hist
37+
ping -n 3
38+
39+
REM STOP GRAFANA AND DATABASE SERVERS
40+
nssm stop JSON_SCADA_grafana
41+
nssm stop JSON_SCADA_mongodb
42+
net stop JSON_SCADA_postgresql

‎src/htdocs/display.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<meta name='mobile-web-app-capable' content='yes' />
99
<meta name='apple-mobile-web-app-capable' content='yes' />
1010
<meta name='viewport' content='width=2400,initial-scale=1.3' />
11-
<title>Screen Viewer</title>
11+
<title>Display Viewer</title>
1212
<meta http-equiv='X-UA-Compatible' content='IE=edge,chrome=1' />
1313
<link rel='apple-touch-icon' href='images/tela.png' />
1414
<link rel="stylesheet" type="text/css" href="lib/radar-chart.css">

0 commit comments

Comments
 (0)