Merge pull request 'patch-discoveryAuthorization' (#14) from patch-discoveryAuthorization into devel
Reviewed-on: #14
This commit is contained in:
commit
7816ab3119
@ -1,4 +1,4 @@
|
||||
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_22:52:20 40367 lib/FHEM/Devices/Nuki/Bridge.pm
|
||||
UPD 2021-11-27_22:56:00 15826 lib/FHEM/Devices/Nuki/Device.pm
|
||||
UPD 2021-11-28_00:29:42 9217 FHEM/73_NUKIBridge.pm
|
||||
UPD 2021-11-28_00:29:54 7569 FHEM/74_NUKIDevice.pm
|
||||
UPD 2021-11-28_00:30:36 41129 lib/FHEM/Devices/Nuki/Bridge.pm
|
||||
UPD 2021-11-28_00:30:50 15802 lib/FHEM/Devices/Nuki/Device.pm
|
||||
|
||||
@ -146,10 +146,6 @@ sub Define {
|
||||
|
||||
my ( $name, undef, $host, $token ) = split( m{\s+}xms, $def );
|
||||
|
||||
# return ('too few parameters: define <name> NUKIBridge <HOST> <TOKEN>')
|
||||
# if ( !defined($host)
|
||||
# || !defined($token) );
|
||||
|
||||
my $port = ::AttrVal( $name, 'port', 8080 );
|
||||
my $infix = 'NUKIBridge';
|
||||
$hash->{HOST} = $host // 'discover';
|
||||
@ -411,6 +407,7 @@ sub Set {
|
||||
my $arg = shift // '';
|
||||
|
||||
my $endpoint;
|
||||
my $param;
|
||||
|
||||
if ( lc($cmd) eq 'getdevicelist' ) {
|
||||
return 'usage: getDeviceList' if ($arg);
|
||||
@ -441,21 +438,26 @@ sub Set {
|
||||
return 'usage: callbackRemove' if ( split( m{\s+}xms, $arg ) > 1 );
|
||||
|
||||
my $id = ( defined($arg) ? $arg : 0 );
|
||||
$endpoint = 'callback/remove';
|
||||
$param = '{"param":"' . $id . '"}';
|
||||
}
|
||||
elsif ( lc($cmd) eq 'configauth' ) {
|
||||
return 'usage: configAuth' if ( split( m{\s+}xms, $arg ) > 1 );
|
||||
|
||||
Write( $hash, 'callback/remove', '{"param":"' . $id . '"}' )
|
||||
if ( !::IsDisabled($name) );
|
||||
|
||||
return;
|
||||
my $configAuth = 'enable=' . ( $arg eq 'enable' ? 1 : 0 );
|
||||
$endpoint = 'configAuth';
|
||||
$param = '{"param":"' . $configAuth . '"}';
|
||||
}
|
||||
else {
|
||||
my $list = '';
|
||||
$list .= 'info:noArg getDeviceList:noArg ';
|
||||
$list .= 'clearLog:noArg fwUpdate:noArg reboot:noArg factoryReset:noArg'
|
||||
$list .=
|
||||
'clearLog:noArg fwUpdate:noArg reboot:noArg factoryReset:noArg configAuth:enable,disable'
|
||||
if ( ::ReadingsVal( $name, 'bridgeType', 'Software' ) eq 'Hardware' );
|
||||
return ( 'Unknown argument ' . $cmd . ', choose one of ' . $list );
|
||||
}
|
||||
|
||||
Write( $hash, $endpoint, undef )
|
||||
Write( $hash, $endpoint, $param )
|
||||
if ( !::IsDisabled($name) );
|
||||
|
||||
return;
|
||||
@ -529,6 +531,9 @@ sub FirstRun {
|
||||
if ( !::IsDisabled($name) );
|
||||
|
||||
$hash->{helper}->{runInfo} = 0;
|
||||
::readingsSingleUpdate( $hash, 'configAuthSuccess', 'unknown', 0 )
|
||||
if ( ::ReadingsVal( $name, 'configAuthSuccess', 'none' ) eq 'none' );
|
||||
|
||||
return ::InternalTimer( ::gettimeofday() + 5,
|
||||
\&FHEM::Devices::Nuki::Bridge::GetCheckBridgeAlive, $hash );
|
||||
}
|
||||
@ -597,6 +602,10 @@ sub CreateUri {
|
||||
&& $deviceType == 2 );
|
||||
}
|
||||
|
||||
$uri .= '&' . $param
|
||||
if ( defined($param)
|
||||
&& $endpoint eq 'configAuth' );
|
||||
|
||||
$uri .= '&id=' . $param
|
||||
if ( defined($param)
|
||||
&& $endpoint eq 'callback/remove' );
|
||||
@ -906,11 +915,14 @@ sub ResponseProcessing {
|
||||
}
|
||||
}
|
||||
|
||||
WriteReadings( $hash, $decode_json )
|
||||
WriteReadings( $hash, $decode_json, $endpoint )
|
||||
if ( $endpoint eq 'info' );
|
||||
|
||||
return;
|
||||
}
|
||||
elsif ( $endpoint eq 'configAuth' ) {
|
||||
WriteReadings( $hash, $decode_json, $endpoint );
|
||||
}
|
||||
else {
|
||||
|
||||
return ::Log3( $name, 5,
|
||||
@ -979,6 +991,7 @@ sub CGI() {
|
||||
sub WriteReadings {
|
||||
my $hash = shift;
|
||||
my $decode_json = shift;
|
||||
my $endpoint = shift;
|
||||
|
||||
my $name = $hash->{NAME};
|
||||
|
||||
@ -989,25 +1002,34 @@ sub WriteReadings {
|
||||
my $dhash;
|
||||
|
||||
::readingsBeginUpdate($hash);
|
||||
::readingsBulkUpdate( $hash, 'appVersion',
|
||||
$decode_json->{versions}->{appVersion} );
|
||||
::readingsBulkUpdate( $hash, 'firmwareVersion',
|
||||
$decode_json->{versions}->{firmwareVersion} );
|
||||
::readingsBulkUpdate( $hash, 'wifiFirmwareVersion',
|
||||
$decode_json->{versions}->{wifiFirmwareVersion} );
|
||||
::readingsBulkUpdate( $hash, 'bridgeType',
|
||||
$bridgeType{ $decode_json->{bridgeType} } );
|
||||
::readingsBulkUpdate( $hash, 'hardwareId',
|
||||
$decode_json->{ids}{hardwareId} );
|
||||
::readingsBulkUpdate( $hash, 'serverId', $decode_json->{ids}{serverId} );
|
||||
::readingsBulkUpdate( $hash, 'uptime', $decode_json->{uptime} );
|
||||
::readingsBulkUpdate( $hash, 'currentGMTime', $decode_json->{currentTime} );
|
||||
::readingsBulkUpdate( $hash, 'serverConnected',
|
||||
$decode_json->{serverConnected} );
|
||||
::readingsBulkUpdate( $hash, 'wlanConnected',
|
||||
$decode_json->{wlanConnected} );
|
||||
::readingsEndUpdate( $hash, 1 );
|
||||
|
||||
if ( $endpoint eq 'configAuth' ) {
|
||||
::readingsBulkUpdate( $hash, 'configAuthSuccess',
|
||||
$decode_json->{success} );
|
||||
}
|
||||
else {
|
||||
::readingsBulkUpdate( $hash, 'appVersion',
|
||||
$decode_json->{versions}->{appVersion} );
|
||||
::readingsBulkUpdate( $hash, 'firmwareVersion',
|
||||
$decode_json->{versions}->{firmwareVersion} );
|
||||
::readingsBulkUpdate( $hash, 'wifiFirmwareVersion',
|
||||
$decode_json->{versions}->{wifiFirmwareVersion} );
|
||||
::readingsBulkUpdate( $hash, 'bridgeType',
|
||||
$bridgeType{ $decode_json->{bridgeType} } );
|
||||
::readingsBulkUpdate( $hash, 'hardwareId',
|
||||
$decode_json->{ids}{hardwareId} );
|
||||
::readingsBulkUpdate( $hash, 'serverId',
|
||||
$decode_json->{ids}{serverId} );
|
||||
::readingsBulkUpdate( $hash, 'uptime', $decode_json->{uptime} );
|
||||
::readingsBulkUpdate( $hash, 'currentGMTime',
|
||||
$decode_json->{currentTime} );
|
||||
::readingsBulkUpdate( $hash, 'serverConnected',
|
||||
$decode_json->{serverConnected} );
|
||||
::readingsBulkUpdate( $hash, 'wlanConnected',
|
||||
$decode_json->{wlanConnected} );
|
||||
}
|
||||
|
||||
::readingsEndUpdate( $hash, 1 );
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@ -113,7 +113,6 @@ my %deviceTypes = (
|
||||
|
||||
my %deviceTypeIds = reverse(%deviceTypes);
|
||||
|
||||
|
||||
my %modes = (
|
||||
2 => {
|
||||
0 => 'door mode',
|
||||
@ -191,7 +190,6 @@ my %doorsensorStates = (
|
||||
5 => 'calibrating'
|
||||
);
|
||||
|
||||
|
||||
sub Define {
|
||||
my $hash = shift;
|
||||
my $def = shift // return;
|
||||
@ -215,7 +213,6 @@ sub Define {
|
||||
$hash->{STATE} = 'Initialized';
|
||||
$hash->{NOTIFYDEV} = 'global,autocreate,' . $name;
|
||||
|
||||
|
||||
my $iodev = ::AttrVal( $name, 'IODev', 'none' );
|
||||
|
||||
::AssignIoPort( $hash, $iodev ) if ( !$hash->{IODev} );
|
||||
@ -558,7 +555,6 @@ sub WriteReadings {
|
||||
&& $t ne 'doorsensorState'
|
||||
&& $t ne 'doorsensorStateName' );
|
||||
|
||||
|
||||
::readingsBulkUpdate(
|
||||
$hash, $t,
|
||||
(
|
||||
@ -573,13 +569,13 @@ sub WriteReadings {
|
||||
|
||||
::readingsBulkUpdate( $hash, $t, $deviceTypes{$v} )
|
||||
if ( $t eq 'deviceType' );
|
||||
|
||||
|
||||
::readingsBulkUpdate( $hash, $t, $doorsensorStates{$v} )
|
||||
if ( $t eq 'doorsensorState' );
|
||||
|
||||
::readingsBulkUpdate( $hash, $t, ( $v == 1 ? 'true' : 'false' ) )
|
||||
if ( $t eq 'paired' );
|
||||
|
||||
|
||||
::readingsBulkUpdate( $hash, $t, ( $v == 1 ? 'true' : 'false' ) )
|
||||
if ( $t eq 'batteryCharging' );
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user