openautomation-svn

[Openautomation-svn] SF.net SVN: openautomation:[74] PyWireGate/trunk/knx_connector/DPT_Types.py

[<ni...@us...>]

Revision: 74
          http://openautomation.svn.sourceforge.net/openautomation/?rev=74&view=rev
Author:   nilss1
Date:     2010-11-04 20:06:44 +0000 (Thu, 04 Nov 2010)

Log Message:
-----------
added time and date and changed dpt16 to unicode

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

Modified: PyWireGate/trunk/knx_connector/DPT_Types.py
===================================================================
--- PyWireGate/trunk/knx_connector/DPT_Types.py	2010-11-04 20:05:11 UTC (rev 73)
+++ PyWireGate/trunk/knx_connector/DPT_Types.py	2010-11-04 20:06:44 UTC (rev 74)
@@ -269,6 +269,8 @@
         ## M Minutes
         ## S Seconds
         weekday = (raw[0] & 0xe0) >> 5
+        
+        ## Fixme: I18N
         weekdays = ["","Mo","Di","Mi","Do","Fr","Sa","So"]
         hour = raw[0] & 0x1f
         min = raw[1] & 0x3f
@@ -278,8 +280,43 @@
         return "%s %d:%d:%d" % (weekdays[weekday], hour,min,sec)
 
     def encodeDPT10(self,val):
-        pass
-    
+        ## checktype default unix timestamp
+        ## except standard timestring 20:15 or 20:15:34 or Mo 20:14:55
+        weekday = 0
+        hour = 0
+        min = 0 
+        sec = 0
+        if type(val) == str:
+            ## check for weekday
+            if val[0].isalpha():
+                ## extract Weekday
+                day,val = val.split(" ",1)
+                ## Fixme: I18N
+                day = day.lower()
+                weekdays = ["","mo","di","mi","do","fr","sa","so"]
+                if weekday in weekdays:
+                    weekday = weekdays.index(day)
+
+            timeval = val.split(":")
+            if len(timeval) == 2:
+                hour = int(timeval[0])
+                min = int(timeval[1])
+            if len(timeval) == 3:
+                sec = int(timeval[2])
+        elif type(val) in [float, int]:
+            now = time.localtime(val)
+            weekday = now[6]
+            hour = now[3]
+            min = now[4]
+            sec = now[5]
+
+        else:
+            ## can't convert
+            return False
+        
+        weekday = weekday << 5
+        return [weekday | hour , min, sec]
+                
     def decodeDPT11(self,raw):
         ## 3 byte Date
         ## RRRDDDDD RRRRMMMM RYYYYYYY
@@ -297,7 +334,36 @@
         return "%02d.%02d.%04d" % (day,mon,year)
 
     def encodeDPT11(self,val):
-        pass
+        if type(val) in [float, int]:
+            tval = val
+        else:
+            tval =0
+        ## make time struct accesible
+        utime = [v for v in time.localtime(tval)]
+        if type(val) == str:
+            datestr = val.split(".")
+            if len(datestr) == 2:
+                # day
+                utime[2] = val[0]
+                # month
+                utime[1] = val[1]
+                ##year
+                if val[2]<90:
+                    utime[2] = 2000 + val[2]
+                elif val[2]<100:
+                    utime = 1900 + val[2]
+                else:
+                    utime = val[2]
+                
+        day = utime[2]
+        mon = utime[1] 
+        year = utime[2]
+        if year < 2000:
+            year -= 1900
+        else:
+            year -= 2000
+            
+        return [ day & 0x1f, mon & 0xf, year & 0x7f ]
 
     def decodeDPT12(self,raw):
         return int(self.toBigInt(raw)) % 0xffffffff
@@ -337,7 +403,9 @@
             if char == 0:
                 break
             res += chr(char)
-        return res
+        
+        ## Decode ISO 2 Unicode
+        return res.decode("iso-8859-15")
 
     def encodeDPT16(self,val):
         pass


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

[Openautomation-svn] SF.net SVN: openautomation:[76] PyWireGate/trunk/knx_connector/DPT_Types.py

[<ni...@us...>]

Revision: 76
          http://openautomation.svn.sourceforge.net/openautomation/?rev=76&view=rev
Author:   nilss1
Date:     2010-11-04 21:39:18 +0000 (Thu, 04 Nov 2010)

Log Message:
-----------
completed DPT encode

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

