Merge pull request #1054 from FrameworkComputer/marigold.fix_led_blinking

JohnAZoidberg · web-flow · commit 85d92ea43f82 · 2024-06-20T10:25:10.000+08:00
marigold:fix led unexpected blinking
diff --git a/zephyr/program/framework/src/led.c b/zephyr/program/framework/src/led.c
@@ -510,7 +510,7 @@ static void led_tick(void)
 
 	/* Facotry test */
 	if (!led_auto_control_is_enabled(EC_LED_ID_BATTERY_LED) ||
-		pre_fingerprint_led_state || pre_multifunction_led_state) {
+		pre_multifunction_led_state) {
 		gpio_pin_set_dt(GPIO_DT_FROM_NODELABEL(gpio_right_side), 1);
 		gpio_pin_set_dt(GPIO_DT_FROM_NODELABEL(gpio_left_side), 1);
 	}

Original file line number	Diff line number	Diff line change
`@@ -510,7 +510,7 @@ static void led_tick(void)`
`510`	`510`
`511`	`511`	`/* Facotry test */`
`512`	`512`	`if (!led_auto_control_is_enabled(EC_LED_ID_BATTERY_LED) \|\|`
`513`		`- pre_fingerprint_led_state \|\| pre_multifunction_led_state) {`
	`513`	`+ pre_multifunction_led_state) {`
`514`	`514`	`gpio_pin_set_dt(GPIO_DT_FROM_NODELABEL(gpio_right_side), 1);`
`515`	`515`	`gpio_pin_set_dt(GPIO_DT_FROM_NODELABEL(gpio_left_side), 1);`
`516`	`516`	`}`