Merge branches 'eterbook' and 'master' into newRTUExchange

.gitignore

@@ -13,6 +13,8 @@ output.*
 Makefile
 Makefile.in
 semantic.cache
+*_SK.cc
+*_SK.h
 
 COPYING
 stamp-h1

TODO

@@ -21,4 +21,11 @@
 
  IOController_i::SensorInfo   UniSetTypes
 (   ConsumerInfo  ..).   uniset-codegen,
-   SensorInfo  ObjectId.
\ No newline at end of file
+   SensorInfo  ObjectId.
+
+
+RTUExchange
+==============
+ ... 
+  udev   
+

Utilities/Admin/create_links.sh

 #!/bin/sh
-#   
-
-ln -s -f admin.sh start
-ln -s -f admin.sh exist
-ln -s -f admin.sh finish
-ln -s -f admin.sh foldUp
-ln -s -f admin.sh info
-ln -s -f admin.sh alarm
-ln -s -f admin.sh create
-#ln -s -f admin.sh setState
-#ln -s -f admin.sh dbcreate
-#ln -s -f admin.sh statistic
-#ln -s -f admin.sh database
-ln -s -f admin.sh logrotate
-ln -s -f admin.sh omap
-ln -s -f admin.sh msgmap
-ln -s -f admin.sh anotify
-ln -s -f admin.sh dnotify
-ln -s -f admin.sh saveValue
-ln -s -f admin.sh saveState
-ln -s -f admin.sh setValue
-ln -s -f admin.sh setState
-ln -s -f admin.sh getValue
-ln -s -f admin.sh getState
-ln -s -f admin.sh getRawValue
-ln -s -f admin.sh getCalibrate
-ln -s -f admin.sh help
-ln -s -f admin.sh oinfo
 
 ln -s -f /usr/bin/uniset-stop.sh stop.sh
-ln -s -f ../../conf/test.xml test.xml
+#ln -s -f ../../conf/test.xml test.xml
+ln -s -f ./configure.xml test.xml
+

conf/release_helper.sh

@@ -8,9 +8,9 @@ REL=eter
 DEFAULTARCH=i586
 RPMDIR=~/RPM/RPMS/$DEFAULTARCH
 RPMSOURCEDIR=~/RPM/SOURCES
-FTPDIR=/var/ftp/pub/Ourside/RPMS.uniset
+FTPDIR=/var/ftp/pub/Ourside/i586/RPMS.uniset
 PROJECT=uniset
-GEN=/var/ftp/pub/Ourside/genbase.sh
+GEN=/var/ftp/pub/Ourside/i586/genb.sh
 BACKUPDIR=$FTPDIR/backup
 RPMBUILD=/usr/bin/rpmbuild
 
@@ -36,7 +36,7 @@ prepare_tarball()
 	cp -r $WDPROJECT/* $DESTDIR/
 	cd 	$DESTDIR/
 		make distclean
-#		[ -a ./autogen.sh ] && ./autogen.sh
+		[ -a ./autogen.sh ] && ./autogen.sh
 		rm -rf autom4te.cache/
 	
 		echo "Make tarball $TARNAME ... from $DESTDIR"
@@ -78,7 +78,7 @@ function send_notify()
 	CURDATE=`date`
 	MAILTO="devel@server"
 # FIXME:  
-mutt $MAILTO -s "[19910B] New build: $BUILDNAME" <<EOF
+mutt $MAILTO -s "[uniset] New build: $BUILDNAME" <<EOF
   : $BUILDNAME
 -- 
 your $0
@@ -102,11 +102,11 @@ export BUILDNAME=$BASENAME-$VERSION-$RELEASE
 
 add_changelog_helper "- new build" $SPECNAME
 
-prepare_tarball
+prepare_tarball || fatal "Can't prpare"
 
 rpmbb $SPECNAME || fatal "Can't build"
 
-#cp2ftp
+cp2ftp
 
 rpmbs $SPECNAME
 #send_notify

conf/uniset.spec

@@ -2,11 +2,7 @@
 
 Name: uniset
 Version: 0.96
-<<<<<<< HEAD:conf/uniset.spec
-Release: eter6
-=======
-Release: eter9
->>>>>>> 6eb79ccca4b348cddaa393aae9cb34b9fcf2a001:conf/uniset.spec
+Release: eter23
 Summary: UniSet
 License: GPL
 Group: Development/C++
@@ -178,20 +174,50 @@ Libraries needed to develop for uniset extentions
 %_bindir/%name-logicproc
 %_bindir/%name-plogicproc
 %_bindir/mtrconv
+%_bindir/vtconv
 %_bindir/rtustate
 %_bindir/%name-rtuexchange
 %_bindir/%name-smemory
 %_bindir/%name-smviewer
 
 %changelog
-<<<<<<< HEAD:conf/uniset.spec
-* Wed May 20 2009 Pavel Vainerman <pv@altlinux.ru> 0.96-eter5
-=======
+* Thu Jun 04 2009 Pavel Vainerman <pv@aeu> 0.96-eter23
+- new build
+
+* Thu Jun 04 2009 Pavel Vainerman <pv@etersoft.ru> 0.96-eter22
+- new build
+
+* Thu Jun 04 2009 Pavel Vainerman <pv@etersoft.ru> 0.96-eter21
+- new build
+
+* Thu Jun 04 2009 Pavel Vainerman <pv@etersoft.ru> 0.96-eter20
+- new build
+
+* Thu Jun 04 2009 Pavel Vainerman <pv@etersoft.ru> 0.96-eter19
+- new build
+
+* Thu Jun 04 2009 Pavel Vainerman <pv@etersoft.ru> 0.96-eter18
+- new build
+
+* Thu Jun 04 2009 Pavel Vainerman <pv@etersoft.ru> 0.96-eter17
+- new build
+
+* Thu Jun 04 2009 Pavel Vainerman <pv@etersoft.ru> 0.96-eter16
+- new build
+
+* Thu Jun 04 2009 Pavel Vainerman <pv@etersoft.ru> 0.96-eter15
+- new build
+
+* Thu Jun 04 2009 Pavel Vainerman <pv@etersoft.ru> 0.96-eter14
+- new build
+
+* Thu Jun 04 2009 Pavel Vainerman <pv@etersoft.ru> 0.96-eter13
+- new build
+
 * Tue Apr 21 2009 Pavel Vainerman <pv@etersoft.ru> 0.96-eter6
 - new build
 
 * Tue Apr 21 2009 Pavel Vainerman <pv@etersoft.ru> 0.96-eter5
->>>>>>> 6eb79ccca4b348cddaa393aae9cb34b9fcf2a001:conf/uniset.spec
 - new build
 
 * Mon Apr 06 2009 Pavel Vainerman <pv@altlinux.ru> 0.96-eter4

extentions/IOControl/IOControl.cc

@@ -56,7 +56,7 @@ IOControl::IOControl( UniSetTypes::ObjectId id, UniSetTypes::ObjectId icID,
 	UniXML_iterator it(cnode);
 
 	noCards = true;
-	for( unsigned int i=0; i=<cards.size(); i++ )
+	for( unsigned int i=1; i<=cards.size(); i++ )
 	{
 		stringstream s1;
 		s1 << "--iodev" << i;

extentions/RTUExchange/RTUExchange.h

@@ -83,7 +83,7 @@ class RTUExchange:
 				mbval(0),mbreg(0),mbfunc(ModbusRTU::fnUnknown),
 				mtrType(MTR::mtUnknown),
 				rtuJack(RTUStorage::nUnknown),rtuChan(0),
-				dev(0),
+				dev(0),offset(0),
 				q_num(0),q_count(1)
 			{}
 
@@ -101,6 +101,8 @@ class RTUExchange:
 			
 			RTUDevice* dev;
 
+			int offset;
+
 			// optimization
 			int q_num;		/*! number in query */
 			int q_count;	/*! count registers for query */
