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

WiFi portal

Browse Source
This commit is contained in:
iranl
2024-10-09 21:33:18 +02:00
parent 220ea7a96d
commit 06e96b5ea7
18 changed files with 999 additions and 497 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/NukiOpenerWrapper.cpp
View File

@@ -1772,21 +1772,21 @@ void NukiOpenerWrapper::onKeypadJsonCommandReceived(const char *value)
String allowedFromTime;
String allowedUntilTime;
if(json.containsKey("code")) code = json["code"].as<unsigned int>();
if(json["code"].is<unsigned int>()) code = json["code"].as<unsigned int>();
else code = 12;
if(json.containsKey("enabled")) enabled = json["enabled"].as<unsigned int>();
if(json["enabled"].is<unsigned int>()) enabled = json["enabled"].as<unsigned int>();
else enabled = 2;
if(json.containsKey("timeLimited")) timeLimited = json["timeLimited"].as<unsigned int>();
if(json["timeLimited"].is<unsigned int>()) timeLimited = json["timeLimited"].as<unsigned int>();
else timeLimited = 2;
if(json.containsKey("name")) name = json["name"].as<String>();
if(json.containsKey("allowedFrom")) allowedFrom = json["allowedFrom"].as<String>();
if(json.containsKey("allowedUntil")) allowedUntil = json["allowedUntil"].as<String>();
if(json.containsKey("allowedWeekdays")) allowedWeekdays = json["allowedWeekdays"].as<String>();
if(json.containsKey("allowedFromTime")) allowedFromTime = json["allowedFromTime"].as<String>();
if(json.containsKey("allowedUntilTime")) allowedUntilTime = json["allowedUntilTime"].as<String>();
if(json["name"].is<String>()) name = json["name"].as<String>();
if(json["allowedFrom"].is<String>()) allowedFrom = json["allowedFrom"].as<String>();
if(json["allowedUntil"].is<String>()) allowedUntil = json["allowedUntil"].as<String>();
if(json["allowedWeekdays"].is<String>()) allowedWeekdays = json["allowedWeekdays"].as<String>();
if(json["allowedFromTime"].is<String>()) allowedFromTime = json["allowedFromTime"].as<String>();
if(json["allowedUntilTime"].is<String>()) allowedUntilTime = json["allowedUntilTime"].as<String>();
if(action)
{
@@ -2209,12 +2209,12 @@ void NukiOpenerWrapper::onTimeControlCommandReceived(const char *value)
String lockAction;
NukiOpener::LockAction timeControlLockAction;
if(json.containsKey("enabled")) enabled = json["enabled"].as<unsigned int>();
if(json["enabled"].is<unsigned int>()) enabled = json["enabled"].as<unsigned int>();
else enabled = 2;
if(json.containsKey("weekdays")) weekdays = json["weekdays"].as<String>();
if(json.containsKey("time")) time = json["time"].as<String>();
if(json.containsKey("lockAction")) lockAction = json["lockAction"].as<String>();
if(json["weekdays"].is<String>()) weekdays = json["weekdays"].as<String>();
if(json["time"].is<String>()) time = json["time"].as<String>();
if(json["lockAction"].is<String>()) lockAction = json["lockAction"].as<String>();
if(lockAction.length() > 0)
{
@@ -2443,22 +2443,22 @@ void NukiOpenerWrapper::onAuthCommandReceived(const char *value)
String allowedFromTime;
String allowedUntilTime;
if(json.containsKey("remoteAllowed")) remoteAllowed = json["remoteAllowed"].as<unsigned int>();
if(json["remoteAllowed"].is<unsigned int>()) remoteAllowed = json["remoteAllowed"].as<unsigned int>();
else remoteAllowed = 2;
if(json.containsKey("enabled")) enabled = json["enabled"].as<unsigned int>();
if(json["enabled"].is<unsigned int>()) enabled = json["enabled"].as<unsigned int>();
else enabled = 2;
if(json.containsKey("timeLimited")) timeLimited = json["timeLimited"].as<unsigned int>();
if(json["timeLimited"].is<unsigned int>()) timeLimited = json["timeLimited"].as<unsigned int>();
else timeLimited = 2;
if(json.containsKey("name")) name = json["name"].as<String>();
//if(json.containsKey("sharedKey")) sharedKey = json["sharedKey"].as<String>();
if(json.containsKey("allowedFrom")) allowedFrom = json["allowedFrom"].as<String>();
if(json.containsKey("allowedUntil")) allowedUntil = json["allowedUntil"].as<String>();
if(json.containsKey("allowedWeekdays")) allowedWeekdays = json["allowedWeekdays"].as<String>();
if(json.containsKey("allowedFromTime")) allowedFromTime = json["allowedFromTime"].as<String>();
if(json.containsKey("allowedUntilTime")) allowedUntilTime = json["allowedUntilTime"].as<String>();
if(json["name"].is<String>()) name = json["name"].as<String>();
//if(json["sharedKey"].is<String>()) sharedKey = json["sharedKey"].as<String>();
if(json["allowedFrom"].is<String>()) allowedFrom = json["allowedFrom"].as<String>();
if(json["allowedUntil"].is<String>()) allowedUntil = json["allowedUntil"].as<String>();
if(json["allowedWeekdays"].is<String>()) allowedWeekdays = json["allowedWeekdays"].as<String>();
if(json["allowedFromTime"].is<String>()) allowedFromTime = json["allowedFromTime"].as<String>();
if(json["allowedUntilTime"].is<String>()) allowedUntilTime = json["allowedUntilTime"].as<String>();
if(action)
{