From 45b6a65e820fc00521a9375f36ec679363a700ce Mon Sep 17 00:00:00 2001 From: iranl Date: Fri, 23 Feb 2024 22:38:52 +0100 Subject: [PATCH 1/4] Update WebCfgServer.cpp --- WebCfgServer.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/WebCfgServer.cpp b/WebCfgServer.cpp index b509ab3..ef6f564 100644 --- a/WebCfgServer.cpp +++ b/WebCfgServer.cpp @@ -624,7 +624,15 @@ void WebCfgServer::buildHtml(String& response) char lockstateArr[20]; NukiOpener::lockstateToString(_nukiOpener->keyTurnerState().lockState, lockstateArr); printParameter(response, "Nuki Opener paired", _nukiOpener->isPaired() ? ("Yes (BLE Address " + _nukiOpener->getBleAddress().toString() + ")").c_str() : "No"); - printParameter(response, "Nuki Opener state", lockstateArr); + + if(_nukiOpener->keyTurnerState().nukiState == NukiOpener::State::ContinuousMode) + { + printParameter(response, "Nuki Opener state", "Open (Continuous Mode)"); + } + else + { + printParameter(response, "Nuki Opener state", lockstateArr); + } } printParameter(response, "Firmware", version.c_str(), "/info"); From 13d26659d3f905e5787263d6cada4b11c453cba6 Mon Sep 17 00:00:00 2001 From: technyon Date: Sun, 25 Feb 2024 17:52:47 +0700 Subject: [PATCH 2/4] update docker to use ninja instead of make --- Docker/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Docker/Dockerfile b/Docker/Dockerfile index 71d6572..c8a8643 100644 --- a/Docker/Dockerfile +++ b/Docker/Dockerfile @@ -2,7 +2,7 @@ FROM eclipse-temurin:11-jdk-jammy AS builder RUN set -ex && \ apt-get update && \ - apt-get install -y git cmake xz-utils python3 python3-serial + apt-get install -y git cmake xz-utils python3 python3-serial ninja-build RUN curl -L "https://downloads.arduino.cc/arduino-1.8.19-linux64.tar.xz" -o /tmp/arduino-ide.tar.xz RUN tar -xf /tmp/arduino-ide.tar.xz --directory ~/ @@ -37,8 +37,8 @@ RUN cd /usr/src/nuki_hub/build && \ RUN set -ex && \ cd /usr/src/nuki_hub/build && \ touch file_opts && \ - cmake -D CMAKE_TOOLCHAIN_FILE=~/Arduino-CMake-Toolchain/Arduino-toolchain.cmake .. && \ - make + cmake -G Ninja -D CMAKE_TOOLCHAIN_FILE=~/Arduino-CMake-Toolchain/Arduino-toolchain.cmake .. && \ + ninja FROM builder AS runtime From e48a9d286dfca5e050f062a2e32a6f0eb3bd25fe Mon Sep 17 00:00:00 2001 From: iranl Date: Mon, 26 Feb 2024 21:12:53 +0100 Subject: [PATCH 3/4] Update Network.cpp --- Network.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Network.cpp b/Network.cpp index 5a5bd3c..ba1c052 100644 --- a/Network.cpp +++ b/Network.cpp @@ -1192,7 +1192,7 @@ void Network::publishHASSConfigContinuousMode(char *deviceType, const char *base baseTopic, String("~") + mqtt_topic_lock_continuous_mode, deviceType, - "lock", + "", "", "", String("~") + mqtt_topic_lock_action, From 7e960ddaaf2835bfc149a03f8e9225291ae441dd Mon Sep 17 00:00:00 2001 From: iranl Date: Tue, 27 Feb 2024 18:32:18 +0100 Subject: [PATCH 4/4] Update Network.cpp --- Network.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Network.cpp b/Network.cpp index ba1c052..5375868 100644 --- a/Network.cpp +++ b/Network.cpp @@ -1198,7 +1198,7 @@ void Network::publishHASSConfigContinuousMode(char *deviceType, const char *base String("~") + mqtt_topic_lock_action, {{ "enabled_by_default", "false" }, {"state_on", "on"}, - {"state_on", "off"}, + {"state_off", "off"}, {"pl_on", "activateCM"}, {"pl_off", "deactivateCM"}}); }