FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-03 10:46:53 +00:00
Code Issues Releases Wiki Activity

73_AutoShuttersControl: add SummaryFn

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@21012 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
LeonGaultier 2020-01-19 09:35:34 +00:00
parent cb7db4b0c8
commit 3c7fd29c0e
2 changed files with 21 additions and 22 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. # 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. # 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 - change: 93_DbLog: adjust configCheck with plotEmbed check. Forum: #107383
- feature: 73_DoorBird: Direct "Transmit_Audio" without fhem SIP Device - feature: 73_DoorBird: Direct "Transmit_Audio" without fhem SIP Device
- feature: 73_NUKIBridge: remove set callbackRemove - feature: 73_NUKIBridge: remove set callbackRemove

42
fhem/FHEM/73_AutoShuttersControl.pm
View File

@ -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 ## 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 # und davor mit :: getrennt der eigentliche package Name des Modules
$hash->{SetFn} = 'FHEM::AutoShuttersControl::Set'; $hash->{SetFn} = 'FHEM::AutoShuttersControl::Set';
$hash->{GetFn} = 'FHEM::AutoShuttersControl::Get'; $hash->{GetFn} = 'FHEM::AutoShuttersControl::Get';
$hash->{DefFn} = 'FHEM::AutoShuttersControl::Define'; $hash->{DefFn} = 'FHEM::AutoShuttersControl::Define';
$hash->{NotifyFn} = 'FHEM::AutoShuttersControl::Notify'; $hash->{NotifyFn} = 'FHEM::AutoShuttersControl::Notify';
$hash->{UndefFn} = 'FHEM::AutoShuttersControl::Undef'; $hash->{UndefFn} = 'FHEM::AutoShuttersControl::Undef';
$hash->{AttrFn} = 'FHEM::AutoShuttersControl::Attr'; $hash->{AttrFn} = 'FHEM::AutoShuttersControl::Attr';
$hash->{AttrList} = $hash->{AttrList} =
'ASC_tempSensor ' 'ASC_tempSensor '
. 'ASC_brightnessDriveUpDown ' . 'ASC_brightnessDriveUpDown '
. 'ASC_autoShuttersControlMorning:on,off ' . 'ASC_autoShuttersControlMorning:on,off '
@ -322,7 +322,8 @@ sub Initialize($) {
. 'ASC_blockAscDrivesAfterManual:0,1 ' . 'ASC_blockAscDrivesAfterManual:0,1 '
. 'ASC_debug:1 ' . 'ASC_debug:1 '
. $readingFnAttributes; . $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 ); return FHEM::Meta::InitMod( __FILE__, $hash );
} }
@ -680,20 +681,13 @@ sub Get($$@) {
my ( $cmd, @args ) = @aa; my ( $cmd, @args ) = @aa;
if ( lc $cmd eq 'showshuttersinformations' ) { if ( lc $cmd eq 'shownotifydevsinformations' ) {
return "usage: $cmd" if ( @args != 0 );
my $ret = GetShuttersInformation($hash);
return $ret;
}
elsif ( lc $cmd eq 'shownotifydevsinformations' ) {
return "usage: $cmd" if ( @args != 0 ); return "usage: $cmd" if ( @args != 0 );
my $ret = GetMonitoredDevs($hash); my $ret = GetMonitoredDevs($hash);
return $ret; return $ret;
} }
else { else {
my $list = ""; my $list = "";
$list .= " showShuttersInformations:noArg"
if ( ReadingsVal( $name, 'userAttrList', 'none' ) eq 'rolled out' );
$list .= " showNotifyDevsInformations:noArg" $list .= " showNotifyDevsInformations:noArg"
if ( ReadingsVal( $name, 'userAttrList', 'none' ) eq 'rolled out' if ( ReadingsVal( $name, 'userAttrList', 'none' ) eq 'rolled out'
and AttrVal( $name, 'ASC_expert', 0 ) == 1 ); and AttrVal( $name, 'ASC_expert', 0 ) == 1 );
@ -3197,9 +3191,12 @@ sub CreateNewNotifyDev($) {
$hash->{NOTIFYDEV} = $hash->{NOTIFYDEV} . $shuttersList; $hash->{NOTIFYDEV} = $hash->{NOTIFYDEV} . $shuttersList;
} }
sub GetShuttersInformation($) { sub ShuttersInformation($@) {
my $hash = shift;
my $ret = '<html><table><tr><td>'; my ($FW_wname, $d, $room, $pageHash) = @_;
my $hash = $defs{$d};
my $ret = '<html><table><tr><h3>ASC Configuration and Information Summary</h3><td>';
$ret .= '<table class="block wide">'; $ret .= '<table class="block wide">';
$ret .= '<tr class="even">'; $ret .= '<tr class="even">';
$ret .= "<td><b>Shutters</b></td>"; $ret .= "<td><b>Shutters</b></td>";
@ -3275,7 +3272,8 @@ sub GetShuttersInformation($) {
$linecount++; $linecount++;
} }
$ret .= '</table></td></tr>'; $ret .= '</table></td></tr>';
$ret .= '</table></html>'; $ret .= '</table></html><br /><br />';
return $ret; return $ret;
} }
@ -7895,9 +7893,9 @@ sub getblockAscDrivesAfterManual {
"Rollo", "Rollo",
"Control" "Control"
], ],
"release_status": "under develop", "release_status": "testing",
"license": "GPL_2", "license": "GPL_2",
"version": "v0.8.13", "version": "v0.8.14",
"author": [ "author": [
"Marko Oldenburg <leongaultier@gmail.com>" "Marko Oldenburg <leongaultier@gmail.com>"
], ],