From 6ff4198b31d4ef11eb5d8fbebe2a7a73462bd100 Mon Sep 17 00:00:00 2001 From: martinp876 Date: Sun, 21 Feb 2016 14:08:39 +0000 Subject: [PATCH] CUL_HM: RGB support git-svn-id: https://svn.fhem.de/fhem/trunk@10901 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/10_CUL_HM.pm | 13 +++++++++---- fhem/FHEM/98_HMinfo.pm | 24 ++++++++++++++++++------ 2 files changed, 27 insertions(+), 10 deletions(-) diff --git a/fhem/FHEM/10_CUL_HM.pm b/fhem/FHEM/10_CUL_HM.pm index a9c070e0d..6ca44e7c3 100755 --- a/fhem/FHEM/10_CUL_HM.pm +++ b/fhem/FHEM/10_CUL_HM.pm @@ -4437,12 +4437,17 @@ sub CUL_HM_Set($@) {#+++++++++++++++++ set command+++++++++++++++++++++++++++++ elsif($cmd eq "brightAuto") { ############################################### my (undef,undef,$bright,$colProg,$min,$max,$duration,$ramp) = @a; #date prepared extention to entdate return "please enter the duration in seconds" - if (!defined $duration || $duration !~ m/^[+-]?\d+(\.\d+)?$/); - my $tval = CUL_HM_encodeTime16($duration);# onTime 0.0..85825945.6, 0=forever - $ramp = CUL_HM_encodeTime16($ramp); + if (defined $duration && $duration !~ m/^[+-]?\d+(\.\d+)?$/); + return "at least bright and colorprogramm need to be set" if (!defined $colProg); + + my $tval; + $tval = (!defined $duration) ? "" : CUL_HM_encodeTime16($duration);# onTime 0.0..85825945.6, 0=forever + $ramp = (!defined $ramp) ? "" : CUL_HM_encodeTime16($ramp) ; + $min = (!defined $min) ? "" : sprintf("%02X",$min) ; + $max = (!defined $max) ? "" : sprintf("%02X",$max) ; CUL_HM_PushCmdStack($hash,'++'.$flag.'11'.$id.$dst.'81'.$chn. - sprintf("%02X%02X%02X%02X",$bright,$colProg,$min,$max).$ramp.$tval); + sprintf("%02X%02X",$bright,$colProg).$min.$max.$ramp.$tval); } elsif($cmd eq "playTone") { ################################################# my $msg; diff --git a/fhem/FHEM/98_HMinfo.pm b/fhem/FHEM/98_HMinfo.pm index 7eb556721..88917c4a2 100644 --- a/fhem/FHEM/98_HMinfo.pm +++ b/fhem/FHEM/98_HMinfo.pm @@ -460,16 +460,28 @@ sub HMinfo_peerCheck(@) { ##################################################### if ($pMd !~ m/HM-CC-RT-DN/ ||$pChn !~ m/(0[45])$/ ){ push @peeringStrange,$eName." pID: Model $pMd should be HM-CC-RT-DN ClimatTeam Channel"; } + elsif($chn eq "04"){ + # compare templist template are identical and boost is same + my $rtCn = CUL_HM_id2Name(substr($pId,0,6)."04"); + Log 1,"General $eName peered with $rtCn rt/rt"; + } } - elsif($chn eq "02" && - ($pChn ne "02" ||$pMd ne "HM-TC-IT-WM-W-EU" )){ - push @peeringStrange,$eName." pID: Model $pMd should be HM-TC-IT-WM-W-EU Climate Channel"; + elsif($chn eq "02"){ + if($pChn ne "02" ||$pMd ne "HM-TC-IT-WM-W-EU" ){ + push @peeringStrange,$eName." pID: Model $pMd should be HM-TC-IT-WM-W-EU Climate Channel"; + } } } elsif ($md eq "HM-TC-IT-WM-W-EU"){ - if($chn eq "02" && - ($pChn ne "02" ||$pMd ne "HM-CC-RT-DN" )){ - push @peeringStrange,$eName." pID: Model $pMd should be HM-TC-IT-WM-W-EU Climate Channel"; + if($chn eq "02"){ + if($pChn ne "02" ||$pMd ne "HM-CC-RT-DN" ){ + push @peeringStrange,$eName." pID: Model $pMd should be HM-TC-IT-WM-W-EU Climate Channel"; + } + else{ + # compare templist template are identical and boost is same + my $rtCn = CUL_HM_id2Name(substr($pId,0,6)."04"); + Log 1,"General $eName peered with $rtCn tc/rt"; + } } } }