Skip to content

U
uniset2
Commit dc2325da authored by Pavel Vainerman's avatar Pavel Vainerman
Browse files
Options

Merge remote-tracking branch '1.x/master'

Conflicts: extensions/ModbusMaster/MBExchange.cc extensions/ModbusSlave/MBSlave.cc extensions/include/IOBase.h extensions/lib/IOBase.cc
parents c08f2b19 40f37844
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 13 deletions
extensions/ModbusSlave/MBSlave.cc
View file @ dc2325da
...@@ -836,25 +836,14 @@ bool MBSlave::initItem( UniXML_iterator& it ) ...@@ -836,25 +836,14 @@ bool MBSlave::initItem( UniXML_iterator& it )
p.mbreg = ModbusRTU::str2mbData(r); p.mbreg = ModbusRTU::str2mbData(r);
} }
string stype( IOBase::initProp(it,"mb_iotype",prop_prefix,false) );
if( stype.empty() )
stype = IOBase::initProp(it,"iotype",prop_prefix,false);
p.stype = UniSetTypes::getIOType(stype);
if( p.stype == UniversalIO::UnknownIOType )
{
dcrit << myname << "(initItem): Unknown 'iotype' or 'mb_iotype' for " << IOBase::initProp(it,"name",prop_prefix,false) << endl;
return false;
}
p.amode = MBSlave::amRW; p.amode = MBSlave::amRW;
string am(IOBase::initProp(it,"mb_accessmode",prop_prefix,false)); string am(IOBase::initProp(it,"accessmode",prop_prefix,false));
if( am == "ro" ) if( am == "ro" )
p.amode = MBSlave::amRO; p.amode = MBSlave::amRO;
else if( am == "rw" ) else if( am == "rw" )
p.amode = MBSlave::amRW; p.amode = MBSlave::amRW;
string vt(IOBase::initProp(it,"mb_vtype",prop_prefix,false)); string vt(IOBase::initProp(it,"vtype",prop_prefix,false));
if( vt.empty() ) if( vt.empty() )
{ {
p.vtype = VTypes::vtUnknown; p.vtype = VTypes::vtUnknown;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment