Merge branch 'martinroger-master'

Y1hsiaochunnn · Y1hsiaochunnn · commit 058626090a73 · 2026-01-04T09:08:54.000+08:00
diff --git a/bsp/esp32_s3_touch_amoled_1_75/esp32_s3_touch_amoled_1_75.c b/bsp/esp32_s3_touch_amoled_1_75/esp32_s3_touch_amoled_1_75.c
@@ -652,7 +652,7 @@ esp_err_t bsp_display_rotation_set(bsp_display_rotation_t rotation)
 
 bool bsp_display_lock(uint32_t timeout_ms)
 {
-    return esp_lv_adapter_lock(timeout_ms);
+    return (esp_lv_adapter_lock(timeout_ms) == ESP_OK);
 }
 
 void bsp_display_unlock(void)
diff --git a/bsp/esp32_s3_touch_amoled_1_75/include/bsp/esp32_s3_touch_amoled_1_75.h b/bsp/esp32_s3_touch_amoled_1_75/include/bsp/esp32_s3_touch_amoled_1_75.h
@@ -305,7 +305,7 @@ lv_indev_t *bsp_display_get_input_dev(void);
 /**
  * @brief Take LVGL mutex
  *
- * @param timeout_ms Timeout in [ms]. 0 will block indefinitely.
+ * @param timeout_ms Timeout in [ms]. -1 will block indefinitely.
  * @return true  Mutex was taken
  * @return false Mutex was NOT taken
  */

Original file line number	Diff line number	Diff line change
`@@ -652,7 +652,7 @@ esp_err_t bsp_display_rotation_set(bsp_display_rotation_t rotation)`
`652`	`652`
`653`	`653`	`bool bsp_display_lock(uint32_t timeout_ms)`
`654`	`654`	`{`
`655`		`- return esp_lv_adapter_lock(timeout_ms);`
	`655`	`+ return (esp_lv_adapter_lock(timeout_ms) == ESP_OK);`
`656`	`656`	`}`
`657`	`657`
`658`	`658`	`void bsp_display_unlock(void)`
Original file line number	Diff line number	Diff line change
`@@ -305,7 +305,7 @@ lv_indev_t *bsp_display_get_input_dev(void);`
`305`	`305`	`/**`
`306`	`306`	`* @brief Take LVGL mutex`
`307`	`307`	`*`
`308`		`- * @param timeout_ms Timeout in [ms]. 0 will block indefinitely.`
	`308`	`+ * @param timeout_ms Timeout in [ms]. -1 will block indefinitely.`
`309`	`309`	`* @return true Mutex was taken`
`310`	`310`	`* @return false Mutex was NOT taken`
`311`	`311`	`*/`