FHEM/mod-AutoShuttersControl
1
0
Fork 0
Code Issues 12 Pull Requests Releases 9 Wiki Activity

dev #122

Merged
marko merged 9 commits from dev into testing 2023-01-03 06:48:56 +00:00
Conversation 0 Commits 9 Files Changed 17 +47 -51
17 changed files with 47 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9cd0d364b4 - Show all commits

4
FHEM/73_AutoShuttersControl.pm
View File

@ -2,7 +2,7 @@
# #
# Developed with VSCodium and richterger perl plugin # Developed with VSCodium and richterger perl plugin
# #
# (c) 2018-2022 Copyright: Marko Oldenburg (fhemdevelopment at cooltux dot net) # (c) 2018-2023 Copyright: Marko Oldenburg (fhemdevelopment at cooltux dot net)
# All rights reserved # All rights reserved
# #
# Special thanks goes to: # Special thanks goes to:
@ -1462,7 +1462,7 @@ __END__
], ],
"release_status": "stable", "release_status": "stable",
"license": "GPL_2", "license": "GPL_2",
"version": "v0.10.24", "version": "v0.10.25",
"author": [ "author": [
"Marko Oldenburg <fhemdevelopment@cooltux.net>" "Marko Oldenburg <fhemdevelopment@cooltux.net>"
], ],

32
controls_AutoShuttersControl.txt
View File

@ -1,16 +1,16 @@
UPD 2022-12-15_09:41:38 116288 FHEM/73_AutoShuttersControl.pm UPD 2022-12-20_14:16:31 116314 FHEM/73_AutoShuttersControl.pm
UPD 2022-12-15_09:55:10 76615 lib/FHEM/Automation/ShuttersControl.pm UPD 2022-12-20_14:12:54 76615 lib/FHEM/Automation/ShuttersControl.pm
UPD 2022-01-14_08:49:13 2691 lib/FHEM/Automation/ShuttersControl/Dev.pm UPD 2022-12-20_14:14:29 2691 lib/FHEM/Automation/ShuttersControl/Dev.pm
UPD 2022-01-14_08:49:13 2677 lib/FHEM/Automation/ShuttersControl/Roommate.pm UPD 2022-12-20_14:13:42 2675 lib/FHEM/Automation/ShuttersControl/Roommate.pm
UPD 2022-03-05_09:12:41 32016 lib/FHEM/Automation/ShuttersControl/Shutters.pm UPD 2022-12-20_14:13:20 31828 lib/FHEM/Automation/ShuttersControl/Shutters.pm
UPD 2022-08-29_13:28:18 25543 lib/FHEM/Automation/ShuttersControl/Shading.pm UPD 2022-12-20_14:13:30 25541 lib/FHEM/Automation/ShuttersControl/Shading.pm
UPD 2022-08-29_13:28:18 112285 lib/FHEM/Automation/ShuttersControl/EventProcessingFunctions.pm UPD 2022-12-20_14:14:20 112297 lib/FHEM/Automation/ShuttersControl/EventProcessingFunctions.pm
UPD 2022-08-29_13:28:18 40705 lib/FHEM/Automation/ShuttersControl/Helper.pm UPD 2022-12-20_14:14:08 40681 lib/FHEM/Automation/ShuttersControl/Helper.pm
UPD 2022-01-14_08:49:13 2209 lib/FHEM/Automation/ShuttersControl/Window.pm UPD 2022-12-20_14:13:02 2209 lib/FHEM/Automation/ShuttersControl/Window.pm
UPD 2022-01-14_08:49:13 11857 lib/FHEM/Automation/ShuttersControl/Dev/Attr.pm UPD 2022-12-20_14:16:12 11857 lib/FHEM/Automation/ShuttersControl/Dev/Attr.pm
UPD 2022-01-14_08:49:13 7265 lib/FHEM/Automation/ShuttersControl/Dev/Readings.pm UPD 2022-12-20_14:16:04 7265 lib/FHEM/Automation/ShuttersControl/Dev/Readings.pm
UPD 2022-03-05_09:12:39 52751 lib/FHEM/Automation/ShuttersControl/Shutters/Attr.pm UPD 2022-12-20_14:15:59 52751 lib/FHEM/Automation/ShuttersControl/Shutters/Attr.pm
UPD 2022-01-14_08:49:13 2799 lib/FHEM/Automation/ShuttersControl/Shutters/Readings.pm UPD 2022-12-20_14:14:58 2799 lib/FHEM/Automation/ShuttersControl/Shutters/Readings.pm
UPD 2022-01-14_08:49:13 3887 lib/FHEM/Automation/ShuttersControl/Window/Attr.pm UPD 2022-12-20_14:14:47 3887 lib/FHEM/Automation/ShuttersControl/Window/Attr.pm
UPD 2022-01-14_08:49:13 2200 lib/FHEM/Automation/ShuttersControl/Window/Readings.pm UPD 2022-12-20_14:14:39 2200 lib/FHEM/Automation/ShuttersControl/Window/Readings.pm
UPD 2022-08-29_13:28:18 7396 lib/FHEM/Automation/ShuttersControl/Rainprotection.pm UPD 2022-12-20_14:13:55 7394 lib/FHEM/Automation/ShuttersControl/Rainprotection.pm

