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

CUL_HM: correct pairing

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@11966 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinp876 2016-08-14 21:13:01 +00:00
parent 4c7ea28d57
commit be292f1168
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fhem/FHEM/10_CUL_HM.pm
View File

@ -1329,7 +1329,6 @@ sub CUL_HM_Parse($$) {#########################################################
CUL_HM_sndIfOpen("x:$mh{ioName}"); CUL_HM_sndIfOpen("x:$mh{ioName}");
return (CUL_HM_pushEvnts(),$mh{devN},@entities); #return something to please dispatcher return (CUL_HM_pushEvnts(),$mh{devN},@entities); #return something to please dispatcher
} }
$mh{devH}->{lastMsg} = $msgX;
delete $mh{devH}->{helper}{rpt};# new message, rm recent ack delete $mh{devH}->{helper}{rpt};# new message, rm recent ack
my @ack; # ack and responses, might be repeated my @ack; # ack and responses, might be repeated
@ -1337,6 +1336,7 @@ sub CUL_HM_Parse($$) {#########################################################
#----------start valid messages parsing --------- #----------start valid messages parsing ---------
my $parse = CUL_HM_parseCommon($iohash,\%mh); my $parse = CUL_HM_parseCommon($iohash,\%mh);
$mh{devH}->{lastMsg} = $msgX;# is used in parseCommon and need previous setting. so set it here
push @evtEt,[$mh{devH},1,"powerOn:$tn"] if($parse eq "powerOn"); push @evtEt,[$mh{devH},1,"powerOn:$tn"] if($parse eq "powerOn");
push @evtEt,[$mh{devH},1,""] if($parse eq "parsed"); # msg is parsed but may push @evtEt,[$mh{devH},1,""] if($parse eq "parsed"); # msg is parsed but may
@ -3014,8 +3014,10 @@ sub CUL_HM_parseCommon(@){#####################################################
} }
elsif($mhp->{mTp} eq "00"){###################################### elsif($mhp->{mTp} eq "00"){######################################
Log 1,"General --------- start me";
if (InternalVal($mhp->{devN},"lastMsg",undef) =~ m/t:00/){# repeated if (InternalVal($mhp->{devN},"lastMsg",undef) =~ m/t:00/){# repeated
# return "done"; # suppress handling of a repeated pair request Log 1,"General --------- stop me###########";
return "done"; # suppress handling of a repeated pair request
} }
my $paired = 0; #internal flag my $paired = 0; #internal flag
CUL_HM_infoUpdtDevData($mhp->{devN}, $mhp->{devH},$mhp->{p}) CUL_HM_infoUpdtDevData($mhp->{devN}, $mhp->{devH},$mhp->{p})

2
fhem/FHEM/HMConfig.pm
View File

@ -927,10 +927,8 @@ foreach my $al (keys %culHmModel){ # duplicate entries for alias devices
,siren =>{ intKeyVisib =>1 ,siren =>{ intKeyVisib =>1
,transmitTryMax =>1,statusInfoMinDly=>1,statusInfoRandom=>1 ,transmitTryMax =>1,statusInfoMinDly=>1,statusInfoRandom=>1
,alarmTimeMax =>1,cyclicInfoMsg =>1,sabotageMsg =>1,signalTone =>1 ,alarmTimeMax =>1,cyclicInfoMsg =>1,sabotageMsg =>1,signalTone =>1
,lowBatLimitRT =>1,localResDis =>1,lowBatSignal =>1 ,lowBatLimitRT =>1,localResDis =>1,lowBatSignal =>1
,OnDly =>1,OnTime =>1,OffDly =>1,OffTime =>1 ,OnDly =>1,OnTime =>1,OffDly =>1,OffTime =>1
,OnTimeMode =>1,OffTimeMode =>1 ,OnTimeMode =>1,OffTimeMode =>1
,ActionType =>1 ,ActionType =>1