Skip to content

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

change property: rtuVType --> vtype

parent b5990858
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 3 deletions
conf/test.xml
View file @ 7205a833
...@@ -115,7 +115,7 @@ ...@@ -115,7 +115,7 @@
mbtype="rtu" mbaddr="0x01" mbfunc="0x06" mbreg="0x02" rs="2" default="10" /> mbtype="rtu" mbaddr="0x01" mbfunc="0x06" mbreg="0x02" rs="2" default="10" />
/> />
<item name="AI_AS" textname="Analog input" node="" iotype="AI" default="378" priority="Medium" <item name="AI_AS" textname="Analog input" node="" iotype="AI" default="378" priority="Medium"
mbtype="rtu" mbaddr="0x01" mbfunc="0x04" mbreg="0x01" rs="1" rtuVType="F2" precision="45"> mbtype="rtu" mbaddr="0x01" mbfunc="0x04" mbreg="0x01" rs="1" vtype="F2" precision="45">
<consumers> <consumers>
<consumer name="TestProc" type="objects" cfilter="test1"/> <consumer name="TestProc" type="objects" cfilter="test1"/>
<consumer name="PLCProcessor" type="objects"/> <consumer name="PLCProcessor" type="objects"/>
......
extentions/RTUExchange/RTUExchange.cc
View file @ 7205a833
...@@ -663,7 +663,6 @@ void RTUExchange::processingMessage(UniSetTypes::VoidMessage *msg) ...@@ -663,7 +663,6 @@ void RTUExchange::processingMessage(UniSetTypes::VoidMessage *msg)
UniSetTypes::SystemMessage sm( msg ); UniSetTypes::SystemMessage sm( msg );
sysCommand( &sm ); sysCommand( &sm );
} }
break; break;
case Message::Timer: case Message::Timer:
...@@ -1083,7 +1082,7 @@ bool RTUExchange::initRTUitem( UniXML_iterator& it, RSProperty& p ) ...@@ -1083,7 +1082,7 @@ bool RTUExchange::initRTUitem( UniXML_iterator& it, RSProperty& p )
p.nbit = UniSetTypes::uni_atoi(nb.c_str()); p.nbit = UniSetTypes::uni_atoi(nb.c_str());
} }
string vt(it.getProp("rtuVType")); string vt(it.getProp("vtype"));
if( vt.empty() ) if( vt.empty() )
{ {
p.rnum = VTypes::wsize(VTypes::vtUnknown); p.rnum = VTypes::wsize(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