From 3041468aa7b1cdb8b4d7e4be2c4b095696c80dc5 Mon Sep 17 00:00:00 2001
From: caocong <caocong@blw.com>
Date: Tue, 10 Feb 2026 17:45:08 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E7=BD=91=E7=BB=9C=E5=8D=87=E7=BA=A7?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1、局域网升级流程 - 初步测试OK
2、云端升级流程 - 初步测试OK
3、云端升级上报升级进度 - 初步测试OK
---
 .cproject                                  |   4 +-
 BLV_485_Driver/blv_rs485_dev_tempctrl.c    |   2 +-
 BLV_485_Driver/blv_rs485_dev_touchswitch.c |   2 +-
 Ld/Link.ld                                 |   7 +-
 MCU_Driver/blv_dev_action.c                |   4 +-
 MCU_Driver/blv_netcomm_function.c          | 746 ++++++++++++++++++++-
 MCU_Driver/inc/blv_netcomm_function.h      |  15 +
 MCU_Driver/inc/flash_mem_addr.h            |   6 +-
 MCU_Driver/inc/mcu_flash.h                 |  12 +-
 MCU_Driver/inc/sram_mem_addr.h             |  55 +-
 MCU_Driver/inc/watchdog.h                  |   3 +
 MCU_Driver/spi_flash.c                     |  15 +-
 MCU_Driver/timer.c                         |   3 +-
 MCU_Driver/uart.c                          |   6 +-
 MCU_Driver/watchdog.c                      |  15 +-
 NetLib/net_function.c                      |  17 +-
 NetLib/tftp_function.c                     | 128 +++-
 NetLib/tftp_function.h                     |   5 +-
 Peripheral/inc/ch564_rcc.h                 |   2 +-
 Readme.md                                  | 136 ++--
 User/includes.h                            |   3 +-
 User/main.c                                |   9 +-
 User/system_ch564.c                        | 325 ++++-----
 23 files changed, 1184 insertions(+), 336 deletions(-)

diff --git a/.cproject b/.cproject
index e791d79..9706ede 100644
--- a/.cproject
+++ b/.cproject
@@ -14,7 +14,7 @@
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" cleanCommand="${cross_rm} -rf" description="" id="ilg.gnumcueclipse.managedbuild.cross.riscv.config.elf.release.1008047074" name="obj" parent="ilg.gnumcueclipse.managedbuild.cross.riscv.config.elf.release">
+				<configuration artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" cleanCommand="${cross_rm} -rf" description="" id="ilg.gnumcueclipse.managedbuild.cross.riscv.config.elf.release.1008047074" name="obj" parent="ilg.gnumcueclipse.managedbuild.cross.riscv.config.elf.release" postbuildStep=" ${cross_prefix}${cross_objcopy}${cross_suffix} -O ihex &quot;${ProjName}.elf&quot; &quot;${ProjName}.hex&quot; &amp;&amp; ${cross_prefix}${cross_objcopy}${cross_suffix} -O binary &quot;${ProjName}.elf&quot; &quot;${ProjName}.bin&quot;">
 					<folderInfo id="ilg.gnumcueclipse.managedbuild.cross.riscv.config.elf.release.1008047074." name="/" resourcePath="">
 						<toolChain id="ilg.gnumcueclipse.managedbuild.cross.riscv.toolchain.elf.release.231146001" name="RISC-V Cross GCC" superClass="ilg.gnumcueclipse.managedbuild.cross.riscv.toolchain.elf.release">
 							<option id="ilg.gnumcueclipse.managedbuild.cross.riscv.option.addtools.createflash.1311852988" name="Create flash image" superClass="ilg.gnumcueclipse.managedbuild.cross.riscv.option.addtools.createflash" useByScannerDiscovery="false" value="true" valueType="boolean"/>
@@ -117,7 +117,7 @@
 							<tool id="ilg.gnumcueclipse.managedbuild.cross.riscv.tool.archiver.1292785366" name="GNU RISC-V Cross Archiver" superClass="ilg.gnumcueclipse.managedbuild.cross.riscv.tool.archiver"/>
 							<tool id="ilg.gnumcueclipse.managedbuild.cross.riscv.tool.createflash.1801165667" name="GNU RISC-V Cross Create Flash Image" superClass="ilg.gnumcueclipse.managedbuild.cross.riscv.tool.createflash">
 								<option id="ilg.gnumcueclipse.managedbuild.cross.riscv.option.createflash.other.406870191" name="Other flags" superClass="ilg.gnumcueclipse.managedbuild.cross.riscv.option.createflash.other" useByScannerDiscovery="false" value="" valueType="string"/>
-								<option id="ilg.gnumcueclipse.managedbuild.cross.riscv.option.createflash.choice.1719943455" name="Output file format (-O)" superClass="ilg.gnumcueclipse.managedbuild.cross.riscv.option.createflash.choice" useByScannerDiscovery="false" value="ilg.gnumcueclipse.managedbuild.cross.riscv.option.createflash.choice.ihex" valueType="enumerated"/>
+								<option id="ilg.gnumcueclipse.managedbuild.cross.riscv.option.createflash.choice.1719943455" name="Output file format (-O)" superClass="ilg.gnumcueclipse.managedbuild.cross.riscv.option.createflash.choice" useByScannerDiscovery="false" value="ilg.gnumcueclipse.managedbuild.cross.riscv.option.createflash.choice.ihexAndbinary" valueType="enumerated"/>
 							</tool>
 							<tool id="ilg.gnumcueclipse.managedbuild.cross.riscv.tool.createlisting.1356766765" name="GNU RISC-V Cross Create Listing" superClass="ilg.gnumcueclipse.managedbuild.cross.riscv.tool.createlisting">
 								<option id="ilg.gnumcueclipse.managedbuild.cross.riscv.option.createlisting.source.2052761852" name="Display source (--source|-S)" superClass="ilg.gnumcueclipse.managedbuild.cross.riscv.option.createlisting.source" useByScannerDiscovery="false" value="false" valueType="boolean"/>
diff --git a/BLV_485_Driver/blv_rs485_dev_tempctrl.c b/BLV_485_Driver/blv_rs485_dev_tempctrl.c
index 730fc1a..406f6de 100644
--- a/BLV_485_Driver/blv_rs485_dev_tempctrl.c
+++ b/BLV_485_Driver/blv_rs485_dev_tempctrl.c
@@ -598,7 +598,7 @@ __attribute__((section(".non_0_wait"))) void Dev_TEMPCTRL_Ctrl(uint32_t CfgDevAd
 
     if(0x01 == KeepFlag)
     {
-        BLV_Device_Info_Write_To_SRAM(CfgDevAddIn,&BUS_PublicOut,(uint8_t *)&Rs485Tem,sizeof(RS485_TEMP_INFO));
+        BLV_Device_Info_Write_To_SRAM(CfgDevAddOut,&BUS_PublicOut,(uint8_t *)&Rs485Tem,sizeof(RS485_TEMP_INFO));
     }
 }
 
