FHEM/mod-NUKI
1
0
Fork 0
Code Issues Pull Requests Releases 3 Wiki Activity

Merge branch 'devel' into patch-discoveryAuthorization

Browse Source
This commit is contained in:
Marko Oldenburg 2021-11-27 21:38:11 +01:00
commit e87f03fe63
3 changed files with 7 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
FHEM/74_NUKIDevice.pm
View File

@ -50,7 +50,7 @@ sub Initialize($) {
$hash->{AttrList} = $hash->{AttrList} =
'IODev ' 'IODev '
. 'model:opener,smartlock ' . 'model:smartlock,opener,smartdoor,smartlock3 '
. 'disable:1 ' . 'disable:1 '
. $::readingFnAttributes; . $::readingFnAttributes;

8
controls_NukiSmart.txt
View File

@ -1,4 +1,4 @@
UPD 2021-11-27_18:39:55 9217 FHEM/73_NUKIBridge.pm UPD 2021-11-27_21:36:20 9217 FHEM/73_NUKIBridge.pm
UPD 2021-11-27_18:40:10 7548 FHEM/74_NUKIDevice.pm UPD 2021-11-27_21:36:27 7569 FHEM/74_NUKIDevice.pm
UPD 2021-11-27_18:39:14 40112 lib/FHEM/Devices/Nuki/Bridge.pm UPD 2021-11-27_21:36:20 40112 lib/FHEM/Devices/Nuki/Bridge.pm
UPD 2021-11-27_18:44:10 16135 lib/FHEM/Devices/Nuki/Device.pm UPD 2021-11-27_21:36:59 15467 lib/FHEM/Devices/Nuki/Device.pm

19
lib/FHEM/Devices/Nuki/Device.pm
View File

@ -107,7 +107,8 @@ if ($@) {
my %deviceTypes = ( my %deviceTypes = (
0 => 'smartlock', 0 => 'smartlock',
2 => 'opener', 2 => 'opener',
4 => 'smartlockNG' 3 => 'smartdoor',
4 => 'smartlock3'
); );
my %modes = ( my %modes = (
@ -448,22 +449,6 @@ sub Parse {
"NUKIDevice ($name) - find logical device: $hash->{NAME}" ); "NUKIDevice ($name) - find logical device: $hash->{NAME}" );
return $hash->{NAME}; return $hash->{NAME};
##################
## Zwischenlösung so für die Umstellung, kann später gelöscht werden
# if ( ::AttrVal( $name, 'model', '' ) eq '' ) {
# ::CommandDefMod( undef,
# $name
# . ' NUKIDevice '
# . $hash->{NUKIID} . ' '
# . $decode_json->{deviceType} );
# ::CommandAttr( undef,
# $name
# . ' model '
# . $deviceTypes{ $decode_json->{deviceType} } );
# ::Log3( $name, 2, "NUKIDevice ($name) - redefined Defmod" );
# }
} }
else { else {
::Log3( $name, 4, ::Log3( $name, 4,