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
4938dfc7
Commit
4938dfc7
authored
May 08, 2013
by
Pavel Vainerman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
(RTUExchange): исправлена ошибка инициализации скорости обмена для
конкретного устройства.
parent
8d27254b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
5 deletions
+7
-5
RTUExchange.cc
extensions/ModbusMaster/RTUExchange.cc
+5
-3
start_fg_mbrtu.sh
extensions/ModbusMaster/start_fg_mbrtu.sh
+2
-2
No files found.
extensions/ModbusMaster/RTUExchange.cc
View file @
4938dfc7
...
@@ -12,7 +12,7 @@ RTUExchange::RTUExchange( UniSetTypes::ObjectId objId, UniSetTypes::ObjectId shm
...
@@ -12,7 +12,7 @@ RTUExchange::RTUExchange( UniSetTypes::ObjectId objId, UniSetTypes::ObjectId shm
const
std
::
string
prefix_
)
:
const
std
::
string
prefix_
)
:
MBExchange
(
objId
,
shmId
,
ic
,
prefix_
),
MBExchange
(
objId
,
shmId
,
ic
,
prefix_
),
mbrtu
(
0
),
mbrtu
(
0
),
defSpeed
(
ComPort
::
ComSpeed0
),
defSpeed
(
ComPort
::
ComSpeed
3840
0
),
use485F
(
false
),
use485F
(
false
),
transmitCtl
(
false
),
transmitCtl
(
false
),
rs_pre_clean
(
false
)
rs_pre_clean
(
false
)
...
@@ -130,7 +130,7 @@ ModbusClient* RTUExchange::initMB( bool reopen )
...
@@ -130,7 +130,7 @@ ModbusClient* RTUExchange::initMB( bool reopen )
mbrtu
->
setSleepPause
(
sleepPause_usec
);
mbrtu
->
setSleepPause
(
sleepPause_usec
);
dlog
[
Debug
::
INFO
]
<<
myname
<<
"(init): dev="
<<
devname
<<
" speed="
<<
ComPort
::
getSpeed
(
defSpeed
)
<<
endl
;
dlog
[
Debug
::
INFO
]
<<
myname
<<
"(init): dev="
<<
devname
<<
" speed="
<<
ComPort
::
getSpeed
(
mbrtu
->
getSpeed
()
)
<<
endl
;
}
}
catch
(
Exception
&
ex
)
catch
(
Exception
&
ex
)
{
{
...
@@ -216,7 +216,7 @@ void RTUExchange::poll()
...
@@ -216,7 +216,7 @@ void RTUExchange::poll()
s
=
d
->
speed
;
s
=
d
->
speed
;
mbrtu
->
setSpeed
(
d
->
speed
);
mbrtu
->
setSpeed
(
d
->
speed
);
}
}
if
(
d
->
dtype
==
MBExchange
::
dtRTU188
)
if
(
d
->
dtype
==
MBExchange
::
dtRTU188
)
{
{
if
(
!
d
->
rtu
)
if
(
!
d
->
rtu
)
...
@@ -358,6 +358,8 @@ bool RTUExchange::initDeviceInfo( RTUDeviceMap& m, ModbusRTU::ModbusAddr a, UniX
...
@@ -358,6 +358,8 @@ bool RTUExchange::initDeviceInfo( RTUDeviceMap& m, ModbusRTU::ModbusAddr a, UniX
return
false
;
return
false
;
}
}
}
}
else
d
->
second
->
speed
=
defSpeed
;
return
true
;
return
true
;
}
}
...
...
extensions/ModbusMaster/start_fg_mbrtu.sh
View file @
4938dfc7
...
@@ -4,13 +4,13 @@ uniset-start.sh -f ./uniset-rtuexchange --confile test.xml \
...
@@ -4,13 +4,13 @@ uniset-start.sh -f ./uniset-rtuexchange --confile test.xml \
--smemory-id
SharedMemory
\
--smemory-id
SharedMemory
\
--rs-dev
/dev/cbsideA0
\
--rs-dev
/dev/cbsideA0
\
--rs-name
RTUExchange
\
--rs-name
RTUExchange
\
--rs-speed
384
00
\
--rs-speed
1152
00
\
--rs-filter-field
rs
\
--rs-filter-field
rs
\
--rs-filter-value
2
\
--rs-filter-value
2
\
--dlog-add-levels
info,crit,warn,level4,level3
\
--dlog-add-levels
info,crit,warn,level4,level3
\
--rs-force
0
\
--rs-force
0
\
--rs-force-out
0
\
--rs-force-out
0
\
--rs-polltime
30
00
\
--rs-polltime
5
00
\
--rs-set-prop-prefix
rs_
\
--rs-set-prop-prefix
rs_
\
#,level3
#,level3
...
...
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