From e6db7477854ce5f8926302289661109a69088947 Mon Sep 17 00:00:00 2001 From: Marko Oldenburg Date: Sun, 18 Dec 2016 13:21:09 +0100 Subject: [PATCH] get logFile show all entrys, englisch commandref updated --- 73_NUKIBridge.pm | 47 ++++++++++++++++++++++++++++++++--------------- 74_NUKIDevice.pm | 8 +++++--- 2 files changed, 37 insertions(+), 18 deletions(-) diff --git a/73_NUKIBridge.pm b/73_NUKIBridge.pm index c983974..83bb12b 100644 --- a/73_NUKIBridge.pm +++ b/73_NUKIBridge.pm @@ -46,7 +46,7 @@ use JSON; use HttpUtils; -my $version = "0.3.40"; +my $version = "0.3.41"; @@ -547,21 +547,17 @@ sub NUKIBridge_getLogfile($) { Log3 $name, 4, "NUKIBridge ($name) - Tabelle mit Logdaten wird aufgebaut"; my $ret = '
'; - $ret .= ''; - - $ret .= ''; - $ret .= ""; - $ret .= ""; - $ret .= ""; - $ret .= ''; - - + foreach my $logs (@{$decode_json}) { + $ret .= ''; + + foreach my $d (reverse sort keys %{$logs}) { + $ret .= ""; + $ret .= ""; + $ret .= ''; + } - $ret .= ""; - $ret .= ""; - $ret .= ""; $ret .= ''; } @@ -670,7 +666,7 @@ sub NUKIBridge_CallBlocking($$$) { =item summary_DE Modul zur Steuerung des Nuki Smartlock über die Nuki Bridge. =begin html - +timestamp

NUKIBridge

    @@ -699,6 +695,15 @@ sub NUKIBridge_CallBlocking($$$) {
  • 0_name - Name of the first found Nuki Smartlock
  • smartlockCount - number of all found Smartlocks
  • bridgeAPI - API Version of bridge
  • +
  • bridgeType - Hardware bridge / Software bridge
  • +
  • currentTime - Current timestamp
  • +
  • firmwareVersion - Version of the bridge firmware
  • +
  • hardwareId - Hardware ID
  • +
  • lastError - Last connected error
  • +
  • serverConnected - Flag indicating whether or not the bridge is connected to the Nuki server
  • +
  • serverId - Server ID
  • +
  • uptime - Uptime of the bridge in seconds
  • +
  • wifiFirmwareVersion- Version of the WiFi modules firmware

  • The preceding number is continuous, starts with 0 und returns the properties of one Smartlock.
@@ -707,7 +712,19 @@ sub NUKIBridge_CallBlocking($$$) { Set
  • autocreate - Prompts to re-read all Smartlocks from the bridge and if not already present in FHEM, create the autimatic.
  • -
  • statusRequest - starts a checkAlive of the bridge, it is determined whether the bridge is still online
  • +
  • callbackRemove - Removes a previously added callback
  • +
  • clearLog - Clears the log of the Bridge
  • +
  • fwUpdate - Immediately checks for a new firmware update and installs it
  • +
  • info - Returns all Smart Locks in range and some device information of the bridge itself
  • +
  • reboot - reboots the bridge
  • +
    +
+

+ + Get +
    +
  • callbackList - List of register url callbacks. The Bridge register up to 3 url callbacks.
  • +
  • logFile - Retrieves the log of the Bridge



diff --git a/74_NUKIDevice.pm b/74_NUKIDevice.pm index 6f2a9b4..045f6fb 100644 --- a/74_NUKIDevice.pm +++ b/74_NUKIDevice.pm @@ -33,7 +33,7 @@ use warnings; use JSON; #use Time::HiRes qw(gettimeofday); -my $version = "0.3.40"; +my $version = "0.3.41"; @@ -562,8 +562,8 @@ sub NUKIDevice_CGI() { Attributes
  • disable - disables the Nuki device
  • -
  • webhookFWinstance - zu verwendene Webinstanz für den Callbackaufruf
  • -
  • webhookHttpHostname - IP oder FQDN vom FHEM Server für den Callbackaufruf
  • +
  • webhookFWinstance - Webinstanz of the Callback
  • +
  • webhookHttpHostname - IP or FQDN of the FHEM Server Callback

@@ -619,6 +619,8 @@ sub NUKIDevice_CGI() { Attribute
  • disable - deaktiviert das Nuki Device
  • +
  • webhookFWinstance - zu verwendene Webinstanz für den Callbackaufruf
  • +
  • webhookHttpHostname - IP oder FQDN vom FHEM Server für den Callbackaufruf

Timestamp Type
$d: $logs->{$d} $logs->{timestamp} $logs->{type}