Modified: PyWireGate/trunk/knx_connector/DPT_Types.py
===================================================================
--- PyWireGate/trunk/knx_connector/DPT_Types.py	2010-11-04 20:51:46 UTC (rev 75)
+++ PyWireGate/trunk/knx_connector/DPT_Types.py	2010-11-04 21:39:18 UTC (rev 76)
@@ -124,7 +124,8 @@
             return msg
 
     def errormsg(self,msg=False):
-        self.WG.errorlog(msg)
+        if self.WG:
+            self.WG.errorlog(msg)
 
     def debug(self,msg):
         self.log(msg,'debug')
@@ -132,7 +133,8 @@
     def log(self,msg,severity='info',instance=False):
         if not instance:
             instance = "dpt-types"
-        self.WG.log(msg,severity,instance)
+        if self.WG:
+            self.WG.log(msg,severity,instance)
 
     def toByteArray(self,val,length):
         ## Set ByteArray
@@ -160,7 +162,7 @@
         return int(raw[0]) & 0x1
 
     def encodeDPT1(self,val):
-        pass
+        return int(val) & 0x1
 
     def decodeDPT2(self,raw):
         ## 2 Bit Control
@@ -171,7 +173,7 @@
         return int(raw[0]) & 0x3
 
     def encodeDPT2(self,val):
-        pass
+        return int(val) & 0x3
 
     def decodeDPT3(self,raw):
         ## 4 bit Dim (DPT 3.007)
@@ -183,29 +185,35 @@
         return int(raw[0]) & 0xf
 
     def encodeDPT3(self,val):
-        pass
+        return int(val) & 0xf
         
     def decodeDPT4(self,raw):
-        ## 1 Byte Character
-        return chr(raw[0] & 0xff)
+        ## 1 Byte Character 
+        ## ISO 2 Unicode
+        return chr(raw[0] & 0xff).decode('iso-8859-15')
     
     def encodeDPT4(self,val):
-        pass
+        if type(val) == unicode:
+            ## convert to str
+            val = val.encode('iso-8859-15')
+        if type(val) <> str:
+            val = "%r" % val
+        return ord(val[0]) & 0xff
     
     def decodeDPT5(self,raw):
         ## 1 Byte unsigned
-        return (int(raw[0] & 0xff))
+        return int(raw[0]) & 0xff
 
     def encodeDPT5(self,val):
-        pass
+        return int(val) & 0xff
 
     def decodeDPT501(self,raw):
         ## 1 Byte unsigned percent
         self.debug("DPT5.001 Scaling: value: %d" % raw[0])
-        return int(raw[0] & 0xff) * 100 / 255
+        return (int(raw[0]) & 0xff) * 100 / 255
 
     def encodeDPT501(self,val):
-        pass
+        return (int(val) * 255 / 100 ) & 0xff
     
     def decodeDPT6(self,raw):
         ## 1 Byte signed
@@ -213,14 +221,17 @@
         return  (val > 127 and val - 256 or val)
 
     def encodeDPT6(self,val):
-        pass
+        if val > 127:
+            ## Max
+            val = 127
+        return int(val) & 0xff
         
     def decodeDPT7(self,raw):
         ## 2 byte unsigned
         return int(self.toBigInt(raw) & 0xffff)
 
     def encodeDPT7(self,val):
-        pass
+        return self.toByteArray(val & 0xffff,2)
         
     def decodeDPT8(self,raw):
         ## 2 Byte signed
@@ -228,7 +239,9 @@
         return  (val > 32767 and val - 32768 or val)
 
     def encodeDPT8(self,val):
-        pass
+        if val > 32767:
+            val = 32767
+        return self.toByteArray(val & 0xffff,2)
 
     def decodeDPT9(self,raw):
         ## 2 Byte Float
@@ -242,7 +255,7 @@
         exp = (val & 0x7800) >> 11
         mant = val & 0x07ff
         if sign <> 0:
-            mant = -(~(mant - 1) & 0x7ff) 
+            mant = -(~(mant - 1) & 0x07ff) 
         self.debug("DPT9: value: %d sign: %d exp: %d mant: %f" % (val, sign,exp,mant))
         return (1 << exp) * 0.01 * mant
 
@@ -252,10 +265,11 @@
         if val < 0:
             sign = 0x8000
         mant = val * 100
-        while mant > 2047:
+        while mant > 0x07ff:
             mant = mant >> 1
             exp +=1
         data = sign | (exp << 11) | (int(mant) & 0x07ff)
