MARVEL/pwm32e_pro
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

缩短死区并提高混合光最低亮度

Browse Source
This commit is contained in:
吴琪
2026-07-27 18:06:20 +08:00
parent 9b1455209d
commit 800473b193
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
project/example/ble/ble_peripheral/app/src/bridge_pwm.c
+4 -4
View File
@@ -16,15 +16,15 @@
* Dual-color output uses one fixed 1 ms frame: * Dual-color output uses one fixed 1 ms frame:
* OFF -> W pulse -> OFF -> C pulse -> OFF to frame end. * OFF -> W pulse -> OFF -> C pulse -> OFF to frame end.
* The available OFF time is distributed around both direction changes and * The available OFF time is distributed around both direction changes and
* each W/C transition retains at least 50 us protection. * each W/C transition retains at least 25 us protection.
* Both non-zero colors therefore produce exactly one pulse per frame (1 kHz). * Both non-zero colors therefore produce exactly one pulse per frame (1 kHz).
*/ */
#define BRIDGE_PWM_SCALE 1000U #define BRIDGE_PWM_SCALE 1000U
#define BRIDGE_PWM_PERIOD 7U #define BRIDGE_PWM_PERIOD 7U
#define BRIDGE_MIX_SCALE 1000U #define BRIDGE_MIX_SCALE 1000U
#define BRIDGE_FRAME_US 1000U #define BRIDGE_FRAME_US 1000U
#define BRIDGE_DEADTIME_US 50U #define BRIDGE_DEADTIME_US 25U
#define BRIDGE_DUAL_ACTIVE_US 900U #define BRIDGE_DUAL_ACTIVE_US 950U
#define BRIDGE_MIN_DUAL_PULSE_US 15U #define BRIDGE_MIN_DUAL_PULSE_US 15U
#define BRIDGE_TIMER_TICKS_PER_US 16U #define BRIDGE_TIMER_TICKS_PER_US 16U
@@ -321,7 +321,7 @@ __RAM_CODE void Bridge_Service_1ms(void)
if (cached_w_mix != w_mix || cached_c_mix != c_mix || if (cached_w_mix != w_mix || cached_c_mix != c_mix ||
output_mode != BRIDGE_MODE_DUAL) { output_mode != BRIDGE_MODE_DUAL) {
/* /*
* Keep 100 us OFF at maximum dual-color brightness. The OFF time is * Keep 50 us OFF at maximum dual-color brightness. The OFF time is
* split evenly between W->C and C->W, which both absorbs interrupt * split evenly between W->C and C->W, which both absorbs interrupt
* latency and spreads the two optical pulses across the 1 ms frame. * latency and spreads the two optical pulses across the 1 ms frame.
*/ */
project/example/ble/ble_peripheral/app/src/light_transition.c
+3 -3
View File
@@ -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_COMBINED_OUTPUT (LIGHT_OUTPUT_SCALE / 10U) #define DUAL_MIN_COMBINED_OUTPUT ((LIGHT_OUTPUT_SCALE * 12U) / 100U)
#define DUAL_MIN_STABLE_CHANNEL_OUTPUT 17U #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
@@ -225,8 +225,8 @@ void Light_Transition_Task(void)
(LIGHT_OUTPUT_SCALE / 100U) + 2048U) >> 12); (LIGHT_OUTPUT_SCALE / 100U) + 2048U) >> 12);
/* /*
* Mixed light starts from a 10% combined floor. If the weaker direction * Mixed light starts from a 12% combined floor. If the weaker direction
* would be below 17/1000 (about 15 us of the 900 us active window), raise * would be below 17/1000 (about 16 us of the 950 us active window), raise
* the combined floor just enough to preserve the requested W:C ratio. * the combined floor just enough to preserve the requested W:C ratio.
* Ratios that cannot satisfy this even at 100% are treated as single * Ratios that cannot satisfy this even at 100% are treated as single
* color. Single-color output keeps the 1% Gamma minimum. * color. Single-color output keeps the 1% Gamma minimum.