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

Merge branch 'master' into check-keypad-codes

Browse Source
This commit is contained in:
iranl
2024-10-28 20:14:03 +01:00
committed by GitHub
parent 25b0e9fabe 8263819a82
commit 40456db982
8 changed files with 85 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/NukiWrapper.cpp
View File

@@ -2650,7 +2650,7 @@ void NukiWrapper::onKeypadJsonCommandReceived(const char *value)
String allowedFromTime;
String allowedUntilTime;
if(json["code"].is<unsigned int>())
if(json["code"].is<JsonVariant>())
{
code = json["code"].as<unsigned int>();
}
@@ -2659,7 +2659,7 @@ void NukiWrapper::onKeypadJsonCommandReceived(const char *value)
code = 12;
}
if(json["enabled"].is<unsigned int>())
if(json["enabled"].is<JsonVariant>())
{
enabled = json["enabled"].as<unsigned int>();
}
@@ -2668,7 +2668,7 @@ void NukiWrapper::onKeypadJsonCommandReceived(const char *value)
enabled = 2;
}
if(json["timeLimited"].is<unsigned int>())
if(json["timeLimited"].is<JsonVariant>())
{
timeLimited = json["timeLimited"].as<unsigned int>();
}
@@ -2677,27 +2677,27 @@ void NukiWrapper::onKeypadJsonCommandReceived(const char *value)
timeLimited = 2;
}
if(json["name"].is<String>())
if(json["name"].is<JsonVariant>())
{
name = json["name"].as<String>();
}
if(json["allowedFrom"].is<String>())
if(json["allowedFrom"].is<JsonVariant>())
{
allowedFrom = json["allowedFrom"].as<String>();
}
if(json["allowedUntil"].is<String>())
if(json["allowedUntil"].is<JsonVariant>())
{
allowedUntil = json["allowedUntil"].as<String>();
}
if(json["allowedWeekdays"].is<String>())
if(json["allowedWeekdays"].is<JsonVariant>())
{
allowedWeekdays = json["allowedWeekdays"].as<String>();
}
if(json["allowedFromTime"].is<String>())
if(json["allowedFromTime"].is<JsonVariant>())
{
allowedFromTime = json["allowedFromTime"].as<String>();
}
if(json["allowedUntilTime"].is<String>())
if(json["allowedUntilTime"].is<JsonVariant>())
{
allowedUntilTime = json["allowedUntilTime"].as<String>();
}
@@ -2837,8 +2837,7 @@ void NukiWrapper::onKeypadJsonCommandReceived(const char *value)
}
if(allowedUntil.length() > 0)
{
if(allowedUntil.length() > 0 == 19)
if(allowedUntil.length() == 19)
{
allowedUntilAr[0] = (uint16_t)allowedUntil.substring(0, 4).toInt();
allowedUntilAr[1] = (uint8_t)allowedUntil.substring(5, 7).toInt();
@@ -3172,7 +3171,7 @@ void NukiWrapper::onTimeControlCommandReceived(const char *value)
String lockAction;
NukiLock::LockAction timeControlLockAction;
if(json["enabled"].is<unsigned int>())
if(json["enabled"].is<JsonVariant>())
{
enabled = json["enabled"].as<unsigned int>();
}
@@ -3181,15 +3180,15 @@ void NukiWrapper::onTimeControlCommandReceived(const char *value)
enabled = 2;
}
if(json["weekdays"].is<String>())
if(json["weekdays"].is<JsonVariant>())
{
weekdays = json["weekdays"].as<String>();
}
if(json["time"].is<String>())
if(json["time"].is<JsonVariant>())
{
time = json["time"].as<String>();
}
if(json["lockAction"].is<String>())
if(json["lockAction"].is<JsonVariant>())
{
lockAction = json["lockAction"].as<String>();
}
@@ -3464,7 +3463,7 @@ void NukiWrapper::onAuthCommandReceived(const char *value)
String allowedFromTime;
String allowedUntilTime;
if(json["remoteAllowed"].is<unsigned int>())
if(json["remoteAllowed"].is<JsonVariant>())
{
remoteAllowed = json["remoteAllowed"].as<unsigned int>();
}
@@ -3473,7 +3472,7 @@ void NukiWrapper::onAuthCommandReceived(const char *value)
remoteAllowed = 2;
}
if(json["enabled"].is<unsigned int>())
if(json["enabled"].is<JsonVariant>())
{
enabled = json["enabled"].as<unsigned int>();
}
@@ -3482,7 +3481,7 @@ void NukiWrapper::onAuthCommandReceived(const char *value)
enabled = 2;
}
if(json["timeLimited"].is<unsigned int>())
if(json["timeLimited"].is<JsonVariant>())
{
timeLimited = json["timeLimited"].as<unsigned int>();
}
@@ -3491,28 +3490,28 @@ void NukiWrapper::onAuthCommandReceived(const char *value)
timeLimited = 2;
}
if(json["name"].is<String>())
if(json["name"].is<JsonVariant>())
{
name = json["name"].as<String>();
}
//if(json["sharedKey"].is<String>()) sharedKey = json["sharedKey"].as<String>();
if(json["allowedFrom"].is<String>())
//if(json["sharedKey"].is<JsonVariant>()) sharedKey = json["sharedKey"].as<String>();
if(json["allowedFrom"].is<JsonVariant>())
{
allowedFrom = json["allowedFrom"].as<String>();
}
if(json["allowedUntil"].is<String>())
if(json["allowedUntil"].is<JsonVariant>())
{
allowedUntil = json["allowedUntil"].as<String>();
}
if(json["allowedWeekdays"].is<String>())
if(json["allowedWeekdays"].is<JsonVariant>())
{
allowedWeekdays = json["allowedWeekdays"].as<String>();
}
if(json["allowedFromTime"].is<String>())
if(json["allowedFromTime"].is<JsonVariant>())
{
allowedFromTime = json["allowedFromTime"].as<String>();
}
if(json["allowedUntilTime"].is<String>())
if(json["allowedUntilTime"].is<JsonVariant>())
{
allowedUntilTime = json["allowedUntilTime"].as<String>();
}
@@ -3606,7 +3605,7 @@ void NukiWrapper::onAuthCommandReceived(const char *value)
if(allowedUntil.length() > 0)
{
if(allowedUntil.length() > 0 == 19)
if(allowedUntil.length() == 19)
{
allowedUntilAr[0] = (uint16_t)allowedUntil.substring(0, 4).toInt();
allowedUntilAr[1] = (uint8_t)allowedUntil.substring(5, 7).toInt();