FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-03 16:56:54 +00:00
Code Issues Releases Wiki Activity

10_KNX.pm: no set-option for listenoly- or get-devices, warning for illegal EVAL

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@16912 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
andi291 2018-06-26 08:13:17 +00:00
parent 5473eec27d
commit bcfa814f49
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
fhem/FHEM/10_KNX.pm
View File

@ -26,6 +26,8 @@
# ABU 20180607 seperated limit and scale from encode/decode in order to avoid warnings and clean up
# ABU 20180613 fixed scaling algo
# ABU 20180613 fixed scaling algo part 2
# ABU 20180624 no set-option for listenoly- or get-devices, warning for illegal EVAL
# ABU 20180626 fixed last changes
package main;
@ -558,8 +560,17 @@ KNX_Define($$) {
my $setString = "";
foreach my $key (keys %{$hash->{GADDETAILS}})
{
$setString .= " " if (length ($setString) > 1);
$setString = $setString . $key . $hash->{GADDETAILS}{$key}{SETLIST};
#no set-command for listenonly or get
my $option = $hash->{GADDETAILS}{$key}{OPTION};
if (defined ($option) and ($option =~ m/(get)|(listenonly)/i))
{
#readonly, do nothing
}
else
{
$setString .= " " if (length ($setString) > 1);
$setString = $setString . $key . $hash->{GADDETAILS}{$key}{SETLIST};
}
}
$hash->{SETSTRING} = $setString;
@ -979,6 +990,7 @@ KNX_Set($@) {
if (defined ($cmdAttr) and !($cmdAttr eq ""))
{
$state = eval $cmdAttr;
Log3 ($name, 2, "set name: Eval error - $@") if $@;
Log3 ($name, 5, "set name: $name - state replaced via command, result: state:$state");
}
@ -1222,6 +1234,7 @@ KNX_Parse($$) {
if (defined ($cmdAttr) and !($cmdAttr eq ""))
{
$state = eval $cmdAttr;
Log3 ($deviceName, 2, "parse device hash (wpi): Eval error - $@") if $@;
Log3 ($deviceName, 5, "parse device hash (wpi): $deviceHash name: $deviceName - state replaced via command $cmdAttr - state: $state");
}
#reassign original name...
@ -1274,6 +1287,8 @@ KNX_Parse($$) {
$hash = $deviceHash;
eval $cmdAttr;
Log3 ($deviceName, 2, "parse device hash (r): Eval error - $@") if $@;
if ($orgValue ne $value)
{
Log3 ($deviceName, 5, "parse device hash (r): $deviceHash name: $deviceName - put replaced via command $cmdAttr - value: $value");