按46微秒阈值调整混合光亮度

This commit is contained in:
2026-07-27 21:47:01 +08:00
parent 7263ad9ebc
commit f06b247c0d
@@ -8,7 +8,7 @@ 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_MIN_STABLE_CHANNEL_OUTPUT 145U #define DUAL_MIN_STABLE_CHANNEL_OUTPUT 102U
#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
@@ -36,22 +36,22 @@ static const uint16_t brightness_gamma_q12[100] = {
}; };
/* /*
* Mixed-light Gamma table. Its first level equals the original 50% APP level * Mixed-light Gamma table. Its first level equals the original level 41
* (1184/4096), where a 50:50 mix measures about 65 us per direction at 2 kHz. * (834/4096), where a 50:50 mix measures about 46 us per direction at 2 kHz.
* The remaining range is expanded to 100%, so all brightness levels remain * The remaining range is expanded to 100%, so all brightness levels remain
* distinct instead of clamping the lower levels to one fixed output. * distinct instead of clamping the lower levels to one fixed output.
*/ */
static const uint16_t mixed_brightness_gamma_q12[100] = { static const uint16_t mixed_brightness_gamma_q12[100] = {
1184U, 1185U, 1187U, 1189U, 1193U, 1198U, 1203U, 1208U, 1216U, 1223U, 834U, 835U, 837U, 840U, 844U, 849U, 855U, 861U, 869U, 877U,
1231U, 1240U, 1249U, 1259U, 1270U, 1282U, 1293U, 1306U, 1319U, 1333U, 886U, 897U, 907U, 918U, 931U, 943U, 956U, 971U, 985U, 1001U,
1348U, 1363U, 1378U, 1394U, 1411U, 1428U, 1446U, 1465U, 1484U, 1504U, 1017U, 1034U, 1051U, 1070U, 1088U, 1108U, 1128U, 1149U, 1170U, 1192U,
1524U, 1544U, 1565U, 1587U, 1609U, 1632U, 1655U, 1680U, 1703U, 1728U, 1214U, 1237U, 1261U, 1285U, 1310U, 1336U, 1362U, 1389U, 1416U, 1444U,
1753U, 1780U, 1806U, 1833U, 1860U, 1888U, 1916U, 1946U, 1975U, 2005U, 1472U, 1502U, 1531U, 1561U, 1592U, 1623U, 1655U, 1688U, 1720U, 1753U,
2036U, 2067U, 2097U, 2130U, 2162U, 2195U, 2228U, 2262U, 2296U, 2331U, 1788U, 1823U, 1857U, 1893U, 1930U, 1967U, 2004U, 2041U, 2080U, 2119U,
2366U, 2402U, 2438U, 2474U, 2512U, 2549U, 2587U, 2626U, 2665U, 2704U, 2158U, 2198U, 2239U, 2280U, 2321U, 2363U, 2406U, 2449U, 2493U, 2537U,
2744U, 2785U, 2826U, 2867U, 2908U, 2951U, 2993U, 3036U, 3080U, 3124U, 2582U, 2627U, 2673U, 2719U, 2765U, 2813U, 2860U, 2909U, 2958U, 3007U,
3168U, 3213U, 3259U, 3304U, 3351U, 3397U, 3444U, 3492U, 3539U, 3588U, 3057U, 3107U, 3158U, 3209U, 3261U, 3313U, 3366U, 3419U, 3473U, 3527U,
3637U, 3686U, 3736U, 3786U, 3837U, 3888U, 3939U, 3991U, 4044U, 4096U 3582U, 3637U, 3693U, 3748U, 3806U, 3863U, 3921U, 3979U, 4037U, 4096U
}; };
/* /*
@@ -257,7 +257,7 @@ void Light_Transition_Task(void)
/* /*
* Keep the weaker mixed-light direction at the measured stable threshold. * Keep the weaker mixed-light direction at the measured stable threshold.
* Raise the combined output only when the requested W:C ratio needs it. * Raise the combined output only when the requested W:C ratio needs it.
* A ratio that cannot provide 145/1000 to its weak side even at full * A ratio that cannot provide 102/1000 to its weak side even at full
* brightness is treated as single color. * brightness is treated as single color.
*/ */
if(W_PWM != 0U && C_PWM != 0U) if(W_PWM != 0U && C_PWM != 0U)