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

Merge pull request #7644 from s-hadinger/gamma_48 

Fix wrong CT channel for Module 48
This commit is contained in:
Theo Arends 2020-02-01 19:06:44 +01:00 committed by GitHub
parent 42461aaaf3 3b61d77680
commit e498840ccf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 32 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
tasmota/xdrv_04_light.ino
View File

@ -2030,38 +2030,40 @@ void calcGammaMultiChannels(uint16_t cur_col_10[5]) {
void calcGammaBulbs(uint16_t cur_col_10[5]) { void calcGammaBulbs(uint16_t cur_col_10[5]) {
// Apply gamma correction for 8 and 10 bits resolutions, if needed // Apply gamma correction for 8 and 10 bits resolutions, if needed
if (Settings.light_correction) {
// First apply combined correction to the overall white power
if ((LST_COLDWARM == Light.subtype) || (LST_RGBCW == Light.subtype)) {
// 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
uint16_t white_bri10 = cur_col_10[cw0] + cur_col_10[cw1]; // cumulated brightness
uint16_t white_bri10_1023 = (white_bri10 > 1023) ? 1023 : white_bri10; // max 1023
if (PHILIPS == my_module_type) { // channel 1 is the color tone, mapped to cold channel (0..255) // First apply combined correction to the overall white power
// Xiaomi Philips bulbs follow a different scheme: if ((LST_COLDWARM == Light.subtype) || (LST_RGBCW == Light.subtype)) {
cur_col_10[cw1] = light_state.getCT10bits(); // channels for white are always the last two channels
// channel 0=intensity, channel1=temperature uint32_t cw1 = Light.subtype - 1; // address for the ColorTone PWM
if (Settings.light_correction) { // gamma correction uint32_t cw0 = Light.subtype - 2; // address for the White Brightness PWM
cur_col_10[cw0] = ledGamma10_10(white_bri10_1023); // 10 bits gamma correction uint16_t white_bri10 = cur_col_10[cw0] + cur_col_10[cw1]; // cumulated brightness
} else { uint16_t white_bri10_1023 = (white_bri10 > 1023) ? 1023 : white_bri10; // max 1023
cur_col_10[cw0] = white_bri10_1023; // no gamma, extend to 10 bits
} if (PHILIPS == my_module_type) { // channel 1 is the color tone, mapped to cold channel (0..255)
// Xiaomi Philips bulbs follow a different scheme:
cur_col_10[cw1] = light_state.getCT10bits();
// channel 0=intensity, channel1=temperature
if (Settings.light_correction) { // gamma correction
cur_col_10[cw0] = ledGamma10_10(white_bri10_1023); // 10 bits gamma correction
} else { } else {
// if sum of both channels is > 255, then channels are probably uncorrelated cur_col_10[cw0] = white_bri10_1023; // no gamma, extend to 10 bits
if (white_bri10 <= 1031) { // take a margin of 8 above 1023 to account for rounding errors }
// we calculate the gamma corrected sum of CW + WW } else if (Settings.light_correction) {
uint16_t white_bri_gamma10 = ledGamma10_10(white_bri10_1023); // if sum of both channels is > 255, then channels are probably uncorrelated
// then we split the total energy among the cold and warm leds if (white_bri10 <= 1031) { // take a margin of 8 above 1023 to account for rounding errors
cur_col_10[cw0] = changeUIntScale(cur_col_10[cw0], 0, white_bri10_1023, 0, white_bri_gamma10); // we calculate the gamma corrected sum of CW + WW
cur_col_10[cw1] = changeUIntScale(cur_col_10[cw1], 0, white_bri10_1023, 0, white_bri_gamma10); uint16_t white_bri_gamma10 = ledGamma10_10(white_bri10_1023);
} else { // then we split the total energy among the cold and warm leds
cur_col_10[cw0] = ledGamma10_10(cur_col_10[cw0]); cur_col_10[cw0] = changeUIntScale(cur_col_10[cw0], 0, white_bri10_1023, 0, white_bri_gamma10);
cur_col_10[cw1] = ledGamma10_10(cur_col_10[cw1]); cur_col_10[cw1] = changeUIntScale(cur_col_10[cw1], 0, white_bri10_1023, 0, white_bri_gamma10);
} } else {
cur_col_10[cw0] = ledGamma10_10(cur_col_10[cw0]);
cur_col_10[cw1] = ledGamma10_10(cur_col_10[cw1]);
} }
} }
}
if (Settings.light_correction) {
// then apply gamma correction to RGB channels // then apply gamma correction to RGB channels
if (LST_RGB <= Light.subtype) { if (LST_RGB <= Light.subtype) {
for (uint32_t i = 0; i < 3; i++) { for (uint32_t i = 0; i < 3; i++) {
@ -2069,8 +2071,8 @@ void calcGammaBulbs(uint16_t cur_col_10[5]) {
} }
} }
// If RGBW or Single channel, also adjust White channel // If RGBW or Single channel, also adjust White channel
if ((LST_COLDWARM != Light.subtype) && (LST_RGBCW != Light.subtype)) { if ((LST_SINGLE == Light.subtype) || (LST_RGBW == Light.subtype)) {
cur_col_10[3] = ledGamma10_10(cur_col_10[3]); cur_col_10[Light.subtype - 1] = ledGamma10_10(cur_col_10[Light.subtype - 1]);
} }
} }
} }