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

git-svn-id: https://svn.fhem.de/fhem/trunk@6547 2b470e98-0d58-463d-a4d8-8e2adae1ed80

Browse Source
This commit is contained in:
pahenning 2014-09-12 18:41:28 +00:00
parent da4d153fe1
commit eda47b407c
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
fhem/contrib/Alarm/95_Alarm.pm
View File

@ -40,7 +40,7 @@ my $alarmname = "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 = "1.0"; my $alarmversion = "1.1";
######################################################################################### #########################################################################################
# #
@ -55,7 +55,7 @@ sub Alarm_Initialize ($) {
$hash->{DefFn} = "Alarm_Define"; $hash->{DefFn} = "Alarm_Define";
$hash->{SetFn} = "Alarm_Set"; $hash->{SetFn} = "Alarm_Set";
#$hash->{GetFn} = "Alarm_Get"; $hash->{GetFn} = "Alarm_Get";
$hash->{UndefFn} = "Alarm_Undef"; $hash->{UndefFn} = "Alarm_Undef";
#$hash->{AttrFn} = "Alarm_Attr"; #$hash->{AttrFn} = "Alarm_Attr";
my $attst = "lockstate:lock,unlock"; my $attst = "lockstate:lock,unlock";
@ -199,7 +199,14 @@ sub Alarm_Set($@) {
sub Alarm_Get($@) { sub Alarm_Get($@) {
my ($hash, @a) = @_; my ($hash, @a) = @_;
return my $res = "";
my $arg = (defined($a[1]) ? $a[1] : "");
if ($arg eq "version") {
return "Alarm.version => $alarmversion";
} else {
return "Unknown argument $arg choose one of version";
}
} }
######################################################################################### #########################################################################################
@ -287,6 +294,8 @@ sub Alarm_Exec($$$$$){
readingsSingleUpdate( $hash, "state", "Canceled", 0 ); readingsSingleUpdate( $hash, "state", "Canceled", 0 );
readingsSingleUpdate( $hash, "level", "none", 0 ); readingsSingleUpdate( $hash, "level", "none", 0 );
Log3 $hash,3,$msg; Log3 $hash,3,$msg;
}else{
Log3 $hash,3,"[Alarm $level] Exec called with act=$act";
} }
#return $msg; #return $msg;
} }