FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-29 23:47:10 +00:00
Code Issues Releases Wiki Activity

ENIGMA2: fix logging and presence

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@5039 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
jpawlowski 2014-02-24 14:05:26 +00:00
parent 31b466a382
commit 6fbb0cbce1
1 changed files with 22 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
fhem/FHEM/70_ENIGMA2.pm
View File

@ -24,7 +24,7 @@
# along with fhem. If not, see <http://www.gnu.org/licenses/>.
#
#
# Version: 1.3.0
# Version: 1.3.1
#
# Major Version History:
# - 1.3.0 - 2013-12-21
@ -785,13 +785,6 @@ sub ENIGMA2_Define($$) {
$attr{$name}{icon} = 'dreambox';
}
unless ( defined( $hash->{helper}{AVAILABLE} )
and ( $hash->{helper}{AVAILABLE} == 0 ) )
{
$hash->{helper}{AVAILABLE} = 1;
readingsSingleUpdate( $hash, "presence", "present", 1 );
}
# start the status update timer
RemoveInternalTimer($hash);
InternalTimer( gettimeofday() + 2, "ENIGMA2_GetStatus", $hash, 1 );
@ -960,35 +953,35 @@ sub ENIGMA2_ReceiveCommand($$$) {
if ( $service eq "powerstate" ) {
$state = "absent";
if (
( not exists( $hash->{helper}{AVAILABLE} ) )
or ( exists( $hash->{helper}{AVAILABLE} )
and $hash->{helper}{AVAILABLE} eq 1 )
)
{
Log3 $name, 3, "ENIGMA2 device $name is unavailable";
readingsBulkUpdate( $hash, "presence", "absent" );
}
}
# all others
else {
if ( !defined($cmd) || $cmd eq "" ) {
Log3 $name, 4, "ENIGMA2 $name: RCV ERROR $service";
Log3 $name, 4, "ENIGMA2 $name: RCV TIMEOUT $service";
}
else {
Log3 $name, 4,
"ENIGMA2 $name: RCV ERROR $service/" . urlDecode($cmd);
"ENIGMA2 $name: RCV TIMEOUT $service/" . urlDecode($cmd);
}
if (
( !defined( $hash->{helper}{AVAILABLE} ) )
or ( defined( $hash->{helper}{AVAILABLE} )
and $hash->{helper}{AVAILABLE} eq 1 )
)
{
$hash->{helper}{AVAILABLE} = 0;
readingsBulkUpdate( $hash, "presence", "absent" );
}
}
}
# data received
elsif ($data) {
if ( defined( $hash->{helper}{AVAILABLE} )
and $hash->{helper}{AVAILABLE} eq 0 )
if (
( !defined( $hash->{helper}{AVAILABLE} ) )
or ( defined( $hash->{helper}{AVAILABLE} )
and $hash->{helper}{AVAILABLE} eq 0 )
)
{
Log3 $name, 3, "ENIGMA2 device $name is available";
$hash->{helper}{AVAILABLE} = 1;
readingsBulkUpdate( $hash, "presence", "present" );
}
@ -1127,7 +1120,9 @@ sub ENIGMA2_ReceiveCommand($$$) {
ENIGMA2_SendCommand( $hash, "signal" );
}
}
elsif ( $hash->{helper}{AVAILABLE} == 1 ) {
elsif ( defined( $hash->{helper}{AVAILABLE} )
&& $hash->{helper}{AVAILABLE} == 1 )
{
Log3 $name, 2,
"ENIGMA2 $name: ERROR: Undefined state of device";
@ -1944,8 +1939,6 @@ sub ENIGMA2_ReceiveCommand($$$) {
readingsEndUpdate( $hash, 1 );
$hash->{helper}{AVAILABLE} = ( defined($data) ? 1 : 0 );
return;
}