From a35e964c7de7852d83a5c81db5d84c0263974beb Mon Sep 17 00:00:00 2001
From: zap <>
Date: Sat, 11 Sep 2021 14:54:19 +0000
Subject: [PATCH] HMCCU: Version 5.0
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@24949 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
contrib/HMCCU/CHANGED | 6 +++++-
contrib/HMCCU/FHEM/88_HMCCU.pm | 7 ++++---
contrib/HMCCU/FHEM/HMCCUConf.pm | 4 ++--
contrib/HMCCU/controls_HMCCU.txt | 4 ++--
4 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/contrib/HMCCU/CHANGED b/contrib/HMCCU/CHANGED
index 4ee221978..4365c2e36 100644
--- a/contrib/HMCCU/CHANGED
+++ b/contrib/HMCCU/CHANGED
@@ -1,4 +1,6 @@
- - bugfix: 88_HMCCU.pm: Fixed some bux in version 5.0
+
+ - bugfix: 88_HMCCU.pm: Fixed some bugs in version 5.0
+ - bugfix: 88_HMCCU.pm: Fixed some bugs in version 5.0
- bugfix: 88_HMCCU.pm: Version 5.0
- bugfix: 88_HMCCU.pm: Release candidate 7
- bugfix: 88_HMCCU.pm: Release candidate 6
@@ -7,4 +9,6 @@
- bugfix: 88_HMCCU.pm: Release candidate 3
- bugfix: 88_HMCCU.pm: Release candidate 2
- bugfix: 88_HMCCU.pm: Fixed bug in set defaults command
+ - bugfix: 88_HMCCU.pm: Fixed state-/controldatapoint bug at FHEM start
+ - bugfix: 88_HMCCU.pm: Fixed some bugs. New command set readingFilter
- bugfix: 88_HMCCU.pm: Fixed device detection bugs
diff --git a/contrib/HMCCU/FHEM/88_HMCCU.pm b/contrib/HMCCU/FHEM/88_HMCCU.pm
index 372ca1237..48b5ee703 100644
--- a/contrib/HMCCU/FHEM/88_HMCCU.pm
+++ b/contrib/HMCCU/FHEM/88_HMCCU.pm
@@ -1712,7 +1712,7 @@ sub HMCCU_Get ($@)
my $rc;
if ($opt eq 'vars') {
- my $varname = shift @$a // return HMCCU_SetError ($hash, "Usage: get $name vars {regexp}[,...]");
+ my $varname = shift @$a // return HMCCU_SetError ($hash, "Usage: get $name vars {regexp}");
($rc, $result) = HMCCU_GetVariables ($hash, $varname);
return HMCCU_SetError ($hash, $rc, $result) if ($rc < 0);
return HMCCU_SetState ($hash, 'OK', $result);
@@ -10396,7 +10396,8 @@ sub HMCCU_MaxHashEntries ($$)
time consuming.
get <name> vars <regexp>
- Get CCU system variables matching regexp and store them as readings.
+ Get CCU system variables matching regexp and store them as readings. Use attribute
+ ccuGetVars to fetch variables periodically.
@@ -10505,7 +10506,7 @@ sub HMCCU_MaxHashEntries ($$)
is queried. Default is 'Value'. Method for write access to datapoints is always
'State'.
- ccuGetVars <interval>[<pattern>]
+ ccuGetVars <interval>:[<pattern>]
Read CCU system variables periodically and update readings. If pattern is specified
only variables matching this expression are stored as readings.
diff --git a/contrib/HMCCU/FHEM/HMCCUConf.pm b/contrib/HMCCU/FHEM/HMCCUConf.pm
index dd79f04ea..fc0d9ac51 100644
--- a/contrib/HMCCU/FHEM/HMCCUConf.pm
+++ b/contrib/HMCCU/FHEM/HMCCUConf.pm
@@ -1765,7 +1765,7 @@ if (oSV) {
code => qq(
object osysvar;
string ssysvarid;
-foreach (ssysvarid, (dom.GetObject(ID_SYSTEM_VARIABLES)).EnumUsedIDs()) {
+foreach (ssysvarid, (dom.GetObject(ID_SYSTEM_VARIABLES)).EnumIDs()) {
osysvar = dom.GetObject(ssysvarid);
Write(osysvar.Name());
if(osysvar.ValueSubType() == 6) {
@@ -1784,7 +1784,7 @@ foreach (ssysvarid, (dom.GetObject(ID_SYSTEM_VARIABLES)).EnumUsedIDs()) {
parameters => 0,
code => qq(
string sSysVarId;
-foreach (sSysVarId, (dom.GetObject(ID_SYSTEM_VARIABLES)).EnumUsedIDs()) {
+foreach (sSysVarId, (dom.GetObject(ID_SYSTEM_VARIABLES)).EnumIDs()) {
object oSysVar = dom.GetObject(sSysVarId);
Write(oSysVar.Name());
if (oSysVar.ValueSubType() == 6) {
diff --git a/contrib/HMCCU/controls_HMCCU.txt b/contrib/HMCCU/controls_HMCCU.txt
index e69df7c87..d363d3a25 100644
--- a/contrib/HMCCU/controls_HMCCU.txt
+++ b/contrib/HMCCU/controls_HMCCU.txt
@@ -1,5 +1,5 @@
UPD 2021-09-09_19:12:29 103713 FHEM/88_HMCCURPCPROC.pm
-UPD 2021-09-09_18:45:27 84909 FHEM/HMCCUConf.pm
+UPD 2021-09-11_15:40:16 84901 FHEM/HMCCUConf.pm
UPD 2021-09-02_19:33:39 43994 FHEM/88_HMCCUCHN.pm
-UPD 2021-09-08_20:42:05 358142 FHEM/88_HMCCU.pm
+UPD 2021-09-11_16:31:05 358198 FHEM/88_HMCCU.pm
UPD 2021-09-02_19:33:39 31267 FHEM/88_HMCCUDEV.pm