Commit a5244817 authored by Pavel Vainerman's avatar Pavel Vainerman

(MBExchange): Разрешил переопределять регистр даже если задан флаг

"mbregFromID"
parent 65441f29
......@@ -2026,10 +2026,18 @@ bool MBExchange::initRegInfo( RegInfo* r, UniXML_iterator& it, MBExchange::RTUD
if( mbregFromID )
{
if( it.getProp("id").empty() )
// всё-таки несмотря на "mbregFromID" разрешим переопределить регистр..
string sr = IOBase::initProp(it,"id",prop_prefix,false);
if( sr.empty() )
{
r->mbreg = conf->getSensorID(it.getProp("name"));
else
r->mbreg = it.getIntProp("id");
if( r->mbreg == DefaultObjectId )
{
dlog[Debug::CRIT] << myname << "(initItem): Unknown 'id' for " << it.getProp("name") << endl;
return false;
}
}
r->mbreg = ModbusRTU::str2mbData(sr);
}
else
{
......
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