From de142f968f64ddd08944ba5b123b4ca1aaf95b47 Mon Sep 17 00:00:00 2001 From: payton Date: Thu, 17 Aug 2023 15:07:12 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=B0=87=E5=8D=87=E7=B4=9A=E8=A1=A8=E7=A4=BA?= =?UTF-8?q?=E5=82=B3=E9=81=9E=E5=88=B0Linux?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../source/cardv/SrcCode/System/sys_linuxboot.c | 2 +- rtos/code/driver/na51089/source/mcu/sf_mcu.c | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) mode change 100644 => 100755 rtos/code/driver/na51089/source/mcu/sf_mcu.c diff --git a/rtos/code/application/source/cardv/SrcCode/System/sys_linuxboot.c b/rtos/code/application/source/cardv/SrcCode/System/sys_linuxboot.c index 794ab3aca..4b5dd82de 100755 --- a/rtos/code/application/source/cardv/SrcCode/System/sys_linuxboot.c +++ b/rtos/code/application/source/cardv/SrcCode/System/sys_linuxboot.c @@ -841,7 +841,7 @@ static int make_bootargs(LINUXTMP_PARTITION *p_linuxtmp, unsigned int bootts_beg //static char bootargs[] = "root=/dev/ram0 rootfstype=ramfs rdinit=/linuxrc bootts=568047,1720128 resume_addr=0x00007e88 user_debug=0xff"; #if HUNTING_CAMERA_MCU == ENABLE char PowerOnModeStr[32] = {'\0'}; - snprintf(PowerOnModeStr, sizeof(PowerOnModeStr), "Mode=%d",sf_get_power_on_mode()); + snprintf(PowerOnModeStr, sizeof(PowerOnModeStr), "Mode=%d UpFw=%d",sf_get_power_on_mode(), sf_in_update()); linuxboot_set_extra_bootarg(PowerOnModeStr); #endif p_linuxtmp->bootargs_addr = p_linuxtmp->tmp_curr; diff --git a/rtos/code/driver/na51089/source/mcu/sf_mcu.c b/rtos/code/driver/na51089/source/mcu/sf_mcu.c old mode 100644 new mode 100755 index 79ab064d8..27e68741d --- a/rtos/code/driver/na51089/source/mcu/sf_mcu.c +++ b/rtos/code/driver/na51089/source/mcu/sf_mcu.c @@ -37,7 +37,7 @@ #include #include "PrjCfg.h" #include "sf_battery.h" - +#include static UINT8 McuSubVersion = 0; static UINT16 McuVersion = 0; static UINT8 DailyReportStartMode = 0; @@ -763,7 +763,13 @@ UINT32 sf_gpio_get_status(UINT32 ipin) gpio_direction_input(ipin); return (UINT32) ((gpio_get_value(ipin) == 1) ? 1 : 0 ); } - +UINT32 sf_in_update(void) +{ + if(!sf_gpio_get_status(GPIO_KEY_TEST)){ + return 1; + } + return 0; +} /************************************************* Function: sf_mcu_dataready_get Description: