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

HMCCUCHN: bug fixes and enhanced handling of datapoints

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@10182 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
fhemzap 2015-12-15 16:50:52 +00:00
parent 872401f22c
commit 85f21fe30a
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
fhem/contrib/HMCCU/88_HMCCUCHN.pm
View File

@ -4,7 +4,7 @@
# #
# $Id:$ # $Id:$
# #
# Version 2.2 # Version 2.3
# #
# (c) 2015 zap (zap01 <at> t-online <dot> de) # (c) 2015 zap (zap01 <at> t-online <dot> de)
# #
@ -24,8 +24,10 @@
# get <name> configdesc # get <name> configdesc
# #
# attr <name> ccureadings { 0 | 1 } # attr <name> ccureadings { 0 | 1 }
# attr <name> ccureadingfilter <datapoint-expr>
# attr <name> ccureadingformat { name | address | datapoint }
# attr <name> statevals <text1>:<subtext1>[,...] # attr <name> statevals <text1>:<subtext1>[,...]
# attr <name> substitute <regexp1>:<subtext1>[,...] # attr <name> substitute <subst-rule>[;...]
# #
################################################################ ################################################################
# Requires module 88_HMCCU # Requires module 88_HMCCU
@ -56,7 +58,7 @@ sub HMCCUCHN_Initialize ($)
$hash->{GetFn} = "HMCCUCHN_Get"; $hash->{GetFn} = "HMCCUCHN_Get";
$hash->{AttrFn} = "HMCCUCHN_Attr"; $hash->{AttrFn} = "HMCCUCHN_Attr";
$hash->{AttrList} = "IODev ccureadingformat:name,address,datapoint ccureadings:0,1 statedatapoint statevals substitute loglevel:0,1,2,3,4,5,6 ". $readingFnAttributes; $hash->{AttrList} = "IODev ccureadingfilter ccureadingformat:name,address,datapoint ccureadings:0,1 statedatapoint statevals substitute stripnumber:0,1,2 loglevel:0,1,2,3,4,5,6 ". $readingFnAttributes;
} }
##################################### #####################################
@ -179,7 +181,7 @@ sub HMCCUCHN_Set ($@)
if (!defined ($objname) || !defined ($objvalue)) { if (!defined ($objname) || !defined ($objvalue)) {
return HMCCUCHN_SetError ($hash, "Usage: set <name> datapoint <datapoint> <value> [...]"); return HMCCUCHN_SetError ($hash, "Usage: set <name> datapoint <datapoint> <value> [...]");
} }
$objvalue = HMCCU_Substitute ($objvalue, $statevals, 1); $objvalue = HMCCU_Substitute ($objvalue, $statevals, 1, '');
# Build datapoint address # Build datapoint address
$objname = $hash->{ccuif}.'.'.$hash->{ccuaddr}.'.'.$objname; $objname = $hash->{ccuif}.'.'.$hash->{ccuaddr}.'.'.$objname;
@ -200,7 +202,7 @@ sub HMCCUCHN_Set ($@)
if (!defined ($objvalue)) { if (!defined ($objvalue)) {
return HMCCUCHN_SetError ($hash, "Usage: set <device> devstate <value>"); return HMCCUCHN_SetError ($hash, "Usage: set <device> devstate <value>");
} }
$objvalue = HMCCU_Substitute ($objvalue, $statevals, 1); $objvalue = HMCCU_Substitute ($objvalue, $statevals, 1, '');
# Build datapoint address # Build datapoint address
my $objname = $hash->{ccuif}.'.'.$hash->{ccuaddr}.'.'.$statedatapoint; my $objname = $hash->{ccuif}.'.'.$hash->{ccuaddr}.'.'.$statedatapoint;
@ -423,6 +425,11 @@ sub HMCCUCHN_SetError ($$)
<br/> <br/>
If set to 1 values read from CCU will be stored as readings. If set to 1 values read from CCU will be stored as readings.
</li><br/> </li><br/>
<li>ccureadingfilter &lt;datapoint-expr&gt;
<br/>
Only datapoints matching specified expression are stored as
readings.
</li><br/>
<li>statedatapoint &lt;datapoint&gt; <li>statedatapoint &lt;datapoint&gt;
<br/> <br/>
Set datapoint for devstate commands. Set datapoint for devstate commands.
@ -434,9 +441,11 @@ sub HMCCUCHN_SetError ($$)
<code>attr my_switch statevals on:true,off:false</code><br/> <code>attr my_switch statevals on:true,off:false</code><br/>
<code>set my_switch on</code> <code>set my_switch on</code>
</li><br/> </li><br/>
<li>substitude &lt;expression&gt;:&lt;subststr&gt;[,...] <li>substitude &lt;subst-rule&gt;[;...]
<br/> <br/>
Define substitions for reading values. Define substitions for reading values. Substitutions for parfile values must
be specified in parfiles. Syntax of subst-rule is<br/><br/>
[datapoint!]&lt;regexp1&gt;:&lt;text1&gt;[,...]
</li> </li>
</ul> </ul>
</ul> </ul>