Sternenlabor/nuki_hub
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'technyon:master' into readme-update

Browse Source
This commit is contained in:
iranl
2024-02-29 20:22:58 +01:00
committed by GitHub
parent dd1b3c9690 e92d0e9ac9
commit 57214ae5dd
3 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Docker/Dockerfile
View File

@@ -2,7 +2,7 @@ FROM eclipse-temurin:11-jdk-jammy AS builder
RUN set -ex && \ RUN set -ex && \
apt-get update && \ 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 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 ~/ RUN tar -xf /tmp/arduino-ide.tar.xz --directory ~/
@@ -37,8 +37,8 @@ RUN cd /usr/src/nuki_hub/build && \
RUN set -ex && \ RUN set -ex && \
cd /usr/src/nuki_hub/build && \ cd /usr/src/nuki_hub/build && \
touch file_opts && \ touch file_opts && \
cmake -D CMAKE_TOOLCHAIN_FILE=~/Arduino-CMake-Toolchain/Arduino-toolchain.cmake .. && \ cmake -G Ninja -D CMAKE_TOOLCHAIN_FILE=~/Arduino-CMake-Toolchain/Arduino-toolchain.cmake .. && \
make ninja
FROM builder AS runtime FROM builder AS runtime

4
Network.cpp
View File

@@ -1192,13 +1192,13 @@ void Network::publishHASSConfigContinuousMode(char *deviceType, const char *base
baseTopic, baseTopic,
String("~") + mqtt_topic_lock_continuous_mode, String("~") + mqtt_topic_lock_continuous_mode,
deviceType, deviceType,
"lock", "",
"", "",
"", "",
String("~") + mqtt_topic_lock_action, String("~") + mqtt_topic_lock_action,
{{ "enabled_by_default", "false" }, {{ "enabled_by_default", "false" },
{"state_on", "on"}, {"state_on", "on"},
{"state_on", "off"}, {"state_off", "off"},
{"pl_on", "activateCM"}, {"pl_on", "activateCM"},
{"pl_off", "deactivateCM"}}); {"pl_off", "deactivateCM"}});
} }

10
WebCfgServer.cpp
View File

@@ -624,7 +624,15 @@ void WebCfgServer::buildHtml(String& response)
char lockstateArr[20]; char lockstateArr[20];
NukiOpener::lockstateToString(_nukiOpener->keyTurnerState().lockState, lockstateArr); 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 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"); printParameter(response, "Firmware", version.c_str(), "/info");