Skip to content

Commit db58239

Browse files
author
ricardo
committed
Version 6.22
1 parent 7ed2fd8 commit db58239

23 files changed

+4371
-4268
lines changed

bin/start_hmi.bat

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,23 @@ rem Starts some OSHMI processes and viewers.
33

44
cd c:\oshmi\bin
55
start webserver.exe
6-
start /wait PING -n 5 127.0.0.1
6+
7+
start /b /wait PING -n 4 127.0.0.1 | rem
8+
timeout 4
9+
10+
rem Choose a protocol driver
11+
start qtester104.exe
12+
13+
start /b /wait PING -n 5 127.0.0.1 | rem
14+
timeout 5
715
start "" "%USERPROFILE%\Desktop\OSHMI\Alarms Viewer.lnk"
8-
start /wait PING -n 2 127.0.0.1
9-
start "" "%USERPROFILE%\Desktop\OSHMI\Screen Viewer.lnk"
16+
17+
start /b /wait PING -n 2 127.0.0.1 | rem
18+
timeout 2
19+
start "" "%USERPROFILE%\Desktop\OSHMI\Events Viewer.lnk"
20+
21+
start /b /wait PING -n 2 127.0.0.1 | rem
22+
timeout 2
23+
rem start "" "%USERPROFILE%\Desktop\OSHMI\Screen Viewer.lnk"
24+
start "" "c:\oshmi\browser\chrome" --user-data-dir=c:\oshmi\browser-data --process-per-site --no-sandbox --disable-popup-blocking --no-proxy-server --bwsi --disable-extensions --disable-sync --no-first-run --app=http://127.0.0.1:51909/htdocs/screen.html?SELTELA=../svg/KAW2.svg
1025

conf_templates/hmi.ini

100644100755
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
; HMI.INI OSHMI CONFIGURATION FILE
1+
; HMI.INI OSHMI CONFIGURATION FILE
22

33
;---------------------------------------------------------------------------------------------------
44
; Initialization config
@@ -18,7 +18,7 @@
1818
; Protocol driver executable file
1919
; default = "qtester104.exe"
2020
; Executável do Varredor
21-
;PROTOCOL_DRIVER="qtester104.exe"
21+
PROTOCOL_DRIVER=""
2222

2323
; Apps to run at initialization
2424
; default = empty
@@ -34,7 +34,7 @@ HIDE=0
3434
; Simulation mode (0=disable simulation, 1=enable local simulation, 2=simulation in master mode, 3=simulation in slave mode)
3535
; Default = 0
3636
; Modo simulação (0=desabilita, 1=simulação local, 2=simulação modo mestre, 3=simulação modo escravo)
37-
SIMULATION=1
37+
SIMULATION=0
3838

3939
; Use internal beep speaker (1=yes, 0=no).
4040
; Default = 0

conf_templates/hmishell.ini

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,12 @@ POS_Y=0
1010
; 1 = transparant mode (default), 0 = non transparent mode
1111
;TRANSPARENCY=1
1212

13+
; TCP HTTP Port for Server
14+
;REMOTE_HTTP_PORT=51909
15+
16+
; Shell API server URL
17+
;SHELL_API_URL="htdocs/shellapi.rjs"
18+
1319
; IP Addresses from the OSHMI servers, only for client mode
1420
;SERVER1=10.63.3.62
1521
;SERVER2=10.63.3.63

conf_templates/kaw2.svg

100755100644
File mode changed.

conf_templates/modbus_queue.ini

100644100755
Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,3 +67,54 @@ READIS_1=10001 32 15000
6767
READCS_1=1 32 18000
6868

6969
; when there are just 2 parameters per line, OSHMI address will be the same as mb_address
70+
71+
; A Modbus RTU (serial) slave IED
72+
[RTU_3]
73+
SERIAL_PORT_NAME=COM3
74+
BAUD_RATE=9600
75+
DATA_BITS=8
76+
STOP_BITS=1
77+
PARITY=NONE
78+
LOG_LEVEL=1
79+
DELAY=1000
80+
SLAVE_ID=1
81+
TIMEOUT=1500
82+
READIR_1=0 8 3040
83+
READIR_2=10 4 3050
84+
READIR_3=20 5 3060
85+
86+
; A Modbus RTU (serial) slave IED RS485
87+
[RTU_4]
88+
RS485_MODE=1
89+
RTS_MODE=0
90+
RTS_DELAY=20
91+
SERIAL_PORT_NAME=COM4
92+
BAUD_RATE=9600
93+
DATA_BITS=8
94+
STOP_BITS=1
95+
PARITY=NONE
96+
LOG_LEVEL=1
97+
DELAY=1000
98+
SLAVE_ID=1
99+
TIMEOUT=1500
100+
READIR_1=0 8 3040
101+
READIR_2=10 4 3050
102+
READIR_3=20 5 3060
103+
104+
; A Modbus RTU (serial) slave IED RS485 (on same channel as previous slave)
105+
[RTU_5]
106+
RS485_MODE=1
107+
RTS_MODE=0
108+
RTS_DELAY=20
109+
SERIAL_PORT_NAME=COM4
110+
BAUD_RATE=9600
111+
DATA_BITS=8
112+
STOP_BITS=1
113+
PARITY=NONE
114+
LOG_LEVEL=1
115+
DELAY=1000
116+
SLAVE_ID=2
117+
TIMEOUT=1500
118+
READIR_1=0 8 3040
119+
READIR_2=10 4 3050
120+
READIR_3=20 5 3060

conf_templates/nginx.conf

100755100644
File mode changed.

conf_templates/point_list.txt

100644100755
Lines changed: 4247 additions & 4247 deletions
Large diffs are not rendered by default.

conf_templates/qtester104.ini

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66
[IEC104]
77

88
; Local link address
9-
PRIMARY_ADDRESS=1
9+
PRIMARY_ADDRESS=2
1010

1111
[RTU1]
1212

1313
; RTU link address
14-
SECONDARY_ADDRESS=2
14+
SECONDARY_ADDRESS=1
1515

1616
; RTU IP address
17-
IP_ADDRESS=10.63.3.212
17+
IP_ADDRESS=207.180.242.96
1818

1919
; redundant RTU IP address (default: none)
2020
; IP_ADDRESS_BACKUP=10.63.3.212
@@ -27,3 +27,4 @@ ALLOW_COMMANDS=1
2727

2828
; period in seconds for general interrogations (default=330)
2929
; GI_PERIOD=330
30+

db/db_cold/create_notes.sql

100755100644
File mode changed.

db/pragmas_hist.sql

100644100755
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.timeout 9000
22
PRAGMA temp_store = MEMORY;
3-
PRAGMA synchronous = OFF;
3+
PRAGMA synchronous = NORMAL;
44
PRAGMA journal_mode = WAL;
55

0 commit comments

Comments
 (0)