From bf76a5c23cfaa42500ff0bd0ceb6d1b2caad2b63 Mon Sep 17 00:00:00 2001
From: Andrey Klimov <anklimov@gmail.com>
Date: Wed, 13 Oct 2021 12:27:56 +0300
Subject: [PATCH] core - group channel toggle, set_with_on fix, mdns

---
 lighthub/item.cpp | 4 ++--
 lighthub/main.cpp | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lighthub/item.cpp b/lighthub/item.cpp
index 74aa465..37b0b1f 100644
--- a/lighthub/item.cpp
+++ b/lighthub/item.cpp
@@ -802,7 +802,7 @@ int Item::Ctrl(itemCmd cmd,  char* subItem, bool allowRecursion)
                   if (chActive) cmd.Cmd(CMD_OFF);
                       else 
                             { 
-                              cmd.loadItemDef(this);  
+                             // cmd.loadItemDef(this);  ///
                               cmd.Cmd(CMD_ON);
                             }   
                   status2Send |=SEND_COMMAND | SEND_IMMEDIATE;    
@@ -1029,7 +1029,7 @@ int Item::Ctrl(itemCmd cmd,  char* subItem, bool allowRecursion)
                         debugSerial<<F("ON:Already Active\n");
                         return -3;
                 }
-            cmd.loadItemDef(this);
+            if (!cmd.isValue()) cmd.loadItemDef(this); // if no_suffix - both, command ON and value provided
             status2Send |= SEND_COMMAND | SEND_PARAMETERS | SEND_IMMEDIATE; 
             toExecute=true; 
             break;
diff --git a/lighthub/main.cpp b/lighthub/main.cpp
index d6aab56..2790af5 100644
--- a/lighthub/main.cpp
+++ b/lighthub/main.cpp
@@ -242,7 +242,7 @@ uint16_t httpHandler(Client& client, String request, uint8_t method, long conten
          client.println(
 #ifdef CORS
 //Redirect to cloud PWA application               
-             String(F("Location: "))+(CORS)+String(F("/pwa"))
+             String(F("Location: " CORS "/pwa"))
 #else
              String(F("Location: /index.html"))
 #endif   
@@ -250,7 +250,7 @@ uint16_t httpHandler(Client& client, String request, uint8_t method, long conten
              +String(F("?mac="))+sysConf.getMACString()
              +String(F("&ip="))+ toString( Ethernet.localIP())
              +String(F("&port="))+ OTA_PORT 
-             + String(F("&name="))+deviceName
+             +String(F("&name="))+deviceName
              );
      
          //response+=(F("&ip="));
@@ -982,7 +982,7 @@ if (WiFi.status() == WL_CONNECTED) {
 
         mdns.begin(Ethernet.localIP(), "lighthub");
          
-         char txtRecord[32] = "\x7mac=";
+         char txtRecord[32] = "\x10mac=";
          SetBytes(sysConf.mac,6,txtRecord+5);
          char mdnsName[32] = "LightHub";
          SetBytes(sysConf.mac+4,2,mdnsName+8);