mirror of
https://github.com/fhem/fhem-mirror.git
synced 2025-03-10 09:16:53 +00:00
10_CUL_HM: improve register handlig, introduce assignIO for vccu
git-svn-id: https://svn.fhem.de/fhem/trunk@8673 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinp876
parent
e88240f7ad
commit
dcfa42d739
@ -136,6 +136,8 @@ sub CUL_HM_Initialize($) {
|
||||
$hash->{GetFn} = "CUL_HM_Get";
|
||||
$hash->{RenameFn} = "CUL_HM_Rename";
|
||||
$hash->{AttrFn} = "CUL_HM_Attr";
|
||||
$hash->{NotifyFn} = "CUL_HM_Notify";
|
||||
|
||||
$hash->{Attr}{dev} = "ignore:1,0 dummy:1,0 " # -- device only attributes
|
||||
."IODev IOList IOgrp "
|
||||
."hmProtocolEvents:0_off,1_dump,2_dumpFull,3_dumpTrigger "
|
||||
@ -209,8 +211,8 @@ sub CUL_HM_updateConfig($){
|
||||
# this gives FHEM sufficient time to fill in attributes
|
||||
# it will also be called after each manual definition
|
||||
# Purpose is to parse attributes and read config
|
||||
RemoveInternalTimer("updateConfig");
|
||||
if (!$init_done){
|
||||
RemoveInternalTimer("updateConfig");
|
||||
InternalTimer(gettimeofday()+5,"CUL_HM_updateConfig", "updateConfig", 0);
|
||||
return;
|
||||
}
|
||||
@ -892,6 +894,17 @@ sub CUL_HM_hmInitMsgUpdt($){ #update device init msg for HMLAN
|
||||
}
|
||||
}
|
||||
|
||||
sub CUL_HM_Notify(@){#################################
|
||||
my ($ntfy, $dev) = @_;
|
||||
return "" if ($dev->{NAME} ne "global");
|
||||
|
||||
my $events = deviceEvents($dev, AttrVal($ntfy->{NAME}, "addStateEvent", 0));
|
||||
return if(!$events); # Some previous notify deleted the array.
|
||||
return "" if (grep !/INITIALIZED/,@{$events});
|
||||
delete $modules{CUL_HM}{NotifyFn};
|
||||
CUL_HM_updateConfig("startUp");
|
||||
}
|
||||
|
||||
#+++++++++++++++++ msg receive, parsing++++++++++++++++++++++++++++++++++++++++
|
||||
# translate level to readable
|
||||
my %lvlStr = ( md =>{ "HM-SEC-WDS" =>{"00"=>"dry" ,"64"=>"damp" ,"C8"=>"wet" }
|
||||
@ -3163,7 +3176,7 @@ sub CUL_HM_Get($@) {#+++++++++++++++++ get command+++++++++++++++++++++++++++++
|
||||
$max = "literal";
|
||||
}
|
||||
elsif (defined($reg->{lit})){
|
||||
$help .= " spacial:".join(",",keys%{$reg->{lit}});
|
||||
$help .= " special:".join(",",keys%{$reg->{lit}});
|
||||
}
|
||||
push @rI,sprintf("%4d: %-16s | %3s %-14s | %8s | %s\n",
|
||||
$reg->{l},$regName,$min,$max.$reg->{u},
|
||||
@ -3484,9 +3497,9 @@ sub CUL_HM_Set($@) {#+++++++++++++++++ set command+++++++++++++++++++++++++++++
|
||||
my (undef,undef,$sectIn) = @a;
|
||||
my @sectL;
|
||||
if ($sectIn eq "all") {
|
||||
@sectL = ("rssi","msgEvents","readings");#readings is last - it schedules a reread possible
|
||||
@sectL = ("rssi","msgEvents","readings","attack");#readings is last - it schedules a reread possible
|
||||
}
|
||||
elsif($sectIn =~ m/(rssi|trigger|msgEvents|readings|register|unknownDev)/){
|
||||
elsif($sectIn =~ m/(rssi|trigger|msgEvents|readings|register|unknownDev|attack)/){
|
||||
@sectL = ($sectIn);
|
||||
}
|
||||
else{
|
||||
@ -3546,6 +3559,12 @@ sub CUL_HM_Set($@) {#+++++++++++++++++ set command+++++++++++++++++++++++++++++
|
||||
delete $defs{$name}{helper}{rssi};
|
||||
delete ($hash->{$_}) foreach (grep(/^rssi/,keys %{$hash}))
|
||||
}
|
||||
elsif($sect eq "attack"){
|
||||
delete $defs{$name}{helper}{rssi};
|
||||
delete ($hash->{$_}) foreach (grep(/^protErrIo(Id|Attack)/,keys %{$hash}));
|
||||
delete $hash->{READINGS}{$_}
|
||||
foreach (grep /^sabotageAttack/,keys %{$hash->{READINGS}});
|
||||
}
|
||||
}
|
||||
$state = "";
|
||||
}
|
||||
@ -3691,8 +3710,7 @@ sub CUL_HM_Set($@) {#+++++++++++++++++ set command+++++++++++++++++++++++++++++
|
||||
)
|
||||
.(($reg->{l} == 3)?" peer required":"")." : ".$reg->{t}."\n"
|
||||
if ($data eq "?");
|
||||
|
||||
if ($reg->{lit} && $reg->{lit}{$data} ){
|
||||
if ($reg->{lit} && defined $reg->{lit}{$data} ){
|
||||
$data = $reg->{lit}{$data};#conv special value past to calculation
|
||||
}
|
||||
|
||||
@ -4904,7 +4922,21 @@ sub CUL_HM_Set($@) {#+++++++++++++++++ set command+++++++++++++++++++++++++++++
|
||||
$hash->{hmPairSerial} = $serial;
|
||||
InternalTimer(gettimeofday()+30, "CUL_HM_RemoveHMPair", "hmPairForSec:$name", 1);
|
||||
}
|
||||
|
||||
elsif($cmd eq "assignIO") { #################################################
|
||||
$state = "";
|
||||
my $io = $a[2];
|
||||
return "use set of unset - $a[3] not allowed"
|
||||
if ($a[3] && $a[3] != m/^(set|unset)$/);
|
||||
my $set = ($a[3] && $a[3] eq "unset")?0:1;
|
||||
if ($set){
|
||||
CommandAttr(undef, "$io hmId $dst");
|
||||
}
|
||||
else{
|
||||
CommandDeleteAttr(undef, "$io hmId");
|
||||
}
|
||||
CUL_HM_UpdtCentral($name);
|
||||
}
|
||||
|
||||
else{
|
||||
return "$cmd not implemented - contact sysop";
|
||||
}
|
||||
@ -7261,28 +7293,21 @@ sub CUL_HM_storeRssi(@){
|
||||
if (AttrVal($name,"rssiLog",undef));
|
||||
return ;
|
||||
}
|
||||
|
||||
sub CUL_HM_UpdtCentral($){
|
||||
my $name = shift;
|
||||
my $id = CUL_HM_name2Id($name);
|
||||
return if(!$init_done || length($id) != 6);
|
||||
|
||||
delete $defs{$_}{owner_CCU} # remove assignments in IO dev to this CCU
|
||||
foreach (grep !/^$/,
|
||||
map{InternalVal($_,"owner_CCU","") eq $name ? $_ : ""}
|
||||
keys %defs);
|
||||
|
||||
my @l = grep !/^$/,
|
||||
map{AttrVal($_,"IODev","")}
|
||||
map{CUL_HM_id2Name($_)}
|
||||
grep /^.{6}$/,
|
||||
keys %{$modules{CUL_HM}{defptr}};
|
||||
my @myIos;# get all IOs using 'my' ID
|
||||
foreach (CUL_HM_noDup(@l)) {
|
||||
push @myIos,$_ if (CUL_HM_h2IoId($defs{$_}) eq $id);
|
||||
foreach (keys %defs){# remove existing IO assignements
|
||||
next if ( AttrVal($_,"hmId","") ne $id
|
||||
&& InternalVal($_,"owner_CCU","") ne $name);
|
||||
delete $defs{$_}{owner_CCU};
|
||||
}
|
||||
$defs{$name}{assignedIOs} = join(",",@myIos);
|
||||
|
||||
$defs{$name}{assignedIOs} = join(",",devspec2array("hmId=$id"));
|
||||
|
||||
foreach my $ioN(split",",AttrVal($name,"IOList","")){
|
||||
foreach my $ioN(split",",AttrVal($name,"IOList","")){# set parameter in IO
|
||||
next if (!$defs{$ioN});
|
||||
if ( $defs{$ioN}{TYPE} eq "HMLAN"){;
|
||||
}
|
||||
@ -7313,17 +7338,17 @@ sub CUL_HM_UpdtCentral($){
|
||||
CUL_HM_ID2PeerList ($ccuChnName,unpack('A8',CUL_HM_name2Id($pn)."01"),1);
|
||||
}
|
||||
}
|
||||
my $io = AttrVal($name,"IODev","empty");
|
||||
my @ioList = split(",",AttrVal($name,"IOList",""));# prepare array for quick access
|
||||
$defs{$name}{helper}{io}{ioList} = \@ioList;
|
||||
my $io = AttrVal($name,"IODev","empty");# assign IODev to vccu
|
||||
if (AttrVal($name,"IOList","") !~ m/$io/){
|
||||
foreach(split",",AttrVal($name,"IOList","")){
|
||||
foreach(@ioList){
|
||||
if ($defs{$_}){
|
||||
$attr{$name}{IODev} = $_;
|
||||
last;
|
||||
}
|
||||
}
|
||||
}
|
||||
my @ioList = split(",",AttrVal($name,"IOList",""));
|
||||
$defs{$name}{helper}{io}{ioList} = \@ioList;
|
||||
|
||||
CUL_HM_UpdtCentralState($name);
|
||||
}
|
||||
@ -7968,13 +7993,14 @@ sub CUL_HM_tempListTmpl(@) { ##################################################
|
||||
|
||||
Universal commands (available to most hm devices):
|
||||
<ul>
|
||||
<li><B>clear <[readings|register|msgEvents|all]></B><a name="CUL_HMclear"></a><br>
|
||||
<li><B>clear <[rssi|readings|register|msgEvents|attack|all]></B><a name="CUL_HMclear"></a><br>
|
||||
A set of variables can be removed.<br>
|
||||
<ul>
|
||||
readings: all readings will be deleted. Any new reading will be added usual. May be used to eliminate old data<br>
|
||||
register: all captured register-readings in FHEM will be removed. This has NO impact to the values in the device.<br>
|
||||
msgEvents: all message event counter will be removed. Also commandstack will be cleared. <br>
|
||||
rssi: collected rssi values will be cleared. <br>
|
||||
attack: information regarding an attack will be removed. <br>
|
||||
all: all of the above. <br>
|
||||
</ul>
|
||||
</li>
|
||||
@ -9305,13 +9331,14 @@ sub CUL_HM_tempListTmpl(@) { ##################################################
|
||||
|
||||
Allgemeine Befehle (verfügbar für die meisten HM-Geräte):
|
||||
<ul>
|
||||
<li><B>clear <[readings|register|msgEvents|all]></B><a name="CUL_HMclear"></a><br>
|
||||
<li><B>clear <[rssi|readings|register|msgEvents|attack|all]></B><a name="CUL_HMclear"></a><br>
|
||||
Eine Reihe von Variablen kann entfernt werden.<br>
|
||||
<ul>
|
||||
readings: Alle Messwerte werden gelöscht, neue Werte werden normal hinzugefügt. Kann benutzt werden um alte Daten zu entfernen<br>
|
||||
register: Alle in FHEM aufgezeichneten Registerwerte werden entfernt. Dies hat KEINEN Einfluss auf Werte im Gerät.<br>
|
||||
msgEvents: Alle Anchrichtenzähler werden gelöscht. Ebenso wird der Befehlsspeicher zurückgesetzt. <br>
|
||||
rssi: gesammelte RSSI-Werte werden gelöscht.<br>
|
||||
attack: Einträge bezüglich einer Attack werden gelöscht.<br>
|
||||
all: alles oben genannte.<br>
|
||||
</ul>
|
||||
</li>
|
||||
|
||||
@ -513,7 +513,7 @@ my $K_actDetID = '000000'; # id of actionDetector
|
||||
redTempLvl =>{a=> 52.0,s=>1.0,l=>1,min=>30 ,max=>100 ,c=>'' ,f=>'' ,u=>"C" ,d=>0,t=>"reduced temperatur recover"},
|
||||
redLvl =>{a=> 53.0,s=>1.0,l=>1,min=>0 ,max=>100 ,c=>'' ,f=>2 ,u=>"%" ,d=>0,t=>"reduced power level"},
|
||||
powerUpAction =>{a=> 86.0,s=>0.1,l=>1,min=>0 ,max=>1 ,c=>'lit' ,f=>'' ,u=>"" ,d=>1,t=>"behavior on power up" ,lit=>{off=>0,on=>1}},
|
||||
statusInfoMinDly=>{a=> 87.0,s=>0.5,l=>1,min=>0.5,max=>15.5 ,c=>'' ,f=>2 ,u=>"s" ,d=>0,t=>"status message min delay" ,lit=>{unused=>0}},
|
||||
statusInfoMinDly=>{a=> 87.0,s=>0.5,l=>1,min=>0 ,max=>15.5 ,c=>'' ,f=>2 ,u=>"s" ,d=>0,t=>"status message min delay" ,lit=>{unused=>0}},
|
||||
statusInfoRandom=>{a=> 87.5,s=>0.3,l=>1,min=>0 ,max=>7 ,c=>'' ,f=>'' ,u=>"s" ,d=>0,t=>"status message random delay"},
|
||||
characteristic =>{a=> 88.0,s=>0.1,l=>1,min=>0 ,max=>1 ,c=>'lit' ,f=>'' ,u=>"" ,d=>1,t=>"" ,lit=>{linear=>0,square=>1}},
|
||||
logicCombination=>{a=> 89.0,s=>0.5,l=>1,min=>0 ,max=>16 ,c=>'lit' ,f=>'' ,u=>'' ,d=>1,t=>"" ,lit=>{inactive=>0,or=>1,and=>2,xor=>3,nor=>4,nand=>5,orinv=>6,andinv=>7,plus=>8,minus=>9,mul=>10,plusinv=>11,minusinv=>12,mulinv=>13,invPlus=>14,invMinus=>15,invMul=>16}},
|
||||
@ -610,8 +610,8 @@ my $K_actDetID = '000000'; # id of actionDetector
|
||||
cndTxThrhLo =>{a=>139 ,s=>2 ,l=>1,min=>0 ,max=>3000 ,c=>'' ,f=>'' ,u=>'mV' ,d=>0,t=>"threshold high condition"},
|
||||
highHoldTime =>{a=>143 ,s=>1 ,l=>1,min=>60 ,max=>7620 ,c=>'fltCvT60' ,f=>'' ,u=>'s' ,d=>0,t=>"hold time on high state"},
|
||||
evntRelFltTime =>{a=>145 ,s=>1 ,l=>1,min=>1 ,max=>7620 ,c=>'fltCvT60' ,f=>'' ,u=>'s' ,d=>0,t=>"event filter release time "},
|
||||
triggerMode =>{a=>146.0,s=>1 ,l=>1,min=>0 ,max=>255 ,c=>'lit' ,f=>'' ,u=>'' ,d=>0,t=>"define type of event report ",lit=>{off=>0,sensor=>33,switch=>34,button=>35}},
|
||||
mtrType =>{a=>149.0,s=>1 ,l=>1,min=>0 ,max=>255 ,c=>'lit' ,f=>'' ,u=>'' ,d=>0,t=>"type of measurement" ,lit=>{gas=>1,IR=>2,LED=>4,unknown=>255}},
|
||||
triggerMode =>{a=>146.0,s=>1 ,l=>1,min=>0 ,max=>255 ,c=>'lit' ,f=>'' ,u=>'' ,d=>0,t=>"define type of event report " ,lit=>{off=>0,sensor=>33,switch=>34,button=>35}},
|
||||
mtrType =>{a=>149.0,s=>1 ,l=>1,min=>0 ,max=>255 ,c=>'lit' ,f=>'' ,u=>'' ,d=>0,t=>"type of measurement" ,lit=>{gas=>1,IR=>2,LED=>4,unknown=>255}},
|
||||
mtrConstIr =>{a=>150.0,s=>2 ,l=>1,min=>1 ,max=>65536 ,c=>'' ,f=>'' ,u=>'U/kWh',d=>0,t=>"constant IR"},
|
||||
mtrConstGas =>{a=>152.0,s=>2 ,l=>1,min=>0001,max=>65.536 ,c=>'' ,f=>1000 ,u=>'m3/I' ,d=>0,t=>"constant gas"},
|
||||
mtrConstLed =>{a=>154.0,s=>2 ,l=>1,min=>1 ,max=>65536 ,c=>'' ,f=>'' ,u=>'i/kWh',d=>0,t=>"constant led"},
|
||||
@ -1353,10 +1353,10 @@ $culHmRegChan{"ROTO_ZEL-STG-RM-FWT03"}= $culHmRegChan{"HM-CC-TC03"};
|
||||
none4Type =>{ "test"=>"" },
|
||||
);
|
||||
%culHmModelGets = (
|
||||
"CCU-FHEM" =>{ "listDevice"=>"" },
|
||||
ActionDetector =>{ "listDevice"=>"[all|alive|unknown|dead|notAlive] ..."
|
||||
"CCU-FHEM" =>{ "listDevice"=>""}
|
||||
,ActionDetector =>{ "listDevice"=>"[all|alive|unknown|dead|notAlive] ..."
|
||||
,"info" =>""
|
||||
},
|
||||
}
|
||||
);
|
||||
|
||||
##############################---set---########################################
|
||||
@ -1365,7 +1365,7 @@ $culHmRegChan{"ROTO_ZEL-STG-RM-FWT03"}= $culHmRegChan{"HM-CC-TC03"};
|
||||
,getRegRaw => "[List0|List1|List2|List3|List4|List5|List6] ... [<PeerChannel>]"
|
||||
,getConfig => ""
|
||||
,regSet => "[prep|exec] <regName> <value> ... [<peerChannel>]"
|
||||
,clear => "[readings|trigger|register|rssi|msgEvents|all]"
|
||||
,clear => "[readings|trigger|register|rssi|msgEvents|attack|all]"
|
||||
);
|
||||
%culHmGlobalSetsVrtDev = (# virtuals and devices without subtype
|
||||
raw => "data ..."
|
||||
@ -1605,6 +1605,7 @@ $culHmModelSets{"HM-RC-Dis-H-x-EU"} = $culHmModelSets{"HM-PB-4DIS-WM"};
|
||||
,hmPairForSec =>"<sec>"
|
||||
,hmPairSerial =>"<serial>"
|
||||
,defIgnUnknown=>""
|
||||
,assignIO =>"<IO> [set|unset]..."
|
||||
}
|
||||
);
|
||||
# clones- - - - - - - - - - - - - - - - -
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user