Commit a86540ac authored by Pavel Vainerman's avatar Pavel Vainerman

(unet2): исправил ошибку в конфигурировании датчика связи

parent 34413c52
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
Name: libuniset Name: libuniset
Version: 1.3 Version: 1.3
Release: alt14 Release: alt15
Summary: UniSet - library for building distributed industrial control systems Summary: UniSet - library for building distributed industrial control systems
License: GPL License: GPL
Group: Development/C++ Group: Development/C++
...@@ -213,6 +213,9 @@ rm -f %buildroot%_libdir/*.la ...@@ -213,6 +213,9 @@ rm -f %buildroot%_libdir/*.la
%changelog %changelog
* Thu Mar 15 2012 Pavel Vainerman <pv@altlinux.ru> 1.3-alt15
- (unet2): fixed bug in respond sensors
* Thu Mar 15 2012 Pavel Vainerman <pv@altlinux.ru> 1.3-alt14 * Thu Mar 15 2012 Pavel Vainerman <pv@altlinux.ru> 1.3-alt14
- (unet2): add 'unet_respond_invert' parameter - (unet2): add 'unet_respond_invert' parameter
......
...@@ -152,7 +152,7 @@ sender2(0) ...@@ -152,7 +152,7 @@ sender2(0)
} }
bool resp_invert = n_it.getIntProp("unet_respond_invert"); bool resp_invert = n_it.getIntProp("unet_respond_invert");
string s_resp_id(n_it.getProp("unet_respond1_id")); string s_resp_id(n_it.getProp("unet_respond1_id"));
UniSetTypes::ObjectId resp_id = UniSetTypes::DefaultObjectId; UniSetTypes::ObjectId resp_id = UniSetTypes::DefaultObjectId;
if( !s_resp_id.empty() ) if( !s_resp_id.empty() )
...@@ -166,7 +166,7 @@ sender2(0) ...@@ -166,7 +166,7 @@ sender2(0)
throw SystemError(err.str()); throw SystemError(err.str());
} }
} }
string s_resp2_id(n_it.getProp("unet_respond2_id")); string s_resp2_id(n_it.getProp("unet_respond2_id"));
UniSetTypes::ObjectId resp2_id = UniSetTypes::DefaultObjectId; UniSetTypes::ObjectId resp2_id = UniSetTypes::DefaultObjectId;
if( !s_resp2_id.empty() ) if( !s_resp2_id.empty() )
...@@ -223,7 +223,7 @@ sender2(0) ...@@ -223,7 +223,7 @@ sender2(0)
} }
} }
string s_resp_comm_id(n_it.getProp("unet_respond2_id")); string s_resp_comm_id(n_it.getProp("unet_respond_id"));
UniSetTypes::ObjectId resp_comm_id = UniSetTypes::DefaultObjectId; UniSetTypes::ObjectId resp_comm_id = UniSetTypes::DefaultObjectId;
if( !s_resp_comm_id.empty() ) if( !s_resp_comm_id.empty() )
{ {
...@@ -231,7 +231,7 @@ sender2(0) ...@@ -231,7 +231,7 @@ sender2(0)
if( resp_comm_id == UniSetTypes::DefaultObjectId ) if( resp_comm_id == UniSetTypes::DefaultObjectId )
{ {
ostringstream err; ostringstream err;
err << myname << ": Unknown RespondID(2).. Not found id for '" << s_resp_comm_id << "'" << endl; err << myname << ": Unknown RespondID(comm).. Not found id for '" << s_resp_comm_id << "'" << endl;
dlog[Debug::CRIT] << myname << "(init): " << err.str() << endl; dlog[Debug::CRIT] << myname << "(init): " << err.str() << endl;
throw SystemError(err.str()); throw SystemError(err.str());
} }
......
#!/bin/sh #!/bin/sh
uniset-start.sh -f ./uniset-unetexchange --unet-name UNetExchange \ uniset-start.sh -f ./uniset-unetexchange --unet-name UNetExchange \
--confile test.xml \ --confile test.xml --smemory-id SharedMemory \
--unet-filter-field rs --unet-filter-value 2 --unet-maxdifferense 40 \ --unet-filter-field rs --unet-filter-value 2 --unet-maxdifferense 40 \
--dlog-add-levels info,crit,warn --dlog-add-levels info,crit,warn
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