FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-07 19:04:20 +00:00
Code Issues Releases Wiki Activity

73_AutoShuttersControl: remove experimental switch

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@29226 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
LeonGaultier 2024-10-12 07:15:41 +00:00
parent 7ffbe7df27
commit 928c4195d1
17 changed files with 115 additions and 117 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
- change: 73_AutoShuttersControl: remove experimental switch
- bugfix: 59_Weather: fix forcast intervall, safe token count - bugfix: 59_Weather: fix forcast intervall, safe token count
- feature: 74_AutomowerConnect: new setter for synchronizing mower timestamp - feature: 74_AutomowerConnect: new setter for synchronizing mower timestamp
- bufgix: 72_FRITZBOX: kleinere Fehler bei zu alten FritzOS Versionen - bufgix: 72_FRITZBOX: kleinere Fehler bei zu alten FritzOS Versionen

4
fhem/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-2023 Copyright: Marko Oldenburg (fhemdevelopment at cooltux dot net) # (c) 2018-2025 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.25", "version": "v0.99.10",
"author": [ "author": [
"Marko Oldenburg <fhemdevelopment@cooltux.net>" "Marko Oldenburg <fhemdevelopment@cooltux.net>"
], ],

41
fhem/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-2023 Copyright: Marko Oldenburg (fhemdevelopment at cooltux dot net) # (c) 2018-2025 Copyright: Marko Oldenburg (fhemdevelopment at cooltux dot net)
# All rights reserved # All rights reserved
# #
# Special thanks goes to: # Special thanks goes to:
@ -72,7 +72,8 @@ use FHEM::Meta;
use GPUtils qw(GP_Import GP_Export); use GPUtils qw(GP_Import GP_Export);
use Data::Dumper; #only for Debugging use Data::Dumper; #only for Debugging
use Date::Parse; use Date::Parse;
use experimental qw( switch );
# use experimental qw( switch ); deprecated
use FHEM::Automation::ShuttersControl::Shutters; use FHEM::Automation::ShuttersControl::Shutters;
use FHEM::Automation::ShuttersControl::Dev; use FHEM::Automation::ShuttersControl::Dev;
@ -526,38 +527,37 @@ sub Set {
my $cmd = shift @$aArg my $cmd = shift @$aArg
// return qq{"set $name" needs at least one argument}; // return qq{"set $name" needs at least one argument};
given ($cmd) { if ( $cmd eq 'renewAllTimer' ) {
when ('renewAllTimer') {
return "usage: $cmd" if ( scalar( @{$aArg} ) != 0 ); return "usage: $cmd" if ( scalar( @{$aArg} ) != 0 );
RenewSunRiseSetShuttersTimer($hash); RenewSunRiseSetShuttersTimer($hash);
} }
when ('renewTimer') { elsif ( $cmd eq 'renewTimer' ) {
return "usage: $cmd" if ( scalar( @{$aArg} ) > 1 ); return "usage: $cmd" if ( scalar( @{$aArg} ) > 1 );
CreateSunRiseSetShuttersTimer( $hash, $aArg->[0] ); CreateSunRiseSetShuttersTimer( $hash, $aArg->[0] );
} }
when ('scanForShutters') { elsif ( $cmd eq 'scanForShutters' ) {
return "usage: $cmd" if ( scalar( @{$aArg} ) != 0 ); return "usage: $cmd" if ( scalar( @{$aArg} ) != 0 );
ShuttersDeviceScan($hash); ShuttersDeviceScan($hash);
} }
when ('createNewNotifyDev') { elsif ( $cmd eq 'createNewNotifyDev' ) {
return "usage: $cmd" if ( scalar( @{$aArg} ) != 0 ); return "usage: $cmd" if ( scalar( @{$aArg} ) != 0 );
CreateNewNotifyDev($hash); CreateNewNotifyDev($hash);
} }
when ('partyMode') { elsif ( $cmd eq 'partyMode' ) {
return "usage: $cmd" if ( scalar( @{$aArg} ) > 1 ); return "usage: $cmd" if ( scalar( @{$aArg} ) > 1 );
::readingsSingleUpdate( $hash, $cmd, $aArg->[0], 1 ) ::readingsSingleUpdate( $hash, $cmd, $aArg->[0], 1 )
if ( $aArg->[0] ne ::ReadingsVal( $name, 'partyMode', 0 ) ); if ( $aArg->[0] ne ::ReadingsVal( $name, 'partyMode', 0 ) );
} }
when ('hardLockOut') { elsif ( $cmd eq 'hardLockOut' ) {
return "usage: $cmd" if ( scalar( @{$aArg} ) > 1 ); return "usage: $cmd" if ( scalar( @{$aArg} ) > 1 );
::readingsSingleUpdate( $hash, $cmd, $aArg->[0], 1 ); ::readingsSingleUpdate( $hash, $cmd, $aArg->[0], 1 );
HardewareBlockForShutters( $hash, $aArg->[0] ); HardewareBlockForShutters( $hash, $aArg->[0] );
} }
when ('sunriseTimeWeHoliday') { elsif ( $cmd eq 'sunriseTimeWeHoliday' ) {
return "usage: $cmd" if ( scalar( @{$aArg} ) > 1 ); return "usage: $cmd" if ( scalar( @{$aArg} ) > 1 );
::readingsSingleUpdate( $hash, $cmd, $aArg->[0], 1 ); ::readingsSingleUpdate( $hash, $cmd, $aArg->[0], 1 );
} }
when ('controlShading') { elsif ( $cmd eq 'controlShading' ) {
return "usage: $cmd" if ( scalar( @{$aArg} ) > 1 ); return "usage: $cmd" if ( scalar( @{$aArg} ) > 1 );
my $response = CheckASC_ConditionsForShadingFn( $hash, $aArg->[0] ); my $response = CheckASC_ConditionsForShadingFn( $hash, $aArg->[0] );
@ -573,19 +573,19 @@ sub Set {
1 1
); );
} }
when ('selfDefense') { elsif ( $cmd eq 'selfDefense' ) {
return "usage: $cmd" if ( scalar( @{$aArg} ) > 1 ); return "usage: $cmd" if ( scalar( @{$aArg} ) > 1 );
::readingsSingleUpdate( $hash, $cmd, $aArg->[0], 1 ); ::readingsSingleUpdate( $hash, $cmd, $aArg->[0], 1 );
} }
when ('ascEnable') { elsif ( $cmd eq 'ascEnable' ) {
return "usage: $cmd" if ( scalar( @{$aArg} ) > 1 ); return "usage: $cmd" if ( scalar( @{$aArg} ) > 1 );
::readingsSingleUpdate( $hash, $cmd, $aArg->[0], 1 ); ::readingsSingleUpdate( $hash, $cmd, $aArg->[0], 1 );
} }
when ('advDriveDown') { elsif ( $cmd eq 'advDriveDown' ) {
return "usage: $cmd" if ( scalar( @{$aArg} ) != 0 ); return "usage: $cmd" if ( scalar( @{$aArg} ) != 0 );
EventProcessingAdvShuttersClose($hash); EventProcessingAdvShuttersClose($hash);
} }
when ('shutterASCenableToggle') { elsif ( $cmd eq 'shutterASCenableToggle' ) {
return "usage: $cmd" if ( scalar( @{$aArg} ) > 1 ); return "usage: $cmd" if ( scalar( @{$aArg} ) > 1 );
::readingsSingleUpdate( ::readingsSingleUpdate(
$defs{ $aArg->[0] }, $defs{ $aArg->[0] },
@ -598,7 +598,7 @@ sub Set {
1 1
); );
} }
when ('wiggle') { elsif ( $cmd eq 'wiggle' ) {
return "usage: $cmd" if ( scalar( @{$aArg} ) > 1 ); return "usage: $cmd" if ( scalar( @{$aArg} ) > 1 );
( (
@ -607,7 +607,7 @@ sub Set {
: wiggle( $hash, $aArg->[0] ) : wiggle( $hash, $aArg->[0] )
); );
} }
default { else {
my $list = 'scanForShutters:noArg'; my $list = 'scanForShutters:noArg';
$list .= $list .=
' renewAllTimer:noArg advDriveDown:noArg partyMode:on,off hardLockOut:on,off sunriseTimeWeHoliday:on,off controlShading:on,off selfDefense:on,off ascEnable:on,off wiggle:all,' ' renewAllTimer:noArg advDriveDown:noArg partyMode:on,off hardLockOut:on,off sunriseTimeWeHoliday:on,off controlShading:on,off selfDefense:on,off ascEnable:on,off wiggle:all,'
@ -616,18 +616,15 @@ sub Set {
. join( ',', @{ $hash->{helper}{shuttersList} } ) . join( ',', @{ $hash->{helper}{shuttersList} } )
. ' renewTimer:' . ' renewTimer:'
. join( ',', @{ $hash->{helper}{shuttersList} } ) . join( ',', @{ $hash->{helper}{shuttersList} } )
if ( if ( ::ReadingsVal( $name, 'userAttrList', 'none' ) eq 'rolled out'
::ReadingsVal( $name, 'userAttrList', 'none' ) eq 'rolled out'
&& defined( $hash->{helper}{shuttersList} ) && defined( $hash->{helper}{shuttersList} )
&& scalar( @{ $hash->{helper}{shuttersList} } ) > 0 ); && scalar( @{ $hash->{helper}{shuttersList} } ) > 0 );
$list .= ' createNewNotifyDev:noArg' $list .= ' createNewNotifyDev:noArg'
if ( if ( ::ReadingsVal( $name, 'userAttrList', 'none' ) eq 'rolled out'
::ReadingsVal( $name, 'userAttrList', 'none' ) eq 'rolled out'
&& ::AttrVal( $name, 'ASC_expert', 0 ) == 1 ); && ::AttrVal( $name, 'ASC_expert', 0 ) == 1 );
return "Unknown argument $cmd,choose one of $list"; return "Unknown argument $cmd,choose one of $list";
} }
}
return; return;
} }

2
fhem/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-2023 Copyright: Marko Oldenburg (fhemdevelopment at cooltux dot net) # (c) 2018-2025 Copyright: Marko Oldenburg (fhemdevelopment at cooltux dot net)
# All rights reserved # All rights reserved
# #
# Special thanks goes to: # Special thanks goes to:

2
fhem/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-2023 Copyright: Marko Oldenburg (fhemdevelopment at cooltux dot net) # (c) 2018-2025 Copyright: Marko Oldenburg (fhemdevelopment at cooltux dot net)
# All rights reserved # All rights reserved
# #
# Special thanks goes to: # Special thanks goes to:

2
fhem/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-2023 Copyright: Marko Oldenburg (fhemdevelopment at cooltux dot net) # (c) 2018-2025 Copyright: Marko Oldenburg (fhemdevelopment at cooltux dot net)
# All rights reserved # All rights reserved
# #
# Special thanks goes to: # Special thanks goes to:

2
fhem/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-2023 Copyright: Marko Oldenburg (fhemdevelopment at cooltux dot net) # (c) 2018-2025 Copyright: Marko Oldenburg (fhemdevelopment at cooltux dot net)
# All rights reserved # All rights reserved
# #
# Special thanks goes to: # Special thanks goes to:

2
fhem/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-2023 Copyright: Marko Oldenburg (fhemdevelopment at cooltux dot net) # (c) 2018-2025 Copyright: Marko Oldenburg (fhemdevelopment at cooltux dot net)
# All rights reserved # All rights reserved
# #
# Special thanks goes to: # Special thanks goes to:

2
fhem/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-2023 Copyright: Marko Oldenburg (fhemdevelopment at cooltux dot net) # (c) 2018-2025 Copyright: Marko Oldenburg (fhemdevelopment at cooltux dot net)
# All rights reserved # All rights reserved
# #
# Special thanks goes to: # Special thanks goes to:

2
fhem/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-2023 Copyright: Marko Oldenburg (fhemdevelopment at cooltux dot net) # (c) 2018-2025 Copyright: Marko Oldenburg (fhemdevelopment at cooltux dot net)
# All rights reserved # All rights reserved
# #
# Special thanks goes to: # Special thanks goes to:

2
fhem/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-2023 Copyright: Marko Oldenburg (fhemdevelopment at cooltux dot net) # (c) 2018-2025 Copyright: Marko Oldenburg (fhemdevelopment at cooltux dot net)
# All rights reserved # All rights reserved
# #
# Special thanks goes to: # Special thanks goes to:

2
fhem/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-2023 Copyright: Marko Oldenburg (fhemdevelopment at cooltux dot net) # (c) 2018-2025 Copyright: Marko Oldenburg (fhemdevelopment at cooltux dot net)
# All rights reserved # All rights reserved
# #
# Special thanks goes to: # Special thanks goes to:

2
fhem/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-2023 Copyright: Marko Oldenburg (fhemdevelopment at cooltux dot net) # (c) 2018-2025 Copyright: Marko Oldenburg (fhemdevelopment at cooltux dot net)
# All rights reserved # All rights reserved
# #
# Special thanks goes to: # Special thanks goes to:

2
fhem/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-2023 Copyright: Marko Oldenburg (fhemdevelopment at cooltux dot net) # (c) 2018-2025 Copyright: Marko Oldenburg (fhemdevelopment at cooltux dot net)
# All rights reserved # All rights reserved
# #
# Special thanks goes to: # Special thanks goes to:

2
fhem/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-2023 Copyright: Marko Oldenburg (fhemdevelopment at cooltux dot net) # (c) 2018-2025 Copyright: Marko Oldenburg (fhemdevelopment at cooltux dot net)
# All rights reserved # All rights reserved
# #
# Special thanks goes to: # Special thanks goes to:

2
fhem/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-2023 Copyright: Marko Oldenburg (fhemdevelopment at cooltux dot net) # (c) 2018-2025 Copyright: Marko Oldenburg (fhemdevelopment at cooltux dot net)
# All rights reserved # All rights reserved
# #
# Special thanks goes to: # Special thanks goes to:

2
fhem/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-2023 Copyright: Marko Oldenburg (fhemdevelopment at cooltux dot net) # (c) 2018-2025 Copyright: Marko Oldenburg (fhemdevelopment at cooltux dot net)
# All rights reserved # All rights reserved
# #
# Special thanks goes to: # Special thanks goes to: