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

Merge pull request 'merge from devel' (#70) from devel into testing

Browse Source 
Reviewed-on: #70
This commit is contained in:
Marko Oldenburg 2021-11-14 13:54:53 +01:00
commit fb44ff9f1a
4 changed files with 10 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
FHEM/73_AutoShuttersControl.pm
View File

@ -1465,7 +1465,7 @@ __END__
], ],
"release_status": "stable", "release_status": "stable",
"license": "GPL_2", "license": "GPL_2",
"version": "v0.10.18", "version": "v0.10.19",
"author": [ "author": [
"Marko Oldenburg <fhemdevelopment@cooltux.net>" "Marko Oldenburg <fhemdevelopment@cooltux.net>"
], ],

8
controls_AutoShuttersControl.txt
View File

@ -1,11 +1,11 @@
UPD 2021-10-27_09:58:32 115685 FHEM/73_AutoShuttersControl.pm UPD 2021-11-14_13:42:55 115685 FHEM/73_AutoShuttersControl.pm
UPD 2021-10-27_09:48:09 75254 lib/FHEM/Automation/ShuttersControl.pm UPD 2021-11-14_13:40:41 75264 lib/FHEM/Automation/ShuttersControl.pm
UPD 2021-10-09_07:12:54 2657 lib/FHEM/Automation/ShuttersControl/Dev.pm UPD 2021-10-09_07:12:54 2657 lib/FHEM/Automation/ShuttersControl/Dev.pm
UPD 2021-10-09_07:12:54 2494 lib/FHEM/Automation/ShuttersControl/Roommate.pm UPD 2021-10-09_07:12:54 2494 lib/FHEM/Automation/ShuttersControl/Roommate.pm
UPD 2021-10-24_07:33:53 31900 lib/FHEM/Automation/ShuttersControl/Shutters.pm UPD 2021-10-24_07:33:53 31900 lib/FHEM/Automation/ShuttersControl/Shutters.pm
UPD 2021-10-09_07:12:54 25333 lib/FHEM/Automation/ShuttersControl/Shading.pm UPD 2021-10-09_07:12:54 25333 lib/FHEM/Automation/ShuttersControl/Shading.pm
UPD 2021-10-27_08:50:46 110681 lib/FHEM/Automation/ShuttersControl/EventProcessingFunctions.pm UPD 2021-11-10_20:11:14 110681 lib/FHEM/Automation/ShuttersControl/EventProcessingFunctions.pm
UPD 2021-10-09_07:12:54 40628 lib/FHEM/Automation/ShuttersControl/Helper.pm UPD 2021-11-14_13:37:27 40094 lib/FHEM/Automation/ShuttersControl/Helper.pm
UPD 2021-10-09_07:12:54 2173 lib/FHEM/Automation/ShuttersControl/Window.pm UPD 2021-10-09_07:12:54 2173 lib/FHEM/Automation/ShuttersControl/Window.pm
UPD 2021-10-09_07:12:54 11739 lib/FHEM/Automation/ShuttersControl/Dev/Attr.pm UPD 2021-10-09_07:12:54 11739 lib/FHEM/Automation/ShuttersControl/Dev/Attr.pm
UPD 2021-10-09_07:12:54 7249 lib/FHEM/Automation/ShuttersControl/Dev/Readings.pm UPD 2021-10-09_07:12:54 7249 lib/FHEM/Automation/ShuttersControl/Dev/Readings.pm

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

@ -775,11 +775,11 @@ sub WriteReadingsShuttersList {
readingsBulkUpdate( readingsBulkUpdate(
$hash, $hash,
'room_' 'room_'
. makeReadingName( AttrVal( $shuttersDev, 'room', 'unsorted' ) ), . ::makeReadingName( AttrVal( $shuttersDev, 'room', 'unsorted' ) ),
ReadingsVal( ReadingsVal(
$name, $name,
'room_' 'room_'
. makeReadingName( . ::makeReadingName(
AttrVal( $shuttersDev, 'room', 'unsorted' ) AttrVal( $shuttersDev, 'room', 'unsorted' )
), ),
'' ''
@ -791,7 +791,7 @@ sub WriteReadingsShuttersList {
ReadingsVal( ReadingsVal(
$name, $name,
'room_' 'room_'
. makeReadingName( . ::makeReadingName(
AttrVal( $shuttersDev, 'room', 'unsorted' ) AttrVal( $shuttersDev, 'room', 'unsorted' )
), ),
'none' 'none'
@ -801,14 +801,14 @@ sub WriteReadingsShuttersList {
readingsBulkUpdate( readingsBulkUpdate(
$hash, $hash,
'room_' 'room_'
. makeReadingName( AttrVal( $shuttersDev, 'room', 'unsorted' ) ), . ::makeReadingName( AttrVal( $shuttersDev, 'room', 'unsorted' ) ),
$shuttersDev $shuttersDev
) )
if ( if (
ReadingsVal( ReadingsVal(
$name, $name,
'room_' 'room_'
. makeReadingName( . ::makeReadingName(
AttrVal( $shuttersDev, 'room', 'unsorted' ) AttrVal( $shuttersDev, 'room', 'unsorted' )
), ),
'none' 'none'

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

@ -994,25 +994,6 @@ sub IsAfterShuttersManualBlocking {
else { return 1 } else { return 1 }
} }
sub makeReadingName {
my ($rname) = shift;
my %charHash = (
chr(0xe4) => "ae", # ä
chr(0xc4) => "Ae", # Ä
chr(0xfc) => "ue", # ü
chr(0xdc) => "Ue", # Ü
chr(0xf6) => "oe", # ö
chr(0xd6) => "Oe", # Ö
chr(0xdf) => "ss" # ß
);
my $charHashkeys = join( "", keys(%charHash) );
return $rname if ( $rname =~ m{^\./}xms );
$rname =~ s/([$charHashkeys])/$charHash{$1}/xgi;
$rname =~ s/[^a-z0-9._\-\/]/_/xgi;
return $rname;
}
sub IsWe { sub IsWe {
return main::IsWe( shift, shift ); return main::IsWe( shift, shift );
} }