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

commandref angepasst, selten verwendete set Befehle werden erst nach setzen eines attr eingeblendet, neue Funktionen - Bildschirmausrichtung, Vollbildmodus, Vorbereitungen für openApp

Browse Source
This commit is contained in:
Marko Oldenburg
2015-08-24 23:26:04 +02:00
parent eec279c48d
commit 2a1ac8e710
2 changed files with 65 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
74_AMAD.pm
View File

@ -22,8 +22,6 @@
# #
################################################################ ################################################################
###### Version 0.4.3 ############
@ -32,8 +30,12 @@ package main;
use strict; use strict;
use warnings; use warnings;
use Time::HiRes qw(gettimeofday); use Time::HiRes qw(gettimeofday);
use HttpUtils; use HttpUtils;
my $VERSION = "0.5.0";
sub AMAD_Initialize($) { sub AMAD_Initialize($) {
my ($hash) = @_; my ($hash) = @_;
@ -43,9 +45,16 @@ sub AMAD_Initialize($) {
$hash->{UndefFn} = "AMAD_Undef"; $hash->{UndefFn} = "AMAD_Undef";
$hash->{AttrFn} = "AMAD_Attr"; $hash->{AttrFn} = "AMAD_Attr";
$hash->{ReadFn} = "AMAD_Read"; $hash->{ReadFn} = "AMAD_Read";
$hash->{AttrList} = $hash->{AttrList} = "setOpenApp ".
"interval disable:1 " "setFullscreen:0,1 ".
. $readingFnAttributes; "setScreenOrientation:0,1 ".
"setScreenMsg:0,1 ".
"setOpenURL:0,1 ".
"setMediaPlayer:0,1 ".
"setAlarmTime:0,1 ".
"port ".
"disable:1 ";
$hash->{AttrList} .= $readingFnAttributes;
} }
sub AMAD_Define($$) { sub AMAD_Define($$) {
@ -70,6 +79,7 @@ sub AMAD_Define($$) {
$hash->{HOST} = $host; $hash->{HOST} = $host;
$hash->{PORT} = $port; $hash->{PORT} = $port;
$hash->{INTERVAL} = $interval; $hash->{INTERVAL} = $interval;
$hash->{VERSION} = $VERSION;
Log3 $name, 3, "AMAD ($name) - defined with host $hash->{HOST} and interval $hash->{INTERVAL} (sec)"; Log3 $name, 3, "AMAD ($name) - defined with host $hash->{HOST} and interval $hash->{INTERVAL} (sec)";
@ -151,17 +161,23 @@ sub AMAD_GetUpdateTimer($)
sub AMAD_Set($$@) sub AMAD_Set($$@)
{ {
my ($hash, $name, $cmd, @val) = @_; my ($hash, $name, $cmd, @val) = @_;
my $apps = AttrVal("$name","openApp","none");
my $list = "screenMsg" my $list = "";
. " ttsMsg"
. " volume:slider,0,1,15" $list .= "screenMsg " if (AttrVal("$name","setScreenMsg","0") eq "1");
. " deviceState:online,offline" $list .= "ttsMsg ";
. " mediaPlayer:play,stop,next,back" $list .= "volume:slider,0,1,15 ";
. " screenBrightness:slider,0,1,255" $list .= "deviceState:online,offline ";
. " screen:on,off" $list .= "mediaPlayer:play,stop,next,back " if (AttrVal("$name","setMediaPlayer","0") eq "1");
. " openURL" $list .= "screenBrightness:slider,0,1,255 ";
. " nextAlarmTime:time" $list .= "screen:on,off ";
. " statusRequest:noArg"; $list .= "screenOrientation:landscape,portrait,default " if (AttrVal("$name","setScreenOrientation","0") eq "1");
$list .= "screenFullscreen:on,off " if (AttrVal("$name","setFullscreen","0") eq "1");
$list .= "openURL " if (AttrVal("$name","setOpenURL","0") eq "1");
$list .= "openApp:$apps " if (AttrVal("$name","setOpenApp","none") ne "none");
$list .= "nextAlarmTime:time " if (AttrVal("$name","setAlarmTime","0") eq "1");
$list .= "statusRequest:noArg ";
if (lc $cmd eq 'screenmsg' if (lc $cmd eq 'screenmsg'
@ -170,8 +186,11 @@ sub AMAD_Set($$@)
|| lc $cmd eq 'mediaplayer' || lc $cmd eq 'mediaplayer'
|| lc $cmd eq 'devicestate' || lc $cmd eq 'devicestate'
|| lc $cmd eq 'screenbrightness' || lc $cmd eq 'screenbrightness'
|| lc $cmd eq 'screenorientation'
|| lc $cmd eq 'screenfullscreen'
|| lc $cmd eq 'screen' || lc $cmd eq 'screen'
|| lc $cmd eq 'openurl' || lc $cmd eq 'openurl'
|| lc $cmd eq 'openApp'
|| lc $cmd eq 'nextalarmtime' || lc $cmd eq 'nextalarmtime'
|| lc $cmd eq 'statusrequest') { || lc $cmd eq 'statusrequest') {
@ -391,6 +410,26 @@ sub AMAD_SelectSetCmd($$@)
return AMAD_HTTP_POST ($hash,$url); return AMAD_HTTP_POST ($hash,$url);
} }
elsif (lc $cmd eq 'screenorientation') {
my $mod = join(" ", @data);
my $url = "http://" . $host . ":" . $port . "/fhem-amad/setCommands/setScreenOrientation?orientation=$mod";
AMAD_GetUpdateLocal($hash);
Log3 $name, 4, "AMAD ($name) - Starte Update GetUpdateLocal";
return AMAD_HTTP_POST ($hash,$url);
}
elsif (lc $cmd eq 'screenfullscreen') {
my $mod = join(" ", @data);
my $url = "http://" . $host . ":" . $port . "/fhem-amad/setCommands/setScreenFullscreen?fullscreen=$mod";
AMAD_GetUpdateLocal($hash);
Log3 $name, 4, "AMAD ($name) - Starte Update GetUpdateLocal";
return AMAD_HTTP_POST ($hash,$url);
}
elsif (lc $cmd eq 'openurl') { elsif (lc $cmd eq 'openurl') {
my $openurl = join(" ", @data); my $openurl = join(" ", @data);
@ -421,21 +460,22 @@ sub AMAD_SelectSetCmd($$@)
=pod =pod
=begin html =begin html
<a name="AMAD"></a> <a name="AMAD"></a>
<h3>AMAD - Automagic Android Device</h3> <h3>AMAD</h3>
<ul> <ul>
<u><b>AMAD - Automagic Android Device</b></u>
At the moment no english documentation is available At the moment no english documentation is available
</ul> </ul>
=end html
=end html
=begin html_DE =begin html_DE
<a name="AMAD"></a> <a name="AMAD"></a>
<h3>AMAD - Automagic Android Device</h3> <h3>AMAD</h3>
<ul> <ul>
<u><b>AMAD - Automagic Android Device</b></u>
Dieses Modul liefert, <b><u>in Verbindung mit der Android APP Automagic</u></b>, diverse Informationen von Android Ger&auml;ten. Dieses Modul liefert, <b><u>in Verbindung mit der Android APP Automagic</u></b>, diverse Informationen von Android Ger&auml;ten.
Die AndroidAPP Automagic (welche nicht von mir stammt und 2.90Euro kostet) funktioniert wie Tasker, ist aber bei weitem User freundlicher. Die AndroidAPP Automagic (welche nicht von mir stammt und 2.90Euro kostet) funktioniert wie Tasker, ist aber bei weitem User freundlicher.
Im Auslieferiungszustand werden folgende Zust&auml;nde dargestellt: Im Auslieferiungszustand werden folgende Zust&auml;nde dargestellt:
@ -578,5 +618,4 @@ sub AMAD_SelectSetCmd($$@)
</ul> </ul>
=end html_DE =end html_DE
=cut =cut