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

93_PWMR.pm : fix handle tempRules if only tempRule1 or tempRule2 is defined

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@21030 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
jamesgo 2020-01-21 17:38:24 +00:00
parent 2847e67949
commit d8d54caeaa
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
fhem/FHEM/93_PWMR.pm
View File

@ -53,6 +53,7 @@
# 20.11.18 GA add integrate $init_done into PWMR_Define to supress error messages during startup # 20.11.18 GA add integrate $init_done into PWMR_Define to supress error messages during startup
# 20.11.18 GA add change default for w_regexp from ".*Open.*" to ".*[Oo]pen.*" to fit for MAX window contacts # 20.11.18 GA add change default for w_regexp from ".*Open.*" to ".*[Oo]pen.*" to fit for MAX window contacts
# 11.02.19 GA add redesign of maxOffTime # 11.02.19 GA add redesign of maxOffTime
# 21.01.20 GA fix remove default tempRule if only tempRule1 or tempRule2 is defined
# module for PWM (Pulse Width Modulation) calculation # module for PWM (Pulse Width Modulation) calculation
@ -1634,10 +1635,26 @@ PWMR_Attr(@)
return PWMR_CheckTemp($hash, "c_tempFrostProtect", $attrval); return PWMR_CheckTemp($hash, "c_tempFrostProtect", $attrval);
} elsif ($attrname eq "tempRule1") { # tempRule1 } elsif ($attrname eq "tempRule1") { # tempRule1
return PWMR_CheckTempRule($hash, $attrname, "c_tempRule1", $attrval); my $ruleError = PWMR_CheckTempRule($hash, $attrname, "c_tempRule1", $attrval);
if (not defined $ruleError) {
# attr for tempRule1 is valid
if (not defined ($attr{$name}{tempRule2})) {
$hash->{c_tempRule2} = "";
PWMR_NormalizeRules($hash);
}
}
return $ruleError;
} elsif ($attrname eq "tempRule2") { # tempRule2 } elsif ($attrname eq "tempRule2") { # tempRule2
return PWMR_CheckTempRule($hash, $attrname, "c_tempRule2", $attrval); my $ruleError = PWMR_CheckTempRule($hash, $attrname, "c_tempRule2", $attrval);
if (not defined $ruleError) {
# attr for tempRule2 is valid
if (not defined ($attr{$name}{tempRule1})) {
$hash->{c_tempRule1} = "";
PWMR_NormalizeRules($hash);
}
}
return $ruleError;
} elsif ($attrname eq "tempRule3") { # tempRule3 } elsif ($attrname eq "tempRule3") { # tempRule3
return PWMR_CheckTempRule($hash, $attrname, "c_tempRule3", $attrval); return PWMR_CheckTempRule($hash, $attrname, "c_tempRule3", $attrval);