innov/xiuos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed opcua demo exception and added mac address with showip command

Browse Source
This commit is contained in:
wlyu
2022-01-10 16:21:32 +08:00
parent b6bec0c2b6
commit 6972a14f6d
4 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ubiquitous/XiUOS/resources/ethernet/LwIP/arch/sys_arch.c
-3
View File
@@ -81,9 +81,6 @@
#include "enet_ethernetif.h"
#include <transform.h>
/* MAC address configuration. */
#define configMAC_ADDR { 0x02, 0x12, 0x13, 0x10, 0x15, 0x11}
char lwip_ipaddr[] = {192, 168, 250, 253};
char lwip_netmask[] = {255, 255, 255, 0};
char lwip_gwaddr[] = {192, 168, 250, 252};
Ubiquitous/XiUOS/resources/ethernet/LwIP/arch/sys_arch.h
+4
View File
@@ -90,6 +90,10 @@
#define GW_ADDR1 168
#define GW_ADDR2 250
#define GW_ADDR3 5
/* MAC address configuration. */
#define configMAC_ADDR { 0x02, 0x12, 0x13, 0x10, 0x15, 0x11}
/* USER CODE END 0 */
#define SYS_MBOX_NULL -1
Ubiquitous/XiUOS/resources/ethernet/cmd_lwip/lwip_config_demo.c
+6 -2
View File
@@ -107,8 +107,10 @@ SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0) | SHELL_CMD_TYPE(SHELL_TYPE_CMD_MAIN) |
setip, lwip_setip_thread, SetIp [IP] [Netmask] [Gateway]);
void lwip_getip_thread(int argc, char *argv[])
void lwip_showip_thread(int argc, char *argv[])
{
char mac_addr[] = configMAC_ADDR;
lw_pr_info("\r\n************************************************\r\n");
lw_pr_info(" Network Configuration\r\n");
lw_pr_info("************************************************\r\n");
@@ -118,10 +120,12 @@ void lwip_getip_thread(int argc, char *argv[])
((u8_t *)&lwip_netmask)[2], ((u8_t *)&lwip_netmask)[3]);
lw_pr_info(" IPv4 Gateway : %u.%u.%u.%u\r\n", ((u8_t *)&lwip_gwaddr)[0], ((u8_t *)&lwip_gwaddr)[1],
((u8_t *)&lwip_gwaddr)[2], ((u8_t *)&lwip_gwaddr)[3]);
lw_pr_info(" MAC Address : %x:%x:%x:%x:%x:%x\r\n", mac_addr[0], mac_addr[1], mac_addr[2],
mac_addr[3], mac_addr[4], mac_addr[5]);
lw_pr_info("************************************************\r\n");
}
SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0) | SHELL_CMD_TYPE(SHELL_TYPE_CMD_MAIN) | SHELL_CMD_PARAM_NUM(0),
showip, lwip_getip_thread, GetIp [IP] [Netmask] [Gateway]);
showip, lwip_showip_thread, GetIp [IP] [Netmask] [Gateway]);
#endif