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

Compare commits

base: wxsmart-test:887c05a28950ca57b92a600560f74fd4c4f5b158
Branches Tags
wxsmart-test:master
wxsmart-test:develop
..
compare: wxsmart-test:55a69e2c5b92802aaa6122cce5e6c73684c9cffc
Branches Tags
wxsmart-test:develop
wxsmart-test:master

No commits in common. "887c05a28950ca57b92a600560f74fd4c4f5b158" and "55a69e2c5b92802aaa6122cce5e6c73684c9cffc" have entirely different histories.
887c05a289 ... 55a69e2c5b

11 changed files with 6922 additions and 7849 deletions
Show Stats Expand all files Collapse all files

30
CH395Q/ch395.c
View File

@ -454,6 +454,7 @@ void ch395_interrupt_handler(void)
{ {
uint16_t init_status; uint16_t init_status;
init_status = ch395_cmd_get_glob_int_status_all(); init_status = ch395_cmd_get_glob_int_status_all();
if (init_status & GINT_STAT_UNREACH) /* 不可达中断，读取不可达信息 */ if (init_status & GINT_STAT_UNREACH) /* 不可达中断，读取不可达信息 */
@ -563,24 +564,11 @@ void ch395q_handler(void)
* @param 无 * @param 无
* @retval 无 * @retval 无
*/ */
//socket_watch[0]:0x05->socket_open, 0x00->socket_closed
//socket_watch[1]:0x01->listen, 0x04->established
uint8_t socket_watch[8][2];
uint8_t rec_test_flag = 0;
void ch395_reconnection(void) void ch395_reconnection(void)
{ {
if (rec_test_flag == 1)
{
rec_test_flag = 0;
//ch395_tcp_disconnect(0);
ch395_close_socket(0);
}
for (uint8_t socket_index = CH395Q_SOCKET_0 ; socket_index <= CH395Q_SOCKET_7 ; socket_index ++ ) for (uint8_t socket_index = CH395Q_SOCKET_0 ; socket_index <= CH395Q_SOCKET_7 ; socket_index ++ )
{ {
/* 检查sokect是否打开成功 */
if (g_ch395q_sta.phy_status == PHY_DISCONN && (g_ch395q_sta.dhcp_status == DHCP_UP || g_ch395q_sta.dhcp_status == DHCP_DOWN || g_ch395q_sta.dhcp_status == DHCP_STA)) if (g_ch395q_sta.phy_status == PHY_DISCONN && (g_ch395q_sta.dhcp_status == DHCP_UP || g_ch395q_sta.dhcp_status == DHCP_DOWN || g_ch395q_sta.dhcp_status == DHCP_STA))
{ {
reconnect_times++; reconnect_times++;
@ -595,14 +583,6 @@ void ch395_reconnection(void)
} }
else else
{ {
ch395_cmd_get_socket_status(socket_index, socket_watch[socket_index]);
if(socket_watch[CH395Q_SOCKET_0][0] != 0x05)
{
//客户端断连后会关闭socket，因此在这里重新打开
ch395_open_socket(CH395Q_SOCKET_0);
ch395_tcp_listen(CH395Q_SOCKET_0);
}
if (g_ch395q_sta.phy_status != PHY_DISCONN && g_ch395q_sta.socket[socket_index].config.socket_enable == CH395Q_DISABLE) if (g_ch395q_sta.phy_status != PHY_DISCONN && g_ch395q_sta.socket[socket_index].config.socket_enable == CH395Q_DISABLE)
{ {
g_ch395q_sta.socket[socket_index].config.socket_enable = CH395Q_ENABLE; g_ch395q_sta.socket[socket_index].config.socket_enable = CH395Q_ENABLE;
@ -689,8 +669,8 @@ uint16_t ch395_port = 8080;
//uint8_t ch395_macaddr[6] = {0x5C,0x53,0x10,0x6C,0x18,0x49}; //uint8_t ch395_macaddr[6] = {0x5C,0x53,0x10,0x6C,0x18,0x49};
/* 远程IP地址设置 */ /* 远程IP地址设置 */
//uint8_t ch395_des_ipaddr[4] = {192,168,1,111}; //uint8_t ch395_des_ipaddr[4] = {192,168,1,111};
static uint8_t socket0_send_buf[255]; static uint8_t socket0_send_buf[1024];
static uint8_t socket0_recv_buf[255]; static uint8_t socket0_recv_buf[1024];
ch395_socket cha95_sockct_sta[8]; ch395_socket cha95_sockct_sta[8];
/** /**

278
MDK-ARM/VOQC.uvguix.admin
View File

File diff suppressed because one or more lines are too long

4
MDK-ARM/VOQC.uvoptx
View File

@ -223,12 +223,12 @@
<Ww> <Ww>
<count>14</count> <count>14</count>
<WinNumber>1</WinNumber> <WinNumber>1</WinNumber>
<ItemText>socket_watch</ItemText> <ItemText>p_flt_window</ItemText>
</Ww> </Ww>
<Ww> <Ww>
<count>15</count> <count>15</count>
<WinNumber>1</WinNumber> <WinNumber>1</WinNumber>
<ItemText>rec_test_flag</ItemText> <ItemText>temp_5803</ItemText>
</Ww> </Ww>
</WatchWindow1> </WatchWindow1>
<Tracepoint> <Tracepoint>

BIN
MDK-ARM/VOQC/VOQC.axf
View File

Binary file not shown.

8
MDK-ARM/VOQC/VOQC.build_log.htm
View File

@ -1,9 +1,9 @@
<html> <html>
<body> <body>
<pre> <pre>
<h1><EFBFBD>Vision Build Log</h1> <h1>µVision Build Log</h1>
<h2>Tool Versions:</h2> <h2>Tool Versions:</h2>
IDE-Version: <EFBFBD><EFBFBD>Vision V5.39.0.0 IDE-Version: ¦ÌVision V5.39.0.0
Copyright (C) 2023 ARM Ltd and ARM Germany GmbH. All rights reserved. Copyright (C) 2023 ARM Ltd and ARM Germany GmbH. All rights reserved.
License Information: 1111 admin, 111, LIC=CZLZX-HG49K-CXUU6-DWQ8R-YUSX2-8I4LW License Information: 1111 admin, 111, LIC=CZLZX-HG49K-CXUU6-DWQ8R-YUSX2-8I4LW
@ -29,7 +29,7 @@ Project File Date: 04/09/2025
Build target 'VOQC' Build target 'VOQC'
compiling gpios.c... compiling gpios.c...
linking... linking...
Program Size: Code=41082 RO-data=514 RW-data=548 ZI-data=8564 Program Size: Code=37462 RO-data=514 RW-data=516 ZI-data=9908
FromELF: creating hex file... FromELF: creating hex file...
"VOQC\VOQC.axf" - 0 Error(s), 0 Warning(s). "VOQC\VOQC.axf" - 0 Error(s), 0 Warning(s).
@ -54,7 +54,7 @@ Package Vendor: Keil
<h2>Collection of Component Files used:</h2> <h2>Collection of Component Files used:</h2>
* Component: ARM::CMSIS:CORE@5.6.0 * Component: ARM::CMSIS:CORE@5.6.0
Build Time Elapsed: 00:00:10 Build Time Elapsed: 00:00:08
</pre> </pre>
</body> </body>
</html> </html>

4880
MDK-ARM/VOQC/VOQC.hex
View File

File diff suppressed because it is too large Load Diff

1743
MDK-ARM/VOQC/VOQC.htm
View File

File diff suppressed because it is too large Load Diff

2467
MDK-ARM/VOQC/VOQC.map
View File

File diff suppressed because it is too large Load Diff

5361
MDK-ARM/VOQC/VOQC_VOQC.dep
View File

File diff suppressed because it is too large Load Diff

BIN
MDK-ARM/VOQC/ch395.crf
View File

Binary file not shown.

BIN
MDK-ARM/VOQC/ch395.o
View File

Binary file not shown.