openautomation-svn Mailing List for Open Automation (Page 207)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 141
          http://openautomation.svn.sourceforge.net/openautomation/?rev=141&view=rev
Author:   nilss1
Date:     2010-11-19 21:54:32 +0000 (Fri, 19 Nov 2010)

Log Message:
-----------
added healthcheck , checking Voltage of KNX Devices * individual threads for send, receive and healthcheck

Modified Paths:
--------------
    PyWireGate/trunk/knx_connector/KNX_Connector.py

Modified: PyWireGate/trunk/knx_connector/KNX_Connector.py
===================================================================

--- PyWireGate/trunk/knx_connector/KNX_Connector.py	2010-11-19 21:43:22 UTC (rev 140)
+++ PyWireGate/trunk/knx_connector/KNX_Connector.py	2010-11-19 21:54:32 UTC (rev 141)
@@ -46,7 +46,8 @@
         self.KNXSrc = EIBConnection.EIBAddr()
         self.KNXDst = EIBConnection.EIBAddr()
         
-        #self.sendQueue = Queue.PriorityQueue(maxsize=5000)
+        self.DeviceList = {}
+        
         self.sendQueue = KNXSendQueue(maxsize=5000)
         
 
@@ -69,80 +70,80 @@
         ## set local config
         self.config = self.WG.config[self.instanceName]
         
+        self._readThread = None
+        self._sendThread = None
+        self._checkThread = None
+        
         ## Start the Thread
         self.start()
 
     def run(self):
-        self._sendThread = threading.Thread(target=self._sendloop)
-        self._sendThread.setDaemon(True)
-        self._sendThread.start()
         while self.isrunning:
             ## Create Socket
             try:
-                self.KNX.EIBSocketURL(self.config['url'])
-                self.KNX.EIB_Cache_Enable()
-                if self.config['parser'] == "groupsocket":
-                    self.debug("Using Groupsocket parser")
-                    self.KNX.EIBOpen_GroupSocket_async(0)
-                else:
-                    self.debug("Using Busmonitor Parser")
-                    self.KNX.EIBOpenVBusmonitor_async()
+                ## wait a second for the Busmon to activate
+                if self._sendThread == None:
+                    self._sendThread = threading.Thread(target=self._run)
+                    self._sendThread.setDaemon(True)
+                    self._sendThread.start()
+                if self._readThread == None:
+                    self._readThread = threading.Thread(target=self._sendloop)
+                    self._readThread.setDaemon(True)
+                    self._readThread.start()
+                if self._checkThread == None:
+                    self._checkThread = threading.Thread(target=self._healthCheck)
+                    self._checkThread.setDaemon(True)
+                    self._checkThread.start()
                 
-                ## wait a second for the Busmon to activate
-                self.idle(1)
-                self._run()
-                try:
-                    self.KNX.EIBClose()
-                except:
-                    self.WG.errorlog()
+
+                #self._run()
+                #try:
+                #    self.KNX.EIBClose()
+                #except:
+                #    self.WG.errorlog()
             except:
                 self.WG.errorlog()
             if self.isrunning:
-                self.debug("Socket %r Closed waiting 5 sec" % self.config['url'])
                 self.idle(5)
 
     def _shutdown(self):
-        try:
-            self._sendThread.join()
-        except:
-            pass
-
-    def _run(self):
-        while self.isrunning:
-            ## Check if we are alive and responde until 10 secs
-            self.WG.watchdog(self.instanceName,10)
+        for rthread in [self._checkThread,self._sendThread,self._readThread]:
             try:
-                vbusmonin, vbusmonout, vbusmonerr = select.select([self.KNX.EIB_Poll_FD()],[],[],1)
+                rthread.join()
             except:
