Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

95_Alarm.pm: Bugfix

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@15588 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
phenning 2017-12-11 09:47:06 +00:00
parent a5684f9192
commit 2d3d1b38a1
1 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
fhem/FHEM/95_Alarm.pm
View File

@ -43,7 +43,7 @@ my $alarmlinkname = "Alarms"; # link text
my $alarmhiddenroom = "AlarmRoom"; # hidden room my $alarmhiddenroom = "AlarmRoom"; # hidden room
my $alarmpublicroom = "Alarm"; # public room my $alarmpublicroom = "Alarm"; # public room
my $alarmno = 8; my $alarmno = 8;
my $alarmversion = "3.1"; my $alarmversion = "3.11";
my %alarm_transtable_EN = ( my %alarm_transtable_EN = (
"ok" => "OK", "ok" => "OK",
@ -441,33 +441,34 @@ sub Alarm_getsettings($$$){
my ($hash,$dev,$type) = @_; my ($hash,$dev,$type) = @_;
my $chg = 0; my $chg = 0;
my @aval = split('\|',AttrVal($dev, "alarmSettings","|||0:00")); my @aval = split('\|',AttrVal($dev, "alarmSettings","|||0:00"),4);
if( $type eq "Actor"){ if( $type eq "Actor"){
#-- position 0:set by, 1:set func, 2:unset func, 3:delay
if( $aval[0] eq "" || $aval[1] eq "" ){
Log3 $hash, 1, "[Alarm] Settings incomplete for alarmActor $dev";
}
#-- check delay time #-- check delay time
if( !defined($aval[3]) || $aval[3] eq "" ){ if( $aval[3] =~ /^\d+$/ ){
$aval[3] = ""; if( $aval[3] > 3559 ){
$chg = 1; Log3 $hash, 1, "[Alarm] Delay time $aval[3] for alarmActor $dev to large as single number, maximum 3559 seconds";;
}elsif( $aval[3] =~ /^\d+$/ ){ $aval[3] = "59:59";
$aval[3] = sprintf("00:%02d",$aval[3]); }else{
my $min = int($aval[3]/60);
my $sec = $aval[3]%60;
$aval[3] = sprintf("%02d:%02d",$min,$sec);
}
$chg = 1; $chg = 1;
}elsif( $aval[3] !~ /^(\d\d:)?\d\d:\d\d/ ){ }elsif( $aval[3] !~ /^(\d\d:)?\d\d:\d\d/ ){
Log3 $hash, 1, "[Alarm] Delay time $aval[3] ill defined for alarmActor $dev"; Log3 $hash, 1, "[Alarm] Delay time $aval[3] ill defined for alarmActor $dev";
$aval[3] = ""; $aval[3] = "0:00";
$chg = 1; $chg = 1;
} }
#-- unset func may be missing
$aval[2] = ""
if(!defined($aval[2]));
#-- position 0:set by, 1:set func, 2:unset func, 3:delay
if( int(@aval) != 4 || !defined($aval[0]) || !defined($aval[1]) ){
Log3 $hash, 1, "[Alarm] Settings incomplete for alarmActor $dev";
}
}
if( $chg==1 ){ if( $chg==1 ){
CommandAttr(undef,$dev.' alarmSettings '.join('|',@aval)); CommandAttr(undef,$dev.' alarmSettings '.join('|',@aval));
} }
}
return @aval; return @aval;
} }