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

HMLAN: check avoiding traces, statusrequest removed for some OUs

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@9721 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinp876 2015-10-30 06:36:47 +00:00
parent 008019cd17
commit 6e4b004ca9
2 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fhem/FHEM/00_HMLAN.pm
View File

@ -477,7 +477,7 @@ sub HMLAN_Write($$$) {#########################################################
HMLAN_SimpleWrite($hash,$msg); HMLAN_SimpleWrite($hash,$msg);
return; return;
} }
elsif (length($msg)>21){ if (length($msg)>21){
my ($mtype,$src,$dst) = (substr($msg, 8, 2), my ($mtype,$src,$dst) = (substr($msg, 8, 2),
substr($msg, 10, 6), substr($msg, 10, 6),
substr($msg, 16, 6)); substr($msg, 16, 6));
@ -508,6 +508,9 @@ sub HMLAN_Write($$$) {#########################################################
; ;
} }
} }
elsif(length($msg)<5){
Log3 $hash, 2, "HMLAN_Send: cmd too short:".($fn?$fn:"noFn").":".($msg?$msg:"no_msg");
}
elsif($msg =~ m /init:(......)/){ elsif($msg =~ m /init:(......)/){
my $dst = $1; my $dst = $1;
if ($modules{CUL_HM}{defptr}{$dst} && if ($modules{CUL_HM}{defptr}{$dst} &&

12
fhem/FHEM/HMConfig.pm
View File

@ -1433,7 +1433,6 @@ $culHmRegChan{"ROTO_ZEL-STG-RM-FWT03"}= $culHmRegChan{"HM-CC-TC03"};
,repeater =>{ statusRequest => "" ,repeater =>{ statusRequest => ""
,getSerial => "" ,getSerial => ""
} }
,outputUnit =>{ statusRequest => ""}
); );
$culHmSubTypeDevSets{dimmer} = $culHmSubTypeDevSets{switch}; $culHmSubTypeDevSets{dimmer} = $culHmSubTypeDevSets{switch};
$culHmSubTypeDevSets{blindActuator} = $culHmSubTypeDevSets{switch}; $culHmSubTypeDevSets{blindActuator} = $culHmSubTypeDevSets{switch};
@ -1499,15 +1498,14 @@ $culHmSubTypeDevSets{blindActuator} = $culHmSubTypeDevSets{switch};
,inhibit => "[on|off]" ,inhibit => "[on|off]"
,statusRequest =>"" ,statusRequest =>""
} }
,outputUnit =>{ statusRequest =>""} ,KFM100 =>{ statusRequest =>""}
); );
# clones- - - - - - - - - - - - - - - - - # clones- - - - - - - - - - - - - - - - -
$culHmSubTypeSets{pushButton} = $culHmSubTypeSets{remote}; $culHmSubTypeSets{pushButton} = $culHmSubTypeSets{remote};
$culHmSubTypeSets{swi} = $culHmSubTypeSets{remote}; $culHmSubTypeSets{swi} = $culHmSubTypeSets{remote};
$culHmSubTypeSets{KFM100} = $culHmSubTypeSets{outputUnit}; $culHmSubTypeSets{blindActuatorSol}= $culHmSubTypeSets{KFM100};
$culHmSubTypeSets{blindActuatorSol}= $culHmSubTypeSets{outputUnit}; $culHmSubTypeSets{tipTronic} = $culHmSubTypeSets{KFM100};
$culHmSubTypeSets{tipTronic} = $culHmSubTypeSets{outputUnit};
$culHmSubTypeSets{motionDetector} = $culHmSubTypeSets{threeStateSensor}; $culHmSubTypeSets{motionDetector} = $culHmSubTypeSets{threeStateSensor};
$culHmSubTypeSets{motionAndBtn} = $culHmSubTypeSets{threeStateSensor}; $culHmSubTypeSets{motionAndBtn} = $culHmSubTypeSets{threeStateSensor};
@ -1552,6 +1550,10 @@ $culHmModelSets{"HM-PB-4DIS-WM-2"} = $culHmModelSets{"HM-PB-4DIS-WM"};
$culHmModelSets{"HM-Dis-WM55"} = $culHmModelSets{"HM-PB-4DIS-WM"}; $culHmModelSets{"HM-Dis-WM55"} = $culHmModelSets{"HM-PB-4DIS-WM"};
$culHmModelSets{"HM-RC-Dis-H-x-EU"} = $culHmModelSets{"HM-PB-4DIS-WM"}; $culHmModelSets{"HM-RC-Dis-H-x-EU"} = $culHmModelSets{"HM-PB-4DIS-WM"};
$culHmModelSets{"ROTO_ZEL-STG-RM-DWT-10"}= $culHmModelSets{"HM-PB-4DIS-WM"}; $culHmModelSets{"ROTO_ZEL-STG-RM-DWT-10"}= $culHmModelSets{"HM-PB-4DIS-WM"};
$culHmModelSets{"HM-OU-CF-PL"} = $culHmModelSets{"HM-SEC-SD"};
$culHmModelSets{"HM-OU-LED16"} = $culHmModelSets{"HM-SEC-SD"};
#$culHmModelSets{"HM-OU-CFM-PL"} = $culHmModelSets{"HM-SEC-SD"};# no statusrequest possible
$culHmModelSets{"HM-OU-CM-PCB"} = $culHmModelSets{"HM-SEC-SD"};