-                self.WG.errorlog()
-                break
-            if self.KNX.EIB_Poll_FD() in vbusmonin:
-                iscomplete=0
-                while True:
-                    try:
-                        iscomplete = self.KNX.EIB_Poll_Complete()
-                        ### evtl. fixed das die abgehackten Telegramme
-                        if iscomplete==1:
-                            break
-                    except:
-                        pass
-                if not iscomplete:
-                    ## Eibd closed connection
-                    break
-                if iscomplete==1:
-                    ## capture BusMon packets
-                    if self.config['parser'] == "groupsocket":
-                        self.KNX.EIBGetGroup_Src(self.KNXBuffer,self.KNXSrc,self.KNXDst)
-                        ## Only decode packets larger than 1 octet
-                        if len(self.KNXBuffer.buffer) > 1 :
-                            self.groupsocket.decode(self.KNXBuffer.buffer,self.KNXSrc.data,self.KNXDst.data)
-                    else:
-                        self.KNX.EIBGetBusmonitorPacket(self.KNXBuffer)
-                        ## Only decode packets larger than 7 octets
-                        if len(self.KNXBuffer.buffer) > 7 :
-                            self.busmon.decode(self.KNXBuffer.buffer)
-                
+                pass
 
+    def _run(self):
+        try:
+            self.KNX.EIBSocketURL(self.config['url'])
+            self.KNX.EIB_Cache_Enable()
+            if self.config['parser'] == "groupsocket":
+                self.debug("Using Groupsocket parser")
+                self.KNX.EIBOpen_GroupSocket_async(0)
+            else:
+                self.debug("Using Busmonitor Parser")
+                self.KNX.EIBOpenVBusmonitor()
+
+            while self.isrunning:
+                ## Check if we are alive and responde until 10 secs
+                self.WG.watchdog(self.instanceName,10)
+                if self.config['parser'] == "busmonior":
+                    self.KNX.EIBGetBusmonitorPacket(self.KNXBuffer)
+                    ## Only decode packets larger than 7 octets
+                    if len(self.KNXBuffer.buffer) > 7 :
+                        self.busmon.decode(self.KNXBuffer.buffer)
+                else:
+                    self.KNX.EIBGetGroup_Src(self.KNXBuffer,self.KNXSrc,self.KNXDst)
+                    ## Only decode packets larger than 1 octet
+                    if self.KNXSrc.data not in self.DeviceList:
+                        self.DeviceList[self.KNXSrc.data] = self.groupsocket._decodePhysicalAddr(self.KNXSrc.data)
+                    if len(self.KNXBuffer.buffer) > 1 :
+                        self.groupsocket.decode(self.KNXBuffer.buffer,self.KNXSrc.data,self.KNXDst.data)
+        finally:
+            self._readThread = None
+            self.KNX.EIBClose()
+
+
     def str2grpaddr(self,addrstr):
         grpaddr = self.GrpAddrRegex.findall(addrstr)
         if not grpaddr:
@@ -161,17 +162,22 @@
     def _sendloop(self):
         addr = 0
         msg = []
-        while self.isrunning:
-            try:
-                (addr,msg) = self.sendQueue.get(timeout=1)
-                self.KNX.EIBSendGroup(addr,msg)
-            except Empty:
-                pass
-            except:
-                self.WG.errorlog("Failed send %r %r" % (addr,msg))
+        KNX = EIBConnection.EIBConnection()
+        try:
+            KNX.EIBSocketURL(self.config['url'])
+            while self.isrunning:
+                try:
+                    (addr,msg) = self.sendQueue.get(timeout=1)
+                    KNX.EIBSendGroup(addr,msg)
+                except Empty:
+                    pass
+                except:
+                    self.WG.errorlog("Failed send %r %r" % (addr,msg))
+        finally:
+            self._sendThread = None
+            KNX.EIBClose()
 
 
-
     def send(self,msg,dstaddr,flag=KNXWRITEFLAG):
         try:
             addr = self.str2grpaddr(dstaddr)
@@ -198,7 +204,45 @@
         except:
             print "----------- ERROR IN KNX_CONNECTOR.setValue ----------------"
             
+    def _healthCheck(self):
+        ebuf = EIBConnection.EIBBuffer()
+        KNX = EIBConnection.EIBConnection()
+        self.debug("Starting HealthCheck")
+        try:
+            KNX.EIBSocketURL(self.config['url'])
+            while self.isrunning:
+                self.idle(30)
+                for physaddr, device in self.DeviceList.items():
+                    if not self.isrunning:
+                        break
+                    if physaddr < 4352:
+                        continue
+                    id = "%s:PHY_%s" % (self.instanceName,device)
+                    self.debug("Checking Voltage for %s" % id)
+                    obj = self.WG.DATASTORE.get(id)
+                    if 'ignorecheck' in obj.config:
+                        continue
+                    KNX.EIB_MC_Connect(physaddr)
+                    ## read voltage
+                    ret = KNX.EIB_MC_ReadADC(1,1,ebuf)
+                    try:
+                        if ret > -1:
+                            value = ebuf.data * .15
+                        else:
+                            value = -1
+                        self.WG.DATASTORE.update(id,value)
+                    except:
+                        pass
+                    KNX.EIBReset()
+                    ## wait 500ms between checks
+                    self.idle(.5)
+                ## wait 5 Minutes
+                self.idle(300)
+        finally:
+            self._checkThread = None
+            KNX.EIBClose()
 
+
 class KNXSendQueue(Queue):
     def _init(self, maxsize):
         self.maxsize = maxsize


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




2010	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct (1)	Nov (121)	Dec (58)
2011	Jan (38)	Feb (36)	Mar (7)	Apr (2)	May (32)	Jun (24)	Jul (16)	Aug (21)	Sep (17)	Oct (62)	Nov (60)	Dec (70)
2012	Jan (54)	Feb (41)	Mar (21)	Apr (38)	May (76)	Jun (47)	Jul (25)	Aug (72)	Sep (29)	Oct (64)	Nov (93)	Dec (97)
2013	Jan (100)	Feb (168)	Mar (115)	Apr (59)	May (37)	Jun (32)	Jul (45)	Aug (42)	Sep (24)	Oct (73)	Nov (64)	Dec (4)
2014	Jan (14)	Feb (57)	Mar (58)	Apr (10)	May (18)	Jun (12)	Jul (7)	Aug (12)	Sep (15)	Oct (6)	Nov (32)	Dec (17)
2015	Jan (50)	Feb (5)	Mar (1)	Apr (26)	May (10)	Jun (3)	Jul (3)	Aug (2)	Sep (3)	Oct (18)	Nov (18)	Dec (8)
2016	Jan (33)	Feb (35)	Mar (50)	Apr (20)	May (25)	Jun (17)	Jul (8)	Aug (73)	Sep (64)	Oct (51)	Nov (20)	Dec (14)
2017	Jan (41)	Feb (57)	Mar (44)	Apr (136)	May (32)	Jun (39)	Jul (2)	Aug (12)	Sep (32)	Oct (103)	Nov (12)	Dec (4)
2018	Jan (9)	Feb (1)	Mar (60)	Apr (24)	May (15)	Jun (1)	Jul (2)	Aug (23)	Sep (15)	Oct (57)	Nov (21)	Dec (77)
2019	Jan (62)	Feb (99)	Mar (98)	Apr (49)	May (6)	Jun (3)	Jul (6)	Aug (18)	Sep (9)	Oct (15)	Nov (30)	Dec (6)
2020	Jan (14)	Feb (2)	Mar (22)	Apr (33)	May (47)	Jun (12)	Jul	Aug	Sep (4)	Oct (2)	Nov (5)	Dec (5)
2021	Jan (4)	Feb (101)	Mar (13)	Apr (32)	May (40)	Jun	Jul (3)	Aug	Sep	Oct (25)	Nov (12)	Dec
2022	Jan (154)	Feb (82)	Mar (63)	Apr (27)	May (26)	Jun (5)	Jul (12)	Aug (23)	Sep (17)	Oct (37)	Nov (13)	Dec (21)
2023	Jan (43)	Feb (43)	Mar (15)	Apr (8)	May (3)	Jun (25)	Jul (6)	Aug (38)	Sep (5)	Oct (20)	Nov (9)	Dec (28)
2024	Jan (15)	Feb (2)	Mar (12)	Apr (2)	May (8)	Jun (10)	Jul (10)	Aug (2)	Sep (3)	Oct (15)	Nov (6)	Dec (20)
2025	Jan	Feb (2)	Mar (6)	Apr (2)	May (2)	Jun	Jul	Aug (1)	Sep	Oct	Nov	Dec

openautomation-svn Mailing List for Open Automation (Page 207)

Building automation (like KNX or OpenHAB) software (like CometVisu).

openautomation-svn — Mailinglist that shows all subversion commits