Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

YAMAHA_AVR: making set on/off blocking again

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@6073 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
markusbloch 2014-06-05 21:23:25 +00:00
parent 688c6c75af
commit e40e81d97c
1 changed files with 48 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
fhem/FHEM/71_YAMAHA_AVR.pm
View File

@ -180,11 +180,11 @@ YAMAHA_AVR_Set($@)
if($what eq "on") if($what eq "on")
{ {
YAMAHA_AVR_SendCommand($hash, "<YAMAHA_AV cmd=\"PUT\"><$zone><Power_Control><Power>On</Power></Power_Control></$zone></YAMAHA_AV>" ,$what,undef); YAMAHA_AVR_SendCommand($hash, "<YAMAHA_AV cmd=\"PUT\"><$zone><Power_Control><Power>On</Power></Power_Control></$zone></YAMAHA_AV>" ,$what,undef, 1);
} }
elsif($what eq "off") elsif($what eq "off")
{ {
YAMAHA_AVR_SendCommand($hash, "<YAMAHA_AV cmd=\"PUT\"><$zone><Power_Control><Power>Standby</Power></Power_Control></$zone></YAMAHA_AV>", $what, undef); YAMAHA_AVR_SendCommand($hash, "<YAMAHA_AV cmd=\"PUT\"><$zone><Power_Control><Power>Standby</Power></Power_Control></$zone></YAMAHA_AV>", $what, undef, 1);
} }
elsif($what eq "input") elsif($what eq "input")
{ {
@ -719,26 +719,54 @@ YAMAHA_AVR_Undefine($$)
sub sub
YAMAHA_AVR_SendCommand($@) YAMAHA_AVR_SendCommand($@)
{ {
my ($hash, $data,$cmd,$arg) = @_; my ($hash, $data,$cmd,$arg,$blocking) = @_;
my $name = $hash->{NAME}; my $name = $hash->{NAME};
my $address = $hash->{helper}{ADDRESS}; my $address = $hash->{helper}{ADDRESS};
$blocking = 0 unless(defined($blocking));
Log3 $name, 5, "YAMAHA_AVR ($name) - execute \"$cmd".(defined($arg) ? " ".(split("\\|", $arg))[0] : "")."\" on $name: $data";
# In case any URL changes must be made, this part is separated in this function". # In case any URL changes must be made, this part is separated in this function".
HttpUtils_NonblockingGet({ if($blocking == 1)
url => "http://".$address."/YamahaRemoteControl/ctrl", {
timeout => AttrVal($name, "request-timeout", 4),
noshutdown => 1, Log3 $name, 5, "YAMAHA_AVR ($name) - execute blocking \"$cmd".(defined($arg) ? " ".(split("\\|", $arg))[0] : "")."\" on $name: $data";
data => "<?xml version=\"1.0\" encoding=\"utf-8\"?>".$data, my $param = {
loglevel => ($hash->{helper}{AVAILABLE} ? undef : 5), url => "http://".$address."/YamahaRemoteControl/ctrl",
hash => $hash, timeout => AttrVal($name, "request-timeout", 4),
cmd => $cmd, noshutdown => 1,
arg => $arg, data => "<?xml version=\"1.0\" encoding=\"utf-8\"?>".$data,
callback => \&YAMAHA_AVR_ParseResponse loglevel => ($hash->{helper}{AVAILABLE} ? undef : 5),
} hash => $hash,
); cmd => $cmd,
arg => $arg
};
my ($err, $data) = HttpUtils_BlockingGet($param);
return YAMAHA_AVR_ParseResponse($param, $err, $data);
}
else
{
Log3 $name, 5, "YAMAHA_AVR ($name) - execute nonblocking \"$cmd".(defined($arg) ? " ".(split("\\|", $arg))[0] : "")."\" on $name: $data";
HttpUtils_NonblockingGet({
url => "http://".$address."/YamahaRemoteControl/ctrl",
timeout => AttrVal($name, "request-timeout", 4),
noshutdown => 1,
data => "<?xml version=\"1.0\" encoding=\"utf-8\"?>".$data,
loglevel => ($hash->{helper}{AVAILABLE} ? undef : 5),
hash => $hash,
cmd => $cmd,
arg => $arg,
callback => \&YAMAHA_AVR_ParseResponse
}
);
}
} }
############################# #############################
@ -1173,8 +1201,8 @@ sub YAMAHA_AVR_getModel($)
{ {
my ($hash) = @_; my ($hash) = @_;
YAMAHA_AVR_SendCommand($hash, "<YAMAHA_AV cmd=\"GET\"><System><Unit_Desc>GetParam</Unit_Desc></System></YAMAHA_AV>", "statusRequest","unitDescription"); YAMAHA_AVR_SendCommand($hash, "<YAMAHA_AV cmd=\"GET\"><System><Unit_Desc>GetParam</Unit_Desc></System></YAMAHA_AV>", "statusRequest","unitDescription", 1);
YAMAHA_AVR_SendCommand($hash, "<YAMAHA_AV cmd=\"GET\"><System><Config>GetParam</Config></System></YAMAHA_AV>", "statusRequest","systemConfig"); YAMAHA_AVR_SendCommand($hash, "<YAMAHA_AV cmd=\"GET\"><System><Config>GetParam</Config></System></YAMAHA_AV>", "statusRequest","systemConfig", 1);
} }
############################# #############################
@ -1276,10 +1304,10 @@ sub YAMAHA_AVR_getInputs($)
return undef if (not defined($zone) or $zone eq ""); return undef if (not defined($zone) or $zone eq "");
# query all inputs # query all inputs
YAMAHA_AVR_SendCommand($hash, "<YAMAHA_AV cmd=\"GET\"><$zone><Input><Input_Sel_Item>GetParam</Input_Sel_Item></Input></$zone></YAMAHA_AV>", "statusRequest","getInputs"); YAMAHA_AVR_SendCommand($hash, "<YAMAHA_AV cmd=\"GET\"><$zone><Input><Input_Sel_Item>GetParam</Input_Sel_Item></Input></$zone></YAMAHA_AV>", "statusRequest","getInputs", 1);
# query all available scenes # query all available scenes
YAMAHA_AVR_SendCommand($hash, "<YAMAHA_AV cmd=\"GET\"><$zone><Scene><Scene_Sel_Item>GetParam</Scene_Sel_Item></Scene></$zone></YAMAHA_AV>", "statusRequest","getScenes"); YAMAHA_AVR_SendCommand($hash, "<YAMAHA_AV cmd=\"GET\"><$zone><Scene><Scene_Sel_Item>GetParam</Scene_Sel_Item></Scene></$zone></YAMAHA_AV>", "statusRequest","getScenes", 1);
} }
############################# #############################