FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-02-25 16:05:19 +00:00
Code Issues Releases Wiki Activity

10_KNX.pm: fix DbLog_split function (Forum #131357)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@26962 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
erwin 2023-01-04 18:20:30 +00:00
parent 221df1000a
commit 1e3cc80553
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fhem/FHEM/10_KNX.pm
View File

@ -108,6 +108,8 @@
# changed not user relevant internals to {.XXXX} # changed not user relevant internals to {.XXXX}
# changed DbLog_split function # changed DbLog_split function
# disabled StateFn # disabled StateFn
# MH 202301xx change pattern matching for dpt1 and dptxxx
# fix DbLogSplitFn
package KNX; ## no critic 'package' package KNX; ## no critic 'package'
@ -182,9 +184,11 @@ my $PAT_GAD_SUFFIX = 'nosuffix';
#pattern for forbidden GAD-Names #pattern for forbidden GAD-Names
my $PAT_GAD_NONAME = '^(on|off|value|raw|' . $PAT_GAD_OPTIONS . q{|} . $PAT_GAD_SUFFIX . ')'; my $PAT_GAD_NONAME = '^(on|off|value|raw|' . $PAT_GAD_OPTIONS . q{|} . $PAT_GAD_SUFFIX . ')';
#pattern for DPT #pattern for DPT
my $PAT_GAD_DPT = 'dpt\d*\.?\d*'; #my $PAT_GAD_DPT = 'dpt\d*\.?\d*';
my $PAT_GAD_DPT = 'dpt\d+\.?\d*';
#pattern for dpt1 (standard) #pattern for dpt1 (standard)
my $PAT_DPT1_PAT = '(on)|(off)|(0?1)|(0?0)'; #my $PAT_DPT1_PAT = '(on)|(off)|(0?1)|(0?0)';
my $PAT_DPT1_PAT = 'on|off|[01]$';
#pattern for date #pattern for date
my $PAT_DTSEP = qr/(?:_)/ix; # date/time separator my $PAT_DTSEP = qr/(?:_)/ix; # date/time separator
my $PAT_DATEdm = qr/^(3[01]|[1-2][0-9]|0?[1-9])\.(1[0-2]|0?[1-9])/ix; # day/month my $PAT_DATEdm = qr/^(3[01]|[1-2][0-9]|0?[1-9])\.(1[0-2]|0?[1-9])/ix; # day/month
@ -984,7 +988,8 @@ sub KNX_DbLog_split {
my $unit = q{}; # default my $unit = q{}; # default
# split event into reading & value # split event into reading & value
my ($reading, $value) = split(/:\s/x, $event, 2); my ($reading,$value) = ($event =~ /^([^\s]+)[:]\s(.*)/x );
# my ($reading, $value) = split(/:\s/x, $event, 2);
if (! defined($reading)) { if (! defined($reading)) {
$reading = 'state'; $reading = 'state';
$value = $event; $value = $event;