FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-16 10:46:03 +00:00
Code Issues Releases Wiki Activity

finish EP implementation

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@5318 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinp876 2014-03-25 06:37:56 +00:00
parent 3872a211fd
commit d6a2393e9d
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
fhem/FHEM/10_CUL_HM.pm
View File

@ -1211,10 +1211,12 @@ sub CUL_HM_Parse($$) {#########################################################
}
elsif($md eq "HM-SEN-EP") { #################################################
if ($mTp eq "40"){
my (undef,$counter) = unpack 'A2A2',$p;
$counter = hex($counter);
my ($chn,$counter) = unpack 'A2A2',$p;
$shash = $modules{CUL_HM}{defptr}{$src.$chn}
if($modules{CUL_HM}{defptr}{$src.$chn});
# $counter = hex($counter);
push @evtEt,[$shash,1,"state:".$counter];
push @evtEt,[$shash,1,"counter:".$counter];
push @evtEt,[$shash,1,"trigger:Short_$counter"];
}
}
elsif($st eq "THSensor") { ##################################################
@ -5244,7 +5246,7 @@ sub CUL_HM_getRegFromStore($$$$@) {#read a register from backup data
}
else{
return "invalid:regname or address"
if($addr<1 ||$addr>255);
if($addr<1 ||$addr>255);
}
my $dst = substr(CUL_HM_name2Id($name),0,6);
if(!$regLN){
@ -5279,8 +5281,8 @@ sub CUL_HM_getRegFromStore($$$$@) {#read a register from backup data
$dRead = $dReadS;
}
else{
if (grep /$regLN../,keys %{$hash->{READINGS}} &&
!$peerId){
if (grep /$regLN../,keys %{$hash->{READINGS}} &&
!$peerId){
return "invalid:peer missing";
}
return "invalid" if (!defined($dRead) || $dRead eq "");
@ -5545,7 +5547,7 @@ sub CUL_HM_time2min($) { # minutes -> time
return $m;
}
sub CUL_HM_getRegN($$$){
sub CUL_HM_getRegN($$$){ # get list of register for a model
my ($st,$md,$chn) = @_;
my @regArr = keys %{$culHmRegGeneral};
push @regArr, keys %{$culHmRegType->{$st}} if($culHmRegType->{$st});

3
fhem/FHEM/HMConfig.pm
View File

@ -1344,7 +1344,6 @@ $culHmRegChan{"ROTO_ZEL-STG-RM-FWT03"}= $culHmRegChan{"HM-CC-TC03"};
$culHmSubTypeSets{pushButton} = $culHmSubTypeSets{remote};
$culHmSubTypeSets{swi} = $culHmSubTypeSets{remote};
$culHmSubTypeSets{sensor} = $culHmSubTypeSets{outputUnit};
$culHmSubTypeSets{KFM100} = $culHmSubTypeSets{outputUnit};
$culHmSubTypeSets{blindActuatorSol}= $culHmSubTypeSets{outputUnit};
$culHmSubTypeSets{tipTronic} = $culHmSubTypeSets{outputUnit};
@ -1383,7 +1382,7 @@ $culHmModelSets{"HM-RC-19-SW"} = $culHmModelSets{"HM-RC-19"};
$culHmModelSets{"HM-OU-CM-PCB"} = $culHmModelSets{"HM-OU-CFM-PL"};
$culHmModelSets{"ROTO_ZEL-STG-RM-FWT"} = $culHmModelSets{"HM-CC-TC"};
$culHmModelSets{"HM-Sen-Wa-Od"} = $culHmModelSets{"HM-SEC-SD"};
#%{$culHmModelSets{"HM-RC-19-SW"}} = %{$culHmModelSets{"HM-RC-19"}}; copy