2
0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-10 09:16:53 +00:00

95_Alarm.pm: Neue Version, einige kleinere Fixes

95_PostMe.pm: Neue Version mit vielen neuen Features

git-svn-id: https://svn.fhem.de/fhem/trunk@12933 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
phenning 2017-01-02 18:47:07 +00:00
parent 5d215af420
commit 2494dc7f50
2 changed files with 593 additions and 240 deletions

View File

@ -33,6 +33,7 @@ use strict;
use warnings;
use vars qw(%defs); # FHEM device/button definitions
use vars qw(%intAt); # FHEM at definitions
use vars qw($FW_ME);
#########################
# Global variables
@ -40,7 +41,7 @@ my $alarmname = "Alarms"; # link text
my $alarmhiddenroom = "AlarmRoom"; # hidden room
my $alarmpublicroom = "Alarm"; # public room
my $alarmno = 8;
my $alarmversion = "2.82";
my $alarmversion = "2.83";
#########################################################################################
#
@ -717,7 +718,7 @@ sub Alarm_Html($)
my $showhelper = ($lockstate eq "unlocked") ? 1 : 0;
#--
$ret .= "<script type=\"text/javascript\" src=\"/fhem/pgm2/alarm.js\"></script><script type=\"text/javascript\">\n";
$ret .= "<script type=\"text/javascript\" src=\"$FW_ME/pgm2/alarm.js\"></script><script type=\"text/javascript\">\n";
$ret .= "var alarmno = ".$alarmno.";\n";
for( my $k=0;$k<$alarmno;$k++ ){
$ret .= "ah.setItem('l".$k."s','".AttrVal($name, "level".$k."start", 0)."');\n"

File diff suppressed because it is too large Load Diff