global make style

Utilities/Admin/admin.cc

@@ -751,10 +751,10 @@ int getChangedTime( const std::string& args, UInterface& ui )
 			{
 				cout << "   name: (" << it.si.id << ") " << it.fname << endl;
 				cout << "   text: " << conf->oind->getTextName(it.si.id) << "\n\n";
-				cout << ui.getChangedTime(it.si.id,it.si.node) << endl;
+				cout << ui.getChangedTime(it.si.id, it.si.node) << endl;
 			}
 			else
-				cout << ui.getChangedTime(it.si.id,it.si.node);
+				cout << ui.getChangedTime(it.si.id, it.si.node);
 		}
 		catch( const Exception& ex )
 		{
@@ -845,14 +845,14 @@ int oinfo( const string& args, UInterface& ui )
 	auto conf = uniset_conf();
 	auto sl = UniSetTypes::getSInfoList( args, conf );
 
-	for( auto&& it : sl )
+	for( auto && it : sl )
 	{
 		if( it.si.node == DefaultObjectId )
 			it.si.node = conf->getLocalNode();
 
 		try
 		{
-			UniSetTypes::ObjectVar o = ui.resolve(it.si.id,it.si.node);
+			UniSetTypes::ObjectVar o = ui.resolve(it.si.id, it.si.node);
 			UniSetObject_i_var obj = UniSetObject_i::_narrow(o);
 
 			if(CORBA::is_nil(obj))

Utilities/ULog/log.cc

@@ -139,7 +139,7 @@ int main( int argc, char** argv )
 					if( arg2 )
 						filter = string(arg2);
 
-					vcmd.push_back( LogReader::Command(LogServerTypes::cmdList,0, filter) );
+					vcmd.push_back( LogReader::Command(LogServerTypes::cmdList, 0, filter) );
 					cmdlist = true;
 				}
 				break;
@@ -239,7 +239,7 @@ int main( int argc, char** argv )
 		lr.setinTimeout(tout);
 		lr.setReconnectDelay(rdelay);
 
-/*		
+		/*
 				if( cmdlist && vcmd.size() == 1 )
 				{
 					cmdonly = 1;
@@ -247,7 +247,7 @@ int main( int argc, char** argv )
 					lr.sendCommand(addr, port, vcmd, cmdonly, verb);
 					return 0;
 				}
-*/		
+		*/
 		if( !vcmd.empty() )
 			lr.sendCommand(addr, port, vcmd, cmdonly, verb);
 

Utilities/ULog/logserver.cc

@@ -139,6 +139,7 @@ int main( int argc, char** argv )
 		auto dlog6 = la3->create("dlog6");
 		la->add(la3);
 #if 0
+
 		for( int i = 0; i < 15; i++ )
 		{
 			ostringstream s;
@@ -151,6 +152,7 @@ int main( int argc, char** argv )
 
 			la->add(l);
 		}
+
 #endif
 
 #if 0

Utilities/codegen/tests/TestGen.cc

@@ -32,10 +32,10 @@ void TestGen::step()
 	ulog()->info() << "ulog: " << str(input2_s) << endl;
 
 	int_var++;
-	bool_var^=true;
+	bool_var ^= true;
 	cout << vmon << endl;
 
-//	cout << vmon.pretty_str() << endl;
+	//	cout << vmon.pretty_str() << endl;
 }
 // -----------------------------------------------------------------------------
 void TestGen::sensorInfo( const SensorMessage* sm )

conf/test.xml

@@ -176,6 +176,7 @@
 			<item id="3101" ip="127.0.0.1" name="LocalhostNode" textname="Локальный узел" unet_ignore="0" unet_port="2048"/>
 		</specnet>
 
+		<GroupAnalogSensors name="TestGroup" ok_c="D106_S"/>
 	</settings>
 	<ObjectsMap idfromfile="1">
 		<!--
@@ -261,6 +262,13 @@
 			<item id="100" iotype="AI" name="AI100_AS" textname="AI100" mbaddr="0x01" mbfunc="0x03" mbreg="100" mbtype="rtu" tcp="6" vtype="F2" precision="1" mbtcp="3"/>
 			<item id="102" iotype="AI" name="AI102_AS" textname="AI101" mbaddr="0x01" mbfunc="0x03" mbreg="102" mbtype="rtu" tcp="6"/>
 			<item id="103" iotype="AI" name="AI103_AS" textname="AI102" mbaddr="0x01" mbfunc="0x03" mbreg="99" mbtype="rtu" tcp="6"/>
+
+			<item id="104" iotype="AI" name="AI104_AS" textname="AI104" ag="2" ag_min="100" ag_max="120"/>
+			<item id="105" iotype="AI" name="AI105_AS" textname="AI105" ag="1" ag_min="0" ag_max="40" ag_status="AI107_AS"/>
+			<item id="106" iotype="DI" name="D106_S" textname="D106"/>
+			<item id="107" iotype="AI" name="AI107_AS" textname="AI107" default="1"/>
+			<item id="108" iotype="AI" name="AI108_AS" textname="AI108" ag="1" ag_min="30" ag_max="40" ag_invert="1"/>
+
 		</sensors>
 		<thresholds name="thresholds">
 			<sensor iotype="AI" name="AI_AS">
@@ -368,6 +376,7 @@
 			<item id="6085" name="MBSlave8"/>
 			<item id="6086" name="MBSlave9"/>
 			<item id="6087" name="MBSlave10"/>
+			<item id="6088" name="TestGroup"/>
 		</objects>
 	</ObjectsMap>
 	<messages idfromfile="1" name="messages">

extensions/ModbusMaster/MBTCPMultiMaster.cc

@@ -497,8 +497,10 @@ UniSetTypes::SimpleInfo* MBTCPMultiMaster::getInfo()
 
 	inf << i->info << endl;
 	inf << "Gates: " << endl;
-	for( const auto& m: mblist )
+
+	for( const auto& m : mblist )
 		inf << "   " << m.getShortInfo() << endl;
+
 	inf << endl;
 
 	i->info = inf.str().c_str();

extensions/ModbusMaster/tests/MBTCPTestServer.cc

@@ -356,7 +356,7 @@ ModbusRTU::mbErrCode MBTCPTestServer::writeOutputRegisters( ModbusRTU::WriteOutp
 
 	if( query.start == 41 )
 	{
-		VTypes::F2 f2(query.data,VTypes::F2::wsize());
+		VTypes::F2 f2(query.data, VTypes::F2::wsize());
 		f2_test_value = (float)f2;
 	}
 

extensions/ModbusMaster/tests/MBTCPTestServer.h

@@ -64,7 +64,10 @@ class MBTCPTestServer
 
 		friend std::ostream& operator<<(std::ostream& os, const MBTCPTestServer* m );
 
-		inline float getF2TestValue(){ return f2_test_value; }
+		inline float getF2TestValue()
+		{
+			return f2_test_value;
+		}
 
 	protected:
 		// действия при завершении работы

extensions/ModbusSlave/MBTCPMultiSlave.cc

@@ -371,8 +371,10 @@ UniSetTypes::SimpleInfo* MBTCPMultiSlave::getInfo()
 
 	inf << i->info << endl;
 	inf << "Clients: " << endl;
-	for( const auto& m: cmap )
+
+	for( const auto& m : cmap )
 		inf << "   " << m.second.getShortInfo() << endl;
+
 	inf << endl;
 
 	i->info = inf.str().c_str();

extensions/ModbusSlave/tests/test_mbslave.cc

@@ -1170,11 +1170,11 @@ TEST_CASE("(0x10): write register outputs or memories [F2](precision)", "[modbus
 	REQUIRE( ui->getValue(tID) == 2004 );
 
 	// read..
-	ui->setValue(tID,203);
+	ui->setValue(tID, 203);
 
 	ModbusRTU::ReadOutputRetMessage ret2 = mb->read03(slaveaddr, tREG, 2);
 
-	F2 r_f2(ret2.data,F2::wsize());
+	F2 r_f2(ret2.data, F2::wsize());
 
 	REQUIRE( (float)r_f2 == 20.3f );
 }

extensions/UNetUDP/UNetExchange.cc

@@ -904,13 +904,15 @@ UniSetTypes::SimpleInfo* UNetExchange::getInfo()
 	inf << "LogServer:  " << logserv_host << ":" << logserv_port << endl;
 	inf << endl;
 	inf << "Receivers: " << endl;
-	for( const auto& r: recvlist )
+
+	for( const auto& r : recvlist )
 	{
 		inf << "[ " << endl;
 		inf << "  chan1: " << ( r.r1 ? r.r1->getShortInfo() : "disable" ) << endl;
 		inf << "  chan2: " << ( r.r2 ? r.r2->getShortInfo() : "disable" ) << endl;
 		inf << "]" << endl;
 	}
+
 	inf << endl;
 
 	inf << "Senders: " << endl;

extensions/include/UObject_SK.h

@@ -31,7 +31,7 @@ class UObject_SK:
 	public LT_Object
 {
 	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();
 
@@ -45,54 +45,60 @@ 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
 
 		// Вспомогательные функции для удобства логирования
 		// ------------------------------------------------------------
@@ -109,16 +115,19 @@ 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());
+		}
 		// ------------------------------------------------------------
 
 
@@ -146,13 +155,16 @@ 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();
@@ -171,7 +183,7 @@ class UObject_SK:
 		int resetMsgTime;
 
 		// Выполнение очередного шага программы
-		virtual void step(){}
+		virtual void step() {}
 
 		int sleep_msec; /*!< пауза между итерациями */
 		bool active;
@@ -186,9 +198,15 @@ 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);
+		}
 
 		int smReadyTimeout; 	/*!< время ожидания готовности SM */
 		std::atomic_bool activated;

