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

HMCCU: Fixed set toggle command

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@17693 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
zap 2018-11-06 07:51:56 +00:00
parent 776e19d526
commit 0de058b52f
2 changed files with 14 additions and 7 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.
# Do not insert empty lines here, update check depends on it.
- bugfix: 88_HMCCU: fixed set toggle command
- new: 98_livetracking: added module
- bugfix: 38_netatmo: changed geocoding to openstreetmap
- bugfix: 88_HMCCU: support for CCU firmware 3.41.7

20
fhem/FHEM/88_HMCCU.pm
View File

@ -4,7 +4,7 @@
#
# $Id$
#
# Version 4.3.006
# Version 4.3.007
#
# Module for communication between FHEM and Homematic CCU2/3.
#
@ -108,7 +108,7 @@ my %HMCCU_CUST_CHN_DEFAULTS;
my %HMCCU_CUST_DEV_DEFAULTS;
# HMCCU version
my $HMCCU_VERSION = '4.3.006';
my $HMCCU_VERSION = '4.3.007';
# Default RPC port (BidCos-RF)
my $HMCCU_RPC_PORT_DEFAULT = 2001;
@ -3156,7 +3156,8 @@ sub HMCCU_UpdateSingleDatapoint ($$$$)
my ($devaddr, $chnnum) = HMCCU_SplitChnAddr ($ccuaddr);
$objects{$devaddr}{$chn}{$dpt} = $value;
my $rc = HMCCU_UpdateMultipleDevices ($hmccu_hash, \%objects);
# my $rc = HMCCU_UpdateMultipleDevices ($hmccu_hash, \%objects);
my $rc = HMCCU_UpdateSingleDevice ($hmccu_hash, $hash, \%objects, undef);
return (ref ($rc)) ? $rc->{$devaddr}{$chn}{$dpt} : $value;
}
@ -3204,7 +3205,6 @@ sub HMCCU_UpdateSingleDevice ($$$$)
$vg = 1 if (($clthash->{ccuif} eq 'VirtualDevices' || $clthash->{ccuif} eq 'fhem') &&
exists ($clthash->{ccugroup}));
HMCCU_Trace ($clthash, 2, $fnc, "$cltname Objects = ".join(',', @addlist));
# Store the resulting readings
@ -6023,6 +6023,7 @@ sub HMCCU_GetDatapoint ($@)
return (-4, $value) if ($cl_hash->{TYPE} ne 'HMCCU' && $cl_hash->{ccudevstate} eq 'deleted');
my $readingformat = HMCCU_GetAttrReadingFormat ($cl_hash, $io_hash);
my $substitute = HMCCU_GetAttrSubstitute ($cl_hash, $io_hash);
my ($statechn, $statedpt, $controlchn, $controldpt) = HMCCU_GetSpecialDatapoints (
$cl_hash, '', 'STATE', '', '');
my $ccuget = HMCCU_GetAttribute ($io_hash, $cl_hash, 'ccuget', 'Value');
@ -6045,9 +6046,14 @@ sub HMCCU_GetDatapoint ($@)
$value = HMCCU_HMCommand ($cl_hash, $cmd, 1);
if (defined ($value) && $value ne '' && $value ne 'null' &&
(!defined ($noupd) || $noupd == 0)) {
$value = HMCCU_UpdateSingleDatapoint ($cl_hash, $chn, $dpt, $value);
if (defined ($value) && $value ne '' && $value ne 'null') {
if (!defined ($noupd) || $noupd == 0) {
$value = HMCCU_UpdateSingleDatapoint ($cl_hash, $chn, $dpt, $value);
}
else {
my $svalue = HMCCU_ScaleValue ($cl_hash, $chn, $dpt, $value, 0);
$value = HMCCU_Substitute ($svalue, $substitute, 0, $chn, $dpt);
}
HMCCU_Trace ($cl_hash, 2, $fnc, "Value of $chn.$dpt = $value");
return (1, $value);
}