diff --git a/fhem/FHEM/95_Alarm.pm b/fhem/FHEM/95_Alarm.pm index c115deefc..f530712d2 100644 --- a/fhem/FHEM/95_Alarm.pm +++ b/fhem/FHEM/95_Alarm.pm @@ -43,7 +43,7 @@ my $alarmlinkname = "Alarms"; # link text my $alarmhiddenroom = "AlarmRoom"; # hidden room my $alarmpublicroom = "Alarm"; # public room my $alarmno = 8; -my $alarmversion = "4.01"; +my $alarmversion = "4.02"; my %alarm_transtable_EN = ( "ok" => "OK", @@ -748,10 +748,10 @@ sub Alarm_Arm($$$$$){ if( ($act eq "arm") && ( $xac ne "armed") ){ my $xdl = AttrVal($name, "armdelay", 0); my $cmdwait = AttrVal($name, "armwait", 0); - my $cmdact = AttrVal($name, "armact", 0); #-- immediate arming if( ($xdl eq '')||($xdl eq '0:00')||($xdl eq '00:00')||($evt eq "delay") ){ + my $cmdact = AttrVal($name, "armact", 0); #-- update state display $hash->{DATA}{"armstate"}{"level".$level} = "armed"; readingsSingleUpdate( $hash, "level".$level,"armed",1 ); @@ -778,20 +778,9 @@ sub Alarm_Arm($$$$$){ readingsSingleUpdate( $hash, "state", Alarm_getstate($hash)." ".$hash->{READINGS}{"short"}{VAL}, 1 ); #-- save new state Alarm_save($hash); - #--transform commands from fhem to perl level - my @cmdactarr = split(/;/,$cmdact); - my $cmdactf; - if( int(@cmdactarr) == 1 ){ - $cmdactf = "fhem(\"".$cmdact."\");;"; - }else{ - $cmdactf = ''; - for(my $i=0;$i