fix:修改芯片时钟初始化函数

2026-02-10 17:48:22 +08:00
parent 5e9338cee4
commit bba63c4763
47 changed files with 460 additions and 36434 deletions
--- a/MCU_Driver/bootload_fun.c
+++ b/MCU_Driver/bootload_fun.c
@@ -45,7 +45,14 @@ void Boot_Timeout_Task(void)
 *******************************************************************************/
 void SPI_FLASH_APP_Data_Erase(void)
 {
-    for(uint8_t i = 0;i < 7;i++)
+    Flash_Erase_Page(0);        //<2F><><EFBFBD><EFBFBD>APP<50><50><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+    for(uint8_t i = 1;i < 16;i++)
+    {
+        WDT_Feed();
+
+        Flash_Erase_Sector(i);
+    }
+    for(uint8_t i = 1;i < 7;i++)
    {
        WDT_Feed();

@@ -140,8 +147,8 @@ uint8_t Launcher_Uart_Upgrade_Process(UART_t *g_rev)

    __enable_irq();

-    DBG_SYS_Printf("Len %d \r\n",g_rev->deal_len);
-    Dbg_Print_Buff(DBG_BIT_SYS_STATUS,"UARTx_Buff:",g_rev->deal_buff,g_rev->deal_len);
+//    DBG_SYS_Printf("Len %d \r\n",g_rev->deal_len);
+//    Dbg_Print_Buff(DBG_BIT_SYS_STATUS,"UARTx_Buff:",g_rev->deal_buff,g_rev->deal_len);

    temp_val = g_rev->deal_buff[BCOMM_FMT_LEN_H];
    temp_val <<= 8;
@@ -149,7 +156,8 @@ uint8_t Launcher_Uart_Upgrade_Process(UART_t *g_rev)

    if(temp_val != g_rev->deal_len)
    {
-        DBG_SYS_Printf("Len Fail \r\n");
+        DBG_SYS_Printf("Len Fail %d - %d\r\n",g_rev->deal_len,temp_val);
+        Dbg_Print_Buff(DBG_BIT_SYS_STATUS,"UARTx_Buff:",g_rev->deal_buff,g_rev->deal_len);
        return 0x01;
    }

@@ -288,11 +296,17 @@ uint8_t Launcher_Uart_Upgrade_Process(UART_t *g_rev)
            if(g_Boot_Time < 10)     g_Boot_Time = 10;
            g_Boot_Time = g_Boot_Time  * 1000;

-            DBG_SYS_Printf("BaudSet: %d",temp_val);
            DBG_SYS_Printf("bootTimeout: %d",g_Boot_Time);

-            g_rev->ChangeBaudFlag = 0x01;
-            g_rev->CommBaud = temp_val;
+            if(g_rev->CommBaud != temp_val)
+            {
+                g_rev->ChangeBaudFlag = 0x01;
+                g_rev->CommBaud = temp_val;
+                DBG_SYS_Printf("BaudSet: %d",temp_val);
+            }else {
+                DBG_SYS_Printf("Baud Not Change: %d",temp_val);
+            }
+

            g_rev->ackBuffer[BCOMM_FMT_PARAM] = BCOMM_CMD_ReplySUCC;
            g_rev->ackLen = 1;
@@ -838,13 +852,14 @@ uint8_t Read_APP_Feature(void)
        if( update_flag == 0x01 )
        {
            /*˵<><CBB5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ǹ<EFBFBD><C7B8>µ<EFBFBD>APP<50><50>
-             * <20><>app_flag <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>־λ<D6BE><CEBB><EFBFBD><EFBFBD>Ϊ0x05<30><35><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>־λ<D6BE><CEBB>ΪAPP <20>̼<EFBFBD>д<EFBFBD><D0B4><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-             * ÿд<C3BF><D0B4>һ<EFBFBD>Σ<EFBFBD>app_flag <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>־λ<D6BE><CEBB>1<EFBFBD><31>ֱ<EFBFBD><D6B1><EFBFBD><EFBFBD>Ϊ0<CEAA><30><EFBFBD>㲻<EFBFBD><E3B2BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+            *- <20><>app_flag <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>־λ<D6BE><CEBB><EFBFBD><EFBFBD>Ϊ0x05<30><35><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>־λ<D6BE><CEBB>ΪAPP <20>̼<EFBFBD>д<EFBFBD><D0B4><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+            *- ÿд<C3BF><D0B4>һ<EFBFBD>Σ<EFBFBD>app_flag <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>־λ<D6BE><CEBB>1<EFBFBD><31>ֱ<EFBFBD><D6B1><EFBFBD><EFBFBD>Ϊ0<CEAA><30><EFBFBD>㲻<EFBFBD><E3B2BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
             * */
            g_update_flag.app_flag = 0x05;
        }else {
-            /**/
-            if( (g_update_flag.app_flag != 0x00) && (g_update_flag.app_flag <= 0x05) )
+            /* - <20><>APP֮ǰû<C7B0><C3BB>д<EFBFBD><D0B4><EFBFBD>ɹ<EFBFBD><C9B9><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>д<EFBFBD><D0B4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+             * */
+            if( (g_update_flag.app_flag != 0x00) && (g_update_flag.app_flag != App_Procedure_Ready) && (g_update_flag.app_flag <= 0x05) )
            {
                g_update_flag.app_flag--;
                update_flag = 0x02;
@@ -868,12 +883,14 @@ uint8_t Read_APP_Feature(void)
        }

        DBG_SYS_Printf("--<2D><><EFBFBD><EFBFBD><EFBFBD>µ<EFBFBD>APP<50>̼<EFBFBD>--");
+        SPIFLASH_Write_APP_Upate_Flag_Info(&g_update_flag);
    }else if( update_flag == 0x02 ){
        DBG_SYS_Printf("--APP<50>̼<EFBFBD><CCBC><EFBFBD>Ҫ<EFBFBD><D2AA><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʣ<EFBFBD><CAA3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:%d --",g_update_flag.app_flag);
+        SPIFLASH_Write_APP_Upate_Flag_Info(&g_update_flag);
    }else{
        DBG_SYS_Printf("--APP<50>̼<EFBFBD><CCBC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:%x--",g_update_flag.app_flag);
    }
-    SPIFLASH_Write_APP_Upate_Flag_Info(&g_update_flag);
+

    /*<2A><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ȶ<EFBFBD>ȡMCU Flash<73><68>APP<50><50><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ƿ<EFBFBD><C7B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݣ<EFBFBD>ͬʱ<CDAC><CAB1>֤APP<50>ĺϷ<C4BA><CFB7><EFBFBD>*/
    rev = Read_APP_Feature_Info(0x01,&g_mcu_app_feature);
@@ -1038,7 +1055,7 @@ uint8_t MCU_APP_Write(void)
    uint16_t crcVal = 0,crcNumIndex = 0;
    uint32_t crc_data_len = 0;

-    SPIFLASH_Read_Update_Recode(&g_update_recode);      //<2F><>ȡAPPд<50><D0B4><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+
    g_update_recode.mcuflash_fw_count++;

    DBG_SYS_Printf("MCU Flash <20><><EFBFBD><EFBFBD>APP<50><50><EFBFBD><EFBFBD>");
@@ -1161,6 +1178,7 @@ uint8_t MCU_APP_Write(void)
            /*д<><D0B4>ʧ<EFBFBD><CAA7> - ʧ<>ܴ<EFBFBD><DCB4><EFBFBD><EFBFBD><EFBFBD>һ*/
            g_update_recode.mcuflash_fw_fail++;
            SPIFLASH_Write_Update_Recode(&g_update_recode);
+            SPIFLASH_Read_Update_Recode(&g_update_recode);      //<2F><>ȡAPPд<50><D0B4><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
            return 0x01;
        }

@@ -1174,6 +1192,7 @@ uint8_t MCU_APP_Write(void)
    /*APP<50><50><EFBFBD>±<EFBFBD>־λ - ״̬<D7B4><CCAC><EFBFBD><EFBFBD>Ϊ<EFBFBD>ļ<EFBFBD><C4BC><EFBFBD><EFBFBD><EFBFBD>*/
    g_update_flag.app_flag = App_Procedure_Ready;
    SPIFLASH_Write_APP_Upate_Flag_Info(&g_update_flag);
+    SPIFLASH_Read_Update_Recode(&g_update_recode);      //<2F><>ȡAPPд<50><D0B4><EFBFBD><EFBFBD><EFBFBD><EFBFBD>

    /*4<><34>У<EFBFBD><D0A3><EFBFBD>ɹ<EFBFBD>*/
    DBG_SYS_Printf("MCU APP Update Succ!!");
@@ -1202,7 +1221,7 @@ uint8_t SPIFLASH_Read_Update_Recode(UPDATE_RECORD_T *info)
        read_len |= g_flash_buff[EEPROM_Offset_Datalen];

        DBG_SYS_Printf("%s read_len : %d ",__func__,read_len);
-        if(read_len == UPDATE_RECORD_INFO_Size)
+        if(read_len == sizeof(UPDATE_RECORD_T) )
        {
            if(EEPROM_CheckSum(&g_flash_buff[EEPROM_Offset_Data],read_len) == g_flash_buff[EEPROM_Offset_Check]){

@@ -1238,16 +1257,16 @@ uint8_t SPIFLASH_Read_Update_Recode(UPDATE_RECORD_T *info)
 *******************************************************************************/
 uint8_t SPIFLASH_Write_Update_Recode(UPDATE_RECORD_T *info)
 {
-    uint16_t save_len = UPDATE_RECORD_INFO_Size;
+    uint16_t save_len = sizeof(UPDATE_RECORD_T);
    memset(g_flash_buff,0,sizeof(g_flash_buff));

    g_flash_buff[EEPROM_Offset_SaveFlag] = EEPROM_SVAE_FLAG;
    g_flash_buff[EEPROM_Offset_Datalen] = save_len & 0xFF;
-    g_flash_buff[EEPROM_Offset_Datalen] = (save_len >> 8) & 0xFF;
+    g_flash_buff[EEPROM_Offset_Datalen + 1] = (save_len >> 8) & 0xFF;

    memcpy(&g_flash_buff[EEPROM_Offset_Data],(uint8_t *)info,save_len);
-    g_flash_buff[3] = EEPROM_CheckSum(&g_flash_buff[4],save_len);

+    g_flash_buff[3] = EEPROM_CheckSum(&g_flash_buff[EEPROM_Offset_Data],save_len);
    save_len+=4;

    Flash_Write(g_flash_buff, APP_FEATURE_SIZE, SPIFLASH_UPDATE_RECORD_Addr);