mirror of
https://github.com/fhem/fhem-mirror.git
synced 2025-03-04 05:16:45 +00:00
10_EnOcean: autocreate teach-in modified
git-svn-id: https://svn.fhem.de/fhem/trunk@9328 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
klaus-schauer
parent
60745216da
commit
d6d7dd61ce
@ -576,47 +576,45 @@ EnOcean_Define($$)
|
||||
return "wrong syntax: define <name> EnOcean <8-digit-hex-code>|getNextID|<EEP>";
|
||||
}
|
||||
# autocreate subType from RORG
|
||||
$attr{$name}{subType} = $1 if($name =~ m/EnO_(.*)_$def/);
|
||||
if (@a == 4) {
|
||||
if (@a == 4 && $name =~ m/EnO_$def/) {
|
||||
# parse received device data
|
||||
$hash->{DEF} = $def;
|
||||
if (exists $attr{$name}{subType}) {
|
||||
my ($data, $status);
|
||||
(undef, undef, undef, $data, undef, $status, undef) = split(':', $a[3]);
|
||||
if ($attr{$name}{subType} eq "switch") {
|
||||
my $nu = (hex($status) & 0x10) >> 4;
|
||||
my $t21 = (hex($status) & 0x20) >> 5;
|
||||
$attr{$name}{manufID} = "7FF";
|
||||
if ($t21 && $nu) {
|
||||
$attr{$name}{eep} = "F6-02-01";
|
||||
readingsSingleUpdate($hash, "teach", "RPS teach-in accepted EEP F6-02-01 Manufacturer: no ID", 1);
|
||||
Log3 $name, 2, "EnOcean $name teach-in EEP F6-02-01 Manufacturer: no ID";
|
||||
} elsif (!$t21 && $nu) {
|
||||
$attr{$name}{eep} = "F6-03-01";
|
||||
readingsSingleUpdate($hash, "teach", "RPS teach-in accepted EEP F6-03-01 Manufacturer: no ID", 1);
|
||||
Log3 $name, 2, "EnOcean $name teach-in EEP F6-03-01 Manufacturer: no ID";
|
||||
}
|
||||
} elsif ($attr{$name}{subType} eq "contact" && hex($data) & 8) {
|
||||
$attr{$name}{eep} = "D5-00-01";
|
||||
$attr{$name}{manufID} = "7FF";
|
||||
readingsSingleUpdate($hash, "teach", "1BS teach-in accepted EEP D5-00-01 Manufacturer: no ID", 1);
|
||||
Log3 $name, 2, "EnOcean $name teach-in EEP D5-00-01 Manufacturer: no ID";
|
||||
} elsif ($attr{$name}{subType} eq "4BS" && hex(substr($data, 6, 2)) & 8) {
|
||||
readingsSingleUpdate($hash, "teach", "4BS teach-in is missing", 1);
|
||||
Log3 $name, 2, "EnOcean $name teach-in is missing";
|
||||
} elsif ($attr{$name}{subType} eq "VLD") {
|
||||
readingsSingleUpdate($hash, "teach", "UTE teach-in is missing", 1);
|
||||
Log3 $name, 2, "EnOcean $name teach-in is missing";
|
||||
} elsif ($attr{$name}{subType} eq "MSC") {
|
||||
readingsSingleUpdate($hash, "teach", "MSC teach-in not supported", 1);
|
||||
Log3 $name, 2, "EnOcean $name MSC not supported";
|
||||
} elsif ($attr{$name}{subType} =~ m/^SEC|ENC$/) {
|
||||
readingsSingleUpdate($hash, "teach", "STE teach-in is missing", 1);
|
||||
Log3 $name, 2, "EnOcean $name secure teach-in is missing";
|
||||
} elsif ($attr{$name}{subType} =~ m/^GPCD|GPSD$/) {
|
||||
readingsSingleUpdate($hash, "teach", "GP teach-in is missing", 1);
|
||||
Log3 $name, 2, "EnOcean $name teach-in is missing";
|
||||
}
|
||||
my ($data, $rorg, $status);
|
||||
(undef, undef, $rorg, $data, undef, $status, undef) = split(':', $a[3]);
|
||||
$attr{$name}{subType} = $EnO_rorgname{$rorg};
|
||||
if ($attr{$name}{subType} eq "switch") {
|
||||
my $nu = (hex($status) & 0x10) >> 4;
|
||||
my $t21 = (hex($status) & 0x20) >> 5;
|
||||
$attr{$name}{manufID} = "7FF";
|
||||
if ($t21 && $nu) {
|
||||
$attr{$name}{eep} = "F6-02-01";
|
||||
readingsSingleUpdate($hash, "teach", "RPS teach-in accepted EEP F6-02-01 Manufacturer: no ID", 1);
|
||||
Log3 $name, 2, "EnOcean $name teach-in EEP F6-02-01 Manufacturer: no ID";
|
||||
} elsif (!$t21 && $nu) {
|
||||
$attr{$name}{eep} = "F6-03-01";
|
||||
readingsSingleUpdate($hash, "teach", "RPS teach-in accepted EEP F6-03-01 Manufacturer: no ID", 1);
|
||||
Log3 $name, 2, "EnOcean $name teach-in EEP F6-03-01 Manufacturer: no ID";
|
||||
}
|
||||
} elsif ($attr{$name}{subType} eq "contact" && hex($data) & 8) {
|
||||
$attr{$name}{eep} = "D5-00-01";
|
||||
$attr{$name}{manufID} = "7FF";
|
||||
readingsSingleUpdate($hash, "teach", "1BS teach-in accepted EEP D5-00-01 Manufacturer: no ID", 1);
|
||||
Log3 $name, 2, "EnOcean $name teach-in EEP D5-00-01 Manufacturer: no ID";
|
||||
} elsif ($attr{$name}{subType} eq "4BS" && hex(substr($data, 6, 2)) & 8) {
|
||||
readingsSingleUpdate($hash, "teach", "4BS teach-in is missing", 1);
|
||||
Log3 $name, 2, "EnOcean $name teach-in is missing";
|
||||
} elsif ($attr{$name}{subType} eq "VLD") {
|
||||
readingsSingleUpdate($hash, "teach", "UTE teach-in is missing", 1);
|
||||
Log3 $name, 2, "EnOcean $name teach-in is missing";
|
||||
} elsif ($attr{$name}{subType} eq "MSC") {
|
||||
readingsSingleUpdate($hash, "teach", "MSC not supported", 1);
|
||||
Log3 $name, 2, "EnOcean $name MSC not supported";
|
||||
} elsif ($attr{$name}{subType} =~ m/^SEC|ENC$/) {
|
||||
readingsSingleUpdate($hash, "teach", "STE teach-in is missing", 1);
|
||||
Log3 $name, 2, "EnOcean $name secure teach-in is missing";
|
||||
} elsif ($attr{$name}{subType} =~ m/^GPCD|GPSD$/) {
|
||||
readingsSingleUpdate($hash, "teach", "GP teach-in is missing", 1);
|
||||
Log3 $name, 2, "EnOcean $name teach-in is missing";
|
||||
}
|
||||
EnOcean_Parse($hash, $a[3]);
|
||||
}
|
||||
@ -4563,10 +4561,10 @@ sub EnOcean_Parse($$)
|
||||
if (exists($iohash->{helper}{gpRespWait}{$destinationID}) ||
|
||||
exists($iohash->{helper}{UTERespWait}{$destinationID}) ||
|
||||
exists($iohash->{helper}{"4BSRespWait"}{$destinationID})) {
|
||||
$ret = "UNDEFINED EnO_${rorgname}_$senderID EnOcean $senderID $msg";
|
||||
#$ret = "UNDEFINED -temporary EnO_${rorgname}_$senderID EnOcean $senderID $msg";
|
||||
$ret = "UNDEFINED EnO_$senderID EnOcean $senderID $msg";
|
||||
#$ret = "UNDEFINED -temporary EnO_$senderID EnOcean $senderID $msg";
|
||||
} else {
|
||||
$ret = "UNDEFINED EnO_${rorgname}_$senderID EnOcean $senderID $msg";
|
||||
$ret = "UNDEFINED EnO_$senderID EnOcean $senderID $msg";
|
||||
}
|
||||
if ($rorgname =~ m/^GPCD|GPSD$/) {
|
||||
Log3 undef, 4, "EnOcean Unknown GP device with SenderID $senderID and $rorgname telegram, please define it.";
|
||||
@ -5394,7 +5392,7 @@ sub EnOcean_Parse($$)
|
||||
$fspeed = 1 if ($db[3] >= 165);
|
||||
$fspeed = 0 if ($db[3] >= 190);
|
||||
$fspeed = "auto" if ($db[3] >= 210);
|
||||
my $switch = $db[0] & 1;
|
||||
my $switch = $db[0] & 1 ? "on" : "off";
|
||||
push @event, "3:state:T: $temp SP: $db[2] F: $fspeed SW: $switch";
|
||||
push @event, "3:fanStage:$fspeed";
|
||||
push @event, "3:switch:$switch";
|
||||
@ -8673,46 +8671,47 @@ sub EnOcean_Notify(@)
|
||||
|
||||
} elsif ($devName eq "global" && $s =~ m/^DEFINED ([^ ]*)$/) {
|
||||
my $definedName = $1;
|
||||
if ($definedName =~ m/FileLog_EnO_(.*)_(.*)/) {
|
||||
if ($definedName =~ m/FileLog_(EnO_.*)/) {
|
||||
# teach-in response actions
|
||||
# delete temporary teach-in response device
|
||||
my $rorgName = $1;
|
||||
$definedName = $1;
|
||||
my $rorgName = AttrVal($definedName, "subType", '');
|
||||
if (defined $hash->{IODev}{helper}{UTERespWaitDel}{$name} && $rorgName eq "UTE") {
|
||||
CommandDelete(undef, substr($definedName, 8));
|
||||
CommandDelete(undef, $definedName);
|
||||
delete $hash->{IODev}{helper}{UTERespWaitDel}{$name};
|
||||
Log3 $name, 2, "EnOcean $name UTE temporary teach-in response device " . substr($definedName, 8) . " deleted";
|
||||
Log3 $name, 2, "EnOcean $name UTE temporary teach-in response device " . $definedName . " deleted";
|
||||
EnOcean_CommandSave(undef, undef);
|
||||
#CommandRereadCfg(undef, undef);
|
||||
#####
|
||||
#delete $hash->{IODev}{helper}{UTERespWaitDel}{$name};
|
||||
#Log3 $name, 2, "EnOcean $name UTE temporary teach-in response device " . substr($definedName, 8) . " deleted";
|
||||
#my %functionHash = (hash => $hash, function => "delete", deleteDevice => substr($definedName, 8), oldDevice => undef);
|
||||
#Log3 $name, 2, "EnOcean $name UTE temporary teach-in response device " . $definedName . " deleted";
|
||||
#my %functionHash = (hash => $hash, function => "delete", deleteDevice => $definedName, oldDevice => undef);
|
||||
#RemoveInternalTimer(\%functionHash);
|
||||
#InternalTimer(gettimeofday() + 0.1, "EnOcean_CommandDelete", \%functionHash, 0);
|
||||
}
|
||||
if (defined $hash->{IODev}{helper}{"4BSRespWaitDel"}{$name} && $rorgName eq "4BS") {
|
||||
CommandDelete(undef, substr($definedName, 8));
|
||||
CommandDelete(undef, $definedName);
|
||||
delete $hash->{IODev}{helper}{"4BSRespWaitDel"}{$name};
|
||||
Log3 $name, 2, "EnOcean $name 4BS temporary teach-in response device " . substr($definedName, 8) . " deleted";
|
||||
Log3 $name, 2, "EnOcean $name 4BS temporary teach-in response device " . $definedName . " deleted";
|
||||
EnOcean_CommandSave(undef, undef);
|
||||
#CommandRereadCfg(undef, undef);
|
||||
#####
|
||||
#delete $hash->{IODev}{helper}{"4BSRespWaitDel"}{$name};
|
||||
#Log3 $name, 2, "EnOcean $name 4BS temporary teach-in response device " . substr($definedName, 8) . " deleted";
|
||||
#my %functionHash = (hash => $hash, function => "delete", deleteDevice => substr($definedName, 8), oldDevice => undef);
|
||||
#Log3 $name, 2, "EnOcean $name 4BS temporary teach-in response device " . $definedName . " deleted";
|
||||
#my %functionHash = (hash => $hash, function => "delete", deleteDevice => $definedName, oldDevice => undef);
|
||||
#RemoveInternalTimer(\%functionHash);
|
||||
#InternalTimer(gettimeofday() + 0.1, "EnOcean_CommandDelete", \%functionHash, 0);
|
||||
}
|
||||
if (defined $hash->{IODev}{helper}{gpRespWaitDel}{$name} && $rorgName eq "GPTR") {
|
||||
CommandDelete(undef, substr($definedName, 8));
|
||||
CommandDelete(undef, $definedName);
|
||||
delete $hash->{IODev}{helper}{gpRespWaitDel}{$name};
|
||||
Log3 $name, 2, "EnOcean $name GP temporary teach-in response device " . substr($definedName, 8) . " deleted";
|
||||
Log3 $name, 2, "EnOcean $name GP temporary teach-in response device " . $definedName . " deleted";
|
||||
EnOcean_CommandSave(undef, undef);
|
||||
#CommandRereadCfg(undef, undef);
|
||||
#####
|
||||
#delete $hash->{IODev}{helper}{gpRespWaitDel}{$name};
|
||||
#Log3 $name, 2, "EnOcean $name GP temporary teach-in response device " . substr($definedName, 8) . " deleted";
|
||||
#my %functionHash = (hash => $hash, function => "delete", deleteDevice => substr($definedName, 8), oldDevice => undef);
|
||||
#Log3 $name, 2, "EnOcean $name GP temporary teach-in response device " . $definedName . " deleted";
|
||||
#my %functionHash = (hash => $hash, function => "delete", deleteDevice => $definedName, oldDevice => undef);
|
||||
#RemoveInternalTimer(\%functionHash);
|
||||
#InternalTimer(gettimeofday() + 0.1, "EnOcean_CommandDelete", \%functionHash, 0);
|
||||
}
|
||||
@ -13239,11 +13238,11 @@ EnOcean_Undef($$)
|
||||
<ul>
|
||||
<li>T: t/°C SP: 0 ... 255 F: 0|1|2|3|auto SW: 0|1</li>
|
||||
<li>fanStage: 0|1|2|3|auto</li>
|
||||
<li>switch: 0|1</li>
|
||||
<li>switch: on|off</li>
|
||||
<li>setpoint: 0 ... 255</li>
|
||||
<li>setpointScaled: <floating-point number></li>
|
||||
<li>temperature: t/°C (Sensor Range: t = 0 °C ... 40 °C)</li>
|
||||
<li>state: T: t/°C SP: 0 ... 255 F: 0|1|2|3|auto SW: 0|1</li><br>
|
||||
<li>state: T: t/°C SP: 0 ... 255 F: 0|1|2|3|auto SW: on|off</li><br>
|
||||
Alternatively for Eltako devices
|
||||
<li>T: t/°C SPT: t/°C NR: t/°C</li>
|
||||
<li>block: lock|unlock</li>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user