按混色比例动态设置最低亮度

This commit is contained in:
2026-07-27 17:57:09 +08:00
parent 45cef73611
commit 9b1455209d
@@ -8,7 +8,8 @@ volatile uint8_t Light_Transition_FadeActive;
#define OUTPUT_SMOOTH_SHIFT 4U #define OUTPUT_SMOOTH_SHIFT 4U
#define LIGHT_OUTPUT_SCALE 1000U #define LIGHT_OUTPUT_SCALE 1000U
#define BREATH_MIN_OUTPUT (LIGHT_OUTPUT_SCALE / 100U) #define BREATH_MIN_OUTPUT (LIGHT_OUTPUT_SCALE / 100U)
#define DUAL_CHANNEL_MIN_OUTPUT (LIGHT_OUTPUT_SCALE / 10U) #define DUAL_MIN_COMBINED_OUTPUT (LIGHT_OUTPUT_SCALE / 10U)
#define DUAL_MIN_STABLE_CHANNEL_OUTPUT 17U
#define POWER_FADE_Q12_MAX 4096U #define POWER_FADE_Q12_MAX 4096U
#define POWER_FADE_ON_TICKS 140U #define POWER_FADE_ON_TICKS 140U
#define POWER_FADE_OFF_TICKS 160U #define POWER_FADE_OFF_TICKS 160U
@@ -195,6 +196,10 @@ void Light_Transition_Task(void)
uint16_t target_brightness_scale; uint16_t target_brightness_scale;
uint16_t brightness_scale; uint16_t brightness_scale;
uint16_t fade_scale; uint16_t fade_scale;
uint16_t mix_total;
uint16_t weak_mix;
uint16_t required_total;
uint16_t floor_w;
uint8_t power_transitioning; uint8_t power_transitioning;
/* /*
@@ -220,32 +225,43 @@ void Light_Transition_Task(void)
(LIGHT_OUTPUT_SCALE / 100U) + 2048U) >> 12); (LIGHT_OUTPUT_SCALE / 100U) + 2048U) >> 12);
/* /*
* In mixed light, each active direction has a 10% floor. Scale both * Mixed light starts from a 10% combined floor. If the weaker direction
* directions together from the weaker side so the requested W:C ratio is * would be below 17/1000 (about 15 us of the 900 us active window), raise
* preserved whenever the stronger side remains within 100%. Single-color * the combined floor just enough to preserve the requested W:C ratio.
* output keeps the 1% Gamma minimum. * Ratios that cannot satisfy this even at 100% are treated as single
* color. Single-color output keeps the 1% Gamma minimum.
*/ */
if(W_PWM != 0U && C_PWM != 0U && if(W_PWM != 0U && C_PWM != 0U)
(target_w < DUAL_CHANNEL_MIN_OUTPUT ||
target_c < DUAL_CHANNEL_MIN_OUTPUT))
{ {
if(W_PWM <= C_PWM) mix_total = (uint16_t)(W_PWM + C_PWM);
weak_mix = (W_PWM < C_PWM) ? W_PWM : C_PWM;
required_total = (uint16_t)(
((uint32_t)DUAL_MIN_STABLE_CHANNEL_OUTPUT * mix_total +
weak_mix - 1U) / weak_mix);
if(required_total > LIGHT_OUTPUT_SCALE)
{ {
target_w = DUAL_CHANNEL_MIN_OUTPUT; if(W_PWM < C_PWM)
target_c = (uint16_t)( target_w = 0U;
((uint32_t)DUAL_CHANNEL_MIN_OUTPUT * C_PWM + else
(W_PWM / 2U)) / W_PWM); target_c = 0U;
if(target_c > LIGHT_OUTPUT_SCALE)
target_c = LIGHT_OUTPUT_SCALE;
} }
else else
{ {
target_c = DUAL_CHANNEL_MIN_OUTPUT; if(required_total < DUAL_MIN_COMBINED_OUTPUT)
target_w = (uint16_t)( required_total = DUAL_MIN_COMBINED_OUTPUT;
((uint32_t)DUAL_CHANNEL_MIN_OUTPUT * W_PWM +
(C_PWM / 2U)) / C_PWM); if((uint16_t)(target_w + target_c) < required_total)
if(target_w > LIGHT_OUTPUT_SCALE) {
target_w = LIGHT_OUTPUT_SCALE; floor_w = (uint16_t)(
((uint32_t)required_total * W_PWM +
(mix_total / 2U)) / mix_total);
if(floor_w == 0U) floor_w = 1U;
if(floor_w >= required_total)
floor_w = required_total - 1U;
target_w = floor_w;
target_c = required_total - floor_w;
}
} }
} }