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

Merge pull request 'change model name for smartlock 3.0 api conform. fix little bugs' (#10) from patch-changeModel into devel

Browse Source 
Reviewed-on: #10
This commit is contained in:
Marko Oldenburg
2021-11-27 21:35:05 +01:00
parent 681e944b44 05e5322b42
commit de2ecf664f
3 changed files with 7 additions and 23 deletions
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:02:39 9224 FHEM/73_NUKIBridge.pm UPD 2021-11-27_21:26:06 9224 FHEM/73_NUKIBridge.pm
UPD 2021-11-27_18:01:59 7548 FHEM/74_NUKIDevice.pm UPD 2021-11-27_21:30:28 7569 FHEM/74_NUKIDevice.pm
UPD 2021-11-27_18:08:11 40444 lib/FHEM/Devices/Nuki/Bridge.pm UPD 2021-11-27_21:26:06 40444 lib/FHEM/Devices/Nuki/Bridge.pm
UPD 2021-11-27_15:28:59 15728 lib/FHEM/Devices/Nuki/Device.pm UPD 2021-11-27_21:32:02 15123 lib/FHEM/Devices/Nuki/Device.pm

20
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,23 +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,