2
lib/FHEM/Automation/ShuttersControl.pm
View File

@ -2,7 +2,7 @@
# #
# Developed with VSCodium and richterger perl plugin # Developed with VSCodium and richterger perl plugin
# #
# (c) 2018-2022 Copyright: Marko Oldenburg (fhemdevelopment at cooltux dot net) # (c) 2018-2023 Copyright: Marko Oldenburg (fhemdevelopment at cooltux dot net)
# All rights reserved # All rights reserved
# #
# Special thanks goes to: # Special thanks goes to:

2
lib/FHEM/Automation/ShuttersControl/Dev.pm
View File

@ -2,7 +2,7 @@
# #
# Developed with VSCodium and richterger perl plugin # Developed with VSCodium and richterger perl plugin
# #
# (c) 2018-2022 Copyright: Marko Oldenburg (fhemdevelopment at cooltux dot net) # (c) 2018-2023 Copyright: Marko Oldenburg (fhemdevelopment at cooltux dot net)
# All rights reserved # All rights reserved
# #
# Special thanks goes to: # Special thanks goes to:

2
lib/FHEM/Automation/ShuttersControl/Dev/Attr.pm
View File

@ -2,7 +2,7 @@
# #
# Developed with VSCodium and richterger perl plugin # Developed with VSCodium and richterger perl plugin
# #
# (c) 2018-2022 Copyright: Marko Oldenburg (fhemdevelopment at cooltux dot net) # (c) 2018-2023 Copyright: Marko Oldenburg (fhemdevelopment at cooltux dot net)
# All rights reserved # All rights reserved
# #
# Special thanks goes to: # Special thanks goes to:

2
lib/FHEM/Automation/ShuttersControl/Dev/Readings.pm
View File

@ -2,7 +2,7 @@
# #
# Developed with VSCodium and richterger perl plugin # Developed with VSCodium and richterger perl plugin
# #
# (c) 2018-2022 Copyright: Marko Oldenburg (fhemdevelopment at cooltux dot net) # (c) 2018-2023 Copyright: Marko Oldenburg (fhemdevelopment at cooltux dot net)
# All rights reserved # All rights reserved
# #
# Special thanks goes to: # Special thanks goes to:

10
lib/FHEM/Automation/ShuttersControl/EventProcessingFunctions.pm
View File

