diff --git a/CHANGED b/CHANGED index 201f616a8..dd8d7ac88 100644 --- a/CHANGED +++ b/CHANGED @@ -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: 73_AutoShuttersControl: add SummaryFn - change: 93_DbLog: adjust configCheck with plotEmbed check. Forum: #107383 - feature: 73_DoorBird: Direct "Transmit_Audio" without fhem SIP Device - feature: 73_NUKIBridge: remove set callbackRemove diff --git a/FHEM/73_AutoShuttersControl.pm b/FHEM/73_AutoShuttersControl.pm index 1e67baa4a..b563119d3 100644 --- a/FHEM/73_AutoShuttersControl.pm +++ b/FHEM/73_AutoShuttersControl.pm @@ -296,13 +296,13 @@ sub Initialize($) { ## Da ich mit package arbeite müssen in die Initialize für die jeweiligen hash Fn Funktionen der Funktionsname # und davor mit :: getrennt der eigentliche package Name des Modules - $hash->{SetFn} = 'FHEM::AutoShuttersControl::Set'; - $hash->{GetFn} = 'FHEM::AutoShuttersControl::Get'; - $hash->{DefFn} = 'FHEM::AutoShuttersControl::Define'; - $hash->{NotifyFn} = 'FHEM::AutoShuttersControl::Notify'; - $hash->{UndefFn} = 'FHEM::AutoShuttersControl::Undef'; - $hash->{AttrFn} = 'FHEM::AutoShuttersControl::Attr'; - $hash->{AttrList} = + $hash->{SetFn} = 'FHEM::AutoShuttersControl::Set'; + $hash->{GetFn} = 'FHEM::AutoShuttersControl::Get'; + $hash->{DefFn} = 'FHEM::AutoShuttersControl::Define'; + $hash->{NotifyFn} = 'FHEM::AutoShuttersControl::Notify'; + $hash->{UndefFn} = 'FHEM::AutoShuttersControl::Undef'; + $hash->{AttrFn} = 'FHEM::AutoShuttersControl::Attr'; + $hash->{AttrList} = 'ASC_tempSensor ' . 'ASC_brightnessDriveUpDown ' . 'ASC_autoShuttersControlMorning:on,off ' @@ -322,7 +322,8 @@ sub Initialize($) { . 'ASC_blockAscDrivesAfterManual:0,1 ' . 'ASC_debug:1 ' . $readingFnAttributes; - $hash->{NotifyOrderPrefix} = '51-'; # Order Nummer für NotifyFn + $hash->{NotifyOrderPrefix} = '51-'; # Order Nummer für NotifyFn + $hash->{FW_detailFn} = 'FHEM::AutoShuttersControl::ShuttersInformation'; return FHEM::Meta::InitMod( __FILE__, $hash ); } @@ -680,20 +681,13 @@ sub Get($$@) { my ( $cmd, @args ) = @aa; - if ( lc $cmd eq 'showshuttersinformations' ) { - return "usage: $cmd" if ( @args != 0 ); - my $ret = GetShuttersInformation($hash); - return $ret; - } - elsif ( lc $cmd eq 'shownotifydevsinformations' ) { + if ( lc $cmd eq 'shownotifydevsinformations' ) { return "usage: $cmd" if ( @args != 0 ); my $ret = GetMonitoredDevs($hash); return $ret; } else { my $list = ""; - $list .= " showShuttersInformations:noArg" - if ( ReadingsVal( $name, 'userAttrList', 'none' ) eq 'rolled out' ); $list .= " showNotifyDevsInformations:noArg" if ( ReadingsVal( $name, 'userAttrList', 'none' ) eq 'rolled out' and AttrVal( $name, 'ASC_expert', 0 ) == 1 ); @@ -3197,9 +3191,12 @@ sub CreateNewNotifyDev($) { $hash->{NOTIFYDEV} = $hash->{NOTIFYDEV} . $shuttersList; } -sub GetShuttersInformation($) { - my $hash = shift; - my $ret = '
'; +sub ShuttersInformation($@) { + + my ($FW_wname, $d, $room, $pageHash) = @_; + my $hash = $defs{$d}; + + my $ret = '

ASC Configuration and Information Summary

'; - $ret .= '
'; $ret .= ''; $ret .= ''; $ret .= ""; @@ -3275,7 +3272,8 @@ sub GetShuttersInformation($) { $linecount++; } $ret .= '
Shutters
'; + $ret .= '


'; + return $ret; } @@ -7895,9 +7893,9 @@ sub getblockAscDrivesAfterManual { "Rollo", "Control" ], - "release_status": "under develop", + "release_status": "testing", "license": "GPL_2", - "version": "v0.8.13", + "version": "v0.8.14", "author": [ "Marko Oldenburg " ],