From 03f4d1e36df2bca7a9a9f93f9ce65a62e489ef06 Mon Sep 17 00:00:00 2001 From: nasseeder1 Date: Mon, 4 May 2020 15:48:12 +0000 Subject: [PATCH] 60_Watches: contrib 0.15.0 git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@21863 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- contrib/DS_Starter/60_Watches.pm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/contrib/DS_Starter/60_Watches.pm b/contrib/DS_Starter/60_Watches.pm index 911679335..44fb19dbd 100644 --- a/contrib/DS_Starter/60_Watches.pm +++ b/contrib/DS_Starter/60_Watches.pm @@ -1043,20 +1043,20 @@ sub digitalWatch { } // Check ob Alarm ausgelöst werden soll und ggf. Alarmevent triggern - function checkAndDoAlm (devname, acttime, almtime, almdef) { + function checkAndDoAlm (acttime) { lastalmtime = localStorage.getItem('lastalmtime_$d'); // letzte Alarmzeit laden - if ( (acttime == almtime || acttime == ' '+almdef) && acttime != lastalmtime ) { - command = '{ CommandSetReading(undef, \"'+devname+' alarmed '+acttime+'\") }'; + if ( (acttime == '$alarm' || acttime == ' $alarmdef') && acttime != lastalmtime ) { + command = '{ CommandSetReading(undef, \"$d alarmed '+acttime+'\") }'; url_$d = makeCommand(command); localStoreSetLastalm (acttime); // aktuelle Alarmzeit sichern - if(acttime == almtime) { + if(acttime == '$alarm') { \$.get(url_$d); } else { \$.get(url_$d, function (data) { - command = '{ CommandSetReading(undef, \"'+devname+' state stopped\") }'; + command = '{ CommandSetReading(undef, \"$d state stopped\") }'; url_$d = makeCommand(command); \$.get(url_$d); } @@ -1145,7 +1145,7 @@ sub digitalWatch { minutes_$d = parseInt(elapsesec_$d / 60); seconds_$d = parseInt(elapsesec_$d - minutes_$d * 60); - checkAndDoAlm (devName_$d, $ddt, '$alarm', '$alarmdef'); // Alarm auslösen wenn zutreffend + checkAndDoAlm ($ddt); // Alarm auslösen wenn zutreffend localStoreSet (hours_$d, minutes_$d, seconds_$d, NaN); } @@ -1238,7 +1238,7 @@ sub digitalWatch { minutes_$d = parseInt(countcurr_$d / 60); seconds_$d = parseInt(countcurr_$d - minutes_$d * 60); - checkAndDoAlm (devName_$d, $ddt, '$alarm', '$alarmdef'); // Alarm auslösen wenn zutreffend + checkAndDoAlm ($ddt); // Alarm auslösen wenn zutreffend localStoreSet (hours_$d, minutes_$d, seconds_$d, NaN); }