add BLINK2, BLINK3 to IOControl (and new release)

conf/libuniset.spec

@@ -175,6 +175,9 @@ rm -f %buildroot%_libdir/*.la
 %exclude %_pkgconfigdir/libUniSet.pc
 
 %changelog
+* Wed Aug 19 2009 Pavel Vainerman <pv@etersoft.ru> 0.96-eter49
+- add BLINK2, BLINK3 to IOControl
+
 * Tue Aug 18 2009 Pavel Vainerman <pv@etersoft.ru> 0.96-eter48
 - fixed bug in PassiveTimer
 

extensions/IOControl/IOControl.h

@@ -114,14 +114,24 @@ class IOControl:
 			friend std::ostream& operator<<(std::ostream& os, IOInfo& inf );
 		};
 
+		struct IOPriority
+		{
+			IOPriority(int p, int i):
+				priority(p),index(i){}
+				
+			int priority;
+			int index;
+		};
+
 		void execute();
 
 	protected:
 
 		void iopoll(); /*!<   / */
-		void blink();
+		void ioread( IOInfo* it );
 		void check_testlamp();
-		
+		void blink();
+	
 		//    
 		virtual void processingMessage( UniSetTypes::VoidMessage* msg );
 		virtual void sysCommand( UniSetTypes::SystemMessage* sm );
@@ -157,7 +167,12 @@ class IOControl:
 
 		typedef std::vector<IOInfo> IOMap;
 		IOMap iomap;			/*!<  / */
+		
+		typedef std::list<IOPriority> PIOMap;
+		PIOMap pmap;	/*!<   / */
+
 		unsigned int maxItem;	/*!<   (   ) */
+		unsigned int maxHalf;
 		int filtersize;
 		float filterT;
 
@@ -168,13 +183,26 @@ class IOControl:
 		UniversalInterface ui;
 		UniSetTypes::ObjectId myid;
 
-		typedef std::list<IOMap::iterator> BlinkList;
+		typedef std::list<IOInfo*> BlinkList;
+
+		void addBlink( IOInfo* it, BlinkList& lst );
+		void delBlink( IOInfo* it, BlinkList& lst );
+		void blink( BlinkList& lst, bool& bstate );
+
+		//  
 		BlinkList lstBlink;
 		PassiveTimer ptBlink;
 		bool blink_state;
 		
-		void addBlink( IOMap::iterator& it );
-		void delBlink( IOMap::iterator& it );
+		//    
+		BlinkList lstBlink2;
+		PassiveTimer ptBlink2;
+		bool blink2_state;
+
+		//    
+		BlinkList lstBlink3;
+		PassiveTimer ptBlink3;
+		bool blink3_state;
 		
 		UniSetTypes::ObjectId testLamp_S;
 		Trigger trTestLamp;

include/UniSetTypes.h

@@ -61,8 +61,8 @@ namespace UniSetTypes
 	{
 		lmpOFF		= 0,	/*!<  */
 		lmpON		= 1,	/*!<  */
-		lmpBLINK	= 2,		/*!<  */
-		lmpBLINK2	= 3,		/*!<  */
+		lmpBLINK	= 2,	/*!<  */
+		lmpBLINK2	= 3,	/*!<  */
 		lmpBLINK3	= 4		/*!<  */
 	};