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

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

Revision: 231
          http://openautomation.svn.sourceforge.net/openautomation/?rev=231&view=rev
Author:   mayerch
Date:     2010-12-27 22:53:32 +0000 (Mon, 27 Dec 2010)

Log Message:
-----------
Send raw values and bring the CometVisu client back to spec (i.e. don't send the DPT anymore)

Modified Paths:
--------------
    CometVisu/trunk/visu/designs/structure_pure.js
    CometVisu/trunk/visu/lib/cometvisu-client.js
    CometVisu/trunk/visu/plugins/colorchooser/structure_plugin.js

Modified: CometVisu/trunk/visu/designs/structure_pure.js
===================================================================
--- CometVisu/trunk/visu/designs/structure_pure.js	2010-12-27 22:51:16 UTC (rev 230)
+++ CometVisu/trunk/visu/designs/structure_pure.js	2010-12-27 22:53:32 UTC (rev 231)
@@ -209,7 +209,8 @@
         {
           data.value = actor.slider('value');
           if( data.address[addr][1] == true ) continue; // skip read only
-          visu.write( addr.substr(1), data.value, data.address[addr][0].substr(4) );
+          //visu.write( addr.substr(1), data.value, data.address[addr][0].substr(4) );
+          visu.write( addr.substr(1), Transform[data.address[addr][0]].encode( data.value ) );
         }
       }, 250 ) ); // update KNX every 250 ms 
     },
@@ -225,7 +226,8 @@
       {
       console.log('change send');
         if( data.address[addr][1] == true ) continue; // skip read only
-        visu.write( addr.substr(1), ui.value, data.address[addr][0].substr(4) );
+        //visu.write( addr.substr(1), ui.value, data.address[addr][0].substr(4) );
+        visu.write( addr.substr(1), Transform[data.address[addr][0]].encode( ui.value ) );
       }
     },
     attributes: {
@@ -278,7 +280,8 @@
       for( var addr in data.address )
       {
         if( data.address[addr][1] == true ) continue; // skip read only
-        visu.write( addr.substr(1), data.value=='1' ? '0' : '1', data.address[addr][0].substr(4) );
+//        visu.write( addr.substr(1), data.value=='1' ? '0' : '1', data.address[addr][0].substr(4) );
+        visu.write( addr.substr(1), Transform[data.address[addr][0]].encode( data.value ) );
       }
     },
     attributes: {
@@ -329,7 +332,7 @@
       for( var addr in data.address )
       {
         if( data.address[addr][1] == true ) continue; // skip read only
-        visu.write( addr.substr(1), data.sendValue, data.address[addr][0].substr(4) );
+        visu.write( addr.substr(1), Transform[data.address[addr][0]].encode( data.sendValue ) );
       }
     },
     attributes: {

Modified: CometVisu/trunk/visu/lib/cometvisu-client.js
===================================================================
--- CometVisu/trunk/visu/lib/cometvisu-client.js	2010-12-27 22:51:16 UTC (rev 230)
+++ CometVisu/trunk/visu/lib/cometvisu-client.js	2010-12-27 22:53:32 UTC (rev 231)
@@ -144,16 +144,10 @@
   /**
    * This function sends a value
    */
-  this.write = function( address, value, datatype ) // FIXME datatype not in spec!!!
+  this.write = function( address, value )
   {
-    //var request = {};
-    //request.a = address; // FIXME the spec allows multiple addresses
-    //request.v = value;
-var request = 'a=' + address + '&v=' + value;
-datatype = datatype.split('.');
-request += '&d=' + datatype[0]; // FIXME datatype not in spec!!!
+    var request = 'a=' + address + '&v=' + value;
     $.ajax( {url:this.urlPrefix + 'w',dataType: 'json',context:this,data:request} );
-//alert( 'write to "' + address + '" value "' + value + '"' );
   }
 };
 

Modified: CometVisu/trunk/visu/plugins/colorchooser/structure_plugin.js
===================================================================
--- CometVisu/trunk/visu/plugins/colorchooser/structure_plugin.js	2010-12-27 22:51:16 UTC (rev 230)
+++ CometVisu/trunk/visu/plugins/colorchooser/structure_plugin.js	2010-12-27 22:53:32 UTC (rev 231)
@@ -50,22 +50,25 @@
         'type'    : 'colorChooser'
       })
       .farbtastic( function(color){
-        var r = parseInt(color.substring(1, 3), 16) * 100 / 255;
-        var g = parseInt(color.substring(3, 5), 16) * 100 / 255;
-        var b = parseInt(color.substring(5, 7), 16) * 100 / 255;
+        var r = parseInt(color.substring(1, 3), 16) * 100 / 255.0;
+        var g = parseInt(color.substring(3, 5), 16) * 100 / 255.0;
+        var b = parseInt(color.substring(5, 7), 16) * 100 / 255.0;
         for( var addr in address )
         {
           if( address[addr][2] == true ) continue; // skip read only
           switch( address[addr][1] )
           {
             case 'r':
-              visu.write( addr.substr(1), r, address[addr][0].substr(4) );
+              //visu.write( addr.substr(1), r, address[addr][0].substr(4) );
+              visu.write( addr.substr(1), Transform[address[addr][0]].encode( r ) );
               break;
             case 'g':
-              visu.write( addr.substr(1), g, address[addr][0].substr(4) );
+              //visu.write( addr.substr(1), g, address[addr][0].substr(4) );
+              visu.write( addr.substr(1), Transform[address[addr][0]].encode( g ) );
               break;
             case 'b':
-              visu.write( addr.substr(1), b, address[addr][0].substr(4) );
+              //visu.write( addr.substr(1), b, address[addr][0].substr(4) );
+              visu.write( addr.substr(1), Transform[address[addr][0]].encode( b ) );
               break;
           }
         }


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