修复合并冲突

diff --git a/code/sdk/zhihui/leiniao/imsl_ln/leiniao_api_at.c b/code/sdk/zhihui/leiniao/imsl_ln/leiniao_api_at.c
index 88ffcd4..1a5e3d0 100644 (file)
--- a/code/sdk/zhihui/leiniao/imsl_ln/leiniao_api_at.c
+++ b/code/sdk/zhihui/leiniao/imsl_ln/leiniao_api_at.c
@@ -1466,6 +1466,19 @@ static uint32_t ln_set_fps_at(uint8_t *para, uint32_t paraLen, char *strCommonCm
 
 /* AT^LN_GET_FPS - 获取当前帧率 */
 static uint32_t ln_get_fps_at(uint8_t *para, uint32_t paraLen, char *strCommonCmd)
+{
+    VAD_UNUSED(para);
+    VAD_UNUSED(paraLen);
+    VAD_UNUSED(strCommonCmd);
+    
+    printf("[LN][GET_FPS] Getting current FPS...\n");
+    
+    // 调用统一的C接口获取帧率
+    uint32_t current_fps = do_get_fps();
+    printf("[LN][GET_FPS] Current FPS: %u\n", current_fps);
+    return ERRCODE_SUCC;
+}
+
 /* AT^LN_DOWNLOAD_EMOJI */
 static uint32_t ln_download_emoji_at(uint8_t *para, uint32_t paraLen, char *strCommonCmd)
 {