FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-08 13:24:56 +00:00
Code Issues Releases Wiki Activity

10_EnOcean: subType manufProfile changed

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@11956 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
klaus-schauer 2016-08-13 16:11:03 +00:00
parent 5e6608be1b
commit 084246e576
1 changed files with 31 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
fhem/FHEM/10_EnOcean.pm
View File

@ -352,7 +352,7 @@ my %EnO_eepConfig = (
"G5.38.08" => {attr => {subType => "gateway", eep => "A5-38-08", gwCmd => "dimming", manufID => "00D", webCmd => "on:off:dim"}, GPLOT => "EnO_dim4:Dim,"}, "G5.38.08" => {attr => {subType => "gateway", eep => "A5-38-08", gwCmd => "dimming", manufID => "00D", webCmd => "on:off:dim"}, GPLOT => "EnO_dim4:Dim,"},
"H5.38.08" => {attr => {subType => "gateway", comMode => "confirm", eep => "A5-38-08", gwCmd => "dimming", manufID => "00D", model => "TF", teachMethod => "confirm", webCmd => "on:off:dim"}, GPLOT => "EnO_dim4:Dim,"}, "H5.38.08" => {attr => {subType => "gateway", comMode => "confirm", eep => "A5-38-08", gwCmd => "dimming", manufID => "00D", model => "TF", teachMethod => "confirm", webCmd => "on:off:dim"}, GPLOT => "EnO_dim4:Dim,"},
"G5.3F.7F" => {attr => {subType => "manufProfile", eep => "A5-3F-7F", manufID => "00D", webCmd => "opens:stop:closes"}}, "G5.3F.7F" => {attr => {subType => "manufProfile", eep => "A5-3F-7F", manufID => "00D", webCmd => "opens:stop:closes"}},
"H5.3F.7F" => {attr => {subType => "manufProfile", comMode => "confirm", eep => "A5-3F-7F", manufID => "00D", model => "TF", sensorMode => 'pushbutton', teachMethod => "confirm", webCmd => "opens:stop:closes"}}, "H5.3F.7F" => {attr => {subType => "manufProfile", comMode => "confirm", eep => "A5-3F-7F", manufID => "00D", model => "TF", sensorMode => 'pushbutton', settingAccuracy => "high", teachMethod => "confirm", webCmd => "opens:stop:closes"}},
"M5.38.08" => {attr => {subType => "gateway", eep => "A5-38-08", gwCmd => "switching", manufID => "00D", webCmd => "on:off"}}, "M5.38.08" => {attr => {subType => "gateway", eep => "A5-38-08", gwCmd => "switching", manufID => "00D", webCmd => "on:off"}},
"N5.38.08" => {attr => {subType => "gateway", comMode => "confirm", eep => "A5-38-08", gwCmd => "switching", manufID => "00D", model => "TF", teachMethod => "confirm", webCmd => "on:off"}}, "N5.38.08" => {attr => {subType => "gateway", comMode => "confirm", eep => "A5-38-08", gwCmd => "switching", manufID => "00D", model => "TF", teachMethod => "confirm", webCmd => "on:off"}},
"G5.ZZ.ZZ" => {attr => {subType => "PM101", manufID => "005"}, GPLOT => "EnO_motion:Motion,EnO_brightness4:Brightness,"}, "G5.ZZ.ZZ" => {attr => {subType => "PM101", manufID => "005"}, GPLOT => "EnO_motion:Motion,EnO_brightness4:Brightness,"},
@ -665,7 +665,8 @@ EnOcean_Initialize($)
"reposition:directly,opens,closes rltRepeat:16,32,64,128,256 rltType:1BS,4BS " . "reposition:directly,opens,closes rltRepeat:16,32,64,128,256 rltType:1BS,4BS " .
"scaleDecimals:0,1,2,3,4,5,6,7,8,9 scaleMax scaleMin secMode:rcv,snd,bidir " . "scaleDecimals:0,1,2,3,4,5,6,7,8,9 scaleMax scaleMin secMode:rcv,snd,bidir " .
"secLevel:encapsulation,encryption,off sendDevStatus:no,yes sensorMode:switch,pushbutton " . "secLevel:encapsulation,encryption,off sendDevStatus:no,yes sensorMode:switch,pushbutton " .
"serviceOn:no,yes setpointRefDev setpointSummerMode:slider,0,5,100 setpointTempRefDev shutTime shutTimeCloses subDef " . "serviceOn:no,yes settingAccuracy:high,low setpointRefDev setpointSummerMode:slider,0,5,100 " .
"setpointTempRefDev shutTime shutTimeCloses subDef " .
"subDef0 subDefI subDefA subDefB subDefC subDefD subDefH subDefW " . "subDef0 subDefI subDefA subDefB subDefC subDefD subDefH subDefW " .
"subType:$subTypeList subTypeSet:$subTypeList subTypeReading:$subTypeList " . "subType:$subTypeList subTypeSet:$subTypeList subTypeReading:$subTypeList " .
"summerMode:off,on switchMode:switch,pushbutton " . "summerMode:off,on switchMode:switch,pushbutton " .
@ -3917,6 +3918,12 @@ sub EnOcean_Set($@)
my $angleTime = AttrVal($name, "angleTime", 0); my $angleTime = AttrVal($name, "angleTime", 0);
my $position = ReadingsVal($name, "position", undef); my $position = ReadingsVal($name, "position", undef);
my $positionStart; my $positionStart;
my $setCmd = 8;
my $settingAccuracy = 1;
if (AttrVal($name, 'settingAccuracy', 'low') eq 'high') {
$setCmd = 0x0A;
$settingAccuracy = 10;
}
if ($cmd eq "?" || $cmd eq "stop") { if ($cmd eq "?" || $cmd eq "stop") {
} else { } else {
@ -4038,7 +4045,7 @@ sub EnOcean_Set($@)
} elsif ($cmd eq "down") { } elsif ($cmd eq "down") {
# down # down
if (defined $a[1]) { if (defined $a[1]) {
if ($a[1] =~ m/^[+-]?\d+$/ && $a[1] >= 0 && $a[1] < 255) { if ($a[1] =~ m/^[+-]?\d+$/ && $a[1] >= 0 && $a[1] <= 255) {
$position = $positionStart + $a[1] / $shutTime * 100; $position = $positionStart + $a[1] / $shutTime * 100;
if ($angleTime) { if ($angleTime) {
$anglePos = $anglePosStart + ($angleMax - $angleMin) * $a[1] / $angleTime; $anglePos = $anglePosStart + ($angleMax - $angleMin) * $a[1] / $angleTime;
@ -4097,8 +4104,8 @@ sub EnOcean_Set($@)
$angleTime = $angleTime * ($angleMax - $anglePos) / ($angleMax - $angleMin); $angleTime = $angleTime * ($angleMax - $anglePos) / ($angleMax - $angleMin);
$shutTime = $shutTime * ($a[1] - $positionStart) / 100 + $angleTime; $shutTime = $shutTime * ($a[1] - $positionStart) / 100 + $angleTime;
# round up # round up
$angleTime = int($angleTime) + 1 if ($angleTime > int($angleTime)); $angleTime = int($angleTime) + 1 if ($settingAccuracy == 1 && $angleTime > int($angleTime));
$shutTime = int($shutTime) + 1 if ($shutTime > int($shutTime)); $shutTime = int($shutTime) + 1 if ($settingAccuracy == 1 && $shutTime > int($shutTime));
$position = $a[1] + $angleTime / $shutTimeSet * 100; $position = $a[1] + $angleTime / $shutTimeSet * 100;
if ($position >= 100) { if ($position >= 100) {
$position = 100; $position = 100;
@ -4114,8 +4121,8 @@ sub EnOcean_Set($@)
$angleTime = $angleTime * ($anglePos - $angleMin) /($angleMax - $angleMin); $angleTime = $angleTime * ($anglePos - $angleMin) /($angleMax - $angleMin);
$shutTime = $shutTime * ($positionStart - $a[1]) / 100 + $angleTime; $shutTime = $shutTime * ($positionStart - $a[1]) / 100 + $angleTime;
# round up # round up
$angleTime = int($angleTime) + 1 if ($angleTime > int($angleTime)); $angleTime = int($angleTime) + 1 if ($settingAccuracy == 1 && $angleTime > int($angleTime));
$shutTime = int($shutTime) + 1 if ($shutTime > int($shutTime)); $shutTime = int($shutTime) + 1 if ($settingAccuracy == 1 && $shutTime > int($shutTime));
$position = $a[1] - $angleTime / $shutTimeSet * 100; $position = $a[1] - $angleTime / $shutTimeSet * 100;
if ($position <= 0) { if ($position <= 0) {
$position = 0; $position = 0;
@ -4132,13 +4139,13 @@ sub EnOcean_Set($@)
# up >> reduce slats angle # up >> reduce slats angle
$shutTime = $angleTime * ($anglePosStart - $anglePos)/($angleMax - $angleMin); $shutTime = $angleTime * ($anglePosStart - $anglePos)/($angleMax - $angleMin);
# round up # round up
$shutTime = int($shutTime) + 1 if ($shutTime > int($shutTime)); $shutTime = int($shutTime) + 1 if ($settingAccuracy == 1 && $shutTime > int($shutTime));
$shutCmd = 1; $shutCmd = 1;
} elsif ($anglePosStart < $anglePos) { } elsif ($anglePosStart < $anglePos) {
# down >> enlarge slats angle # down >> enlarge slats angle
$shutTime = $angleTime * ($anglePos - $anglePosStart) /($angleMax - $angleMin); $shutTime = $angleTime * ($anglePos - $anglePosStart) /($angleMax - $angleMin);
# round up # round up
$shutTime = int($shutTime) + 1 if ($shutTime > int($shutTime)); $shutTime = int($shutTime) + 1 if ($settingAccuracy == 1 && $shutTime > int($shutTime));
$shutCmd = 2; $shutCmd = 2;
} else { } else {
# position and slats angle ok # position and slats angle ok
@ -4178,13 +4185,13 @@ sub EnOcean_Set($@)
# up >> reduce slats angle # up >> reduce slats angle
$shutTime = $angleTime * ($anglePosStart - $anglePos)/($angleMax - $angleMin); $shutTime = $angleTime * ($anglePosStart - $anglePos)/($angleMax - $angleMin);
# round up # round up
$shutTime = int($shutTime) + 1 if ($shutTime > int($shutTime)); $shutTime = int($shutTime) + 1 if ($settingAccuracy == 1 && $shutTime > int($shutTime));
$shutCmd = 1; $shutCmd = 1;
} elsif ($anglePosStart < $anglePos) { } elsif ($anglePosStart < $anglePos) {
# down >> enlarge slats angle # down >> enlarge slats angle
$shutTime = $angleTime * ($anglePos - $anglePosStart) /($angleMax - $angleMin); $shutTime = $angleTime * ($anglePos - $anglePosStart) /($angleMax - $angleMin);
# round up # round up
$shutTime = int($shutTime) + 1 if ($shutTime > int($shutTime)); $shutTime = int($shutTime) + 1 if ($settingAccuracy == 1 && $shutTime > int($shutTime));
$shutCmd = 2; $shutCmd = 2;
} else { } else {
# slats angle ok # slats angle ok
@ -4201,7 +4208,6 @@ sub EnOcean_Set($@)
} }
} }
} elsif ($cmd eq "local") { } elsif ($cmd eq "local") {
my $setCmd = 8;
if ($a[1]) { if ($a[1]) {
return "Usage: $cmd [learn]" if ($a[1] ne "learn"); return "Usage: $cmd [learn]" if ($a[1] ne "learn");
if ($a[1] eq "learn") { if ($a[1] eq "learn") {
@ -4210,14 +4216,14 @@ sub EnOcean_Set($@)
shift(@a); shift(@a);
} }
$updateState = 0; $updateState = 0;
$data = sprintf "%02X%02X%02X%02X", 0, $shutTime, $shutCmd, $setCmd; $data = sprintf "%04X%02X%02X", int($shutTime * $settingAccuracy), $shutCmd, $setCmd;
} else { } else {
return "Unknown argument " . $cmd . ", choose one of " . $cmdList . "position:slider,0,5,100 anglePos:slider,-180,5,180 closes:noArg down local:learn opens:noArg stop:noArg teach:noArg up" return "Unknown argument " . $cmd . ", choose one of " . $cmdList . "position:slider,0,5,100 anglePos:slider,-180,5,180 closes:noArg down local:learn opens:noArg stop:noArg teach:noArg up"
} }
if ($shutCmd || $cmd eq "stop") { if ($shutCmd || $cmd eq "stop") {
#$updateState = 0; #$updateState = 0;
$data = sprintf "%02X%02X%02X%02X", 0, $shutTime, $shutCmd, 8; $data = sprintf "%04X%02X%02X", int($shutTime * $settingAccuracy), $shutCmd, $setCmd;
} }
Log3 $name, 3, "EnOcean set $name $cmd"; Log3 $name, 3, "EnOcean set $name $cmd";
} }
@ -16966,7 +16972,7 @@ EnOcean_Delete($$)
<li>up tu/s<br> <li>up tu/s<br>
issue roll up command</li> issue roll up command</li>
</ul><br> </ul><br>
Runtime Range: tu|td = 1 s ... 255 s<br> Run-time Range: tu|td = 1 s ... 255 s<br>
Position Range: position = 0 % ... 100 %<br> Position Range: position = 0 % ... 100 %<br>
Slat Angle Range: &alpha; = -180 &#176 ... 180 &#176<br> Slat Angle Range: &alpha; = -180 &#176 ... 180 &#176<br>
Angle Time Range: ta = 0 s ... 6 s<br> Angle Time Range: ta = 0 s ... 6 s<br>
@ -16974,8 +16980,8 @@ EnOcean_Delete($$)
<a href="#angleMin">angleMin</a>, <a href="#angleTime">angleTime</a>, <a href="#angleMin">angleMin</a>, <a href="#angleTime">angleTime</a>,
<a href="#shutTime">shutTime</a> and <a href="#shutTimeCloses">shutTimeCloses</a>, <a href="#shutTime">shutTime</a> and <a href="#shutTimeCloses">shutTimeCloses</a>,
are set correctly. are set correctly.
Set attr subType to manufProfile, manufID to 00D and attr model to If <a href="#EnOcean_settingAccuracy">settingAccuracy</a> is set to high, the run-time is sent in 1/10 increments.<br>
FSB14|FSB61|FSB70 manually.<br> Set attr subType to manufProfile, manufID to 00D and attr model to FSB14|FSB61|FSB70|TF manually.<br>
Use the sensor type "Szenentaster/PC" for Eltako devices. Use the sensor type "Szenentaster/PC" for Eltako devices.
</li> </li>
<br><br> <br><br>
@ -17946,15 +17952,15 @@ EnOcean_Delete($$)
<li><a name="EnOcean_sendDevStatus">sendDevStatus</a> no|yes, [sendDevStatus] = no is default.<br> <li><a name="EnOcean_sendDevStatus">sendDevStatus</a> no|yes, [sendDevStatus] = no is default.<br>
Send new status of the device. Send new status of the device.
</li> </li>
<li><a name="EnOcean_serviceOn">serviceOn</a> no|yes,
[serviceOn] = no is default.<br>
Device in Service Mode.
</li>
<li><a name="sensorMode">sensorMode</a> switch|pushbutton, <li><a name="sensorMode">sensorMode</a> switch|pushbutton,
[sensorMode] = switch is default.<br> [sensorMode] = switch is default.<br>
The status "released" will be shown in the reading state if the The status "released" will be shown in the reading state if the
attribute is set to "pushbutton". attribute is set to "pushbutton".
</li> </li>
<li><a name="EnOcean_serviceOn">serviceOn</a> no|yes,
[serviceOn] = no is default.<br>
Device in Service Mode.
</li>
<li><a name="EnOcean_setCmdTrigger">setCmdTrigger</a> man|refDev, [setCmdTrigger] = man is default.<br> <li><a name="EnOcean_setCmdTrigger">setCmdTrigger</a> man|refDev, [setCmdTrigger] = man is default.<br>
Operation mode to send set commands<br> Operation mode to send set commands<br>
If the attribute is set to "refDev", a device-specific set command is sent when the reference device is updated. If the attribute is set to "refDev", a device-specific set command is sent when the reference device is updated.
@ -17973,6 +17979,10 @@ EnOcean_Delete($$)
Name of the device whose reference value is read. The reference values is Name of the device whose reference value is read. The reference values is
the reading setpointTemp. the reading setpointTemp.
</li> </li>
<li><a name="EnOcean_settingAccuracy">settingAccuracy</a> high|low,
[settingAccuracy] = low is default.<br>
set setting accurancy.
</li>
<li><a href="#showtime">showtime</a></li> <li><a href="#showtime">showtime</a></li>
<li><a name="shutTime">shutTime</a> t/s<br> <li><a name="shutTime">shutTime</a> t/s<br>
subType blindsCtrl.00: [shutTime] = 5 ... 300, 300 is default.<br> subType blindsCtrl.00: [shutTime] = 5 ... 300, 300 is default.<br>