andry/lighthub
1
0
Fork 0
mirror of https://github.com/anklimov/lighthub synced 2025-12-06 11:49:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

core - group channel toggle, set_with_on fix, mdns

Browse Source
This commit is contained in:
Andrey Klimov
2021-10-13 12:27:56 +03:00
parent 9bfaca7898
commit bf76a5c23c
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lighthub/item.cpp
View File

@@ -802,7 +802,7 @@ int Item::Ctrl(itemCmd cmd, char* subItem, bool allowRecursion)
if (chActive) cmd.Cmd(CMD_OFF); if (chActive) cmd.Cmd(CMD_OFF);
else else
{ {
cmd.loadItemDef(this); // cmd.loadItemDef(this); ///
cmd.Cmd(CMD_ON); cmd.Cmd(CMD_ON);
} }
status2Send |=SEND_COMMAND | SEND_IMMEDIATE; status2Send |=SEND_COMMAND | SEND_IMMEDIATE;
@@ -1029,7 +1029,7 @@ int Item::Ctrl(itemCmd cmd, char* subItem, bool allowRecursion)
debugSerial<<F("ON:Already Active\n"); debugSerial<<F("ON:Already Active\n");
return -3; 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; status2Send |= SEND_COMMAND | SEND_PARAMETERS | SEND_IMMEDIATE;
toExecute=true; toExecute=true;
break; break;

6
lighthub/main.cpp
View File

@@ -242,7 +242,7 @@ uint16_t httpHandler(Client& client, String request, uint8_t method, long conten
client.println( client.println(
#ifdef CORS #ifdef CORS
//Redirect to cloud PWA application //Redirect to cloud PWA application
String(F("Location: "))+(CORS)+String(F("/pwa")) String(F("Location: " CORS "/pwa"))
#else #else
String(F("Location: /index.html")) String(F("Location: /index.html"))
#endif #endif
@@ -250,7 +250,7 @@ uint16_t httpHandler(Client& client, String request, uint8_t method, long conten
+String(F("?mac="))+sysConf.getMACString() +String(F("?mac="))+sysConf.getMACString()
+String(F("&ip="))+ toString( Ethernet.localIP()) +String(F("&ip="))+ toString( Ethernet.localIP())
+String(F("&port="))+ OTA_PORT +String(F("&port="))+ OTA_PORT
+ String(F("&name="))+deviceName +String(F("&name="))+deviceName
); );
//response+=(F("&ip=")); //response+=(F("&ip="));
@@ -982,7 +982,7 @@ if (WiFi.status() == WL_CONNECTED) {
mdns.begin(Ethernet.localIP(), "lighthub"); mdns.begin(Ethernet.localIP(), "lighthub");
char txtRecord[32] = "\x7mac="; char txtRecord[32] = "\x10mac=";
SetBytes(sysConf.mac,6,txtRecord+5); SetBytes(sysConf.mac,6,txtRecord+5);
char mdnsName[32] = "LightHub"; char mdnsName[32] = "LightHub";
SetBytes(sysConf.mac+4,2,mdnsName+8); SetBytes(sysConf.mac+4,2,mdnsName+8);