Merge pull request #4840 from tonhuisman/feature/UI-show-controller-s…

…tate-on-device-page [UI] Show Controller-state on Device page
letscontrolit · Oct 12, 2023 · b4f9d48 · b4f9d48
2 parents 73bc76d + 3e63a58
commit b4f9d48
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 17 deletions.
diff --git a/src/src/Globals/CPlugins.cpp b/src/src/Globals/CPlugins.cpp
@@ -214,10 +214,7 @@ String getCPluginNameFromCPluginID(cpluginID_t cpluginID) {
   protocolIndex_t protocolIndex = getProtocolIndex_from_CPluginID_(cpluginID);
 
   if (!validProtocolIndex(protocolIndex)) {
-    String name = F("CPlugin ");
-    name += String(static_cast<int>(cpluginID));
-    name += F(" not included in build");
-    return name;
+    return strformat(F("CPlugin %d not included in build"), cpluginID);
   }
   return getCPluginNameFromProtocolIndex(protocolIndex);
 }
diff --git a/src/src/Globals/Plugins.cpp b/src/src/Globals/Plugins.cpp
@@ -126,10 +126,7 @@ String getPluginNameFromPluginID(pluginID_t pluginID) {
   deviceIndex_t deviceIndex = getDeviceIndex(pluginID);
 
   if (!validDeviceIndex(deviceIndex)) {
-    String name = F("Plugin ");
-    name += String(pluginID.value);
-    name += F(" not included in build");
-    return name;
+    return strformat(F("Plugin %d not included in build"), pluginID.value);
   }
   return getPluginNameFromDeviceIndex(deviceIndex);
 }
@@ -654,14 +651,10 @@ bool PluginCall(uint8_t Function, struct EventStruct *event, String& str)
           clearPluginTaskData(taskIndex);                       // Make sure any task data is actually cleared.
           if (PluginCallForTask(taskIndex, PLUGIN_INIT, &TempEvent, str, event) &&
               loglevelActiveFor(LOG_LEVEL_INFO)) {
-            String log;
-            log.reserve(80);
-            log += concat(F("INIT : Started Priority task "), static_cast<int>(taskIndex + 1));
-            log += F(", [");
-            log += getTaskDeviceName(taskIndex);
-            log += F("] ");
-            log += getPluginNameFromDeviceIndex(getDeviceIndex_from_TaskIndex(taskIndex));
-            addLogMove(LOG_LEVEL_INFO, log);
+            addLogMove(LOG_LEVEL_INFO, strformat(F("INIT : Started Priority task %d, [%s] %s"),
+                                       taskIndex + 1,
+                                       getTaskDeviceName(taskIndex).c_str(),
+                                       getPluginNameFromDeviceIndex(getDeviceIndex_from_TaskIndex(taskIndex)).c_str()));
           }
         }
       }

diff --git a/src/src/WebServer/DevicesPage.cpp b/src/src/WebServer/DevicesPage.cpp
@@ -1318,7 +1318,8 @@ void devicePage_show_controller_config(taskIndex_t taskIndex, deviceIndex_t Devi
         html_TR_TD();
         addHtml(F("Send to Controller "));
         addHtml(getControllerSymbol(controllerNr));
-        addHtmlDiv(F("note"), wrap_braces(getCPluginNameFromCPluginID(Settings.Protocol[controllerNr])));
+        addHtmlDiv(F("note"), wrap_braces(getCPluginNameFromCPluginID(Settings.Protocol[controllerNr]) + F(", ") + // Most compact code...
+                                          (Settings.ControllerEnabled[controllerNr] ? F("enabled") : F("disabled"))));
         html_TD();
 
         addHtml(F("<table style='padding-left:0;'>")); // remove left padding 2x to align vertically with other inputs