mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7020 from s-hadinger/light_fix 

Multiple fixes in light
This commit is contained in:
Theo Arends 2019-11-24 22:36:33 +01:00 committed by GitHub
parent 0fb236c834 6af40a2ba3
commit 1d9d637c2e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 53 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
tasmota/xdrv_04_light.ino
View File

@ -1173,7 +1173,7 @@ void LightInit(void)
light_controller.setCTRGBLinked(ct_rgb_linked); light_controller.setCTRGBLinked(ct_rgb_linked);
} }
if ((LST_SINGLE < Light.subtype) && Light.pwm_multi_channels) { if ((LST_SINGLE <= Light.subtype) && Light.pwm_multi_channels) {
// we treat each PWM channel as an independant one, hence we switch to // we treat each PWM channel as an independant one, hence we switch to
light_controller.setPWMMultiChannel(true); light_controller.setPWMMultiChannel(true);
Light.device = devices_present - Light.subtype + 1; // adjust if we also have relays Light.device = devices_present - Light.subtype + 1; // adjust if we also have relays
@ -1363,6 +1363,7 @@ void LightState(uint8_t append)
{ {
char scolor[LIGHT_COLOR_SIZE]; char scolor[LIGHT_COLOR_SIZE];
char scommand[33]; char scommand[33];
bool unlinked = !light_controller.isCTRGBLinked() && (Light.subtype >= LST_RGBW); // there are 2 power and dimmers for RGB and White
if (append) { if (append) {
ResponseAppend_P(PSTR(",")); ResponseAppend_P(PSTR(","));
@ -1370,8 +1371,18 @@ void LightState(uint8_t append)
Response_P(PSTR("{")); Response_P(PSTR("{"));
} }
if (!Light.pwm_multi_channels) { if (!Light.pwm_multi_channels) {
GetPowerDevice(scommand, Light.device, sizeof(scommand), Settings.flag.device_index_enable); // SetOption26 - Switch between POWER or POWER1 if (unlinked) {
ResponseAppend_P(PSTR("\"%s\":\"%s\",\"" D_CMND_DIMMER "\":%d"), scommand, GetStateText(Light.power), light_state.getDimmer()); // RGB and W are unlinked, we display the second Power/Dimmer
ResponseAppend_P(PSTR("\"" D_RSLT_POWER "%d\":\"%s\",\"" D_CMND_DIMMER "%d\":%d"
",\"" D_RSLT_POWER "%d\":\"%s\",\"" D_CMND_DIMMER "%d\":%d"),
Light.device, GetStateText(Light.power & 1), Light.device, light_state.getDimmer(1),
Light.device + 1, GetStateText(Light.power & 2 ? 1 : 0), Light.device + 1, light_state.getDimmer(2));
} else {
GetPowerDevice(scommand, Light.device, sizeof(scommand), Settings.flag.device_index_enable); // SetOption26 - Switch between POWER or POWER1
ResponseAppend_P(PSTR("\"%s\":\"%s\",\"" D_CMND_DIMMER "\":%d"), scommand, GetStateText(Light.power & 1),
light_state.getDimmer());
}
if (Light.subtype > LST_SINGLE) { if (Light.subtype > LST_SINGLE) {
ResponseAppend_P(PSTR(",\"" D_CMND_COLOR "\":\"%s\""), LightGetColor(scolor)); ResponseAppend_P(PSTR(",\"" D_CMND_COLOR "\":\"%s\""), LightGetColor(scolor));
@ -1423,8 +1434,7 @@ void LightState(uint8_t append)
} }
} }
void LightPreparePower(void) void LightPreparePower(power_t channels = 0xFFFFFFFF) { // 1 = only RGB, 2 = only CT, 3 = both RGB and CT
{
#ifdef DEBUG_LIGHT #ifdef DEBUG_LIGHT
AddLog_P2(LOG_LEVEL_DEBUG, "LightPreparePower power=%d Light.power=%d", power, Light.power); AddLog_P2(LOG_LEVEL_DEBUG, "LightPreparePower power=%d Light.power=%d", power, Light.power);
#endif #endif
@ -1462,20 +1472,24 @@ void LightPreparePower(void)
} }
} else { } else {
// RGB // RGB
if (light_state.getBriRGB() && !(Light.power & 1)) { if (channels & 1) {
if (!Settings.flag.not_power_linked) { // SetOption20 - Control power in relation to Dimmer/Color/Ct changes if (light_state.getBriRGB() && !(Light.power & 1)) {
ExecuteCommandPower(Light.device, POWER_ON_NO_STATE, SRC_LIGHT); if (!Settings.flag.not_power_linked) { // SetOption20 - Control power in relation to Dimmer/Color/Ct changes
ExecuteCommandPower(Light.device, POWER_ON_NO_STATE, SRC_LIGHT);
}
} else if (!light_state.getBriRGB() && (Light.power & 1)) {
ExecuteCommandPower(Light.device, POWER_OFF_NO_STATE, SRC_LIGHT);
} }
} else if (!light_state.getBri() && (Light.power & 1)) {
ExecuteCommandPower(Light.device, POWER_OFF_NO_STATE, SRC_LIGHT);
} }
// White CT // White CT
if (light_state.getBriCT() && !(Light.power & 2)) { if (channels & 2) {
if (!Settings.flag.not_power_linked) { // SetOption20 - Control power in relation to Dimmer/Color/Ct changes if (light_state.getBriCT() && !(Light.power & 2)) {
ExecuteCommandPower(Light.device + 1, POWER_ON_NO_STATE, SRC_LIGHT); if (!Settings.flag.not_power_linked) { // SetOption20 - Control power in relation to Dimmer/Color/Ct changes
ExecuteCommandPower(Light.device + 1, POWER_ON_NO_STATE, SRC_LIGHT);
}
} else if (!light_state.getBriCT() && (Light.power & 2)) {
ExecuteCommandPower(Light.device + 1, POWER_OFF_NO_STATE, SRC_LIGHT);
} }
} else if (!light_state.getBri() && (Light.power & 2)) {
ExecuteCommandPower(Light.device + 1, POWER_OFF_NO_STATE, SRC_LIGHT);
} }
} }
#ifdef USE_DOMOTICZ #ifdef USE_DOMOTICZ
@ -2071,7 +2085,7 @@ void CmndSupportColor(void)
ResponseCmndIdxChar(scolor); ResponseCmndIdxChar(scolor);
} }
if (coldim) { if (coldim) {
LightPreparePower(); LightPreparePower(); // no parameter, recalculate Power for all channels
} }
} }
@ -2102,11 +2116,12 @@ void CmndWhite(void)
void CmndChannel(void) void CmndChannel(void)
{ {
if ((XdrvMailbox.index >= Light.device) && (XdrvMailbox.index < Light.device + Light.subtype )) { if ((XdrvMailbox.index >= Light.device) && (XdrvMailbox.index < Light.device + Light.subtype )) {
bool coldim = false; uint32_t light_index = XdrvMailbox.index - Light.device;
power_t coldim = 0; // bit flag to update
// Handle +/- special command // Handle +/- special command
if (1 == XdrvMailbox.data_len) { if (1 == XdrvMailbox.data_len) {
uint8_t channel = changeUIntScale(Light.current_color[XdrvMailbox.index - Light.device],0,255,0,100); uint8_t channel = changeUIntScale(Light.current_color[light_index],0,255,0,100);
if ('+' == XdrvMailbox.data[0]) { if ('+' == XdrvMailbox.data[0]) {
XdrvMailbox.payload = (channel > 89) ? 100 : channel + 10; XdrvMailbox.payload = (channel > 89) ? 100 : channel + 10;
} else if ('-' == XdrvMailbox.data[0]) { } else if ('-' == XdrvMailbox.data[0]) {
@ -2116,23 +2131,28 @@ void CmndChannel(void)
// Set "Channel" directly - this allows Color and Direct PWM control to coexist // Set "Channel" directly - this allows Color and Direct PWM control to coexist
if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 100)) { if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 100)) {
Light.current_color[XdrvMailbox.index - Light.device] = changeUIntScale(XdrvMailbox.payload,0,100,0,255); Light.current_color[light_index] = changeUIntScale(XdrvMailbox.payload,0,100,0,255);
if (Light.pwm_multi_channels) { if (Light.pwm_multi_channels) {
// if (!Settings.flag.not_power_linked) { // SetOption20 - Control power in relation to Dimmer/Color/Ct changes coldim = 1 << light_index; // change the specified channel
// Light.power = Light.power | (1 << (XdrvMailbox.index - Light.device)); // ask to turn on channel
// }
} else { } else {
// if we change channels 1,2,3 then turn off CT mode (unless non-linked) if (light_controller.isCTRGBLinked()) {
if ((XdrvMailbox.index <= 3) && (light_controller.isCTRGBLinked())) { // if we change channels 1,2,3 then turn off CT mode (unless non-linked)
Light.current_color[3] = Light.current_color[4] = 0; if ((light_index < 3) && (light_controller.isCTRGBLinked())) {
Light.current_color[3] = Light.current_color[4] = 0;
} else {
Light.current_color[0] = Light.current_color[1] = Light.current_color[2] = 0;
}
coldim = 1;
} else {
if (light_index < 3) { coldim = 1; } // RGB
else { coldim = 2; } // CT
} }
} }
light_controller.changeChannels(Light.current_color); light_controller.changeChannels(Light.current_color);
coldim = true;
} }
ResponseCmndIdxNumber(changeUIntScale(Light.current_color[XdrvMailbox.index -1],0,255,0,100)); ResponseCmndIdxNumber(changeUIntScale(Light.current_color[light_index],0,255,0,100));
if (coldim) { if (coldim) {
LightPreparePower(); LightPreparePower(coldim);
} }
} }
} }
@ -2179,7 +2199,7 @@ void CmndHsbColor(void)
} }
if (validHSB) { if (validHSB) {
light_controller.changeHSB(HSB[0], HSB[1], HSB[2]); light_controller.changeHSB(HSB[0], HSB[1], HSB[2]);
LightPreparePower(); LightPreparePower(1);
MqttPublishPrefixTopic_P(RESULT_OR_STAT, PSTR(D_CMND_COLOR)); MqttPublishPrefixTopic_P(RESULT_OR_STAT, PSTR(D_CMND_COLOR));
} }
} else { } else {
@ -2242,7 +2262,7 @@ void CmndColorTemperature(void)
} }
if ((XdrvMailbox.payload >= 153) && (XdrvMailbox.payload <= 500)) { // https://developers.meethue.com/documentation/core-concepts if ((XdrvMailbox.payload >= 153) && (XdrvMailbox.payload <= 500)) { // https://developers.meethue.com/documentation/core-concepts
light_controller.changeCTB(XdrvMailbox.payload, light_state.getBri()); light_controller.changeCTB(XdrvMailbox.payload, light_state.getBri());
LightPreparePower(); LightPreparePower(2);
} else { } else {
ResponseCmndNumber(ct); ResponseCmndNumber(ct);
} }
@ -2272,17 +2292,19 @@ void CmndDimmer(void)
if (light_controller.isCTRGBLinked()) { if (light_controller.isCTRGBLinked()) {
// normal state, linked RGB and CW // normal state, linked RGB and CW
light_controller.changeDimmer(XdrvMailbox.payload); light_controller.changeDimmer(XdrvMailbox.payload);
LightPreparePower();
} else { } else {
if (0 != XdrvMailbox.index) { if (0 != XdrvMailbox.index) {
light_controller.changeDimmer(XdrvMailbox.payload, XdrvMailbox.index); light_controller.changeDimmer(XdrvMailbox.payload, XdrvMailbox.index);
LightPreparePower(1 << (XdrvMailbox.index - 1)); // recalculate only the target dimmer
} else { } else {
// change both dimmers // change both dimmers
light_controller.changeDimmer(XdrvMailbox.payload, 1); light_controller.changeDimmer(XdrvMailbox.payload, 1);
light_controller.changeDimmer(XdrvMailbox.payload, 2); light_controller.changeDimmer(XdrvMailbox.payload, 2);
LightPreparePower();
} }
} }
Light.update = true; Light.update = true;
LightPreparePower();
} else { } else {
ResponseCmndNumber(dimmer); ResponseCmndNumber(dimmer);
} }