|
From: <dpe...@us...> - 2012-11-10 17:35:51
|
Revision: 1119
http://openautomation.svn.sourceforge.net/openautomation/?rev=1119&view=rev
Author: dpesch01
Date: 2012-11-10 17:35:45 +0000 (Sat, 10 Nov 2012)
Log Message:
-----------
Fixes: bei allen Aufrufen von groupaddress() die Klammern hinzugef?\195?\188gt (Perl meldete sonst syntax Fehler), translate ga nur noch anmelden, falls translate definiert wurde
Modified Paths:
--------------
wiregate/plugin/generic/Logikprozessor.pl
Modified: wiregate/plugin/generic/Logikprozessor.pl
===================================================================
--- wiregate/plugin/generic/Logikprozessor.pl 2012-11-10 13:46:40 UTC (rev 1118)
+++ wiregate/plugin/generic/Logikprozessor.pl 2012-11-10 17:35:45 UTC (rev 1119)
@@ -142,9 +142,12 @@
}
# transmit-Adresse abonnieren
- my $transmit=groupaddress $logic{$t}{transmit};
- $plugin_subscribe{$transmit}{$plugname}=1;
- plugin_log($plugname, "\$logic{$t}: Transmit-GA $transmit nicht in %eibgaconf gefunden") if $debug && !exists $eibgaconf{$transmit};
+ if (defined $logic{$t}{transmit})
+ {
+ my $transmit=groupaddress($logic{$t}{transmit});
+ $plugin_subscribe{$transmit}{$plugname}=1;
+ plugin_log($plugname, "\$logic{$t}: Transmit-GA $transmit nicht in %eibgaconf gefunden") if $debug && !exists $eibgaconf{$transmit};
+ }
# Zaehlen und Logeintrag
$count++;
@@ -157,7 +160,7 @@
}
# Nun alle receive-Adressen abonnieren (eine oder mehrere)
- my $receive=groupaddress $logic{$t}{receive};
+ my $receive=groupaddress($logic{$t}{receive});
next unless $receive;
@@ -182,7 +185,7 @@
# Berechnung und Senden beim Startup des Logikprozessors
my $result=execute_logic($t, undef, undef);
- my $ga=groupaddress $logic{$t}{transmit};
+ my $ga=groupaddress($logic{$t}{transmit});
plugin_log($plugname, "\$logic{$t}{transmit}(Logik) -> $ga:$result") if $debug;
knx_write($ga, $result); # DPT aus eibga.conf
}
@@ -752,8 +755,8 @@
my $input=$in;
# alle receive-GAs
- my $receive=groupaddress $logic{$t}{receive};
- my $fetch=groupaddress $logic{$t}{fetch};
+ my $receive=groupaddress($logic{$t}{receive});
+ my $fetch=groupaddress($logic{$t}{fetch});
if(defined $fetch)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|