fix:修改芯片时钟初始化函数
This commit is contained in:
31
User/main.c
31
User/main.c
@@ -30,7 +30,6 @@ int main(void)
|
||||
uint8_t sys_reset = 0;
|
||||
unsigned char Buffer;
|
||||
|
||||
|
||||
/* - <20>ϵ<EFBFBD>ǰ<EFBFBD><C7B0>Ҫ<EFBFBD>رտ<D8B1><D5BF>Ź<EFBFBD>
|
||||
* - ԭ<><D4AD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ź<EFBFBD><C5B9><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>и<EFBFBD>λ<EFBFBD><CEBB><EFBFBD><EFBFBD><EFBFBD>Ź<EFBFBD><C5B9><EFBFBD><EFBFBD>ڣ<EFBFBD><DAA3><EFBFBD>һֱ<D2BB><D6B1><EFBFBD><EFBFBD><EFBFBD><EFBFBD>λ
|
||||
* */
|
||||
@@ -38,7 +37,7 @@ int main(void)
|
||||
SystemCoreClockUpdate(); //ϵͳ<CFB5><CDB3>ʼ<EFBFBD><CABC>
|
||||
Systick_Init();
|
||||
|
||||
UARTx_Init(UART_0,512000);
|
||||
UARTx_Init(UART_1,512000);
|
||||
UARTx_Init(UART_2,512000);
|
||||
|
||||
SYS_LED_Init();
|
||||
@@ -65,14 +64,17 @@ int main(void)
|
||||
|
||||
DBG_SYS_Printf("Project Name:%s",Prject_File_Name);
|
||||
|
||||
DBG_SYS_Printf("Project - SYSCLK_FREQ_120MHz_HSI");
|
||||
|
||||
sys_reset = RCC_GET_GLOB_RST_KEEP(); //<2F><>λ<EFBFBD><CEBB><EFBFBD>ּĴ<D6BC><C4B4><EFBFBD>
|
||||
if(sys_reset == 0x00)
|
||||
{
|
||||
DBG_SYS_Printf("<EFBFBD>ϵ縴λ \r\n");
|
||||
g_Boot_Time = 10000;
|
||||
|
||||
}else if(sys_reset == 0x02){
|
||||
DBG_SYS_Printf("<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>λ \r\n");
|
||||
g_Boot_Time = 30000;
|
||||
g_Boot_Time = 10000;
|
||||
|
||||
}else if(sys_reset == 0x03){
|
||||
DBG_SYS_Printf("MCU Flash<73><68><EFBFBD><EFBFBD><EFBFBD><EFBFBD>λ \r\n");
|
||||
@@ -80,10 +82,12 @@ int main(void)
|
||||
|
||||
}else {
|
||||
DBG_SYS_Printf("<EFBFBD>쳣<EFBFBD><EFBFBD>λ \r\n");
|
||||
g_Boot_Time = 30000;
|
||||
g_Boot_Time = 10000;
|
||||
}
|
||||
|
||||
RCC_SET_GLOB_RST_KEEP(0x01);
|
||||
SPIFLASH_Read_Update_Recode(&g_update_recode); //<2F><>ȡAPPд<50><D0B4><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||
|
||||
g_jump_flag = Read_APP_Feature();
|
||||
|
||||
//<2F><><EFBFBD><EFBFBD>ʹ<EFBFBD>õ<EFBFBD> - <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>״̬
|
||||
@@ -92,15 +96,18 @@ int main(void)
|
||||
|
||||
DBG_SYS_Printf("<EFBFBD><EFBFBD><EFBFBD><EFBFBD>MCU Flash<73><68><EFBFBD><EFBFBD><EFBFBD><EFBFBD>λ \r\n");
|
||||
|
||||
//WDT_Init();
|
||||
//RCC_SET_GLOB_RST_KEEP(0x03);
|
||||
RCC_SET_GLOB_RST_KEEP(0x03);
|
||||
Delay_Ms(1000);
|
||||
|
||||
// - <20><><EFBFBD><EFBFBD>ȫ<EFBFBD>ָ<EFBFBD>λ<EFBFBD><CEBB><EFBFBD><EFBFBD>оƬ<D0BE><C6AC><EFBFBD><EFBFBD>ת<EFBFBD><D7AA>Code Flash
|
||||
RCC_GlobleRstCFG(RB_GLOB_FORCE_RST, ENABLE);
|
||||
//RCC_GlobleRstCFG(RB_GLOB_FORCE_RST, ENABLE);
|
||||
|
||||
// - <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>λ<EFBFBD><CEBB>оƬ<D0BE><C6AC><EFBFBD><EFBFBD>ת<EFBFBD><D7AA>Code Flash,<2C><>Ҫ<EFBFBD><D2AA><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD><C4BC>е<EFBFBD>LD<4C>ļ<EFBFBD> .vector<6F>ֶ<EFBFBD><D6B6>м<EFBFBD><D0BC><EFBFBD> KEEP,<2C><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʹ<EFBFBD><CAB9>
|
||||
NVIC_SystemReset();
|
||||
while(1);
|
||||
}
|
||||
|
||||
//Dbg_Switch = 0x00;
|
||||
WDT_Init();
|
||||
|
||||
while (1)
|
||||
@@ -109,14 +116,14 @@ int main(void)
|
||||
|
||||
SYS_LED_Task();
|
||||
|
||||
Uart0_Task();
|
||||
Uart1_Task();
|
||||
|
||||
Uart2_Task();
|
||||
|
||||
//<2F><><EFBFBD><EFBFBD>ʹ<EFBFBD>õ<EFBFBD> - <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>״̬
|
||||
if(g_jump_flag == 0x00)
|
||||
{
|
||||
if(SysTick_1ms - g_Boot_Tick >= 5000)
|
||||
if(SysTick_1ms - g_Boot_Tick >= g_Boot_Time)
|
||||
{
|
||||
g_Boot_Tick = SysTick_1ms;
|
||||
|
||||
@@ -144,7 +151,11 @@ int main(void)
|
||||
|
||||
Delay_Ms(1000);
|
||||
|
||||
RCC_GlobleRstCFG(RB_GLOB_FORCE_RST, ENABLE);
|
||||
//<2F><>ʽ1<CABD><31>
|
||||
//RCC_GlobleRstCFG(RB_GLOB_FORCE_RST, ENABLE);
|
||||
|
||||
//<2F><>ʽ2<CABD><32>
|
||||
NVIC_SystemReset();
|
||||
while(1);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user