extensions/lib/UObject_SK.cc

@@ -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!!!") );
+	throw Exception( string(myname + ": init failed!!!") );
 }
 // -----------------------------------------------------------------------------
 // ( val, confval, default val )
@@ -59,6 +59,7 @@ static const std::string init3_str( const std::string& s1, const std::string& s2
 {
 	if( !s1.empty() )
 		return s1;
+
 	if( !s2.empty() )
 		return s2;
 
@@ -66,34 +67,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),
-argprefix( (_argprefix.empty() ? myname+"-" : _argprefix) ),
-// Инициализация идентификаторов (имена берутся из конф. файла)
+	UniSetObject(id),
+	argprefix( (_argprefix.empty() ? myname + "-" : _argprefix) ),
+	// Инициализация идентификаторов (имена берутся из конф. файла)
 
-// Используемые идентификаторы сообщений (имена берутся из конф. файла)
+	// Используемые идентификаторы сообщений (имена берутся из конф. файла)
 
-// variables
+	// variables
 
-sleep_msec(150),
-active(true),
+	sleep_msec(150),
+	active(true),
 
-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();
 	}
 
 
@@ -109,10 +110,10 @@ end_private(false)
 	{
 		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());
 
@@ -130,12 +131,14 @@ end_private(false)
 		logserv_port = conf->getArgPInt("--" + argprefix + "logserver-port", it.getProp("logserverPort"), getId());
 	}
 
