FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-01-31 12:49:34 +00:00
Code Issues Releases Wiki Activity

10_pilight_ctrl: NEW: protocol oregon_21 (temp)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@11597 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
risiko79 2016-06-02 18:35:19 +00:00
parent 8f2a57c665
commit 01381d4ce2
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fhem/CHANGED
View File

@ -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.
- feature: 10_pilight_ctrl: NEW: protocol oregon_21 for temperature
- deleted: 52_I2C_GY30_BH1750FVI: Arno Augustin hatte fast zeitgleich
eine technisch bessere Variante entwickelt. Diese ist
nicht mehr notwendig

12
fhem/FHEM/37_plex.pm
View File

@ -1040,7 +1040,7 @@ plex_Set($$@)
}
$list .= 'playMedia ' if( !$hash->{controllable} || $hash->{controllable} =~ m/\bplayPause\b/ );
$list .= 'play ' if( $hash->{protocolCapabilities} =~ m/\bplayqueues\b/ );
$list .= 'play ' if( defined($hash->{protocolCapabilities}) && $hash->{protocolCapabilities} =~ m/\bplayqueues\b/ );
$list .= 'resume:noArg ' if( !$hash->{controllable} || $hash->{controllable} =~ m/\bplayPause\b/ );
$list .= 'pause:noArg ' if( $hash->{controllable} && $hash->{controllable} =~ m/\bplayPause\b/ );;
$list .= 'stop:noArg ' if( $hash->{controllable} && $hash->{controllable} =~ m/\bstop\b/ );;
@ -2388,6 +2388,7 @@ plex_parseTimeline($$$)
delete $chash->{time};
delete $chash->{seekRange};
delete $chash->{controllable};
my $controllable;
foreach my $entry (@{$xml->{Timeline}}) {
next if( !$entry->{state} );
@ -2406,6 +2407,10 @@ plex_parseTimeline($$$)
$chash->{controllable} = $entry->{controllable} if( $entry->{controllable} );
if( $entry->{type} && $entry->{controllable}) {
$controllable->{ $entry->{type} } = $entry->{controllable};
}
if( $entry->{time} ) {
# if( !$chash->{helper}{time} || abs($entry->{time} - $chash->{helper}{time}) > 2000 ) {
# plex_readingsBulkUpdateIfChanged($chash, 'time', plex_sec2hms($entry->{time}/1000) );
@ -2430,6 +2435,7 @@ plex_parseTimeline($$$)
if( $state =~ '(\w*):(playing|paused)' ) {
$chash->{currentMediaType} = $1;
$chash->{controllable} = $controllable->{ $1 };
} else {
delete $chash->{currentMediaType};
}
@ -3981,7 +3987,7 @@ plex_publishToSonos($$;$)
$param->{cl} = $hash->{CL} if( ref($hash->{CL}) eq 'HASH' );
$param->{callback} = \&plex_parseHttpAnswer;
my($err,$data) = HttpUtils_NonblockingGet( $param );
my($err,$tmpdata) = HttpUtils_NonblockingGet( $param );
Log3 $name, 2, "$name: http request ($url) failed: $err" if( $err );
@ -4025,7 +4031,7 @@ plex_publishToSonos($$;$)
$param->{cl} = $hash->{CL} if( ref($hash->{CL}) eq 'HASH' );
$param->{callback} = \&plex_parseHttpAnswer;
my($err,$data) = HttpUtils_NonblockingGet( $param );
my($err,$tmpdata) = HttpUtils_NonblockingGet( $param );
Log3 $name, 2, "$name: http request ($url) failed: $err" if( $err );