From 5b1493b94044b7961caba45502b73ca40200e8b1 Mon Sep 17 00:00:00 2001
From: proddy <paul@derbyshire.nl>
Date: Thu, 19 Sep 2024 18:38:36 +0200
Subject: [PATCH] incorporated Michael's changes
 https://github.com/emsesp/EMS-ESP32/pull/2027

---
 src/command.cpp                 | 5 +++--
 src/console.cpp                 | 2 +-
 src/web/WebSchedulerService.cpp | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/command.cpp b/src/command.cpp
index a8420409b..f9fbe5f7a 100644
--- a/src/command.cpp
+++ b/src/command.cpp
@@ -298,8 +298,9 @@ bool Command::set_attribute(JsonObject output, const char * cmd, const char * at
     if (attribute == nullptr) {
         return true;
     }
-    if (output[attribute].is<std::string>()) {
-        std::string data = output[attribute];
+
+    if (output[attribute].is<JsonVariantConst>()) {
+        std::string data = output[attribute].as<std::string>();
         output.clear();
         output["api_data"] = data; // always as a string
         return true;
diff --git a/src/console.cpp b/src/console.cpp
index bdbc8db4c..677fd1986 100644
--- a/src/console.cpp
+++ b/src/console.cpp
@@ -552,7 +552,7 @@ static void setup_commands(std::shared_ptr<Commands> & commands) {
 
             if (return_code == CommandRet::OK) {
                 if (json.size()) {
-                    if (json["api_data"].is<String>()) {
+                    if (json["api_data"].is<std::string>()) {
                         String data = json["api_data"];
                         shell.println(data.c_str());
                         return;
diff --git a/src/web/WebSchedulerService.cpp b/src/web/WebSchedulerService.cpp
index f1b3c5812..f4fa0c08d 100644
--- a/src/web/WebSchedulerService.cpp
+++ b/src/web/WebSchedulerService.cpp
@@ -245,7 +245,7 @@ void WebSchedulerService::publish(const bool force) {
     JsonDocument doc;
     bool         ha_created = ha_registered_;
     for (const ScheduleItem & scheduleItem : *scheduleItems_) {
-        if (!scheduleItem.name.empty() && !doc[scheduleItem.name].is<const char *>()) {
+        if (!scheduleItem.name.empty() && !doc[scheduleItem.name].is<JsonVariantConst>()) {
             if (EMSESP::system_.bool_format() == BOOL_FORMAT_TRUEFALSE) {
                 doc[scheduleItem.name] = scheduleItem.active;
             } else if (EMSESP::system_.bool_format() == BOOL_FORMAT_10) {