From 8554fa9cd5a566597bf6e497551e2be1296e908c Mon Sep 17 00:00:00 2001 From: payton Date: Tue, 22 Aug 2023 17:53:18 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9rtos=E4=B8=8B=E7=94=B5?= =?UTF-8?q?=E6=B1=A0=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../application/source/cardv/SrcCode/System/rtos-main.c | 6 ++---- rtos/code/driver/na51089/source/mcu/sf_battery.c | 7 +++++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/rtos/code/application/source/cardv/SrcCode/System/rtos-main.c b/rtos/code/application/source/cardv/SrcCode/System/rtos-main.c index 20c26c462..bed6b3fec 100755 --- a/rtos/code/application/source/cardv/SrcCode/System/rtos-main.c +++ b/rtos/code/application/source/cardv/SrcCode/System/rtos-main.c @@ -171,7 +171,8 @@ static void insmod_system(void) #if HUNTING_CAMERA_MCU == ENABLE VOS_TICK t1, t2; vos_perf_mark(&t1); - sf_battery_check_init(); + //sf_battery_check_init(); + sf_battery_thread_init(); vos_perf_mark(&t2); DBG_DUMP("sf_mod_init: %lu\n", vos_perf_duration(t1, t2)); #endif @@ -408,9 +409,6 @@ static void mcu_task(void) sf_sys_status_led_set(SF_LED_SYS_STATE_PIR_NOT_DETECT); sf_sys_status_led_set(SF_LED_SYS_STATE_NORMAL); - #if HW_S530 - sf_view_osd_battery_draw(TRUE); - #endif //vos_util_delay_ms(15); //if(sf_is_night_mode(1) !=TRUE) diff --git a/rtos/code/driver/na51089/source/mcu/sf_battery.c b/rtos/code/driver/na51089/source/mcu/sf_battery.c index fe1ac8551..d64dd0dbf 100755 --- a/rtos/code/driver/na51089/source/mcu/sf_battery.c +++ b/rtos/code/driver/na51089/source/mcu/sf_battery.c @@ -1272,7 +1272,7 @@ BOOL sf_is_battery_low(UINT8 refresh, UINT8 nightMode) batteryVal = sf_battery_value_get(nightMode); - if(!sf_get_mode_flag()) + //if(!sf_get_mode_flag()) { if(batteryVal >= 70) { @@ -1297,7 +1297,10 @@ BOOL sf_is_battery_low(UINT8 refresh, UINT8 nightMode) sf_LatestBattLevel = batteryLevel; } - + #if HW_S530 + printf("batteryVal=%d sf_get_mode_flag()=%d \n", batteryVal, sf_get_mode_flag()); + sf_view_osd_battery_draw(TRUE); + #endif if(batteryVal == 0) return TRUE;