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

Fix better handling of PWM White Temperature mode for Module 48 (#6534)

This commit is contained in:
Stephan Hadinger 2019-10-06 20:34:35 +02:00
parent 2ed171c4c0
commit 58da51be1c
2 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sonoff/_changelog.ino
View File

@ -5,6 +5,7 @@
* Add support for SM2135 as used in Action LSC Smart Led E14 (#6495)
* Add command SetOption72 0/1 to switch between software (0) or hardware (1) energy total counter (#6561)
* Add Zigbee tracking of connected devices and auto-probing of Manuf/Model Ids
* Fix better handling of PWM White Temperature mode for Module 48 (#6534)
*
* 6.6.0.14 20190925
* Change command Tariffx to allow time entries like 23 (hours), 1320 (minutes) or 23:00. NOTE: As this is development branch previous tariffs are lost! (#6488)

36
sonoff/xdrv_04_light.ino
View File

@ -404,7 +404,7 @@ class LightStateClass {
if (b) { *b = _b; }
}
// get full brightness values for wamr and cold channels.
// get full brightness values for warm and cold channels.
// either w=c=0 (off) or w+c >= 255
void getCW(uint8_t *rc, uint8_t *rw) {
if (rc) { *rc = _wc; }
@ -1776,12 +1776,13 @@ void LightAnimate(void)
cur_col_10bits[i] = changeUIntScale(cur_col[i], 0, 255, 0, 1023);
}
if (PHILIPS == my_module_type) {
calcGammaXiaomiBulbs(cur_col, cur_col_10bits);
} else if (Light.pwm_multi_channels) {
if (Light.pwm_multi_channels) {
calcGammaMultiChannels(cur_col, cur_col_10bits);
} else { // PHILIPS != my_module_type
} else {
calcGammaBulbs(cur_col, cur_col_10bits);
if (PHILIPS == my_module_type) {
calcGammaCTPwm(cur_col, cur_col_10bits);
}
// Now see if we need to mix RGB and True White
// Valid only for LST_RGBW, LST_RGBWC, rgbwwTable[4] is zero, and white is zero (see doc)
@ -1870,22 +1871,25 @@ void LightAnimate(void)
}
}
// Do specific computation for Xiaomi Bulbs
void calcGammaXiaomiBulbs(uint8_t cur_col[5], uint16_t cur_col_10bits[5]) {
// Do specific computation is SetOption73 is on, Color Temp is a separate PWM channel
void calcGammaCTPwm(uint8_t cur_col[5], uint16_t cur_col_10bits[5]) {
// Xiaomi Philips bulbs follow a different scheme:
uint8_t cold; // channel 1 is the color tone, mapped to cold channel (0..255)
light_state.getCW(&cold, nullptr);
cur_col[1] = cold;
cur_col_10bits[1] = changeUIntScale(cur_col[1], 0, 255, 0, 1023);
uint8_t cold, warm; // channel 1 is the color tone, mapped to cold channel (0..255)
light_state.getCW(&cold, &warm);
// channels for white are always the last two channels
uint32_t cw1 = Light.subtype - 1; // address for the ColorTone PWM
uint32_t cw0 = Light.subtype - 2; // address for the White Brightness PWM
cur_col[cw1] = changeUIntScale(cold, 0, cold + warm, 0, 255); //
cur_col_10bits[cw1] = changeUIntScale(cur_col[cw1], 0, 255, 0, 1023);
// now set channel 0 to overall brightness
uint8_t pxBri = light_state.getBriCT();
// channel 0=intensity, channel1=temperature
if (Settings.light_correction) { // gamma correction
cur_col[0] = ledGamma(pxBri);
cur_col_10bits[0] = ledGamma(pxBri, 10); // 10 bits gamma correction
cur_col[cw0] = ledGamma(pxBri);
cur_col_10bits[cw0] = ledGamma(pxBri, 10); // 10 bits gamma correction
} else {
cur_col[0] = pxBri;
cur_col_10bits[0] = changeUIntScale(pxBri, 0, 255, 0, 1023); // no gamma, extend to 10 bits
cur_col[cw0] = pxBri;
cur_col_10bits[cw0] = changeUIntScale(pxBri, 0, 255, 0, 1023); // no gamma, extend to 10 bits
}
}
@ -1936,7 +1940,7 @@ void calcGammaBulbs(uint8_t cur_col[5], uint16_t cur_col_10bits[5]) {
}
}
// If RGBW or Single channel, also adjust White channel
if (LST_COLDWARM != Light.subtype) {
if ((LST_COLDWARM != Light.subtype) && (LST_RGBWC != Light.subtype)) {
cur_col_10bits[3] = ledGamma(cur_col[3], 10);
cur_col[3] = ledGamma(cur_col[3]);
}