(codegen): добавил проверку что 'выход' сохранился в SM.

Utilities/codegen/ctl-cpp-cc-alone-ask.xsl

@@ -353,7 +353,22 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::updateOutputs( bool _force )
 			{
 				si.id 	= <xsl:value-of select="../../@name"/>;
 				si.node = node_<xsl:value-of select="../../@name"/>;
+				unsigned int i=0;
+				for( ; i&lt;setValueNumberOfAttempts; i++ )
+				{
 					ui->setValue( si,<xsl:call-template name="setprefix"/><xsl:value-of select="../../@name"/>, getId() );
+					// Проверка, что сохранилось
+					if( ui->getValue(si.id,si.node) == <xsl:call-template name="setprefix"/><xsl:value-of select="../../@name"/> )
+						break;
+				}
+			
+				if( i>=setValueNumberOfAttempts )
+				{
+					ostringstream err;
+					err &lt;&lt; myname &lt;&lt; "(setmsg): failed setValue for sid=" &lt;&lt; si.id;
+					mycrit &lt;&lt; err.str() &lt;&lt; endl;
+					throw UniSetTypes::SystemError(err.str());
+				}
 			}
 			catch( const Exception&amp; ex )
 			{
@@ -368,7 +383,22 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::updateOutputs( bool _force )
 	{
 		si.id 	= <xsl:value-of select="../../@name"/>;
 		si.node = node_<xsl:value-of select="../../@name"/>;
+		unsigned int i=0;
+		for( ; i&lt;setValueNumberOfAttempts; i++ )
+		{
 			ui->setValue( si,<xsl:value-of select="$setval"/>, getId() );
+			// Проверка, что сохранилось
+			if( ui->getValue(si.id,si.node) == <xsl:value-of select="$setval"/> )
+				break;
+		}
+			
+		if( i>=setValueNumberOfAttempts )
+		{
+			ostringstream err;
+			err &lt;&lt; myname &lt;&lt; "(setmsg): failed setValue for sid=" &lt;&lt; si.id;
+			mycrit &lt;&lt; err.str() &lt;&lt; endl;
+			throw UniSetTypes::SystemError(err.str());
+		}
 	}
 	catch( const Exception&amp; ex )
 	{

Utilities/codegen/ctl-cpp-cc-alone.xsl

@@ -291,7 +291,22 @@ UniSetTypes::ObjectId <xsl:value-of select="$CLASSNAME"/>_SK::getSMTestID()
 	{
 		si.id 	= <xsl:value-of select="../../@name"/>;
 		si.node = node_<xsl:value-of select="../../@name"/>;
+		unsigned int i=0;
+		for( ; i&lt;setValueNumberOfAttempts; i++ )
+		{
 			ui->setValue( si,<xsl:call-template name="setprefix"/><xsl:value-of select="../../@name"/>, getId() );
+			// Проверка, что сохранилось
+			if( ui->getValue(si.id,si.node) == <xsl:call-template name="setprefix"/><xsl:value-of select="../../@name"/> )
+				break;
+		}
+			
+		if( i>=setValueNumberOfAttempts )
+		{
+			ostringstream err;
+			err &lt;&lt; myname &lt;&lt; "(setdata): failed setValue for sid=" &lt;&lt; si.id;
+			mycrit &lt;&lt; err.str()  &lt;&lt; endl;
+			throw UniSetTypes::SystemError(err.str());
+		}
 	}
 	catch( const Exception&amp; ex )
 	{
@@ -306,7 +321,22 @@ UniSetTypes::ObjectId <xsl:value-of select="$CLASSNAME"/>_SK::getSMTestID()
 	{
 		si.id 	= <xsl:value-of select="../../@name"/>;
 		si.node = node_<xsl:value-of select="../../@name"/>;
+		unsigned int i=0;
+		for( ; i&lt;setValueNumberOfAttempts; i++ )
+		{
 			ui->setValue( si,<xsl:value-of select="$setval"/>, getId() );
+			// Проверка, что сохранилось
+			if( ui->getValue(si.id,si.node) == <xsl:value-of select="$setval"/> )
+				break;
+		}
+			
+		if( i>=setValueNumberOfAttempts )
+		{
+			ostringstream err;
+			err &lt;&lt; myname &lt;&lt; "(setdata): failed setValue for sid=" &lt;&lt; si.id;
+			mycrit &lt;&lt; err.str() &lt;&lt; endl;
+			throw UniSetTypes::SystemError(err.str());
+		}			
 	}
 	catch( const Exception&amp; ex )
 	{

Utilities/codegen/ctl-cpp-cc-ask.xsl

@@ -293,7 +293,22 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::preAskSensors( UniversalIO::UIOComm
 				{
 					si.id 	= <xsl:value-of select="@name"/>;
 					si.node = node_<xsl:value-of select="@name"/>;
+					unsigned int i=0;
+					for( ; i&lt;setValueNumberOfAttempts; i++ )
+					{
 						ui->setValue( si, <xsl:call-template name="setprefix"/><xsl:value-of select="@name"/>, getId() );
+						// Проверка, что сохранилось
+						if( ui->getValue(si.id,si.node) == <xsl:call-template name="setprefix"/><xsl:value-of select="@name"/> )
+							break;
+					}
+					
+					if( i>=setValueNumberOfAttempts )
+					{
+						ostringstream err;
+						err &lt;&lt; myname &lt;&lt; "(setdata): failed setValue for sid=" &lt;&lt; si.id;
+						mycrit &lt;&lt; err.str() &lt;&lt; endl;
+						throw UniSetTypes::SystemError(err.str());
+					}
 				}
 				catch( UniSetTypes::Exception&amp; ex )
 				{
@@ -311,7 +326,22 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::preAskSensors( UniversalIO::UIOComm
 		{
 			si.id 	= <xsl:value-of select="@name"/>;
 			si.node = node_<xsl:value-of select="@name"/>;
+			unsigned int i=0;
+			for( ; i&lt;setValueNumberOfAttempts; i++ )
+			{
 				ui->setValue( si,<xsl:value-of select="$setval"/>, getId() );
+				// Проверка, что сохранилось
+				if( ui->getValue(si.id,si.node) == <xsl:value-of select="$setval"/> )
+					break;
+			}
+			
+			if( i>=setValueNumberOfAttempts )
+			{
+				ostringstream err;
+				err &lt;&lt; myname &lt;&lt; "(setdata): failed setValue for sid=" &lt;&lt; si.id;
+				mycrit &lt;&lt; err.str() &lt;&lt; endl;
+				throw UniSetTypes::SystemError(err.str());
+			}
 		}
 		catch( UniSetTypes::Exception&amp; ex )
 		{

Utilities/codegen/ctl-cpp-cc.xsl

@@ -234,7 +234,22 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::initFromSM()
 		{
 			si.id 	= <xsl:value-of select="@name"/>;
 			si.node = node_<xsl:value-of select="@name"/>;
+			unsigned int i=0;
+			for( ; i&lt;setValueNumberOfAttempts; i++ )
+			{
 				ui->setValue( si, <xsl:call-template name="setprefix"/><xsl:value-of select="@name"/>, getId() );
+				// Проверка, что сохранилось
+				if( ui->getValue(si.id,si.node) == <xsl:call-template name="setprefix"/><xsl:value-of select="@name"/> )
+					break;
+			}
+			
+			if( i>=setValueNumberOfAttempts )
+			{
+				ostringstream err;
+				err &lt;&lt; myname &lt;&lt; "(setdata): failed setValue for sid=" &lt;&lt; si.id;
+				mycrit &lt;&lt; err.str() &lt;&lt; endl;
+				throw UniSetTypes::SystemError(err.str());
+			}
 		}
 	}
 	catch( const Exception&amp; ex )
@@ -252,7 +267,22 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::initFromSM()
 		{
 			si.id 	= <xsl:value-of select="@name"/>;
 			si.node = node_<xsl:value-of select="@name"/>;
+			unsigned int i=0;
+			for( ; i&lt;setValueNumberOfAttempts; i++ )
+			{
 				ui->setValue( si,<xsl:value-of select="$setval"/>, getId() );
+				// Проверка, что сохранилось
+				if( ui->getValue(si.id,si.node) == <xsl:value-of select="$setval"/> )
+					break;
+			}
+			
+			if( i>=setValueNumberOfAttempts )
+			{
+				ostringstream err;
+				err &lt;&lt; myname &lt;&lt; "(setdata): failed setValue for sid=" &lt;&lt; si.id;
+				mycrit &lt;&lt; err.str() &lt;&lt; endl;
+				throw UniSetTypes::SystemError(err.str());
+			}
 		}
 	}
 	catch( const Exception&amp; ex )
@@ -269,7 +299,22 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::initFromSM()
 		{
 			si.id 	= <xsl:value-of select="@name"/>;
 			si.node = node_<xsl:value-of select="@name"/>;
+			unsigned int i=0;
+			for( ; i&lt;setValueNumberOfAttempts; i++ )
+			{
 				ui->setValue( si,(long)m_<xsl:value-of select="@name"/>, getId() );
+				// Проверка, что сохранилось
+				if( ui->getValue(si.id,si.node) == (long)m_<xsl:value-of select="@name"/> )
+					break;
+			}
+			
+			if( i>=setValueNumberOfAttempts )
+			{
+				ostringstream err;
+				err &lt;&lt; myname &lt;&lt; "(setmsg): failed setValue for sid=" &lt;&lt; si.id;
+				mycrit &lt;&lt; err.str() &lt;&lt; endl;
+				throw UniSetTypes::SystemError(err.str());
+			}
 		}
 	}
 	catch( const Exception&amp; ex )

Utilities/codegen/ctl-cpp-common.xsl

@@ -345,6 +345,7 @@
 </xsl:template>
 
 <xsl:template name="COMMON-HEAD-PRIVATE">
+		unsigned int setValueNumberOfAttempts = { 3 }; // количество попыток, сохранить 'out' (см. updateOutputs)
 		<xsl:if test="normalize-space($VARMAP)='1'">
 		class PtrMapHashFn
 		{
@@ -907,6 +908,8 @@ end_private(false)
 		maxHeartBeat = conf->getArgPInt("--" + argprefix + "heartbeat-max",it.getProp("heartbeat_max"), 10);
 	}
 
+	setValueNumberOfAttempts = conf->getArgPInt("--" + argprefix + "setValueNumberOfAttempts",it.getProp("setValueNumberOfAttempts"),setValueNumberOfAttempts);
+	
 	// Инициализация значений
 	<xsl:for-each select="//smap/item">
 		<xsl:if test="normalize-space(@default)=''">
@@ -994,6 +997,7 @@ end_private(false)
 	vmonit(maxHeartBeat);
 	vmonit(activateTimeout);
 	vmonit(smReadyTimeout);
+	vmonit(setValueNumberOfAttempts);
 }
 
 // -----------------------------------------------------------------------------
@@ -1357,6 +1361,7 @@ askPause(uniset_conf()->getPIntProp(cnode,"askPause",2000))
 	si.node = conf->getLocalNode();
 
 	sleep_msec = conf->getArgPInt("--" + argprefix + "sleep-msec","<xsl:call-template name="settings-alone"><xsl:with-param name="varname" select="'sleep-msec'"/></xsl:call-template>", <xsl:call-template name="settings-alone"><xsl:with-param name="varname" select="'sleep-msec'"/></xsl:call-template>);
+	setValueNumberOfAttempts = conf->getArgPInt("--" + argprefix + "setValueNumberOfAttempts",it.getProp("setValueNumberOfAttempts"),setValueNumberOfAttempts);
 
 	string s_resetTime("<xsl:call-template name="settings-alone"><xsl:with-param name="varname" select="'sleep-msec'"/></xsl:call-template>");
 	if( s_resetTime.empty() )

conf/libuniset2.spec

@@ -14,7 +14,7 @@
 
 Name: libuniset2
 Version: 2.3
-Release: alt5
+Release: alt6
 Summary: UniSet - library for building distributed industrial control systems
 
 License: LGPL
@@ -483,6 +483,9 @@ mv -f %buildroot%python_sitelibdir_noarch/* %buildroot%python_sitelibdir/%oname
 # ..
 
 %changelog
+* Fri May 27 2016 Pavel Vainerman <pv@altlinux.ru> 2.3-alt6
+- codegen: added several attempts to save the value
+
 * Wed May 11 2016 Pavel Vainerman <pv@altlinux.ru> 2.3-alt5
 - fixes after coverity_scan
 

docs/DocPages/uniset-codegen.dox

@@ -224,6 +224,7 @@
 - \b --argprefix-activate-timeout msec
 - \b --argprefix-startup-timeout msec
 - \b --argprefix-log-[add|del]-levels xxx,xxx,xxx 
+- \b --argprefix-setValueNumberOfAttempts num
 
 
 \section pg_Codegen_Configuration Конфигурирование
@@ -254,6 +255,8 @@
  - \b activateTimeout	= conf->getArgPInt("--activate-timeout", 20000); - время отведённое на инициализацию процесса
  - \b msec = conf->getArgPInt("--startup-timeout", 10000); - пауза, в течение которой игнорируется сообщение SystemMessage::WatchDog.
 В случае если они приходят подряд.
+ - \b setValueNumberOfAttempts	- количество попыток сохранить 'выходы'(out_xxx) в SharedMemory.
+
 
 
 \section pg_Codegen_TestMode Специальный режим "тест" (TestMode)

extensions/include/UObject_SK.h

-/*
- * Copyright (c) 2015 Pavel Vainerman.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, version 2.1.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
+
 // --------------------------------------------------------------------------
 /*
  DO NOT EDIT THIS FILE. IT IS AUTOGENERATED FILE.
@@ -22,7 +8,7 @@
  ВСЕ ВАШИ ИЗМЕНЕНИЯ БУДУТ ПОТЕРЯНЫ.
 */ 
 // --------------------------------------------------------------------------
-// generate timestamp: 2015-12-19+03:00
+// generate timestamp: 2016-05-27+03:00
 // -----------------------------------------------------------------------------
 #ifndef UObject_SK_H_
 #define UObject_SK_H_
@@ -43,7 +29,7 @@ class UObject_SK:
 	public UniSetObject
 {
 	public:
-		UObject_SK( UniSetTypes::ObjectId id, xmlNode* node = UniSetTypes::uniset_conf()->getNode("UObject"), const std::string& argprefix = "" );
+		UObject_SK( UniSetTypes::ObjectId id, xmlNode* node=UniSetTypes::uniset_conf()->getNode("UObject"), const std::string& argprefix="" );
 		UObject_SK();
 		virtual ~UObject_SK();
 
@@ -57,60 +43,54 @@ class UObject_SK:
 
 		virtual bool setMsg( UniSetTypes::ObjectId code, bool state = true );
 
-		inline std::shared_ptr<DebugStream> log()
-		{
-			return mylog;
-		}
-		inline std::shared_ptr<LogAgregator> logAgregator()
-		{
-			return loga;
-		}
+		inline std::shared_ptr<DebugStream> log(){ return mylog; }
+		inline std::shared_ptr<LogAgregator> logAgregator(){ return loga; }
 
 		void init_dlog( std::shared_ptr<DebugStream> d );
 
         // "синтаксический сахар"..для логов
-#ifndef myinfo
-#define myinfo if( log()->debugging(Debug::INFO) ) log()->info()
-#endif
-#ifndef mywarn
-#define mywarn if( log()->debugging(Debug::WARN) ) log()->warn()
-#endif
-#ifndef mycrit
-#define mycrit if( log()->debugging(Debug::CRIT) ) log()->crit()
-#endif
-#ifndef mylog1
-#define mylog1 if( log()->debugging(Debug::LEVEL1) ) log()->level1()
-#endif
-#ifndef mylog2
-#define mylog2 if( log()->debugging(Debug::LEVEL2) ) log()->level2()
-#endif
-#ifndef mylog3
-#define mylog3 if( log()->debugging(Debug::LEVEL3) ) log()->level3()
-#endif
-#ifndef mylog4
-#define mylog4 if( log()->debugging(Debug::LEVEL4) ) log()->level4()
-#endif
-#ifndef mylog5
-#define mylog5 if( log()->debugging(Debug::LEVEL5) ) log()->level5()
-#endif
-#ifndef mylog6
-#define mylog6 if( log()->debugging(Debug::LEVEL6) ) log()->level6()
-#endif
-#ifndef mylog7
-#define mylog7 if( log()->debugging(Debug::LEVEL7) ) log()->level7()
-#endif
-#ifndef mylog8
-#define mylog8 if( log()->debugging(Debug::LEVEL8) ) log()->level8()
-#endif
-#ifndef mylog9
-#define mylog9 if( log()->debugging(Debug::LEVEL9) ) log()->level9()
-#endif
-#ifndef mylogany
-#define mylogany log()->any()
-#endif
-#ifndef vmonit
-#define vmonit( var ) vmon.add( #var, var )
-#endif
+        #ifndef myinfo 
+        	#define myinfo if( log()->debugging(Debug::INFO) ) log()->info() 
+        #endif
+        #ifndef mywarn
+	        #define mywarn if( log()->debugging(Debug::WARN) ) log()->warn()
+        #endif
+        #ifndef mycrit
+    	    #define mycrit if( log()->debugging(Debug::CRIT) ) log()->crit()
+        #endif
+        #ifndef mylog1
+        	#define mylog1 if( log()->debugging(Debug::LEVEL1) ) log()->level1()
+        #endif
+        #ifndef mylog2
+	        #define mylog2 if( log()->debugging(Debug::LEVEL2) ) log()->level2()
+        #endif
+        #ifndef mylog3
+    	    #define mylog3 if( log()->debugging(Debug::LEVEL3) ) log()->level3()
+        #endif
+        #ifndef mylog4
+        	#define mylog4 if( log()->debugging(Debug::LEVEL4) ) log()->level4()
+        #endif
+        #ifndef mylog5
+	        #define mylog5 if( log()->debugging(Debug::LEVEL5) ) log()->level5()
+        #endif
+        #ifndef mylog6
+    	    #define mylog6 if( log()->debugging(Debug::LEVEL6) ) log()->level6()
+        #endif
+        #ifndef mylog7
+        	#define mylog7 if( log()->debugging(Debug::LEVEL7) ) log()->level7()
+        #endif
+        #ifndef mylog8
+	        #define mylog8 if( log()->debugging(Debug::LEVEL8) ) log()->level8()
+        #endif
+        #ifndef mylog9
+    	    #define mylog9 if( log()->debugging(Debug::LEVEL9) ) log()->level9()
+        #endif
+        #ifndef mylogany
+        	#define mylogany log()->any()
+        #endif
+        #ifndef vmonit
+            #define vmonit( var ) vmon.add( #var, var )
+        #endif
         
         // Вспомогательные функции для удобства логирования
         // ------------------------------------------------------------
@@ -127,19 +107,16 @@ class UObject_SK:
            \param id           - идентификатор датчика
            \param showLinkName - TRUE - выводить SensorName, FALSE - не выводить
         */
-		std::string str( UniSetTypes::ObjectId id, bool showLinkName = true );
+        std::string str( UniSetTypes::ObjectId id, bool showLinkName=true );
         
         /*! Вывод значения входа/выхода в формате: in_xxx(SensorName)=val 
            \param id           - идентификатор датчика
            \param showLinkName - TRUE - выводить SensorName, FALSE - не выводить
         */
-		std::string strval( UniSetTypes::ObjectId id, bool showLinkName = true );
+        std::string strval( UniSetTypes::ObjectId id, bool showLinkName=true );        
         
         /*! Вывод состояния внутренних переменных */
-		inline std::string dumpVars()
-		{
-			return std::move(vmon.pretty_str());
-		}
+        inline std::string dumpVars(){ return std::move(vmon.pretty_str()); }
         // ------------------------------------------------------------
         std::string help();
         
@@ -168,16 +145,13 @@ class UObject_SK:
 		
 		virtual void callback() override;
 		virtual void processingMessage( UniSetTypes::VoidMessage* msg ) override;
-		virtual void sysCommand( const UniSetTypes::SystemMessage* sm ) {};
-		virtual void askSensors( UniversalIO::UIOCommand cmd ) {}
-		virtual void sensorInfo( const UniSetTypes::SensorMessage* sm ) override {}
-		virtual void timerInfo( const UniSetTypes::TimerMessage* tm ) override {}
+		virtual void sysCommand( const UniSetTypes::SystemMessage* sm ){};
+		virtual void askSensors( UniversalIO::UIOCommand cmd ){}
+		virtual void sensorInfo( const UniSetTypes::SensorMessage* sm ) override{}
+		virtual void timerInfo( const UniSetTypes::TimerMessage* tm ) override{}
 		virtual void sigterm( int signo ) override;
 		virtual bool activateObject() override;
-		virtual std::string getMonitInfo()
-		{
-			return "";    /*!< пользовательская информация выводимая в getInfo() */
-		}
+		virtual std::string getMonitInfo(){ return ""; } /*!< пользовательская информация выводимая в getInfo() */
 		
 		virtual void testMode( bool state );
 		void updatePreviousValues();
@@ -190,6 +164,7 @@ class UObject_SK:
 		void preSysCommand( const UniSetTypes::SystemMessage* sm );
 		void waitSM( int wait_msec, UniSetTypes::ObjectId testID = UniSetTypes::DefaultObjectId );
 		void initFromSM();
+		UniSetTypes::ObjectId getSMTestID();
 
 		void resetMsg();
 		Trigger trResetMsg;
@@ -197,7 +172,7 @@ class UObject_SK:
 		int resetMsgTime;
 
 		// Выполнение очередного шага программы
-		virtual void step() {}
+		virtual void step(){}
 
 		int sleep_msec; /*!< пауза между итерациями */
 		bool active;
@@ -212,15 +187,9 @@ class UObject_SK:
 		
 		xmlNode* confnode;
 		/*! получить числовое свойство из конф. файла по привязанной confnode */
-		int getIntProp(const std::string& name)
-		{
-			return UniSetTypes::uniset_conf()->getIntProp(confnode, name);
-		}
+		int getIntProp(const std::string& name) { return UniSetTypes::uniset_conf()->getIntProp(confnode, name); }
 		/*! получить текстовое свойство из конф. файла по привязанной confnode */
-		inline const std::string getProp(const std::string& name)
-		{
-			return UniSetTypes::uniset_conf()->getProp(confnode, name);
-		}
+		inline const std::string getProp(const std::string& name) { return UniSetTypes::uniset_conf()->getProp(confnode, name); }
 
 		timeout_t smReadyTimeout; 	/*!< время ожидания готовности SM */
 		std::atomic_bool activated;
@@ -254,6 +223,8 @@ class UObject_SK:
 
 		// Используемые идентификаторы сообщений
 		
+		unsigned int setValueNumberOfAttempts = { 3 }; // количество попыток, сохранить 'out' (см. updateOutputs)
+		
 
 		bool end_private; // вспомогательное поле (для внутреннего использования при генерировании кода)
 };

extensions/lib/UObject_SK.cc

@@ -11,7 +11,7 @@
  ВСЕ ВАШИ ИЗМЕНЕНИЯ БУДУТ ПОТЕРЯНЫ.
 */ 
 // --------------------------------------------------------------------------
-// generate timestamp: 2015-12-19+03:00
+// generate timestamp: 2016-05-27+03:00
 // -----------------------------------------------------------------------------
 #include <memory>
 #include <iomanip>
@@ -32,26 +32,26 @@ using namespace UniSetTypes;
 
 // -----------------------------------------------------------------------------
 UObject_SK::UObject_SK():
-	// Инициализация идентификаторов (имена берутся из конф. файла)
+// Инициализация идентификаторов (имена берутся из конф. файла)
 
-	// Используемые идентификаторы сообщений (имена берутся из конф. файла)
+// Используемые идентификаторы сообщений (имена берутся из конф. файла)
 
-	// variables
+// variables
 
-	active(false),
+active(false),
 
-	idHeartBeat(DefaultObjectId),
-	maxHeartBeat(10),
-	confnode(0),
-	smReadyTimeout(0),
-	activated(false),
-	askPause(2000),
-	forceOut(false),
+idHeartBeat(DefaultObjectId),
+maxHeartBeat(10),
+confnode(0),
+smReadyTimeout(0),
+activated(false),
+askPause(2000),
+forceOut(false),
 
-	end_private(false)
+end_private(false)
 {
-	ucrit << "UObject: init failed!!!!!!!!!!!!!!!" << endl;
-	throw Exception( string(myname + ": init failed!!!") );
+	mycrit << "UObject: init failed!!!!!!!!!!!!!!!" << endl;
+	throw Exception( string(myname+": init failed!!!") );
 }
 // -----------------------------------------------------------------------------
 // ( val, confval, default val )
@@ -59,7 +59,6 @@ static const std::string init3_str( const std::string& s1, const std::string& s2
 {
 	if( !s1.empty() )
 		return s1;
-
 	if( !s2.empty() )
 		return s2;
 	
@@ -67,34 +66,34 @@ static const std::string init3_str( const std::string& s1, const std::string& s2
 }
 // -----------------------------------------------------------------------------
 UObject_SK::UObject_SK( ObjectId id, xmlNode* cnode, const std::string& _argprefix ):
-	UniSetObject(id),
-	// Инициализация идентификаторов (имена берутся из конф. файла)
+UniSetObject(id),
+// Инициализация идентификаторов (имена берутся из конф. файла)
 
-	// Используемые идентификаторы сообщений (имена берутся из конф. файла)
+// Используемые идентификаторы сообщений (имена берутся из конф. файла)
 
-	// variables
+// variables
 
-	sleep_msec(150),
-	active(true),
-	argprefix( (_argprefix.empty() ? myname + "-" : _argprefix) ),
+sleep_msec(150),
+active(true),
+argprefix( (_argprefix.empty() ? myname+"-" : _argprefix) ),
 
-	idHeartBeat(DefaultObjectId),
-	maxHeartBeat(10),
-	confnode(cnode),
-	smReadyTimeout(0),
-	activated(false),
-	askPause(uniset_conf()->getPIntProp(cnode, "askPause", 2000)),
-	forceOut(false),
+idHeartBeat(DefaultObjectId),
+maxHeartBeat(10),
+confnode(cnode),
+smReadyTimeout(0),
+activated(false),
+askPause(uniset_conf()->getPIntProp(cnode,"askPause",2000)),
+forceOut(false),
 
-	end_private(false)
+end_private(false)
 {
 	auto conf = uniset_conf();
 
 	
-	if( UniSetTypes::findArgParam("--print-id-list", uniset_conf()->getArgc(), uniset_conf()->getArgv()) != -1 )
+	if( UniSetTypes::findArgParam("--print-id-list",uniset_conf()->getArgc(),uniset_conf()->getArgv()) != -1 )
 	{
 
-		//		abort();
+//		abort();
 	}
 
 
@@ -110,10 +109,10 @@ UObject_SK::UObject_SK( ObjectId id, xmlNode* cnode, const std::string& _argpref
 	{
 		ostringstream s;
 		s << argprefix << "log";
-		conf->initLogStream(mylog, s.str());
+		conf->initLogStream(mylog,s.str());
 	}
 
-	loga = make_shared<LogAgregator>(myname + "-loga");
+	loga = make_shared<LogAgregator>(myname+"-loga");
 	loga->add(mylog);
 	loga->add(ulog());
 
@@ -131,14 +130,12 @@ UObject_SK::UObject_SK( ObjectId id, xmlNode* cnode, const std::string& _argpref
 		logserv_port = conf->getArgPInt("--" + argprefix + "logserver-port", it.getProp("logserverPort"), getId());
 	}
 	
-	forceOut = conf->getArgPInt("--" + argprefix + "force-out", it.getProp("forceOut"), false);
-
-	string heart = conf->getArgParam("--" + argprefix + "heartbeat-id", it.getProp("heartbeat_id"));
+	forceOut = conf->getArgPInt("--" + argprefix + "force-out",it.getProp("forceOut"),false);
 
+	string heart = conf->getArgParam("--" + argprefix + "heartbeat-id",it.getProp("heartbeat_id"));
 	if( !heart.empty() )
 	{
 		idHeartBeat = conf->getSensorID(heart);
-
 		if( idHeartBeat == DefaultObjectId )
 		{
 			ostringstream err;
@@ -146,34 +143,33 @@ UObject_SK::UObject_SK( ObjectId id, xmlNode* cnode, const std::string& _argpref
 			throw SystemError(err.str());
 		}
 
-		int heartbeatTime = conf->getArgPInt("--" + argprefix + "heartbeat-time", it.getProp("heartbeatTime"), conf->getHeartBeatTime());
-
-		if( heartbeatTime > 0 )
+		int heartbeatTime = conf->getArgPInt("--" + argprefix + "heartbeat-time",it.getProp("heartbeatTime"),conf->getHeartBeatTime());
+		if( heartbeatTime>0 )
 			ptHeartBeat.setTiming(heartbeatTime);
 		else
 			ptHeartBeat.setTiming(UniSetTimer::WaitUpTime);
 
-		maxHeartBeat = conf->getArgPInt("--" + argprefix + "heartbeat-max", it.getProp("heartbeat_max"), 10);
+		maxHeartBeat = conf->getArgPInt("--" + argprefix + "heartbeat-max",it.getProp("heartbeat_max"), 10);
 	}
 
+	setValueNumberOfAttempts = conf->getArgPInt("--" + argprefix + "setValueNumberOfAttempts",it.getProp("setValueNumberOfAttempts"),setValueNumberOfAttempts);
+	
 	// Инициализация значений
 	
 	
 	si.id = UniSetTypes::DefaultObjectId;
 	si.node = conf->getLocalNode();
 	
-	sleep_msec = conf->getArgPInt("--" + argprefix + "sleep-msec", "150", 150);
+	sleep_msec = conf->getArgPInt("--" + argprefix + "sleep-msec","150", 150);
 
 	string s_resetTime("");
-
 	if( s_resetTime.empty() )
 		s_resetTime = "500";
 
-	resetMsgTime = uni_atoi(init3_str(conf->getArgParam("--" + argprefix + "resetMsgTime"), conf->getProp(cnode, "resetMsgTime"), s_resetTime));
+	resetMsgTime = uni_atoi(init3_str(conf->getArgParam("--" + argprefix + "resetMsgTime"),conf->getProp(cnode,"resetMsgTime"),s_resetTime));
 	ptResetMsg.setTiming(resetMsgTime);
 
-	int sm_tout = conf->getArgInt("--" + argprefix + "sm-ready-timeout", "");
-
+	int sm_tout = conf->getArgInt("--" + argprefix + "sm-ready-timeout","");
 	if( sm_tout == 0 )
 		smReadyTimeout = 60000;
 	else if( sm_tout < 0 )
@@ -181,9 +177,12 @@ UObject_SK::UObject_SK( ObjectId id, xmlNode* cnode, const std::string& _argpref
 	else
 		smReadyTimeout = sm_tout;
 
-	smTestID = conf->getSensorID(init3_str(conf->getArgParam("--" + argprefix + "sm-test-id"), conf->getProp(cnode, "smTestID"), ""));
+	smTestID = conf->getSensorID(init3_str(conf->getArgParam("--" + argprefix + "sm-test-id"),conf->getProp(cnode,"smTestID"),""));
 	
 
+	if( smTestID == DefaultObjectId )
+		smTestID = getSMTestID();
+
 	activateTimeout	= conf->getArgPInt("--" + argprefix + "activate-timeout", 20000);
 
 	int msec = conf->getArgPInt("--" + argprefix + "startup-timeout", 10000);
@@ -201,6 +200,7 @@ UObject_SK::UObject_SK( ObjectId id, xmlNode* cnode, const std::string& _argpref
 	vmonit(maxHeartBeat);
 	vmonit(activateTimeout);
 	vmonit(smReadyTimeout);
+	vmonit(setValueNumberOfAttempts);
 }
 
 // -----------------------------------------------------------------------------
@@ -251,10 +251,20 @@ bool UObject_SK::setMsg( UniSetTypes::ObjectId _code, bool _state )
 void UObject_SK::resetMsg()
 {
     mylog8 << myname << "(resetMsg): reset messages.." << endl;
-	// reset messages
+// reset messages
 
 }
 // -----------------------------------------------------------------------------
+UniSetTypes::ObjectId UObject_SK::getSMTestID()
+{
+	if( smTestID != DefaultObjectId )
+		return smTestID;
+
+	
+
+	return DefaultObjectId;
+}
+// -----------------------------------------------------------------------------
 void UObject_SK::testMode( bool _state )
 {
 	if( !_state  )
@@ -279,23 +289,19 @@ std::string  UObject_SK::dumpIO()
 	s << endl;
 
 	int n = 0;
-
-	for( const auto& e : v_in )
+	for( const auto& e: v_in )
 	{
 		s << e;
-
-		if( (n++) % 2 )
+		if( (n++)%2 )
 			s << std::endl;
 	}
 	
 	s << endl;
 	n = 0;
-
-	for( const auto& e : v_out )
+	for( const auto& e: v_out )
 	{
 		s << e;
-
-		if( (n++) % 2 )
+		if( (n++)%2 )
 			s << std::endl;
 	}
 	
@@ -349,7 +355,7 @@ void UObject_SK::processingMessage( UniSetTypes::VoidMessage* _msg )
 	}
 	catch( const Exception& ex )
 	{
-		ucrit  << myname << "(processingMessage): " << ex << endl;
+		mycrit  << myname << "(processingMessage): " << ex << endl;
 	}
 }
 // -----------------------------------------------------------------------------
@@ -358,14 +364,12 @@ void UObject_SK::preSysCommand( const SystemMessage* _sm )
 	switch( _sm->command )
 	{
 		case SystemMessage::WatchDog:
-			uinfo << myname << "(preSysCommand): WatchDog" << endl;
-
+			myinfo << myname << "(preSysCommand): WatchDog" << endl;
 			if( !active || !ptStartUpTimeout.checkTime() )
 			{
-				uwarn << myname << "(preSysCommand): игнорируем WatchDog, потому-что только-что стартанули" << endl;
+				mywarn << myname << "(preSysCommand): игнорируем WatchDog, потому-что только-что стартанули" << endl;
 				break;
 			}
-
 		case SystemMessage::StartUp:
 		{
 			if( !logserv_host.empty() && logserv_port != 0 && !logserv->isRunning() )
@@ -398,10 +402,9 @@ void UObject_SK::preSysCommand( const SystemMessage* _sm )
 			// переоткрываем логи
 			mylogany << myname << "(preSysCommand): logRotate" << endl;
 			string fname( log()->getLogFile() );
-
 			if( !fname.empty() )
 			{
-				mylog->logFile(fname.c_str(), true);
+				mylog->logFile(fname.c_str(),true);
 				mylogany << myname << "(preSysCommand): ***************** mylog LOG ROTATE *****************" << endl;
 			}
 		}
@@ -427,16 +430,14 @@ UniSetTypes::SimpleInfo* UObject_SK::getInfo( CORBA::Long userparam )
 	inf << endl;
 	auto timers = getTimersList();
 	inf << "Timers[" << timers.size() << "]:" << endl;
-
-	for( const auto& t : timers )
+	for( const auto& t: timers )
 	{
 		inf << "  " << setw(15) << getTimerName(t.id) << "[" << t.id  << "]: msec="
 			<< setw(6) << t.tmr.getInterval()
 			<< "    timeleft="  << setw(6) << t.curTimeMS
-			<< "    tick="  << setw(3) << ( t.curTick >= 0 ? t.curTick : -1 )
+			<< "    tick="  << setw(3) << ( t.curTick>=0 ? t.curTick : -1 )
 			<< endl;
 	}
-
 	inf << endl;
 	inf << vmon.pretty_str() << endl;
 	inf << endl;
@@ -485,26 +486,39 @@ void UObject_SK::waitSM( int wait_msec, ObjectId _testID )
 	if( _testID == DefaultObjectId )
 		return;
 		
-	uinfo << myname << "(waitSM): waiting SM ready "
+	myinfo << myname << "(waitSM): waiting SM ready "
 			<< wait_msec << " msec"
 			<< " testID=" << _testID << endl;
 		
-	if( !ui->waitReady(_testID, wait_msec) )
+	// waitReady можно использовать т.к. датчик это по сути IONotifyController
+	if( !ui->waitReady(_testID,wait_msec) )
 	{
 		ostringstream err;
 		err << myname 
 			<< "(waitSM): Не дождались готовности(exist) SharedMemory к работе в течение " 
 			<< wait_msec << " мсек";
 
-		ucrit << err.str() << endl;
-		//		terminate();
-		//		abort();
+        mycrit << err.str() << endl;
+//		terminate();
+//		abort();
 		raise(SIGTERM);
 		terminate();
-		//		throw SystemError(err.str());
+//		throw SystemError(err.str());
 	}
 
+	if( !ui->waitWorking(_testID,wait_msec) )
+	{
+		ostringstream err;
+		err << myname
+			<< "(waitSM): Не дождались готовности(work) SharedMemory к работе в течение "
+			<< wait_msec << " мсек";
 	
+		mycrit << err.str() << endl;
+//		terminate();
+//		abort();
+		raise(SIGTERM);
+//		throw SystemError(err.str());
+	}
 }
 // ----------------------------------------------------------------------------
 std::string UObject_SK::help()
@@ -521,44 +535,42 @@ void UObject_SK::callback()
 {
 	if( !active )
 		return;
-
 	try
 	{
 
 		// проверка таймеров
 		checkTimers(this);
 
-		if( resetMsgTime > 0 && trResetMsg.hi(ptResetMsg.checkTime()) )
+		if( resetMsgTime>0 && trResetMsg.hi(ptResetMsg.checkTime()) )
 		{
-			//			cout << myname <<  ": ********* reset messages *********" << endl;
+//			cout << myname <<  ": ********* reset messages *********" << endl;
 			resetMsg();
 		}
 
 		// обработка сообщений (таймеров и т.п.)
-		for( unsigned int i = 0; i < 20; i++ )
+		for( unsigned int i=0; i<20; i++ )
 		{
 			if( !receiveMessage(msg) )
 				break;
-
 			processingMessage(&msg);
 			updateOutputs(forceOut);
-			//			updatePreviousValues();
+//			updatePreviousValues();
 		}
 
 		// Выполнение шага программы
 		step();
 
 		// "сердцебиение"
-		if( idHeartBeat != DefaultObjectId && ptHeartBeat.checkTime() )
+		if( idHeartBeat!=DefaultObjectId && ptHeartBeat.checkTime() )
 		{
 			try
 			{
-				ui->setValue(idHeartBeat, maxHeartBeat);
+				ui->setValue(idHeartBeat,maxHeartBeat);
 				ptHeartBeat.reset();
 			}
 			catch( const Exception& ex )
 			{
-				ucrit << myname << "(execute): " << ex << endl;
+				mycrit << myname << "(execute): " << ex << endl;
 			}
 		}
 
@@ -568,16 +580,16 @@ void UObject_SK::callback()
 	}
 	catch( const Exception& ex )
 	{
-		ucrit << myname << "(execute): " << ex << endl;
+        mycrit << myname << "(execute): " << ex << endl;
 	}
 	catch( const CORBA::SystemException& ex )
 	{
-		ucrit << myname << "(execute): СORBA::SystemException: "
+        mycrit << myname << "(execute): СORBA::SystemException: "
                 << ex.NP_minorString() << endl;
 	}
-	catch( const std::exception& ex )
+    catch( const std::exception&ex )
     {
-		ucrit << myname << "(execute): catch " << ex.what()  <<   endl;
+        mycrit << myname << "(execute): catch " << ex.what()  <<   endl;
     }
 
 	if( !active )
@@ -593,7 +605,7 @@ void UObject_SK::setValue( UniSetTypes::ObjectId _sid, long _val )
 		
 	
 
-	ui->setValue(_sid, _val);
+	ui->setValue(_sid,_val);
 }
 // -----------------------------------------------------------------------------
 void UObject_SK::updateOutputs( bool _force )
@@ -615,7 +627,7 @@ void UObject_SK::initFromSM()
 // -----------------------------------------------------------------------------
 void UObject_SK::askSensor( UniSetTypes::ObjectId _sid, UniversalIO::UIOCommand _cmd, UniSetTypes::ObjectId _node )
 {
-	ui->askRemoteSensor(_sid, _cmd, _node, getId());
+	ui->askRemoteSensor(_sid,_cmd,_node,getId());
 }
 // -----------------------------------------------------------------------------
 long UObject_SK::getValue( UniSetTypes::ObjectId _sid )
@@ -628,7 +640,7 @@ long UObject_SK::getValue( UniSetTypes::ObjectId _sid )
 	}
 	catch( const Exception& ex )
 	{
-		ucrit << myname << "(getValue): " << ex << endl;
+        mycrit << myname << "(getValue): " << ex << endl;
 		throw;
 	}
 }
@@ -637,18 +649,16 @@ long UObject_SK::getValue( UniSetTypes::ObjectId _sid )
 void UObject_SK::preAskSensors( UniversalIO::UIOCommand _cmd )
 {
 	PassiveTimer ptAct(activateTimeout);
-
 	while( !activated && !ptAct.checkTime() )
 	{	
 		cout << myname << "(preAskSensors): wait activate..." << endl;
 		msleep(300);
-
 		if( activated )
 			break;
 	}
 			
 	if( !activated )
-		ucrit << myname
+		mycrit << myname
 			<< "(preAskSensors): ************* don`t activated?! ************" << endl;
 
 	for( ;; )
@@ -660,11 +670,11 @@ void UObject_SK::preAskSensors( UniversalIO::UIOCommand _cmd )
 		}
 		catch( const Exception& ex )
 		{
-			ucrit << myname << "(preAskSensors): " << ex << endl;
+            mycrit << myname << "(preAskSensors): " << ex << endl;
 		}
-		catch( const std::exception& ex )
+	    catch( const std::exception&ex )
     	{
-			ucrit << myname << "(execute): catch " << ex.what()  <<   endl;
+		mycrit << myname << "(execute): catch " << ex.what()  <<   endl;
 	    }
 
 		msleep(askPause);