feat:网络升级流程完善
1、局域网升级流程 - 初步测试OK 2、云端升级流程 - 初步测试OK 3、云端升级上报升级进度 - 初步测试OK
This commit is contained in:
@@ -601,12 +601,12 @@ __attribute__((section(".non_0_wait"))) void NetWork_Parameter_Get(void)
|
||||
//MCU<43><55>ʼ<EFBFBD><CABC>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<43><55>ʼ<EFBFBD><CABC><EFBFBD><EFBFBD>
|
||||
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<43><55>ʼ<EFBFBD><CABC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||
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");
|
||||
}
|
||||
|
||||
/*<2A><>ȡMAC <20><>ַ*/
|
||||
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);
|
||||
|
||||
//<2F><>ȡоƬ<D0BE>Դ<EFBFBD><D4B4><EFBFBD>MAC <20><>ַ
|
||||
// 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;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user