Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

10_ZWave.pm: doorlock patch from Andreas (Forum #46614)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@10357 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2016-01-04 11:10:06 +00:00
parent 023d3135ab
commit 640fcc2c1d
1 changed files with 32 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
FHEM/10_ZWave.pm
View File

@ -258,7 +258,8 @@ my %zwave_class = (
ZIP_PORTAL => { id => '61' }, ZIP_PORTAL => { id => '61' },
DOOR_LOCK => { id => '62', # V2 DOOR_LOCK => { id => '62', # V2
set => { doorLockOperation => 'ZWave_DoorLockOperationSet($hash, "%s")', set => { doorLockOperation => 'ZWave_DoorLockOperationSet($hash, "%s")',
doorLockConfiguration =>'ZWave_DoorLockConfigSet($hash, "%s")' }, doorLockConfiguration =>
'ZWave_DoorLockConfigSet($hash, "%s")' },
get => { doorLockOperation => '02', get => { doorLockOperation => '02',
doorLockConfiguration => '05'}, doorLockConfiguration => '05'},
parse => { "..6203(.*)" => 'ZWave_DoorLockOperationReport($hash, $1)', parse => { "..6203(.*)" => 'ZWave_DoorLockOperationReport($hash, $1)',
@ -1524,22 +1525,33 @@ sub
ZWave_DoorLockConfigSet($$) ZWave_DoorLockConfigSet($$)
{ {
# 0x62 V1, V2 # 0x62 V1, V2
# userinput: operationType_dez, handles, seconds_dez # userinput: operationType, ohandles, ihandles, seconds_dez
my ($hash, $arg) = @_; my ($hash, $arg) = @_;
my $name = $hash->{NAME}; my $name = $hash->{NAME};
my @param = split (" ", $arg); if ($arg !~ m/\b(.+)\b \b([01]{4})\b \b([01]{4})\b \b([0-9]+)$/) {
return ("wrong arg, need: operationType handles timeoutSeconds","") #~ Log3 $name, 1, "$name: doorLockConfigurationSet wrong ".
if(@param != 3); #~ "format, see commandref: $arg";
return ("doorLockConfigurationSet: wrong format, see commandref","");
}
return ("wrong operationType: only 1 or 2 allowed","") my $oT;
if (($param[0] < 1) || ($param[0] > 2)); if (lc($1) eq "constant") {
$oT = 1;
} elsif (lc($1) eq "timed") {
$oT = 2;
} else {
return ("wrong operationType: only [constant|timed] is allowed","");
}
return("wrong timeout: 1 - 15239 seconds allowed","") my $handles = ((oct("0b".$2))<<4 | oct("0b".$3));
if ((($param[2]) < 1) || ($param[2]) > 253*60+59);
if (($4 < 1) || ($4) > 15239) { # max. 253 * 60 + 59 seconds
return ("doorLockConfigurationSet: 1-15238 seconds allowed","");
}
return ("", sprintf("04%02x%02x%02x%02x", return ("", sprintf("04%02x%02x%02x%02x",
$param[0],$param[1], int($param[2] / 60) ,($param[2] % 60))); $oT,$handles, int($4 / 60) ,($4 % 60)));
} }
sub sub
@ -3604,13 +3616,15 @@ s2Hex($)
FF = Door secured<br> FF = Door secured<br>
Note: open/close can be used as an alias for 00/FF. Note: open/close can be used as an alias for 00/FF.
</li> </li>
<li>doorLockConfiguration operationType handles timeoutSeconds<br> <li>doorLockConfiguration operationType outsidehandles
insidehandles timeoutSeconds<br>
Set the configuration for the door lock.<br> Set the configuration for the door lock.<br>
operationType: 1=constant operation, 2=timed operation<br> operationType: [constant|timed]<br>
handles: 1 byte: bit 0..3 = outside door handle 1-4, outsidehandle/insidehandle: 4-bit binary field for handle 1-4,
bit 4..7 = inside door handle 1-4, bit=0:handle disabled, bit=1:handle enabled, highest bit is for
bit=0:handle disabled, bit=1:handle enabled.<br> handle 4, lowest bit for handle 1. Example 0110 0001
timeoutSeconds: time out for timed operation (in seconds). = outside handles 3 and 2 are active, inside handle 1 is active<br>
timeoutSeconds: time out for timed operation (in seconds) [1-15239].
</li> </li>
<br><br><b>Class INDICATOR</b> <br><br><b>Class INDICATOR</b>