FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-13 05:06:35 +00:00
Code Issues Releases Wiki Activity

60_Watches: contrib 0.15.1

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@21864 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
nasseeder1 2020-05-04 16:27:18 +00:00
parent 1e18cd983c
commit 69adf7d829
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fhem/contrib/DS_Starter/60_Watches.pm
View File

@ -72,6 +72,7 @@ BEGIN {
# Versions History intern # Versions History intern
my %vNotesIntern = ( my %vNotesIntern = (
"0.15.1" => "04.05.2020 fix permanently events when no alarmTime is set in countdownwatch and countdown is finished ",
"0.15.0" => "04.05.2020 new attribute 'digitalSegmentType' for different segement count, also new attributes ". "0.15.0" => "04.05.2020 new attribute 'digitalSegmentType' for different segement count, also new attributes ".
"'digitalDigitAngle', 'digitalDigitDistance', 'digitalDigitHeight', 'digitalDigitWidth', 'digitalSegmentDistance' ". "'digitalDigitAngle', 'digitalDigitDistance', 'digitalDigitHeight', 'digitalDigitWidth', 'digitalSegmentDistance' ".
"'digitalSegmentWidth', stopwatches don't stop when alarm is triggered (use notify to do it) ", "'digitalSegmentWidth', stopwatches don't stop when alarm is triggered (use notify to do it) ",
@ -177,14 +178,15 @@ sub Set { ## no critic 'compl
my $prop2 = $a[4]; my $prop2 = $a[4];
my $prop3 = $a[5]; my $prop3 = $a[5];
my $model = $hash->{MODEL}; my $model = $hash->{MODEL};
my $addp = AttrVal($name,"digitalDisplayPattern","watch"); my $addp = AttrVal($name, "digitalDisplayPattern", "watch");
return if(IsDisabled($name) || $addp !~ /stopwatch|staticwatch|countdownwatch/); return if(IsDisabled($name) || $addp !~ /watch/);
my $setlist = "Unknown argument $opt, choose one of "; my $setlist = "Unknown argument $opt, choose one of ";
$setlist .= "time " if($addp =~ /staticwatch/); $setlist .= "time " if($addp =~ /staticwatch/);
$setlist .= "alarmHMSset alarmHMSdel:noArg reset:noArg resume:noArg start:noArg stop:noArg " if($addp =~ /stopwatch|countdownwatch/); $setlist .= "alarmHMSset alarmHMSdel:noArg reset:noArg resume:noArg start:noArg stop:noArg " if($addp =~ /stopwatch|countdownwatch/);
$setlist .= "countDownInit " if($addp =~ /countdownwatch/); $setlist .= "countDownInit " if($addp =~ /countdownwatch/);
$setlist .= "alarmHMSset alarmHMSdel:noArg " if($addp =~ /\bwatch\b/);
if ($opt =~ /\bstart\b/) { if ($opt =~ /\bstart\b/) {
return qq{Please set "countDownInit" before !} if($addp =~ /countdownwatch/ && !ReadingsVal($name, "countInitVal", "")); return qq{Please set "countDownInit" before !} if($addp =~ /countdownwatch/ && !ReadingsVal($name, "countInitVal", ""));
@ -386,7 +388,7 @@ sub digitalWatch {
my $addd = AttrVal($d, "digitalDigitDistance", 2); my $addd = AttrVal($d, "digitalDigitDistance", 2);
my $adsd = AttrVal($d, "digitalSegmentDistance", 0.5); my $adsd = AttrVal($d, "digitalSegmentDistance", 0.5);
my $adda = AttrVal($d, "digitalDigitAngle", 9); my $adda = AttrVal($d, "digitalDigitAngle", 9);
my $alarm = " ".ReadingsVal($d, "alarmTime", $alarmdef); my $alarm = " ".ReadingsVal($d, "alarmTime", "aa:bb:cc");
my $ddp = "###:##:##"; # dummy my $ddp = "###:##:##"; # dummy
my ($h,$m,$s) = (0,0,0); my ($h,$m,$s) = (0,0,0);
@ -1044,7 +1046,7 @@ sub digitalWatch {
// Check ob Alarm ausgelöst werden soll und ggf. Alarmevent triggern // Check ob Alarm ausgelöst werden soll und ggf. Alarmevent triggern
function checkAndDoAlm (acttime) { function checkAndDoAlm (acttime) {
lastalmtime = localStorage.getItem('lastalmtime_$d'); // letzte Alarmzeit laden lastalmtime = localStorage.getItem('lastalmtime_$d'); // letzte Alarmzeit laden
if ( (acttime == '$alarm' || acttime == ' $alarmdef') && acttime != lastalmtime ) { if ( (acttime == '$alarm' || acttime == ' $alarmdef') && acttime != lastalmtime ) {
command = '{ CommandSetReading(undef, \"$d alarmed '+acttime+'\") }'; command = '{ CommandSetReading(undef, \"$d alarmed '+acttime+'\") }';
url_$d = makeCommand(command); url_$d = makeCommand(command);