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

98_WeekdayTimer: allow devspec for device, 'use' cleanup

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@24682 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
Beta-User 2021-06-26 04:36:29 +00:00
parent 94c12984b4
commit 3d592b415b
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
fhem/FHEM/98_WeekdayTimer.pm
View File

@ -31,10 +31,11 @@ use strict;
use warnings;
use Time::Local qw( timelocal_nocheck );
use Scalar::Util qw(looks_like_number);
use Data::Dumper;
$Data::Dumper::Sortkeys = 1;
use FHEM::Core::Timer::Register qw(:ALL);
use JSON qw(decode_json);
use GPUtils qw(GP_Import);
## Import der FHEM Funktionen
@ -75,12 +76,8 @@ BEGIN {
devspec2array
addToDevAttrList
FmtDateTime
sunrise_abs
sunset_abs
trim
stacktrace
decode_json
looks_like_number
trim
)
);
}
@ -182,7 +179,9 @@ sub WDT_Start {
my $conditionOrCommand = join q{ }, @arr;
my @errors;
# test if device is defined
if ( !$defs{$device} ) {
#if ( !$defs{$device} ) {
my @devices = devspec2array($device);
if ( !$defs{$devices[0]} ) {
Log3( $hash, 3, "[$name] device <$device> in fhem not defined, but accepted") ;
if ( $init_done ) { push @errors, qq(device <$device> in fhem not defined) };
}
@ -220,7 +219,7 @@ sub WDT_Start {
WDT_SetTimerOfDay({ HASH => $hash});
return if !$init_done;
return join('\n', @errors) if (@errors);
return join '\n', @errors if (@errors);
return;
}
@ -373,7 +372,7 @@ sub _Profile {
$hash->{profil}{$idx}{WE_Override} = $overrulewday;
}
# ---- Texte Readings aufbauen -----------------------------------------
Log3( $hash, 4, "[$hash->{NAME}] " . sunrise_abs() . " " . sunset_abs() . " " . $longDays{$language}[$wday] );
#Log3( $hash, 4, "[$hash->{NAME}] " . sunrise_abs() . " " . sunset_abs() . " " . $longDays{$language}[$wday] );
for my $d (sort keys %{$hash->{profile}}) {
my $profiltext = q{};
for my $t (sort keys %{$hash->{profile}{$d}}) {