+        self.debug("DPT9: value: %d sign: %d exp: %d mant: %r" % (val, sign,exp,mant))
         ## change to 2Byte bytearray 
         return self.toByteArray(data,2)
     
@@ -362,21 +376,22 @@
             year -= 1900
         else:
             year -= 2000
-            
         return [ day & 0x1f, mon & 0xf, year & 0x7f ]
 
     def decodeDPT12(self,raw):
         return int(self.toBigInt(raw)) % 0xffffffff
 
     def encodeDPT12(self,val):
-        pass
+        return self.toByteArray(val & 0xffffffff,4)
 
     def decodeDPT13(self,raw):
         val = int(self.toBigInt(raw)) % 0xffffffff
         return (val > 2147483647 and val - 2147483648 or val)
 
     def encodeDPT13(self,val):
-        pass
+        if val > 2147483647:
+            val = 2147483647
+        return self.toByteArray(val & 0xffffffff,4)
 
     def decodeDPT14(self,raw):
         ## 4 Byte Float
@@ -394,7 +409,18 @@
         return (1 << exp) * 0.01 * mant
 
     def encodeDPT14(self,val):
-        pass
+        sign = 0
+        exp = 0
+        if val < 0:
+            sign = 0x80000000
+        mant = val * 100
+        while mant > 0x7fffff:
+            mant = mant >> 1
+            exp +=1
+        data = sign | (exp << 23) | (int(mant) & 0x07ff)
+        self.debug("DPT14: value: %d sign: %d exp: %d mant: %r" % (val, sign,exp,mant))
+        ## change to 4Byte bytearray 
+        return self.toByteArray(data,4)
 
     def decodeDPT16(self,raw):
         res = ""
@@ -405,10 +431,21 @@
             res += chr(char)
         
         ## Decode ISO 2 Unicode
-        return res.decode("iso-8859-15")
+        return res.decode('iso-8859-15')
 
     def encodeDPT16(self,val):
-        pass
+        if type(val) == unicode:
+            val = val.encode('iso-8859-15')
+        ## max 14
+        val = val[:14]
+        data = []
+        for cnt in range(14):
+            if len(val) > cnt:
+                char = ord(val[cnt])
+            else:
+                char = 0
+            data.append(char)
+        return data
 
     def validTypes(self,datalen):
         ##TODO:
@@ -441,8 +478,8 @@
 
 
 if __name__ == "__main__":
-    dpttypes = dpt_type()
+    dpttypes = dpt_type(False)
     print dpttypes.decode([24,88],dptid=9)
     print dpttypes.decode([1],dptid=1)
     print dpttypes.decode([35,76,58],dptid=16)
-    
\ No newline at end of file
+    print dpttypes.encode("Das ist",dptid=16)
\ No newline at end of file


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

[Openautomation-svn] SF.net SVN: openautomation:[77] PyWireGate/trunk/knx_connector/DPT_Types.py

[<ni...@us...>]

Revision: 77
          http://openautomation.svn.sourceforge.net/openautomation/?rev=77&view=rev
Author:   nilss1
Date:     2010-11-04 21:50:46 +0000 (Thu, 04 Nov 2010)

Log Message:
-----------
Fixed: Date and Time returned str instead pf unicode

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

Modified: PyWireGate/trunk/knx_connector/DPT_Types.py
===================================================================
--- PyWireGate/trunk/knx_connector/DPT_Types.py	2010-11-04 21:39:18 UTC (rev 76)
+++ PyWireGate/trunk/knx_connector/DPT_Types.py	2010-11-04 21:50:46 UTC (rev 77)
@@ -291,7 +291,7 @@
         sec = raw[2] & 0x3f
         ## Fixme: eigentlich sollte Zeit als Unix Timestamp gespeichert werden, was macht man mit dem Wochentag
         ## machs erstmal so wie makki
-        return "%s %d:%d:%d" % (weekdays[weekday], hour,min,sec)
+        return u"%s %d:%d:%d" % (weekdays[weekday], hour,min,sec)
 
     def encodeDPT10(self,val):
         ## checktype default unix timestamp
@@ -345,7 +345,7 @@
             year += 2000
         else:
             year += 1900
-        return "%02d.%02d.%04d" % (day,mon,year)
+        return u"%02d.%02d.%04d" % (day,mon,year)
 
     def encodeDPT11(self,val):
         if type(val) in [float, int]:


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