@ -2,7 +2,7 @@
# #
# Developed with VSCodium and richterger perl plugin # Developed with VSCodium and richterger perl plugin
# #
# (c) 2018-2022 Copyright: Marko Oldenburg (fhemdevelopment at cooltux dot net) # (c) 2018-2023 Copyright: Marko Oldenburg (fhemdevelopment at cooltux dot net)
# All rights reserved # All rights reserved
# #
# Special thanks goes to: # Special thanks goes to:
@ -47,8 +47,8 @@ use utf8;
use Data::Dumper; #only for Debugging use Data::Dumper; #only for Debugging
use FHEM::Automation::ShuttersControl::Helper qw (:ALL); use FHEM::Automation::ShuttersControl::Helper qw (:ALL);
use FHEM::Automation::ShuttersControl::Shading qw (:ALL); use FHEM::Automation::ShuttersControl::Shading qw (:ALL);
use FHEM::Automation::ShuttersControl::Rainprotection qw (:ALL); use FHEM::Automation::ShuttersControl::Rainprotection qw (:ALL);
require Exporter; require Exporter;
@ -68,7 +68,7 @@ our %EXPORT_TAGS = (
EventProcessingGeneral EventProcessingGeneral
EventProcessingShutters EventProcessingShutters
EventProcessingAdvShuttersClose EventProcessingAdvShuttersClose
) )
], ],
); );
@ -144,7 +144,7 @@ sub EventProcessingGeneral {
|ASC_twilightDevice) |ASC_twilightDevice)
\s(.*)$}xms \s(.*)$}xms
) )
{ # wurde den Attributen unserer Rolläden ein Wert zugewiesen ? { # wurde den Attributen unserer Rolläden ein Wert zugewiesen ?
FHEM::Automation::ShuttersControl::AddNotifyDev( $hash, $3, $1, $2 ) FHEM::Automation::ShuttersControl::AddNotifyDev( $hash, $3, $1, $2 )
if ( $3 ne 'none' ); if ( $3 ne 'none' );
::Log3( $name, 4, ::Log3( $name, 4,

10
lib/FHEM/Automation/ShuttersControl/Helper.pm
View File

@ -2,7 +2,7 @@
# #
# Developed with VSCodium and richterger perl plugin # Developed with VSCodium and richterger perl plugin
# #
# (c) 2018-2022 Copyright: Marko Oldenburg (fhemdevelopment at cooltux dot net) # (c) 2018-2023 Copyright: Marko Oldenburg (fhemdevelopment at cooltux dot net)
# All rights reserved # All rights reserved
# #
# Special thanks goes to: # Special thanks goes to:
@ -84,7 +84,7 @@ our %EXPORT_TAGS = (
PerlCodeCheck PerlCodeCheck
IsAdv IsAdv
IsInTime IsInTime
) )
], ],
); );
@ -207,7 +207,7 @@ sub CheckIfShuttersWindowRecOpen {
m{[Cc]lose|true}xms ) m{[Cc]lose|true}xms )
{ {
return 0; return 0;
} # CK: covers: close|closed } # CK: covers: close|closed
} }
sub ExtractNotifyDevFromEvent { sub ExtractNotifyDevFromEvent {
@ -408,7 +408,7 @@ sub _IsDay {
sub ShuttersSunrise { sub ShuttersSunrise {
my $shuttersDev = shift; my $shuttersDev = shift;
my $tm = shift; # Tm steht für Timemode und bedeutet Realzeit oder Unixzeit my $tm = shift; # Tm steht für Timemode und bedeutet Realzeit oder Unixzeit
my $autoAstroMode; my $autoAstroMode;
$FHEM::Automation::ShuttersControl::shutters->setShuttersDev($shuttersDev); $FHEM::Automation::ShuttersControl::shutters->setShuttersDev($shuttersDev);
@ -829,7 +829,7 @@ sub ShuttersSunrise {
sub ShuttersSunset { sub ShuttersSunset {
my $shuttersDev = shift; my $shuttersDev = shift;
my $tm = shift; # Tm steht für Timemode und bedeutet Realzeit oder Unixzeit my $tm = shift; # Tm steht für Timemode und bedeutet Realzeit oder Unixzeit
my $autoAstroMode; my $autoAstroMode;
$FHEM::Automation::ShuttersControl::shutters->setShuttersDev($shuttersDev); $FHEM::Automation::ShuttersControl::shutters->setShuttersDev($shuttersDev);

4
lib/FHEM/Automation/ShuttersControl/Rainprotection.pm
View File

@ -2,7 +2,7 @@
# #
# Developed with VSCodium and richterger perl plugin # Developed with VSCodium and richterger perl plugin
# #
# (c) 2018-2022 Copyright: Marko Oldenburg (fhemdevelopment at cooltux dot net) # (c) 2018-2023 Copyright: Marko Oldenburg (fhemdevelopment at cooltux dot net)
# All rights reserved # All rights reserved
# #
# Special thanks goes to: # Special thanks goes to:
@ -57,7 +57,7 @@ our %EXPORT_TAGS = (
ALL => [ ALL => [
qw( qw(
RainProcessing RainProcessing
) )
], ],
); );

4
lib/FHEM/Automation/ShuttersControl/Roommate.pm
View File

@ -2,7 +2,7 @@
# #
# Developed with VSCodium and richterger perl plugin # Developed with VSCodium and richterger perl plugin
# #
# (c) 2018-2022 Copyright: Marko Oldenburg (fhemdevelopment at cooltux dot net) # (c) 2018-2023 Copyright: Marko Oldenburg (fhemdevelopment at cooltux dot net)
# All rights reserved # All rights reserved
# #
# Special thanks goes to: # Special thanks goes to:
@ -57,7 +57,7 @@ our %EXPORT_TAGS = (
qw( qw(
getRoommateStatus getRoommateStatus
getRoommateLastStatus getRoommateLastStatus
) )
], ],
); );

4
lib/FHEM/Automation/ShuttersControl/Shading.pm
View File

@ -2,7 +2,7 @@
# #
# Developed with VSCodium and richterger perl plugin # Developed with VSCodium and richterger perl plugin
# #
# (c) 2018-2022 Copyright: Marko Oldenburg (fhemdevelopment at cooltux dot net) # (c) 2018-2023 Copyright: Marko Oldenburg (fhemdevelopment at cooltux dot net)
# All rights reserved # All rights reserved
# #
# Special thanks goes to: # Special thanks goes to:
@ -62,7 +62,7 @@ our %EXPORT_TAGS = (
CheckASC_ConditionsForShadingFn CheckASC_ConditionsForShadingFn
ShadingProcessing ShadingProcessing
ShadingProcessingDriveCommand ShadingProcessingDriveCommand
) )
], ],
); );