@@ -117,7 +119,7 @@ class RTUExchange:
 			mbaddr(0),
 			dtype(dtUnknown),
 			resp_id(UniSetTypes::DefaultObjectId),
-			resp_state(false),
+			resp_state(true),
 			resp_invert(false),
 			resp_real(false),
 			rtu(0)
@@ -169,7 +171,7 @@ class RTUExchange:
 
 		void step();
 		void poll();
-		void pollRTU( RTUDevice* dev, RegMap::iterator& it );
+		bool pollRTU( RTUDevice* dev, RegMap::iterator& it );
 		
 		void updateSM();
 		void updateRTU(RegMap::iterator& it);
@@ -193,6 +195,8 @@ class RTUExchange:
 		void initIterators();
 		bool initItem( UniXML_iterator& it );
 		bool readItem( UniXML& xml, UniXML_iterator& it, xmlNode* sec );
+		void initRespondList();
+		void initOffsetList();
 
 
 		RTUDevice* addDev( RTUDeviceMap& dmap, ModbusRTU::ModbusAddr a, UniXML_iterator& it );

extentions/RTUExchange/create_links.sh

 #!/bin/sh
 
 ln -s -f /usr/bin/uniset-stop.sh stop.sh
-ln -s -f ../../conf/test.xml test.xml
+#ln -s -f ../../conf/test.xml test.xml
+ln -s -f ./configure.xml test.xml
+

extentions/RTUExchange/start_fg.sh

 #!/bin/sh
 
-uniset-start.sh -f ./uniset-rtuexchange --rs-name RTUExchange --confile test.xml \
-	--rs-filter-field rs --rs-filter-value wago \
-	--rs-dev /dev/ttyUSB0 \
-	--dlog-add-levels info,crit,warn
+uniset-start.sh -f ./uniset-rtuexchange --confile test.xml \
+	--rs-dev /dev/cbsideA0 \
+	--rs-name RSExchange \
+	--rs-speed 38400 \
+	--rs-filter-field rs \
+	--rs-filter-value 1 \
+	--dlog-add-levels info,crit,warn,level1
 #,level3
 

extentions/SharedMemory/create_links.sh

 #!/bin/sh
 
 ln -s -f /usr/bin/uniset-stop.sh stop.sh
-ln -s -f ../../conf/test.xml test.xml
+#ln -s -f ../../conf/test.xml test.xml
+ln -s -f ./configure.xml test.xml
+

extentions/SharedMemory/start_fg.sh

@@ -2,7 +2,7 @@
 
 ulimit -Sc 1000000000000
 
-uniset-start.sh -f ./uniset-smemory --smemory-id SharedMemory \
+uniset-start.sh -f ./uniset-smemory --smemory-id SharedMemory1 \
 --confile test.xml \
 --unideb-add-levels info,crit,warn,level9,system