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銆丩auncher 绗竴娆¤烦杞け璐ラ棶棰橈紝寰呰В鍐炽��
-
 鈥�	2銆丷S485涓诲姩绔彛澧炲姞閬块殰鍔熻兘锛孯S485杞绔彛涓嶣US绔彛鏄疆璇㈡満鍒讹紝涓嶉渶瑕佸鍔犮��
-
 鈥�	3銆丅LV-C1P 鏃犲惎鍔ㄥ師鍥狅紝闇�鍙﹁緹椤荤粡瀹炵幇鍚姩鍘熷洜銆�
-
 鈥�	4銆丩auncher娴佺▼淇敼锛孧CU Flash鍙湪鍗囩骇鍚庡啓鍏ワ紝鍏朵粬鍘熷洜鍚姩涓嶅啓鍏CU Flash銆�
-
 鈥�	5銆佸湪姣忎釜璁惧椹卞姩涓鍔犺鍙栬蒋浠剁増鏈彿锛�
-
+鈥�	6銆丄PP鍥轰欢涓覆鍙ｅ崌绾� - 鎼滅储鍛戒护銆佽烦杞懡浠�
+鈥�	7銆乀FTP鏃ュ織涓婁紶鏈哄埗淇敼
+    
 寰呮祴璇曚簨椤癸細
-
 鈥�	1銆侀厤缃姛鑳� - 鐫＄湢鍔熻兘
-
 鈥�	2銆侀厤缃姛鑳� - 澶氳仈寮�鍏�
-
 鈥�	3銆侀厤缃姛鑳� - 鏃犲崱鍙栫數
-
 鈥�	4銆侀厤缃姛鑳� - 绌鸿皟鎻愮ず闊�
-
-閬囧埌闂锛�
-
-鈥�	1銆佺綉缁滄悳绱富鏈� - 鍥炲椤圭洰缂栫爜銆佹埧鍨嬨�佹埧鍙枫�佹埧鍙稩D銆佹埧鍨婭D 銆佹埧鎬併�佷笉姝ｇ‘
-
-鈥�	2銆佺綉缁滄悳绱富鏈轰腑锛屾湇鍔″櫒閫氳绔彛鍦–1F涓紝杩欎釜绔彛鏄浐瀹氫负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銆佸満鏅姩浣滄墽琛屽垵姝ユ祴璇昈K
+```
+
+### 2026-01-05
+
+```C
+淇敼浜猴細鏇硅仾
+淇敼鐐癸細
+	1銆丆SIO 缁х數鍣ㄥ崟鐙竴涓澶囧瓨鏀惧湪BUS璁惧鍒楄〃涓紝搴旇灏嗚繖涓澶囧瓨鏀惧埌铏氭嫙璁惧涓� - 涓嶅悎鐞嗙殑鍦版柟锛屽緟淇敼
+	2銆佽皟璇旴US鎬荤嚎閫氳 - OK
+	3銆佸姩浣滄墽琛� - 缃戠粶鎺у埗缁х數鍣� OK
+	4銆佸鍔燙5缁х數鍣ㄨ澶�
+```
+
+### 2025-12-25
+
+```C
+淇敼浜猴細鏇硅仾
+淇敼鐐癸細
+	1銆乀FTP鍗囩骇 - 閰嶇疆鏂囦欢鍒濇娴嬭瘯娌￠棶棰�
+	2銆侀厤缃枃浠跺唴瀹硅В鏋愮Щ妞嶅畬姣曪紝璋冭瘯涓�
+	3銆乀FTP鍗囩骇 - 鏄惁涓�涓鎺ュ瓧鎼炲畾锛屼笉闇�瑕佷娇鐢ㄤ袱涓鎺ュ瓧
+```
+
+### 2025-12-10
+
+```C
+淇敼浜猴細鏇硅仾
+淇敼鐐癸細
+   	1銆乀FTP IAP鍗囩骇鍔熻兘绉绘瀹屾瘯锛屽緟娴嬭瘯
+	2銆佷紭鍖栦唬鐮佺紪璇戠殑绌洪棿闂锛岀洰鍓嶉浂绛夊緟鍖虹殑绌洪棿宸叉弧锛岄渶灏嗛櫎浜嗗簱鍑芥暟浠ュ鐨勪唬鐮佸強鐩稿叧鍙橀噺鍏ㄩ儴鏀剧疆闈為浂绛夊緟鍖轰腑锛屽惁鍒欓」鐩紪璇戜笉鎴愬姛
+```
+
+### 2025-12-06
+
+```C
+淇敼浜猴細鏇硅仾
+淇敼鐐癸細
+	1銆佸姩浣滄墽琛屽嚱鏁板垵姝ュ疄鐜板畬姣� - 寰呮祴璇�
+	2銆佸紑濮嬬Щ妞峊FTP鍔熻兘
+        -> TFTP鍗囩骇
+        -> TFTP鏃ュ織鏂囦欢浼犺緭
+```
 
 
 
-#### 2026-01-06
-
-鈥�	1銆佸満鏅姩浣滄墽琛屽垵姝ユ祴璇昈K
 
 
-
-#### 2026-01-05
-
-鈥�	1銆丆SIO 缁х數鍣ㄥ崟鐙竴涓澶囧瓨鏀惧湪BUS璁惧鍒楄〃涓紝搴旇灏嗚繖涓澶囧瓨鏀惧埌铏氭嫙璁惧涓� - 涓嶅悎鐞嗙殑鍦版柟锛屽緟淇敼
-
-鈥�	2銆佽皟璇旴US鎬荤嚎閫氳 - OK
-
-鈥�	3銆佸姩浣滄墽琛� - 缃戠粶鎺у埗缁х數鍣� OK
-
-鈥�	4銆佸鍔燙5缁х數鍣ㄨ澶�
-
-
-
-#### 2025-12-25
-
-鈥�	1銆乀FTP鍗囩骇 - 閰嶇疆鏂囦欢鍒濇娴嬭瘯娌￠棶棰�
-
-鈥�	2銆侀厤缃枃浠跺唴瀹硅В鏋愮Щ妞嶅畬姣曪紝璋冭瘯涓�
-
-鈥�	3銆乀FTP鍗囩骇 - 鏄惁涓�涓鎺ュ瓧鎼炲畾锛屼笉闇�瑕佷娇鐢ㄤ袱涓鎺ュ瓧
-
-
-
-#### 2025-12-10
-
-鈥�	1銆乀FTP IAP鍗囩骇鍔熻兘绉绘瀹屾瘯锛屽緟娴嬭瘯
-
-鈥�	2銆佷紭鍖栦唬鐮佺紪璇戠殑绌洪棿闂锛岀洰鍓嶉浂绛夊緟鍖虹殑绌洪棿宸叉弧锛岄渶灏嗛櫎浜嗗簱鍑芥暟浠ュ鐨勪唬鐮佸強鐩稿叧鍙橀噺鍏ㄩ儴鏀剧疆闈為浂绛夊緟鍖轰腑锛屽惁鍒欓」鐩紪璇戜笉鎴愬姛
-
-#### 2025-12-06
-
-1. 鍔ㄤ綔鎵ц鍑芥暟鍒濇瀹炵幇瀹屾瘯 - 寰呮祴璇�
-2. 寮�濮嬬Щ妞峊FTP鍔熻兘
-   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);
 
 }