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

CUL_HM:DIS_EP update

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@11856 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinp876 2016-07-27 18:42:43 +00:00
parent 311bcbffa1
commit 41e1324d15
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fhem/FHEM/10_CUL_HM.pm
View File

@ -4887,7 +4887,7 @@ sub CUL_HM_Set($@) {#+++++++++++++++++ set command+++++++++++++++++++++++++++++
($pause < 1 ?1 : ($pause < 1 ?1 :
($pause >160 ?160: ($pause >160 ?160:
$pause))); $pause)));
if($msg eq 'help'){ # display command info if($msg eq 'help'){ # display command info
return "command options:" return "command options:"
."\n line1,icon1:line2,icon2:line3,icon3 sound repeat pause signal" ."\n line1,icon1:line2,icon2:line3,icon3 sound repeat pause signal"
@ -4901,7 +4901,7 @@ sub CUL_HM_Set($@) {#+++++++++++++++++ set command+++++++++++++++++++++++++++++
} }
my $cmd = '020A'; my $cmd = '020A';
# Lines are separated by semicolon, empty lines are supported # Lines are separated by semicolon, empty lines are supported
my @disp_lines = split (':', $msg.":::");# at least 3 entries - loop will use first 3 my @disp_lines = (split (':', $msg.":::"),"","");# at least 3 entries - loop will use first 3
my $lineNr=1; my $lineNr=1;
$evtDly = 1; $evtDly = 1;
foreach my $line (@disp_lines[0..2]) {# only 3 lines foreach my $line (@disp_lines[0..2]) {# only 3 lines
@ -4909,7 +4909,7 @@ sub CUL_HM_Set($@) {#+++++++++++++++++ set command+++++++++++++++++++++++++++++
my ($text, $icon) = split (',', $line.","); # add separator in case Icon is dismissed my ($text, $icon) = split (',', $line.","); # add separator in case Icon is dismissed
$cmd .= '12';# start text indicator $cmd .= '12';# start text indicator
if ($line ne '') { if (defined $line && $line ne '') {
# Hex code # Hex code
if ($text =~ /^0x[0-9A-F]{2}$/) { if ($text =~ /^0x[0-9A-F]{2}$/) {
@ -4948,7 +4948,6 @@ sub CUL_HM_Set($@) {#+++++++++++++++++ set command+++++++++++++++++++++++++++++
CUL_HM_pushEvnts(); CUL_HM_pushEvnts();
CUL_HM_PushCmdStack($hash,"++${flag}11$id${dst}80${chn}$_") foreach (unpack('(A28)*',$cmd)); CUL_HM_PushCmdStack($hash,"++${flag}11$id${dst}80${chn}$_") foreach (unpack('(A28)*',$cmd));
return;
} }
elsif($cmd =~ m/^(controlMode|controlManu|controlParty)$/) { ################ elsif($cmd =~ m/^(controlMode|controlManu|controlParty)$/) { ################

7
fhem/FHEM/HMConfig.pm
View File

@ -310,7 +310,7 @@ my $K_actDetID = '000000'; # id of actionDetector
,"00F8" => {name=>"HM-RC-4-3-D" ,st=>'remote' ,cyc=>'' ,rxt=>'c:w:l' ,lst=>'1,4' ,chn=>"Btn:1:4",} ,"00F8" => {name=>"HM-RC-4-3-D" ,st=>'remote' ,cyc=>'' ,rxt=>'c:w:l' ,lst=>'1,4' ,chn=>"Btn:1:4",}
,"00F9" => {name=>"HM-Sec-Sir-WM" ,st=>'siren' ,cyc=>'' ,rxt=>'c:b' ,lst=>'1,3' ,chn=>"Sen:1:2,Panic:3:3,Arm:4:4",} ,"00F9" => {name=>"HM-Sec-Sir-WM" ,st=>'siren' ,cyc=>'' ,rxt=>'c:b' ,lst=>'1,3' ,chn=>"Sen:1:2,Panic:3:3,Arm:4:4",}
,"00FA" => {name=>"HM-OU-CFM-TW" ,st=>'outputUnit' ,cyc=>'' ,rxt=>'c:b' ,lst=>'3' ,chn=>"Led:1:1,Mp3:2:2",} ,"00FA" => {name=>"HM-OU-CFM-TW" ,st=>'outputUnit' ,cyc=>'' ,rxt=>'c:b' ,lst=>'3' ,chn=>"Led:1:1,Mp3:2:2",}
,"00FB" => {name=>"HM-Dis-EP-WM55" ,st=>'pushButton' ,cyc=>'' ,rxt=>'c:b' ,lst=>'1,3' ,chn=>"Btn:1:2,Dis:3:3,Key:4:8",} ,"00FB" => {name=>"HM-Dis-EP-WM55" ,st=>'pushButton' ,cyc=>'' ,rxt=>'c:b' ,lst=>'1,3:1p.2p' ,chn=>"Btn:1:2,Dis:3:3,Key:4:8",}
,"00FC" => {name=>"OLIGO-smart-iq-HM" ,st=>'dimmer' ,cyc=>'' ,rxt=>'' ,lst=>'1,3' ,chn=>"Dim:1:2,Dim1_V:3:4,Dim2_V:5:6",} ,"00FC" => {name=>"OLIGO-smart-iq-HM" ,st=>'dimmer' ,cyc=>'' ,rxt=>'' ,lst=>'1,3' ,chn=>"Dim:1:2,Dim1_V:3:4,Dim2_V:5:6",}
,"00FD" => {name=>"HM-Sen-LI-O" ,st=>'senBright' ,cyc=>'00:10' ,rxt=>'c:w' ,lst=>'1' ,chn=>""} ,"00FD" => {name=>"HM-Sen-LI-O" ,st=>'senBright' ,cyc=>'00:10' ,rxt=>'c:w' ,lst=>'1' ,chn=>""}
@ -997,8 +997,9 @@ $culHmRegType{pushButton} = $culHmRegType{remote};
} }
,"HM-PB-4DIS-WM" =>{ peerNeedsBurst =>1,expectAES =>1,language =>1,stbyTime =>1} ,"HM-PB-4DIS-WM" =>{ peerNeedsBurst =>1,expectAES =>1,language =>1,stbyTime =>1}
,"HM-Dis-WM55" =>{ stbyTime =>1} ,"HM-Dis-WM55" =>{ intKeyVisib =>1,stbyTime =>1}
,"HM-Dis-EP-WM55" =>{ powerSupply =>1,localResDis =>1,wakeupBehavior =>1,wakeupBehavMsg =>1 ,"HM-Dis-EP-WM55" =>{ intKeyVisib =>1
,powerSupply =>1,localResDis =>1,wakeupBehavior =>1,wakeupBehavMsg =>1
,displayInvert =>1} ,displayInvert =>1}
,"HM-WDS100-C6-O" =>{ burstRx =>1,sunThresh =>1,stormUpThresh =>1,stormLowThresh =>1} ,"HM-WDS100-C6-O" =>{ burstRx =>1,sunThresh =>1,stormUpThresh =>1,stormLowThresh =>1}