FHEM/mod-AMAD
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fhemServerIP als Reading in der Bridge, muss zwingend eingetragen werden. expertMode ebenfalls in der Bridge für direkte Befehlsabsetzung von FHEM Befehlen über die Bridge

Browse Source
This commit is contained in:
Marko Oldenburg
2015-10-02 11:19:04 +02:00
parent fa2b42af6b
commit 8ad6dbccfd
1 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
74_AMAD.pm
View File

@ -35,7 +35,7 @@ use Time::HiRes qw(gettimeofday);
use HttpUtils; use HttpUtils;
use TcpServerUtils; use TcpServerUtils;
my $version = "0.7.2"; my $version = "0.7.3";
@ -53,7 +53,6 @@ sub AMAD_Initialize($) {
"setFullscreen:0,1 ". "setFullscreen:0,1 ".
"setScreenOrientation:0,1 ". "setScreenOrientation:0,1 ".
"setScreenBrightness:0,1 ". "setScreenBrightness:0,1 ".
"fhemServerIP ".
"root:0,1 ". "root:0,1 ".
"interval ". "interval ".
"port ". "port ".
@ -90,9 +89,9 @@ sub AMAD_Define($$) {
return "there is already a amad bridge" if( $modules{AMAD}{defptr}{BRIDGE} ); return "there is already a amad bridge" if( $modules{AMAD}{defptr}{BRIDGE} );
$hash->{BRIDGE} = 1; $hash->{BRIDGE} = 1;
$hash->{TEMPORARY} = 1; #$hash->{TEMPORARY} = 1;
$modules{AMAD}{defptr}{BRIDGE} = $hash; $modules{AMAD}{defptr}{BRIDGE} = $hash;
$attr{$name}{room} = "hidden"; $attr{$name}{room} = "AMAD";
Log3 $name, 3, "AMAD ($name) - defined Bridge with Socketport $hash->{PORT}"; Log3 $name, 3, "AMAD ($name) - defined Bridge with Socketport $hash->{PORT}";
AMAD_CommBridge_Open( $hash ); AMAD_CommBridge_Open( $hash );
@ -240,7 +239,7 @@ sub AMAD_RetrieveAutomagicInfo($) {
my $name = $hash->{NAME}; my $name = $hash->{NAME};
my $host = $hash->{HOST}; my $host = $hash->{HOST};
my $port = $hash->{PORT}; my $port = $hash->{PORT};
my $fhemip = AttrVal( $name, "fhemServerIP", "none" ); my $fhemip = ReadingsVal( "AMADCommBridge", "fhemServerIP", "none" );
my $url = "http://" . $host . ":" . $port . "/fhem-amad/deviceInfo/"; # Path muß so im Automagic als http request Trigger drin stehen my $url = "http://" . $host . ":" . $port . "/fhem-amad/deviceInfo/"; # Path muß so im Automagic als http request Trigger drin stehen
@ -435,7 +434,7 @@ sub AMAD_Set($$@) {
$list .= "ttsMsg "; $list .= "ttsMsg ";
$list .= "volume:slider,0,1,15 "; $list .= "volume:slider,0,1,15 ";
$list .= "deviceState:online,offline "; $list .= "deviceState:online,offline ";
$list .= "mediaPlayer:play,stop,next,back " if( AttrVal( $name, "fhemServerIP", "none" ) ne "none" ); $list .= "mediaPlayer:play,stop,next,back " if( ReadingsVal( "AMADCommBridge", "fhemServerIP", "none" ) ne "none");
$list .= "screenBrightness:slider,0,1,255 " if( AttrVal( $name, "setScreenBrightness", "1" ) eq "1" ); $list .= "screenBrightness:slider,0,1,255 " if( AttrVal( $name, "setScreenBrightness", "1" ) eq "1" );
$list .= "screen:on,off "; $list .= "screen:on,off ";
$list .= "screenOrientation:auto,landscape,portrait " if( AttrVal( $name, "setScreenOrientation", "1" ) eq "1" ); $list .= "screenOrientation:auto,landscape,portrait " if( AttrVal( $name, "setScreenOrientation", "1" ) eq "1" );
@ -446,8 +445,7 @@ sub AMAD_Set($$@) {
$list .= "statusRequest:noArg "; $list .= "statusRequest:noArg ";
$list .= "system:reboot " if( AttrVal( $name, "root", "1" ) eq "1" ); $list .= "system:reboot " if( AttrVal( $name, "root", "1" ) eq "1" );
if( lc $cmd eq 'screenmsg'
if (lc $cmd eq 'screenmsg'
|| lc $cmd eq 'ttsmsg' || lc $cmd eq 'ttsmsg'
|| lc $cmd eq 'volume' || lc $cmd eq 'volume'
|| lc $cmd eq 'mediaplayer' || lc $cmd eq 'mediaplayer'
@ -460,7 +458,7 @@ sub AMAD_Set($$@) {
|| lc $cmd eq 'openapp' || lc $cmd eq 'openapp'
|| lc $cmd eq 'nextalarmtime' || lc $cmd eq 'nextalarmtime'
|| lc $cmd eq 'system' || lc $cmd eq 'system'
|| lc $cmd eq 'statusrequest') { || lc $cmd eq 'statusrequest' ) {
Log3 $name, 5, "AMAD ($name) - set $name $cmd ".join(" ", @val); Log3 $name, 5, "AMAD ($name) - set $name $cmd ".join(" ", @val);
@ -475,6 +473,25 @@ sub AMAD_Set($$@) {
return "Unknown argument $cmd, bearword as argument or wrong parameter(s), choose one of $list"; return "Unknown argument $cmd, bearword as argument or wrong parameter(s), choose one of $list";
} }
elsif( $name eq "AMADCommBridge" ) {
my $list = "";
## set Befehle für die AMAD_CommBridge
$list .= "expertMode:0,1 " if( $modules{AMAD}{defptr}{BRIDGE} );
$list .= "fhemServerIP " if( $modules{AMAD}{defptr}{BRIDGE} );
if( lc $cmd eq 'expertmode'
|| lc $cmd eq 'fhemserverip' ) {
readingsSingleUpdate( $hash, $cmd, $val[0], 0 );
return;
}
return "Unknown argument $cmd, bearword as argument or wrong parameter(s), choose one of $list";
}
} }
sub AMAD_SelectSetCmd($$@) { sub AMAD_SelectSetCmd($$@) {
@ -848,7 +865,7 @@ sub AMAD_CommBridge_Read($) {
elsif ( $data[0] =~ /FHEMCMD: set\b/ ) { elsif ( $data[0] =~ /FHEMCMD: set\b/ ) {
my $fhemCmd = $data[1]; my $fhemCmd = $data[1];
fhem ("$fhemCmd") if( AttrVal( "AMADCommBridge", "Expert", "0" ) eq "1" ); fhem ("$fhemCmd") if( ReadingsVal( "AMADCommBridge", "expertMode", 0 ) ne "0" );
readingsSingleUpdate( $brihash, "receiveFhemCommand", $fhemCmd, 1 ); readingsSingleUpdate( $brihash, "receiveFhemCommand", $fhemCmd, 1 );
return; return;