mirror of
https://github.com/fhem/fhem-mirror.git
synced 2025-04-23 14:46:24 +00:00
multi: some HM minor bugs
git-svn-id: https://svn.fhem.de/fhem/trunk@7355 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinp876
parent
6867734884
commit
6278665e29
@ -1841,7 +1841,7 @@ sub CUL_HM_Parse($$) {#########################################################
|
||||
push @evtEt,[$devH,1,"alive:yes"];
|
||||
push @evtEt,[$devH,1,"battery:". (($err&0x80)?"low" :"ok" )];
|
||||
}
|
||||
if (defined($state)){# if state was detected post events
|
||||
if (defined($state) && $chn ne "00"){# if state was detected post events
|
||||
my $txt;
|
||||
if ($shash->{helper}{lm} && $shash->{helper}{lm}{hex($state)}){$txt = $shash->{helper}{lm}{hex($state)}}
|
||||
elsif ($lvlStr{md}{$md}){$txt = $lvlStr{md}{$md}{$state}}
|
||||
@ -7003,6 +7003,7 @@ sub CUL_HM_unQEntity($$){# remove entity from q
|
||||
}
|
||||
$q = $q."Wu" if (CUL_HM_getRxType($defs{$name}) & 0x1C);
|
||||
my $mQ = $modules{CUL_HM}{helper}{$q};
|
||||
return if(!$mQ || scalar(@{$mQ}) == 0);
|
||||
@{$mQ} = grep !/^$devN$/,@{$mQ} if ($dq->{$q} eq "");
|
||||
}
|
||||
sub CUL_HM_qEntity($$){ # add to queue
|
||||
|
||||
@ -344,18 +344,13 @@ sub HMinfo_regCheck(@) { ######################################################
|
||||
if ($ehash->{helper}{shadowReg}){
|
||||
foreach my $rl (keys %{$ehash->{helper}{shadowReg}}){
|
||||
delete $ehash->{helper}{shadowReg}{$rl}
|
||||
if ($ehash->{READINGS}{$rl} &&
|
||||
$ehash->{helper}{shadowReg} &&
|
||||
$ehash->{helper}{shadowReg}{$rl} &&
|
||||
$ehash->{READINGS}{$rl}{VAL} eq $ehash->{helper}{shadowReg}{$rl});
|
||||
if ( ( $ehash->{READINGS}{$rl}
|
||||
&& $ehash->{READINGS}{$rl}{VAL} eq $ehash->{helper}{shadowReg}{$rl}
|
||||
) # content is already displayed
|
||||
||(!$ehash->{helper}{shadowReg}{$rl}) # content is missing
|
||||
);
|
||||
}
|
||||
if (keys %{$ehash->{helper}{shadowReg}}){
|
||||
push @regChPend,$eName;
|
||||
}
|
||||
else{
|
||||
delete $ehash->{helper}{shadowReg};
|
||||
}
|
||||
|
||||
push @regChPend,$eName if (keys %{$ehash->{helper}{shadowReg}});
|
||||
}
|
||||
|
||||
push @regMissing,$eName.":\t".join(",",@mReg) if (scalar @mReg);
|
||||
@ -560,7 +555,7 @@ sub HMinfo_tempList(@) { ######################################################
|
||||
$filter = "." if (!$filter);
|
||||
$action = "" if (!$action);
|
||||
my %dl =("Sat"=>0,"Sun"=>1,"Mon"=>2,"Tue"=>3,"Wed"=>4,"Thu"=>5,"Fri"=>6);
|
||||
my $ret;;
|
||||
my $ret;
|
||||
if ($action eq "save"){
|
||||
# foreach my $eN(HMinfo_getEntities("d")){#search and select channel
|
||||
# my $md = AttrVal($eN,"model","");
|
||||
|
||||
@ -138,7 +138,7 @@ my $K_actDetID = '000000'; # id of actionDetector
|
||||
,"003D" => {name=>"HM-WDS10-TH-O" ,st=>'THSensor' ,cyc=>'00:10' ,rxt=>'c:f' ,lst=>'p' ,chn=>"",} #:w todo should be wakeup, does not react
|
||||
,"003E" => {name=>"HM-WDS30-T-O" ,st=>'THSensor' ,cyc=>'00:10' ,rxt=>'c:w' ,lst=>'p' ,chn=>"",} #:w remark: this device behaves on wakeup
|
||||
,"003F" => {name=>"HM-WDS40-TH-I" ,st=>'THSensor' ,cyc=>'00:10' ,rxt=>'c:f' ,lst=>'p' ,chn=>"",} #:w todo should be wakeup, does not react
|
||||
,"0040" => {name=>"HM-WDS100-C6-O" ,st=>'THSensor' ,cyc=>'00:10' ,rxt=>'c' ,lst=>'p,1' ,chn=>"",} #:w todo should be wakeup, does not react
|
||||
,"0040" => {name=>"HM-WDS100-C6-O" ,st=>'THSensor' ,cyc=>'00:10' ,rxt=>'c:w' ,lst=>'p,1' ,chn=>"",} #:w todo should be wakeup, does not react
|
||||
,"0041" => {name=>"HM-WDC7000" ,st=>'THSensor' ,cyc=>'00:10' ,rxt=>'' ,lst=>'1,4' ,chn=>"",}
|
||||
,"0042" => {name=>"HM-SEC-SD" ,st=>'smokeDetector' ,cyc=>'99:00' ,rxt=>'b' ,lst=>'p' ,chn=>"",}
|
||||
,"0043" => {name=>"HM-SEC-TIS" ,st=>'threeStateSensor' ,cyc=>'28:00' ,rxt=>'c:w' ,lst=>'1,4' ,chn=>"",}
|
||||
@ -321,8 +321,8 @@ my $K_actDetID = '000000'; # id of actionDetector
|
||||
%culHmRegDefShLg = (# register that are available for short AND long button press. Will be merged to rgister list at init
|
||||
#blindActuator mainly
|
||||
ActionType =>{a=> 10.0,s=>0.2,l=>3,min=>0 ,max=>3 ,c=>'lit' ,f=>'' ,u=>'' ,d=>1,t=>"" ,lit=>{off=>0,jmpToTarget=>1,toggleToCnt=>2,toggleToCntInv=>3}},
|
||||
OffTimeMode =>{a=> 10.6,s=>0.1,l=>3,min=>0 ,max=>1 ,c=>'lit' ,f=>'' ,u=>'' ,d=>0,t=>"off time mode" ,lit=>{absolut=>0,minimal=>1}},
|
||||
OnTimeMode =>{a=> 10.7,s=>0.1,l=>3,min=>0 ,max=>1 ,c=>'lit' ,f=>'' ,u=>'' ,d=>0,t=>"on time mode" ,lit=>{absolut=>0,minimal=>1}},
|
||||
OffTimeMode =>{a=> 10.6,s=>0.1,l=>3,min=>0 ,max=>1 ,c=>'lit' ,f=>'' ,u=>'' ,d=>0,t=>"off time meant absolut or at least" ,lit=>{absolut=>0,minimal=>1}},
|
||||
OnTimeMode =>{a=> 10.7,s=>0.1,l=>3,min=>0 ,max=>1 ,c=>'lit' ,f=>'' ,u=>'' ,d=>0,t=>"on time meant absolut or at least" ,lit=>{absolut=>0,minimal=>1}},
|
||||
MaxTimeF =>{a=> 29.0,s=>1.0,l=>3,min=>0 ,max=>25.5 ,c=>'' ,f=>10 ,u=>'s' ,d=>0,t=>"max time first direction." ,lit=>{unused=>25.5}},
|
||||
DriveMode =>{a=> 31.0,s=>1.0,l=>3,min=>0 ,max=>3 ,c=>'lit' ,f=>'' ,u=>'' ,d=>0,t=>"" ,lit=>{direct=>0,viaUpperEnd=>1,viaLowerEnd=>2,viaNextEnd=>3}},
|
||||
#dimmer mainly
|
||||
@ -332,7 +332,7 @@ my $K_actDetID = '000000'; # id of actionDetector
|
||||
OffTime =>{a=> 9.0,s=>1.0,l=>3,min=>0 ,max=>111600 ,c=>'fltCvT' ,f=>'' ,u=>'s' ,d=>0,t=>"off time" ,lit=>{unused=>111600}},
|
||||
|
||||
ActionTypeDim =>{a=> 10.0,s=>0.4,l=>3,min=>0 ,max=>8 ,c=>'lit' ,f=>'' ,u=>'' ,d=>1,t=>"" ,lit=>{off=>0,jmpToTarget=>1,toggleToCnt=>2,toggleToCntInv=>3,upDim=>4,downDim=>5,toggelDim=>6,toggelDimToCnt=>7,toggelDimToCntInv=>8}},
|
||||
OffDlyBlink =>{a=> 14.5,s=>0.1,l=>3,min=>0 ,max=>1 ,c=>'lit' ,f=>'' ,u=>'' ,d=>0,t=>"" ,lit=>{off=>0,on=>1}},
|
||||
OffDlyBlink =>{a=> 14.5,s=>0.1,l=>3,min=>0 ,max=>1 ,c=>'lit' ,f=>'' ,u=>'' ,d=>0,t=>"blink when in off delay" ,lit=>{off=>0,on=>1}},
|
||||
OnLvlPrio =>{a=> 14.6,s=>0.1,l=>3,min=>0 ,max=>1 ,c=>'lit' ,f=>'' ,u=>'' ,d=>0,t=>"" ,lit=>{high=>0,low=>1}},
|
||||
OnDlyMode =>{a=> 14.7,s=>0.1,l=>3,min=>0 ,max=>1 ,c=>'lit' ,f=>'' ,u=>'' ,d=>0,t=>"" ,lit=>{setToOff=>0,NoChange=>1}},
|
||||
OffLevel =>{a=> 15.0,s=>1.0,l=>3,min=>0 ,max=>100 ,c=>'' ,f=>2 ,u=>'%' ,d=>0,t=>"PowerLevel off"},
|
||||
@ -350,9 +350,9 @@ my $K_actDetID = '000000'; # id of actionDetector
|
||||
DimMinLvl =>{a=> 21.0,s=>1.0,l=>3,min=>0 ,max=>100 ,c=>'' ,f=>2 ,u=>'%' ,d=>0,t=>"dimMinLevel"},
|
||||
DimMaxLvl =>{a=> 22.0,s=>1.0,l=>3,min=>0 ,max=>100 ,c=>'' ,f=>2 ,u=>'%' ,d=>0,t=>"dimMaxLevel"},
|
||||
DimStep =>{a=> 23.0,s=>1.0,l=>3,min=>0 ,max=>100 ,c=>'' ,f=>2 ,u=>'%' ,d=>0,t=>"dimStep"},
|
||||
|
||||
OffDlyNewTime =>{a=> 25.0,s=>1.0,l=>3,min=>0.1,max=>25.6 ,c=>'' ,f=>10 ,u=>'s' ,d=>0,t=>"off delay new time"},
|
||||
OffDlyOldTime =>{a=> 26.0,s=>1.0,l=>3,min=>0.1,max=>25.6 ,c=>'' ,f=>10 ,u=>'s' ,d=>0,t=>"off delay old time"},
|
||||
OffDlyStep =>{a=> 24.0,s=>1.0,l=>3,min=>0.1,max=>25.6 ,c=>'' ,f=>2 ,u=>'%' ,d=>0,t=>"off delay step if blink is active"},
|
||||
OffDlyNewTime =>{a=> 25.0,s=>1.0,l=>3,min=>0.1,max=>25.6 ,c=>'' ,f=>10 ,u=>'s' ,d=>0,t=>"off delay blink time for low"},
|
||||
OffDlyOldTime =>{a=> 26.0,s=>1.0,l=>3,min=>0.1,max=>25.6 ,c=>'' ,f=>10 ,u=>'s' ,d=>0,t=>"off delay blink time for high"},
|
||||
DimElsOffTimeMd =>{a=> 38.6,s=>0.1,l=>3,min=>0 ,max=>1 ,c=>'lit' ,f=>'' ,u=>'' ,d=>0,t=>"" ,lit=>{absolut=>0,minimal=>1}},
|
||||
DimElsOnTimeMd =>{a=> 38.7,s=>0.1,l=>3,min=>0 ,max=>1 ,c=>'lit' ,f=>'' ,u=>'' ,d=>0,t=>"" ,lit=>{absolut=>0,minimal=>1}},
|
||||
DimElsActionType=>{a=> 38.0,s=>0.4,l=>3,min=>0 ,max=>8 ,c=>'lit' ,f=>'' ,u=>'' ,d=>0,t=>"" ,lit=>{off=>0,jmpToTarget=>1,toggleToCnt=>2,toggleToCntInv=>3,upDim=>4,downDim=>5,toggelDim=>6,toggelDimToCnt=>7,toggelDimToCntInv=>8}},
|
||||
@ -766,7 +766,7 @@ my $K_actDetID = '000000'; # id of actionDetector
|
||||
,CtValLo =>1,CtValHi =>1
|
||||
,CtOn =>1,CtDlyOn =>1,CtRampOn =>1
|
||||
,CtOff =>1,CtDlyOff =>1,CtRampOff =>1
|
||||
,OffDlyNewTime =>1,OffDlyOldTime =>1
|
||||
,OffDlyStep =>1,OffDlyNewTime =>1,OffDlyOldTime =>1
|
||||
,lgMultiExec =>1
|
||||
}
|
||||
,switch =>{ intKeyVisib =>1,sign =>1
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user