From 1f0733ad93ef51233fd1c01edfd9dd4e7c8520e3 Mon Sep 17 00:00:00 2001 From: justme-1968 Date: Tue, 3 Sep 2013 20:53:25 +0000 Subject: [PATCH] allow device selection by TYPE=xxx (and all other internal values) git-svn-id: https://svn.fhem.de/fhem/trunk@3852 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/CHANGED | 2 +- fhem/FHEM/33_readingsGroup.pm | 18 ++++++++++++++++-- fhem/MAINTAINER.txt | 2 +- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/fhem/CHANGED b/fhem/CHANGED index db384fa7d..596673d89 100644 --- a/fhem/CHANGED +++ b/fhem/CHANGED @@ -1,5 +1,5 @@ # Add changes at the top of the list. Keep it in ASCII, and 80-char wide. -- SVN + - feature: readingsGroup: allow device selecton by TYPE=xxx - feature: new module Revolt for Revolt NC-5462 power metering devices. (by mehf) - feature: HUEDevice: added alert command diff --git a/fhem/FHEM/33_readingsGroup.pm b/fhem/FHEM/33_readingsGroup.pm index 1bec9e6eb..c3b8467b6 100644 --- a/fhem/FHEM/33_readingsGroup.pm +++ b/fhem/FHEM/33_readingsGroup.pm @@ -60,7 +60,17 @@ readingsGroup_updateDevices($) } else { my @device = split(":", $param); - if( defined($defs{$device[0]}) ) { + if($device[0] =~ m/(.*)=(.*)/) { + my ($lattr,$re) = ($1, $2); + foreach my $d (sort keys %defs) { + next if( IsIgnored($d) ); + next if( !defined($defs{$d}{$lattr}) ); + next if( $defs{$d}{$lattr} !~ m/^$re$/); + $list{$d} = 1; + push @devices, [$d,$device[1]]; + } + } + elsif( defined($defs{$device[0]}) ) { $list{$device[0]} = 1; push @devices, [@device]; } else { @@ -454,7 +464,8 @@ readingsGroup_Get($@) Notes:
@@ -464,6 +475,9 @@ readingsGroup_Get($@) define batteries readingsGroup .*:battery

define temperatures readingsGroup s300th.*:temperature
+ define temperatures readingsGroup TYPE=CUL_WS.*:temperature
+
+ define culRSSI readingsGroup cul_RSSI=.*:+cul_RSSI

define heizung readingsGroup t1:temperature t2:temperature t3:temperature
attr heizung notime 1
diff --git a/fhem/MAINTAINER.txt b/fhem/MAINTAINER.txt index ef057096d..17f46bc88 100644 --- a/fhem/MAINTAINER.txt +++ b/fhem/MAINTAINER.txt @@ -85,7 +85,7 @@ FHEM/30_HUEBridge.pm justme1968 http://forum.fhem.de Sonstige FHEM/31_HUEDevice.pm justme1968 http://forum.fhem.de Sonstige Systeme FHEM/31_LightScene.pm justme1968 http://forum.fhem.de Automatisierung FHEM/32_SYSSTAT.pm justme1968 http://forum.fhem.de Unterstützende Dienste -FHEM/33_readingsGroup.pm justme1968 http://forum.fhem.de Automatisierung +FHEM/33_readingsGroup.pm justme1968 http://forum.fhem.de Frontends FHEM/32_speedtest.pm justme1968 http://forum.fhem.de Sonstiges FHEM/34_panStamp.pm justme1968 http://forum.fhem.de Sonstiges Systeme FHEM/34_SWAP.pm justme1968 http://forum.fhem.de Sonstiges Systeme