FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-01-31 18:59:33 +00:00
Code Issues Releases Wiki Activity

00_OW2S0SMSGUARD:fix internal timer

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@23705 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
Wzut 2021-02-08 18:50:44 +00:00
parent c364a8cfd3
commit 3e406cfca9
1 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
fhem/FHEM/00_OW2S0SMSGUARD.pm
View File

@ -259,11 +259,12 @@ sub GetUpdate {
my $name = $hash->{NAME};
Log3($name, 5, "$name, GetUpdate");
RemoveInternalTimer($hash);
return if (IsDisabled($name) || !$hash->{INTERVAL} || ($hash->{addr} ne 'master'));
InternalTimer(gettimeofday()+$hash->{INTERVAL}, 'FHEM::OW2S0SMSGUARD::GetUpdate', $hash, 0);
SimpleWrite($hash, '$?');
InternalTimer(gettimeofday()+$hash->{INTERVAL}, 'FHEM::OW2S0SMSGUARD::GetUpdate', $hash, 0);
return;
}
@ -424,9 +425,10 @@ sub ReadFn {
return '' if (!defined($buf));
my $raw = $hash->{PARTIAL};
Log3($name, 5, "$name, RAW: $raw / $buf");
$raw .= $buf;
Log3($name, 5, "$name, ReadFn RAW: $raw / buf :$ buf");
my $i = 0;
while($raw =~ m/\n/x) {
@ -569,7 +571,7 @@ sub decodeList {
return;
}
InternalTimer(gettimeofday()+1+(($hash->{OWVals}-1) * $hash->{DELAY}), 'FHEM::OW2S0SMSGUARD::read_OW', {h=>$hash, n=>$num}, 0) if ($ok && ($model > 1)); # nicht bei DS2401
InternalTimer(gettimeofday()+1+($num * $hash->{DELAY}), 'FHEM::OW2S0SMSGUARD::read_OW', {h=>$hash, n=>$num}, 0) if ($ok && ($model > 1)); # nicht bei DS2401
return;
}
@ -628,6 +630,9 @@ sub decodeTemperature {
if ($model eq 'DS1820') {
$temp = (( hex($data[1]) << 8) + hex($data[0])) << 3;
#$temp = ( hex($data[1]) << 8) + hex($data[0]);
$temp = ($temp & 0xFFF0) +12 - hex($data[6]) if ($data[7] eq '10');
}
@ -673,6 +678,8 @@ sub ParseFn {
my $dhash = $modules{OW2S0SMSGUARD}{defptr}{$arr[1]};
my $dname = $dhash->{NAME} // return;
$dhash->{last_present} //= '???';
Log3($dname, 4, "$dname, ParseFn $msg");
$dhash->{busid} = $arr[4] //= -1;
@ -682,13 +689,23 @@ sub ParseFn {
if (($model eq 'DS1820') || ($model eq 'DS18B20') || ($model eq 'DS1822') ) {
readingsBulkUpdate($dhash, 'temperature', $val);
readingsBulkUpdate($dhash, 'state', "T: $val °C");
$dhash->{last_present} = TimeNow();
}
elsif ($model eq 'DS2401') {
if ((ReadingsVal($dname, 'presence' ,'absent') ne $val) && ($val eq 'absent')) {
$dhash->{busid} = -1;
setReadingsVal($dhash, 'last_present', ReadingsTimestamp($dname, 'presence', 'unknown'), TimeNow());
$dhash->{last_present} = TimeNow() if ($val eq 'present');
$dhash->{last_absent} = TimeNow() if ($val eq 'absent');
$dhash->{last_absent} //= '???';
if (ReadingsVal($dname, 'presence' ,'') ne $val) {
if ($val eq 'absent') {
$dhash->{busid} = -1;
readingsBulkUpdate($dhash, 'last_present', $dhash->{last_present});
}
else {
readingsBulkUpdate($dhash, 'last_absent', $dhash->{last_absent});
}
}
readingsBulkUpdate($dhash, 'state', $val);
readingsBulkUpdate($dhash, 'presence', $val);
}