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

remove debug, add some docu

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@5201 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinp876 2014-03-11 17:42:49 +00:00
parent 61bab752f7
commit c5805afd48
2 changed files with 55 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
fhem/FHEM/10_CUL_HM.pm
View File

@ -1046,7 +1046,7 @@ sub CUL_HM_Parse($$) {#########################################################
$ctrlMode = ($ctrlMode >> 6) & 0x3 ; $ctrlMode = ($ctrlMode >> 6) & 0x3 ;
$actTemp = sprintf("%2.1f",$actTemp); $actTemp = sprintf("%2.1f",$actTemp);
$setTemp = ($setTemp < 5 )?'off': $setTemp = ($setTemp < 5 )?'off':
($setTemp >30 )?'on' :$setTemp; ($setTemp >30 )?'on' :sprintf("%.1f",$setTemp);
my $dHash = $shash; my $dHash = $shash;
$shash = $modules{CUL_HM}{defptr}{"$src$chn"} $shash = $modules{CUL_HM}{defptr}{"$src$chn"}
@ -1073,7 +1073,7 @@ sub CUL_HM_Parse($$) {#########################################################
push @evtEt,[$wHash,1,"measured-temp:$actTemp"] if ($wHash); push @evtEt,[$wHash,1,"measured-temp:$actTemp"] if ($wHash);
} }
elsif($mTp eq "59" && $p =~ m/^(..)/) {#inform team about new value elsif($mTp eq "59" && $p =~ m/^(..)/) {#inform team about new value
my $setTemp = int(hex($1)/4)/2; my $setTemp = sprintf("%.1f",int(hex($1)/4)/2);
my $ctrlMode = hex($1)&0x3; my $ctrlMode = hex($1)&0x3;
push @evtEt,[$shash,1,"desired-temp:$setTemp"]; push @evtEt,[$shash,1,"desired-temp:$setTemp"];
push @evtEt,[$shash,1,"mode:$ctlTbl{$ctrlMode}"]; push @evtEt,[$shash,1,"mode:$ctlTbl{$ctrlMode}"];
@ -1104,7 +1104,7 @@ sub CUL_HM_Parse($$) {#########################################################
$ctrlMode = ($ctrlMode >> 6) & 0x3 ; $ctrlMode = ($ctrlMode >> 6) & 0x3 ;
$actTemp = sprintf("%2.1f",$actTemp); $actTemp = sprintf("%2.1f",$actTemp);
$setTemp = ($setTemp < 5 )?'off': $setTemp = ($setTemp < 5 )?'off':
($setTemp >30 )?'on' :$setTemp; ($setTemp >30 )?'on' :sprintf("%.1f",$setTemp);
my $dHash = $shash; my $dHash = $shash;
$shash = $modules{CUL_HM}{defptr}{"$src$chn"} $shash = $modules{CUL_HM}{defptr}{"$src$chn"}
@ -1138,7 +1138,7 @@ sub CUL_HM_Parse($$) {#########################################################
my $actTemp =(($t ) & 0x3ff)/10; my $actTemp =(($t ) & 0x3ff)/10;
$actTemp = sprintf("%2.1f",$actTemp); $actTemp = sprintf("%2.1f",$actTemp);
$setTemp = ($setTemp < 5 )?'off': $setTemp = ($setTemp < 5 )?'off':
($setTemp >30 )?'on' :$setTemp; ($setTemp >30 )?'on' :sprintf("%.1f",$setTemp);
push @evtEt,[$shash,1,"measured-temp:$actTemp"]; push @evtEt,[$shash,1,"measured-temp:$actTemp"];
push @evtEt,[$shash,1,"desired-temp:$setTemp"]; push @evtEt,[$shash,1,"desired-temp:$setTemp"];
push @evtEt,[$shash,1,"humidity:$h"]; push @evtEt,[$shash,1,"humidity:$h"];
@ -2243,7 +2243,7 @@ sub CUL_HM_parseCommon(@){#####################################################
$ret = "done"; $ret = "done";
} }
elsif($mTp =~ m /^4[01]/){ #someone is triggered########## elsif($mTp =~ m /^4[01]/){ #someone is triggered##########
CUL_HM_qStateUpdatIfEnab($dst)if (hex($mFlg) & 0x20 && $dhash); CUL_HM_stateUpdatDly($dhash->{NAME},10) if ($mFlgH & 0x20 && $dhash);
my $chn = hex(substr($p,0,2)); my $chn = hex(substr($p,0,2));
my $long = ($chn & 0x40)?"long":"short"; my $long = ($chn & 0x40)?"long":"short";
$chn = $chn & 0x3f; $chn = $chn & 0x3f;
@ -2842,6 +2842,7 @@ sub CUL_HM_Set($@) {#+++++++++++++++++ set command+++++++++++++++++++++++++++++
$hash->{helper}{prt}{wakeup}=1;# start wakeup $hash->{helper}{prt}{wakeup}=1;# start wakeup
CUL_HM_SndCmd($hash,"++B112$id$dst"); CUL_HM_SndCmd($hash,"++B112$id$dst");
} }
elsif($cmd eq "pair") { ##################################################### elsif($cmd eq "pair") { #####################################################
$state = ""; $state = "";
my $serialNr = ReadingsVal($name, "D-serialNr", undef); my $serialNr = ReadingsVal($name, "D-serialNr", undef);
@ -3042,6 +3043,7 @@ sub CUL_HM_Set($@) {#+++++++++++++++++ set command+++++++++++++++++++++++++++++
CUL_HM_PushCmdStack($hash,$_) foreach(@postCmds);#ugly commands after regSet CUL_HM_PushCmdStack($hash,$_) foreach(@postCmds);#ugly commands after regSet
} }
elsif($cmd eq "level") { #################################################### elsif($cmd eq "level") { ####################################################
#level =>"<level> <relockDly> <speed>..." #level =>"<level> <relockDly> <speed>..."
my (undef,undef,$lvl,$rLocDly,$speed) = @a; my (undef,undef,$lvl,$rLocDly,$speed) = @a;
@ -3068,7 +3070,7 @@ sub CUL_HM_Set($@) {#+++++++++++++++++ set command+++++++++++++++++++++++++++++
$hash = $chnHash; # report to channel if defined $hash = $chnHash; # report to channel if defined
} }
elsif($cmd =~ m/^(on-for-timer|on-till)$/) { ################################ elsif($cmd =~ m/^(on-for-timer|on-till)$/) { ################################
my (undef,undef,$duration,$edate) = @a; #date prepared extention to entdate my (undef,undef,$duration,$ramp) = @a; #date prepared extention to entdate
if ($cmd eq "on-till"){ if ($cmd eq "on-till"){
# to be extended to handle end date as well # to be extended to handle end date as well
my ($eH,$eM,$eSec) = split(':',$duration); my ($eH,$eM,$eSec) = split(':',$duration);
@ -3083,8 +3085,9 @@ sub CUL_HM_Set($@) {#+++++++++++++++++ set command+++++++++++++++++++++++++++++
if (!defined $duration || $duration !~ m/^[+-]?\d+(\.\d+)?$/); if (!defined $duration || $duration !~ m/^[+-]?\d+(\.\d+)?$/);
my $tval = CUL_HM_encodeTime16($duration);# onTime 0.0..85825945.6, 0=forever my $tval = CUL_HM_encodeTime16($duration);# onTime 0.0..85825945.6, 0=forever
return "timer value to low" if ($tval eq "0000"); return "timer value to low" if ($tval eq "0000");
$ramp = ($ramp && $st eq "dimmer")?CUL_HM_encodeTime16($ramp):"0000";
delete $hash->{helper}{dlvl};#stop desiredLevel supervision delete $hash->{helper}{dlvl};#stop desiredLevel supervision
CUL_HM_PushCmdStack($hash,"++$flag"."11$id$dst"."02$chn"."C80000$tval"); CUL_HM_PushCmdStack($hash,"++${flag}11$id${dst}02${chn}C8$ramp$tval");
$hash = $chnHash; # report to channel if defined $hash = $chnHash; # report to channel if defined
} }
elsif($cmd eq "lock") { ##################################################### elsif($cmd eq "lock") { #####################################################
@ -3320,6 +3323,7 @@ sub CUL_HM_Set($@) {#+++++++++++++++++ set command+++++++++++++++++++++++++++++
} }
CUL_HM_PushCmdStack($hash,$msg) if ($msg); CUL_HM_PushCmdStack($hash,$msg) if ($msg);
} }
elsif($cmd =~ m/^(controlMode|controlManu|controlParty)$/) { ################ elsif($cmd =~ m/^(controlMode|controlManu|controlParty)$/) { ################
my $mode = $a[2]; my $mode = $a[2];
if ($cmd ne "controlMode"){ if ($cmd ne "controlMode"){
@ -3546,6 +3550,7 @@ sub CUL_HM_Set($@) {#+++++++++++++++++ set command+++++++++++++++++++++++++++++
CUL_HM_UpdtReadSingle($hash,$lim{$cmd}{rd},$valu.$u,1); CUL_HM_UpdtReadSingle($hash,$lim{$cmd}{rd},$valu.$u,1);
} }
} }
elsif($cmd eq "keydef") { ############################################### reg elsif($cmd eq "keydef") { ############################################### reg
if ( $a[3] eq "tilt") {CUL_HM_pushConfig($hash,$id,$dst,1,$id,$a[2],3,"0B220D838B228D83");#JT_ON/OFF/RAMPON/RAMPOFF short and long if ( $a[3] eq "tilt") {CUL_HM_pushConfig($hash,$id,$dst,1,$id,$a[2],3,"0B220D838B228D83");#JT_ON/OFF/RAMPON/RAMPOFF short and long
} elsif ($a[3] eq "close") {CUL_HM_pushConfig($hash,$id,$dst,1,$id,$a[2],3,"0B550D838B558D83");#JT_ON/OFF/RAMPON/RAMPOFF short and long } elsif ($a[3] eq "close") {CUL_HM_pushConfig($hash,$id,$dst,1,$id,$a[2],3,"0B550D838B558D83");#JT_ON/OFF/RAMPON/RAMPOFF short and long
@ -3650,7 +3655,6 @@ sub CUL_HM_Set($@) {#+++++++++++++++++ set command+++++++++++++++++++++++++++++
} }
my ($pDev,$pCh) = unpack 'A6A2',$pId; my ($pDev,$pCh) = unpack 'A6A2',$pId;
return "button cannot be identified" if (!$pCh); return "button cannot be identified" if (!$pCh);
Log 1,"General ########### $pId:$pDev,$pCh,$mode";
delete $hash->{helper}{dlvl};#stop desiredLevel supervision delete $hash->{helper}{dlvl};#stop desiredLevel supervision
CUL_HM_PushCmdStack($hash, sprintf("++%s3E%s%s%s40%02X%02X",$flag, CUL_HM_PushCmdStack($hash, sprintf("++%s3E%s%s%s40%02X%02X",$flag,
$id,$dst,$pDev, $id,$dst,$pDev,
@ -3757,7 +3761,6 @@ sub CUL_HM_Set($@) {#+++++++++++++++++ set command+++++++++++++++++++++++++++++
$state = ""; $state = "";
return "command requires parameter" if (!$a[2]); return "command requires parameter" if (!$a[2]);
my ($ioId,$ioCh,$set) = ($id,$a[2],'set'); #set defaults my ($ioId,$ioCh,$set) = ($id,$a[2],'set'); #set defaults
Log 1,"General got $a[2]";
if ($defs{$a[2]}){ #IO device given if ($defs{$a[2]}){ #IO device given
$ioId = AttrVal($a[2],"hmId",""); $ioId = AttrVal($a[2],"hmId","");
return "$a[2] not valid, attribut hmid not set" return "$a[2] not valid, attribut hmid not set"
@ -4873,18 +4876,16 @@ sub CUL_HM_ID2PeerList ($$$) {
} }
sub CUL_HM_peerChId($$) {# in:<IDorName> <deviceID> <ioID>, out:channelID sub CUL_HM_peerChId($$) {# in:<IDorName> <deviceID> <ioID>, out:channelID
my($pId,$dId)=@_; my($pId,$dId)=@_;
my $iId = CUL_HM_IOid(CUL_HM_id2Hash($dId)); my $iId = CUL_HM_id2IoId($dId);
my $pSc = substr($pId,0,4); #helper for shortcut spread my ($pSc,$pScNo) = unpack 'A4A*',$pId; #helper for shortcut spread
return $dId.sprintf("%02X",'0'.substr($pId,4)) if ($pSc eq 'self'); return $dId.sprintf("%02X",'0'.$pScNo) if ($pSc eq 'self');
return $iId.sprintf("%02X",'0'.substr($pId,4)) if ($pSc eq 'fhem'); return $iId.sprintf("%02X",'0'.$pScNo) if ($pSc eq 'fhem');
return "all" if ($pId eq 'all');#used by getRegList return "all" if ($pId eq 'all');#used by getRegList
my $repID = CUL_HM_name2Id($pId); return substr(CUL_HM_name2Id($pId).'01',0,8);# default chan is 01
$repID .= '01' if (length( $repID) == 6);# add default 01 if this is a device
return $repID;
} }
sub CUL_HM_peerChName($$) {#in:<IDorName> <deviceID> <ioID>, out:name sub CUL_HM_peerChName($$) {#in:<IDorName> <deviceID> <ioID>, out:name
my($pId,$dId)=@_; my($pId,$dId)=@_;
my $iId = CUL_HM_IOid(CUL_HM_id2Hash($dId)); my $iId = CUL_HM_id2IoId($dId);
my($pDev,$pChn) = unpack'A6A2',$pId; my($pDev,$pChn) = unpack'A6A2',$pId;
return 'self'.$pChn if ($pDev eq $dId); return 'self'.$pChn if ($pDev eq $dId);
return 'fhem'.$pChn if ($pDev eq $iId); return 'fhem'.$pChn if ($pDev eq $iId);
@ -5002,9 +5003,9 @@ sub CUL_HM_name2Id(@) { #in: name or HMid ==>out: HMid, "" if no match
my ($name,$idHash) = @_; my ($name,$idHash) = @_;
my $hash = $defs{$name}; my $hash = $defs{$name};
return $hash->{DEF} if($hash && $hash->{TYPE} eq "CUL_HM");#name is entity return $hash->{DEF} if($hash && $hash->{TYPE} eq "CUL_HM");#name is entity
return "000000" if($name eq "broadcast"); #broadcast
return $defs{$1}->{DEF}.$2 if($name =~ m/(.*)_chn:(..)/); #<devname> chn:xx
return $name if($name =~ m/^[A-F0-9]{6,8}$/i);#was already HMid return $name if($name =~ m/^[A-F0-9]{6,8}$/i);#was already HMid
return $defs{$1}->{DEF}.$2 if($name =~ m/(.*)_chn:(..)/); #<devname> chn:xx
return "000000" if($name eq "broadcast"); #broadcast
return substr($idHash->{DEF},0,6).sprintf("%02X",$1) return substr($idHash->{DEF},0,6).sprintf("%02X",$1)
if($idHash && ($name =~ m/self(.*)/)); if($idHash && ($name =~ m/self(.*)/));
return AttrVal($name,"hmId",""); # could be IO device return AttrVal($name,"hmId",""); # could be IO device
@ -5034,6 +5035,16 @@ sub CUL_HM_id2Hash($) {#in: id, out:hash
$id = substr($id,0,6); $id = substr($id,0,6);
return $modules{CUL_HM}{defptr}{$id}?($modules{CUL_HM}{defptr}{$id}):undef; return $modules{CUL_HM}{defptr}{$id}?($modules{CUL_HM}{defptr}{$id}):undef;
} }
sub CUL_HM_id2IoId($) {#in: id, out:Id of assigned IO
my ($id) = @_;
($id) = unpack 'A6',$id;#get device ID
return "" if (!$modules{CUL_HM}{defptr}{$id} ||
!$modules{CUL_HM}{defptr}{$id}->{IODev} ||
!$modules{CUL_HM}{defptr}{$id}->{IODev}->{NAME});
my $ioHash = $modules{CUL_HM}{defptr}{$id}->{IODev};
my $fhtid = defined($ioHash->{FHTID}) ? $ioHash->{FHTID} : "0000";
return AttrVal($ioHash->{NAME},"hmId","F1$fhtid");
}
sub CUL_HM_getDeviceHash($) {#in: hash out: devicehash sub CUL_HM_getDeviceHash($) {#in: hash out: devicehash
my ($hash) = @_; my ($hash) = @_;
return $hash if(!$hash->{DEF}); return $hash if(!$hash->{DEF});
@ -5208,7 +5219,6 @@ sub CUL_HM_updtRegDisp($$$) {
CUL_HM_peerChName($peerId,$devId)."-":""; CUL_HM_peerChName($peerId,$devId)."-":"";
$pReg=~s/:/-/; $pReg=~s/:/-/;
$pReg="R-".$pReg; $pReg="R-".$pReg;
Log 1,"General $peerId,$devId,$ioId:".CUL_HM_peerChName($peerId,$devId);
my $devName =CUL_HM_getDeviceHash($hash)->{NAME};# devName as protocol entity my $devName =CUL_HM_getDeviceHash($hash)->{NAME};# devName as protocol entity
my $st = $attr{$devName}{subType} ?$attr{$devName}{subType} :""; my $st = $attr{$devName}{subType} ?$attr{$devName}{subType} :"";
my $md = $attr{$devName}{model} ?$attr{$devName}{model} :""; my $md = $attr{$devName}{model} ?$attr{$devName}{model} :"";

48
fhem/FHEM/HMConfig.pm
View File

@ -1113,24 +1113,24 @@ $culHmRegChan{"ROTO_ZEL-STG-RM-FWT03"}= $culHmRegChan{"HM-CC-TC03"};
peerBulk => "<peer1,peer2,...>", peerBulk => "<peer1,peer2,...>",
); );
%culHmSubTypeSets = (# channels of this subtype %culHmSubTypeSets = (# channels of this subtype
switch =>{ "on-for-timer" =>"<sec>" switch =>{ "on-for-timer" =>"<ontime>"
,"on-till" =>"<time>" ,"on-till" =>"<time>"
,on =>"" ,on =>""
,off =>"" ,off =>""
,toggle =>"" ,toggle =>""
,press =>"[long|short] [on|off] ..." ,press =>"[long|short] [<peer>] [<peerChn>]..."
,inhibit =>"[on|off]" ,inhibit =>"[on|off]"
,statusRequest =>"" ,statusRequest =>""
,peerIODev =>"[IO] <btn> [set|unset]..." ,peerIODev =>"[IO] <btn> [set|unset]..."
}, },
dimmer =>{ "on-for-timer" =>"<sec>" dimmer =>{ "on-for-timer" =>"<ontime> [<ramptime>]..."
,"on-till" =>"<time>" ,"on-till" =>"<time> [<ramptime>]..."
,on =>"" ,on =>""
,off =>"" ,off =>""
,toggle =>"" ,toggle =>""
,pct =>"<value> ... [<ontime>] [<ramptime>]" ,pct =>"<value> ... [<ontime>] [<ramptime>]"
,stop =>"" ,stop =>""
,press =>"[long|short] [on|off] ..." ,press =>"[long|short] [on|off|<peer>] [<peerChn>] ..."
,up =>"[<changeValue>] [<ontime>] [<ramptime>] ..." ,up =>"[<changeValue>] [<ontime>] [<ramptime>] ..."
,down =>"[<changeValue>] [<ontime>] [<ramptime>] ..." ,down =>"[<changeValue>] [<ontime>] [<ramptime>] ..."
,inhibit =>"[on|off]" ,inhibit =>"[on|off]"
@ -1142,7 +1142,7 @@ $culHmRegChan{"ROTO_ZEL-STG-RM-FWT03"}= $culHmRegChan{"HM-CC-TC03"};
,toggle =>"" ,toggle =>""
,pct =>"[<value>] ... [<ontime>]" ,pct =>"[<value>] ... [<ontime>]"
,stop =>"" ,stop =>""
,press =>"[long|short] [on|off] ..." ,press =>"[long|short] [on|off|<peer>] [<peerChn>] ..."
,up =>"[<changeValue>] [<ontime>] [<ramptime>] ..." ,up =>"[<changeValue>] [<ontime>] [<ramptime>] ..."
,down =>"[<changeValue>] [<ontime>] [<ramptime>] ..." ,down =>"[<changeValue>] [<ontime>] [<ramptime>] ..."
,inhibit =>"[on|off]" ,inhibit =>"[on|off]"
@ -1150,24 +1150,24 @@ $culHmRegChan{"ROTO_ZEL-STG-RM-FWT03"}= $culHmRegChan{"HM-CC-TC03"};
,peerIODev =>"[IO] <btn> [set|unset]..." ,peerIODev =>"[IO] <btn> [set|unset]..."
}, },
remote =>{ peerChan =>"<btnNumber> <actChn> ... [single|dual] [set|unset] [actor|remote|both]"}, remote =>{ peerChan =>"<btnNumber> <actChn> ... [single|dual] [set|unset] [actor|remote|both]"},
threeStateSensor =>{ peerChan =>"<btnNumber> <actChn> ... single [set|unset] [actor|remote|both]" threeStateSensor =>{ peerChan =>"<btnNumber> <actChn> ... single [set|unset] [actor|remote|both]"
# ,statusRequest =>"" # ,statusRequest =>""
}, },
THSensor =>{ peerChan =>" 0 <actChn> ... single [set|unset] [actor|remote|both]"}, THSensor =>{ peerChan =>"0 <actChn> ... single [set|unset] [actor|remote|both]"},
virtual =>{ peerChan =>"<btnNumber> <actChn> ... [single|dual] [set|unset] [actor|remote|both]" virtual =>{ peerChan =>"<btnNumber> <actChn> ... [single|dual] [set|unset] [actor|remote|both]"
,press =>"[long|short] [noBurst] ..." ,press =>"[long|short] [noBurst] ..."
,postEvent =>"<condition>"}, ,postEvent =>"<condition>"},
smokeDetector =>{ peerChan =>"<btnNumber> <actChn> ... single [set|unset] actor"}, smokeDetector =>{ peerChan =>"<btnNumber> <actChn> ... single [set|unset] actor"},
winMatic =>{ statusRequest =>""}, winMatic =>{ statusRequest =>""},
keyMatic =>{ lock =>"" keyMatic =>{ lock =>""
,unlock =>"[<sec>] ..." ,unlock =>"[<sec>] ..."
,open =>"[<sec>] ..." ,open =>"[<sec>] ..."
,inhibit =>"[on|off]" ,inhibit =>"[on|off]"
,statusRequest =>""}, ,statusRequest =>""},
repeater =>{ setRepeat => "[no1..36] <sendName> <recName> [bdcast-yes|no]" repeater =>{ setRepeat => "[no1..36] <sendName> <recName> [bdcast-yes|no]"
,inhibit => "[on|off]" ,inhibit => "[on|off]"
,statusRequest =>""}, ,statusRequest =>""},
outputUnit =>{ statusRequest =>""}, outputUnit =>{ statusRequest =>""},
); );
# clones- - - - - - - - - - - - - - - - - # clones- - - - - - - - - - - - - - - - -
$culHmSubTypeSets{pushButton} = $culHmSubTypeSets{remote}; $culHmSubTypeSets{pushButton} = $culHmSubTypeSets{remote};
@ -1196,7 +1196,7 @@ $culHmSubTypeSets{motionDetector} = $culHmSubTypeSets{threeStateSensor};
,on =>"" ,on =>""
,off =>"" ,off =>""
,toggle =>"" ,toggle =>""
,press =>"[long|short] [on|off|<peer> ] [<peerChn>]..." ,press =>"[long|short] [<peer>] [<peerChn>]..."
,inhibit =>"[on|off]"}, ,inhibit =>"[on|off]"},
"HM-CC-TC" =>{ burstXmit =>""}, "HM-CC-TC" =>{ burstXmit =>""},
"HM-CC-RT-DN" =>{ burstXmit =>"" "HM-CC-RT-DN" =>{ burstXmit =>""