From 1cfde3005d513297c483270a033ffd27ffb2fb0e Mon Sep 17 00:00:00 2001 From: markooldenburg <> Date: Fri, 9 Dec 2016 20:37:53 +0000 Subject: [PATCH] 74_AMAD: statusRequest every Time git-svn-id: https://svn.fhem.de/fhem/trunk@12731 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/CHANGED | 1 + fhem/FHEM/74_AMAD.pm | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/fhem/CHANGED b/fhem/CHANGED index 3866fa932..956898bb9 100644 --- a/fhem/CHANGED +++ b/fhem/CHANGED @@ -1,5 +1,6 @@ # Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # Do not insert empty lines here, update check depends on it. + - update: 74_AMAD: statusRequest every Time - change: 93_DbRep: code reviewed, no functional changes - change: 93_DbRep: DbRep version as INTERNAL, check if DBI module is installed diff --git a/fhem/FHEM/74_AMAD.pm b/fhem/FHEM/74_AMAD.pm index c4a371440..383ff8383 100644 --- a/fhem/FHEM/74_AMAD.pm +++ b/fhem/FHEM/74_AMAD.pm @@ -37,7 +37,7 @@ use TcpServerUtils; use Encode qw(encode); -my $modulversion = "2.6.6"; +my $modulversion = "2.6.7"; my $flowsetversion = "2.6.7"; @@ -589,14 +589,15 @@ sub AMAD_Set($$@) { || lc $cmd eq 'vibrate') { Log3 $name, 5, "AMAD ($name) - set $name $cmd ".join(" ", @val); - + + return AMAD_SelectSetCmd( $hash, $cmd, @val ) if( lc $cmd eq 'statusrequest' ); return "set command only works if state not equal initialized" if( ReadingsVal( $hash->{NAME}, "state", 0 ) eq "initialized"); return "Cannot set command, FHEM Device is disabled" if( AttrVal( $name, "disable", "0" ) eq "1" ); return "Cannot set command, FHEM Device is unknown" if( ReadingsVal( $name, "deviceState", "online" ) eq "unknown" ); return "Cannot set command, FHEM Device is offline" if( ReadingsVal( $name, "deviceState", "online" ) eq "offline" ); - return AMAD_SelectSetCmd( $hash, $cmd, @val ) if( @val ) || ( lc $cmd eq 'statusrequest' ) || ( lc $cmd eq 'activatevoiceinput' ) || ( lc $cmd eq 'vibrate' ) || ( lc $cmd eq 'currentflowsetupdate' ); + return AMAD_SelectSetCmd( $hash, $cmd, @val ) if( @val ) || ( lc $cmd eq 'activatevoiceinput' ) || ( lc $cmd eq 'vibrate' ) || ( lc $cmd eq 'currentflowsetupdate' ); } return "Unknown argument $cmd, bearword as argument or wrong parameter(s), choose one of $list"; @@ -1716,4 +1717,4 @@ sub AMAD_decrypt($) { =end html_DE -=cut \ No newline at end of file +=cut