[Openautomation-svn] SF.net SVN: openautomation:[700] CometVisu/trunk/visu

[<ma...@us...>]

Revision: 700
          http://openautomation.svn.sourceforge.net/openautomation/?rev=700&view=rev
Author:   mayerch
Date:     2012-02-12 14:36:55 +0000 (Sun, 12 Feb 2012)
Log Message:
-----------
Added encoding for Time at the transform for KNX. 
Also added a little helper function that preprends zeros to a string till a given length.

Modified Paths:
--------------
    CometVisu/trunk/visu/plugins/clock/structure_plugin.js
    CometVisu/trunk/visu/transforms/transform_default.js
    CometVisu/trunk/visu/transforms/transform_knx.js

Modified: CometVisu/trunk/visu/plugins/clock/structure_plugin.js
===================================================================
--- CometVisu/trunk/visu/plugins/clock/structure_plugin.js	2012-02-12 14:07:04 UTC (rev 699)
+++ CometVisu/trunk/visu/plugins/clock/structure_plugin.js	2012-02-12 14:36:55 UTC (rev 700)
@@ -44,6 +44,7 @@
     var datatype =  $(page).attr('datatype');
     var $actor = $(actor)
       .data({
+        'value'   : new Date(),
         'address' : address,
         'type'    : 'clock'
       });
@@ -82,7 +83,6 @@
     var y = 50 - (event.originalEvent.pageY - $svg.offset().top);
     var angle = (Math.atan2( x, y ) * 180 / Math.PI + 360) % 360;
     var time = $container.data('value');
-    var told = time.toString();
     if( event.data.type == 'hour' )
     {
       var oldHours = time.getHours();

Modified: CometVisu/trunk/visu/transforms/transform_default.js
===================================================================
--- CometVisu/trunk/visu/transforms/transform_default.js	2012-02-12 14:07:04 UTC (rev 699)
+++ CometVisu/trunk/visu/transforms/transform_default.js	2012-02-12 14:36:55 UTC (rev 700)
@@ -66,4 +66,14 @@
       Transform[ prefix + ':' + trans ] = transforms[ trans ];
     }
   }
+}
+
+/**
+ * Prepend zeros to the string s till the result has the length l.
+ */
+function zeroFillString( s, l )
+{
+  if( s.length >= l ) return s;
+  
+  return new Array(1 + l - s.length).join('0') + s;
 }
\ No newline at end of file

Modified: CometVisu/trunk/visu/transforms/transform_knx.js
===================================================================
--- CometVisu/trunk/visu/transforms/transform_knx.js	2012-02-12 14:07:04 UTC (rev 699)
+++ CometVisu/trunk/visu/transforms/transform_knx.js	2012-02-12 14:36:55 UTC (rev 700)
@@ -216,7 +216,10 @@
   '10.001' : {
     name  : 'DPT_TimeOfDay',
     encode: function( phy ){
-      // FIXME
+      var val = zeroFillString( ((phy.getDay() << 5) + phy.getHours()).toString(16), 2);
+      val += zeroFillString( phy.getMinutes().toString(16), 2 );
+      val += zeroFillString( phy.getSeconds().toString(16), 2 );
+      return '80' + val;
     },
     decode: function( hex ){ 
       var date = new Date(); // assume today

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