From 202c95805754ce22d9432a4338092ae7112bb378 Mon Sep 17 00:00:00 2001 From: fvanroie <15969459+fvanroie@users.noreply.github.com> Date: Tue, 23 Feb 2021 00:05:10 +0100 Subject: [PATCH] Change power to state --- src/hasp/hasp_dispatch.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/hasp/hasp_dispatch.cpp b/src/hasp/hasp_dispatch.cpp index bf2c2dcb..9484ff4b 100644 --- a/src/hasp/hasp_dispatch.cpp +++ b/src/hasp/hasp_dispatch.cpp @@ -800,7 +800,7 @@ void dispatch_moodlight(const char* topic, const char* payload) dispatch_json_error(TAG_MSGR, jsonError); } else { - if(!json[F("power")].isNull()) moodlight.power = Utilities::is_true(json[F("power")].as()); + if(!json[F("state")].isNull()) moodlight.power = Utilities::is_true(json[F("state")].as()); if(!json[F("r")].isNull()) moodlight.r = json[F("r")].as(); if(!json[F("g")].isNull()) moodlight.r = json[F("g")].as(); @@ -826,9 +826,10 @@ void dispatch_moodlight(const char* topic, const char* payload) // Return the current state char buffer[128]; - snprintf_P(buffer, sizeof(buffer), - PSTR("{\"power\":\"%u\",\"color\":\"#%02x%02x%02x\",\"r\":%u,\"g\":%u,\"b\":%u}"), moodlight.power, - moodlight.r, moodlight.g, moodlight.b, moodlight.r, moodlight.g, moodlight.b); + snprintf_P( + // buffer, sizeof(buffer), PSTR("{\"state\":\"%s\",\"color\":\"#%02x%02x%02x\",\"r\":%u,\"g\":%u,\"b\":%u}"), + buffer, sizeof(buffer), PSTR("{\"state\":\"%s\",\"color\":[%u,%u,%u]}"), moodlight.power ? "ON" : "OFF", + moodlight.r, moodlight.g, moodlight.b); dispatch_state_msg(F("moodlight"), buffer); }