autotest
/
xiuos
forked from xuos/xiuos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

APP_Framework/Framework/:update ethernet driver and update the connection files,and the mcu can communicate with the ethernet module correctly, but the module can't connect the local server.

This commit is contained in:
chunyexixiaoyu 2022-05-25 16:04:43 +08:00
parent 888d981f8f
commit 876a6c8ff1
6 changed files with 39 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
APP_Framework/Framework/connection/adapter_agent.c
View File

@ -446,11 +446,13 @@ int DeleteATAgent(ATAgentType agent)
PrivMutexDelete(&agent->lock); PrivMutexDelete(&agent->lock);
} }
#endif #endif
#ifdef ADD_XIZI_FETURES
if (agent->entm_rx_notice) { if (agent->entm_rx_notice) {
printf("delete agent entm_rx_notice = %d\n",agent->entm_rx_notice); printf("delete agent entm_rx_notice = %d\n",agent->entm_rx_notice);
PrivSemaphoreDelete(&agent->entm_rx_notice); PrivSemaphoreDelete(&agent->entm_rx_notice);
} }
#else
#endif
#ifdef ADD_XIZI_FETURES #ifdef ADD_XIZI_FETURES
if (agent->rsp_sem) { if (agent->rsp_sem) {
printf("delete agent rsp_sem = %d\n",agent->rsp_sem); printf("delete agent rsp_sem = %d\n",agent->rsp_sem);

4
APP_Framework/Framework/connection/at_agent.h
View File

@ -74,7 +74,11 @@ struct ATAgent
char entm_recv_buf[ENTM_RECV_MAX]; char entm_recv_buf[ENTM_RECV_MAX];
uint32 entm_recv_len; uint32 entm_recv_len;
enum ReceiveMode receive_mode; enum ReceiveMode receive_mode;
#ifdef ADD_XIZI_FETURES
int entm_rx_notice; int entm_rx_notice;
#else
sem_t entm_rx_notice;
#endif
}; };
typedef struct ATAgent *ATAgentType; typedef struct ATAgent *ATAgentType;

13
APP_Framework/Framework/connection/ethernet/adapter_ethernet.c
View File

@ -97,28 +97,33 @@ int AdapterEthernetTest(void)
AdapterDeviceSetUp(adapter); AdapterDeviceSetUp(adapter);
const char *ip = "10.10.100.50"; const char *ip = "192.168.131.26";
const char *port = "12345"; const char *port = "9999";
enum NetRoleType net_role = CLIENT;//SERVER enum NetRoleType net_role = CLIENT;//SERVER
enum IpType ip_type = IPV4; enum IpType ip_type = IPV4;
AdapterDeviceConnect(adapter, net_role, ip, port, ip_type); AdapterDeviceConnect(adapter, net_role, ip, port, ip_type);
printf("ready to test data transfer\n"); printf("ready to test data transfer\n");
PrivTaskDelay(2000);
len = strlen(ethernet_msg); len = strlen(ethernet_msg);
for (i = 0;i < 10; i ++) { for (i = 0;i < 10; i ++) {
printf("AdapterEthernetTest send %s\n", ethernet_msg); printf("AdapterEthernetTest send %s\n", ethernet_msg);
AdapterDeviceSend(adapter, ethernet_msg, len); AdapterDeviceSend(adapter, ethernet_msg, len);
PrivTaskDelay(4000); PrivTaskDelay(4000);
} }
while (1) { while (1) {
AdapterDeviceRecv(adapter, ethernet_recv_msg, 128); AdapterDeviceRecv(adapter, ethernet_recv_msg, 128);
printf("AdapterEthernetTest recv %s\n", ethernet_recv_msg); printf("AdapterEthernetTest recv %s\n", ethernet_recv_msg);
memset(ethernet_recv_msg, 0, 128); memset(ethernet_recv_msg, 0, 128);
} }
#endif #endif
return 0; return 0;
} }
#ifdef ADD_RTTHREAD_FETURES
MSH_CMD_EXPORT(AdapterEthernetTest,a ethernet adpter sample);
#elif definded ADD_XIZI_FETURES
SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0)|SHELL_CMD_TYPE(SHELL_TYPE_CMD_FUNC)|SHELL_CMD_PARAM_NUM(0)|SHELL_CMD_DISABLE_RETURN, AdapterEthernetTest, AdapterEthernetTest, show adapter ethernet information); SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0)|SHELL_CMD_TYPE(SHELL_TYPE_CMD_FUNC)|SHELL_CMD_PARAM_NUM(0)|SHELL_CMD_DISABLE_RETURN, AdapterEthernetTest, AdapterEthernetTest, show adapter ethernet information);
#endif

