[Openautomation-svn] SF.net SVN: openautomation:[782] wiregate/plugin/generic

[<pf...@us...>]

Revision: 782
          http://openautomation.svn.sourceforge.net/openautomation/?rev=782&view=rev
Author:   pfry
Date:     2012-05-02 23:05:18 +0000 (Wed, 02 May 2012)
Log Message:
-----------


Modified Paths:
--------------
    wiregate/plugin/generic/Szenencontroller.pl
    wiregate/plugin/generic/Translator.pl

Modified: wiregate/plugin/generic/Szenencontroller.pl
===================================================================
--- wiregate/plugin/generic/Szenencontroller.pl	2012-05-02 22:36:50 UTC (rev 781)
+++ wiregate/plugin/generic/Szenencontroller.pl	2012-05-02 23:05:18 UTC (rev 782)
@@ -128,8 +128,16 @@
     my $z="$room\__$n";
 
     # Debugging
-    plugin_log($plugname, "Szene $z ".($cmd eq 'S'?'speichern':'abrufen'));
-
+    
+    if($cmd eq 'S')
+    {
+	plugin_log($plugname, "Szene $z speichern: ".join(',', (keys %{$scene{$room}{gas}})));
+    }
+    else
+    {
+	plugin_log($plugname, "Szene $z abrufen: ".join(',', (values %{$scene{$room}{gas}})));
+    }
+	
     if($cmd eq 'S') # Szene speichern
     {
 	delete $scene{$z};

Modified: wiregate/plugin/generic/Translator.pl
===================================================================
--- wiregate/plugin/generic/Translator.pl	2012-05-02 22:36:50 UTC (rev 781)
+++ wiregate/plugin/generic/Translator.pl	2012-05-02 23:05:18 UTC (rev 782)
@@ -118,7 +118,14 @@
     if($msg{apci} eq "A_GroupValue_Read")
     {
 	# Ein Read-Request auf einer Transmit-GA wird mit dem letzten Ergebnis beantwortet
-	knx_write($ga, $plugin_info{$plugname.'_'.$t.'_result'}) if $cmd eq 'T';
+	if($cmd eq 'T')
+	{
+	    my $transmit=$ga;
+	    $transmit=$eibgaconf{$ga}{short} if $use_short_names;
+	    my $result=$plugin_info{$plugname.'_'.$t.'_result'};
+	    plugin_log($plugname, "memory: $result ($transmit)");
+	    knx_write($ga, $result);
+	}
 	return;
     }
     elsif($msg{apci} eq "A_GroupValue_Write")
@@ -177,13 +184,15 @@
 	my $receive=$trans{$t}{receive};
 	my $transmit=$trans{$t}{transmit};
 	
-	# Debugging
-	plugin_log($plugname, "$input ($receive) -> $result ($transmit)");
-
 	$receive=$eibgaconf{$receive}{ga} if $receive!~/^[0-9\/]+$/ && defined $eibgaconf{$receive};
 	$transmit=$eibgaconf{$transmit}{ga} if $transmit!~/^[0-9\/]+$/ && defined $eibgaconf{$transmit};
 
-	knx_write($transmit, $result) unless($transmit eq $receive);
+	# Debugging
+	unless($transmit eq $receive)
+	{
+	    plugin_log($plugname, "$input ($receive) -> $result ($transmit)");
+	    knx_write($transmit, $result);
+	}
     }
 }
 

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