FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-19 18:56:03 +00:00
Code Issues Releases Wiki Activity

HMCCU: Several improvements and bug fixes

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@25336 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
zap 2021-12-12 13:01:01 +00:00
parent c48380d5fd
commit 62a234b4d9
6 changed files with 428 additions and 193 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fhem/CHANGED
View File

@ -1,5 +1,6 @@
# Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # 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. # Do not insert empty lines here, update check depends on it.
- bugfix: 88_HMCCU: Several improvements and bug fixes
- bugfix: 93_DbRep: fix some problems with reduceLog - bugfix: 93_DbRep: fix some problems with reduceLog
(Forum: #/topic,53584.msg1177799.html#msg1177799 (Forum: #/topic,53584.msg1177799.html#msg1177799
- feature: 98_weekprofile: support HMCCUCHN with CCU - feature: 98_weekprofile: support HMCCUCHN with CCU

318
fhem/FHEM/88_HMCCU.pm
View File

@ -31,7 +31,7 @@ no if $] >= 5.017011, warnings => 'experimental::smartmatch';
use strict; use strict;
use warnings; use warnings;
# use Data::Dumper; use Data::Dumper;
use Encode qw(decode encode); use Encode qw(decode encode);
use RPC::XML::Client; use RPC::XML::Client;
use RPC::XML::Server; use RPC::XML::Server;
@ -57,7 +57,7 @@ my %HMCCU_CUST_CHN_DEFAULTS;
my %HMCCU_CUST_DEV_DEFAULTS; my %HMCCU_CUST_DEV_DEFAULTS;
# HMCCU version # HMCCU version
my $HMCCU_VERSION = '5.0 213301607'; my $HMCCU_VERSION = '5.0 213461309';
# Timeout for CCU requests (seconds) # Timeout for CCU requests (seconds)
my $HMCCU_TIMEOUT_REQUEST = 4; my $HMCCU_TIMEOUT_REQUEST = 4;
@ -4327,11 +4327,12 @@ sub HMCCU_GetParamDef ($$$;$)
my $a = $devDesc->{ADDRESS}; my $a = $devDesc->{ADDRESS};
my ($devAddr, $chnNo) = ($a =~ /:[0-9]{1,2}$/) ? HMCCU_SplitChnAddr ($a) : ($a, 'd'); my ($devAddr, $chnNo) = ($a =~ /:[0-9]{1,2}$/) ? HMCCU_SplitChnAddr ($a) : ($a, 'd');
my $model = HMCCU_GetDeviceModel ($hash, $devDesc->{_model}, $devDesc->{_fw_ver}, $chnNo);
if (!defined($paramset)) { if (!defined($paramset)) {
HMCCU_Log ($hash, 2, "$a Paramset not defined ".stacktraceAsString(undef)); HMCCU_Log ($hash, 2, "$a Paramset not defined ".stacktraceAsString(undef));
return undef; return undef;
} }
my $model = HMCCU_GetDeviceModel ($hash, $devDesc->{_model}, $devDesc->{_fw_ver}, $chnNo);
if (defined($model) && exists($model->{$paramset})) { if (defined($model) && exists($model->{$paramset})) {
if (defined($parameter)) { if (defined($parameter)) {
return exists($model->{$paramset}{$parameter}) ? $model->{$paramset}{$parameter} : undef; return exists($model->{$paramset}{$parameter}) ? $model->{$paramset}{$parameter} : undef;
@ -4378,6 +4379,46 @@ sub HMCCU_FindParamDef ($$$)
return (undef, undef); return (undef, undef);
} }
######################################################################
# Get values of ENUM datapoint
# object - Hash with parameter defintion or channel address
# dpt - Datapoint name
# value - Either a numeric value or an enumeration constant
# If value is not specified, a comma separated list of enumeration
# constants is returned.
# Return value or undef if datapoint is not of type ENUM.
######################################################################
sub HMCCU_GetEnumValues ($$$;$)
{
my ($ioHash, $object, $dpt, $value) = @_;
my $paramDef = ref($object) eq 'HASH' ? $object : HMCCU_GetParamDef ($ioHash, $object, 'VALUES', $dpt);
if (defined($paramDef) && defined($paramDef->{TYPE}) && $paramDef->{TYPE} eq 'ENUM' && defined($paramDef->{VALUE_LIST})) {
my $i = defined($paramDef->{MIN}) && HMCCU_IsIntNum($paramDef->{MIN}) ? $paramDef->{MIN} : 0;
my $j = $i;
my @valList = split(',',$paramDef->{VALUE_LIST});
my %valIndex = map { $_ => $i++ } @valList;
if (defined($value)) {
if ($value eq '#') {
$j--;
return join(',', map { $j++; $_ ne '' ? "$_:$j" : () } @valList);
}
elsif (HMCCU_IsIntNum($value)) {
return $valList[$value] if ($value >= 0 && $value < scalar(@valList));
}
else {
return $valIndex{$value} if (exists($valIndex{$value}));
}
}
else {
return $paramDef->{VALUE_LIST};
}
}
return $value;
}
###################################################################### ######################################################################
# Check if parameter exists # Check if parameter exists
# Parameters: # Parameters:
@ -4683,7 +4724,7 @@ sub HMCCU_UpdateParamsetReadings ($$$;$)
HMCCU_UpdateInternalValues ($clHash, $chKey, $ps, 'VAL', $v); HMCCU_UpdateInternalValues ($clHash, $chKey, $ps, 'VAL', $v);
# Modify value: scale, format, substitute # Modify value: scale, format, substitute
$sv = HMCCU_ScaleValue ($clHash, $c, $p, $v, 0); $sv = HMCCU_ScaleValue ($clHash, $c, $p, $v, 0, $ps);
HMCCU_UpdateInternalValues ($clHash, $chKey, $ps, 'NVAL', $sv); HMCCU_UpdateInternalValues ($clHash, $chKey, $ps, 'NVAL', $sv);
HMCCU_Trace ($clHash, 2, "$p: sv = $sv"); HMCCU_Trace ($clHash, 2, "$p: sv = $sv");
$fv = HMCCU_FormatReadingValue ($clHash, $sv, $p); $fv = HMCCU_FormatReadingValue ($clHash, $sv, $p);
@ -5816,7 +5857,6 @@ sub HMCCU_IsDeviceActive ($)
return 1 if ($disabled == 0 && exists($clHash->{ccuaddr}) && exists($clHash->{ccuif}) && $devstate ne 'inactive'); return 1 if ($disabled == 0 && exists($clHash->{ccuaddr}) && exists($clHash->{ccuif}) && $devstate ne 'inactive');
} }
HMCCU_Log ($clHash, 2, "Device disabled or inactive and/or address or interface is missing");
return 0; return 0;
} }
@ -6803,8 +6843,8 @@ sub HMCCU_SetDefaultAttributes ($;$)
} }
} }
else { else {
my ($sc, $sd, $cc, $cd) = HMCCU_GetSCDatapoints ($clHash); my $scc = HMCCU_StateOrControlChannel ($clHash);
$role = $parRef->{role} // HMCCU_GetChannelRole ($clHash, $parRef->{roleChn} // $cc); $role = $parRef->{role} // HMCCU_GetChannelRole ($clHash, $parRef->{roleChn} // $scc);
} }
if (defined($role) && $role ne '') { if (defined($role) && $role ne '') {
@ -6848,6 +6888,8 @@ sub HMCCU_GetStateValues ($;$$)
$dpt //= ''; $dpt //= '';
$ctrlChn //= ''; $ctrlChn //= '';
my $ioHash = HMCCU_GetHash ($clHash);
my $sv = AttrVal ($clHash->{NAME}, 'statevals', ''); my $sv = AttrVal ($clHash->{NAME}, 'statevals', '');
if ($sv eq '' && $dpt ne '' && $ctrlChn ne '') { if ($sv eq '' && $dpt ne '' && $ctrlChn ne '') {
my $role = HMCCU_GetChannelRole ($clHash, $ctrlChn); my $role = HMCCU_GetChannelRole ($clHash, $ctrlChn);
@ -6855,7 +6897,9 @@ sub HMCCU_GetStateValues ($;$$)
if ($role ne '' && exists($HMCCU_STATECONTROL->{$role}) && if ($role ne '' && exists($HMCCU_STATECONTROL->{$role}) &&
HMCCU_DetectSCDatapoint ($HMCCU_STATECONTROL->{$role}{C}, $clHash->{ccuif}) eq $dpt) HMCCU_DetectSCDatapoint ($HMCCU_STATECONTROL->{$role}{C}, $clHash->{ccuif}) eq $dpt)
{ {
return $HMCCU_STATECONTROL->{$role}{V}; return $HMCCU_STATECONTROL->{$role}{V} eq '#' ?
HMCCU_GetEnumValues ($ioHash, HMCCU_GetChannelAddr ($clHash, $ctrlChn), $HMCCU_STATECONTROL->{$role}{C}, '#') :
$HMCCU_STATECONTROL->{$role}{V};
} }
} }
@ -7038,6 +7082,9 @@ sub HMCCU_UpdateRoleCommands ($$;$)
my %valList; my %valList;
if ($dpt eq $HMCCU_STATECONTROL->{$role}{C}) { if ($dpt eq $HMCCU_STATECONTROL->{$role}{C}) {
# If parameter is control datapoint, use values/conversions from HMCCU_STATECONTROL # If parameter is control datapoint, use values/conversions from HMCCU_STATECONTROL
my $stVals = $HMCCU_STATECONTROL->{$role}{V} eq '#' ?
HMCCU_GetEnumValues ($ioHash, HMCCU_GetChannelAddr ($clHash, $chnNo), $HMCCU_STATECONTROL->{$role}{C}, '#') :
$HMCCU_STATECONTROL->{$role}{V};
foreach my $cv (split(',', $HMCCU_STATECONTROL->{$role}{V})) { foreach my $cv (split(',', $HMCCU_STATECONTROL->{$role}{V})) {
my ($vn, $vv) = split(':', $cv); my ($vn, $vv) = split(':', $cv);
$valList{$vn} = $vv // $vn; $valList{$vn} = $vv // $vn;
@ -7182,7 +7229,10 @@ sub HMCCU_UpdateAdditionalCommands ($$;$$)
if ($role ne '' && exists($HMCCU_STATECONTROL->{$role}) && if ($role ne '' && exists($HMCCU_STATECONTROL->{$role}) &&
HMCCU_DetectSCDatapoint ($HMCCU_STATECONTROL->{$role}{C}, $clHash->{ccuif}) eq $cd) { HMCCU_DetectSCDatapoint ($HMCCU_STATECONTROL->{$role}{C}, $clHash->{ccuif}) eq $cd) {
# Only add toggle command, ignore attribute statevals # Only add toggle command, ignore attribute statevals
my %stateCmds = split (/[:,]/, $HMCCU_STATECONTROL->{$role}{V}); my $stVals = $HMCCU_STATECONTROL->{$role}{V} eq '#' ?
HMCCU_GetEnumValues ($ioHash, HMCCU_GetChannelAddr ($clHash, $cc), $HMCCU_STATECONTROL->{$role}{C}, '#') :
$HMCCU_STATECONTROL->{$role}{V};
my %stateCmds = split (/[:,]/, $stVals);
my @states = keys %stateCmds; my @states = keys %stateCmds;
$clHash->{hmccu}{cmdlist}{set} .= $s.'toggle:noArg' if (scalar(@states) > 1); $clHash->{hmccu}{cmdlist}{set} .= $s.'toggle:noArg' if (scalar(@states) > 1);
return; return;
@ -7431,6 +7481,7 @@ sub HMCCU_ExecuteSetDatapointCommand ($@)
{ {
my ($clHash, $a, $h) = @_; my ($clHash, $a, $h) = @_;
my $ioHash = HMCCU_GetHash ($clHash);
my $usage = "Usage: set $clHash->{NAME} datapoint [{channel-number}.]{datapoint} {value} [...]"; my $usage = "Usage: set $clHash->{NAME} datapoint [{channel-number}.]{datapoint} {value} [...]";
my %dpval; my %dpval;
my $i = 0; my $i = 0;
@ -7439,32 +7490,63 @@ sub HMCCU_ExecuteSetDatapointCommand ($@)
my $stVals = HMCCU_GetStateValues ($clHash, $cd, $cc); my $stVals = HMCCU_GetStateValues ($clHash, $cd, $cc);
push (@$a, %${h}) if (defined($h)); push (@$a, %${h}) if (defined($h));
while (my $dpt = shift @$a) { while (my $cdpt = shift @$a) {
my $value = shift @$a // return HMCCU_SetError ($clHash, $usage); my $value = shift @$a // return HMCCU_SetError ($clHash, $usage);
$i++; $i++;
my $chnAddr = '';
my $dpt = '';
if ($clHash->{TYPE} eq 'HMCCUDEV') { if ($clHash->{TYPE} eq 'HMCCUDEV') {
if ($dpt =~ /^([0-9]+)\..+$/) { if ($cdpt =~ /^([0-9]+)\.(.+)$/) {
$chnAddr = "$devAddr:$1";
$dpt = $2;
return HMCCU_SetError ($clHash, -7) if ($1 >= $clHash->{hmccu}{channels}); return HMCCU_SetError ($clHash, -7) if ($1 >= $clHash->{hmccu}{channels});
} }
else { else {
return HMCCU_SetError ($clHash, -12) if ($cc eq ''); return HMCCU_SetError ($clHash, -12) if ($cc eq '');
$dpt = "$cc.$dpt"; $dpt = $cdpt;
$cdpt = "$cc.$cdpt";
$chnAddr = "$devAddr:$cc";
} }
} }
else { else {
if ($dpt =~ /^([0-9]+)\..+$/) { if ($cdpt =~ /^([0-9]+)\.(.+)$/) {
$chnAddr = "$devAddr:$1";
$dpt = $2;
return HMCCU_SetError ($clHash, -7) if ($1 != $chnNo); return HMCCU_SetError ($clHash, -7) if ($1 != $chnNo);
} }
else { else {
$dpt = "$chnNo.$dpt"; $dpt = $cdpt;
$cdpt = "$chnNo.$cdpt";
$chnAddr = "$devAddr:$chnNo";
}
}
my $paramDef = HMCCU_GetParamDef ($ioHash, $chnAddr, 'VALUES', $dpt);
my $paramType = defined($paramDef) ? $paramDef->{TYPE} : '';
# Show values allowed for datapoint
if ($value eq '?' && defined($paramDef)) {
if ($paramDef->{OPERATIONS} & 2) {
if ($paramType ne 'ENUM') {
my $min = $paramDef->{MIN} // '?';
my $max = $paramDef->{MAX} // '?';
my $unit = $paramDef->{UNIT} // '?';
return "Usage: set $clHash->{NAME} datapoint $cdpt {$paramType} # min=$min max=$max unit=$unit";
}
else {
return "Usage: set $clHash->{NAME} datapoint $cdpt {$paramDef->{VALUE_LIST}}";
}
}
else {
return "Datapoint $cdpt is not writeable";
} }
} }
$value = HMCCU_Substitute ($value, $stVals, 1, undef, '') if ($stVals ne '' && $dpt eq $cd); $value = HMCCU_Substitute ($value, $stVals, 1, undef, '') if ($stVals ne '' && $dpt eq $cd);
my $no = sprintf ("%03d", $i); my $no = sprintf ("%03d", $i);
$dpval{"$no.$clHash->{ccuif}.$devAddr:$dpt"} = $value; $dpval{"$no.$clHash->{ccuif}.$chnAddr.$dpt"} = $value;
} }
return HMCCU_SetError ($clHash, $usage) if (scalar(keys %dpval) < 1); return HMCCU_SetError ($clHash, $usage) if (scalar(keys %dpval) < 1);
@ -7526,9 +7608,13 @@ sub HMCCU_ExecuteSetParameterCommand ($@)
return HMCCU_SetError ($clHash, "Paramset $paramset not supported by device or channel") return HMCCU_SetError ($clHash, "Paramset $paramset not supported by device or channel")
if ($devDesc->{PARAMSETS} !~ /$paramset/); if ($devDesc->{PARAMSETS} !~ /$paramset/);
if (!HMCCU_IsValidParameter ($ioHash, $devDesc, $paramset, $h)) { if (!HMCCU_IsValidParameter ($ioHash, $devDesc, $paramset, $h)) {
my @parList = HMCCU_GetParamDef ($ioHash, $devDesc, $paramset); my $paramDef = HMCCU_GetParamDef ($ioHash, $devDesc, $paramset);
return HMCCU_SetError ($clHash, 'Invalid parameter specified. Valid parameters are '. if (defined($paramDef)) {
join(',', @parList)); my @parList = map { $paramDef->{$_}{OPERATIONS} == 2 ? $_ : () } keys %$paramDef;
return HMCCU_SetError ($clHash, 'Invalid parameter specified. Valid parameters: '.
join(',', @parList)) if (scalar(@parList) > 0);
}
return HMCCU_SetError ($clHash, 'Invalid parameter specified');
} }
if ($paramset eq 'VALUES' || $paramset eq 'MASTER') { if ($paramset eq 'VALUES' || $paramset eq 'MASTER') {
@ -7978,7 +8064,7 @@ sub HMCCU_SetDefaultSCDatapoints ($$;$$)
$cc = $detect->{defCCh} if ($detect->{defCCh} != -1); $cc = $detect->{defCCh} if ($detect->{defCCh} != -1);
$sd = $detect->{stateRole}{$sc}{datapoint} if ($sc ne '' && exists($detect->{stateRole}{$sc})); $sd = $detect->{stateRole}{$sc}{datapoint} if ($sc ne '' && exists($detect->{stateRole}{$sc}));
$cd = $detect->{controlRole}{$cc}{datapoint} if ($cc ne '' && exists($detect->{controlRole}{$cc})); $cd = $detect->{controlRole}{$cc}{datapoint} if ($cc ne '' && exists($detect->{controlRole}{$cc}));
# HMCCU_Log ($clHash, 2, "Prio 4: s=$sc.$sd c=$cc.$sd"); # HMCCU_Log ($clHash, 2, "Prio 4: s=$sc.$sd c=$cc.$cd");
} }
# Prio 3: Use information stored in device hash (HMCCUDEV only) # Prio 3: Use information stored in device hash (HMCCUDEV only)
@ -7986,22 +8072,34 @@ sub HMCCU_SetDefaultSCDatapoints ($$;$$)
# Support for level 5 devices # Support for level 5 devices
($sc, $sd) = HMCCU_SplitDatapoint ($clHash->{hmccu}{defSDP}) if (defined($clHash->{hmccu}{defSDP})); ($sc, $sd) = HMCCU_SplitDatapoint ($clHash->{hmccu}{defSDP}) if (defined($clHash->{hmccu}{defSDP}));
($cc, $cd) = HMCCU_SplitDatapoint ($clHash->{hmccu}{defCDP}) if (defined($clHash->{hmccu}{defCDP})); ($cc, $cd) = HMCCU_SplitDatapoint ($clHash->{hmccu}{defCDP}) if (defined($clHash->{hmccu}{defCDP}));
# HMCCU_Log ($clHash, 2, "Prio 3: s=$sc.$sd c=$cc.$sd"); # HMCCU_Log ($clHash, 2, "Prio 3: s=$sc.$sd c=$cc.$cd");
} }
# Prio 2: Use attribute statechannel and controlchannel for HMCCUDEV and channel address for HMCCUCHN # Prio 2: Use attribute statechannel and controlchannel for HMCCUDEV and channel address for HMCCUCHN
my ($asc, $acc) = ('', '');
if ($clType eq 'HMCCUCHN') { if ($clType eq 'HMCCUCHN') {
# State and control channel of HMCCUCHN devices is defined by channel address # State and control channel of HMCCUCHN devices is defined by channel address
my $da; my $da;
($da, $sc) = HMCCU_SplitChnAddr ($clHash->{ccuaddr}); ($da, $asc) = HMCCU_SplitChnAddr ($clHash->{ccuaddr});
$cc = $sc; $acc = $asc;
} }
else { else {
# Consider attributes statechannel and controlchannel for HMCCUDEV devices # Consider attributes statechannel and controlchannel for HMCCUDEV devices
$sc = AttrVal ($clName, 'statechannel', $sc); $asc = AttrVal ($clName, 'statechannel', $sc);
$cc = AttrVal ($clName, 'controlchannel', $cc); $acc = AttrVal ($clName, 'controlchannel', $cc);
} }
# HMCCU_Log ($clHash, 2, "Prio 2: s=$sc.$sd c=$cc.$sd"); # Correct datapoints
if (defined($detect)) {
if ($asc ne '' && exists($detect->{stateRole}) && exists($detect->{stateRole}{$asc})) {
$sc = $asc;
$sd = $detect->{stateRole}{$asc}{datapoint};
}
if ($acc ne '' && exists($detect->{controlRole}) && exists($detect->{controlRole}{$acc})) {
$cc = $acc;
$cd = $detect->{controlRole}{$acc}{datapoint};
}
}
# HMCCU_Log ($clHash, 2, "Prio 2: s=$sc.$sd c=$cc.$cd");
# Prio 1: Use attributes statedatapoint and controldatapoint # Prio 1: Use attributes statedatapoint and controldatapoint
# Attributes are overriding attributes statechannel and controlchannel for HMCCUDEV # Attributes are overriding attributes statechannel and controlchannel for HMCCUDEV
@ -8023,13 +8121,13 @@ sub HMCCU_SetDefaultSCDatapoints ($$;$$)
} }
$cd = $ca[0]; $cd = $ca[0];
} }
# HMCCU_Log ($clHash, 2, "Prio 1: s=$sc.$sd c=$cc.$sd"); # HMCCU_Log ($clHash, 2, "Prio 1: s=$sc.$sd c=$cc.$cd");
my $sr = $sc ne '' && defined($detect) && exists($detect->{stateRole}{$sc}) ? $detect->{stateRole}{$sc}{role} : ''; my $sr = $sc ne '' && defined($detect) && exists($detect->{stateRole}{$sc}) ? $detect->{stateRole}{$sc}{role} : '';
my $cr = $cc ne '' && defined($detect) && exists($detect->{controlRole}{$cc}) ? $detect->{controlRole}{$cc}{role} : ''; my $cr = $cc ne '' && defined($detect) && exists($detect->{controlRole}{$cc}) ? $detect->{controlRole}{$cc}{role} : '';
($sc, $sd) = ('', '') if (!HMCCU_SetSCDatapoints ($clHash, 'statedatapoint', "$sc.$sd", $sr)); ($sc, $sd) = ('', '') if (!HMCCU_SetSCDatapoints ($clHash, 'statedatapoint', "$sc.$sd", $sr));
($cc, $cd) = ('', '') if (!HMCCU_SetSCDatapoints ($clHash, 'controldatapoint', "$cc.$cd", $cr)); ($cc, $cd) = ('', '') if (!HMCCU_SetSCDatapoints ($clHash, 'controldatapoint', "$cc.$cd", $cr));
# HMCCU_Log ($clHash, 2, "SetDC: s=$sc.$sd c=$cc.$sd sr=$sr cr=$cr"); # HMCCU_Log ($clHash, 2, "SetDC: s=$sc.$sd c=$cc.$cd sr=$sr cr=$cr");
if ($cmd) { if ($cmd) {
my $chn = $cc ne '' ? $cc : $sc; my $chn = $cc ne '' ? $cc : $sc;
@ -8047,46 +8145,44 @@ sub HMCCU_SetDefaultSCDatapoints ($$;$$)
###################################################################### ######################################################################
# Get state and control channel and datapoint of a device. # Get state and control channel and datapoint of a device.
# Priority depends on FHEM device type: # If neither statedatapoint nor controldatapoint is defined, try
# # setting default values.
# HMCCUCHN:
# 1. Datapoints from attributes statedatapoint, controldatapoint
# 2. Datapoints by role
#
# HMCCUDEV:
# 1. Attributes statechannel, controlchannel
# 2. Channel from attributes statedatapoint, controldatapoint
# 3. Datapoints from attributes statedatapoint, controldatapoint
# 4. Channel datapoint by role
#
# If controldatapoint is not specified it is synchronized with
# statedatapoint.
#
# Return (sc, sd, cc, cd, sdCnt, cdCnt)
# If sdCnt > 1 or cdCnt > 1 more than 1 matching rules were found
###################################################################### ######################################################################
sub HMCCU_GetSCDatapoints ($) sub HMCCU_GetSCDatapoints ($)
{ {
my ($clHash) = @_; my ($clHash) = @_;
my $ioHash = HMCCU_GetHash ($clHash);
my $type = $clHash->{TYPE}; my $type = $clHash->{TYPE};
my ($sc, $sd) = HMCCU_StateDatapoint ($clHash); my ($sc, $sd) = HMCCU_StateDatapoint ($clHash);
my ($cc, $cd) = HMCCU_ControlDatapoint ($clHash); my ($cc, $cd) = HMCCU_ControlDatapoint ($clHash);
my $rsdCnt;
my $rcdCnt; my $rsdCnt = $sc ne '' && $sd ne '' ? 1 : 0;
my $rcdCnt = $cc ne '' && $cd ne '' ? 1 : 0;
return ($sc, $sd, $cc, $cd, $rsdCnt, $rcdCnt) if ($rsdCnt > 0 || $rcdCnt > 0);
# Detect by attributes # Detect by attributes
# ($sc, $sd, $cc, $cd, $rsdCnt, $rcdCnt) = HMCCU_DetectSCAttr ($clHash, $sc, $sd, $cc, $cd); # ($sc, $sd, $cc, $cd, $rsdCnt, $rcdCnt) = HMCCU_DetectSCAttr ($clHash, $sc, $sd, $cc, $cd);
# return ($sc, $sd, $cc, $cd, $rsdCnt, $rcdCnt) if ($rsdCnt); # return ($sc, $sd, $cc, $cd, $rsdCnt, $rcdCnt) if ($rsdCnt);
# HMCCU_Log ($clHash, 2, "GetSCDatapoints 2: $sc, $sd, $cc, $cd"); my $ioHash = HMCCU_GetHash ($clHash);
return HMCCU_SetDefaultSCDatapoints ($ioHash, $clHash); return HMCCU_SetDefaultSCDatapoints ($ioHash, $clHash);
} }
sub HMCCU_StateOrControlChannel ($)
{
my ($clHash) = @_;
my ($sc, $sd) = HMCCU_StateDatapoint ($clHash);
my ($cc, $cd) = HMCCU_ControlDatapoint ($clHash);
($sc, $sd, $cc, $cd) = HMCCU_GetSCDatapoints ($clHash);
return $cc eq '' ? $sc : $cc;
}
sub HMCCU_ControlDatapoint ($) sub HMCCU_ControlDatapoint ($)
{ {
my ($clHash) = @_; my ($clHash) = @_;
@ -9066,16 +9162,18 @@ sub HMCCU_SetMultipleParameters ($$$;$)
$paramSet //= 'VALUES'; $paramSet //= 'VALUES';
$address =~ s/:d$//; $address =~ s/:d$//;
my ($add, $chn) = HMCCU_SplitChnAddr ($address); my ($add, $chn) = HMCCU_SplitChnAddr ($address, 'd');
return (-1, undef) if ($paramSet eq 'VALUES' && !defined($chn)); return (-1, undef) if ($paramSet eq 'VALUES' && $chn eq 'd');
foreach my $p (sort keys %$params) { foreach my $p (sort keys %$params) {
HMCCU_Trace ($clHash, 2, "Parameter=$address.$paramSet.$p Value=$params->{$p}"); HMCCU_Trace ($clHash, 2, "Parameter=$address.$paramSet.$p chn=$chn Value=$params->{$p}");
return (-8, undef) if ( return (-8, undef) if (
($paramSet eq 'VALUES' && !HMCCU_IsValidParameter ($clHash, $address, 'VALUES', $p, 2)) || ($paramSet eq 'VALUES' && !HMCCU_IsValidParameter ($clHash, $address, 'VALUES', $p, 2)) ||
($paramSet eq 'MASTER' && !HMCCU_IsValidParameter ($clHash, $address, 'MASTER', $p)) ($paramSet eq 'MASTER' && !HMCCU_IsValidParameter ($clHash, $address, 'MASTER', $p))
); );
$params->{$p} = HMCCU_ScaleValue ($clHash, $chn, $p, $params->{$p}, 1); if ($params->{$p} !~ /:(STRING|BOOL|INTEGER|FLOAT|DOUBLE)$/) {
$params->{$p} = HMCCU_ScaleValue ($clHash, $chn, $p, $params->{$p}, 1, $paramSet);
}
} }
return HMCCU_RPCRequest ($clHash, 'putParamset', $address, $paramSet, $params); return HMCCU_RPCRequest ($clHash, 'putParamset', $address, $paramSet, $params);
@ -9090,7 +9188,8 @@ sub HMCCU_SetMultipleParameters ($$$;$)
# Return value < 0 on error. # Return value < 0 on error.
###################################################################### ######################################################################
sub HMCCU_SetMultipleDatapoints ($$) { sub HMCCU_SetMultipleDatapoints ($$)
{
my ($clHash, $params) = @_; my ($clHash, $params) = @_;
my $mdFlag = $clHash->{TYPE} eq 'HMCCU' ? 1 : 0; my $mdFlag = $clHash->{TYPE} eq 'HMCCU' ? 1 : 0;
my $ioHash; my $ioHash;
@ -9154,8 +9253,19 @@ sub HMCCU_SetMultipleDatapoints ($$) {
} }
} }
my $dptType = HMCCU_GetDatapointAttr ($ioHash, $ccuType, $chn, $dpt, 'type'); my $paramDef = HMCCU_GetParamDef ($ioHash, "$add:$chn", 'VALUES', $dpt);
$v = "'".$v."'" if (defined($dptType) && $dptType == $HMCCU_TYPE_STRING); if (defined($paramDef)) {
if ($paramDef->{TYPE} eq 'STRING') {
$v = "'".$v."'";
}
elsif ($paramDef->{TYPE} eq 'ENUM' && !HMCCU_IsIntNum($v)) {
HMCCU_Log ($clHash, 2, "Enum datapoint value = $v");
$v = HMCCU_GetEnumValues ($ioHash, $paramDef, $dpt, $v);
HMCCU_Log ($clHash, 2, "Enum datapoint number = $v");
}
}
# my $dptType = HMCCU_GetDatapointAttr ($ioHash, $ccuType, $chn, $dpt, 'type');
# $v = "'".$v."'" if (defined($dptType) && $dptType == $HMCCU_TYPE_STRING);
my $c = '(datapoints.Get("'.$int.'.'.$add.':'.$chn.'.'.$dpt.'")).State('.$v.");\n"; my $c = '(datapoints.Get("'.$int.'.'.$add.':'.$chn.'.'.$dpt.'")).State('.$v.");\n";
if ($dpt =~ /$ccuChange/) { if ($dpt =~ /$ccuChange/) {
@ -9197,15 +9307,19 @@ sub HMCCU_ScaleValue ($$$$$;$)
my $name = $hash->{NAME}; my $name = $hash->{NAME};
my $ioHash = HMCCU_GetHash ($hash); my $ioHash = HMCCU_GetHash ($hash);
# Only numeric values allowed my $boundsChecking = HMCCU_IsFlag ($name, 'noBoundsChecking') ? 0 : 1;
return $value if (!HMCCU_IsFltNum ($value));
# Get parameter definition and min/max values # Get parameter definition and min/max values
my $min; my $min;
my $max; my $max;
my $unit; my $unit;
my $ccuaddr = $hash->{ccuaddr}; my $ccuaddr = $hash->{ccuaddr};
$ccuaddr .= ':'.$chnno if ($hash->{TYPE} eq 'HMCCUDEV' && $chnno ne ''); if ($hash->{TYPE} eq 'HMCCUDEV' && $chnno ne '' && $chnno ne 'd') {
$ccuaddr .= ':'.$chnno;
}
elsif ($hash->{TYPE} eq 'HMCCUCHN' && $chnno eq 'd') {
($ccuaddr, undef) = HMCCU_SplitChnAddr ($ccuaddr);
}
my $paramDef = HMCCU_GetParamDef ($ioHash, $ccuaddr, $paramSet, $dpt); my $paramDef = HMCCU_GetParamDef ($ioHash, $ccuaddr, $paramSet, $dpt);
if (defined($paramDef)) { if (defined($paramDef)) {
$min = $paramDef->{MIN} if (defined($paramDef->{MIN}) && $paramDef->{MIN} ne ''); $min = $paramDef->{MIN} if (defined($paramDef->{MIN}) && $paramDef->{MIN} ne '');
@ -9214,7 +9328,7 @@ sub HMCCU_ScaleValue ($$$$$;$)
$unit = '100%' if ($dpt eq 'LEVEL' && !defined($unit)); $unit = '100%' if ($dpt eq 'LEVEL' && !defined($unit));
} }
else { else {
HMCCU_Trace ($hash, 2, "Can't get parameter definion for addr=$hash->{ccuaddr} chn=$chnno"); HMCCU_Trace ($hash, 2, "Can't get parameter definion for addr=$ccuaddr chn=$chnno dpt=$dpt");
} }
# Default values can be overriden by attribute # Default values can be overriden by attribute
@ -9222,7 +9336,11 @@ sub HMCCU_ScaleValue ($$$$$;$)
HMCCU_Trace ($hash, 2, "chnno=$chnno, dpt=$dpt, value=$value, mode=$mode"); HMCCU_Trace ($hash, 2, "chnno=$chnno, dpt=$dpt, value=$value, mode=$mode");
# Scale by attribute ccuscaleval
if ($ccuscaleval ne '' && $mode != 2) { if ($ccuscaleval ne '' && $mode != 2) {
# Only numeric or values allowed
return $value if (!HMCCU_IsFltNum ($value));
HMCCU_Trace ($hash, 2, "ccuscaleval"); HMCCU_Trace ($hash, 2, "ccuscaleval");
my @sl = split (',', $ccuscaleval); my @sl = split (',', $ccuscaleval);
foreach my $sr (@sl) { foreach my $sr (@sl) {
@ -9270,37 +9388,34 @@ sub HMCCU_ScaleValue ($$$$$;$)
} }
# Align value with min/max boundaries for set mode # Align value with min/max boundaries for set mode
if ($mode == 1 && defined($min) && defined($max)) { if ($mode == 1 && defined($min) && defined($max) && $boundsChecking) {
$value = HMCCU_MinMax ($value, $min, $max); $value = HMCCU_MinMax ($value, $min, $max);
} }
HMCCU_Trace ($hash, 2, "Attribute scaled value of $dpt = $value"); HMCCU_Trace ($hash, 2, "Attribute scaled value of $dpt = $value");
return int($value) == $value ? int($value) : $value; return $mode == 0 && int($value) == $value ? int($value) : $value;
} }
if ($dpt =~ /^RSSI_/) { # Auto scale
if ($dpt =~ /^RSSI_/ && $mode == 0) {
# Subtract 256 from Rega value (Rega bug) # Subtract 256 from Rega value (Rega bug)
$value = abs ($value) == 65535 || $value == 0 ? 'N/A' : ($value > 0 ? $value-256 : $value); $value = abs ($value) == 65535 || $value == 0 ? 'N/A' : ($value > 0 ? $value-256 : $value);
} }
elsif ($dpt =~ /^(P[0-9]_)?ENDTIME/) { elsif (defined($unit) && ($unit eq 'minutes' || $unit eq 's')) {
if ($mode == 0) { $value = HMCCU_ConvertTime ($value, $unit, $mode);
my $hh = sprintf ("%02d", int($value/60));
my $mm = sprintf ("%02d", $value%60);
$value = "$hh:$mm";
}
else {
my ($hh, $mm) = split (':', $value);
$mm //= 0;
$value = $hh*60+$mm;
}
} }
elsif (defined($unit) && $unit =~ /^([0-9]+)%$/) { elsif (defined($unit) && $unit =~ /^([0-9]+)%$/) {
# percentage values
my $f = $1; my $f = $1;
$min //= 0; $min //= 0;
$max //= 1.0; $max //= 1.0;
$value = ($mode == 0 || $mode == 2) ? HMCCU_MinMax ($value, $min, $max)*$f : if ($mode == 0 || $mode == 2) {
HMCCU_MinMax($value, $min*$f, $max*$f)/$f; $value = HMCCU_MinMax ($value, $min, $max)*$f;
}
else {
$value = $boundsChecking ? HMCCU_MinMax($value, $min*$f, $max*$f)/$f : $value/$f;
}
} }
HMCCU_Trace ($hash, 2, "Auto scaled value of $dpt = $value"); HMCCU_Trace ($hash, 2, "Auto scaled value of $dpt = $value");
@ -9420,7 +9535,7 @@ sub HMCCU_GetUpdate ($$;$$)
return -4 if ($type ne 'HMCCU' && $clHash->{ccudevstate} eq 'deleted'); return -4 if ($type ne 'HMCCU' && $clHash->{ccudevstate} eq 'deleted');
my $nam = ''; my $nam = '';
my $list = ''; my @list = ();
my $script = ''; my $script = '';
$ccuget = HMCCU_GetAttribute ($ioHash, $clHash, 'ccuget', 'Value') if ($ccuget eq 'Attr'); $ccuget = HMCCU_GetAttribute ($ioHash, $clHash, 'ccuget', 'Value') if ($ccuget eq 'Attr');
@ -9429,12 +9544,14 @@ sub HMCCU_GetUpdate ($$;$$)
return -1 if ($nam eq ''); return -1 if ($nam eq '');
my ($stadd, $stchn) = split (':', $addr); my ($stadd, $stchn) = split (':', $addr);
my $stnam = HMCCU_GetChannelName ($ioHash, "$stadd:0"); my $stnam = HMCCU_GetChannelName ($ioHash, "$stadd:0");
$list = $stnam eq '' ? $nam : $stnam . "," . $nam; push @list, $stnam if ($stnam ne '');
push @list, $nam;
$script = '!GetDatapointsByChannel'; $script = '!GetDatapointsByChannel';
} }
elsif (HMCCU_IsValidDevice ($ioHash, $addr, $HMCCU_FL_ADDRESS)) { elsif (HMCCU_IsValidDevice ($ioHash, $addr, $HMCCU_FL_ADDRESS)) {
$nam = HMCCU_GetDeviceName ($ioHash, $addr); $nam = HMCCU_GetDeviceName ($ioHash, $addr);
return -1 if ($nam eq ''); return -1 if ($nam eq '');
push @list, $nam;
$script = '!GetDatapointsByDevice'; $script = '!GetDatapointsByDevice';
# Consider members of group device # Consider members of group device
@ -9442,7 +9559,7 @@ sub HMCCU_GetUpdate ($$;$$)
exists($clHash->{ccugroup}) && $clHash->{ccugroup} ne '') { exists($clHash->{ccugroup}) && $clHash->{ccugroup} ne '') {
foreach my $gd (split (',', $clHash->{ccugroup})) { foreach my $gd (split (',', $clHash->{ccugroup})) {
$nam = HMCCU_GetDeviceName ($ioHash, $gd); $nam = HMCCU_GetDeviceName ($ioHash, $gd);
$list .= ','.$nam if ($nam ne ''); push @list, $nam if ($nam ne '');
} }
} }
} }
@ -9452,14 +9569,14 @@ sub HMCCU_GetUpdate ($$;$$)
if (HMCCU_IsFlag ($ioHash->{NAME}, 'nonBlocking')) { if (HMCCU_IsFlag ($ioHash->{NAME}, 'nonBlocking')) {
# Non blocking request # Non blocking request
HMCCU_HMScriptExt ($ioHash, $script, { list => $list, ccuget => $ccuget }, HMCCU_HMScriptExt ($ioHash, $script, { list => join(',',@list), ccuget => $ccuget },
\&HMCCU_UpdateCB, { filter => $filter }); \&HMCCU_UpdateCB, { filter => $filter });
return 1; return 1;
} }
# Blocking request # Blocking request
my $response = HMCCU_HMScriptExt ($ioHash, $script, my $response = HMCCU_HMScriptExt ($ioHash, $script,
{ list => $list, ccuget => $ccuget }); { list => join(',',@list), ccuget => $ccuget });
HMCCU_Trace ($clHash, 2, "Addr=$addr Name=$nam Script=$script<br>". HMCCU_Trace ($clHash, 2, "Addr=$addr Name=$nam Script=$script<br>".
"Script response = \n".$response); "Script response = \n".$response);
return -2 if ($response eq '' || $response =~ /^ERROR:.*/); return -2 if ($response eq '' || $response =~ /^ERROR:.*/);
@ -9864,6 +9981,45 @@ sub HMCCU_GetTimeSpec ($)
return ($s-$cs); return ($s-$cs);
} }
######################################################################
# Convert time values
# $value - Time value, format:
# $mode = 0: n
# $mode = 1, unit = s: [[hh:]mm:]ss
# $mode = 1, unit = minutes: [hh:]mm
# $unit - s or minutes
# $mode - 0 = Get, 1 = Set
######################################################################
sub HMCCU_ConvertTime ($$$)
{
my ($value, $unit, $mode) = @_;
return $value if ($unit ne 'minutes' && $unit ne 's');
if ($mode == 0) {
my $f = $unit eq 'minutes' ? 60 : 3600;
my @t = ();
while ($f >= 60) {
push @t, sprintf('%02d',int($value/$f));
$value = $value%$f;
$f = $f/60;
}
push @t, sprintf('%02d',$value);
return join(':',@t);
}
else {
my @t = split(':',$value);
my $f = scalar(@t) == 1 ? 1 : ($unit eq 'minutes' ? 60 : (scalar(@t) == 3 ? 3600 : 60));
my $r = 0;
foreach my $v (@t) {
$r = $r+$v*$f;
$f = $f/60;
}
return $r;
}
}
###################################################################### ######################################################################
# Get minimum or maximum of 2 values # Get minimum or maximum of 2 values
# Align value with boundaries # Align value with boundaries

28
fhem/FHEM/88_HMCCUCHN.pm
View File

@ -30,7 +30,7 @@ sub HMCCUCHN_Set ($@);
sub HMCCUCHN_Get ($@); sub HMCCUCHN_Get ($@);
sub HMCCUCHN_Attr ($@); sub HMCCUCHN_Attr ($@);
my $HMCCUCHN_VERSION = '5.0 213281908'; my $HMCCUCHN_VERSION = '5.0 213461309';
###################################################################### ######################################################################
# Initialize module # Initialize module
@ -51,7 +51,7 @@ sub HMCCUCHN_Initialize ($)
$hash->{parseParams} = 1; $hash->{parseParams} = 1;
$hash->{AttrList} = 'IODev ccucalculate '. $hash->{AttrList} = 'IODev ccucalculate '.
'ccuflags:multiple-strict,ackState,logCommand,noReadings,trace,showMasterReadings,showLinkReadings,showDeviceReadings,showServiceReadings '. 'ccuflags:multiple-strict,noBoundsChecking,ackState,logCommand,noReadings,trace,showMasterReadings,showLinkReadings,showDeviceReadings,showServiceReadings '.
'ccureadingfilter:textField-long statedatapoint controldatapoint '. 'ccureadingfilter:textField-long statedatapoint controldatapoint '.
'ccureadingformat:name,namelc,address,addresslc '. 'ccureadingformat:name,namelc,address,addresslc '.
'ccureadingname:textField-long ccuSetOnChange ccuReadingPrefix '. 'ccureadingname:textField-long ccuSetOnChange ccuReadingPrefix '.
@ -212,7 +212,7 @@ sub HMCCUCHN_InitDevice ($$)
$rc = -2; $rc = -2;
} }
HMCCU_GetUpdate ($devHash, $da, 'Value'); HMCCU_GetUpdate ($devHash, $da);
} }
return $rc; return $rc;
@ -357,7 +357,7 @@ sub HMCCUCHN_Set ($@)
elsif ($lcopt =~ /^(config|values)$/) { elsif ($lcopt =~ /^(config|values)$/) {
return HMCCU_ExecuteSetParameterCommand ($ioHash, $hash, $lcopt, $a, $h); return HMCCU_ExecuteSetParameterCommand ($ioHash, $hash, $lcopt, $a, $h);
} }
elsif ($lcopt =~ 'readingfilter') { elsif ($lcopt eq 'readingfilter') {
my $filter = shift @$a // return HMCCU_SetError ($hash, "Usage: set $name readingFilter {datapointList}"); my $filter = shift @$a // return HMCCU_SetError ($hash, "Usage: set $name readingFilter {datapointList}");
$filter =~ s/,/\|/g; $filter =~ s/,/\|/g;
$filter = '^('.$filter.')$'; $filter = '^('.$filter.')$';
@ -519,6 +519,9 @@ sub HMCCUCHN_Get ($@)
<a name="HMCCUCHNset"></a> <a name="HMCCUCHNset"></a>
<b>Set</b><br/><br/> <b>Set</b><br/><br/>
<ul> <ul>
<li><b>set &lt;name&gt; armState {DISARMED|EXTSENS_ARMED|ALLSENS_ARMED|ALARM_BLOCKED}</b><br/>
[alarm siren] Set arm state.
</li><br/>
<li><b>set &lt;name&gt; clear [&lt;reading-exp&gt;|reset]</b><br/> <li><b>set &lt;name&gt; clear [&lt;reading-exp&gt;|reset]</b><br/>
Delete readings matching specified reading name expression. Default expression is '.*'. Delete readings matching specified reading name expression. Default expression is '.*'.
Readings 'state' and 'control' are not deleted. With option 'reset' all readings Readings 'state' and 'control' are not deleted. With option 'reset' all readings
@ -542,7 +545,9 @@ sub HMCCUCHN_Get ($@)
Parameter <i>parameter</i> must be a valid configuration parameter. Parameter <i>parameter</i> must be a valid configuration parameter.
If <i>type</i> is not specified, it's taken from parameter set definition. If type If <i>type</i> is not specified, it's taken from parameter set definition. If type
cannot be determined, the default <i>type</i> STRING is used. cannot be determined, the default <i>type</i> STRING is used.
Valid types are STRING, BOOL, INTEGER, FLOAT, DOUBLE.<br/><br/> Valid types are STRING, BOOL, INTEGER, FLOAT, DOUBLE.<br>
If unit of <i>parameter</i> is 'minutes' (i.e. endtime in a week profile), value/time can
be specified in minutes after midnight or in format hh:mm (hh=hours, mm=minutes).<br/><br/>
Example 1: Set device parameter AES<br/> Example 1: Set device parameter AES<br/>
<code>set myDev config device AES=1</code><br/> <code>set myDev config device AES=1</code><br/>
Example 2: Set channel parameters MIN and MAX with type definition<br/> Example 2: Set channel parameters MIN and MAX with type definition<br/>
@ -577,6 +582,16 @@ sub HMCCUCHN_Get ($@)
[dimmer, blind] Decrement value of datapoint LEVEL. This command is only available [dimmer, blind] Decrement value of datapoint LEVEL. This command is only available
if channel contains a datapoint LEVEL. Default for <i>value</i> is 20. if channel contains a datapoint LEVEL. Default for <i>value</i> is 20.
</li><br/> </li><br/>
<li><b>set &lt;name&gt; off</b><br/>
Turn device off.
</li><br/>
<li><b>set &lt;name&gt; oldLevel</b><br/>
[dimmer, blind] Set level to previous value. The command is only available if channel
contains a datapoint LEVEL with a maximum value of 1.01.
</li><br/>
<li><b>set &lt;name&gt; on</b><br/>
Turn device on.
</li><br/>
<li><b>set &lt;name&gt; on-for-timer &lt;ontime&gt;</b><br/> <li><b>set &lt;name&gt; on-for-timer &lt;ontime&gt;</b><br/>
[switch] Switch device on for specified number of seconds. This command is only available if [switch] Switch device on for specified number of seconds. This command is only available if
channel contains a datapoint ON_TIME. Parameter <i>ontime</i> can be specified channel contains a datapoint ON_TIME. Parameter <i>ontime</i> can be specified
@ -728,10 +743,11 @@ sub HMCCUCHN_Get ($@)
<code>dewpoint:taupunkt:1.TEMPERATURE,1.HUMIDITY</code> <code>dewpoint:taupunkt:1.TEMPERATURE,1.HUMIDITY</code>
</li><br/> </li><br/>
<a name="ccuflags"></a> <a name="ccuflags"></a>
<li><b>ccuflags {ackState, logCommand, noReadings, showDeviceReadings, showLinkReadings, showConfigReadings, trace}</b><br/> <li><b>ccuflags {ackState, logCommand, noBoundsChecking, noReadings, showDeviceReadings, showLinkReadings, showConfigReadings, trace}</b><br/>
Control behaviour of device:<br/> Control behaviour of device:<br/>
ackState: Acknowledge command execution by setting STATE to error or success.<br/> ackState: Acknowledge command execution by setting STATE to error or success.<br/>
logCommand: Write get and set commands to FHEM log with verbose level 3.<br/> logCommand: Write get and set commands to FHEM log with verbose level 3.<br/>
noBoundsChecking: Datapoint values are not checked for min/max boundaries<br/>
noReadings: Do not update readings<br/> noReadings: Do not update readings<br/>
showDeviceReadings: Show readings of device and channel 0.<br/> showDeviceReadings: Show readings of device and channel 0.<br/>
showLinkReadings: Show link readings.<br/> showLinkReadings: Show link readings.<br/>

8
fhem/FHEM/88_HMCCUDEV.pm
View File

@ -31,7 +31,7 @@ sub HMCCUDEV_Set ($@);
sub HMCCUDEV_Get ($@); sub HMCCUDEV_Get ($@);
sub HMCCUDEV_Attr ($@); sub HMCCUDEV_Attr ($@);
my $HMCCUDEV_VERSION = '5.0 213281908'; my $HMCCUDEV_VERSION = '5.0 213461309';
###################################################################### ######################################################################
# Initialize module # Initialize module
@ -52,7 +52,7 @@ sub HMCCUDEV_Initialize ($)
$hash->{parseParams} = 1; $hash->{parseParams} = 1;
$hash->{AttrList} = 'IODev ccuaggregate:textField-long ccucalculate:textField-long '. $hash->{AttrList} = 'IODev ccuaggregate:textField-long ccucalculate:textField-long '.
'ccuflags:multiple-strict,ackState,logCommand,noReadings,trace,showMasterReadings,showLinkReadings,showDeviceReadings,showServiceReadings '. 'ccuflags:multiple-strict,ackState,noBoundsChecking,logCommand,noReadings,trace,showMasterReadings,showLinkReadings,showDeviceReadings,showServiceReadings '.
'ccureadingfilter:textField-long '. 'ccureadingfilter:textField-long '.
'ccureadingformat:name,namelc,address,addresslc,datapoint,datapointlc '. 'ccureadingformat:name,namelc,address,addresslc,datapoint,datapointlc '.
'ccureadingname:textField-long ccuSetOnChange ccuReadingPrefix '. 'ccureadingname:textField-long ccuSetOnChange ccuReadingPrefix '.
@ -259,7 +259,7 @@ sub HMCCUDEV_InitDevice ($$)
} }
# Update readings # Update readings
HMCCU_GetUpdate ($devHash, $da, 'Value'); HMCCU_GetUpdate ($devHash, $da);
} }
# Parse group options # Parse group options
@ -445,7 +445,7 @@ sub HMCCUDEV_Set ($@)
elsif ($lcopt =~ /^(config|values)$/) { elsif ($lcopt =~ /^(config|values)$/) {
return HMCCU_ExecuteSetParameterCommand ($ioHash, $hash, $opt, $a, $h); return HMCCU_ExecuteSetParameterCommand ($ioHash, $hash, $opt, $a, $h);
} }
elsif ($lcopt =~ 'readingfilter') { elsif ($lcopt eq 'readingfilter') {
my $filter = shift @$a // return HMCCU_SetError ($hash, "Usage: set $name readingFilter {datapointList}"); my $filter = shift @$a // return HMCCU_SetError ($hash, "Usage: set $name readingFilter {datapointList}");
$filter = join(';', map { (my $f = $_) =~ s/\.(.+)/\.\^$1\$/; $f } split(',', $filter)); $filter = join(';', map { (my $f = $_) =~ s/\.(.+)/\.\^$1\$/; $f } split(',', $filter));
return CommandAttr (undef, "$name ccureadingfilter $filter"); return CommandAttr (undef, "$name ccureadingfilter $filter");

2
fhem/FHEM/88_HMCCURPCPROC.pm
View File

@ -39,7 +39,7 @@ require "$attr{global}{modpath}/FHEM/88_HMCCU.pm";
###################################################################### ######################################################################
# HMCCURPC version # HMCCURPC version
my $HMCCURPCPROC_VERSION = '5.0 213281908'; my $HMCCURPCPROC_VERSION = '5.0 213461309';
# Maximum number of events processed per call of Read() # Maximum number of events processed per call of Read()
my $HMCCURPCPROC_MAX_EVENTS = 100; my $HMCCURPCPROC_MAX_EVENTS = 100;

262
fhem/FHEM/HMCCUConf.pm
View File

@ -61,6 +61,9 @@ $HMCCU_CONFIG_VERSION = '5.0';
'ALARM_SWITCH_VIRTUAL_RECEIVER' => { 'ALARM_SWITCH_VIRTUAL_RECEIVER' => {
F => 3, S => 'ACOUSTIC_ALARM_ACTIVE', C => 'ACOUSTIC_ALARM_SELECTION', V => '', P => 2 F => 3, S => 'ACOUSTIC_ALARM_ACTIVE', C => 'ACOUSTIC_ALARM_SELECTION', V => '', P => 2
}, },
'ARMING' => {
F => 3, S => 'ARMSTATE', C => 'ARMSTATE', V => '#', P => 2
},
'BLIND' => { 'BLIND' => {
F => 3, S => 'LEVEL', C => 'LEVEL', V => 'open:100,close:0', P => 2 F => 3, S => 'LEVEL', C => 'LEVEL', V => 'open:100,close:0', P => 2
}, },
@ -172,6 +175,12 @@ $HMCCU_CONFIG_VERSION = '5.0';
'SWITCH' => { 'SWITCH' => {
F => 3, S => 'STATE', C => 'STATE', V => 'on:true,off:false', P => 2 F => 3, S => 'STATE', C => 'STATE', V => 'on:true,off:false', P => 2
}, },
'SWITCH_PANIC' => {
F => 3, S => 'STATE', C => 'STATE', V => 'on:true,off:false', P => 2
},
'SWITCH_SENSOR' => {
F => 3, S => 'STATE', C => 'STATE', V => 'on:true,off:false', P => 2
},
'SWITCH_TRANSMITTER' => { 'SWITCH_TRANSMITTER' => {
F => 3, S => 'STATE', C => '', V => '', P => 1 F => 3, S => 'STATE', C => '', V => '', P => 1
}, },
@ -192,6 +201,9 @@ $HMCCU_CONFIG_VERSION = '5.0';
}, },
'WEATHER_TRANSMIT' => { 'WEATHER_TRANSMIT' => {
F => 3, S => 'ACTUAL_TEMPERATURE', C => '', V => '', P => 1 F => 3, S => 'ACTUAL_TEMPERATURE', C => '', V => '', P => 1
},
'WINMATIC' => {
F => 3, S => 'LEVEL', C => 'LEVEL', V => 'open:100,close:0', P => 2
} }
); );
@ -203,26 +215,32 @@ $HMCCU_CONFIG_VERSION = '5.0';
###################################################################### ######################################################################
%HMCCU_READINGS = ( %HMCCU_READINGS = (
'ARMING' =>
'^(C#\.)?ARMSTATE$:+armState',
'BLIND' => 'BLIND' =>
'^(C#\.)?LEVEL$:+pct', '^(C#\.)?LEVEL$:+pct,+level',
'BLIND_TRANSMITTER' => 'BLIND_TRANSMITTER' =>
'^(C#\.)?LEVEL$:+pct', '^(C#\.)?LEVEL$:+pct,+level;^(C#\.)?LEVEL_2$:+pctSlats',
'BLIND_VIRTUAL_RECEIVER' => 'BLIND_VIRTUAL_RECEIVER' =>
'^(C#\.)?LEVEL$:+pct', '^(C#\.)?LEVEL$:+pct,+level',
'SHUTTER_TRANSMITTER' => 'SHUTTER_TRANSMITTER' =>
'^(C#\.)?LEVEL$:+pct', '^(C#\.)?LEVEL$:+pct,+level',
'SHUTTER_VIRTUAL_RECEIVER' => 'SHUTTER_VIRTUAL_RECEIVER' =>
'^(C#\.)?LEVEL$:+pct', '^(C#\.)?LEVEL$:+pct,+level',
'SWITCH_PANIC' =>
'^(C#\.)?STATE$:+panic',
'SWITCH_SENSOR' =>
'^(C#\.)?STATE$:+sensor',
'DIMMER' => 'DIMMER' =>
'^(C#\.)?LEVEL$:+pct', '^(C#\.)?LEVEL$:+pct,+level',
'DIMMER_TRANSMITTER' => 'DIMMER_TRANSMITTER' =>
'^(C#\.)?LEVEL$:+pct;(C#\.)?COLOR$:+color', '^(C#\.)?LEVEL$:+pct,+level;(C#\.)?COLOR$:+color',
'DIMMER_VIRTUAL_RECEIVER' => 'DIMMER_VIRTUAL_RECEIVER' =>
'^(C#\.)?LEVEL$:+pct;(C#\.)?COLOR$:+color', '^(C#\.)?LEVEL$:+pct,+level;(C#\.)?COLOR$:+color',
'DIMMER_WEEK_PROFILE' => 'DIMMER_WEEK_PROFILE' =>
'^(C#\.)?WEEK_PROGRAM_CHANNEL_LOCKS$:+progMode', '^(C#\.)?WEEK_PROGRAM_CHANNEL_LOCKS$:+progMode',
'JALOUSIE' => 'JALOUSIE' =>
'^(C#\.)?LEVEL$:+pct;(C#\.)?LEVEL_SLATS$:+pctSlats', '^(C#\.)?LEVEL$:+pct,+level;(C#\.)?LEVEL_SLATS$:+pctSlats',
'KEY' => 'KEY' =>
'^(C#\.)?PRESS_(SHORT|LONG)$:+pressed', '^(C#\.)?PRESS_(SHORT|LONG)$:+pressed',
'KEY_TRANSCEIVER' => 'KEY_TRANSCEIVER' =>
@ -262,7 +280,7 @@ $HMCCU_CONFIG_VERSION = '5.0';
'CLIMATECONTROL_REGULATOR' => 'CLIMATECONTROL_REGULATOR' =>
'^(C#\.)?SETPOINT$:+desired-temp', '^(C#\.)?SETPOINT$:+desired-temp',
'DEFAULT' => 'DEFAULT' =>
'^([0-9]{1,2}\.)?LEVEL$:+pct;'. '^([0-9]{1,2}\.)?LEVEL$:+pct,+level;'.
'^([0-9]{1,2}\.)?SET_TEMPERATURE$:+desired-temp;'. '^([0-9]{1,2}\.)?SET_TEMPERATURE$:+desired-temp;'.
'^([0-9]{1,2}\.)?(ACTUAL_TEMPERATURE|TEMPERATURE)$:+measured-temp;'. '^([0-9]{1,2}\.)?(ACTUAL_TEMPERATURE|TEMPERATURE)$:+measured-temp;'.
'^([0-9]{1,2}\.)?SET_POINT_TEMPERATURE$:+desired-temp;'. '^([0-9]{1,2}\.)?SET_POINT_TEMPERATURE$:+desired-temp;'.
@ -309,30 +327,89 @@ $HMCCU_CONFIG_VERSION = '5.0';
###################################################################### ######################################################################
%HMCCU_ROLECMDS = ( %HMCCU_ROLECMDS = (
'MOTIONDETECTOR_TRANSCEIVER' => {
'detection' => 'V:MOTION_DETECTION_ACTIVE:#detection=inactive,active',
'reset' => 'V:RESET_MOTION:true'
},
'PRESENCEDETECTOR_TRANSCEIVER' => {
'detection' => 'V:PRESENCE_DETECTION_ACTIVE:#detection=inactive,active',
'reset' => 'V:RESET_PRESENCE:true'
},
'PASSAGE_DETECTOR_DIRECTION_TRANSMITTER' => {
'detection' => 'M:PASSAGE_DETECTION,CHANNEL_OPERATION_MODE:#inactive,active'
},
'SMOKE_DETECTOR' => {
'command' => 'V:SMOKE_DETECTOR_COMMAND:#command'
},
'ALARM_SWITCH_VIRTUAL_RECEIVER' => { 'ALARM_SWITCH_VIRTUAL_RECEIVER' => {
'opticalAlarm' => 'V:OPTICAL_ALARM_SELECTION:#alarmMode V:ACOUSTIC_ALARM_SELECTION:0 V:DURATION_UNIT:*unit=0 V:DURATION_VALUE:*duration=10', 'opticalAlarm' => 'V:OPTICAL_ALARM_SELECTION:#alarmMode V:ACOUSTIC_ALARM_SELECTION:0 V:DURATION_UNIT:*unit=0 V:DURATION_VALUE:*duration=10',
'acousticAlarm' => 'V:ACOUSTIC_ALARM_SELECTION:#alarmMode V:OPTICAL_ALARM_SELECTION:0 V:DURATION_UNIT:0 V:DURATION_VALUE:10', 'acousticAlarm' => 'V:ACOUSTIC_ALARM_SELECTION:#alarmMode V:OPTICAL_ALARM_SELECTION:0 V:DURATION_UNIT:0 V:DURATION_VALUE:10',
'duration' => 'I:DURATION_VALUE:?duration I:DURATION_UNIT:#unit' 'duration' => 'I:DURATION_VALUE:?duration I:DURATION_UNIT:#unit'
}, },
'ARMING' => {
'armState' => 'V:ARMSTATE:#armState'
},
'BLIND' => {
'pct' => 'V:LEVEL:?level',
'open' => 'V:LEVEL:100',
'close' => 'V:LEVEL:0',
'up' => 'V:LEVEL:?delta=+20',
'down' => 'V:LEVEL:?delta=-20',
'stop' => 'V:STOP:1'
},
'BLIND_VIRTUAL_RECEIVER' => {
'pct' => 'V:LEVEL:?level',
'open' => 'V:LEVEL:100',
'close' => 'V:LEVEL:0',
'oldLevel' => 'V:LEVEL:100.5',
'up' => 'V:LEVEL:?delta=+20',
'down' => 'V:LEVEL:?delta=-20',
'stop' => 'V:STOP:1',
'pctSlats' => 'V:LEVEL_2:?level V:LEVEL:101',
'openSlats' => 'V:LEVEL_2:100 V:LEVEL:101',
'closeSlats' => 'V:LEVEL_2:0 V:LEVEL:101',
},
'CLIMATECONTROL_REGULATOR' => {
'desired-temp' => 'V:SETPOINT:?temperature',
'on' => 'V:SETPOINT:30.5',
'off' => 'V:SETPOINT:4.5'
},
'CLIMATECONTROL_RT_TRANSCEIVER' => {
'desired-temp' => 'V:SET_TEMPERATURE:?temperature',
'manu' => 'V:MANU_MODE:?temperature=20',
'on' => 'V:MANU_MODE:30.5',
'off' => 'V:MANU_MODE:4.5',
'auto' => 'V:AUTO_MODE:1',
'boost' => 'V:BOOST_MODE:1',
'week-program:VirtualDevices' => 'D:WEEK_PROGRAM_POINTER:#program',
'get week-program:VirtualDevices' => 'D:WEEK_PROGRAM_POINTER:#program:HMCCU_DisplayWeekProgram'
},
'DIMMER' => {
'pct' => '3:V:LEVEL:?level 1:V:ON_TIME:?time=0.0 2:V:RAMP_TIME:?ramp=0.5',
'level' => 'V:LEVEL:?level',
'on' => 'V:LEVEL:100',
'off' => 'V:LEVEL:0',
'on-for-timer' => 'V:ON_TIME:?duration V:LEVEL:100',
'on-till' => 'V:ON_TIME:?time V:LEVEL:100',
'up' => 'V:LEVEL:?delta=+10',
'down' => 'V:LEVEL:?delta=-10',
'stop' => 'V:RAMP_STOP:1'
},
'DIMMER_VIRTUAL_RECEIVER' => {
'pct' => '5:V:LEVEL:?level 1:V:DURATION_UNIT:0 2:V:ON_TIME,DURATION_VALUE:?time=0.0 3:V:RAMP_TIME_UNIT:0 4:V:RAMP_TIME,RAMP_TIME_VALUE:?ramp=0.5',
'level' => 'V:LEVEL:?level',
'on' => 'V:LEVEL:100',
'off' => 'V:LEVEL:0',
'oldLevel' => 'V:LEVEL:100.5',
'on-for-timer' => '1:V:DURATION_UNIT:0 2:V:ON_TIME,DURATION_VALUE:?duration 3:V:LEVEL:100',
'on-till' => '1:V:DURATION_UNIT:0 2:V:ON_TIME,DURATION_VALUE:?time 3:V:LEVEL:100',
'up' => 'V:LEVEL:?delta=+10',
'down' => 'V:LEVEL:?delta=-10',
'color' => 'V:COLOR:#color'
},
'DIMMER_WEEK_PROFILE' => {
'progMode' => 'V:WEEK_PROGRAM_TARGET_CHANNEL_LOCK:#progMode'
},
'DOOR_LOCK_STATE_TRANSMITTER' => { 'DOOR_LOCK_STATE_TRANSMITTER' => {
'open' => 'V:LOCK_TARGET_LEVEL:2', 'open' => 'V:LOCK_TARGET_LEVEL:2',
'unlock' => 'V:LOCK_TARGET_LEVEL:1', 'unlock' => 'V:LOCK_TARGET_LEVEL:1',
'lock' => 'V:LOCK_TARGET_LEVEL:0' 'lock' => 'V:LOCK_TARGET_LEVEL:0'
}, },
'HEATING_CLIMATECONTROL_TRANSCEIVER' => {
'desired-temp' => 'V:SET_POINT_TEMPERATURE:?temperature',
'auto' => 'V:CONTROL_MODE:0',
'manu' => 'V:CONTROL_MODE:1',
'holiday' => 'V:CONTROL_MODE:2',
'boost' => 'V:BOOST_MODE:1',
'on' => 'V:CONTROL_MODE:1 V:SET_POINT_TEMPERATURE:30.5',
'off' => 'V:CONTROL_MODE:1 V:SET_POINT_TEMPERATURE:4.5'
},
'JALOUSIE' => { 'JALOUSIE' => {
'pct' => 'V:LEVEL:?level', 'pct' => 'V:LEVEL:?level',
'open' => 'V:LEVEL:100', 'open' => 'V:LEVEL:100',
@ -351,73 +428,54 @@ $HMCCU_CONFIG_VERSION = '5.0';
}, },
'KEYMATIC' => { 'KEYMATIC' => {
'open' => 'V:OPEN:true', 'open' => 'V:OPEN:true',
'lock' => 'V:STATE:false', 'lock' => 'V:STATE:0',
'unklock' => 'V:STATE:true' 'unlock' => 'V:STATE:1'
}, },
'VIRTUAL_KEY' => { 'MOTIONDETECTOR_TRANSCEIVER' => {
'on' => 'V:PRESS_SHORT:1', 'detection' => 'V:MOTION_DETECTION_ACTIVE:#detection=inactive,active',
'off' => 'V:PRESS_SHORT:1', 'reset' => 'V:RESET_MOTION:true'
'press' => 'V:PRESS_SHORT:1'
}, },
'BLIND' => { 'PASSAGE_DETECTOR_DIRECTION_TRANSMITTER' => {
'pct' => 'V:LEVEL:?level', 'detection' => 'M:PASSAGE_DETECTION,CHANNEL_OPERATION_MODE:#inactive,active'
'open' => 'V:LEVEL:100',
'close' => 'V:LEVEL:0',
'up' => 'V:LEVEL:?delta=+20',
'down' => 'V:LEVEL:?delta=-20',
'stop' => 'V:STOP:1'
}, },
'BLIND_VIRTUAL_RECEIVER' => { 'PRESENCEDETECTOR_TRANSCEIVER' => {
'pct' => 'V:LEVEL:?level', 'detection' => 'V:PRESENCE_DETECTION_ACTIVE:#detection=inactive,active',
'open' => 'V:LEVEL:100', 'reset' => 'V:RESET_PRESENCE:true'
'close' => 'V:LEVEL:0',
'up' => 'V:LEVEL:?delta=+20',
'down' => 'V:LEVEL:?delta=-20',
'stop' => 'V:STOP:1'
}, },
'SHUTTER_VIRTUAL_RECEIVER' => { 'SHUTTER_VIRTUAL_RECEIVER' => {
'pct' => 'V:LEVEL:?level', 'pct' => 'V:LEVEL:?level',
'open' => 'V:LEVEL:100', 'open' => 'V:LEVEL:100',
'oldLevel' => 'V:LEVEL:100.5',
'close' => 'V:LEVEL:0', 'close' => 'V:LEVEL:0',
'up' => 'V:LEVEL:?delta=+20', 'up' => 'V:LEVEL:?delta=+20',
'down' => 'V:LEVEL:?delta=-20', 'down' => 'V:LEVEL:?delta=-20',
'stop' => 'V:STOP:1' 'stop' => 'V:STOP:1'
}, },
'SMOKE_DETECTOR' => {
'command' => 'V:SMOKE_DETECTOR_COMMAND:#command'
},
'SWITCH' => { 'SWITCH' => {
'on' => 'V:STATE:1', 'on' => 'V:STATE:1',
'off' => 'V:STATE:0', 'off' => 'V:STATE:0',
'on-for-timer' => 'V:ON_TIME:?duration V:STATE:1', 'on-for-timer' => 'V:ON_TIME:?duration V:STATE:1',
'on-till' => 'V:ON_TIME:?time V:STATE:1' 'on-till' => 'V:ON_TIME:?time V:STATE:1'
}, },
'SWITCH_PANIC' => {
'panic' => 'V:STATE:#panic=on,off',
'panic-on-for-timer' => 'V:ON_TIME:?duration V:STATE:1',
'panic-on-till' => 'V:ON_TIME:?time V:STATE:1'
},
'SWITCH_SENSOR' => {
'sensor' => 'V:STATE:#sensor=on,off',
'sensor-on-for-timer' => 'V:ON_TIME:?duration V:STATE:1',
'sensor-on-till' => 'V:ON_TIME:?time V:STATE:1'
},
'SWITCH_VIRTUAL_RECEIVER' => { 'SWITCH_VIRTUAL_RECEIVER' => {
'on' => 'V:STATE:1', 'on' => 'V:STATE:1',
'off' => 'V:STATE:0', 'off' => 'V:STATE:0',
'on-for-timer' => 'V:ON_TIME:?duration V:STATE:1', 'on-for-timer' => 'V:ON_TIME:?duration V:STATE:1',
'on-till' => 'V:ON_TIME:?time V:STATE:1' 'on-till' => 'V:ON_TIME:?time V:STATE:1'
}, },
'DIMMER' => {
'pct' => '3:V:LEVEL:?level 1:V:ON_TIME:?time=0.0 2:V:RAMP_TIME:?ramp=0.5',
'on' => 'V:LEVEL:100',
'off' => 'V:LEVEL:0',
'on-for-timer' => 'V:ON_TIME:?duration V:LEVEL:100',
'on-till' => 'V:ON_TIME:?time V:LEVEL:100',
'up' => 'V:LEVEL:?delta=+10',
'down' => 'V:LEVEL:?delta=-10',
'stop' => 'V:RAMP_STOP:1'
},
'DIMMER_VIRTUAL_RECEIVER' => {
'pct' => '5:V:LEVEL:?level 1:V:DURATION_UNIT:0 2:V:ON_TIME,DURATION_VALUE:?time=0.0 3:V:RAMP_TIME_UNIT:0 4:V:RAMP_TIME,RAMP_TIME_VALUE:?ramp=0.5',
'on' => 'V:LEVEL:100',
'off' => 'V:LEVEL:0',
'on-for-timer' => '1:V:DURATION_UNIT:0 2:V:ON_TIME,DURATION_VALUE:?duration 3:V:LEVEL:100',
'on-till' => '1:V:DURATION_UNIT:0 2:V:ON_TIME,DURATION_VALUE:?time 3:V:LEVEL:100',
'up' => 'V:LEVEL:?delta=+10',
'down' => 'V:LEVEL:?delta=-10',
'color' => 'V:COLOR:#color'
},
'DIMMER_WEEK_PROFILE' => {
'progMode' => 'V:WEEK_PROGRAM_TARGET_CHANNEL_LOCK:#progMode'
},
'THERMALCONTROL_TRANSMIT' => { 'THERMALCONTROL_TRANSMIT' => {
'desired-temp' => 'V:SET_TEMPERATURE:?temperature', 'desired-temp' => 'V:SET_TEMPERATURE:?temperature',
'manu' => 'V:MANU_MODE:?temperature=20', 'manu' => 'V:MANU_MODE:?temperature=20',
@ -428,29 +486,17 @@ $HMCCU_CONFIG_VERSION = '5.0';
'week-program' => 'D:WEEK_PROGRAM_POINTER:#program', 'week-program' => 'D:WEEK_PROGRAM_POINTER:#program',
'get week-program' => 'D:WEEK_PROGRAM_POINTER:#program:HMCCU_DisplayWeekProgram' 'get week-program' => 'D:WEEK_PROGRAM_POINTER:#program:HMCCU_DisplayWeekProgram'
}, },
'CLIMATECONTROL_RT_TRANSCEIVER' => { 'VIRTUAL_KEY' => {
'desired-temp' => 'V:SET_TEMPERATURE:?temperature', 'on' => 'V:PRESS_SHORT:1',
'manu' => 'V:MANU_MODE:?temperature=20', 'off' => 'V:PRESS_SHORT:1',
'on' => 'V:MANU_MODE:30.5', 'press' => 'V:PRESS_SHORT:1'
'off' => 'V:MANU_MODE:4.5',
'auto' => 'V:AUTO_MODE:1',
'boost' => 'V:BOOST_MODE:1',
'week-program:VirtualDevices' => 'D:WEEK_PROGRAM_POINTER:#program',
'get week-program:VirtualDevices' => 'D:WEEK_PROGRAM_POINTER:#program:HMCCU_DisplayWeekProgram'
}, },
'HEATING_CLIMATECONTROL_TRANSCEIVER' => { 'WINMATIC' => {
'desired-temp' => 'V:SET_POINT_TEMPERATURE:?temperature', 'open' => 'V:LEVEL:100',
'auto' => 'V:CONTROL_MODE:0', 'close' => 'V:LEVEL:0',
'manu' => 'V:CONTROL_MODE:1', 'lock' => 'V:LEVEL:-0.5',
'holiday' => 'V:CONTROL_MODE:2', 'pct' => 'V:LEVEL:?level',
'boost' => 'V:BOOST_MODE:1', 'stop' => 'V:STOP:1'
'on' => 'V:CONTROL_MODE:1 V:SET_POINT_TEMPERATURE:30.5',
'off' => 'V:CONTROL_MODE:1 V:SET_POINT_TEMPERATURE:4.5'
},
'CLIMATECONTROL_REGULATOR' => {
'desired-temp' => 'V:SETPOINT:?temperature',
'on' => 'V:SETPOINT:30.5',
'off' => 'V:SETPOINT:4.5'
} }
); );
@ -480,21 +526,21 @@ $HMCCU_CONFIG_VERSION = '5.0';
}, },
'DIMMER' => { 'DIMMER' => {
'cmdIcon' => 'on:general_an off:general_aus', 'cmdIcon' => 'on:general_an off:general_aus',
'substexcl' => 'pct', 'substexcl' => 'pct|level',
'webCmd' => 'pct:on:off', 'webCmd' => 'level:on:off',
'widgetOverride' => 'pct:slider,0,10,100' 'widgetOverride' => 'level:slider,0,10,100'
}, },
'DIMMER_TRANSMITTER' => { 'DIMMER_TRANSMITTER' => {
'substexcl' => 'pct' 'substexcl' => 'pct|level'
}, },
'DIMMER_VIRTUAL_RECEIVER' => { 'DIMMER_VIRTUAL_RECEIVER' => {
'cmdIcon' => 'on:general_an off:general_aus', 'cmdIcon' => 'on:general_an off:general_aus',
'substexcl' => 'pct', 'substexcl' => 'pct|level',
'webCmd' => 'pct:on:off', 'webCmd' => 'level:on:off',
'widgetOverride' => 'pct:slider,0,10,100' 'widgetOverride' => 'level:slider,0,10,100'
}, },
'DOOR_LOCK_STATE_TRANSMITTER' => { 'DOOR_LOCK_STATE_TRANSMITTER' => {
'cmdIcon' => 'open:fts_door_open unlock:secur_open lock:secur_lock', 'cmdIcon' => 'open:fts_door_open unlock:secur_open lock:secur_locked',
'webCmd' => 'lock:unlock:open' 'webCmd' => 'lock:unlock:open'
}, },
'JALOUSIE' => { 'JALOUSIE' => {
@ -504,15 +550,15 @@ $HMCCU_CONFIG_VERSION = '5.0';
'widgetOverride' => 'pct:slider,0,10,100' 'widgetOverride' => 'pct:slider,0,10,100'
}, },
'KEY' => { 'KEY' => {
'event-on-update-reading' => 'PRESS.*', 'event-on-update-reading' => '.*',
'cmdIcon' => 'press:taster', 'cmdIcon' => 'press:taster',
'webCmd' => 'press' 'webCmd' => 'press'
}, },
'KEY_TRANSCEIVER' => { 'KEY_TRANSCEIVER' => {
'event-on-update-reading' => 'PRESS.*' 'event-on-update-reading' => '.*'
}, },
'KEYMATIC' => { 'KEYMATIC' => {
'cmdIcon' => 'open:fts_door_right_open lock:secure_locked unlock:secur_open', 'cmdIcon' => 'open:fts_door_right_open lock:secur_locked unlock:secur_open',
'webCmd' => 'open:lock:unlock' 'webCmd' => 'open:lock:unlock'
}, },
'MOTION_DETECTOR' => { 'MOTION_DETECTOR' => {
@ -585,6 +631,13 @@ $HMCCU_CONFIG_VERSION = '5.0';
}, },
'WATER_DETECTION_TRANSMITTER' => { 'WATER_DETECTION_TRANSMITTER' => {
'_none_' => '' '_none_' => ''
},
'WINMATIC' => {
'ccuflags' => 'noBoundsChecking',
'substexcl' => 'pct',
'cmdIcon' => 'open:fts_window_1w_tilt stop:rc_STOP close:fts_window_1w lock:secur_locked',
'webCmd' => 'pct:open:close:lock:stop',
'widgetOverride' => 'pct:slider,0,10,100'
} }
); );
@ -648,6 +701,12 @@ $HMCCU_CONFIG_VERSION = '5.0';
'SWITCH' => { 'SWITCH' => {
'STATE' => { '0' => 'off', 'false' => 'off', '1' => 'on', 'true' => 'on', 'off' => '0', 'on' => '1' }, 'STATE' => { '0' => 'off', 'false' => 'off', '1' => 'on', 'true' => 'on', 'off' => '0', 'on' => '1' },
}, },
'SWITCH_PANIC' => {
'STATE' => { '0' => 'off', 'false' => 'off', '1' => 'on', 'true' => 'on', 'off' => '0', 'on' => '1' },
},
'SWITCH_SENSOR' => {
'STATE' => { '0' => 'off', 'false' => 'off', '1' => 'on', 'true' => 'on', 'off' => '0', 'on' => '1' },
},
'SWITCH_TRANSMITTER' => { 'SWITCH_TRANSMITTER' => {
'STATE' => { '0' => 'off', 'false' => 'off', '1' => 'on', 'true' => 'on', 'off' => '0', 'on' => '1' }, 'STATE' => { '0' => 'off', 'false' => 'off', '1' => 'on', 'true' => 'on', 'off' => '0', 'on' => '1' },
}, },
@ -712,6 +771,9 @@ $HMCCU_CONFIG_VERSION = '5.0';
'WATER_DETECTION_TRANSMITTER' => { 'WATER_DETECTION_TRANSMITTER' => {
'ALARMSTATE' => { '0' => 'noAlarm', '1' => 'Alarm', 'false' => 'noAlarm', 'true' => 'alarm' } 'ALARMSTATE' => { '0' => 'noAlarm', '1' => 'Alarm', 'false' => 'noAlarm', 'true' => 'alarm' }
}, },
'WINMATIC' => {
'LEVEL' => { '0' => 'closed', '100' => 'open', '-0.5' => 'locked' }
},
'DEFAULT' => { 'DEFAULT' => {
'AES_KEY' => { '0' => 'off', 'false' => 'off', '1' => 'on', 'true' => 'on' }, 'AES_KEY' => { '0' => 'off', 'false' => 'off', '1' => 'on', 'true' => 'on' },
'LOW_BAT' => { '0' => 'ok', 'false' => 'ok', '1' => 'low', 'true' => 'low' }, 'LOW_BAT' => { '0' => 'ok', 'false' => 'ok', '1' => 'low', 'true' => 'low' },