13
APP_Framework/Framework/connection/ethernet/hfa21_ethernet/hfa21_ethernet.c
View File

@ -72,7 +72,7 @@ static int Hfa21EthernetOpen(struct Adapter *adapter)
/*step2: init AT agent*/ /*step2: init AT agent*/
if (!adapter->agent) { if (!adapter->agent) {
char *agent_name = "ethernet_uart_client"; char *agent_name = "ethernet_uart_client";
if (EOK != InitATAgent(agent_name, adapter->fd, 512)) { if (0 != InitATAgent(agent_name, adapter->fd, 512)) {
printf("at agent init failed !\n"); printf("at agent init failed !\n");
return -1; return -1;
} }
@ -168,19 +168,20 @@ static int Hfa21EthernetSetUp(struct Adapter *adapter)
Hfa21EthernetInitAtCmd(adapter->agent); Hfa21EthernetInitAtCmd(adapter->agent);
/*Step3 : FEPHY enable phy function*/ /*Step3 : FEPHY enable phy function*/
ret = AtCmdConfigAndCheck(adapter->agent, HFA21_ETHERNET_AT_FEPHY_CMD, HFA21_ETHERNET_OK_REPLY); ret = AtCmdConfigAndCheck(adapter->agent, HFA21_ETHERNET_AT_FEPHY_CMD, HFA21_ETHERNET_OK_REPLY);
if (ret < 0) { if (ret < 0) {
goto __exit; goto __exit;
} }
PrivTaskDelay(2000);
/*Step4 : FVEW disable WANN function, ethernet work at LANN mode*/ /*Step4 : FVEW disable WANN function, ethernet work at LANN mode*/
ret = AtCmdConfigAndCheck(adapter->agent, HFA21_ETHERNET_AT_DISABLE_WANN_CMD, HFA21_ETHERNET_OK_REPLY); ret = AtCmdConfigAndCheck(adapter->agent, HFA21_ETHERNET_AT_DISABLE_WANN_CMD, HFA21_ETHERNET_OK_REPLY);
if (ret < 0) { if (ret < 0) {
goto __exit; goto __exit;
} }
/*Step5 : RELD enable F-AT cmd*/ /*Step5 : RELD enable F-AT cmd*/
PrivTaskDelay(2000);
ret = AtCmdConfigAndCheck(adapter->agent, HFA21_ETHERNET_AT_RELD_CMD, HFA21_ETHERNET_OK_REPLY); ret = AtCmdConfigAndCheck(adapter->agent, HFA21_ETHERNET_AT_RELD_CMD, HFA21_ETHERNET_OK_REPLY);
if (ret < 0) { if (ret < 0) {
goto __exit; goto __exit;
@ -195,13 +196,13 @@ static int Hfa21EthernetSetUp(struct Adapter *adapter)
if (ret < 0) { if (ret < 0) {
goto __exit; goto __exit;
} }
PrivTaskDelay(2000);
/*Step7 : AT+WANN check if get ip、netmask、gateway*/ /*Step7 : AT+WANN check if get ip、netmask、gateway*/
ret = AtCmdConfigAndCheck(adapter->agent, HFA21_ETHERNET_AT_WANN_CMD, HFA21_ETHERNET_OK_REPLY); ret = AtCmdConfigAndCheck(adapter->agent, HFA21_ETHERNET_AT_WANN_CMD, HFA21_ETHERNET_OK_REPLY);
if (ret < 0) { if (ret < 0) {
goto __exit; goto __exit;
} }
PrivTaskDelay(2000);
/*Step8 : AT+Z reboot hfa21 device*/ /*Step8 : AT+Z reboot hfa21 device*/
ret = AtCmdConfigAndCheck(adapter->agent, HFA21_ETHERNET_AT_REBOOT_CMD, HFA21_ETHERNET_OK_REPLY); ret = AtCmdConfigAndCheck(adapter->agent, HFA21_ETHERNET_AT_REBOOT_CMD, HFA21_ETHERNET_OK_REPLY);
if (ret < 0) { if (ret < 0) {
@ -209,7 +210,6 @@ static int Hfa21EthernetSetUp(struct Adapter *adapter)
} }
PrivTaskDelay(10000); PrivTaskDelay(10000);
return ret; return ret;
__exit: __exit:
@ -365,6 +365,7 @@ static int Hfa21EthernetConnect(struct Adapter *adapter, enum NetRoleType net_ro
} }
adapter->net_role = net_role; adapter->net_role = net_role;
PrivTaskDelay(2000);
/*Step3 : AT+Z reboot hfa21 device*/ /*Step3 : AT+Z reboot hfa21 device*/
ret = AtCmdConfigAndCheck(adapter->agent, HFA21_ETHERNET_AT_REBOOT_CMD, HFA21_ETHERNET_OK_REPLY); ret = AtCmdConfigAndCheck(adapter->agent, HFA21_ETHERNET_AT_REBOOT_CMD, HFA21_ETHERNET_OK_REPLY);

25
Ubiquitous/RT-Thread_Fusion_XiUOS/aiit_board/aiit-arm32-board/.config
View File

@ -25,14 +25,12 @@ CONFIG_RT_USING_HOOK=y
CONFIG_RT_USING_IDLE_HOOK=y CONFIG_RT_USING_IDLE_HOOK=y
CONFIG_RT_IDLE_HOOK_LIST_SIZE=4 CONFIG_RT_IDLE_HOOK_LIST_SIZE=4
CONFIG_IDLE_THREAD_STACK_SIZE=256 CONFIG_IDLE_THREAD_STACK_SIZE=256
CONFIG_RT_USING_TIMER_SOFT=y # CONFIG_RT_USING_TIMER_SOFT is not set
CONFIG_RT_TIMER_THREAD_PRIO=4
CONFIG_RT_TIMER_THREAD_STACK_SIZE=512
# #
# kservice optimization # kservice optimization
# #
# CONFIG_RT_KSERVICE_USING_STDLIB is not set CONFIG_RT_KSERVICE_USING_STDLIB=y
# CONFIG_RT_KSERVICE_USING_TINY_SIZE is not set # CONFIG_RT_KSERVICE_USING_TINY_SIZE is not set
# CONFIG_RT_USING_ASM_MEMCPY is not set # CONFIG_RT_USING_ASM_MEMCPY is not set
CONFIG_RT_DEBUG=y CONFIG_RT_DEBUG=y
@ -186,9 +184,7 @@ CONFIG_RT_USING_PIN=y
# CONFIG_RT_USING_MTD_NOR is not set # CONFIG_RT_USING_MTD_NOR is not set
# CONFIG_RT_USING_MTD_NAND is not set # CONFIG_RT_USING_MTD_NAND is not set
# CONFIG_RT_USING_PM is not set # CONFIG_RT_USING_PM is not set
CONFIG_RT_USING_RTC=y # CONFIG_RT_USING_RTC is not set
# CONFIG_RT_USING_ALARM is not set
# CONFIG_RT_USING_SOFT_RTC is not set
# CONFIG_RT_USING_SDIO is not set # CONFIG_RT_USING_SDIO is not set
CONFIG_RT_USING_SPI=y CONFIG_RT_USING_SPI=y
# CONFIG_RT_USING_QSPI is not set # CONFIG_RT_USING_QSPI is not set
@ -285,7 +281,7 @@ CONFIG_BSP_USING_GPIO=y
CONFIG_BSP_USING_UART=y CONFIG_BSP_USING_UART=y
CONFIG_BSP_USING_UART1=y CONFIG_BSP_USING_UART1=y
CONFIG_BSP_USING_UART2=y CONFIG_BSP_USING_UART2=y
# CONFIG_BSP_USING_UART3 is not set CONFIG_BSP_USING_UART3=y
# CONFIG_BSP_USING_UART4 is not set # CONFIG_BSP_USING_UART4 is not set
# CONFIG_BSP_USING_I2C1 is not set # CONFIG_BSP_USING_I2C1 is not set
# CONFIG_BSP_USING_SPI is not set # CONFIG_BSP_USING_SPI is not set
@ -328,14 +324,12 @@ CONFIG_CONNECTION_FRAMEWORK_DEBUG=y
# CONFIG_CONNECTION_INDUSTRIAL_WLAN is not set # CONFIG_CONNECTION_INDUSTRIAL_WLAN is not set
# CONFIG_CONNECTION_ADAPTER_LORA is not set # CONFIG_CONNECTION_ADAPTER_LORA is not set
# CONFIG_CONNECTION_ADAPTER_4G is not set # CONFIG_CONNECTION_ADAPTER_4G is not set
CONFIG_CONNECTION_ADAPTER_NB=y # CONFIG_CONNECTION_ADAPTER_NB is not set
CONFIG_ADAPTER_BC28=y
CONFIG_ADAPTER_NBIOT_BC28="bc28"
CONFIG_ADAPTER_BC28_RESETPIN=100
CONFIG_ADAPTER_BC28_PIN_DRIVER="/dev/pin"
CONFIG_ADAPTER_BC28_DRIVER="/dev/uart2"
# CONFIG_CONNECTION_ADAPTER_WIFI is not set # CONFIG_CONNECTION_ADAPTER_WIFI is not set
# CONFIG_CONNECTION_ADAPTER_ETHERNET is not set CONFIG_ADAPTER_HFA21_DRIVER="/dev/uart3"
CONFIG_CONNECTION_ADAPTER_ETHERNET=y
CONFIG_ADAPTER_HFA21_ETHERNET=y
CONFIG_ADAPTER_ETHERNET_HFA21="hfa21_ethernet"
# CONFIG_CONNECTION_ADAPTER_BLUETOOTH is not set # CONFIG_CONNECTION_ADAPTER_BLUETOOTH is not set
# CONFIG_CONNECTION_ADAPTER_ZIGBEE is not set # CONFIG_CONNECTION_ADAPTER_ZIGBEE is not set
# CONFIG_CONNECTION_ADAPTER_5G is not set # CONFIG_CONNECTION_ADAPTER_5G is not set
@ -385,6 +379,7 @@ CONFIG_MAIN_KTASK_STACK_SIZE=1024
# #
# CONFIG_APPLICATION_SENSOR is not set # CONFIG_APPLICATION_SENSOR is not set
# CONFIG_USING_EMBEDDED_DATABASE_APP is not set # CONFIG_USING_EMBEDDED_DATABASE_APP is not set
# CONFIG_APP_USING_WEBNET is not set
# #
# lib # lib

16
Ubiquitous/RT-Thread_Fusion_XiUOS/aiit_board/aiit-arm32-board/rtconfig.h
View File

@ -21,12 +21,10 @@
#define RT_USING_IDLE_HOOK #define RT_USING_IDLE_HOOK
#define RT_IDLE_HOOK_LIST_SIZE 4 #define RT_IDLE_HOOK_LIST_SIZE 4
#define IDLE_THREAD_STACK_SIZE 256 #define IDLE_THREAD_STACK_SIZE 256
#define RT_USING_TIMER_SOFT
#define RT_TIMER_THREAD_PRIO 4
#define RT_TIMER_THREAD_STACK_SIZE 512
/* kservice optimization */ /* kservice optimization */
#define RT_KSERVICE_USING_STDLIB
#define RT_DEBUG #define RT_DEBUG
#define RT_DEBUG_COLOR #define RT_DEBUG_COLOR
@ -123,7 +121,6 @@
#define RT_USING_I2C #define RT_USING_I2C
#define RT_USING_I2C_BITOPS #define RT_USING_I2C_BITOPS
#define RT_USING_PIN #define RT_USING_PIN
#define RT_USING_RTC
#define RT_USING_SPI #define RT_USING_SPI
#define RT_USING_SPI_MSD #define RT_USING_SPI_MSD
#define RT_USING_SFUD #define RT_USING_SFUD
@ -175,6 +172,7 @@
#define BSP_USING_UART #define BSP_USING_UART
#define BSP_USING_UART1 #define BSP_USING_UART1
#define BSP_USING_UART2 #define BSP_USING_UART2
#define BSP_USING_UART3
#define BSP_USING_USB #define BSP_USING_USB
#define BSP_USING_STM32_USBH #define BSP_USING_STM32_USBH
#define USB_BUS_NAME "usb" #define USB_BUS_NAME "usb"
@ -195,12 +193,10 @@
#define ADD_RTTHREAD_FETURES #define ADD_RTTHREAD_FETURES
#define SUPPORT_CONNECTION_FRAMEWORK #define SUPPORT_CONNECTION_FRAMEWORK
#define CONNECTION_FRAMEWORK_DEBUG #define CONNECTION_FRAMEWORK_DEBUG
#define CONNECTION_ADAPTER_NB #define ADAPTER_HFA21_DRIVER "/dev/uart3"
#define ADAPTER_BC28 #define CONNECTION_ADAPTER_ETHERNET
#define ADAPTER_NBIOT_BC28 "bc28" #define ADAPTER_HFA21_ETHERNET
#define ADAPTER_BC28_RESETPIN 100 #define ADAPTER_ETHERNET_HFA21 "hfa21_ethernet"
#define ADAPTER_BC28_PIN_DRIVER "/dev/pin"
#define ADAPTER_BC28_DRIVER "/dev/uart2"
/* Security */ /* Security */