payton/nt9856x
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.去掉loader下按上键升级功能

Browse Source
This commit is contained in:
payton 2024-01-24 14:07:16 +08:00
parent a283ca3db8
commit b1a9b35ba4
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
loader/LibExt/LIBExt_src/Ctrl_Flow/bl_func.c
View File

@ -3218,7 +3218,7 @@ _THUMB2 UINT32 bl_mainFlow(void)
} }
UINT32 ota_flag = 0; UINT32 ota_flag = 0;
if(gsfSpecialKeyCallBack(0)) if(FALSE == gsfSpecialKeyCallBack(0))
{ {
ota_flag = bl_check_ota_flag(uiOTABufferAddr, uiOTABufferSize); ota_flag = bl_check_ota_flag(uiOTABufferAddr, uiOTABufferSize);
} }

21
loader/Project/Model/Src/prj_main.c
View File

@ -43,8 +43,8 @@
#define GPIO_SPECIAL_USB D_GPIO_7 #define GPIO_SPECIAL_USB D_GPIO_7
#elif (MODEL == MODEL_S550) #elif (MODEL == MODEL_S550)
#define GPIO_KEY_TEST P_GPIO_22 #define GPIO_KEY_TEST P_GPIO_22//Key Up
#define GPIO_ISP_KEY_DET C_GPIO_4 #define GPIO_ISP_KEY_DET C_GPIO_4 //Key Left
#define GPIO_FASTBOOT_KEY GPIO_KEY_TEST #define GPIO_FASTBOOT_KEY GPIO_KEY_TEST
#define GPIO_SPECIAL_KEY GPIO_KEY_TEST #define GPIO_SPECIAL_KEY GPIO_KEY_TEST
#define GPIO_SPECIAL_KEY2 GPIO_ISP_KEY_DET #define GPIO_SPECIAL_KEY2 GPIO_ISP_KEY_DET
@ -158,17 +158,18 @@ static BOOL prj_isSpecialKeyPressed(UINT32 ota_flag)
#if (MODEL == MODEL_S530) #if (MODEL == MODEL_S530)
if ((!gpio_getPin(GPIO_SPECIAL_KEY)) && (gpio_getPin(GPIO_SPECIAL_USB))) if ((!gpio_getPin(GPIO_SPECIAL_KEY)) && (gpio_getPin(GPIO_SPECIAL_USB)))
#elif (MODEL == MODEL_S550) #elif (MODEL == MODEL_S550)
if ((gpio_getPin(GPIO_SPECIAL_KEY)) && (gpio_getPin(GPIO_SPECIAL_USB))) if ((!(gpio_getPin(GPIO_SPECIAL_KEY2)) && (gpio_getPin(GPIO_SPECIAL_USB))))//Force Upgrade
#endif #endif
{ {
return TRUE; return TRUE;
} }
else if((!(gpio_getPin(GPIO_SPECIAL_KEY2)) && (gpio_getPin(GPIO_SPECIAL_USB))) || prj_is_WDT_OTA() || prj_is_Flash_OTA(ota_flag)) else if(prj_is_WDT_OTA() || prj_is_Flash_OTA(ota_flag))//Software OTA upgrade
{ {
return TRUE; return TRUE;
}else { }else
return FALSE; {
} return FALSE;
}
//return TRUE; //return TRUE;
} }
static BOOL prj_issfSpecialKeyPressed(UINT32 ota_flag) static BOOL prj_issfSpecialKeyPressed(UINT32 ota_flag)
@ -177,7 +178,7 @@ static BOOL prj_issfSpecialKeyPressed(UINT32 ota_flag)
#if (MODEL == MODEL_S530) #if (MODEL == MODEL_S530)
if ((!gpio_getPin(GPIO_SPECIAL_KEY)) && (gpio_getPin(GPIO_SPECIAL_USB))) if ((!gpio_getPin(GPIO_SPECIAL_KEY)) && (gpio_getPin(GPIO_SPECIAL_USB)))
#elif (MODEL == MODEL_S550) #elif (MODEL == MODEL_S550)
if ((gpio_getPin(GPIO_SPECIAL_KEY)) && (gpio_getPin(GPIO_SPECIAL_USB))) if ((!(gpio_getPin(GPIO_SPECIAL_KEY2)) && (gpio_getPin(GPIO_SPECIAL_USB))))//Force Upgrade
#endif #endif
{ {
return TRUE; return TRUE;