Skip to content

Various code optimizations #647

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 3, 2020
Merged

Various code optimizations #647

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
25f6b8c
Fix the ability to provide `null` for `wifi.password` for open WiFi n…
mkfrey Dec 19, 2019
64ca0ba
Make `ota.enabled` configuration optional
mkfrey Dec 19, 2019
60ca263
Avoid unnecessary copying in Config::getSafeConfigFile()
mkfrey Dec 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Make ota.enabled configuration optional 
* OTA will be disabled by default if `ota.enabled` is not provided
  • Loading branch information
@mkfrey
mkfrey committed Dec 19, 2019
commit 64ca0bad9d412d8a0e5bcab292d3f996f743eb78
20 changes: 11 additions & 9 deletions src/Homie/Utils/Validation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,17 +345,19 @@ ConfigValidationResult Validation::_validateConfigOta(const JsonObject object) {

JsonVariant ota = object["ota"];

if (!ota.is<JsonObject>()) {
result.reason = F("ota is not an object");
return result;
}
if (!ota.isNull()) {
if (!ota.is<JsonObject>()) {
result.reason = F("ota is not an object");
return result;
}

{
JsonVariant otaEnabled = ota["enabled"];
{
JsonVariant otaEnabled = ota["enabled"];

if (!otaEnabled.is<bool>()) {
result.reason = F("ota.enabled is not a boolean");
return result;
if (!otaEnabled.isNull() && !otaEnabled.is<bool>()) {
result.reason = F("ota.enabled is not a boolean");
return result;
}
}
}

Expand Down