mhop/fhem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HMCCU: Version 3.9.005

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@13569 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
zap
2017-03-01 18:11:41 +00:00
parent 33524e65f7
commit 551481d09f
2 changed files with 13 additions and 12 deletions
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.
- update: 88_HMCCU: added tracing for RPC set config
- bugfix: 32_withings: removed experimental code - bugfix: 32_withings: removed experimental code
- new: 82_LGTV_WebOS: to control LG TV's with WebOS - new: 82_LGTV_WebOS: to control LG TV's with WebOS
- bugfix: 42_Nextion: restore version - bugfix: 42_Nextion: restore version

24
fhem/FHEM/88_HMCCU.pm
View File

@@ -4,7 +4,7 @@
# #
# $Id$ # $Id$
# #
# Version 3.9.004 # Version 3.9.005
# #
# Module for communication between FHEM and Homematic CCU2. # Module for communication between FHEM and Homematic CCU2.
# Supports BidCos-RF, BidCos-Wired, HmIP-RF, virtual CCU channels, # Supports BidCos-RF, BidCos-Wired, HmIP-RF, virtual CCU channels,
@@ -104,7 +104,7 @@ my %HMCCU_CUST_CHN_DEFAULTS;
my %HMCCU_CUST_DEV_DEFAULTS; my %HMCCU_CUST_DEV_DEFAULTS;
# HMCCU version # HMCCU version
my $HMCCU_VERSION = '3.9.004'; my $HMCCU_VERSION = '3.9.005';
# RPC Ports and URL extensions # RPC Ports and URL extensions
my %HMCCU_RPC_NUMPORT = ( my %HMCCU_RPC_NUMPORT = (
@@ -4641,8 +4641,8 @@ sub HMCCU_RPCSetConfig ($$$)
my $name = $hash->{NAME}; my $name = $hash->{NAME};
my $type = $hash->{TYPE}; my $type = $hash->{TYPE};
my $ccuflags = AttrVal ($name, 'ccuflags', 'null');
my $addr; my $addr;
my %paramset;
my $hmccu_hash = HMCCU_GetHash ($hash); my $hmccu_hash = HMCCU_GetHash ($hash);
return -3 if (!defined ($hmccu_hash)); return -3 if (!defined ($hmccu_hash));
@@ -4658,23 +4658,23 @@ sub HMCCU_RPCSetConfig ($$$)
my $port = $HMCCU_RPC_PORT{$int}; my $port = $HMCCU_RPC_PORT{$int};
my $url = "http://".$hmccu_hash->{host}.":".$port."/"; my $url = "http://".$hmccu_hash->{host}.":".$port."/";
$url .= $HMCCU_RPC_URL{$port} if (exists ($HMCCU_RPC_URL{$port})); $url .= $HMCCU_RPC_URL{$port} if (exists ($HMCCU_RPC_URL{$port}));
# Build param set if ($ccuflags =~ /trace/) {
# foreach my $pardef (@$parref) { my $ps = '';
# my ($par,$val) = split ("=", $pardef); foreach my $p (keys %$parref) {
# next if (!defined ($par) || !defined ($val)); $ps .= ", ".$p."=".$parref->{$p};
# $paramset{$par} = $val; }
# } Log3 $name, 2, "HMCCU: RPCSetConfig: addr=$addr".$ps;
}
my $client = RPC::XML::Client->new ($url); my $client = RPC::XML::Client->new ($url);
# my $res = $client->simple_request ("putParamset", $addr, "MASTER", \%paramset);
my $res = $client->simple_request ("putParamset", $addr, "MASTER", $parref); my $res = $client->simple_request ("putParamset", $addr, "MASTER", $parref);
if (! defined ($res)) { if (! defined ($res)) {
return -5; return -5;
} }
elsif (ref ($res)) { elsif (ref ($res)) {
if (exists ($res->{faultString})) { if (exists ($res->{faultString})) {
Log3 $name, 1, "HMCCU: ".$res->{faultString}; Log3 $name, 1, "HMCCU: RPC request failed. ".$res->{faultString};
return -2; return -2;
} }
} }