Merge branch 'master' into separate-config

2024-04-20 14:39:32 +02:00
parent 747ecdb629 3d211c64b4
commit 3ea6f4f2d9
446 changed files with 10924 additions and 9414 deletions
--- a/NetworkLock.cpp
+++ b/NetworkLock.cpp
@@ -619,7 +619,7 @@ void NetworkLock::publishKeypad(const std::list<NukiLock::KeypadEntry>& entries,
        jsonEntry["allowedUntil"] = allowedUntilDT;

        uint8_t allowedWeekdaysInt = entry.allowedWeekdays;
-        JsonArray weekdays = jsonEntry.createNestedArray("allowedWeekdays");
+        JsonArray weekdays = jsonEntry["allowedWeekdays"].to<JsonArray>();

        while(allowedWeekdaysInt > 0) {
            if(allowedWeekdaysInt >= 64)