diff --git a/BLV_485_Driver/blv_rs485_dev_touchswitch.c b/BLV_485_Driver/blv_rs485_dev_touchswitch.c
index 9ac104b..8c01e8b 100644
--- a/BLV_485_Driver/blv_rs485_dev_touchswitch.c
+++ b/BLV_485_Driver/blv_rs485_dev_touchswitch.c
@@ -226,7 +226,7 @@ __attribute__((section(".non_0_wait"))) uint8_t BLW_Rs485_Touch_Swi_Check(uint32
     else       //��ַû��ƥ����
     {
         DevAdd = Find_AllDevice_List_Information2(Active_Port, 0x06, data[0]);   //��ַ���¸�ֵ
-        if( (0x00000000 != DevAdd) || (0xFFFFFFFF != DevAdd) )
+        if( (0x00000000 != DevAdd) && (0xFFFFFFFF != DevAdd) )
         {
             BLV_Device_PublicInfo_Read_To_Struct(DevAdd,&BUS_Public);
         }else{
diff --git a/Ld/Link.ld b/Ld/Link.ld
index 9d3c110..277315a 100644
--- a/Ld/Link.ld
+++ b/Ld/Link.ld
@@ -35,8 +35,9 @@ MEMORY
  	RAM (xrw) : ORIGIN = 0x20000000 , LENGTH = 64K
 */
 
-	FLASH (rx) : ORIGIN = 0x00000000 , LENGTH = 80K
-    FLASH1 (rx) : ORIGIN = 0x00014000 , LENGTH = 368K
+
+	FLASH (rx) : ORIGIN = 0x00001000 , LENGTH = 76K
+    FLASH1 (rx) : ORIGIN = 0x00014000 , LENGTH = 336K
  	RAM (xrw) : ORIGIN = 0x20000000 , LENGTH = 64K
 
 }
@@ -55,7 +56,7 @@ SECTIONS
 	
 	.vector :
 	{
-		*(.vector);
+		KEEP(*(.vector));
 		_endof_Vector = .;
         ASSERT(_endof_Vector < ORIGIN(FLASH1), "The vector must maintain in 0-wait zone");
 		. = ALIGN(4);
diff --git a/MCU_Driver/blv_dev_action.c b/MCU_Driver/blv_dev_action.c
index 5bd6933..d0b5275 100644
--- a/MCU_Driver/blv_dev_action.c
+++ b/MCU_Driver/blv_dev_action.c
@@ -17,7 +17,7 @@ BLV_DevAction_Manage_G  DevActionGlobal;   //
 * Description    : ���豸������Ϣ�ṹ�壬���浽�ⲿSRAM
 * DevAction_Info  �����ṹ��
 *******************************************************************************/
-uint8_t DevAction_Info_Write_To_SRAM(uint32_t addr,DEV_ACTION_INFO *DevAction_Info)
+__attribute__((section(".non_0_wait"))) uint8_t DevAction_Info_Write_To_SRAM(uint32_t addr,DEV_ACTION_INFO *DevAction_Info)
 {
     uint16_t temp_len = 0;
     memset(Global_Large_Buff,0,sizeof(Global_Large_Buff));
@@ -111,7 +111,7 @@ uint8_t DevAction_Info_Write_To_SRAM(uint32_t addr,DEV_ACTION_INFO *DevAction_In
 *   addr    ��ȡ��ַ
 *   DevAction_Info  �����ṹ��
 *******************************************************************************/
-uint8_t DevAction_Info_Read_To_Struct(uint32_t addr,DEV_ACTION_INFO *DevAction_Info)
+__attribute__((section(".non_0_wait"))) uint8_t DevAction_Info_Read_To_Struct(uint32_t addr,DEV_ACTION_INFO *DevAction_Info)
 {
     uint16_t temp_len = SRAM_Read_Word(addr);
 
diff --git a/MCU_Driver/blv_netcomm_function.c b/MCU_Driver/blv_netcomm_function.c
index d424a79..18baf93 100644
--- a/MCU_Driver/blv_netcomm_function.c
+++ b/MCU_Driver/blv_netcomm_function.c
@@ -381,7 +381,7 @@ uint8_t Udp_Internal_BLVIAP_Logic(uint8_t* data,uint16_t DataLen, uint8_t *ip,ui
     Dbg_Println(DBG_BIT_NET_STATUS_bit,"BlockSize:%d",IAPVarTypeStruct_Ptr.BlockSize);
 
     sendlen = BLV_UDP_HEAD_LEN;
-    if( (0 < IAPVarTypeStruct_Ptr.BlockSize) && ( IAPVarTypeStruct_Ptr.BlockSize <= CONFIG_BLOCK_MAX ))
+    if( ( 0 < IAPVarTypeStruct_Ptr.BlockSize ) && ( IAPVarTypeStruct_Ptr.BlockSize <= CONFIG_BLOCK_MAX ) )
     {
         Ret = 0x01;
         Global_Large_Buff[sendlen++] = TFTP_IAP_Status_Ready;                      //��������
@@ -413,7 +413,7 @@ uint8_t Udp_Internal_BLVIAP_Logic(uint8_t* data,uint16_t DataLen, uint8_t *ip,ui
 uint8_t UDP_IAP_Cmd_Processing(uint8_t* data, uint16_t DataLen, uint8_t *ip,uint16_t port)
 {
     uint16_t frameno = UDP_Get_FrameNum(data);
-    UINT32 sendlen = 0x00;
+    uint32_t sendlen = 0x00;
     uint8_t buff[6];
 
     //У�����ݳ���
@@ -421,6 +421,8 @@ uint8_t UDP_IAP_Cmd_Processing(uint8_t* data, uint16_t DataLen, uint8_t *ip,uint
 
     memset(Global_Large_Buff,0,sizeof(Global_Large_Buff));
 
+    Dbg_Println(DBG_BIT_NET_STATUS_bit,"%s",__func__);
+
     server_info.goal_port = port;
     memcpy(server_info.goal_ip, ip, 4);
     memcpy(buff, ip, 4);
@@ -430,6 +432,7 @@ uint8_t UDP_IAP_Cmd_Processing(uint8_t* data, uint16_t DataLen, uint8_t *ip,uint
 
     memset(&IAPVarTypeStruct_Ptr, 0, sizeof(IAPVarTypeStruct));
 
+    IAPVarTypeStruct_Ptr.BLVIapFlag = 0x01;
     IAPVarTypeStruct_Ptr.IapFileType = TFTP_IAP_DataType_APP;               //�ļ�����
 
     //IAP ����APP��Ӧ��MD5 У��
@@ -467,11 +470,15 @@ uint8_t UDP_IAP_Cmd_Processing(uint8_t* data, uint16_t DataLen, uint8_t *ip,uint
         IAPVarTypeStruct_Ptr.Md5[12],IAPVarTypeStruct_Ptr.Md5[13],\
         IAPVarTypeStruct_Ptr.Md5[14],IAPVarTypeStruct_Ptr.Md5[15]);
 
+    Dbg_Println(DBG_BIT_NET_STATUS_bit,"BlockSize:%d",IAPVarTypeStruct_Ptr.BlockSize);
+
     sendlen = BLV_UDP_HEAD_LEN;
     if( (0 < IAPVarTypeStruct_Ptr.BlockSize) || (IAPVarTypeStruct_Ptr.BlockSize <= APP_BLOCK_MAX) )
     {
         Global_Large_Buff[sendlen++] = TFTP_IAP_Status_Ready;
         IAPVarTypeStruct_Ptr.enable = 0x01;
+        IAPVarTypeStruct_Ptr.FunType = TFTP_FUNTYPE_LocalIAP;
+        IAPVarTypeStruct_Ptr.Write_Block = 0x00;
     }else {
         Global_Large_Buff[sendlen++] = TFTP_IAP_Status_Error_Block;
     }
@@ -484,6 +491,544 @@ uint8_t UDP_IAP_Cmd_Processing(uint8_t* data, uint16_t DataLen, uint8_t *ip,uint
     return 0x00;
 }
 
+/*******************************************************************************
+* Function Name  : UDP_Cloud_IAP_Cmd_Processing
+* Description    : BLVͨѶЭ�� - �ƶ�IAP����У��������մ�������
+*******************************************************************************/
+uint8_t UDP_Cloud_IAP_Cmd_Processing(uint8_t* data, uint16_t DataLen, uint8_t *ip,uint16_t port)
+{
+    uint16_t frameno = UDP_Get_FrameNum(data);
+    uint32_t sendlen = 0x00;
+    uint8_t temp_buff[6];
+    uint16_t temp_len = 0;
+
+    memset(Global_Large_Buff,0,sizeof(Global_Large_Buff));
+
+    temp_len = BLV_UDP_HEAD_LEN;
+    memcpy(server_info.goal_ip, &data[temp_len], 4);
+    temp_len += 4;
+
+    IAPVarTypeStruct_Ptr.TFTP_Port = data[temp_len + 1];
+    IAPVarTypeStruct_Ptr.TFTP_Port <<= 8;
+    IAPVarTypeStruct_Ptr.TFTP_Port |= data[temp_len];
+
+    memcpy(temp_buff, ip, 4);
+    temp_buff[4] = data[temp_len];
+    temp_buff[5] = data[temp_len + 1];
+    SRAM_DMA_Write_Buff(temp_buff, 6, SRAM_IAP_IP_ADDRESS);     //�����ù��ߵ�ip��port����SRAM���ظ��������ʱʹ������˿ڣ�������TFTP�����ļ�������׽���
+
+    temp_len += 2;
+    Dbg_Println(DBG_BIT_NET_STATUS_bit,"�ƶ�TFTP port:%X , IP:%d.%d.%d.%d",IAPVarTypeStruct_Ptr.TFTP_Port,temp_buff[0],temp_buff[1],temp_buff[2],temp_buff[3]);
+
+    IAPVarTypeStruct_Ptr.Md5[0]      = data[temp_len + 3];
+    IAPVarTypeStruct_Ptr.Md5[1]      = data[temp_len + 2];
+    IAPVarTypeStruct_Ptr.Md5[2]      = data[temp_len + 1];
+    IAPVarTypeStruct_Ptr.Md5[3]      = data[temp_len + 0];
+
+    IAPVarTypeStruct_Ptr.Md5[4]      = data[temp_len + 7];
+    IAPVarTypeStruct_Ptr.Md5[5]      = data[temp_len + 6];
+    IAPVarTypeStruct_Ptr.Md5[6]      = data[temp_len + 5];
+    IAPVarTypeStruct_Ptr.Md5[7]      = data[temp_len + 4];
+
+    IAPVarTypeStruct_Ptr.Md5[8]      = data[temp_len + 11];
+    IAPVarTypeStruct_Ptr.Md5[9]      = data[temp_len + 10];
+    IAPVarTypeStruct_Ptr.Md5[10]     = data[temp_len + 9];
+    IAPVarTypeStruct_Ptr.Md5[11]     = data[temp_len + 8];
+
+    IAPVarTypeStruct_Ptr.Md5[12]     = data[temp_len + 15];
+    IAPVarTypeStruct_Ptr.Md5[13]     = data[temp_len + 14];
+    IAPVarTypeStruct_Ptr.Md5[14]     = data[temp_len + 13];
+    IAPVarTypeStruct_Ptr.Md5[15]     = data[temp_len + 12];
+
+    temp_len += 16;
+
+    IAPVarTypeStruct_Ptr.BlockSize = data[temp_len + 1];
+    IAPVarTypeStruct_Ptr.BlockSize <<= 8;
+    IAPVarTypeStruct_Ptr.BlockSize |= data[temp_len];
+
+    temp_len += 2;
+
+    Dbg_Println(DBG_BIT_NET_STATUS_bit,"BlockSize:%d ",IAPVarTypeStruct_Ptr.BlockSize);
+
+    if(data[temp_len] == 0x00)                          //�̼� - UDPЭ���� 0x00��ʾ�̼���0x01��ʾ�����ļ�
+    {
+        IAPVarTypeStruct_Ptr.IapFileType = TFTP_IAP_DataType_APP;
+
+    }else if(data[temp_len] == 0x01)                    //����
+    {
+        IAPVarTypeStruct_Ptr.IapFileType = TFTP_IAP_DataType_CONFIG;
+
+    }else{
+        Dbg_Println(DBG_BIT_NET_STATUS_bit,"IapFileType Error:%d ",data[temp_len]);
+        return 0x02;
+    }
+
+    temp_len += 1;
+
+    IAPVarTypeStruct_Ptr.FtpFileNameLen = DataLen - 42;
+    if(IAPVarTypeStruct_Ptr.FtpFileNameLen > TFTP_File_Name_Size)
+    {
+        Dbg_Println(DBG_BIT_NET_STATUS_bit,"FtpFileNameLen Error:%d ",IAPVarTypeStruct_Ptr.FtpFileNameLen);
+        return 0x02;
+    }
+
+    memcpy(IAPVarTypeStruct_Ptr.FtpFileName,&data[temp_len],IAPVarTypeStruct_Ptr.FtpFileNameLen);
+    Dbg_Println(DBG_BIT_NET_STATUS_bit,"ftp_name:%d - %s",IAPVarTypeStruct_Ptr.FtpFileNameLen,IAPVarTypeStruct_Ptr.FtpFileName);
+
+    if( (0 < IAPVarTypeStruct_Ptr.BlockSize) || (IAPVarTypeStruct_Ptr.BlockSize <= APP_BLOCK_MAX) )
+    {
+        IAPVarTypeStruct_Ptr.enable = 0x01;
+        IAPVarTypeStruct_Ptr.FunType = TFTP_FUNTYPE_CloudIAP;
+        IAPVarTypeStruct_Ptr.Write_Block = 0x00;
+    }else {
+        return 0x02;
+    }
+
+    //�ظ��������
+    sendlen = BLV_UDP_HEAD_LEN;
+
+    Global_Large_Buff[sendlen++] = 0x00;                                //����״̬ - �ظ�����(0x00)
+    sendlen += UDP_ADD_SoftwareVer(&Global_Large_Buff[sendlen]);
+    //�����ļ�����
+    if( IAPVarTypeStruct_Ptr.IapFileType == TFTP_IAP_DataType_APP )
+    {
+        Global_Large_Buff[sendlen++] = 0x00;
+    }else if( IAPVarTypeStruct_Ptr.IapFileType == TFTP_IAP_DataType_CONFIG ){
+        Global_Large_Buff[sendlen++] = 0x01;
+    }else {
+        Global_Large_Buff[sendlen++] = 0x00;
+    }
+
+    sendlen += 2;
+    UDP_Add_Header(Global_Large_Buff, In_Cloud_IAP_Cmd, sendlen, frameno);
+
+    NetCRC16(Global_Large_Buff,sendlen);
+
+    WCHNET_SocketUdpSendTo(g_netinfo.SocketId[SocketIdnex_BLVSeriver], Global_Large_Buff, &sendlen, ip, port);
+
+    return 0x00;
+}
+
+/*******************************************************************************
+* Function Name  : UDP__BLVIAPCheck_Cmd_Processing
+* Description    : BLVͨѶЭ�� - IAP����У��������մ�������
+*******************************************************************************/
+uint8_t UDP_BLVIAPCheck_Cmd_Processing(uint8_t* data, uint16_t DataLen, uint8_t *ip,uint16_t port)
+{
+    uint8_t rev = 0;
+    uint16_t crcNumIndex = 0,temp_val = 0x00,deal_frame = 0;
+    uint32_t crc_data_len = 0,sendlen = 0;
+    memset(Global_Large_Buff,0,sizeof(Global_Large_Buff));
+
+    Dbg_Println(DBG_BIT_NET_STATUS_bit,"%s - %d",__func__,DataLen);
+
+    if(DataLen <= BLV_UDP_HEAD_LEN)    return 0x01;
+
+    /* У��֡�� - ֡�Ų�ͬ�����д���*/
+    deal_frame = UDP_Get_FrameNum(data);
+
+    Dbg_Println(DBG_BIT_NET_STATUS_bit,"%s Frame:%d - %d",__func__,deal_frame,server_info.udp_frame);
+    if( server_info.udp_frame != deal_frame )
+    {
+        Dbg_Println(DBG_BIT_NET_STATUS_bit,"BLVIapFlag:%d - %d %d",IAPVarTypeStruct_Ptr.BLVIapFlag,IAPVarTypeStruct_Ptr.BlockSize,tftp_args.block);
+        server_info.udp_frame = deal_frame;
+        /*��ǰ��BLV_Cx�������̣����ҵ�ǰ�����һ�����ݣ���ִ������У���ļ�����*/
+        if((IAPVarTypeStruct_Ptr.BLVIapFlag == 0x01) && (IAPVarTypeStruct_Ptr.BlockSize == IAPVarTypeStruct_Ptr.Write_Block))
+        {
+            uint8_t md5[16] = {0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0};
+
+            IAPVarTypeStruct_Ptr.status = STA_END;      //�ͷ�IAP�׽���
+            switch(IAPVarTypeStruct_Ptr.IapFileType)
+            {
+            case TFTP_IAP_DataType_APP:
+                MD5Digest_SRAM(SRAM_IAP_APP_FILE_ADDRESS, IAPVarTypeStruct_Ptr.TotalCount,(char *)&md5[0]);
+                Dbg_Println(DBG_BIT_NET_STATUS_bit,"falshд���ܳ��ȣ�%dByte", IAPVarTypeStruct_Ptr.TotalCount );
+
+                if( bytes_cmp(md5,IAPVarTypeStruct_Ptr.Md5,16) == 0x00 )
+                {
+                    //�ļ�MD5У��ɹ�
+                    Dbg_Println(DBG_BIT_NET_STATUS_bit,"�����ɹ���Md5��ȷ");
+
+                    if( IAPVarTypeStruct_Ptr.FunType == TFTP_FUNTYPE_LocalIAP )
+                    {
+                        Dbg_Println(DBG_BIT_NET_STATUS_bit,"��¼�����������ɹ�״̬..");
+                        LOG_LogicInfo_DebugRecord("��¼�����������ɹ�״̬..");
+                        SRAM_Write_Byte(TFTP_FUNTYPE_LocalIAP, SRAM_IAP_NET_UPGRADE_Flag_ADDRESS);
+                    }
+
+                    Dbg_Println(DBG_BIT_NET_STATUS_bit,"��APP�Flash��..");
+
+                    SPI_FLASH_APP_Data_Erase();
+                    for(uint32_t i = 0;i < IAPVarTypeStruct_Ptr.BlockSize; i++ )
+                    {
+                        WDT_Feed();
+                        SRAM_DMA_Read_Buff(Global_Large_Buff,512,SRAM_IAP_APP_FILE_ADDRESS+i*512);
+                        Flash_Write(Global_Large_Buff,512,SPIFLASH_APP_Data_Start_Addr+i*512);
+                    }
+
+                    memset(Global_Large_Buff,0,sizeof(Global_Large_Buff));
+
+                    /* ����APP��CRCУ��ֵ ����APP����������*/
+                    g_app_feature.app_flag = App_Procedure_Ready;
+                    g_app_feature.app_crc_size = MCU_APP_Flash_PageSize;
+                    g_app_feature.app_start_addr = MCU_APP_Flash_Start_Addr;
+                    g_app_feature.app_end_addr = MCU_APP_Flash_Start_Addr + IAPVarTypeStruct_Ptr.TotalCount;
+
+                    if( ( IAPVarTypeStruct_Ptr.TotalCount % g_app_feature.app_crc_size ) != 0x00 ){
+                        g_app_feature.app_crc_len = ( (IAPVarTypeStruct_Ptr.TotalCount / g_app_feature.app_crc_size) + 1) * 2;
+                    }else {
+                        g_app_feature.app_crc_len = (IAPVarTypeStruct_Ptr.TotalCount / g_app_feature.app_crc_size) * 2;
+                    }
+
+                    Dbg_Println(DBG_BIT_NET_STATUS_bit,"App CRC BLock:%d ",g_app_feature.app_crc_len);
+
+                    crcNumIndex = 0x00;
+                    for(uint32_t crc_addr = g_app_feature.app_start_addr; crc_addr < g_app_feature.app_end_addr;crc_addr += g_app_feature.app_crc_size)
+                    {
+                        if( g_app_feature.app_end_addr - crc_addr >= g_app_feature.app_crc_size )    {
+                            crc_data_len = g_app_feature.app_crc_size;
+                        }else {
+                            crc_data_len = g_app_feature.app_end_addr - crc_addr;
+                        }
+
+                        memset(Temp_Flash_Buff,0,sizeof(Temp_Flash_Buff));
+
+                        if(crc_data_len > 2048)
+                        {
+                            Flash_Read(Temp_Flash_Buff,2048,crc_addr);
+                            Flash_Read(&Temp_Flash_Buff[2048],(crc_data_len - 2048),crc_addr+2048);
+                        }else {
+                            Flash_Read(Temp_Flash_Buff,crc_data_len,crc_addr);
+                        }
+
+                        temp_val = NetCRC16_2(Temp_Flash_Buff,crc_data_len);
+
+                        g_app_feature.app_crc[crcNumIndex] = temp_val & 0xFF;
+                        g_app_feature.app_crc[crcNumIndex + 1] = (temp_val >> 8) & 0xFF;
+                        crcNumIndex += 2;
+                    }
+
+                    g_app_feature.crc_check = 0x00;
+                    Write_APP_Feature_Info(0x02,&g_app_feature);    //�APP������
+
+                    WDT_Feed();     //��ֹ���Ź���λ
+
+                    Dbg_Println(DBG_BIT_DEVICE_STATUS_bit,"�̼�����������λ!");
+                    //ֱ�ӿ��Ź���λ
+
+                    IAPVarTypeStruct_Ptr.BLVIapResult = 0x01;       //IAP�����ɹ�
+                }else{
+                    //MD5У��ʧ��
+    //                switch(IAPVarTypeStruct_Ptr->IapType)
+    //                {
+    //                    case IAPTFTPWRITE://IAP_AckState(IAP_Error_MD5, (uint8_t *)ip, (uint16_t)port);  break;  //�ظ�Md5����
+    //                        IAP_AckState(IAP_Error_MD5, (uint8_t *)ip_addr, (uint16_t)sever_port);      //�ظ�Md5����
+    //                        break;
+    //                    case IAPTFTPREAD:
+    //                        CLOUD_IAP_AckState(CLOUD_IAP_Cmd, IAP_Error_MD5, (uint8_t *)ip, (uint16_t)port, DATATYPE_IAP);
+    //                        break;
+    //                }
+
+                    IAPVarTypeStruct_Ptr.BLVIapResult = 0x02;       //IAP����ʧ��
+                    Dbg_Println(DBG_BIT_NET_STATUS_bit,"����ʧ�ܣ�Md5����:%X,%X,%X,%X,%X,%X,%X,%X,%X,%X,%X,%X,%X,%X,%X,%X", \
+                            md5[0],md5[1],md5[2],md5[3],md5[4],md5[5],md5[6],md5[7],md5[8],md5[9],md5[10],md5[11],md5[12],md5[13],md5[14],md5[15]);
+                    Dbg_Println(DBG_BIT_NET_STATUS_bit,"UDP Md5:%X,%X,%X,%X,%X,%X,%X,%X,%X,%X,%X,%X,%X,%X,%X,%X",   \
+                        IAPVarTypeStruct_Ptr.Md5[0],IAPVarTypeStruct_Ptr.Md5[1],  \
+                        IAPVarTypeStruct_Ptr.Md5[2],IAPVarTypeStruct_Ptr.Md5[3],  \
+                        IAPVarTypeStruct_Ptr.Md5[4],IAPVarTypeStruct_Ptr.Md5[5],  \
+                        IAPVarTypeStruct_Ptr.Md5[6],IAPVarTypeStruct_Ptr.Md5[7],  \
+                        IAPVarTypeStruct_Ptr.Md5[8],IAPVarTypeStruct_Ptr.Md5[9],  \
+                        IAPVarTypeStruct_Ptr.Md5[10],IAPVarTypeStruct_Ptr.Md5[11],\
+                        IAPVarTypeStruct_Ptr.Md5[12],IAPVarTypeStruct_Ptr.Md5[13],\
+                        IAPVarTypeStruct_Ptr.Md5[14],IAPVarTypeStruct_Ptr.Md5[15]);
+                }
+                break;
+            case TFTP_IAP_DataType_CONFIG:
+                MD5Digest_SRAM(SRAM_IAP_LOGIC_DataStart_ADDRESS, IAPVarTypeStruct_Ptr.TotalCount, (char *)&md5[0]);
+                if( bytes_cmp(md5,IAPVarTypeStruct_Ptr.Md5,16) == 0x00 )
+                {
+    //                switch(IAPVarTypeStruct_Ptr->IapType)
+    //                {
+    //                    case IAPTFTPWRITE:      //�ظ��������
+    //                        Dbg_Println(DBG_BIT_NET_STATUS_bit,"��¼�߼��ļ�д��ɹ�״̬..");
+    //                        LOGIC_Config_AckState(IAP_Finish, (uint8_t *)ip, (uint16_t)sever_port);
+    //                        break;
+    //                    case IAPTFTPREAD:
+    //                        Dbg_Println(DBG_BIT_NET_STATUS_bit,"��¼�߼��ļ���ȡ�ɹ�״̬..");
+    //                        CLOUD_IAP_AckState(CLOUD_IAP_Cmd, IAP_Finish, (uint8_t *)ip, (uint16_t)sever_port, DATATYPE_CONFIG);
+    //                        break;
+    //                }
+
+                    SPI_FLASH_Logic_File_Erase();       //��������ȫ������
+
+                    for(uint32_t i = 0; i < IAPVarTypeStruct_Ptr.BlockSize; i++)
+                    {
+                        WDT_Feed();
+                        temp_val = SRAM_IAP_LOGIC_DataStart_ADDRESS+i*512;
+                        SRAM_DMA_Read_Buff(Global_Large_Buff,512,SRAM_IAP_LOGIC_DataStart_ADDRESS+i*512);
+                        Flash_Write(Global_Large_Buff,512,SPIFLASH_LOGIC_DataStart_ADDRESS+i*512);
+                    }
+
+                    Global_Large_Buff[0] = 0x01;
+                    Global_Large_Buff[1] = 0x00;
+                    Global_Large_Buff[2] = 0x06;
+                    Global_Large_Buff[3] = 0xCC;
+
+                    Global_Large_Buff[4] = IAPVarTypeStruct_Ptr.TotalCount & 0xFF;
+                    Global_Large_Buff[5] = (IAPVarTypeStruct_Ptr.TotalCount >> 8) & 0xFF;
+                    Global_Large_Buff[6] = (IAPVarTypeStruct_Ptr.TotalCount >> 16) & 0xFF;
+                    Global_Large_Buff[7] = (IAPVarTypeStruct_Ptr.TotalCount >> 24) & 0xFF;
+
+                    memcpy(&Global_Large_Buff[8],IAPVarTypeStruct_Ptr.Md5,16);
+                    Flash_Write(Global_Large_Buff,24,SPIFLASH_LOGIC_DataFlag_ADDRESS);
+
+                    Dbg_Println(DBG_BIT_DEVICE_STATUS_bit,"�����ļ� �������");
+                    LOG_LogicInfo_DebugRecord("�����ļ� ������λ");
+                    IAPVarTypeStruct_Ptr.BLVIapResult = 0x01;       //IAP�����ɹ�
+                }else{
+    //                switch(IAPVarTypeStruct_Ptr->IapType)
+    //                {
+    //                    case IAPTFTPWRITE:  //�ظ��������
+    //                        LOGIC_Config_AckState(IAP_Error_MD5, (uint8_t *)ip_addr, (uint16_t)sever_port);
+    //                        break;
+    //                    case IAPTFTPREAD:
+    //                        CLOUD_IAP_AckState(CLOUD_IAP_Cmd, IAP_Error_MD5, (uint8_t *)ip, (uint16_t)sever_port, DATATYPE_CONFIG);
+    //                        break;
+    //                }
+
+                    IAPVarTypeStruct_Ptr.BLVIapResult = 0x02;       //IAP����ʧ��
+                    Dbg_Println(DBG_BIT_NET_STATUS_bit,"��������ʧ�ܣ�Md5����:%X,%X,%X,%X,%X,%X,%X,%X,%X,%X,%X,%X,%X,%X,%X,%X",\
+                            md5[0],md5[1],md5[2],md5[3],md5[4],md5[5],md5[6],md5[7],md5[8],md5[9],md5[10],md5[11],md5[12],md5[13],md5[14],md5[15]);
+                    Dbg_Println(DBG_BIT_NET_STATUS_bit,"UDP Md5:%X,%X,%X,%X,%X,%X,%X,%X,%X,%X,%X,%X,%X,%X,%X,%X",\
+                        IAPVarTypeStruct_Ptr.Md5[0],IAPVarTypeStruct_Ptr.Md5[1],\
+                        IAPVarTypeStruct_Ptr.Md5[2],IAPVarTypeStruct_Ptr.Md5[3],\
+                        IAPVarTypeStruct_Ptr.Md5[4],IAPVarTypeStruct_Ptr.Md5[5],\
+                        IAPVarTypeStruct_Ptr.Md5[6],IAPVarTypeStruct_Ptr.Md5[7],\
+                        IAPVarTypeStruct_Ptr.Md5[8],IAPVarTypeStruct_Ptr.Md5[9],\
+                        IAPVarTypeStruct_Ptr.Md5[10],IAPVarTypeStruct_Ptr.Md5[11],\
+                        IAPVarTypeStruct_Ptr.Md5[12],IAPVarTypeStruct_Ptr.Md5[13],\
+                        IAPVarTypeStruct_Ptr.Md5[14],IAPVarTypeStruct_Ptr.Md5[15]);
+                }
+                break;
+            default:
+                IAPVarTypeStruct_Ptr.BLVIapResult = 0x10;       //IAP���� - δ֪����
+                Dbg_Println(DBG_BIT_NET_STATUS_bit,"�����ļ����Ͳ���");
+                break;
+            }
+
+        }else if( (IAPVarTypeStruct_Ptr.BLVIapFlag == 0x01) && (IAPVarTypeStruct_Ptr.BlockSize != IAPVarTypeStruct_Ptr.Write_Block) )
+        {
+            IAPVarTypeStruct_Ptr.BLVIapResult = 0x03;       //IAP���� - ������
+        }else {
+            IAPVarTypeStruct_Ptr.BLVIapResult = 0x10;       //IAP���� - δ֪����
+        }
+    }else{
+        /*֡����ͬ - ��������������Ҫ�ظ�(�ظ��еĽ��ʹ����һ��ʹ�õĽ��)*/
+    }
+
+    //�ظ�����
+    sendlen = BLV_UDP_HEAD_LEN;
+
+    Global_Large_Buff[BLV_UDP_HEAD_LEN] = IAPVarTypeStruct_Ptr.BLVIapResult;        //�ظ��������
+    sendlen += 3;
+
+    UDP_Add_Header(Global_Large_Buff,In_BLVIAPCheck_Cmd,sendlen,deal_frame);
+    NetCRC16(Global_Large_Buff,sendlen);
+
+    rev = WCHNET_SocketUdpSendTo(g_netinfo.SocketId[SocketIdnex_BLVSeriver],Global_Large_Buff,&sendlen,ip,port);
+
+    return rev;
+}
+
+/*******************************************************************************
+* Function Name  : UDP_BLVIAPPlan_Cmd_Processing
+* Description    : BLVͨѶЭ�� - IAP���������ϱ����ͺ���
+*******************************************************************************/
+uint8_t UDP_BLVIAPPlan_Cmd_SendPack(uint8_t iap_state)
+{
+    uint8_t rev = 0;
+    uint32_t sendlen = 0;
+
+    Dbg_Println(DBG_BIT_NET_STATUS_bit,"%s -------",__func__);
+
+    if((server_info.frame_no < 0xfffe) && (server_info.frame_no >= 0x8000))
+    {
+        server_info.frame_no++;
+    } else {
+        server_info.frame_no = 0x8000;
+    }
+
+    memset(Global_Large_Buff,0,sizeof(Global_Large_Buff));
+
+    sendlen = BLV_UDP_HEAD_LEN;
+    Global_Large_Buff[sendlen++] = iap_state;                             //����״̬
+    Global_Large_Buff[sendlen++] = IAPVarTypeStruct_Ptr.IapFileType;                 //�������ļ�����
+
+    Global_Large_Buff[sendlen++] = (IAPVarTypeStruct_Ptr.BlockSize & 0xFF);          //�����ļ��ܿ���
+    Global_Large_Buff[sendlen++] = ((IAPVarTypeStruct_Ptr.BlockSize >> 8) & 0xFF);   //�����ļ��ܿ���
+
+    Global_Large_Buff[sendlen++] = (IAPVarTypeStruct_Ptr.Write_Block & 0xFF);         //�����ļ��ĵ�ǰ����
+    Global_Large_Buff[sendlen++] = ((IAPVarTypeStruct_Ptr.Write_Block >> 8) & 0xFF);  //�����ļ��ĵ�ǰ����
+
+    Global_Large_Buff[sendlen++] = IAPVarTypeStruct_Ptr.FtpFileNameLen;
+
+    memcpy(&Global_Large_Buff[sendlen],IAPVarTypeStruct_Ptr.FtpFileName,IAPVarTypeStruct_Ptr.FtpFileNameLen);
+    sendlen += IAPVarTypeStruct_Ptr.FtpFileNameLen;
+
+    UDP_Add_Header(Global_Large_Buff,In_BLVIAPPlan_Cmd,sendlen,server_info.frame_no);
+    NetCRC16(Global_Large_Buff,sendlen);
+
+    rev = WCHNET_SocketUdpSendTo(g_netinfo.SocketId[SocketIdnex_BLVSeriver], Global_Large_Buff, &sendlen, server_info.dis_ip, server_info.dis_port);
+
+    return rev;
+}
+
+/*******************************************************************************
+* Function Name  : UDP_BLVIAPJump_Cmd_Processing
+* Description    : BLVͨѶЭ�� - ��λ������մ�������
+*******************************************************************************/
+uint8_t UDP_BLVIAPJump_Cmd_Processing(uint8_t* data, uint16_t DataLen, uint8_t *ip,uint16_t port)
+{
+    uint8_t rev = 0x00,result = 0x02;
+    uint16_t deal_frame = 0;
+    uint32_t sendlen = 0;
+    memset(Global_Large_Buff,0,sizeof(Global_Large_Buff));
+
+    Dbg_Println(DBG_BIT_NET_STATUS_bit,"%s - %d",__func__,DataLen);
+
+    if(DataLen <= BLV_UDP_HEAD_LEN)    return 0x01;
+
+    /* У��֡�� - ֡�Ų�ͬ�����д���*/
+    deal_frame = UDP_Get_FrameNum(data);
+    if( server_info.udp_frame != deal_frame )
+    {
+        switch(data[BLV_UDP_HEAD_LEN])
+        {
+            case 0x01:
+                result = 0x01;
+                break;
+            case 0x02:
+                result = 0x01;
+                break;
+        }
+    }
+
+
+
+    //�ظ�����
+    sendlen = BLV_UDP_HEAD_LEN;
+    Global_Large_Buff[BLV_UDP_HEAD_LEN] = IAPVarTypeStruct_Ptr.BLVIapResult;        //�ظ��������
+
+    sendlen += 3;
+    UDP_Add_Header(Global_Large_Buff,In_BLVIAPJump_Cmd,sendlen,deal_frame);
+
+    NetCRC16(Global_Large_Buff,sendlen);
+
+    rev = WCHNET_SocketUdpSendTo(g_netinfo.SocketId[SocketIdnex_BLVSeriver],Global_Large_Buff,&sendlen,ip,port);
+
+    /* - ����Ǿ�����������ɺ�λ�Ļ�������һ����־λ,
+         * - ��Ҫ��Ԥ��IAP������ɺ󣬻�û�и�λ��������ظ����������*/
+    if( (SRAM_Read_Byte(SRAM_IAP_NET_UPGRADE_Flag_ADDRESS) == TFTP_FUNTYPE_LocalIAP) )
+    {
+        SRAM_Write_Byte(0x01, SRAM_IAP_IAP_Reset_Flag_ADDRESS);
+        Dbg_Println(DBG_BIT_NET_STATUS_bit,"%s ���þ�������λ��־ %d",__func__,SRAM_Read_Byte(SRAM_IAP_IAP_Reset_Flag_ADDRESS));
+    }
+
+    if(result == 0x01)
+    {
+        Delay_Ms(100);
+
+        WDT_Feed();
+
+        switch(data[BLV_UDP_HEAD_LEN])
+        {
+            case 0x01:  //������λ
+                Dbg_Println(DBG_BIT_NET_STATUS_bit,"%s ������λ",__func__,DataLen);
+                RCC_SET_GLOB_RST_KEEP(0x03);
+                Delay_Ms(100);
+
+                NVIC_SystemReset();
+                while(1);
+                break;
+            case 0x02:  //���Ź���λ
+                Dbg_Println(DBG_BIT_NET_STATUS_bit,"%s ���Ź���λ",__func__,DataLen);
+                RCC_SET_GLOB_RST_KEEP(0x04);    //0x04��APP ���Ź���λ
+                Delay_Ms(100);
+                while(1);
+                break;
+        }
+    }
+
+    return rev;
+}
+
+/*******************************************************************************
+* Function Name  : UDP_ReplyIAP_SendPack
+* Description    : BLVͨѶЭ�� - IAP�����ظ� ���ݷ��ͺ���
+*******************************************************************************/
+uint8_t UDP_ReplyIAP_SendPack(void)
+{
+    uint16_t frameno = 0x8001;
+    uint8_t R_IP[4] = {0};
+    uint16_t R_Port = 0;
+    uint32_t sendlen = 0x00;
+    uint8_t rev = 0;
+
+    Dbg_Println(DBG_BIT_NET_STATUS_bit,"%s",__func__);
+
+    memset(Global_Large_Buff,0,sizeof(Global_Large_Buff));
+
+    SRAM_DMA_Read_Buff(R_IP,4,SRAM_IAP_IP_ADDRESS);
+    R_Port = SRAM_Read_Byte(SRAM_IAP_PORT_ADDRESS);
+    R_Port |= SRAM_Read_Byte(SRAM_IAP_PORT_ADDRESS+1) << 8;
+
+    sendlen = BLV_UDP_HEAD_LEN;
+    Global_Large_Buff[sendlen++] = 0x01;            //�ظ�������� -
+    sendlen += UDP_ADD_SoftwareVer(&Global_Large_Buff[sendlen]);      //���ӹ̼��汾
+
+    sendlen += 2;
+    UDP_Add_Header(Global_Large_Buff,In_IAP_Cmd,sendlen,frameno);
+    NetCRC16(Global_Large_Buff,sendlen);
+
+    rev = WCHNET_SocketUdpSendTo(g_netinfo.SocketId[SocketIdnex_BLVSeriver],Global_Large_Buff,&sendlen,R_IP,R_Port);
+
+    return rev;
+}
+
+/*******************************************************************************
+* Function Name  : UDP_ReplyCloudIAP_SendPack
+* Description    : BLVͨѶЭ�� - �ƶ�IAP�����ظ� ���ݷ��ͺ���
+*******************************************************************************/
+uint8_t UDP_ReplyCloudIAP_SendPack(void)
+{
+    uint16_t frameno = 0x8001;
+    uint8_t R_IP[4] = {0};
+    uint16_t R_Port = 0;
+    uint32_t sendlen = 0x00;
+    uint8_t rev = 0;
+
+    Dbg_Println(DBG_BIT_NET_STATUS_bit,"%s",__func__);
+
+    memset(Global_Large_Buff,0,sizeof(Global_Large_Buff));
+
+    SRAM_DMA_Read_Buff(R_IP,4,SRAM_IAP_IP_ADDRESS);
+    R_Port = SRAM_Read_Byte(SRAM_IAP_PORT_ADDRESS);
+    R_Port |= SRAM_Read_Byte(SRAM_IAP_PORT_ADDRESS+1) << 8;
+
+    sendlen = BLV_UDP_HEAD_LEN;
+    Global_Large_Buff[sendlen++] = 0x01;            //�ظ�������� -
+    sendlen += UDP_ADD_SoftwareVer(&Global_Large_Buff[sendlen]);      //���ӹ̼��汾
+    Global_Large_Buff[sendlen++] = 0x00;
+
+    sendlen += 2;
+    UDP_Add_Header(Global_Large_Buff,In_Cloud_IAP_Cmd,sendlen,frameno);
+    NetCRC16(Global_Large_Buff,sendlen);
+
+    rev = WCHNET_SocketUdpSendTo(g_netinfo.SocketId[SocketIdnex_BLVSeriver],Global_Large_Buff,&sendlen,server_info.dis_ip,server_info.dis_port);
+
+    return rev;
+}
+
 /*******************************************************************************
 * Function Name  : UDP_Search_Cmd_Processing
 * Description    : BLVͨѶЭ�� - ����������մ�������
@@ -760,6 +1305,108 @@ uint8_t Udp_QueryTime_Cmd_Process(uint8_t *data, uint16_t DataLen, uint8_t *ip,u
     return 0;
 }
 
+/*******************************************************************************
+* Function Name  : Udp_WriteRegister_Cmd_Processing
+* Description    : UDPͨѶЭ�� - д��Ĵ������� ���ݴ�������
+*******************************************************************************/
+uint8_t Udp_WriteRegister_Cmd_Processing(uint8_t *data, uint16_t DataLen, uint8_t *ip,uint16_t port)
+{
+    uint8_t i = 0,temp = 0,temp_num = 0;
+    uint32_t read_register = 0,temp_offset = 0,temp_data = 0;
+    uint16_t pack_frame = 0;
+    uint32_t sendlen = BLV_UDP_HEAD_LEN;       //�������ݳ���
+
+    memset(Global_Large_Buff,0,sizeof(Global_Large_Buff));
+
+    Dbg_Println(DBG_BIT_NET_STATUS_bit,"%s",__func__);
+
+    pack_frame = UDP_Get_FrameNum(data);   //֡��
+
+    if( server_info.udp_frame != pack_frame )
+    {
+        //֡�Ų�ͬ����������
+
+        /*���üĴ�������*/
+        temp = 0x01;
+
+        if(data[BLV_UDP_HEAD_LEN] > 35) temp_num = 35;      //���üĴ�������,���35��
+        else temp_num = data[BLV_UDP_HEAD_LEN];
+
+        for(i = 0;i<temp_num;i++)
+        {
+            temp_offset = data[BLV_UDP_HEAD_LEN+i*8+4];
+            temp_offset <<= 8;
+            temp_offset |= data[BLV_UDP_HEAD_LEN+i*8+3];
+            temp_offset <<= 8;
+            temp_offset |= data[BLV_UDP_HEAD_LEN+i*8+2];
+            temp_offset <<= 8;
+            temp_offset |= data[BLV_UDP_HEAD_LEN+i*8+1];
+
+            temp_data = data[BLV_UDP_HEAD_LEN+i*8+8];
+            temp_data <<= 8;
+            temp_data |= data[BLV_UDP_HEAD_LEN+i*8+7];
+            temp_data <<= 8;
+            temp_data |= data[BLV_UDP_HEAD_LEN+i*8+6];
+            temp_data <<= 8;
+            temp_data |= data[BLV_UDP_HEAD_LEN+i*8+5];
+
+            read_register = SRAM_Register_Start_ADDRESS + temp_offset;
+            Dbg_Println(DBG_BIT_NET_STATUS_bit,"temp_offset:%X data:%X",read_register,temp_data);
+
+            if(read_register > SRAM_Register_End_ADDRESS)
+            {
+                temp = 0x02;        //д��ʧ��
+                Dbg_Println(DBG_BIT_NET_STATUS_bit,"Not In The Right Range");
+                continue;
+            }
+
+            /*��Ȩʱ��д��ʱ����������һ�±���ʱ�� �������û��RTCʱ����ֱ��ʹ��UTCʱ�䱣���ڱ���*/
+            if(read_register == (SRAM_Register_Start_ADDRESS + Register_MandateUTC_OFFSET))
+            {
+                S_RTC write_rtc;
+                memset(&write_rtc,0,sizeof(write_rtc));
+                Unix_Conversion_To_RTC(&write_rtc,temp_data);
+                RTC_WriteDate(write_rtc);
+            }
+
+            /*��Ȩ����ʱ��ˢ��*/
+            if(read_register == (SRAM_Register_Start_ADDRESS + Register_MandateExpiresTime_OFFSET))
+            {
+                BLV_Set_Authorize_Status(temp_data,0);
+            }
+
+            /*����MCU����״̬*/
+            if(read_register == (SRAM_Register_Start_ADDRESS + Register_MandateLock_OFFSET))
+            {
+                Dbg_Println(DBG_BIT_NET_STATUS_bit,"Set_Authorize_Lock_Status:%X",temp_data);
+                if(temp_data == 0x00000001)
+                {
+                    Set_Authorize_Lock_Status(0x01);
+                }else if(temp_data == 0x00000000)
+                {
+                    Set_Authorize_Lock_Status(0x00);
+                }
+            }
+
+            SRAM_Write_DW(temp_data,read_register);
+            if(temp_data != SRAM_Read_DW(read_register))    temp = 0x02;        //д��ʧ��
+        }
+
+        Retain_Flash_Register_Data();       //�����ݱ��浽Flash��
+    }else{
+        //֡����ͬ������������
+    }
+
+    sendlen = BLV_UDP_HEAD_LEN;
+    Global_Large_Buff[sendlen++] = temp;     //���
+    UDP_Add_Header(Global_Large_Buff,In_WriteRegister_Cmd,sendlen,pack_frame);             //����ͷ��
+    //���ݴ��
+    NetCRC16(&Global_Large_Buff[0],sendlen);
+    WCHNET_SocketUdpSendTo(g_netinfo.SocketId[SocketIdnex_BLVSeriver], &Global_Large_Buff[0], &sendlen, server_info.dis_ip, server_info.dis_port);
+
+    return 0x00;
+}
+
 /*******************************************************************************
 * Function Name  : Udp_Internal_GetRoomRent_CMD
 * Description    : ���������ȡ��̬
@@ -1068,12 +1715,16 @@ __attribute__((section(".non_0_wait"))) uint8_t Udp_Internal_Read_MCU_System_Sen
     }else {
         /*��ȡ����Launcher_ ǰ׺���ַ���Ĭ��ΪLauncher_C1F_V02*/
         memset(temp_data,0,sizeof(temp_data));
-        snprintf((char *)temp_data,sizeof(temp_data),"Launcher_C1F_V02 ");
+        snprintf((char *)temp_data,sizeof(temp_data),"Launcher_C1F_V04 ");
         memcpy(&Global_Large_Buff[BLV_UDP_HEAD_LEN+67],temp_data,20);
     }
 
     UDP_Add_Mac(&Global_Large_Buff[BLV_UDP_HEAD_LEN+87]);           //MAC��ַ
-    SRAM_DMA_Read_Buff(&Global_Large_Buff[BLV_UDP_HEAD_LEN+93],4,SRAM_Register_Start_ADDRESS + Register_ProjectCode_OFFSET);        //��Ŀ����
+    Global_Large_Buff[BLV_UDP_HEAD_LEN+93] = 0x3D;
+    Global_Large_Buff[BLV_UDP_HEAD_LEN+94] = 0x04;
+    Global_Large_Buff[BLV_UDP_HEAD_LEN+95] = 0x00;
+    Global_Large_Buff[BLV_UDP_HEAD_LEN+96] = 0x00;
+    //SRAM_DMA_Read_Buff(&Global_Large_Buff[BLV_UDP_HEAD_LEN+93],4,SRAM_Register_Start_ADDRESS + Register_ProjectCode_OFFSET);        //��Ŀ����
     SRAM_DMA_Read_Buff(&Global_Large_Buff[BLV_UDP_HEAD_LEN+97],4,SRAM_Register_Start_ADDRESS + Register_RoomNumber_OFFSET);
     SRAM_DMA_Read_Buff(&Global_Large_Buff[BLV_UDP_HEAD_LEN+101],4,SRAM_Register_Start_ADDRESS + Register_HouseType_OFFSET);
     SRAM_DMA_Read_Buff(&Global_Large_Buff[BLV_UDP_HEAD_LEN+105],4,SRAM_Register_Start_ADDRESS + Register_ConfigVersion_OFFSET);     //���������汾
@@ -1087,11 +1738,12 @@ __attribute__((section(".non_0_wait"))) uint8_t Udp_Internal_Read_MCU_System_Sen
 
     //��ʱ����ʹ��
     memset(temp_data,0,sizeof(temp_data));
-    snprintf((char *)temp_data,sizeof(temp_data),"BLV-C1");
+    snprintf((char *)temp_data,sizeof(temp_data),"BLV-C1F");
     memcpy(&Global_Large_Buff[BLV_UDP_HEAD_LEN+257],temp_data,32);
     memset(temp_data,0,sizeof(temp_data));
     snprintf((char *)temp_data,sizeof(temp_data),"BLV-V9");
     memcpy(&Global_Large_Buff[BLV_UDP_HEAD_LEN+321],temp_data,32);
+
     //��ȡFlash�е�ģ����ģ��
     //Flash_Read(&Global_Large_Buff[BLV_UDP_HEAD_LEN+257],64,SPIFLASH_MCU_Model_Revision_ADDRESS);
     //Flash_Read(&Global_Large_Buff[BLV_UDP_HEAD_LEN+321],64,SPIFLASH_MCU_Control_Revision_ADDRESS);
@@ -2222,6 +2874,7 @@ void Udp_Internal_Analysis(uint8_t *data, uint32_t len, uint8_t* ip, uint16_t po
                 temp_val = data[len-1];
                 temp_val <<= 0x08;
                 temp_val |= data[len-2];
+
                 if(NetCRC16_2(data,len-2) != temp_val)    return ;    //CRCУ��ʧ��,ֱ���˳�
 
                 switch(data[CMD_OFFSET])
@@ -2232,25 +2885,43 @@ void Udp_Internal_Analysis(uint8_t *data, uint32_t len, uint8_t* ip, uint16_t po
 //                case In_IAP_Cmd:                //IAP APP��������
 //                    UDP_IAP_Cmd_Processing(data, len, ip, port);
 //                    break;
-//                case In_Subgroup_Cmd:           //IAP �̼���������    -- ȡ��û��ʹ��
-//                    UDP_Subgroup_Cmd_Processing(data, len, ip, port);
-//                    break;
+
+                case In_Cloud_IAP_Cmd:          //�ƶ�IAP���������
+
+                    UDP_Cloud_IAP_Cmd_Processing(data, len, ip, port);
+
+                    break;
                 case In_Read_MCUSystem_Cmd:     //��ȡMCU�������� - Ҳ����������
                     UDP_Read_MCUSystem_Cmd_Processing(data, len, ip, port);
                     break;
                 case In_QueryTime_Cmd:          //��ȡʱ������
                     Udp_QueryTime_Cmd_Process(data, len, ip, port);
                     break;
+                case In_ReadRegister_Cmd:
+
+                    break;
+                case In_WriteRegister_Cmd:
+                    Udp_WriteRegister_Cmd_Processing(data, len, ip, port);
+                    break;
                 case In_DevState_Cmd:           //�ϱ��豸״̬����
                     Udp_Internal_RoomState_Process(data, len, ip, port);
                     break;
                 case In_PeriodicReport_Cmd:     //�����ϱ�����
                     Udp_Internal_Periodic_Report_Process(data, len, ip, port);
                     break;
-                case In_BLVIAPLogic_Cmd:
+                case In_BLVIAP_Cmd:             //PC �̼���������
+                    UDP_IAP_Cmd_Processing(data, len, ip, port);
+                    break;
+                case In_BLVIAPCheck_Cmd:        //PC ������
+                    UDP_BLVIAPCheck_Cmd_Processing(data, len, ip, port);
+                    break;
+                case In_BLVIAPJump_Cmd:         //PC �����
+                    UDP_BLVIAPJump_Cmd_Processing(data, len, ip, port);
+                    break;
+                case In_BLVIAPLogic_Cmd:        //PC ������������
                     Udp_Internal_BLVIAP_Logic(data, len, ip, port);
                     break;
-                case In_BLVPCTestDevice_Cmd:
+                case In_BLVPCTestDevice_Cmd:    //PC ��������
                     Udp_Internal_BLVPCTestDevice_Process(data, len, ip, port);
                     break;
                 default:
@@ -2274,7 +2945,7 @@ void Udp_Internal_Analysis(uint8_t *data, uint32_t len, uint8_t* ip, uint16_t po
 __attribute__((section(".non_0_wait"))) void BLV_UDP_Comm_Task(void)
 {
     static uint32_t udp_state_tick = 0;
-    uint32_t temp_val = 0;
+    uint32_t temp_val = 0,temp_rev = 0;
 
     /*������Ҫ���� - ������������*/
     if( SysTick_1ms - udp_state_tick >= 100 )
@@ -2283,16 +2954,6 @@ __attribute__((section(".non_0_wait"))) void BLV_UDP_Comm_Task(void)
 
         if( (WCHNET_Get_PHY_Linked_Status() == 0x01) || (server_info.init_flag == 0x00) ) return ;      //DNS��������ʧ��ֱ���˳�
 
-        /*���Ҳ���TFTP������*/
-//        if(IAPVarTypeStruct_Ptr != NULL)
-//        {
-//            if(IAPSTART == IAPVarTypeStruct_Ptr->IapState)
-//            {
-//                Dbg_Println(DBG_BIT_NET_STATUS_bit,"RoomState_Cmd��ͣ,IAP������..");
-//                return;
-//            }
-//        }
-
         server_info.udp_scan_cnt++;
         if(server_info.udp_scan_cnt >= 9)
         {
@@ -2322,6 +2983,8 @@ __attribute__((section(".non_0_wait"))) void BLV_UDP_Comm_Task(void)
             //UDP_ActSend_PowerChange_Scan_State();       //ɨ��ȡ�������ϱ�����
 
             //Udp_Scan_Roomstate();       //ɨ�跿���豸״̬
+
+
         }
 
         switch(server_info.udp_sta)
@@ -2340,6 +3003,47 @@ __attribute__((section(".non_0_wait"))) void BLV_UDP_Comm_Task(void)
                     }
 
                     return ;
+                }else{
+                    //�ж��Ƿ����������״̬
+                    if( (SRAM_Read_Byte(SRAM_IAP_NET_UPGRADE_Flag_ADDRESS) == TFTP_FUNTYPE_LocalIAP)
+                        && (SRAM_Read_Byte(SRAM_IAP_IAP_Reset_Flag_ADDRESS) == 0x01) )
+                    {
+                        Dbg_Println(DBG_BIT_NET_STATUS_bit,"�ظ�-�����������ɹ� ..");
+                        temp_rev = UDP_ReplyIAP_SendPack();
+                        if(temp_rev == WCHNET_ERR_SUCCESS)
+                        {
+                            Dbg_Println(DBG_BIT_NET_STATUS_bit,"�ظ��ɹ���");
+                            SRAM_Write_Byte(0xFF,SRAM_IAP_NET_UPGRADE_Flag_ADDRESS);    //�������������־λ
+                            SRAM_Write_Byte(0xFF,SRAM_IAP_IAP_Reset_Flag_ADDRESS);
+                        }else {
+                            Dbg_Println(DBG_BIT_NET_STATUS_bit,"�ظ�ʧ�� %x��",temp_rev);
+                            temp_rev = SRAM_Read_Byte(SRAM_IAP_UPGRADE_Reply_NUM_ADDRESS);
+                            if(temp_rev > 5) SRAM_Write_Byte(0xFF,SRAM_IAP_NET_UPGRADE_Flag_ADDRESS);    //�������������־λ
+                            temp_rev++;
+                            SRAM_Write_Byte(0xFF,SRAM_IAP_UPGRADE_Reply_NUM_ADDRESS);
+                        }
+
+                        return ;
+                    }else if( SRAM_Read_Byte(SRAM_IAP_NET_UPGRADE_Flag_ADDRESS) == TFTP_FUNTYPE_CloudIAP )
+                    {
+                        Dbg_Println(DBG_BIT_NET_STATUS_bit,"�ظ�-�ƶ����������ɹ� -..");
+                        temp_rev = UDP_ReplyCloudIAP_SendPack();
+                        if(temp_rev == WCHNET_ERR_SUCCESS)
+                        {
+                            Dbg_Println(DBG_BIT_NET_STATUS_bit,"�ظ��ɹ���");
+                            SRAM_Write_Byte(0xFF,SRAM_IAP_NET_UPGRADE_Flag_ADDRESS);    //�������������־λ
+
+                        }else {
+                            Dbg_Println(DBG_BIT_NET_STATUS_bit,"�ظ�ʧ�� %x��",temp_rev);
+                            temp_rev = SRAM_Read_Byte(SRAM_IAP_UPGRADE_Reply_NUM_ADDRESS);
+                            if(temp_rev > 5) SRAM_Write_Byte(0xFF,SRAM_IAP_NET_UPGRADE_Flag_ADDRESS);    //�������������־λ
+                            temp_rev++;
+                            SRAM_Write_Byte(0xFF,SRAM_IAP_UPGRADE_Reply_NUM_ADDRESS);
+                        }
+
+                        return ;
+                    }
+
                 }
 
                 Dbg_Println(DBG_BIT_NET_STATUS_bit,"UDPע�����ݷ���");
diff --git a/MCU_Driver/inc/blv_netcomm_function.h b/MCU_Driver/inc/blv_netcomm_function.h
index 21cb03d..31b4825 100644
--- a/MCU_Driver/inc/blv_netcomm_function.h
+++ b/MCU_Driver/inc/blv_netcomm_function.h
@@ -40,6 +40,8 @@
 #define In_Power_Change_Cmd             0x35    //ȡ��״̬�ϱ�        2025-09-25 ����
 #define In_DevState_Cmd                 0x36    //�豸״̬�ϱ�            2025-09-25 ����
 
+#define In_Cloud_IAP_Cmd                0x68    //�ƶ�IAP��������
+
 #define In_SeriaNet_Cmd                 0x70    //͸�������·�
 #define In_SeriaNetReported_Cmd         0x71    //͸�������ϱ�
 
@@ -75,6 +77,12 @@
 #define UDP_ActSend_TimeSync_Flag       0x20    //UDP�����ϱ� - ʱ��ͬ�� ��־λ
 #define UDP_ActSend_Heart_Flag          0x40    //UDP�����ϱ� - ������ ��־λ
 
+#define IAPPlan_State_Starting      0x01    //����״̬ - ��ʼ��������
+#define IAPPlan_State_Underway      0x02    //����״̬ - ������
+#define IAPPlan_State_Checking      0x03    //����״̬ - ����������ɣ�У����
+#define IAPPlan_State_CheckSucc     0x04    //����״̬ - У��ɹ�,RCU������
+#define IAPPlan_State_IAPTimeout    0x05    //����״̬ - ������ʱ
+
 #define USER_NET_Register_Timeout       30              //�������ע������ͳ�ʱ,��λ��S
 #define USER_NET_Send_Timeout           20              //�������ݵȴ��ظ�ʱ��,��λ��S
 #define USER_NET_Register_Times         10              //�������ע������ʹ���
@@ -96,8 +104,15 @@ uint8_t Udp_Internal_SeriaNet_Uploading(uint8_t port,uint32_t baud,uint32_t data
 uint8_t Udp_Internal_SeriaNet_Uploading2(uint8_t port,uint32_t baud,uint8_t* data, uint16_t DataLen);
 uint8_t Udp_Internal_SeriaNet_Response_Timeout(void);
 
+uint8_t UDP_BLVIAPPlan_Cmd_SendPack(uint8_t iap_state);
+
+uint8_t UDP_ReplyIAP_SendPack(void);
+uint8_t UDP_ReplyCloudIAP_SendPack(void);
+
 void Udp_Internal_Analysis(uint8_t *data, uint32_t len, uint8_t* ip, uint16_t port);
 
+
+
 void BLV_UDP_Comm_Task(void);
 
 #endif /* MCU_DRIVER_INC_BLV_NETCOMM_FUNCTION_H_ */
diff --git a/MCU_Driver/inc/flash_mem_addr.h b/MCU_Driver/inc/flash_mem_addr.h
index 691b9f7..77ff06e 100644
--- a/MCU_Driver/inc/flash_mem_addr.h
+++ b/MCU_Driver/inc/flash_mem_addr.h
@@ -20,9 +20,11 @@
 #define SPIFLASH_APP_FEATURE_Addr                       0x00000000          //���������� - 512Byte
 
 
-#define SPIFLASH_UPDATE_RECORD_Addr                     0x00000200          //д�����ͳ�Ʊ����ַ - 512Byte
+#define SPIFLASH_UPDATE_FLAG_Addr                       0x00000200          //д�����ͳ�Ʊ����ַ - 512Byte
+#define SPIFLASH_UPDATE_RECORD_Addr                     0x00000400          //д�����ͳ�Ʊ����ַ
 
-#define SPIFLASH_APP_Data_Start_Addr                    0x00004000
+
+#define SPIFLASH_APP_Data_Start_Addr                    0x00001000
 #define SPIFLASH_APP_Data_End_Addr                      0x0006FFFF
 
 #define SPIFLASH_APP_End_Addr                           0x0006FFFF
diff --git a/MCU_Driver/inc/mcu_flash.h b/MCU_Driver/inc/mcu_flash.h
index 47c3ee1..8380418 100644
--- a/MCU_Driver/inc/mcu_flash.h
+++ b/MCU_Driver/inc/mcu_flash.h
@@ -19,13 +19,13 @@
 #define App_Procedure_Not_Ready             0x44                //Appδ׼��������־λ
 
 //MCU Flash Address range(0x0 -- 0x6FFFF)   Size(448K)
-#define MCU_APP_Flash_Start_Addr            0x00007000          //MCU Flash��APP����ʼ��ַ
-#define MCU_APP_Data_Start_Addr             0x00007000          //MCU Flash APP������ʼ��ַ
-#define MCU_APP_Data_End_Addr               0x00027DFF          //MCU Flash APP���ݽ�����ַ
-#define MCU_APP_Feature_Addr                0x00027E00          //MCU Flash ���������ݱ����ַ
-#define MCU_APP_Flash_End_Addr              0x00027FFF          //MCU Flash��APP�Ľ�����ַ
+#define MCU_APP_Flash_Start_Addr            0x00001000          //MCU Flash��APP����ʼ��ַ
+#define MCU_APP_Data_Start_Addr             0x00001000          //MCU Flash APP������ʼ��ַ
+#define MCU_APP_Data_End_Addr               0x00067DFF          //MCU Flash APP���ݽ�����ַ
+#define MCU_APP_Feature_Addr                0x00067E00          //MCU Flash ���������ݱ����ַ
+#define MCU_APP_Flash_End_Addr              0x00067FFF          //MCU Flash��APP�Ľ�����ַ
 
-#define MCU_APP_Feature_PageAddr            0x00027000          //MCU APP������ ����ҳ�ĵ�ַ
+#define MCU_APP_Feature_PageAddr            0x00067000          //MCU APP������ ����ҳ�ĵ�ַ
 #define MCU_APP_Feature_PageOffset          0x00000E00          //MCU APP����������ҳ��ƫ����
 #define APP_FEATURE_SIZE                    0x0200              //512Byte
 
diff --git a/MCU_Driver/inc/sram_mem_addr.h b/MCU_Driver/inc/sram_mem_addr.h
index 78d726c..e34413b 100644
--- a/MCU_Driver/inc/sram_mem_addr.h
+++ b/MCU_Driver/inc/sram_mem_addr.h
@@ -116,7 +116,8 @@
 /*��¼Launcher�汾��Ϣ ��С��0x20 2025-07-07*/
 #define SRAM_Launcher_SoftwareVer_Addr                  0x0000E800
 
-
+/*Launcherʹ�� ���ڼ�¼APP��������ͳ�� ��С:0x10 2026-01-14*/
+#define SRAM_APP_Write_Count_Addr                       0x0000E900
 
 /**********SRAM Uart��������ض��� - ��ʼ**********/
 #define SRAM_Uart_Buffer_Size                           0x0400              //���ڻ���һ�����ݴ�С
@@ -170,19 +171,9 @@
 #define SRAM_VCard_Property_Start_Addr                  0x0004D000      //�޿�ȡ��  ��������   ��ʼ��ַ  ����   һ��1K
 #define SRAM_VCard_Property_End_Addr                    0x0004D3FF      //�޿�ȡ��  ��������   ������ַ  ����
 
-/**********SRAM�����洢��ַ ��ض��� - ��ʼ**********/
-#define SRAM_IAP_APP_FILE_ADDRESS                       0x00050000      //SRAM�д������APP�ļ��ĵ�ַ - 218K
-
-#define SRAM_IAP_IP_ADDRESS                             0x0008E600      //SRAM�д������ʱ�����õ�IP - 4Byte      ��ʱ��UDP��ַ��ſռ䣬����ͬʱ����͸��UDP��ַ����
-#define SRAM_IAP_PORT_ADDRESS                           0x0008E604      //SRAM�д������ʱ�����õ�port - 2Byte    ��ʱ��UDP��ַ��ſռ䣬����ͬʱ����͸��UDP��ַ����
-#define SRAM_IAP_NET_UPGRADE_Flag_ADDRESS               0x0008E606      //SRAM�д��������־λ - 1Byte
-#define SRAM_IAP_UPGRADE_Reply_NUM_ADDRESS              0x0008E607      //SRAM�д�������ظ�������������ɺ�APP��ʼ�����ϱ�������ɼ��� - 1Byte
-
-/**********SRAM�����洢��ַ ��ض��� - ����**********/
-
 /**********��Ŀӳ��Ĵ�����ض��� - ��ʼ**********/
-#define SRAM_Register_Start_ADDRESS                     0x0008E900
-#define SRAM_Register_End_ADDRESS                       0x0008EFFF
+#define SRAM_Register_Start_ADDRESS                     0x0004E000
+#define SRAM_Register_End_ADDRESS                       0x0004EFFF
 
 #define Register_OFFSET_LEN                     0x0400      //��ǰ�Ĵ����ռ䳤�� - �����������Ŀ�Ĵ����������ˣ��ⳤ��ҲӦ�ñ仯
 //��Ŀ�Ĵ���ƫ�Ƶ�ַ
@@ -222,29 +213,39 @@
 #define Register_TFTPDmName_OFFSET              0x0185      //TFTP��־���������� - 64Byte
 /**********��Ŀӳ��Ĵ�����ض��� - ����**********/
 
+/**********SRAM�����洢��ַ ��ض��� - ��ʼ**********/
+#define SRAM_IAP_APP_FILE_ADDRESS                       0x00100000      //SRAM�д������APP�ļ� ��ʼ��ַ - 412K
+#define SRAM_IAP_APP_FILE_End_ADDRESS                   0x00167FFF      //SRAM�д������APP�ļ� ������ַ
+
+#define SRAM_IAP_IP_ADDRESS                             0x00168000      //SRAM�д������ʱ�����õ�IP - 4Byte      ��ʱ��UDP��ַ��ſռ䣬����ͬʱ����͸��UDP��ַ����
+#define SRAM_IAP_PORT_ADDRESS                           0x00168004      //SRAM�д������ʱ�����õ�port - 2Byte    ��ʱ��UDP��ַ��ſռ䣬����ͬʱ����͸��UDP��ַ����
+#define SRAM_IAP_NET_UPGRADE_Flag_ADDRESS               0x00168006      //SRAM�д��������־λ - 1Byte
+#define SRAM_IAP_UPGRADE_Reply_NUM_ADDRESS              0x00168007      //SRAM�д�������ظ��ķ��ͼ�����������ɺ�APP��ʼ�����ϱ�������ɵ��ϱ����� - 1Byte
+#define SRAM_IAP_IAP_Reset_Flag_ADDRESS                 0x00168008      //SRAM�д�ž�����������ɺ󣬸�λ��־λ
+
+/**********SRAM�����洢��ַ ��ض��� - ����**********/
+
 /**********SRAM�����ļ��·� ��ض��� - ��ʼ**********/
-#define SRAM_IAP_LOGIC_FILE_ADDRESS             0x00090000      //SRAM���߼��·�����ļ������׵�ַ
+#define SRAM_IAP_LOGIC_FILE_ADDRESS                     0x00190000      //SRAM���߼��·�����ļ������׵�ַ
 
-#define SRAM_IAP_LOGIC_DataFlag_ADDRESS         0x00090000      //�ļ���־λ - 4Byte
-#define SRAM_IAP_LOGIC_DataSize_ADDRESS         0x00090004      //�ļ����� - 4Byte
-#define SRAM_IAP_LOGIC_DataMD5_ADDRESS          0x00090008      //�ļ�MD5У��ֵ - 16Byte
+#define SRAM_IAP_LOGIC_DataFlag_ADDRESS                 0x00190000      //�ļ���־λ - 4Byte
+#define SRAM_IAP_LOGIC_DataSize_ADDRESS                 0x00190004      //�ļ����� - 4Byte
+#define SRAM_IAP_LOGIC_DataMD5_ADDRESS                  0x00190008      //�ļ�MD5У��ֵ - 16Byte
 
-#define SRAM_IAP_LOGIC_DataStart_ADDRESS        0x00090200
-#define SRAM_IAP_LOGIC_DataEnd_ADDRESS          0x000FFFFF
+#define SRAM_IAP_LOGIC_DataStart_ADDRESS                0x00190200
+#define SRAM_IAP_LOGIC_DataEnd_ADDRESS                  0x001FFFFF
 /**********SRAM�����ļ��·� ��ض��� - ����**********/
 
 #define SRAM_DevAction_List_Size                0x0400          //ÿ���豸�����ڵ�洢�ռ��С  - ��ǰ�豸�����ڵ�
 #define SRAM_DevAction_List_Num                 950
-#define SRAM_DevAction_List_Start_Addr          0x00100000      //�豸����������ʼ��ַ       ����        һ��960K
-#define SRAM_DevAction_List_End_Addr            0x001EFFFF      //�豸��������������ַ     ������
-
-#define SRAM_BlwMap_List_Start_Addr             0x001F0000      //ӳ�����ʼ��ַ           ����        һ��32K
-#define SRAM_BlwMap_List_End_Addr               0x001F7FFF      //ӳ���������ַ           ������
-
-#define SRAM_DevDly_List_Start_Addr             0x001F8000      //��ʱ�豸��ʼ��ַ                     һ��32K
-#define SRAM_DevDly_List_End_Addr               0x001FFFFF      //��ʱ�豸������ַ
+#define SRAM_DevAction_List_Start_Addr                  0x00200000      //�豸����������ʼ��ַ       ����        һ��960K
+#define SRAM_DevAction_List_End_Addr                    0x002EFFFF      //�豸��������������ַ     ������
 
+#define SRAM_BlwMap_List_Start_Addr                     0x002F0000      //ӳ�����ʼ��ַ           ����        һ��32K
+#define SRAM_BlwMap_List_End_Addr                       0x002F7FFF      //ӳ���������ַ           ������
 
+#define SRAM_DevDly_List_Start_Addr                     0x002F8000      //��ʱ�豸��ʼ��ַ                     һ��32K
+#define SRAM_DevDly_List_End_Addr                       0x002FFFFF      //��ʱ�豸������ַ
 
 
 
diff --git a/MCU_Driver/inc/watchdog.h b/MCU_Driver/inc/watchdog.h
index 03553f7..3680afa 100644
--- a/MCU_Driver/inc/watchdog.h
+++ b/MCU_Driver/inc/watchdog.h
@@ -8,6 +8,9 @@
 #ifndef MCU_DRIVER_INC_WATCHDOG_H_
 #define MCU_DRIVER_INC_WATCHDOG_H_
 
+#include <stdint.h>
+#include "ch564.h"
+
 void WDT_Init(void);
 void WDT_Feed(void);
 void WDT_Reinit(void);
diff --git a/MCU_Driver/spi_flash.c b/MCU_Driver/spi_flash.c
index 3c2e1f5..7dfc3be 100644
--- a/MCU_Driver/spi_flash.c
+++ b/MCU_Driver/spi_flash.c
@@ -7,6 +7,7 @@
 
 #include "spi_flash.h"
 #include "debug.h"
+#include "watchdog.h"
 
 uint8_t Temp_Flash_Buff[4100]; //FLash д�뻺��BUFF
 
@@ -493,12 +494,22 @@ __attribute__((section(".non_0_wait"))) void Flash_Write(uint8_t* pBuffer,uint16
 /*******************************************************************************
 * Function Name  : SPI_FLASH_APP_Data_Erase
 * Description    : �ⲿFlash APP�ռ����
-*       APP�ռ��С Size: 0x00070000    ��ַ��Χ��0x00000000 ~ 0x0006FFFF
+*       APP�ռ��С Size: 0x00070000    ��ַ��Χ��0x00001000 ~ 0x0006FFFF
 *******************************************************************************/
 __attribute__((section(".non_0_wait"))) void SPI_FLASH_APP_Data_Erase(void)
 {
-    for(uint8_t i = 0;i < 7;i++)
+    Flash_Erase_Page(0);        //����APP������
+
+    for(uint8_t i = 1;i < 16;i++)
     {
+        WDT_Feed();
+
+        Flash_Erase_Sector(i);
+    }
+    for(uint8_t i = 1;i < 7;i++)
+    {
+        WDT_Feed();
+
         Flash_Erase_Block(i);
     }
 }
diff --git a/MCU_Driver/timer.c b/MCU_Driver/timer.c
index d210eb5..0ff19f0 100644
--- a/MCU_Driver/timer.c
+++ b/MCU_Driver/timer.c
@@ -22,7 +22,8 @@ void TIMER0_Init(void)
 volatile uint32_t Time0_100us = 0;
 volatile uint32_t Time0_1ms = 0;
 
-void __attribute__((interrupt("WCH-Interrupt-fast"))) TIM0_IRQHandler()
+void TIM0_IRQHandler(void) __attribute__((interrupt("WCH-Interrupt-fast")));
+void TIM0_IRQHandler(void)
 {
     static uint8_t NUM_1 = 0;
 
diff --git a/MCU_Driver/uart.c b/MCU_Driver/uart.c
index a52713d..1311961 100644
--- a/MCU_Driver/uart.c
+++ b/MCU_Driver/uart.c
@@ -455,7 +455,7 @@ __attribute__((section(".non_0_wait"))) uint8_t UART1_ChangeBaud(uint32_t baudra
 
     while(1)
     {
-        if( UART0_GetLinSTA() & RB_LSR_TX_ALL_EMP )
+        if( UART1_GetLinSTA() & RB_LSR_TX_ALL_EMP )
         {
             /*������*/
             __disable_irq();
@@ -503,7 +503,7 @@ __attribute__((section(".non_0_wait"))) uint8_t UART2_ChangeBaud(uint32_t baudra
 
     while(1)
     {
-        if( UART0_GetLinSTA() & RB_LSR_TX_ALL_EMP )
+        if( UART2_GetLinSTA() & RB_LSR_TX_ALL_EMP )
         {
             /*������*/
             __disable_irq();
@@ -551,7 +551,7 @@ __attribute__((section(".non_0_wait"))) uint8_t UART3_ChangeBaud(uint32_t baudra
 
     while(1)
     {
-        if( UART0_GetLinSTA() & RB_LSR_TX_ALL_EMP )
+        if( UART3_GetLinSTA() & RB_LSR_TX_ALL_EMP )
         {
             /*������*/
             __disable_irq();
diff --git a/MCU_Driver/watchdog.c b/MCU_Driver/watchdog.c
index af7275f..3cd1df0 100644
--- a/MCU_Driver/watchdog.c
+++ b/MCU_Driver/watchdog.c
@@ -8,14 +8,14 @@
 
 /*******************************************************************************
 * Function Name  : WDT_Init
-* Description    : ���Ź���ʼ�� ���Ź�һ������ʱ��Ϊ4ms����
+* Description    : ���Ź���ʼ�� ����100MHz ��ƵԼΪ84ms
 * Input          : None
 * Return         : None
 *******************************************************************************/
 __attribute__((section(".non_0_wait"))) void WDT_Init(void)
 {
-//    WWDG_ResetCfg(ENABLE);
-//    WWDG_SetCounter(WDT_NUM);
+    FEED_DOG();
+    WDOG_ENABLE();
 }
 
 /*******************************************************************************
@@ -26,17 +26,14 @@ __attribute__((section(".non_0_wait"))) void WDT_Init(void)
 *******************************************************************************/
 __attribute__((section(".non_0_wait"))) void WDT_Feed(void)
 {
-    //WWDG_ClearFlag();
-//    WWDG_SetCounter(WDT_NUM);
+    FEED_DOG();
 }
 
 /*******************************************************************************
 * Function Name  : WDT_Reinit
-* Description    : ���Ź�ȥ��ʼ�� ���Ź�һ������ʱ��Ϊ4ms����
-* Input          : None
-* Return         : None
+* Description    : ���Ź�ȥ��ʼ��
 *******************************************************************************/
 __attribute__((section(".non_0_wait"))) void WDT_Reinit(void)
 {
-
+    WDOG_DISABLE();
 }
diff --git a/NetLib/net_function.c b/NetLib/net_function.c
index d9fa58e..47cdd49 100644
--- a/NetLib/net_function.c
+++ b/NetLib/net_function.c
@@ -601,12 +601,12 @@ __attribute__((section(".non_0_wait"))) void NetWork_Parameter_Get(void)
         //MCU��ʼ��IP
         g_netinfo.device_ip[0] = 192;
         g_netinfo.device_ip[1] = 168;
-        g_netinfo.device_ip[2] = MACAddr[4];
-        g_netinfo.device_ip[3] = MACAddr[5];
+        g_netinfo.device_ip[2] = g_netinfo.mac_addr[4];
+        g_netinfo.device_ip[3] = g_netinfo.mac_addr[5];
         //MCU��ʼ����
         g_netinfo.gateway[0] = 192;
         g_netinfo.gateway[1] = 168;
-        g_netinfo.gateway[2] = MACAddr[4];
+        g_netinfo.gateway[2] = g_netinfo.mac_addr[4];
         g_netinfo.gateway[3] = 1;
         //MCU��ʼ��������
         g_netinfo.subnet[0] = 255;
@@ -775,9 +775,16 @@ __attribute__((section(".non_0_wait"))) uint8_t WCHNET_LIB_Init(void)
         Dbg_Println(DBG_BIT_NET_STATUS_bit,"version error.\n");
     }
 
+    /*��ȡMAC ��ַ*/
+    g_netinfo.mac_addr[2] = SRAM_Read_Byte(SRAM_Register_Start_ADDRESS + Register_NETMACKADDR_OFFSET );
+    g_netinfo.mac_addr[3] = SRAM_Read_Byte(SRAM_Register_Start_ADDRESS + Register_NETMACKADDR_OFFSET + 1);
+    g_netinfo.mac_addr[4] = SRAM_Read_Byte(SRAM_Register_Start_ADDRESS + Register_NETMACKADDR_OFFSET + 2);
+    g_netinfo.mac_addr[5] = SRAM_Read_Byte(SRAM_Register_Start_ADDRESS + Register_NETMACKADDR_OFFSET + 3);
+
     //��ȡоƬ�Դ���MAC ��ַ
 //    GetMACAddress(MACAddr);
-//    Dbg_Print_Buff(DBG_BIT_NET_STATUS_bit, "NET MAC:", MACAddr, 6);
+
+    Dbg_Print_Buff(DBG_BIT_NET_STATUS_bit, "NET MAC:", g_netinfo.mac_addr, 6);
 
     NetWork_Parameter_Get();
 
@@ -814,6 +821,8 @@ __attribute__((section(".non_0_wait"))) uint8_t WCHNET_LIB_Init(void)
 
     server_info.net_sta = NET_PHY_WAIT;
 
+    SRAM_Write_Byte(0x00,SRAM_IAP_UPGRADE_Reply_NUM_ADDRESS);
+
     return 0;
 }
 
diff --git a/NetLib/tftp_function.c b/NetLib/tftp_function.c
index 21ee476..1d1fb33 100644
--- a/NetLib/tftp_function.c
+++ b/NetLib/tftp_function.c
@@ -6,6 +6,7 @@
  */
 #include "tftp_function.h"
 #include "net_function.h"
+#include "blv_netcomm_function.h"
 #include "sram_mem_addr.h"
 #include "flash_mem_addr.h"
 #include "spi_flash.h"
@@ -125,10 +126,10 @@ __attribute__((section(".non_0_wait"))) uint8_t IAP_tftp_process_write(uint8_t s
     memcpy(&tftp_args.to_ip[0],to_ip,4);
     tftp_args.to_port = to_port;
 
-    tftp_args.block = 0;
     tftp_args.tot_bytes = 0;
 
-    IAPVarTypeStruct_Ptr.TotalCount =0;
+    IAPVarTypeStruct_Ptr.Write_Block = 0;
+    IAPVarTypeStruct_Ptr.TotalCount = 0;
     IAPVarTypeStruct_Ptr.IapErrFlag = 0;
     Dbg_Println(DBG_BIT_NET_STATUS_bit,"ip:%d.%d.%d.%d, port:%d",to_ip[0], to_ip[1], to_ip[2], to_ip[3], to_port);
     /*BLV_C1 -- ����Flash���ݣ���������֤������֮���ٲ���ͬʱ��SRAM�е�����д��flash��*/
@@ -147,7 +148,55 @@ __attribute__((section(".non_0_wait"))) uint8_t IAP_tftp_process_write(uint8_t s
         return 0x01;
     }
 
-    TFTP_send_ack_packet(g_netinfo.SocketId[SocketIdnex_TFTPDATA], to_ip, to_port, tftp_args.block);        //ʹ�������׽���
+    TFTP_send_ack_packet(g_netinfo.SocketId[SocketIdnex_TFTPDATA], to_ip, to_port, IAPVarTypeStruct_Ptr.Write_Block);        //ʹ�������׽���
+    return 0x00;
+}
+
+/*******************************************************************************
+* Function Name  : IAP_tftp_process_read
+* Description    : TFTP�����׽��� - ���Ͷ�ȡ�ļ����� ���ݷ���
+*******************************************************************************/
+uint8_t IAP_tftp_process_read(uint8_t s, uint8_t* to_ip, int to_port)
+{
+    uint8_t data_buffer[150];
+    uint32_t sendlen = 0;
+
+    memset(data_buffer,0,sizeof(data_buffer));
+
+    Dbg_Println(DBG_BIT_NET_STATUS_bit,"%s",__func__);
+
+    IAPVarTypeStruct_Ptr.TotalCount = 0x00;
+    IAPVarTypeStruct_Ptr.IapErrFlag = 0x00;
+
+    if(IAPVarTypeStruct_Ptr.IapFileType == TFTP_IAP_DataType_APP)
+    {
+        Dbg_Println(DBG_BIT_NET_STATUS_bit,"���������ļ�д���ַ");
+        IAPVarTypeStruct_Ptr.FlashWriteAddress = SRAM_IAP_APP_FILE_ADDRESS;    //����д��ַ - �����ȱ�����SRAM��
+    }else if(IAPVarTypeStruct_Ptr.IapFileType == TFTP_IAP_DataType_CONFIG)
+    {
+        Dbg_Println(DBG_BIT_NET_STATUS_bit,"�����߼�����д���ַ");
+        IAPVarTypeStruct_Ptr.FlashWriteAddress = SRAM_IAP_LOGIC_DataStart_ADDRESS; //����д��ַ - �����ȱ�����SRAM��
+    }else{
+        return 1;
+    }
+
+    data_buffer[0] = 0x00;
+    data_buffer[1] = 0x01;
+    memcpy(&data_buffer[2], IAPVarTypeStruct_Ptr.FtpFileName, IAPVarTypeStruct_Ptr.FtpFileNameLen);   //���ļ�����λ��ȥ��ȡ�ļ� �ܳ���
+
+    sendlen += IAPVarTypeStruct_Ptr.FtpFileNameLen+2;
+    data_buffer[sendlen++] = 0;
+    data_buffer[sendlen++] = 'o';       //octet ��������׼ʹ�ð�λ��
+    data_buffer[sendlen++] = 'c';
+    data_buffer[sendlen++] = 't';
+    data_buffer[sendlen++] = 'e';
+    data_buffer[sendlen++] = 't';
+    data_buffer[sendlen++] = 0;
+
+    Dbg_Println(DBG_BIT_NET_STATUS_bit,"FtpFileNameLen:%d , name:%s",IAPVarTypeStruct_Ptr.FtpFileNameLen,IAPVarTypeStruct_Ptr.FtpFileName);
+    Dbg_Println(DBG_BIT_NET_STATUS_bit,"SocketId:%d , port:%d , len:%d , IP:%d.%d.%d.%d",s,to_port,sendlen,to_ip[0],to_ip[1],to_ip[2],to_ip[3]);
+
+    WCHNET_SocketUdpSendTo(s, data_buffer, &sendlen, to_ip, to_port);
     return 0x00;
 }
 
@@ -171,6 +220,11 @@ __attribute__((section(".non_0_wait"))) void TFTP_IAP_Data_Processing(uint8_t s,
 
     Dbg_Println(DBG_BIT_NET_STATUS_bit,"%s block:%d - %d",__func__,IAPVarTypeStruct_Ptr.Write_Block,TFTP_Pack_Get_Block(pkt_buf));
 
+    if( pkt_buf_len > TFTP_DATA_LEN_MAX )   {
+        Dbg_Println(DBG_BIT_NET_STATUS_bit,"%s Data_len:%d Error",__func__,pkt_buf_len);
+        return ;
+    }
+
     if( (pkt_buf_len > TFTP_DATA_PKT_HDR_LEN) && ( TFTP_Pack_Get_Block(pkt_buf) == (IAPVarTypeStruct_Ptr.Write_Block + 1) ) )
     {
         pkt_buf_len = pkt_buf_len - TFTP_DATA_PKT_HDR_LEN;
@@ -189,7 +243,7 @@ __attribute__((section(".non_0_wait"))) void TFTP_IAP_Data_Processing(uint8_t s,
             if( IAPVarTypeStruct_Ptr.Write_Block == 0x00 )
             {
                 temp_val = data_buffer[0] + (data_buffer[1]<<8) + (data_buffer[2]<<16) + (data_buffer[3]<<24);
-                Dbg_Println(DBG_BIT_NET_STATUS_bit,"temp_var : %08X ,block :%d",temp_val,IAPVarTypeStruct_Ptr.Write_Block);
+                Dbg_Println(DBG_BIT_NET_STATUS_bit,"temp_var : %X ,block :%d",temp_val,IAPVarTypeStruct_Ptr.Write_Block);
                 if( (temp_val & 0x2FFE0000) != 0x20000000 )
                 {
                     Dbg_Println(DBG_BIT_NET_STATUS_bit,"�ڴ����ĵ�ַ������Ч��");
@@ -208,7 +262,7 @@ __attribute__((section(".non_0_wait"))) void TFTP_IAP_Data_Processing(uint8_t s,
 //                        break;
 //                }
 
-                IAPVarTypeStruct_Ptr.IapErrFlag = 1;                                                                //���������־��һ
+                //IAPVarTypeStruct_Ptr.IapErrFlag = 1;                                                                //���������־��һ
                 Dbg_Println(DBG_BIT_NET_STATUS_bit,"����ʧ�ܣ���ַ���� data_buffer[0] & 0x2FFE0000 = %X; data_buffer[1]=%X\n", (data_buffer[0] & 0x2FFE0000), data_buffer[1]);
 
             }else if( IAPVarTypeStruct_Ptr.Write_Block > APP_BLOCK_MAX ){
@@ -253,7 +307,7 @@ __attribute__((section(".non_0_wait"))) void TFTP_IAP_Data_Processing(uint8_t s,
         {
             IAPVarTypeStruct_Ptr.Write_Block++;
             SRAM_DMA_Write_Buff(data_buffer,pkt_buf_len,IAPVarTypeStruct_Ptr.FlashWriteAddress);        //�SRAM��������
-            Dbg_Println(DBG_BIT_NET_STATUS_bit,"д���ַ��%08X,д������: byte��%d", IAPVarTypeStruct_Ptr.FlashWriteAddress, pkt_buf_len);
+            Dbg_Println(DBG_BIT_NET_STATUS_bit,"д���ַ��%X,д������: byte��%d", IAPVarTypeStruct_Ptr.FlashWriteAddress, pkt_buf_len);
 
             /*�Գ��Ƚ���4Byte���� �����ڵ�ַƫ��ʹ��   ���費��Ҫ�ֽڶ��룬����̫��Ҫ*/
 //            pkt_buf_len = (pkt_buf_len + 3) / 4;
@@ -268,7 +322,16 @@ __attribute__((section(".non_0_wait"))) void TFTP_IAP_Data_Processing(uint8_t s,
 
     TFTP_send_ack_packet(s, ip_addr, Port, IAPVarTypeStruct_Ptr.Write_Block);   //��ÿ�δ����ݰ��Ļظ������׽��� ��ַ �˿ںͿ��
 
-    if( IAPVarTypeStruct_Ptr.Write_Block == IAPVarTypeStruct_Ptr.BlockSize )
+    if( (IAPVarTypeStruct_Ptr.BLVIapFlag != 0x01)
+            && (IAPVarTypeStruct_Ptr.Write_Block != 0x00)
+            && (IAPVarTypeStruct_Ptr.Write_Block % 50 == 0x00)
+            && (IAPVarTypeStruct_Ptr.BlockSize != IAPVarTypeStruct_Ptr.Write_Block) )
+    {
+        /* ���ƶ˷������ϱ��ƶ��������� */
+        UDP_BLVIAPPlan_Cmd_SendPack(IAPPlan_State_Underway);      //����������
+    }
+
+    if( (IAPVarTypeStruct_Ptr.BLVIapFlag != 0x01) && (IAPVarTypeStruct_Ptr.Write_Block == IAPVarTypeStruct_Ptr.BlockSize) )
     {
         uint8_t md5[16] = {0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0};
         uint16_t crc_data_len = 0;
@@ -283,23 +346,17 @@ __attribute__((section(".non_0_wait"))) void TFTP_IAP_Data_Processing(uint8_t s,
             {
                 //�ļ�MD5У��ɹ�
                 Dbg_Println(DBG_BIT_NET_STATUS_bit,"�����ɹ���Md5��ȷ");
-                //Ϊɶ�������ƶ˻ظ�������������Ҫ��һ��
-//                switch(IAPVarTypeStruct_Ptr->IapType)
-//                {
-//                    case IAPTFTPWRITE:  //������������״̬Ϊ���,�������
-//                        Dbg_Println(DBG_BIT_NET_STATUS_bit,"��¼�����������ɹ�״̬..");
-//                        SRAM_Write_Byte(IAP_STATE_COMPLETE, SRAM_IAP_NET_UPGRADE_Flag_ADDRESS);
-//                        LOG_LogicInfo_DebugRecord("��¼�����������ɹ�״̬..");
-//                        break;
-//                    case IAPTFTPREAD:       //�ƶ���������
-//                        Dbg_Println(DBG_BIT_NET_STATUS_bit,"��¼�ƶ������ɹ�״̬..");
-//                        LOG_LogicInfo_DebugRecord("��¼�ƶ������ɹ�״̬..");
-//                        SRAM_Write_Byte(CLOUD_IAP_TFTP_STATE_COMPLETE, SRAM_IAP_NET_UPGRADE_Flag_ADDRESS);
-//                        break;
-//                }
+
+                if( IAPVarTypeStruct_Ptr.FunType == TFTP_FUNTYPE_CloudIAP )
+                {
+                    Dbg_Println(DBG_BIT_NET_STATUS_bit,"��¼�ƶ������ɹ�״̬..");
+                    LOG_LogicInfo_DebugRecord("��¼�ƶ������ɹ�״̬..");
+                    SRAM_Write_Byte(TFTP_FUNTYPE_CloudIAP, SRAM_IAP_NET_UPGRADE_Flag_ADDRESS);
+                }
+
                 Dbg_Println(DBG_BIT_NET_STATUS_bit,"��APP�Flash��..");
 
-                //Cloud_IAP_Plan_SendPack(args,IAPVarTypeStruct_Ptr,IAPPlan_State_CheckSucc);     //����������ɣ�У���С�����
+                UDP_BLVIAPPlan_Cmd_SendPack(IAPPlan_State_CheckSucc);          //����IAP������� - ��������
 
                 SPI_FLASH_APP_Data_Erase();
                 for(uint32_t i = 0;i < IAPVarTypeStruct_Ptr.BlockSize; i++ )
@@ -358,6 +415,8 @@ __attribute__((section(".non_0_wait"))) void TFTP_IAP_Data_Processing(uint8_t s,
 
                 Dbg_Println(DBG_BIT_DEVICE_STATUS_bit,"�̼�����������λ!");
                 //ֱ�ӿ��Ź���λ
+                NVIC_SystemReset();
+                while(1);
 
             }else{
                 //MD5У��ʧ��
@@ -401,7 +460,7 @@ __attribute__((section(".non_0_wait"))) void TFTP_IAP_Data_Processing(uint8_t s,
 //                        break;
 //                }
 
-                //Cloud_IAP_Plan_SendPack(args,IAPVarTypeStruct_Ptr,IAPPlan_State_CheckSucc);     //����������ɣ�У���С�����
+                UDP_BLVIAPPlan_Cmd_SendPack(IAPPlan_State_CheckSucc);          //����IAP������� - ��������
 
                 SPI_FLASH_Logic_File_Erase();       //��������ȫ������
 
@@ -495,6 +554,11 @@ void UDPSocket_TFTP_CMD_AppCallBack(struct _SOCK_INF * SocketInf,uint32_t ipaddr
         /*TFTP�����ϴ���־�����У��Ż���յ�������*/
 
 
+    }else if( TFTP_Pack_Get_Opcode(buff) == TFTP_DATA )
+    {
+        /*TFTP�����ƶ������У��Ż���յ�������*/
+
+
     }else {
         /*�������� - �ݲ�����*/
 
@@ -527,6 +591,8 @@ void UDPSocket_TFTP_DATA_AppCallBack(struct _SOCK_INF * SocketInf,uint32_t ipadd
 //    }
 }
 
+
+
 /*******************************************************************************
 * Function Name  : Internal_TFTP_Task
 * Description    : TFTP������
@@ -563,14 +629,25 @@ __attribute__((section(".non_0_wait"))) void Internal_TFTP_Task(void)
                 {
                     IAPVarTypeStruct_Ptr.processing_tick = SysTick_1ms;
                     IAPVarTypeStruct_Ptr.status = STA_INIT_IDLE;
+
+
+                    if(IAPVarTypeStruct_Ptr.FunType == TFTP_FUNTYPE_CloudIAP)
+                    {
+                        //���ƶ˷����������ļ�
+                        //TFTP_CMD_ACK(server_info.goal_ip, server_info.goal_port);    //�ظ�TFTP����
+
+                        Dbg_Println(DBG_BIT_NET_STATUS_bit,"���ƶ˷����������ļ�...");
+                        IAP_tftp_process_read(g_netinfo.SocketId[SocketIdnex_TFTPDATA], server_info.goal_ip, IAPVarTypeStruct_Ptr.TFTP_Port);
+                    }
+
                 }
                 break;
             case STA_INIT_IDLE:
                 //���ƶ˷��Ͷ�ȡ�ļ�����
 
-                if( SysTick_1ms - IAPVarTypeStruct_Ptr.processing_tick > 30000)     //������ʱ���ͷ��׽���
+                if( SysTick_1ms - IAPVarTypeStruct_Ptr.processing_tick > 60000 )     //������ʱ���ͷ��׽���
                 {
-                    //Cloud_IAP_Plan_SendPack(tftp_args,IAPVarTypeStruct_Ptr,IAPPlan_State_IAPTimeout);   //����IAP������� - ������ʱ
+                    UDP_BLVIAPPlan_Cmd_SendPack(IAPPlan_State_IAPTimeout);          //����IAP������� - ������ʱ
 
                     Dbg_Println(DBG_BIT_NET_STATUS_bit,"TFTP ������ʱ");
                     IAPVarTypeStruct_Ptr.status = STA_END;
@@ -626,6 +703,7 @@ __attribute__((section(".non_0_wait"))) void Internal_TFTP_Task(void)
                 }
                 break;
             case STA_INIT_CONNECT:  //
+
                 break;
             }
         }
diff --git a/NetLib/tftp_function.h b/NetLib/tftp_function.h
index 9cf53b3..b56b80d 100644
--- a/NetLib/tftp_function.h
+++ b/NetLib/tftp_function.h
@@ -61,7 +61,8 @@ typedef struct
     uint8_t  enable;                //TFTP ����ʹ��״̬ 0X01:ʹ�ܣ�0x00:ûʹ��
     uint8_t  FunType;               //�������� 0x01:����IAP������0x02:�ƶ�IAP������0x03:LOG��־�ϴ�
 
-    uint8_t  NewIapFlag;            //���������̱�־λ - 2022-01-05
+    uint8_t  BLVIapFlag;            //BLV�������̱�־λ
+    uint8_t  BLVIapResult;          //BLV�������
 
     uint8_t  IapErrFlag;            //�������ݴ�������־
 
@@ -105,7 +106,9 @@ typedef struct
 }tftp_connection_args;
 
 extern IAPVarTypeStruct IAPVarTypeStruct_Ptr;
+extern tftp_connection_args tftp_args;
 
+uint8_t bytes_cmp(uint8_t *src,uint8_t *dat,uint32_t len);
 void Internal_TFTP_Task(void);
 
 #endif /* NETLIB_TFTP_FUNCTION_H_ */
diff --git a/Peripheral/inc/ch564_rcc.h b/Peripheral/inc/ch564_rcc.h
index 41d02db..c55add0 100644
--- a/Peripheral/inc/ch564_rcc.h
+++ b/Peripheral/inc/ch564_rcc.h
@@ -100,7 +100,7 @@ extern "C"
 }
 
 #define RCC_GET_GLOB_RST_KEEP() (R8_GLOB_RESET_KEEP)
-#define RCC_SET_GLOB_RST_KEEP(val) (R8_GLOB_RESET_KEEP = (val);)
+#define RCC_SET_GLOB_RST_KEEP(val) {R8_GLOB_RESET_KEEP = (val);}
 #define RCC_SET_PLL_SYS_OUT_DIV(val)                                                                                   \
 ({                                                                                                                 \
     RCC_UNLOCK_SAFE_ACCESS();                                                                                      \
diff --git a/Readme.md b/Readme.md
index 1d57707..4559550 100644
--- a/Readme.md
+++ b/Readme.md
@@ -1,86 +1,94 @@
+
+
+```C
 待完成事项：
-
 ​	1、Launcher 第一次跳转失败问题，待解决。
-
 ​	2、RS485主动端口增加避障功能，RS485轮询端口与BUS端口是轮询机制，不需要增加。
-
 ​	3、BLV-C1P 无启动原因，需另辟须经实现启动原因。
-
 ​	4、Launcher流程修改，MCU Flash只在升级后写入，其他原因启动不写入MCU Flash。
-
 ​	5、在每个设备驱动中增加读取软件版本号，
-
+​	6、APP固件中串口升级 - 搜索命令、跳转命令
+​	7、TFTP日志上传机制修改
+    
 待测试事项：
-
 ​	1、配置功能 - 睡眠功能
-
 ​	2、配置功能 - 多联开关
-
 ​	3、配置功能 - 无卡取电
-
 ​	4、配置功能 - 空调提示音
-
-遇到问题：
-
-​	1、网络搜索主机 - 回复项目编码、房型、房号、房号ID、房型ID 、房态、不正确
-
-​	2、网络搜索主机中，服务器通讯端口在C1F中，这个端口是固定为3341，网络配置工具上使用的是这个字段进行的网络通讯下发字段。
-
-​		问题点：RCU主机 UDP套接字固定端口为3341，而服务器端口为3339
-
-​	
+```
 
 
 
-#### 2026-01-08
+### 2026-02-10
 
-1、场景动作延时执行 - 初步测试OK
+```C
+修改人：曹聪
+修改点：
+    1、局域网升级流程 - 初步测试OK
+    2、云端升级流程 - 初步测试OK
+    3、云端升级上报升级进度 - 初步测试OK
+```
 
-2、场景反馈灯控制 - 初步测试OK
+### 2026-01-08
 
-3、开关、插卡取电、温控器设备模型 - 初步测试OK
+```C
+修改人：曹聪
+修改点：
+    1、场景动作延时执行 - 初步测试OK
+    2、场景反馈灯控制 - 初步测试OK
+    3、开关、插卡取电、温控器设备模型 - 初步测试OK
+```
+
+### 2026-01-06
+
+```C
+修改人：曹聪
+修改点：
+	1、场景动作执行初步测试OK
+```
+
+### 2026-01-05
+
+```C
+修改人：曹聪
+修改点：
+	1、CSIO 继电器单独一个设备存放在BUS设备列表中，应该将这个设备存放到虚拟设备上 - 不合理的地方，待修改
+	2、调试BUS总线通讯 - OK
+	3、动作执行 - 网络控制继电器 OK
+	4、增加C5继电器设备
+```
+
+### 2025-12-25
+
+```C
+修改人：曹聪
+修改点：
+	1、TFTP升级 - 配置文件初步测试没问题
+	2、配置文件内容解析移植完毕，调试中
+	3、TFTP升级 - 是否一个套接字搞定，不需要使用两个套接字
+```
+
+### 2025-12-10
+
+```C
+修改人：曹聪
+修改点：
+   	1、TFTP IAP升级功能移植完毕，待测试
+	2、优化代码编译的空间问题，目前零等待区的空间已满，需将除了库函数以外的代码及相关变量全部放置非零等待区中，否则项目编译不成功
+```
+
+### 2025-12-06
+
+```C
+修改人：曹聪
+修改点：
+	1、动作执行函数初步实现完毕 - 待测试
+	2、开始移植TFTP功能
+        -> TFTP升级
+        -> TFTP日志文件传输
+```
 
 
 
-#### 2026-01-06
-
-​	1、场景动作执行初步测试OK
 
 
-
-#### 2026-01-05
-
-​	1、CSIO 继电器单独一个设备存放在BUS设备列表中，应该将这个设备存放到虚拟设备上 - 不合理的地方，待修改
-
-​	2、调试BUS总线通讯 - OK
-
-​	3、动作执行 - 网络控制继电器 OK
-
-​	4、增加C5继电器设备
-
-
-
-#### 2025-12-25
-
-​	1、TFTP升级 - 配置文件初步测试没问题
-
-​	2、配置文件内容解析移植完毕，调试中
-
-​	3、TFTP升级 - 是否一个套接字搞定，不需要使用两个套接字
-
-
-
-#### 2025-12-10
-
-​	1、TFTP IAP升级功能移植完毕，待测试
-
-​	2、优化代码编译的空间问题，目前零等待区的空间已满，需将除了库函数以外的代码及相关变量全部放置非零等待区中，否则项目编译不成功
-
-#### 2025-12-06
-
-1. 动作执行函数初步实现完毕 - 待测试
-2. 开始移植TFTP功能
-   1. TFTP升级
-   2. TFTP日志文件传输
-
-​		
\ No newline at end of file
diff --git a/User/includes.h b/User/includes.h
index fd37f32..aebc771 100644
--- a/User/includes.h
+++ b/User/includes.h
@@ -65,7 +65,8 @@
 
 #define MCU_TYPE        "BLV-C1F"               //���ͱ��
 #define APP_NAME        "App_L4_C1F_42"         //APP���� 16Byte
-#define SoftwareVer     "C1P_A_L4_01_251107"    //�����汾 20Byte
+
+#define SoftwareVer     "C1P_A_L4_01_251109"    //�����汾 20Byte
 
 
 
diff --git a/User/main.c b/User/main.c
index d7f6e26..08ad6a7 100644
--- a/User/main.c
+++ b/User/main.c
@@ -14,6 +14,8 @@
 #include <stdio.h>
 #include <string.h>
 
+
+
 uint32_t test_tick = 0;
 uint8_t test_buff[10] = {0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A};
 
@@ -30,6 +32,7 @@ int main(void)
     SystemCoreClockUpdate();
     Systick_Init();
 
+    WDT_Reinit();
     UARTx_Init(UART_0,9600);        //RS485��ѯ�˿�
     UARTx_Init(UART_1,512000);      //���Դ���
     UARTx_Init(UART_2,9600);        //RS485�����˿�
@@ -41,6 +44,8 @@ int main(void)
 
     SPI_FLASH_Init();
 
+    Read_Flash_Register_Data();
+
     WCHNET_LIB_Init();
 
     Dbg_Println(DBG_BIT_SYS_STATUS_bit,"MCU Start!! \r\n");
@@ -48,8 +53,8 @@ int main(void)
 
     Dbg_Println(DBG_BIT_SYS_STATUS_bit,"DEV_ACTION_INFO Size:%d \r\n",sizeof(DEV_ACTION_INFO));
 
-    Dbg_Println(DBG_BIT_SYS_STATUS_bit,"Dev_Action_U64Cond Size:%d \r\n",sizeof(Dev_Action_U64Cond));
-    Dbg_Println(DBG_BIT_SYS_STATUS_bit,"Struct_Dev_Dly Size:%d \r\n",sizeof(Struct_Dev_Dly));
+//    Dbg_Println(DBG_BIT_SYS_STATUS_bit,"Dev_Action_U64Cond Size:%d \r\n",sizeof(Dev_Action_U64Cond));
+//    Dbg_Println(DBG_BIT_SYS_STATUS_bit,"Struct_Dev_Dly Size:%d \r\n",sizeof(Struct_Dev_Dly));
 
     BLV_DevAction_AllData_Init();
 
diff --git a/User/system_ch564.c b/User/system_ch564.c
index 72838b6..8d4bd4c 100644
--- a/User/system_ch564.c
+++ b/User/system_ch564.c
@@ -12,7 +12,6 @@
 
 #include "ch564.h"
 #include "debug.h"
-
 /*
  * Uncomment the line corresponding to the desired System clock (SYSCLK)
  * frequency (after reset the HSI is used as SYSCLK source).
@@ -88,38 +87,23 @@ static void SetSysClockTo25_HSE(void);
  */
 void SystemInit(void)
 {
-	if ( SystemCoreClock >= 60000000 )
-	{
-		RCC_UNLOCK_SAFE_ACCESS();
-		BITS_CFG( R32_EXTEN_CTLR0 , RB_FLASH_PRE_EN , ENABLE );
-		BITS_CFG( R32_EXTEN_CTLR0 , RB_SW_CFG , DISABLE );
-		RCC_LOCK_SAFE_ACCESS();
-	}
-	else
-	{
-		RCC_UNLOCK_SAFE_ACCESS();
-		BITS_CFG( R32_EXTEN_CTLR0 , RB_FLASH_PRE_EN , DISABLE );
-		BITS_CFG( R32_EXTEN_CTLR0 , RB_SW_CFG , DISABLE );
-		RCC_LOCK_SAFE_ACCESS();
-	}
+    SystemCoreClockUpdate();
+    //Delay_Init();
+    HSI_ON();
 
-	SystemCoreClockUpdate();
+    /* Close ETH PHY */
+    RCC_SlpWakeCtrl( RB_SLP_ETH_PWR_DN , DISABLE );
+    Delay_Us( PLL_STARTUP_TIME );
+    ETH->PHY_CR |= ( 1 << 31 );
+    ETH->PHY_CR &= ~( 1 << 30 );
+    ETH->PHY_CR |= ( 1 << 30 );
+    Delay_Us( HSI_STARTUP_TIME );
+    RCC_SlpWakeCtrl( RB_SLP_ETH_PWR_DN , ENABLE );
 
-	HSI_ON();
-
-	/* Close ETH PHY */
-	RCC_SlpWakeCtrl( RB_SLP_ETH_PWR_DN , DISABLE );
-	Delay_Us( PLL_STARTUP_TIME );
-	ETH->PHY_CR |= ( 1 << 31 );
-	ETH->PHY_CR &= ~( 1 << 30 );
-	ETH->PHY_CR |= ( 1 << 30 );
-	Delay_Us( HSI_STARTUP_TIME );
-	RCC_SlpWakeCtrl( RB_SLP_ETH_PWR_DN , ENABLE );
-
-	CLKSEL_HSI();
-	SYSCLK_SOURCE_SELECT( SYSCLK_SOURCE_HSI_HSE );
-	USB_PLL_OFF();
-	SetSysClock();
+    CLKSEL_HSI();
+    SYSCLK_SOURCE_SELECT( SYSCLK_SOURCE_HSI_HSE );
+    USB_PLL_OFF();
+    SetSysClock();
 }
 
 /*********************************************************************
@@ -131,55 +115,55 @@ void SystemInit(void)
  */
 void SystemCoreClockUpdate(void)
 {
-	uint32_t tmp = 0;
+    uint32_t tmp = 0;
 
-	if ( R32_EXTEN_CTLR0 & RB_SW )
-	{
-		if ( R32_EXTEN_CTLR1 & RB_CLKSEL )
-		{
-			tmp = HSE_Value;
-		}
-		else
-		{
-			tmp = HSI_Value;
-		}
-	}
-	else
-	{
-		switch ( R32_EXTEN_CTLR0 & RB_USBPLLSRC )
-		{
-			case 0x60:
-				tmp = HSI_Value;
-				break;
-			case 0x20:
-				tmp = HSE_Value;
-				break;
-			default:
-				tmp = HSE_Value * 20 / 25;
-				break;
-		}
+    if ( R32_EXTEN_CTLR0 & RB_SW )
+    {
+        if ( R32_EXTEN_CTLR1 & RB_CLKSEL )
+        {
+            tmp = HSE_Value;
+        }
+        else
+        {
+            tmp = HSI_Value;
+        }
+    }
+    else
+    {
+        switch ( R32_EXTEN_CTLR0 & RB_USBPLLSRC )
+        {
+            case 0x60:
+                tmp = HSI_Value;
+                break;
+            case 0x20:
+                tmp = HSE_Value;
+                break;
+            default:
+                tmp = HSE_Value * 20 / 25;
+                break;
+        }
 
-		switch ( R32_EXTEN_CTLR0 & RB_USBPLLCLK )
-		{
-			case 0x0:
-				tmp *= 24;
-				break;
-			case 0x4000:
-				tmp *= 20;
-				break;
-			case 0x8000:
-				tmp *= 16;
-				break;
-			case 0xC000:
-				tmp *= 15;
-				break;
-			default:
-				break;
-		}
-		tmp /= ( R8_PLL_OUT_DIV >> 4 ) + 1;
-	}
+        switch ( R32_EXTEN_CTLR0 & RB_USBPLLCLK )
+        {
+            case 0x0:
+                tmp *= 24;
+                break;
+            case 0x4000:
+                tmp *= 20;
+                break;
+            case 0x8000:
+                tmp *= 16;
+                break;
+            case 0xC000:
+                tmp *= 15;
+                break;
+            default:
+                break;
+        }
+        tmp /= ( R8_PLL_OUT_DIV >> 4 ) + 1;
+    }
 
-	SystemCoreClock = tmp;
+    SystemCoreClock = tmp;
 }
 
 /*********************************************************************
@@ -191,29 +175,30 @@ void SystemCoreClockUpdate(void)
  */
 static void SetSysClock(void)
 {
-	SystemCoreClockUpdate();
-	GPIO_IPD_Unused();
+    SystemCoreClockUpdate();
+    //Delay_Init();
+    GPIO_IPD_Unused();
 
 #ifdef SYSCLK_FREQ_120MHz_HSI
-	SetSysClockTo120_HSI();
+    SetSysClockTo120_HSI();
 #elif defined SYSCLK_FREQ_80MHz_HSI
-	SetSysClockTo80_HSI();
+    SetSysClockTo80_HSI();
 #elif defined SYSCLK_FREQ_60MHz_HSI
-	SetSysClockTo60_HSI();
+    SetSysClockTo60_HSI();
 #elif defined SYSCLK_FREQ_40MHz_HSI
-	SetSysClockTo40_HSI();
+    SetSysClockTo40_HSI();
 #elif defined SYSCLK_FREQ_20MHz_HSI
-	SetSysClockTo20_HSI();
+    SetSysClockTo20_HSI();
 #elif defined SYSCLK_FREQ_120MHz_HSE
-	SetSysClockTo120_HSE();
+    SetSysClockTo120_HSE();
 #elif defined SYSCLK_FREQ_80MHz_HSE
-	SetSysClockTo80_HSE();
+    SetSysClockTo80_HSE();
 #elif defined SYSCLK_FREQ_60MHz_HSE
-	SetSysClockTo60_HSE();
+    SetSysClockTo60_HSE();
 #elif defined SYSCLK_FREQ_40MHz_HSE
-	SetSysClockTo40_HSE();
+    SetSysClockTo40_HSE();
 #elif defined SYSCLK_FREQ_25MHz_HSE
-	SetSysClockTo25_HSE();
+    SetSysClockTo25_HSE();
 #endif
 }
 
@@ -228,12 +213,16 @@ static void SetSysClock(void)
  */
 static void SetSysClockTo120_HSI(void)
 {
-	RCC_SET_PLL_SYS_OUT_DIV( 0x3 );
-	USB_PLL_MUL_SELECT( USB_PLL_MUL_24 );
-	USB_PLL_SOURCE_SELECT( USB_PLL_SOURCE_HSI );
-	USB_PLL_ON();
-	Delay_Us( PLL_STARTUP_TIME );
-	SYSCLK_SOURCE_SELECT( SYSCLK_SOURCE_USBPLL );
+    RCC_SET_PLL_SYS_OUT_DIV( 0x3 );
+    USB_PLL_MUL_SELECT( USB_PLL_MUL_24 );
+    USB_PLL_SOURCE_SELECT( USB_PLL_SOURCE_HSI );
+    USB_PLL_ON();
+    Delay_Us( PLL_STARTUP_TIME );
+    RCC_UNLOCK_SAFE_ACCESS();
+    BITS_CFG( R32_EXTEN_CTLR0 , RB_FLASH_PRE_EN , ENABLE );
+    BITS_CFG( R32_EXTEN_CTLR0 , RB_SW_CFG , DISABLE );          //�ر�SW���Կ�
+    RCC_LOCK_SAFE_ACCESS();
+    SYSCLK_SOURCE_SELECT( SYSCLK_SOURCE_USBPLL );
 }
 
 #elif defined SYSCLK_FREQ_80MHz_HSI
@@ -247,12 +236,16 @@ static void SetSysClockTo120_HSI(void)
  */
 static void SetSysClockTo80_HSI(void)
 {
-	RCC_SET_PLL_SYS_OUT_DIV(0x5);
-	USB_PLL_MUL_SELECT(USB_PLL_MUL_24);
-	USB_PLL_SOURCE_SELECT(USB_PLL_SOURCE_HSI);
-	USB_PLL_ON();
-	Delay_Us(PLL_STARTUP_TIME);
-	SYSCLK_SOURCE_SELECT(SYSCLK_SOURCE_USBPLL);
+    RCC_SET_PLL_SYS_OUT_DIV(0x5);
+    USB_PLL_MUL_SELECT(USB_PLL_MUL_24);
+    USB_PLL_SOURCE_SELECT(USB_PLL_SOURCE_HSI);
+    USB_PLL_ON();
+    Delay_Us(PLL_STARTUP_TIME);
+    RCC_UNLOCK_SAFE_ACCESS();
+    BITS_CFG( R32_EXTEN_CTLR0 , RB_FLASH_PRE_EN , ENABLE );
+    BITS_CFG( R32_EXTEN_CTLR0 , RB_SW_CFG , DISABLE );          //�ر�SW���Կ�
+    RCC_LOCK_SAFE_ACCESS();
+    SYSCLK_SOURCE_SELECT(SYSCLK_SOURCE_USBPLL);
 }
 
 #elif defined SYSCLK_FREQ_60MHz_HSI
@@ -266,12 +259,16 @@ static void SetSysClockTo80_HSI(void)
  */
 static void SetSysClockTo60_HSI(void)
 {
-	RCC_SET_PLL_SYS_OUT_DIV(0x7);
-	USB_PLL_MUL_SELECT(USB_PLL_MUL_24);
-	USB_PLL_SOURCE_SELECT(USB_PLL_SOURCE_HSI);
-	USB_PLL_ON();
-	Delay_Us(PLL_STARTUP_TIME);
-	SYSCLK_SOURCE_SELECT(SYSCLK_SOURCE_USBPLL);
+    RCC_SET_PLL_SYS_OUT_DIV(0x7);
+    USB_PLL_MUL_SELECT(USB_PLL_MUL_24);
+    USB_PLL_SOURCE_SELECT(USB_PLL_SOURCE_HSI);
+    USB_PLL_ON();
+    Delay_Us(PLL_STARTUP_TIME);
+    RCC_UNLOCK_SAFE_ACCESS();
+    BITS_CFG( R32_EXTEN_CTLR0 , RB_FLASH_PRE_EN , ENABLE );
+    BITS_CFG( R32_EXTEN_CTLR0 , RB_SW_CFG , DISABLE );          //�ر�SW���Կ�
+    RCC_LOCK_SAFE_ACCESS();
+    SYSCLK_SOURCE_SELECT(SYSCLK_SOURCE_USBPLL);
 }
 
 #elif defined SYSCLK_FREQ_40MHz_HSI
@@ -285,12 +282,12 @@ static void SetSysClockTo60_HSI(void)
  */
 static void SetSysClockTo40_HSI(void)
 {
-	RCC_SET_PLL_SYS_OUT_DIV( 0xB );
-	USB_PLL_MUL_SELECT( USB_PLL_MUL_24 );
-	USB_PLL_SOURCE_SELECT( USB_PLL_SOURCE_HSI );
-	USB_PLL_ON();
-	Delay_Us( PLL_STARTUP_TIME );
-	SYSCLK_SOURCE_SELECT( SYSCLK_SOURCE_USBPLL );
+    RCC_SET_PLL_SYS_OUT_DIV( 0xB );
+    USB_PLL_MUL_SELECT( USB_PLL_MUL_24 );
+    USB_PLL_SOURCE_SELECT( USB_PLL_SOURCE_HSI );
+    USB_PLL_ON();
+    Delay_Us( PLL_STARTUP_TIME );
+    SYSCLK_SOURCE_SELECT( SYSCLK_SOURCE_USBPLL );
 }
 
 #elif defined SYSCLK_FREQ_20MHz_HSI
@@ -304,8 +301,8 @@ static void SetSysClockTo40_HSI(void)
  */
 static void SetSysClockTo20_HSI(void)
 {
-	CLKSEL_HSI();
-	SYSCLK_SOURCE_SELECT(SYSCLK_SOURCE_HSI_HSE);
+    CLKSEL_HSI();
+    SYSCLK_SOURCE_SELECT(SYSCLK_SOURCE_HSI_HSE);
 }
 
 #elif defined SYSCLK_FREQ_120MHz_HSE
@@ -319,15 +316,19 @@ static void SetSysClockTo20_HSI(void)
  */
 static void SetSysClockTo120_HSE(void)
 {
-	HSE_ON();
-	Delay_Us(HSE_STARTUP_TIME);
-	RCC_SlpWakeCtrl(RB_SLP_ETH_PWR_DN, DISABLE);
-	RCC_SET_PLL_SYS_OUT_DIV(0x3);
-	USB_PLL_SOURCE_SELECT(USB_PLL_SOURCE_ETH_PLL_OUT);
-	USB_PLL_MUL_SELECT(USB_PLL_MUL_24);
-	USB_PLL_ON();
-	Delay_Us(PLL_STARTUP_TIME);
-	SYSCLK_SOURCE_SELECT(SYSCLK_SOURCE_USBPLL);
+    HSE_ON();
+    Delay_Us(HSE_STARTUP_TIME);
+    RCC_SlpWakeCtrl(RB_SLP_ETH_PWR_DN, DISABLE);
+    RCC_SET_PLL_SYS_OUT_DIV(0x3);
+    USB_PLL_SOURCE_SELECT(USB_PLL_SOURCE_ETH_PLL_OUT);
+    USB_PLL_MUL_SELECT(USB_PLL_MUL_24);
+    USB_PLL_ON();
+    Delay_Us(PLL_STARTUP_TIME);
+    RCC_UNLOCK_SAFE_ACCESS();
+    BITS_CFG( R32_EXTEN_CTLR0 , RB_FLASH_PRE_EN , ENABLE );
+    BITS_CFG( R32_EXTEN_CTLR0 , RB_SW_CFG , DISABLE );          //�ر�SW���Կ�
+    RCC_LOCK_SAFE_ACCESS();
+    SYSCLK_SOURCE_SELECT(SYSCLK_SOURCE_USBPLL);
 }
 
 #elif defined SYSCLK_FREQ_80MHz_HSE
@@ -341,15 +342,19 @@ static void SetSysClockTo120_HSE(void)
  */
 static void SetSysClockTo80_HSE(void)
 {
-	HSE_ON();
-	Delay_Us(HSE_STARTUP_TIME);
-	RCC_SlpWakeCtrl(RB_SLP_ETH_PWR_DN, DISABLE);
-	RCC_SET_PLL_SYS_OUT_DIV(0x5);
-	USB_PLL_SOURCE_SELECT(USB_PLL_SOURCE_ETH_PLL_OUT);
-	USB_PLL_MUL_SELECT(USB_PLL_MUL_24);
-	USB_PLL_ON();
-	Delay_Us(PLL_STARTUP_TIME);
-	SYSCLK_SOURCE_SELECT(SYSCLK_SOURCE_USBPLL);
+    HSE_ON();
+    Delay_Us(HSE_STARTUP_TIME);
+    RCC_SlpWakeCtrl(RB_SLP_ETH_PWR_DN, DISABLE);
+    RCC_SET_PLL_SYS_OUT_DIV(0x5);
+    USB_PLL_SOURCE_SELECT(USB_PLL_SOURCE_ETH_PLL_OUT);
+    USB_PLL_MUL_SELECT(USB_PLL_MUL_24);
+    USB_PLL_ON();
+    Delay_Us(PLL_STARTUP_TIME);
+    RCC_UNLOCK_SAFE_ACCESS();
+    BITS_CFG( R32_EXTEN_CTLR0 , RB_FLASH_PRE_EN , ENABLE );
+    BITS_CFG( R32_EXTEN_CTLR0 , RB_SW_CFG , DISABLE );          //�ر�SW���Կ�
+    RCC_LOCK_SAFE_ACCESS();
+    SYSCLK_SOURCE_SELECT(SYSCLK_SOURCE_USBPLL);
 }
 
 #elif defined SYSCLK_FREQ_60MHz_HSE
@@ -363,15 +368,19 @@ static void SetSysClockTo80_HSE(void)
  */
 static void SetSysClockTo60_HSE(void)
 {
-	HSE_ON();
-	Delay_Us(HSE_STARTUP_TIME);
-	RCC_SlpWakeCtrl(RB_SLP_ETH_PWR_DN, DISABLE);
-	RCC_SET_PLL_SYS_OUT_DIV(0x7);
-	USB_PLL_SOURCE_SELECT(USB_PLL_SOURCE_ETH_PLL_OUT);
-	USB_PLL_MUL_SELECT(USB_PLL_MUL_24);
-	USB_PLL_ON();
-	Delay_Us(PLL_STARTUP_TIME);
-	SYSCLK_SOURCE_SELECT(SYSCLK_SOURCE_USBPLL);
+    HSE_ON();
+    Delay_Us(HSE_STARTUP_TIME);
+    RCC_SlpWakeCtrl(RB_SLP_ETH_PWR_DN, DISABLE);
+    RCC_SET_PLL_SYS_OUT_DIV(0x7);
+    USB_PLL_SOURCE_SELECT(USB_PLL_SOURCE_ETH_PLL_OUT);
+    USB_PLL_MUL_SELECT(USB_PLL_MUL_24);
+    USB_PLL_ON();
+    Delay_Us(PLL_STARTUP_TIME);
+    RCC_UNLOCK_SAFE_ACCESS();
+    BITS_CFG( R32_EXTEN_CTLR0 , RB_FLASH_PRE_EN , ENABLE );
+    BITS_CFG( R32_EXTEN_CTLR0 , RB_SW_CFG , DISABLE );          //�ر�SW���Կ�
+    RCC_LOCK_SAFE_ACCESS();
+    SYSCLK_SOURCE_SELECT(SYSCLK_SOURCE_USBPLL);
 }
 
 #elif defined SYSCLK_FREQ_40MHz_HSE
@@ -385,15 +394,15 @@ static void SetSysClockTo60_HSE(void)
  */
 static void SetSysClockTo40_HSE(void)
 {
-	HSE_ON();
-	Delay_Us(HSE_STARTUP_TIME);
-	RCC_SlpWakeCtrl(RB_SLP_ETH_PWR_DN, DISABLE);
-	RCC_SET_PLL_SYS_OUT_DIV(0xB);
-	USB_PLL_SOURCE_SELECT(USB_PLL_SOURCE_ETH_PLL_OUT);
-	USB_PLL_MUL_SELECT(USB_PLL_MUL_24);
-	USB_PLL_ON();
-	Delay_Us(PLL_STARTUP_TIME);
-	SYSCLK_SOURCE_SELECT(SYSCLK_SOURCE_USBPLL);
+    HSE_ON();
+    Delay_Us(HSE_STARTUP_TIME);
+    RCC_SlpWakeCtrl(RB_SLP_ETH_PWR_DN, DISABLE);
+    RCC_SET_PLL_SYS_OUT_DIV(0xB);
+    USB_PLL_SOURCE_SELECT(USB_PLL_SOURCE_ETH_PLL_OUT);
+    USB_PLL_MUL_SELECT(USB_PLL_MUL_24);
+    USB_PLL_ON();
+    Delay_Us(PLL_STARTUP_TIME);
+    SYSCLK_SOURCE_SELECT(SYSCLK_SOURCE_USBPLL);
 }
 
 #elif defined SYSCLK_FREQ_25MHz_HSE
@@ -407,13 +416,13 @@ static void SetSysClockTo40_HSE(void)
  */
 static void SetSysClockTo25_HSE(void)
 {
-	HSE_ON();
-	Delay_Us(HSE_STARTUP_TIME);
-	CLKSEL_HSE();
-	SystemCoreClock = HSE_VALUE;
-	Delay_Init();
-	Delay_Us(PLL_STARTUP_TIME);
-	SYSCLK_SOURCE_SELECT(SYSCLK_SOURCE_HSI_HSE);
+    HSE_ON();
+    Delay_Us(HSE_STARTUP_TIME);
+    CLKSEL_HSE();
+    SystemCoreClock = HSE_VALUE;
+    Delay_Init();
+    Delay_Us(PLL_STARTUP_TIME);
+    SYSCLK_SOURCE_SELECT(SYSCLK_SOURCE_HSI_HSE);
 
 }