From 3c77a77cda2b18e5692ede60da9817a0836f84b5 Mon Sep 17 00:00:00 2001 From: nasseeder1 Date: Fri, 31 Dec 2021 08:20:31 +0000 Subject: [PATCH] 93_DbLog: standard unit assignment for readings beginning with 'temperature' removed, forum:#125087 git-svn-id: https://svn.fhem.de/fhem/trunk@25394 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/CHANGED | 2 +- fhem/FHEM/93_DbLog.pm | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/fhem/CHANGED b/fhem/CHANGED index 966017b28..72fc029f8 100644 --- a/fhem/CHANGED +++ b/fhem/CHANGED @@ -1,7 +1,7 @@ # Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # Do not insert empty lines here, update check depends on it. - change: 93_DbLog: standard unit assignment for readings beginning with - 'temperature' or 'humidity' removed, forum:#125087 + 'temperature' removed, forum:#125087 - feature: 36_ShellyMonitor: support for readings of Shelly TRV - feature: 82_LGTV_WebOS: add weibu and change part's of code - bugfix: 93_DbLog: logging negative temperature of Type FBDECT diff --git a/fhem/FHEM/93_DbLog.pm b/fhem/FHEM/93_DbLog.pm index 9dca07d9f..de8750559 100644 --- a/fhem/FHEM/93_DbLog.pm +++ b/fhem/FHEM/93_DbLog.pm @@ -30,7 +30,7 @@ no if $] >= 5.017011, warnings => 'experimental::smartmatch'; # Version History intern by DS_Starter: my %DbLog_vNotesIntern = ( - "4.12.5" => "31.12.2001 standard unit assignment for readings beginning with 'temperature' and 'humidity' removed, forum:#125087 ", + "4.12.5" => "31.12.2001 standard unit assignment for readings beginning with 'temperature' and removed, forum:#125087 ", "4.12.4" => "27.12.2021 change ParseEvent for FBDECT, warning messages for deprecated commands added ", "4.12.3" => "20.04.2021 change sub DbLog_ConnectNewDBH for SQLITE, change error Logging in DbLog_writeFileIfCacheOverflow ", "4.12.2" => "08.04.2021 change standard splitting ", @@ -1117,11 +1117,13 @@ sub DbLog_ParseEvent { } } - #globales Abfangen von # removed in Version 4.12.5 + #globales Abfangen von # changed in Version 4.12.5 # - temperature # - humidity #if ($reading =~ m(^temperature)) { $unit = "°C"; } # wenn reading mit temperature beginnt #elsif($reading =~ m(^humidity)) { $unit = "%"; } # wenn reading mit humidity beginnt + if($reading =~ m(^humidity)) { $unit = "%"; } # wenn reading mit humidity beginnt + # the interpretation of the argument depends on the device type # EMEM, M232Counter, M232Voltage return plain numbers