wxsmart-test
/
acdt
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: wxsmart-test:490a53a2af6d2d2c7172b0f6ac41891568efce8e
Branches Tags
wxsmart-test:master
wxsmart-test:develop
...
compare: wxsmart-test:8e0e1937423f7292b023cb9ac1308ffadf86f253
Branches Tags
wxsmart-test:develop
wxsmart-test:master

2 Commits
490a53a2af ... 8e0e193742

Author SHA1 Message Date
吴俊潮 8e0e193742 合并冲突处理 2025-04-02 16:04:08 +08:00
吴俊潮 1b29ec18e6 更新，CH395端口同步 2025-04-02 16:00:06 +08:00
1 changed files with 0 additions and 8 deletions
Show Stats Expand all files Collapse all files

8
CH395Q/ch395.c
View File

@ -683,11 +683,7 @@ void ch395_init(void)
memcpy(cha95_sockct_sta[0].net_config.gwipaddr, ch395_gw_ipaddr, sizeof(cha95_sockct_sta[0].net_config.gwipaddr)); /* 设置静态网关IP地址 */ memcpy(cha95_sockct_sta[0].net_config.gwipaddr, ch395_gw_ipaddr, sizeof(cha95_sockct_sta[0].net_config.gwipaddr)); /* 设置静态网关IP地址 */
memcpy(cha95_sockct_sta[0].net_config.maskaddr, ch395_ipmask, sizeof(cha95_sockct_sta[0].net_config.maskaddr)); /* 设置静态子网掩码地址 */ memcpy(cha95_sockct_sta[0].net_config.maskaddr, ch395_ipmask, sizeof(cha95_sockct_sta[0].net_config.maskaddr)); /* 设置静态子网掩码地址 */
//memcpy(cha95_sockct_sta[0].net_config.macaddr, ch395_macaddr, sizeof(cha95_sockct_sta[0].net_config.macaddr)); /* 设置静态MAC地址 */ //memcpy(cha95_sockct_sta[0].net_config.macaddr, ch395_macaddr, sizeof(cha95_sockct_sta[0].net_config.macaddr)); /* 设置静态MAC地址 */
<<<<<<< HEAD
cha95_sockct_sta[0].sour_port = ch395_port; /* 源端口 */ cha95_sockct_sta[0].sour_port = ch395_port; /* 源端口 */
=======
cha95_sockct_sta[0].sour_port = 8080; /* 源端口 */
>>>>>>> 694c8a2a7149125de63428eb48d859c6a7ca06cf
cha95_sockct_sta[0].proto = CH395Q_SOCKET_TCP_SERVER; /* 设置协议 */ cha95_sockct_sta[0].proto = CH395Q_SOCKET_TCP_SERVER; /* 设置协议 */
cha95_sockct_sta[0].send.buf = socket0_send_buf; /* 发送数据 */ cha95_sockct_sta[0].send.buf = socket0_send_buf; /* 发送数据 */
cha95_sockct_sta[0].send.size = sizeof(socket0_send_buf); /* 发送数据大小 */ cha95_sockct_sta[0].send.size = sizeof(socket0_send_buf); /* 发送数据大小 */
@ -738,11 +734,7 @@ void set_ipv4(void)
memcpy(cha95_sockct_sta[0].net_config.ipaddr, ch395_ipaddr, sizeof(cha95_sockct_sta[0].net_config.ipaddr)); /* 设置静态本地IP地址 */ memcpy(cha95_sockct_sta[0].net_config.ipaddr, ch395_ipaddr, sizeof(cha95_sockct_sta[0].net_config.ipaddr)); /* 设置静态本地IP地址 */
memcpy(cha95_sockct_sta[0].net_config.gwipaddr, ch395_gw_ipaddr, sizeof(cha95_sockct_sta[0].net_config.gwipaddr)); /* 设置静态网关IP地址 */ memcpy(cha95_sockct_sta[0].net_config.gwipaddr, ch395_gw_ipaddr, sizeof(cha95_sockct_sta[0].net_config.gwipaddr)); /* 设置静态网关IP地址 */
memcpy(cha95_sockct_sta[0].net_config.maskaddr, ch395_ipmask, sizeof(cha95_sockct_sta[0].net_config.maskaddr)); /* 设置静态子网掩码地址 */ memcpy(cha95_sockct_sta[0].net_config.maskaddr, ch395_ipmask, sizeof(cha95_sockct_sta[0].net_config.maskaddr)); /* 设置静态子网掩码地址 */
<<<<<<< HEAD
cha95_sockct_sta[0].sour_port = ch395_port; /* 源端口 */
=======
cha95_sockct_sta[0].sour_port = 8080; /* 源端口 */ cha95_sockct_sta[0].sour_port = 8080; /* 源端口 */
>>>>>>> 694c8a2a7149125de63428eb48d859c6a7ca06cf
ch395q_socket_config(&cha95_sockct_sta[0]); /* 配置socket参数 */ ch395q_socket_config(&cha95_sockct_sta[0]); /* 配置socket参数 */
} }