mhop/fhem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

toggle 4 dimmer, CO2 sensor implementation

Browse Source 
git-svn-id: https://fhem.svn.sourceforge.net/svnroot/fhem/trunk/fhem@2439 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinp876
2013-01-06 13:36:14 +00:00
parent c94611a9be
commit c2edfc7b71
1 changed files with 42 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
FHEM/10_CUL_HM.pm
View File

@@ -953,18 +953,29 @@ CUL_HM_Parse($$)
else{push @event, "3SSunknownMsg:$p" if(!@event);} else{push @event, "3SSunknownMsg:$p" if(!@event);}
} }
elsif($model eq "HM-WDC7000" ||$st eq "THSensor") { #################### elsif($model eq "HM-WDC7000" ||$st eq "THSensor") { ####################
my $t = hex(substr($p,0,4)); if($model eq "HM-CC-SCD"){# co2 sensor
$t -= 32768 if($t > 1638.4); if (($msgType eq "02" && $p =~ m/^01/) || # handle Ack_Status
$t = sprintf("%0.1f", $t/10); ($msgType eq "10" && $p =~ m/^06/) || #or Info_Status message here
my $h = hex(substr($p,4,2)); ($msgType eq "41")) {
my $ap = hex(substr($p,6,4)); my $co2Lvl = hex(substr($p,4,2));
my $statemsg = "state:T: $t"; my %lvl=(0=>"normal",1=>"added",2=>"addedStrong");
$statemsg .= " H: $h" if ($h); push @event, "state:".$lvl{$co2Lvl};
$statemsg .= " AP: $ap" if ($ap); }
push @event, $statemsg; }
push @event, "temperature:$t";#temp is always there else{
push @event, "humidity:$h" if ($h); my $t = hex(substr($p,0,4));
push @event, "airpress:$ap" if ($ap); $t -= 32768 if($t > 1638.4);
$t = sprintf("%0.1f", $t/10);
my $h = hex(substr($p,4,2));
my $ap = hex(substr($p,6,4));
my $statemsg = "state:T: $t";
$statemsg .= " H: $h" if ($h);
$statemsg .= " AP: $ap" if ($ap);
push @event, $statemsg;
push @event, "temperature:$t";#temp is always there
push @event, "humidity:$h" if ($h);
push @event, "airpress:$ap" if ($ap);
}
} }
elsif($st eq "winMatic") { #################################### elsif($st eq "winMatic") { ####################################
@@ -1281,6 +1292,7 @@ my %culHmRegDefine = (
ledFlashUnlocked=>{a=> 31.3,s=>0.1,l=>1,min=>0 ,max=>1 ,c=>'lit' ,f=>'' ,u=>'' ,d=>0,t=>"LED blinks when not locked",lit=>{off=>0,on=>1}}, ledFlashUnlocked=>{a=> 31.3,s=>0.1,l=>1,min=>0 ,max=>1 ,c=>'lit' ,f=>'' ,u=>'' ,d=>0,t=>"LED blinks when not locked",lit=>{off=>0,on=>1}},
ledFlashLocked =>{a=> 31.6,s=>0.1,l=>1,min=>0 ,max=>1 ,c=>'lit' ,f=>'' ,u=>'' ,d=>0,t=>"LED blinks when locked" ,lit=>{off=>0,on=>1}}, ledFlashLocked =>{a=> 31.6,s=>0.1,l=>1,min=>0 ,max=>1 ,c=>'lit' ,f=>'' ,u=>'' ,d=>0,t=>"LED blinks when locked" ,lit=>{off=>0,on=>1}},
# sec_mdir # sec_mdir
sabotageMsg =>{a=> 16.0,s=>1 ,l=>0,min=>0 ,max=>1 ,c=>'lit' ,f=>'' ,u=>'' ,d=>1,t=>"enable sabotage message" ,lit=>{off=>0,on=>1}},
evtFltrPeriod =>{a=> 1.0,s=>0.4,l=>1,min=>0.5,max=>7.5 ,c=>'factor' ,f=>2 ,u=>'s' ,d=>1,t=>"event filter period"}, evtFltrPeriod =>{a=> 1.0,s=>0.4,l=>1,min=>0.5,max=>7.5 ,c=>'factor' ,f=>2 ,u=>'s' ,d=>1,t=>"event filter period"},
evtFltrNum =>{a=> 1.4,s=>0.4,l=>1,min=>1 ,max=>15 ,c=>'' ,f=>'' ,u=>'' ,d=>1,t=>"sensitivity - read sach n-th puls"}, evtFltrNum =>{a=> 1.4,s=>0.4,l=>1,min=>1 ,max=>15 ,c=>'' ,f=>'' ,u=>'' ,d=>1,t=>"sensitivity - read sach n-th puls"},
minInterval =>{a=> 2.0,s=>0.3,l=>1,min=>0 ,max=>4 ,c=>'lit' ,f=>'' ,u=>'' ,d=>1,t=>"minimum interval in sec" ,lit=>{0=>0,15=>1,20=>2,60=>3,120=>4}}, minInterval =>{a=> 2.0,s=>0.3,l=>1,min=>0 ,max=>4 ,c=>'lit' ,f=>'' ,u=>'' ,d=>1,t=>"minimum interval in sec" ,lit=>{0=>0,15=>1,20=>2,60=>3,120=>4}},
@@ -1338,7 +1350,7 @@ my %culHmRegType = (
angelOpen =>1,angelMax =>1,angelLocked =>1, angelOpen =>1,angelMax =>1,angelLocked =>1,
ledFlashUnlocked=>1,ledFlashLocked =>1, ledFlashUnlocked=>1,ledFlashLocked =>1,
}, },
motionDetector=>{ motionDetector=>{
evtFltrPeriod =>1,evtFltrNum =>1,minInterval =>1, evtFltrPeriod =>1,evtFltrNum =>1,minInterval =>1,
captInInterval=>1,brightFilter =>1,ledOnTime =>1, captInInterval=>1,brightFilter =>1,ledOnTime =>1,
}, },
@@ -1364,11 +1376,12 @@ my %culHmRegModel = (
"HM-WDS100-C6-O" =>{stormUpThresh =>1,stormLowThresh =>1}, "HM-WDS100-C6-O" =>{stormUpThresh =>1,stormLowThresh =>1},
"KS550" =>{stormUpThresh =>1,stormLowThresh =>1}, "KS550" =>{stormUpThresh =>1,stormLowThresh =>1},
"HM-OU-CFM-PL" =>{localResetDis =>1, "HM-OU-CFM-PL" =>{localResetDis =>1,
OnTime =>1,OffTime =>1, OnDly =>1,OffDly =>1, OnTime =>1,OffTime =>1, OnDly =>1,OffDly =>1,
SwJtOn =>1,SwJtOff =>1,SwJtDlyOn =>1,SwJtDlyOff =>1, SwJtOn =>1,SwJtOff =>1,SwJtDlyOn =>1,SwJtDlyOff =>1,
CtOn =>1,CtDlyOn =>1,CtOff =>1,CtDlyOff =>1, CtOn =>1,CtDlyOn =>1,CtOff =>1,CtDlyOff =>1,
OnTimeMode =>1,OffTimeMode =>1, OnTimeMode =>1,OffTimeMode =>1,
ActType =>1,ActNum =>1}, ActType =>1,ActNum =>1},
"HM-SEC-MDIR" =>{sabotageMsg =>1,},
"HM-CC-TC" =>{backlOnTime =>1,backlOnMode =>1,btnLock =>1}, "HM-CC-TC" =>{backlOnTime =>1,backlOnMode =>1,btnLock =>1},
"HM-CC-SCD" =>{peerNeedsBurst =>1,expectAES =>1, "HM-CC-SCD" =>{peerNeedsBurst =>1,expectAES =>1,
transmitTryMax =>1,evtFltrTime =>1, transmitTryMax =>1,evtFltrTime =>1,
@@ -2189,10 +2202,16 @@ CUL_HM_Set($@)
CUL_HM_PushCmdStack($hash,'++'.$flag.'11'.$id.$dst.'02'.$chn.'C80000'.$tval); CUL_HM_PushCmdStack($hash,'++'.$flag.'11'.$id.$dst.'02'.$chn.'C80000'.$tval);
} }
elsif($cmd eq "toggle") { ################################################### elsif($cmd eq "toggle") { ###################################################
$hash->{toggleIndex} = 1 if(!$hash->{toggleIndex}); if($st eq "dimmer"){;
$hash->{toggleIndex} = (($hash->{toggleIndex}+1) % 128); CUL_HM_PushCmdStack($hash,'++'.$flag.'11'.$id.$dst.'02'.$chn.
CUL_HM_PushCmdStack($hash, sprintf("++%s3E%s%s%s40%s%02X",$flag,$id, $dst, (ReadingsVal($name,"state","on") eq "off" ?"C80000":"000000"));
}
else{
$hash->{toggleIndex} = 1 if(!$hash->{toggleIndex});
$hash->{toggleIndex} = (($hash->{toggleIndex}+1) % 128);
CUL_HM_PushCmdStack($hash, sprintf("++%s3E%s%s%s40%s%02X",$flag,$id, $dst,
$dst, $chn, $hash->{toggleIndex})); $dst, $chn, $hash->{toggleIndex}));
}
} }
elsif($cmd eq "lock") { ################################################### elsif($cmd eq "lock") { ###################################################
CUL_HM_PushCmdStack($hash,'++'.$flag.'11'.$id.$dst.'800100FF'); # LEVEL_SET CUL_HM_PushCmdStack($hash,'++'.$flag.'11'.$id.$dst.'800100FF'); # LEVEL_SET
@@ -2475,7 +2494,8 @@ CUL_HM_Set($@)
CUL_HM_SndCmd($hash, sprintf("++9440%s%s00%02X",$dst,$dst,$testnr)); CUL_HM_SndCmd($hash, sprintf("++9440%s%s00%02X",$dst,$dst,$testnr));
} }
elsif($cmd =~ m/alarm(.*)/) { ############################################### elsif($cmd =~ m/alarm(.*)/) { ###############################################
CUL_HM_SndCmd($hash, sprintf("++9441%s%s01%s", # CUL_HM_SndCmd($hash, sprintf("++9441%s%s01%s",
CUL_HM_SndCmd($hash, sprintf("++B441%s%s01%s",
$dst,$dst, $1 eq "On" ? "0BC8" : "0C01")); $dst,$dst, $1 eq "On" ? "0BC8" : "0C01"));
} }
elsif($cmd eq "virtual") { ################################################## elsif($cmd eq "virtual") { ##################################################