From 0de058b52fd308cf1322590ba0e0984872344afe Mon Sep 17 00:00:00 2001
From: zap <>
Date: Tue, 6 Nov 2018 07:51:56 +0000
Subject: [PATCH] HMCCU: Fixed set toggle command

git-svn-id: https://svn.fhem.de/fhem/trunk@17693 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/CHANGED          |  1 +
 fhem/FHEM/88_HMCCU.pm | 20 +++++++++++++-------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/fhem/CHANGED b/fhem/CHANGED
index 00b2402ef..037ab7a0a 100644
--- a/fhem/CHANGED
+++ b/fhem/CHANGED
@@ -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
diff --git a/fhem/FHEM/88_HMCCU.pm b/fhem/FHEM/88_HMCCU.pm
index a256830d2..8370b834c 100755
--- a/fhem/FHEM/88_HMCCU.pm
+++ b/fhem/FHEM/88_HMCCU.pm
@@ -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);
 	}