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

Merge branch 'patch-implemntationAllModelAndFunctions' into patch-discoveryAuthorization

Browse Source
This commit is contained in:
Marko Oldenburg 2021-11-27 22:57:15 +01:00
commit efbea2f987
3 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
controls_NukiSmart.txt
View File

@ -1,4 +1,4 @@
UPD 2021-11-27_21:36:20 9217 FHEM/73_NUKIBridge.pm UPD 2021-11-27_22:52:03 9217 FHEM/73_NUKIBridge.pm
UPD 2021-11-27_21:36:27 7569 FHEM/74_NUKIDevice.pm UPD 2021-11-27_21:36:27 7569 FHEM/74_NUKIDevice.pm
UPD 2021-11-27_21:36:20 40112 lib/FHEM/Devices/Nuki/Bridge.pm UPD 2021-11-27_22:52:20 40367 lib/FHEM/Devices/Nuki/Bridge.pm
UPD 2021-11-27_21:36:59 15467 lib/FHEM/Devices/Nuki/Device.pm UPD 2021-11-27_22:56:00 15826 lib/FHEM/Devices/Nuki/Device.pm

8
lib/FHEM/Devices/Nuki/Bridge.pm
View File

@ -501,7 +501,14 @@ sub GetCheckBridgeAlive {
if ( !::IsDisabled($name) if ( !::IsDisabled($name)
&& $hash->{helper}->{iowrite} == 0 ) && $hash->{helper}->{iowrite} == 0 )
{ {
if ( $hash->{helper}->{runInfo} == 0 ) {
Write( $hash, 'info', undef ); Write( $hash, 'info', undef );
$hash->{helper}->{runInfo} = 1;
}
else {
Write( $hash, 'list', undef );
$hash->{helper}->{runInfo} = 0;
}
::Log3( $name, 4, "NUKIBridge ($name) - run Write" ); ::Log3( $name, 4, "NUKIBridge ($name) - run Write" );
} }
@ -521,6 +528,7 @@ sub FirstRun {
Write( $hash, 'list', undef ) Write( $hash, 'list', undef )
if ( !::IsDisabled($name) ); if ( !::IsDisabled($name) );
$hash->{helper}->{runInfo} = 0;
return ::InternalTimer( ::gettimeofday() + 5, return ::InternalTimer( ::gettimeofday() + 5,
\&FHEM::Devices::Nuki::Bridge::GetCheckBridgeAlive, $hash ); \&FHEM::Devices::Nuki::Bridge::GetCheckBridgeAlive, $hash );
} }

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

@ -111,6 +111,9 @@ my %deviceTypes = (
4 => 'smartlock3' 4 => 'smartlock3'
); );
my %deviceTypeIds = reverse(%deviceTypes);
my %modes = ( my %modes = (
2 => { 2 => {
0 => 'door mode', 0 => 'door mode',
@ -180,7 +183,14 @@ my %lockStates = (
} }
); );
my %deviceTypeIds = reverse(%deviceTypes); my %doorsensorStates = (
1 => 'deactivated',
2 => 'door closed',
3 => 'door opened',
4 => 'door state unknown',
5 => 'calibrating'
);
sub Define { sub Define {
my $hash = shift; my $hash = shift;
@ -205,6 +215,7 @@ sub Define {
$hash->{STATE} = 'Initialized'; $hash->{STATE} = 'Initialized';
$hash->{NOTIFYDEV} = 'global,autocreate,' . $name; $hash->{NOTIFYDEV} = 'global,autocreate,' . $name;
my $iodev = ::AttrVal( $name, 'IODev', 'none' ); my $iodev = ::AttrVal( $name, 'IODev', 'none' );
::AssignIoPort( $hash, $iodev ) if ( !$hash->{IODev} ); ::AssignIoPort( $hash, $iodev ) if ( !$hash->{IODev} );
@ -543,7 +554,10 @@ sub WriteReadings {
&& $t ne 'batteryCritical' && $t ne 'batteryCritical'
&& $t ne 'batteryChargeState' && $t ne 'batteryChargeState'
&& $t ne 'batteryCharging' && $t ne 'batteryCharging'
&& $t ne 'timestamp' ); && $t ne 'timestamp'
&& $t ne 'doorsensorState'
&& $t ne 'doorsensorStateName' );
::readingsBulkUpdate( ::readingsBulkUpdate(
$hash, $t, $hash, $t,
@ -560,6 +574,9 @@ sub WriteReadings {
::readingsBulkUpdate( $hash, $t, $deviceTypes{$v} ) ::readingsBulkUpdate( $hash, $t, $deviceTypes{$v} )
if ( $t eq 'deviceType' ); if ( $t eq 'deviceType' );
::readingsBulkUpdate( $hash, $t, $doorsensorStates{$v} )
if ( $t eq 'doorsensorState' );
::readingsBulkUpdate( $hash, $t, ( $v == 1 ? 'true' : 'false' ) ) ::readingsBulkUpdate( $hash, $t, ( $v == 1 ? 'true' : 'false' ) )
if ( $t eq 'paired' ); if ( $t eq 'paired' );