-	forceOut = conf->getArgPInt("--" + argprefix + "force-out",it.getProp("forceOut"),false);
+	forceOut = conf->getArgPInt("--" + argprefix + "force-out", it.getProp("forceOut"), false);
+
+	string heart = conf->getArgParam("--" + argprefix + "heartbeat-id", it.getProp("heartbeat_id"));
 
-	string heart = conf->getArgParam("--" + argprefix + "heartbeat-id",it.getProp("heartbeat_id"));
 	if( !heart.empty() )
 	{
 		idHeartBeat = conf->getSensorID(heart);
+
 		if( idHeartBeat == DefaultObjectId )
 		{
 			ostringstream err;
@@ -143,34 +146,37 @@ end_private(false)
 			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);
 	}
 
 	// Инициализация значений
 
 
-	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);
 
-	smReadyTimeout = conf->getArgInt("--" + argprefix + "sm-ready-timeout","");
+	smReadyTimeout = conf->getArgInt("--" + argprefix + "sm-ready-timeout", "");
+
 	if( smReadyTimeout == 0 )
 		smReadyTimeout = 60000;
 	else if( smReadyTimeout < 0 )
 		smReadyTimeout = UniSetTimer::WaitUpTime;
 
-	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"), ""));
 
 
 	activateTimeout	= conf->getArgPInt("--" + argprefix + "activate-timeout", 20000);
@@ -236,7 +242,7 @@ bool UObject_SK::setMsg( UniSetTypes::ObjectId _code, bool _state )
 // -----------------------------------------------------------------------------
 void UObject_SK::resetMsg()
 {
-// reset messages
+	// reset messages
 
 }
 // -----------------------------------------------------------------------------
