mhop/fhem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

74_AutomowerConnect: Commandref corrections, fix start up warning, improve attribute disableForIntervalls handling

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@28310 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
Ellert
2023-12-24 14:23:15 +00:00
parent f4905b08be
commit c99f90fc4f
3 changed files with 34 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
fhem/lib/FHEM/Devices/AMConnect/Common.pm
View File

@@ -457,7 +457,7 @@ sub FW_detailFn {
my ($FW_wname, $name, $room, $pageHash) = @_; # pageHash is set for summaryFn.
my $hash = $defs{$name};
my $type = $hash->{TYPE};
return '' if( AttrVal($name, 'disable', 0) || !AttrVal($name, 'showMap', 1) );
return '' if( AttrVal($name, 'disable', 0) || !AttrVal($name, 'showMap', 1) || !$::init_done );
my $img = "$FW_ME/$type/$name/map";
my $zoom=AttrVal( $name,"mapImageZoom", 0.7 );
@@ -633,9 +633,18 @@ sub APIAuth {
my $type = $hash->{TYPE};
my $iam = "$type $name APIAuth:";
if( IsDisabled( $name ) ) {
if ( IsDisabled( $name ) ) {
if ( IsDisabled( $name ) == 1 and ReadingsVal( $name, 'device_state', '' ) ne 'disabled' ) {
readingsSingleUpdate( $hash, 'device_state', 'disabled', 1 );
} elsif ( IsDisabled( $name ) == 2 and ReadingsVal( $name, 'device_state', '' ) ne 'temporarily disabled' ) {
readingsSingleUpdate( $hash, 'device_state', 'temporarily disabled', 1 );
}
readingsSingleUpdate( $hash, 'device_state', 'temporarily disabled', 1 ) if ( ReadingsVal( $name, 'device_state', '' ) !~ /disabled/ );
RemoveInternalTimer( $hash );
InternalTimer( gettimeofday() + $hash->{helper}{retry_interval_apiauth}, \&APIAuth, $hash, 0 );
return undef;
@@ -1323,6 +1332,7 @@ sub Attr {
my $hash = $defs{$name};
my $type = $hash->{TYPE};
my $iam = "$type $name Attr:";
##########
if( $attrName eq "disable" ) {
if( $cmd eq "set" and $attrVal eq "1" ) {
@@ -2600,6 +2610,17 @@ sub FmtDateTimeGMT {
sub wsKeepAlive {
my ($hash) = @_;
my $name = $hash->{NAME};
if ( IsDisabled( $name ) == 2 ) {
RemoveInternalTimer( $hash );
DevIo_CloseDev( $hash ) if ( DevIo_IsOpen( $hash ) );
DevIo_setStates( $hash, "closed" );
InternalTimer( gettimeofday() + 1, \&APIAuth, $hash, 0 );
}
RemoveInternalTimer( $hash, \&wsKeepAlive);
DevIo_Ping($hash);
InternalTimer(gettimeofday() + $hash->{helper}{interval_ping}, \&wsKeepAlive, $hash, 0);