12
lib/FHEM/Automation/ShuttersControl/Shutters.pm
View File

@ -2,7 +2,7 @@
# #
# Developed with VSCodium and richterger perl plugin # Developed with VSCodium and richterger perl plugin
# #
# (c) 2018-2022 Copyright: Marko Oldenburg (fhemdevelopment at cooltux dot net) # (c) 2018-2023 Copyright: Marko Oldenburg (fhemdevelopment at cooltux dot net)
# All rights reserved # All rights reserved
# #
# Special thanks goes to: # Special thanks goes to:
@ -162,10 +162,6 @@ sub setDriveCmd {
$FHEM::Automation::ShuttersControl::ascDev->setDelayCmdReading; $FHEM::Automation::ShuttersControl::ascDev->setDelayCmdReading;
$FHEM::Automation::ShuttersControl::shutters->setNoDelay(0); $FHEM::Automation::ShuttersControl::shutters->setNoDelay(0);
# $FHEM::Automation::ShuttersControl::shutters->setExternalTriggerStatus(0)
# if ( $FHEM::Automation::ShuttersControl::shutters
# ->getExternalTriggerStatus );
FHEM::Automation::ShuttersControl::ASC_Debug( 'setDriveCmd: ' FHEM::Automation::ShuttersControl::ASC_Debug( 'setDriveCmd: '
. $FHEM::Automation::ShuttersControl::shutters->getShuttersDev . $FHEM::Automation::ShuttersControl::shutters->getShuttersDev
. ' - Die Fahrt wird zurückgestellt. Grund kann ein geöffnetes Fenster sein oder ein aktivierter Party Modus oder Weihnachtszeit' . ' - Die Fahrt wird zurückgestellt. Grund kann ein geöffnetes Fenster sein oder ein aktivierter Party Modus oder Weihnachtszeit'
@ -598,7 +594,7 @@ sub getShuttersPosCmdValueNegate {
sub getQueryShuttersPos sub getQueryShuttersPos
{ # Es wird geschaut ob die aktuelle Position des Rollos unterhalb der Zielposition ist { # Es wird geschaut ob die aktuelle Position des Rollos unterhalb der Zielposition ist
my $self = shift; my $self = shift;
my $posValue = shift; # wenn dem so ist wird 1 zurück gegeben ansonsten 0 my $posValue = shift; # wenn dem so ist wird 1 zurück gegeben ansonsten 0
return ( return (
$FHEM::Automation::ShuttersControl::shutters $FHEM::Automation::ShuttersControl::shutters
@ -889,7 +885,7 @@ sub getIdleDetection {
### Begin Beschattung Objekt mit Daten befüllen ### Begin Beschattung Objekt mit Daten befüllen
sub setShadingStatus { sub setShadingStatus {
my $self = shift; my $self = shift;
my $value = shift; ### Werte für value = in, out, in reserved, out reserved my $value = shift; ### Werte für value = in, out, in reserved, out reserved
# Es wird durch das return die ShadingWaitingTime nicht mehr beachtet, Bugmeldung von Bernd Griemsmann # Es wird durch das return die ShadingWaitingTime nicht mehr beachtet, Bugmeldung von Bernd Griemsmann
# return # return
@ -1002,7 +998,7 @@ sub getBrightnessAverage {
return; return;
} }
sub getShadingStatus { # Werte für value = in, out, in reserved, out reserved sub getShadingStatus { # Werte für value = in, out, in reserved, out reserved
my $self = shift; my $self = shift;
return ( return (

2
lib/FHEM/Automation/ShuttersControl/Shutters/Attr.pm
View File

@ -2,7 +2,7 @@
# #
# Developed with VSCodium and richterger perl plugin # Developed with VSCodium and richterger perl plugin
# #
# (c) 2018-2022 Copyright: Marko Oldenburg (fhemdevelopment at cooltux dot net) # (c) 2018-2023 Copyright: Marko Oldenburg (fhemdevelopment at cooltux dot net)
# All rights reserved # All rights reserved
# #
# Special thanks goes to: # Special thanks goes to:

2
lib/FHEM/Automation/ShuttersControl/Shutters/Readings.pm
View File

@ -2,7 +2,7 @@
# #
# Developed with VSCodium and richterger perl plugin # Developed with VSCodium and richterger perl plugin
# #
# (c) 2018-2022 Copyright: Marko Oldenburg (fhemdevelopment at cooltux dot net) # (c) 2018-2023 Copyright: Marko Oldenburg (fhemdevelopment at cooltux dot net)
# All rights reserved # All rights reserved
# #
# Special thanks goes to: # Special thanks goes to:

2
lib/FHEM/Automation/ShuttersControl/Window.pm
View File

@ -2,7 +2,7 @@
# #
# Developed with VSCodium and richterger perl plugin # Developed with VSCodium and richterger perl plugin
# #
# (c) 2018-2022 Copyright: Marko Oldenburg (fhemdevelopment at cooltux dot net) # (c) 2018-2023 Copyright: Marko Oldenburg (fhemdevelopment at cooltux dot net)
# All rights reserved # All rights reserved
# #
# Special thanks goes to: # Special thanks goes to:

2
lib/FHEM/Automation/ShuttersControl/Window/Attr.pm
View File

@ -2,7 +2,7 @@
# #
# Developed with VSCodium and richterger perl plugin # Developed with VSCodium and richterger perl plugin
# #
# (c) 2018-2022 Copyright: Marko Oldenburg (fhemdevelopment at cooltux dot net) # (c) 2018-2023 Copyright: Marko Oldenburg (fhemdevelopment at cooltux dot net)
# All rights reserved # All rights reserved
# #
# Special thanks goes to: # Special thanks goes to:

2
lib/FHEM/Automation/ShuttersControl/Window/Readings.pm
View File

@ -2,7 +2,7 @@
# #
# Developed with VSCodium and richterger perl plugin # Developed with VSCodium and richterger perl plugin
# #
# (c) 2018-2022 Copyright: Marko Oldenburg (fhemdevelopment at cooltux dot net) # (c) 2018-2023 Copyright: Marko Oldenburg (fhemdevelopment at cooltux dot net)
# All rights reserved # All rights reserved
# #
# Special thanks goes to: # Special thanks goes to: