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
69973cd4
Commit
69973cd4
authored
Feb 10, 2012
by
Pavel Vainerman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "(Modbus): сделал необязательным указание mbfunc для RTU188" Оно и так было необязательным
This reverts commit
f30ef207
.
parent
2ee39db9
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
13 deletions
+0
-13
MBExchange.cc
extensions/ModbusMaster/MBExchange.cc
+0
-13
No files found.
extensions/ModbusMaster/MBExchange.cc
View file @
69973cd4
...
...
@@ -1867,13 +1867,6 @@ bool MBExchange::initRegInfo( RegInfo* r, UniXML_iterator& it, MBExchange::RTUD
r
->
mbfunc
=
ModbusRTU
::
fnUnknown
;
string
f
=
it
.
getProp
(
prop_prefix
+
"mbfunc"
);
// С RTU188 особенная работа. Там код функций
// "жётско вшит" в код обмена (см. RTUStorage)
// по этому здесь просто указываем по умолчанию
if
(
dev
->
dtype
==
MBExchange
::
dtRTU188
)
f
=
"0x04"
;
if
(
!
f
.
empty
()
)
{
r
->
mbfunc
=
(
ModbusRTU
::
SlaveFunctionCode
)
UniSetTypes
::
uni_atoi
(
f
.
c_str
());
...
...
@@ -1950,12 +1943,6 @@ bool MBExchange::initItem( UniXML_iterator& it )
int
fn
=
it
.
getIntProp
(
prop_prefix
+
"mbfunc"
);
// С RTU188 особенная работа. Там код функций
// "жётско вшит" в код обмена (см. RTUStorage)
// по этому здесь просто указываем по умолчанию
if
(
dev
->
dtype
==
MBExchange
::
dtRTU188
)
fn
=
ModbusRTU
::
fnReadInputRegisters
;
// формула для вычисления ID
// требования:
// - ID > диапазона возможных регитров
...
...
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