@@ -315,11 +321,13 @@ void UObject_SK::preSysCommand( const SystemMessage* _sm )
 	{
 		case SystemMessage::WatchDog:
 			uinfo << myname << "(preSysCommand): WatchDog" << endl;
+
 			if( !active || !ptStartUpTimeout.checkTime() )
 			{
 				uwarn << myname << "(preSysCommand): игнорируем WatchDog, потому-что только-что стартанули" << endl;
 				break;
 			}
+
 		case SystemMessage::StartUp:
 		{
 			if( !logserv_host.empty() && logserv_port != 0 && !logserv->isRunning() )
@@ -351,9 +359,10 @@ 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;
 			}
 		}
@@ -423,7 +432,7 @@ void UObject_SK::waitSM( int wait_msec, ObjectId _testID )
 		  << wait_msec << " msec"
 		  << " testID=" << _testID << endl;
 
-	if( !ui->waitReady(_testID,wait_msec) )
+	if( !ui->waitReady(_testID, wait_msec) )
 	{
 		ostringstream err;
 		err << myname
@@ -431,11 +440,11 @@ void UObject_SK::waitSM( int wait_msec, ObjectId _testID )
 			<< wait_msec << " мсек";
 
 		ucrit << err.str() << endl;
-//		terminate();
-//		abort();
+		//		terminate();
+		//		abort();
 		raise(SIGTERM);
 		terminate();
-//		throw SystemError(err.str());
+		//		throw SystemError(err.str());
 	}
 
 
@@ -447,37 +456,39 @@ 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 )
@@ -499,7 +510,7 @@ void UObject_SK::callback()
 		ucrit << 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;
 	}
@@ -514,7 +525,7 @@ void UObject_SK::setValue( UniSetTypes::ObjectId _sid, long _val )
 {
 
 
-	ui->setValue(_sid,_val);
+	ui->setValue(_sid, _val);
 }
 // -----------------------------------------------------------------------------
 void UObject_SK::updateOutputs( bool _force )
@@ -531,7 +542,7 @@ void UObject_SK::preSensorInfo( const UniSetTypes::SensorMessage* _sm )
 // -----------------------------------------------------------------------------
 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 )
@@ -553,10 +564,12 @@ 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;
 	}
@@ -576,7 +589,7 @@ void UObject_SK::preAskSensors( UniversalIO::UIOCommand _cmd )
 		{
 			ucrit << myname << "(preAskSensors): " << ex << endl;
 		}
-	    catch( const std::exception&ex )
+		catch( const std::exception& ex )
 		{
 			ucrit << myname << "(execute): catch " << ex.what()  <<   endl;
 		}

extensions/tests/SMemoryTest/smemory-test.cc

@@ -40,7 +40,7 @@ int main(int argc, const char** argv)
 
 			cout << "..create " << s.str() << endl;
 			auto tp = make_shared<TestProc>( conf->getObjectID(s.str()));
-//			tp->init_dlog(dlog());
+			//			tp->init_dlog(dlog());
 			act->add(tp);
 		}
 

include/VMonitor.h

@@ -110,7 +110,7 @@
 class VMonitor
 {
 	public:
-		VMonitor(){}
+		VMonitor() {}
 
 		friend std::ostream& operator<<(std::ostream& os, VMonitor& m );
 
@@ -125,13 +125,19 @@ class VMonitor
 		VMON_DEF_FUNC(bool);
 		VMON_DEF_FUNC(float);
 		VMON_DEF_FUNC(double);
-//		VMON_DEF_FUNC(UniSetTypes::ObjectId); // <--- long
+		//		VMON_DEF_FUNC(UniSetTypes::ObjectId); // <--- long
 
 		void add( const std::string& name, const std::string& v );
 		const std::string pretty_str( const std::string& name, const std::string* v );
 
-		inline int getNameWidth(){ return nameWidth; }
-		inline void setNameWidth( int w ){ nameWidth = w; }
+		inline int getNameWidth()
+		{
+			return nameWidth;
+		}
+		inline void setNameWidth( int w )
+		{
+			nameWidth = w;
+		}
 
 	protected:
 
@@ -145,7 +151,7 @@ class VMonitor
 		VMON_DEF_MAP(float);
 		VMON_DEF_MAP(double);
 		// VMON_DEF_MAP3(UniSetTypes::ObjectId,ObjectId); // <-- long
-		VMON_DEF_MAP3(std::string,string);
+		VMON_DEF_MAP3(std::string, string);
 
 		int nameWidth = { 30 };
 };

include/modbus/ModbusTCPMaster.h

@@ -38,8 +38,14 @@ class ModbusTCPMaster:
 			cleanInputStream();
 		}
 
-		inline std::string getAddress(){ return iaddr; }
-		inline int getPort(){ return port; }
+		inline std::string getAddress()
+		{
+			return iaddr;
+		}
+		inline int getPort()
+		{
+			return port;
+		}
 
 	protected:
 

src/Log/LogAgregator.cc

@@ -55,7 +55,7 @@ std::shared_ptr<DebugStream> LogAgregator::create( const std::string& logname )
 	auto l = std::make_shared<DebugStream>();
 	l->setLogName(logname);
 	auto conn = l->signal_stream_event().connect( sigc::mem_fun(this, &LogAgregator::logOnEvent) );
-	conmap.emplace(l,conn);
+	conmap.emplace(l, conn);
 	lmap[logname] = l;
 	return l;
 }
@@ -83,13 +83,15 @@ void LogAgregator::addLogAgregator( std::shared_ptr<LogAgregator> la, const std:
 		return;
 
 	auto lst = la->getLogList();
-	for( auto&& l: lst )
+
+	for( auto && l : lst )
 	{
 		auto c = conmap.find(l.log);
+
 		if( c == conmap.end() )
 		{
 			auto conn = l.log->signal_stream_event().connect( sigc::mem_fun(this, &LogAgregator::logOnEvent) );
-			conmap.emplace(l.log,conn);
+			conmap.emplace(l.log, conn);
 		}
 	}
 
@@ -106,10 +108,11 @@ void LogAgregator::addLog( std::shared_ptr<DebugStream> l, const std::string& ln
 	if( connect )
 	{
 		auto c = conmap.find(l);
+
 		if( c == conmap.end() )
 		{
 			auto conn = l->signal_stream_event().connect( sigc::mem_fun(this, &LogAgregator::logOnEvent) );
-			conmap.emplace(l,conn);
+			conmap.emplace(l, conn);
 		}
 	}
 
@@ -157,7 +160,7 @@ std::ostream& LogAgregator::printLogList( std::ostream& os, const std::string& r
 	else
 		lst = getLogList(regexp_str);
 
-	return printLogList(os,lst);
+	return printLogList(os, lst);
 }
 // -------------------------------------------------------------------------
 std::ostream& LogAgregator::printLogList( std::ostream& os, std::list<iLog>& lst )
@@ -233,13 +236,14 @@ std::vector<std::string> LogAgregator::splitFirst( const std::string& lname, con
 // -------------------------------------------------------------------------
 bool LogAgregator::logExist( std::shared_ptr<DebugStream>& log )
 {
-	for( const auto& l: lmap )
+	for( const auto& l : lmap )
 	{
 		if( l.second == log )
 			return true;
 
 		bool res = false;
 		auto ag = dynamic_pointer_cast<LogAgregator>(l.second);
+
 		if( ag )
 			res = ag->logExist(log);
 

src/Log/LogReader.cc

@@ -180,7 +180,7 @@ void LogReader::sendCommand( const std::string& _addr, ost::tpport_t _port, std:
 				if( c.cmd == LogServerTypes::cmdList )
 				{
 					listfilter = c.logfilter;
-					n=0;
+					n = 0;
 					continue;
 				}
 
@@ -218,6 +218,7 @@ void LogReader::sendCommand( const std::string& _addr, ost::tpport_t _port, std:
 		while( a > 0 && tcp->isPending(ost::Socket::pendingInput, reply_timeout) )
 		{
 			int n = tcp->peek( buf, sizeof(buf) - 1 );
+
 			if( n > 0 )
 			{
 				tcp->read(buf, n);
@@ -280,7 +281,7 @@ void LogReader::readlogs( const std::string& _addr, ost::tpport_t _port, LogServ
 			{
 				rlog.warn() << "(LogReader): **** connection timeout.." << endl;
 
-				if( rcount>0 && readcount > 0 )
+				if( rcount > 0 && readcount > 0 )
 					rcount--;
 
 				if( rcount == 0 )
@@ -299,6 +300,7 @@ void LogReader::readlogs( const std::string& _addr, ost::tpport_t _port, LogServ
 			while( tcp->isPending(ost::Socket::pendingInput, inTimeout) )
 			{
 				int n = tcp->peek( buf, sizeof(buf) - 1 );
+
 				if( n > 0 )
 				{
 					tcp->read(buf, n);
@@ -307,18 +309,19 @@ void LogReader::readlogs( const std::string& _addr, ost::tpport_t _port, LogServ
 					log << buf;
 				}
 
-				if( rcount>0 && readcount > 0 )
+				if( rcount > 0 && readcount > 0 )
 					rcount--;
 
-				if( readcount>0 && rcount==0 )
+				if( readcount > 0 && rcount == 0 )
 					break;
 			}
 
-			if( rcount>0 && readcount > 0 )
+			if( rcount > 0 && readcount > 0 )
 				rcount--;
 
 			if( rcount != 0 )
 				rlog.warn() << "(LogReader): ...connection timeout..." << endl;
+
 			disconnect();
 		}
 		catch( const ost::SockException& e )
@@ -330,7 +333,7 @@ void LogReader::readlogs( const std::string& _addr, ost::tpport_t _port, LogServ
 			cerr << "(LogReader): " << ex.what() << endl;
 		}
 
-		if( rcount==0 && readcount > 0 )
+		if( rcount == 0 && readcount > 0 )
 			break;
 	}
 

src/ObjectRepository/UniSetTypes.cc

@@ -119,14 +119,14 @@ long UniSetTypes::setoutregion(long ret, long calMin, long calMax)
 UniSetTypes::IDList::IDList( std::vector<std::string>&& svec ):
 	UniSetTypes::IDList::IDList()
 {
-	for( const auto& s: svec )
+	for( const auto& s : svec )
 		add( uni_atoi(s) );
 }
 // ------------------------------------------------------------------
 UniSetTypes::IDList::IDList( std::vector<std::string>& svec ):
 	UniSetTypes::IDList::IDList()
 {
-	for( const auto& s: svec )
+	for( const auto& s : svec )
 		add( uni_atoi(s) );
 }
 // -------------------------------------------------------------------------
@@ -209,7 +209,7 @@ bool UniSetTypes::file_exist( const std::string& filename )
 // -------------------------------------------------------------------------
 UniSetTypes::IDList UniSetTypes::explode( const string& str, char sep )
 {
-	UniSetTypes::IDList l( explode_str(str,sep) );
+	UniSetTypes::IDList l( explode_str(str, sep) );
 	return std::move(l);
 }
 // -------------------------------------------------------------------------
@@ -230,9 +230,11 @@ std::vector<std::string> UniSetTypes::explode_str( const string& str, char sep )
 
 		if( pos == string::npos )
 		{
-			string s(str.substr(prev, sz-prev));
+			string s(str.substr(prev, sz - prev));
+
 			if( !s.empty() )
 				v.emplace_back(s);
+
 			break;
 		}
 

src/Processes/IONotifyController.cc

@@ -160,6 +160,7 @@ void IONotifyController::askSensor(const UniSetTypes::ObjectId sid,
 	if( cmd == UniversalIO::UIONotify || (cmd == UIONotifyFirstNotNull && li->second->value) )
 	{
 		SensorMessage  smsg(li->second->makeSensorMessage());
+
 		try
 		{
 			ui->send(ci.id, std::move(smsg.transport_msg()), ci.node);

src/Various/VMonitor.cc

@@ -5,97 +5,97 @@
 #include "VMonitor.h"
 // --------------------------------------------------------------------------
 #define VMON_IMPL_ADD(T) void VMonitor::add( const std::string& name, const T& v ) \
-{\
+	{\
 		m_##T.emplace(&v,name); \
-} \
-\
-const std::string VMonitor::pretty_str( const std::string& name, const T* v ) \
-{ \
+	} \
+	\
+	const std::string VMonitor::pretty_str( const std::string& name, const T* v ) \
+	{ \
 		std::ostringstream s; \
 		s << std::right << std::setw(nameWidth) << name << std::left << " = " << std::right << std::setw(6) << *(v); \
 		return std::move(s.str()); \
-}
+	}
 // --------------------------------------------------------------------------
 #define VMON_IMPL_ADD2(T) \
-void VMonitor::add( const std::string& name, const T& v ) \
-{\
+	void VMonitor::add( const std::string& name, const T& v ) \
+	{\
 		m_##T.emplace(&v,name); \
-} \
-void VMonitor::add( const std::string& name, const unsigned T& v ) \
-{\
+	} \
+	void VMonitor::add( const std::string& name, const unsigned T& v ) \
+	{\
 		m_unsigned_##T.emplace(&v,name); \
-} \
-const std::string VMonitor::pretty_str( const std::string& name, const T* v ) \
-{ \
+	} \
+	const std::string VMonitor::pretty_str( const std::string& name, const T* v ) \
+	{ \
 		std::ostringstream s; \
 		s << std::right << std::setw(nameWidth) << name << std::left << " = " << std::right << std::setw(6) << *(v); \
 		return std::move(s.str()); \
-} \
-const std::string VMonitor::pretty_str( const std::string& name, const unsigned T* v ) \
-{ \
+	} \
+	const std::string VMonitor::pretty_str( const std::string& name, const unsigned T* v ) \
+	{ \
 		std::ostringstream s; \
 		s << std::right << std::setw(nameWidth) << name << std::left << " = " << std::right << std::setw(6) << *(v); \
 		return std::move(s.str()); \
-}
+	}
 // --------------------------------------------------------------------------
 #define VMON_IMPL_ADD3(T,M) void VMonitor::add( const std::string& name, const T& v ) \
-{\
+	{\
 		m_##M.emplace(&v,name); \
-} \
-const std::string VMonitor::pretty_str( const std::string& name, const T* v ) \
-{ \
+	} \
+	const std::string VMonitor::pretty_str( const std::string& name, const T* v ) \
+	{ \
 		std::ostringstream s; \
 		s << std::right << std::setw(nameWidth) << name << std::left << " = " << std::right << std::setw(6) << *(v); \
 		return std::move(s.str()); \
-}
+	}
 // --------------------------------------------------------------------------
 #define VMON_IMPL_PRN(M,T) \
-{\
+	{\
 		for( const auto& e: M.m_##T ) \
 			os << e.second << "=" << *(e.first) << std::endl;\
-}
+	}
 // --------------------------------------------------------------------------
 #define VMON_IMPL_PRN2(M,T) \
-{\
+	{\
 		for( const auto& e: M.m_##T ) \
 			os << e.second << "=" << *(e.first) << std::endl;\
-\
+		\
 		for( const auto& e: M.m_unsigned_##T ) \
 			os << e.second << "=" << *(e.first) << std::endl;\
-}
+	}
 // --------------------------------------------------------------------------
 #define VMON_IMPL_PRN_CHAR(M) \
-{\
+	{\
 		for( const auto& e: M.m_char ) \
 			os << e.second << "=" << (int)(*(e.first)) << std::endl;\
-\
+		\
 		for( const auto& e: M.m_unsigned_char) \
 			os << e.second << "=" << (int)(*(e.first)) << std::endl;\
-}
+	}
 // --------------------------------------------------------------------------
 #define VMON_IMPL_PRET(T) \
-{\
+	{\
 		for( const auto& e: m_##T ) \
 			os << pretty_str(e.second,e.first) << std::endl;\
-}
+	}
 // --------------------------------------------------------------------------
 #define VMON_IMPL_PRET2(T) \
-{\
+	{\
 		for( const auto& e: m_##T ) \
 			os << pretty_str(e.second,e.first) << std::endl;\
-\
+		\
 		for( const auto& e: m_unsigned_##T ) \
 			os << pretty_str(e.second,e.first) << std::endl;\
-}
+	}
 // --------------------------------------------------------------------------
 #define VMON_IMPL_PRET_CHAR \
-{\
+	{\
 		for( const auto& e: m_char ) \
 			os << std::right << std::setw(nameWidth) << e.second << std::left << " = " << std::right << std::setw(6) << (int)(*(e.first)) << std::endl;\
-\
+		\
 		for( const auto& e: m_unsigned_char ) \
 			os << std::right << std::setw(nameWidth) << e.second << std::left << " = " << std::right << std::setw(6) << (int)(*(e.first)) << std::endl;\
-}
+	}
 // --------------------------------------------------------------------------
 VMON_IMPL_ADD2(int)
 VMON_IMPL_ADD2(long)
@@ -104,20 +104,20 @@ VMON_IMPL_ADD2(char)
 VMON_IMPL_ADD(bool)
 VMON_IMPL_ADD(float)
 VMON_IMPL_ADD(double)
-VMON_IMPL_ADD3(std::string,string)
+VMON_IMPL_ADD3(std::string, string)
 //VMON_IMPL_ADD3(UniSetTypes::ObjectId,ObjectId)
 // --------------------------------------------------------------------------
 std::ostream& operator<<(std::ostream& os, VMonitor& m )
 {
-	VMON_IMPL_PRN2(m,int);
-	VMON_IMPL_PRN2(m,long);
-	VMON_IMPL_PRN2(m,short);
+	VMON_IMPL_PRN2(m, int);
+	VMON_IMPL_PRN2(m, long);
+	VMON_IMPL_PRN2(m, short);
 	VMON_IMPL_PRN_CHAR(m);
-	VMON_IMPL_PRN(m,bool);
-	VMON_IMPL_PRN(m,float);
-	VMON_IMPL_PRN(m,double);
-	VMON_IMPL_PRN(m,string);
-//	VMON_IMPL_PRN(m,ObjectId);
+	VMON_IMPL_PRN(m, bool);
+	VMON_IMPL_PRN(m, float);
+	VMON_IMPL_PRN(m, double);
+	VMON_IMPL_PRN(m, string);
+	//	VMON_IMPL_PRN(m,ObjectId);
 
 	return os;
 }
@@ -141,7 +141,7 @@ std::string VMonitor::pretty_str()
 	VMON_IMPL_PRET(float);
 	VMON_IMPL_PRET(double);
 	VMON_IMPL_PRET(string);
-//	VMON_IMPL_PRET(ObjectId);
+	//	VMON_IMPL_PRET(ObjectId);
 
 	return std::move(os.str());
 }

tests/develop.cc

@@ -11,7 +11,7 @@ class VMon
 {
 	public:
 
-		std::tuple<std::unordered_map<const Args*,const std::string>...> m_tuple;
+		std::tuple<std::unordered_map<const Args*, const std::string>...> m_tuple;
 };
 
 // ------------------------------------------------------------------------------
@@ -19,9 +19,9 @@ using namespace std;
 
 int main( int argc, const char** argv )
 {
-//	VMon<int,double,char> vmon;
+	//	VMon<int,double,char> vmon;
 
-//	cout << std::get<0>(vmon.m_tuple).size() << endl;
+	//	cout << std::get<0>(vmon.m_tuple).size() << endl;
 
 	return 0;
 }

tests/test_logserver.cc

@@ -169,6 +169,7 @@ TEST_CASE("LogServer", "[LogServer]" )
 
 	g_read_cancel = true;
 	msleep(readTimeout);
+
 	if( r_thr->joinable() )
 		r_thr->join();
 }

tests/test_utypes.cc

@@ -78,29 +78,29 @@ TEST_CASE("UniSetTypes: explode", "[utypes][explode]" )
 {
 	const std::string str1("id1/wed/wedwed/");
 
-	auto t1 = UniSetTypes::explode_str(str1,'/');
+	auto t1 = UniSetTypes::explode_str(str1, '/');
 	CHECK( t1.size() == 3 );
 
-	auto t2 = UniSetTypes::explode_str(str1,'.');
+	auto t2 = UniSetTypes::explode_str(str1, '.');
 	CHECK( t2.size() == 1 );
 
 	const std::string str2("id1/wed/wedwed/f");
 
-	auto t3 = UniSetTypes::explode_str(str2,'/');
+	auto t3 = UniSetTypes::explode_str(str2, '/');
 	CHECK( t3.size() == 4 );
 
 	const std::string str3("/id1/wed/wedwed/");
 
-	auto t4 = UniSetTypes::explode_str(str3,'/');
+	auto t4 = UniSetTypes::explode_str(str3, '/');
 	CHECK( t4.size() == 3 );
 
 
 	const std::string str4("");
-	auto t5 = UniSetTypes::explode_str(str4,'/');
+	auto t5 = UniSetTypes::explode_str(str4, '/');
 	CHECK( t5.size() == 0 );
 
 	const std::string str5("/");
-	auto t6 = UniSetTypes::explode_str(str5,'/');
+	auto t6 = UniSetTypes::explode_str(str5, '/');
 	CHECK( t6.size() == 0 );
 }
 // -----------------------------------------------------------------------------