mirror of
https://github.com/fhem/fhem-mirror.git
synced 2025-04-22 20:24:36 +00:00
26_tahoma.pm:2016-02-27 V 0204 commands open,close,my,stop and setClosure added
git-svn-id: https://svn.fhem.de/fhem/trunk@11682 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
parent
10d734deb7
commit
f529526d35
@ -32,6 +32,7 @@
|
|||||||
# 2015-09-20 V 0201 some standard requests after login which are not neccessary disabled (so the actual requests are not equal to flow of iphone app)
|
# 2015-09-20 V 0201 some standard requests after login which are not neccessary disabled (so the actual requests are not equal to flow of iphone app)
|
||||||
# 2016-01-26 V 0202 bugs forcing some startup warning messages fixed
|
# 2016-01-26 V 0202 bugs forcing some startup warning messages fixed
|
||||||
# 2016-02-20 V 0203 perl exception while parsing json string captured
|
# 2016-02-20 V 0203 perl exception while parsing json string captured
|
||||||
|
# 2016-02-27 V 0204 commands open,close,my,stop and setClosure added
|
||||||
|
|
||||||
package main;
|
package main;
|
||||||
|
|
||||||
@ -500,9 +501,9 @@ sub tahoma_getDeviceList($$$)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
sub tahoma_applyRequest($$$)
|
sub tahoma_applyRequest($$$$)
|
||||||
{
|
{
|
||||||
my ($hash,$nonblocking,$value) = @_;
|
my ($hash,$nonblocking,$command,$value) = @_;
|
||||||
my $name = $hash->{NAME};
|
my $name = $hash->{NAME};
|
||||||
Log3 $name, 4, "tahoma_applyRequest";
|
Log3 $name, 4, "tahoma_applyRequest";
|
||||||
|
|
||||||
@ -525,12 +526,13 @@ sub tahoma_applyRequest($$$)
|
|||||||
|
|
||||||
return if (scalar @devices < 1);
|
return if (scalar @devices < 1);
|
||||||
|
|
||||||
|
$value = '' if (!defined($value));
|
||||||
my $data = '{"label":"';
|
my $data = '{"label":"';
|
||||||
$data .= $hash->{inLabel}.' - Positionieren auf '.$value.' % - iPhone","actions":[';
|
$data .= $hash->{inLabel}.' - Positionieren auf '.$value.' % - iPhone","actions":[';
|
||||||
foreach my $device (@devices) {
|
foreach my $device (@devices) {
|
||||||
$data .= ',' if substr($data, -1) eq '}';
|
$data .= ',' if substr($data, -1) eq '}';
|
||||||
$data .= '{"deviceURL":"'.$device->{device}.'",';
|
$data .= '{"deviceURL":"'.$device->{device}.'",';
|
||||||
$data .= '"commands":[{"name":"setClosure","parameters":['.$value.']}]}';
|
$data .= '"commands":[{"name":"'.$command.'","parameters":['.$value.']}]}';
|
||||||
}
|
}
|
||||||
$data .= ']}';
|
$data .= ']}';
|
||||||
|
|
||||||
@ -927,12 +929,14 @@ sub tahoma_Set($$@)
|
|||||||
my $list = "";
|
my $list = "";
|
||||||
if( $hash->{SUBTYPE} eq "DEVICE" ||
|
if( $hash->{SUBTYPE} eq "DEVICE" ||
|
||||||
$hash->{SUBTYPE} eq "PLACE" ) {
|
$hash->{SUBTYPE} eq "PLACE" ) {
|
||||||
$list = "dim:slider,0,1,100";
|
$list = "dim:slider,0,1,100 setClosure open:noArg close:noArg my:noArg stop:noArg";
|
||||||
|
$list = $hash->{COMMANDS} if (defined $hash->{COMMANDS});
|
||||||
|
|
||||||
if( $cmd eq "dim" ) {
|
$cmd = "setClosure" if( $cmd eq "dim" );
|
||||||
#if( $hash->{SUBTYPE} eq "DEVICE" ) {
|
|
||||||
tahoma_applyRequest($hash,1,$val);
|
if( $cmd eq "setClosure" || $cmd eq "open" || $cmd eq "close" || $cmd eq "my" || $cmd eq "stop" )
|
||||||
#}
|
{
|
||||||
|
tahoma_applyRequest($hash,1,$cmd,$val);
|
||||||
return undef;
|
return undef;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user