Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
U
uniset2
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
UniSet project repositories
uniset2
Commits
a6955f90
Commit
a6955f90
authored
Jun 03, 2009
by
Pavel Vainerman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
minor optimization
parent
e00d8589
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
25 additions
and
16 deletions
+25
-16
test.xml
conf/test.xml
+13
-2
iocontrol.cc
extentions/IOControl/iocontrol.cc
+1
-1
RTUExchange.cc
extentions/RTUExchange/RTUExchange.cc
+0
-1
start_fg.sh
extentions/SharedMemoryPlus/start_fg.sh
+11
-12
No files found.
conf/test.xml
View file @
a6955f90
...
...
@@ -18,6 +18,11 @@
<DumpStateTime
name=
"10"
/>
<!-- [] -->
<SleepTickMS
name=
"500"
/>
<!-- [] -->
<ServicesSection
name=
"Services"
/>
<NameService
host=
"localhost"
port=
"2809"
/>
<SizeOfMessageQueue
name=
"2000"
/>
<LocalIOR
name=
"1"
/>
<!-- Debug, logs -->
<UniSetDebug
name=
"unideb"
levels=
"crit,warn"
file=
""
/>
...
...
@@ -25,9 +30,9 @@
<ConfDir
name=
""
/>
<DataDir
name=
""
/>
<BinDir
name=
""
/>
<LogDir
name=
""
/>
<LogDir
name=
"
/home/pv/tmp/
"
/>
<DocDir
name=
""
/>
<LockDir
name=
""
/>
<LockDir
name=
"
/home/pv/tmp/
"
/>
<Services>
<LocalTimeService
name=
"TimeService"
MaxCountTimers=
"100"
AskLifeTimeSEC=
"10"
/>
...
...
@@ -83,6 +88,8 @@
<HeartBeatTime
time_msec=
"5000"
/>
<IOControl
name=
"IOControl"
/>
<ObjectsMap
idfromfile=
"0"
>
<!--
'sensors'
...
...
@@ -122,6 +129,10 @@
<item
name=
"RS_Test15_S"
textname=
" 2"
node=
""
iotype=
"DI"
priority=
"Medium"
mbtype=
"rtu"
mbaddr=
"0x01"
mbfunc=
"0x03"
mbreg=
"0xD"
rs=
"1"
/>
<item
name=
"RS_Test16_S"
textname=
" 2"
node=
""
iotype=
"DI"
priority=
"Medium"
mbtype=
"mtr"
mtrtype=
"F1"
mbaddr=
"0x05"
mbfunc=
"0x03"
mbreg=
"0x10"
rs=
"1"
/>
<item
name=
"RS_Test17_S"
textname=
" 2"
node=
""
iotype=
"DI"
priority=
"Medium"
mbtype=
"rtu"
mbaddr=
"0x01"
mbfunc=
"0x03"
mbreg=
"0x10"
rs=
"1"
/>
<item
name=
"IO_Test1_S"
textname=
"io test"
node=
""
iotype=
"DO"
priority=
"Medium"
io=
"1"
/>
<item
name=
"IO_Test2_S"
textname=
"io test"
node=
""
iotype=
"DI"
priority=
"Medium"
io=
"1"
/>
<item
name=
"IO_Test3_S"
textname=
"io test"
node=
""
iotype=
"AO"
priority=
"Medium"
io=
"1"
/>
<item
name=
"IO_Test4_S"
textname=
"io test"
node=
""
iotype=
"AI"
priority=
"Medium"
io=
"1"
/>
<item
name=
"Input6_S"
textname=
" 6"
node=
""
iotype=
"DI"
priority=
"Medium"
>
<depends>
...
...
extentions/IOControl/iocontrol.cc
View file @
a6955f90
...
...
@@ -30,7 +30,7 @@ int main(int argc, char **argv)
string
logfilename
=
conf
->
getArgParam
(
"--io-logfile"
,
"iocontrol.log"
);
string
logname
(
conf
->
getLogDir
()
+
logfilename
);
dlog
.
logFile
(
logname
.
c_str
()
);
unideb
.
logFile
(
logname
.
c_str
()
);
unideb
.
logFile
(
logname
.
c_str
()
);
ObjectId
shmID
=
DefaultObjectId
;
string
sID
=
conf
->
getArgParam
(
"--smemory-id"
);
...
...
extentions/RTUExchange/RTUExchange.cc
View file @
a6955f90
...
...
@@ -1874,6 +1874,5 @@ void RTUExchange::updateRTU188( RegMap::iterator& it )
dlog
[
Debug
::
LEVEL3
]
<<
myname
<<
"(updateMTR): catch ..."
<<
endl
;
}
}
}
// -----------------------------------------------------------------------------
extentions/SharedMemoryPlus/start_fg.sh
View file @
a6955f90
...
...
@@ -4,22 +4,21 @@ ulimit -Sc 10000000
START
=
uniset-start.sh
${
START
}
-f
./uniset-smemory-plus
--smemory-id
SharedMemory
--confile
test.xml
\
--unideb-add-levels
info,crit,warn,level9,system
\
--unideb-add-levels
info,crit,warn,level9,system
,level3,level2,level1
\
--add-io
\
--io-force
1
\
--io-name
IOControl1
\
--io-name
IOControl
\
--io-polltime
100
\
--io-s-filter-field
io
\
--io-s-filter-value
ts
\
--iodev1
/dev/null
--io-s-filter-value
1
\
--iodev1
/dev/null
\
--iodev2
/dev/null
\
--io-test-lamp
TS_TestLamp
_S
\
--io-heartbeat-id
_31_11
_AS
\
--io-sm-ready-test-sid
TestMode_S
\
--add-rtu
\
--rtu-device
/dev/cbsideA1
\
--rtu
-id
RTUExchange
\
--add-mbslave
\
--io-test-lamp
RS_Test9
_S
\
--io-heartbeat-id
AI
_AS
\
--io-sm-ready-test-sid
RS_Test9_S
#
--add-rtu \
# --rs-dev
/dev/cbsideA1 \
# --rs
-id RTUExchange \
#
--add-mbslave \
#--skip-rtu1 --skip-rtu2 --skip-can --dlog-add-levels info,warn,crit
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment