(2.0): - Заменил ТАБУЛЯЦИИ НА ПРОБЕЛЫ по всем исходным файлам - Небольшая…

TODO

@@ -29,3 +29,4 @@ Version 2.0
 - написать документацию по ModbusSlave
 - рефакторинг класса логов (DebugStream)
 - циклическое хранилище для аварийных следов на основе SQLite
+

Utilities/MBTester/MBSlave.cc

@@ -537,3 +537,4 @@ ModbusRTU::mbErrCode MBSlave::read4314( ModbusRTU::MEIMessageRDI& query,
 }
 // -------------------------------------------------------------------------
 
+

Utilities/codegen/Makefile.am

@@ -8,3 +8,4 @@ xsl_DATA 	= *.xsl skel*
 all-local:
 	chmod 'a+x' @PACKAGE@-codegen
 
+                   
\ No newline at end of file

Utilities/codegen/ctl-cpp-common.xsl

@@ -611,6 +611,7 @@ end_private(false)
 	<xsl:if test="normalize-space(@no_check_id)!='1'">
 	if( <xsl:value-of select="normalize-space(@name)"/> == UniSetTypes::DefaultObjectId )
 		throw Exception( myname + ": Not found ID for (<xsl:value-of select="@name"/>) " + conf->getProp(cnode,"<xsl:value-of select="@name"/>") );
+	
 	</xsl:if>
 	
 	if( node_<xsl:value-of select="normalize-space(@name)"/> == UniSetTypes::DefaultObjectId )

Utilities/codegen/uniset-codegen.in

@@ -32,6 +32,8 @@ Valid options are:
   
   --make-skel name  - generate process skeleton (name.src.xml, Name.cc, Name.hh, Makefile.am, main.cc)
                       Additional arguments: --no-main, --no-makefile
+  
+  
 EOF
     [ -n "$1" ] && exit "$1" || exit
 }

conf/idl.mk

@@ -33,3 +33,4 @@ depend:
 	
 
 install:
+	

conf/test.xml

@@ -148,7 +148,7 @@
 			</rrd>
 		</RRDServer1>
 	</settings>
-	<ObjectsMap idfromfile="0">
+	<ObjectsMap idfromfile="1">
 		<!--
 	Краткие пояснения к полям секции 'sensors'
 	==========================================
@@ -273,7 +273,6 @@
 	</messages>
 	<!-- <xi:include href="testID.xml"/> -->
 	<!-- <xi:include href="testIDnon-exist.xml"/> -->
-
 	<Calibrations name="Calibrations">
 		<diagram name="testcal">
 			<point x="-200" y="-60"/>

extensions/DBServer-MySQL/DBInterface.cc

@@ -54,7 +54,6 @@ bool DBInterface::connect( const string& host, const string& user, const string&
         connected = false;
         return false;
     }
-
     connected = true;
     return true;
 }

extensions/DBServer-MySQL/start_fg.sh

@@ -5,3 +5,4 @@ ulimit -Sc 1000000
 uniset-start.sh -f ./uniset-mysql-dbserver --confile test.xml --name DBServer1 \
 --unideb-add-levels info,crit,warn,level9,system \
 --dbserver-buffer-size 100
+

extensions/DBServer-SQLite/Makefile.am

@@ -28,3 +28,4 @@ pkgconfigdir    = $(libdir)/pkgconfig
 pkgconfig_DATA  = libUniSetSQLite.pc
 
 endif
+                                
\ No newline at end of file

extensions/DBServer-SQLite/start_fg.sh

@@ -5,3 +5,4 @@ ulimit -Sc 1000000
 uniset-start.sh -f ./uniset-sqlite-dbserver --confile test.xml --name DBServer1 \
 --unideb-add-levels info,crit,warn,level9,system \
 --dbserver-buffer-size 100
+

extensions/LogicProcessor/TDelay.cc

@@ -30,10 +30,8 @@ void TDelay::setIn( int num, bool state )
     {
         pt.setTiming(0); // reset timer
         myout = false;
-
         if( dlog.is_info() )
             dlog.info() << this << ": set " << myout << endl;    
-
         if( prev != myout )
             Element::setChildOut();
         return;
@@ -46,10 +44,8 @@ void TDelay::setIn( int num, bool state )
     {
         pt.setTiming(0); // reset timer
         myout = true;
-
         if( dlog.is_info() )
             dlog.info() << this << ": set " << myout << endl;    
-
         if( prev != myout )
             Element::setChildOut();
         return;
@@ -60,7 +56,6 @@ void TDelay::setIn( int num, bool state )
     {
         if( dlog.is_info() )
             dlog.info() << this << ": set timer " << delay << " [msec]" << endl;    
-
         pt.setTiming(delay);
     }
 }

extensions/LogicProcessor/TOR.cc

@@ -62,7 +62,6 @@ void TOR::setIn( int num, bool state )
 
     if( dlog.is_info() )
         dlog.info() << this << ": myout " << myout << endl;    
-
     if( prev != myout )
         Element::setChildOut();
 }

extensions/ModbusMaster/MBExchange.cc

@@ -2484,7 +2484,6 @@ bool MBExchange::initDeviceInfo( RTUDeviceMap& m, ModbusRTU::ModbusAddr a, UniXM
  
     if( dlog.is_info() )
         dlog.info() << myname << "(initDeviceInfo): add addr=" << ModbusRTU::addr2str(a) << endl;
-
     int tout = it.getPIntProp("timeout",5000);
     d->second->resp_ptTimeout.setTiming(tout);
     d->second->resp_invert = it.getIntProp("invert");

extensions/ModbusMaster/Makefile.am

@@ -85,3 +85,4 @@ pkgconfig_DATA 	= libUniSetMBTCPMaster.pc libUniSetRTU.pc
 
 all-local:
 	ln -sf ../ModbusMaster/$(devel_include_HEADERS) ../include
+