Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

bug fixing

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@3989 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinp876 2013-10-02 09:35:48 +00:00
parent f6dcb37507
commit 73c4186230
3 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
FHEM/10_CUL_HM.pm
View File

@ -3479,7 +3479,8 @@ sub CUL_HM_responseSetup($$) {#store all we need to handle the response
elsif($mTp eq '11' && $chn =~ m/^(02|81)$/){#!!! chn is subtype!!!
CUL_HM_qStateUpdatIfEnab($dst);
if ($p =~ m/02..(..)....(....)/){#lvl ne 0 and timer on
$hash->{helper}{tmdOn} = $2 if ($1 ne "00" && $2 !~ m/(0000|FFFF)/)
$hash->{helper}{tmdOn} = $2 if ($1 ne "00" && $2 !~ m/(0000|FFFF)/);
CUL_HM_respWaitSu ($hash,"cmd:$cmd","mNo:$mNo","reSent:1","timedOn:1");
}
}
elsif($mTp eq '12' && $mFlg & 0x10){#wakeup with burst

4
FHEM/98_HMinfo.pm
View File

@ -88,7 +88,7 @@ sub HMinfo_getParam(@) { ######################################################
my $found = 0;
foreach (@param){
my $para = CUL_HM_Get($ehash,$eName,"param",$_);
push @paramList,sprintf("%-15s",($para eq "undefined"?"-":$para));
push @paramList,sprintf("%-15s",($para eq "undefined"?" -":$para));
$found = 1 if ($para ne "undefined") ;
}
return $found,sprintf("%-20s\t: %s",$eName,join "\t|",@paramList);
@ -262,7 +262,7 @@ sub HMinfo_SetFn($@) {#########################################################
}
if (!$cmd ||$cmd eq "?" ) {##actionImmediate: clear parameter--------------
return "autoReadReg clear configCheck param peerCheck peerXref ".
return "autoReadReg clear configCheck param peerCheck peerXref "
."protoEvents models regCheck register rssi saveConfig update "
."templateSet templateChk templateList templateDef cpRegs update";
}

32
FHEM/HMConfig.pm
View File

@ -975,23 +975,29 @@ $culHmSubTypeSets{motionDetector} = $culHmSubTypeSets{threeStateSensor};
# sensRain ( no statusrequest)
my %culHmModelSets = (# channels of this subtype-------------
"HM-CC-VD" =>{ valvePos => "position"},
"HM-RC-19" =>{ service => "<count>"
,alarm => "<count>"
,display => "<text> [comma|no] [unit] [off|1|2|3] [off|on|slow|fast] <symbol>"},
"HM-PB-4DIS-WM"=>{ text => "<txt1> <txt2>..."
#text => "<btn> [on|off] <txt1> <txt2>...", old style will not be offered anymore
},
"HM-OU-LED16" =>{ led => "[off|red|green|orange]"
,ilum => "[0-15] [0-127]"},
"HM-OU-CFM-PL" =>{ press => "[long|short] [on|off] ..."
,inhibit => "[on|off]"},
"HM-CC-TC" =>{ statusRequest =>""},
"HM-CC-VD" =>{ statusRequest =>""},
"HM-CC-VD" =>{ valvePos => "position"},
"HM-RC-19" =>{ service => "<count>"
,alarm => "<count>"
,display => "<text> [comma|no] [unit] [off|1|2|3] [off|on|slow|fast] <symbol>"},
"HM-PB-4DIS-WM" =>{ text => "<txt1> <txt2>..."
#text => "<btn> [on|off] <txt1> <txt2>...", old style will not be offered anymore
},
"HM-OU-LED16" =>{ led => "[off|red|green|orange]"
,ilum => "[0-15] [0-127]"},
"HM-OU-CFM-PL" =>{ "on-for-timer"=>"<sec>"
,"on-till" =>"<time>"
,on =>""
,off =>""
,toggle =>""
,press =>"[long|short] [on|off] ..."
,inhibit =>"[on|off]"},
"HM-CC-TC" =>{ statusRequest =>""},
"HM-CC-VD" =>{ statusRequest =>""},
);
# clones- - - - - - - - - - - - - - - - -
$culHmModelSets{"HM-RC-19-B"} = $culHmModelSets{"HM-RC-19"};
$culHmModelSets{"HM-RC-19-SW"} = $culHmModelSets{"HM-RC-19"};
$culHmModelSets{"HM-OU-CM-PCB"} = $culHmModelSets{"HM-OU-CFM-PL"};
#%{$culHmModelSets{"HM-RC-19-SW"}} = %{$culHmModelSets{"HM-RC-19"}}; copy
my %culHmChanSets = (