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

Merge pull request #9928 from s-hadinger/zigbee_plug_glitch

Browse Source 
Zigbee fix glitch in UI for plugs
This commit is contained in:
s-hadinger 2020-11-20 22:16:45 +01:00 committed by GitHub
commit fbd331a2eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tasmota/xdrv_23_zigbee_A_impl.ino
View File

@ -1744,7 +1744,9 @@ void ZigbeeShow(bool json)
const Z_Data_Light & light = device.data.find<Z_Data_Light>(); const Z_Data_Light & light = device.data.find<Z_Data_Light>();
bool light_display = (&light != nullptr) ? light.validDimmer() : false; bool light_display = (&light != nullptr) ? light.validDimmer() : false;
const Z_Data_Plug & plug = device.data.find<Z_Data_Plug>(); const Z_Data_Plug & plug = device.data.find<Z_Data_Plug>();
if (onoff_display || light_display || (&plug != nullptr)) { bool plug_voltage = (&plug != nullptr) ? plug.validMainsVoltage() : false;
bool plug_power = (&plug != nullptr) ? plug.validMainsPower() : false;
if (onoff_display || light_display || plug_voltage || plug_power) {
int8_t channels = device.getLightChannels(); int8_t channels = device.getLightChannels();
if (channels < 0) { channels = 5; } // if number of channel is unknown, display all known attributes if (channels < 0) { channels = 5; } // if number of channel is unknown, display all known attributes
WSContentSend_P(PSTR("<tr class='htr'><td colspan=\"4\">&#9478;")); WSContentSend_P(PSTR("<tr class='htr'><td colspan=\"4\">&#9478;"));
@ -1770,17 +1772,13 @@ void ZigbeeShow(bool json)
WSContentSend_P(PSTR(" <i class=\"bx\" style=\"--cl:#%02X%02X%02X\"></i> #%02X%02X%02X"), r,g,b,r,g,b); WSContentSend_P(PSTR(" <i class=\"bx\" style=\"--cl:#%02X%02X%02X\"></i> #%02X%02X%02X"), r,g,b,r,g,b);
} }
} }
if (&plug != nullptr) { if (plug_voltage || plug_power) {
bool validMainsVoltage = plug.validMainsVoltage(); WSContentSend_P(PSTR(" &#9889; "));
bool validMainsPower = plug.validMainsPower(); if (plug_voltage) {
if (validMainsVoltage || validMainsPower) { WSContentSend_P(PSTR(" %dV"), plug.getMainsVoltage());
WSContentSend_P(PSTR(" &#9889; ")); }
if (validMainsVoltage) { if (plug_power) {
WSContentSend_P(PSTR(" %dV"), plug.getMainsVoltage()); WSContentSend_P(PSTR(" %dW"), plug.getMainsPower());
}
if (validMainsPower) {
WSContentSend_P(PSTR(" %dW"), plug.getMainsPower());
}
} }
} }
WSContentSend_P(PSTR("{e}")); WSContentSend_P(PSTR("{e}"));