From 88d1f6906960da0235402953467b55a65fa7d2c0 Mon Sep 17 00:00:00 2001 From: fvanroie <15969459+fvanroie@users.noreply.github.com> Date: Tue, 13 Apr 2021 04:45:00 +0200 Subject: [PATCH] objid property is obsolete, use obj instead --- src/hasp/hasp_dispatch.cpp | 6 +++--- src/hasp/hasp_object.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/hasp/hasp_dispatch.cpp b/src/hasp/hasp_dispatch.cpp index 61c78a3b..442152c7 100644 --- a/src/hasp/hasp_dispatch.cpp +++ b/src/hasp/hasp_dispatch.cpp @@ -803,9 +803,9 @@ void dispatch_moodlight(const char* topic, const char* payload) if(!json[F("state")].isNull()) moodlight.power = Utilities::is_true(json[F("state")].as().c_str()); - if(!json[F("r")].isNull()) moodlight.r = json[F("r")].as(); - if(!json[F("g")].isNull()) moodlight.g = json[F("g")].as(); - if(!json[F("b")].isNull()) moodlight.b = json[F("b")].as(); + if(!json["r"].isNull()) moodlight.r = json["r"].as(); + if(!json["g"].isNull()) moodlight.g = json["g"].as(); + if(!json["b"].isNull()) moodlight.b = json["b"].as(); if(!json[F("color")].isNull()) { if(!json[F("color")]["r"].isNull()) { diff --git a/src/hasp/hasp_object.cpp b/src/hasp/hasp_object.cpp index e1569fb7..d1cc849e 100644 --- a/src/hasp/hasp_object.cpp +++ b/src/hasp/hasp_object.cpp @@ -386,7 +386,7 @@ void hasp_new_object(const JsonObject& config, uint8_t& saved_page_id) config.remove(FPSTR(FP_OBJ)); } } else { - LOG_WARNING(TAG_HASP, F("objid property is obsolete, use obj instead")); + LOG_WARNING(TAG_HASP, F("objid property is obsolete, use obj instead")); // TODO: obsolete objid sdbm = config[FPSTR(FP_OBJID)].as(); config.remove(FPSTR(FP_OBJID)); }