From a55e6535cbb47fc44bf18b1a49165f6576e07613 Mon Sep 17 00:00:00 2001 From: erwin <> Date: Sat, 8 Jan 2022 18:16:22 +0000 Subject: [PATCH] 10_KNX.pm: fix KNX_scan utility (export problem) git-svn-id: https://svn.fhem.de/fhem/trunk@25438 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/10_KNX.pm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/fhem/FHEM/10_KNX.pm b/fhem/FHEM/10_KNX.pm index 3dcebf888..00f2ec042 100644 --- a/fhem/FHEM/10_KNX.pm +++ b/fhem/FHEM/10_KNX.pm @@ -70,6 +70,7 @@ # E05.01 feature: utitity KNX_scan # corrections cmd-ref # optimize replaceByRegex +# MH 20220108 fix KNX_scan sub (export-problem) package FHEM::KNX; ## no critic 'package' @@ -113,11 +114,11 @@ BEGIN { AnalyzePerlCommand AnalyzeCommandChain EvalSpecials fhemTimeLocal) ); +} # export to main context (with different name) GP_Export( - qw(Initialize KNX_scan) + qw(Initialize) ); -} #string constants my $MODELERR = "MODEL_NOT_DEFINED"; # for autocreate @@ -1838,10 +1839,10 @@ sub dec_dpt232 { #RGB-Code ### get state of devices from KNX_Hardware ### called with devspec as argument -### e.g : scanKNX() / scanKNX('device1') / scanKNX('device1, dev2,dev3,...' / scanKNX('room=Kueche'), ... +### e.g : KNX_scan() / KNX_scan('device1') / KNX_scan('device1, dev2,dev3,...' / KNX_scan('room=Kueche'), ... ### returns number of "gets" executed #E05.01 -sub KNX_scan { +sub main::KNX_scan { my $devs = shift; my @devlist = (); @@ -1865,11 +1866,11 @@ sub KNX_scan { foreach my $gads (@getnames) { my $gad = (split(/[:]/ix,$gads))[0]; $k++; - Log3 $knxdef, 4, "scanKNXexec: [$k] get $knxdef $gad"; + Log3 $knxdef, 4, "KNX_scan-exec: [$k] get $knxdef $gad"; $getsarr .= "$knxdef $gad,"; } } - Log3 undef, 3, "scanKNX: $i devices selected / $j devices with get / $k gets executing..."; + Log3 undef, 3, "KNX_scan: $i devices selected / $j devices with get / $k gets executing..."; doKNX_scan($getsarr) if ($k > 0); return $k; }