Merge branch 'develop' of http://git.jsgsdt.com:8070/wxsmart-test/acdt into develop

CH395Q/ch395.c

@@ -683,7 +683,11 @@ 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.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地址 */
+<<<<<<< HEAD
+    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].send.buf = socket0_send_buf;                                                                    /* 发送数据 */
     cha95_sockct_sta[0].send.size = sizeof(socket0_send_buf);                                                           /* 发送数据大小 */
@@ -734,7 +738,11 @@ 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.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));     /* 设置静态子网掩码地址 */
+<<<<<<< HEAD
+    cha95_sockct_sta[0].sour_port = ch395_port;                                                                               /* 源端口 */
+=======
     cha95_sockct_sta[0].sour_port = 8080;                                                                               /* 源端口 */
+>>>>>>> 694c8a2a7149125de63428eb48d859c6a7ca06cf
 	ch395q_socket_config(&cha95_sockct_sta[0]);                                                                         /* 配置socket参数 */
 }
 

MDK-ARM/VOQC.uvoptx

@@ -208,7 +208,11 @@
         <Ww>
           <count>10</count>
           <WinNumber>1</WinNumber>
+<<<<<<< HEAD
+          <ItemText>tx_start</ItemText>
+=======
           <ItemText>g_ch395q_sta.socket[0].config</ItemText>
+>>>>>>> 694c8a2a7149125de63428eb48d859c6a7ca06cf
         </Ww>
       </WatchWindow1>
       <MemoryWindow1>