jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-29 13:46:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Work-around for Philips Hue emulation issue by using part of MAC address for LightId

Browse Source 
Work-around for Philips Hue emulation issue by using part of MAC address for LightId (#5849)
This commit is contained in:
Theo Arends 2019-05-31 11:28:47 +02:00
parent b954d18fee
commit 1b229f5c9b
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sonoff/_changelog.ino
View File

@ -2,7 +2,7 @@
* Add command SetOption38 6..255 to set IRReceive protocol detection sensitivity mimizing UNKNOWN protocols (#5853) * Add command SetOption38 6..255 to set IRReceive protocol detection sensitivity mimizing UNKNOWN protocols (#5853)
* Fix missing white channel for WS2812 (#5869) * Fix missing white channel for WS2812 (#5869)
* Add reset of Energy values when connection to sensor is lost for over 4 seconds (#5874, #5881) * Add reset of Energy values when connection to sensor is lost for over 4 seconds (#5874, #5881)
* Work-around for Philips Hue emulation issue (#5849) * Work-around for Philips Hue emulation issue by using part of MAC address for LightId (#5849)
* Add support to Stage Arduino Core (next 2.6.0) * Add support to Stage Arduino Core (next 2.6.0)
* *
* 6.5.0.12 20190521 * 6.5.0.12 20190521

24
sonoff/xdrv_20_hue.ino
View File

@ -342,11 +342,19 @@ void HueLightStatus2(uint8_t device, String *response)
response->replace("{j2", GetHueDeviceId(device)); response->replace("{j2", GetHueDeviceId(device));
} }
// generate a unique lightId mixing local IP address and deice number // generate a unique lightId mixing local IP address and device number
// it is limited to 16 devices. // it is limited to 16 devices.
uint32_t lightId(uint32_t idx) { // last 16 bits of Mac address + 4 bits of local light
uint32_t ip_local = WiFi.localIP(); uint32_t EncodeLightId(uint8_t idx)
return ((ip_local & 0xFF000000) >> 20) + idx % 16; // >> 24 * 16 is equivalent to >> 20 {
uint8_t mac[6];
WiFi.macAddress(mac);
uint32_t id = (mac[4] << 12) | (mac[5] << 4) | (idx & 0xF);
return id;
}
uint32_t DecodeLightId(uint32_t id) {
return id & 0xF;
} }
void HueGlobalConfig(String *path) void HueGlobalConfig(String *path)
@ -357,7 +365,7 @@ void HueGlobalConfig(String *path)
path->remove(0,1); // cut leading / to get <id> path->remove(0,1); // cut leading / to get <id>
response = F("{\"lights\":{\""); response = F("{\"lights\":{\"");
for (uint8_t i = 1; i <= maxhue; i++) { for (uint8_t i = 1; i <= maxhue; i++) {
response += lightId(i); response += EncodeLightId(i);
response += F("\":{\"state\":"); response += F("\":{\"state\":");
HueLightStatus1(i, &response); HueLightStatus1(i, &response);
HueLightStatus2(i, &response); HueLightStatus2(i, &response);
@ -401,7 +409,7 @@ void HueLights(String *path)
if (path->endsWith("/lights")) { // Got /lights if (path->endsWith("/lights")) { // Got /lights
response = "{\""; response = "{\"";
for (uint8_t i = 1; i <= maxhue; i++) { for (uint8_t i = 1; i <= maxhue; i++) {
response += lightId(i); response += EncodeLightId(i);
response += F("\":{\"state\":"); response += F("\":{\"state\":");
HueLightStatus1(i, &response); HueLightStatus1(i, &response);
HueLightStatus2(i, &response); HueLightStatus2(i, &response);
@ -569,7 +577,7 @@ void HueLights(String *path)
} }
else if(path->indexOf("/lights/") >= 0) { // Got /lights/ID else if(path->indexOf("/lights/") >= 0) { // Got /lights/ID
path->remove(0,8); // Remove /lights/ path->remove(0,8); // Remove /lights/
device = atoi(path->c_str()) % 16; device = DecodeLightId(atoi(path->c_str()));
if ((device < 1) || (device > maxhue)) { if ((device < 1) || (device > maxhue)) {
device = 1; device = 1;
} }
@ -598,7 +606,7 @@ void HueGroups(String *path)
String lights = F("\"1\""); String lights = F("\"1\"");
for (uint8_t i = 2; i <= maxhue; i++) { for (uint8_t i = 2; i <= maxhue; i++) {
lights += ",\""; lights += ",\"";
lights += lightId(i); lights += EncodeLightId(i);
lights += "\""; lights += "\"";
} }
response.replace("{l1", lights); response.replace("{l1", lights);