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

00_OW2S0SMSGUARD:fix hexadecimal check

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@23715 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
Wzut 2021-02-10 18:41:19 +00:00
parent 0b1f6ce8a2
commit 7a5d856199
1 changed files with 30 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
fhem/FHEM/00_OW2S0SMSGUARD.pm
View File

@ -302,7 +302,7 @@ sub SetFn {
return SimpleWrite($hash, '$rez') if ($cmd eq 'S0-reset'); return SimpleWrite($hash, '$rez') if ($cmd eq 'S0-reset');
if (($cmd eq 'deleteDS2401') && $dlist && ($val =~ m{ [0-9A-F]+ }x ) && (substr($val, 0, 2) eq '01')) { if (($cmd eq 'deleteDS2401') && $dlist && (IsValidHex($val,16)) && (substr($val, 0, 2) eq '01')) {
my ($ret , $rr, $r); my ($ret , $rr, $r);
@ -483,7 +483,7 @@ sub Parse {
my $ok = (defined($data[1]) && ($data[1] eq 'o')) ? 1 : 0; my $ok = (defined($data[1]) && ($data[1] eq 'o')) ? 1 : 0;
return decodeList($hash, $name, $num, $ok, @data) if (defined($data[2]) && (length($data[2]) == 16) && ( $data[2] =~ m{ [0-9A-F]+ }x )); return decodeList($hash, $name, $num, $ok, @data) if (defined($data[2]) && (IsValidHex($data[2],16)));
return decodeVal($hash, $name, $num, @data) if ($ok && defined($data[11]) && exists($hash->{helper}{OW}{$num})); return decodeVal($hash, $name, $num, @data) if ($ok && defined($data[11]) && exists($hash->{helper}{OW}{$num}));
return; return;
@ -577,15 +577,15 @@ sub decodeVal {
my ($hash, $name, $num, @data) = @_; my ($hash, $name, $num, @data) = @_;
my $error; my $error;
my $crc; my $crc = 0;
# das 10.Byte ist eine Checksumme für die serielle Übertragung # das 10.Byte ist eine Checksumme für die serielle Übertragung
for my $i (2..10) { for my $i (2..10) {
$crc += hex($data[$i]) if (($data[$i] =~ m{ [0-9A-F]+ }x) && (length($data[$i]) == 2)) ; $crc += (IsValidHex($data[$i],2)) ? hex($data[$i]) : 0;
} }
$crc = $crc & 0xFF; $crc = $crc & 0xFF;
$data[11] = (($data[11] =~ m{ [0-9A-F]+ }x) && (length($data[11]) == 2)) ? hex($data[11]) : -1; # das CRC Byte selbst ist ungültig $data[11] = (IsValidHex($data[11],2)) ? hex($data[11]) : -1; # das CRC Byte selbst ist ungültig
if ($crc != $data[11]) { if ($crc != $data[11]) {
$error = "CRC error OW device $num : $data[11] != $crc"; $error = "CRC error OW device $num : $data[11] != $crc";
@ -630,32 +630,30 @@ sub decodeVal {
sub decodeTemperature { sub decodeTemperature {
my ($model, @data) = @_; my ($model, @data) = @_;
my $temp = ''; my $temp = (( hex($data[1]) << 8) | hex($data[0]));
if ($model eq 'DS1820') { if ($model eq 'DS1820') {
$temp = (( hex($data[1]) << 8) + hex($data[0])) << 3;
#$temp = ( hex($data[1]) << 8) + hex($data[0]); # heute eigentlich DS18S20 , echter alter DS1820 hat nur 0.5° Auflösung
$temp = $temp * 0.5;
#$temp = ($temp & 0xFFF0) +12 - hex($data[6]) if ($data[7] eq '10');
# Alternative Berechnung :
$temp = ($temp & 0xFFF0) +12 - hex($data[6]) if ($data[7] eq '10'); $temp = ($temp - 0.25) + ((hex($data[7]) - hex($data[6])) / hex($data[7])) if ($data[7] ne '00');
} }
if (($model eq 'DS18B20') || ($model eq 'DS1822')) { if (($model eq 'DS18B20') || ($model eq 'DS1822')) {
$temp = (( hex($data[1]) << 8) + hex($data[0]));
my $cfg = (hex($data[4]) & 0x60); my $cfg = (hex($data[4]) & 0x60);
$temp = $temp << 3 if ($cfg == 0); $temp = $temp << 3 if ($cfg == 0);
$temp = $temp << 2 if ($cfg == 0x20); $temp = $temp << 2 if ($cfg == 0x20);
$temp = $temp << 1 if ($cfg == 0x40); $temp = $temp << 1 if ($cfg == 0x40);
$temp = $temp/16.0;
} }
if ($temp) { $temp -= 4096 if (hex($data[1]) > 127); # ToDo : testen !
$temp = $temp/16.0;
$temp -= 4096 if (hex($data[1]) > 127);
$temp = sprintf('%.1f', $temp);
}
return $temp; return sprintf('%.1f', $temp);
} }
##################################### #####################################
@ -667,7 +665,7 @@ sub ParseFn {
Log3($shash, 5, "ParseFn, $msg"); Log3($shash, 5, "ParseFn, $msg");
my @arr = split(',', $msg); my @arr = split(',', $msg);
return if (!defined($arr[1]) || (length($arr[1]) != 16) || ($arr[1] !~ m{ [0-9A-F]+ }x )); return if (!defined($arr[1]) || (!validHex($arr[1],16)));
my $model = $arr[2] // return; my $model = $arr[2] // return;
my $val = $arr[3] // return; my $val = $arr[3] // return;
@ -846,6 +844,17 @@ sub OW_uniq {
##################################### #####################################
sub IsValidHex {
my $d = shift;
my $l = shift;
return 0 if (length($d) != $l);
for my $i (0..$l-1) {
return 0 if (substr($d,$i,1) !~ m{ [0-9A-F] }x);
}
return 1;
}
1; 1;
__END__ __END__