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

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

Revision: 106
          http://openautomation.svn.sourceforge.net/openautomation/?rev=106&view=rev
Author:   nilss1
Date:     2010-11-11 14:45:53 +0000 (Thu, 11 Nov 2010)

Log Message:
-----------
Fixed time and date for val 0 send current

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-11 14:37:02 UTC (rev 105)
+++ PyWireGate/trunk/knx_connector/DPT_Types.py	2010-11-11 14:45:53 UTC (rev 106)
@@ -21,6 +21,7 @@
 ### sondern als LIST mit den dezimalen Werten ist das decode hier ein bischen angepasst
 
 import struct
+import time
 
 class dpt_type:
     def __init__(self,parent):
@@ -325,7 +326,11 @@
             if len(timeval) == 3:
                 sec = int(timeval[2])
         elif type(val) in [float, int]:
-            now = time.localtime(val)
+            if val == 0:
+                ## current Time
+                now = time.localtime()
+            else:
+                now = time.localtime(val)
             weekday = now[6]
             hour = now[3]
             min = now[4]
@@ -355,12 +360,12 @@
         return u"%02d.%02d.%04d" % (day,mon,year)
 
     def encodeDPT11(self,val):
+        ## make time struct accesible
         if type(val) in [float, int]:
-            tval = val
+            utime = [v for v in time.localtime(tval)]
         else:
-            tval =0
-        ## make time struct accesible
-        utime = [v for v in time.localtime(tval)]
+            utime = [v for v in time.localtime()]
+        
         if type(val) == str:
             datestr = val.split(".")
             if len(datestr) == 2:


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