From b5e55c30c551c17426b864327b92b20d437d35d7 Mon Sep 17 00:00:00 2001
From: chen <15335560115@163.com>
Date: 星期五, 20 九月 2024 18:17:29 +0800
Subject: [PATCH] 对应手环V1.12非车载，删除部分socket.c的外包代码
---
keil/include/components/internet/src/Socket.c | 72 +++++++++++++++++++++++++++++++++++-
1 files changed, 70 insertions(+), 2 deletions(-)
diff --git a/keil/include/components/internet/src/Socket.c b/keil/include/components/internet/src/Socket.c
index de02677..af7a189 100644
--- a/keil/include/components/internet/src/Socket.c
+++ b/keil/include/components/internet/src/Socket.c
@@ -46,6 +46,10 @@
HIDO_UINT8 l_au8SendQueueBuf[SOCKET_SEND_QUEUE_BUF_SIZE];
HIDO_UINT8 l_au8RecvQueueBuf[SOCKET_RECV_QUEUE_BUF_SIZE];
+
+ HIDO_BOOL m_bUseHeartbeat;
+ HIDO_UINT32 m_u32HeartbeatFreq;
+ HIDO_CHAR m_acHeartbeatData[128];
}ST_SocketData;
/*******************************************************************************
@@ -376,7 +380,7 @@
}
pstSocketData->m_eState = SOCKET_STATE_CONNECTED;
-
+#if 0
/* 重置队列 */
HIDO_VLQInit(&pstSocketData->m_stSendQueue, pstSocketData->l_au8SendQueueBuf,
SOCKET_SEND_QUEUE_BUF_SIZE, SOCKET_SEND_QUEUE_MEMBER_CNT);
@@ -390,7 +394,7 @@
HIDO_VLQInit(&pstSocketData->m_stRecvQueue, pstSocketData->l_au8RecvQueueBuf,
SOCKET_RECV_QUEUE_BUF_SIZE, SOCKET_RECV_QUEUE_MEMBER_CNT);
}
-
+#endif
/* 通知上层 */
if(pstSocketData->m_fnEventProc != HIDO_NULL)
{
@@ -762,6 +766,70 @@
}
/*******************************************************************************
+ * Function Name : Socket_UseHeartbeat
+ *******************************************************************************/
+HIDO_BOOL Socket_UseHeartbeat(HIDO_INT32 _i32SockID)
+{
+ ST_SocketData *pstSocketData = &l_astSocketData[_i32SockID];
+
+ if(_i32SockID < 0 || _i32SockID >= SOCKET_NUM)
+ {
+ return HIDO_FALSE;
+ }
+
+ return pstSocketData->m_bUseHeartbeat;
+}
+
+/*******************************************************************************
+ * Function Name : Socket_SetHeartbeatData
+ *******************************************************************************/
+HIDO_INT32 Socket_HeartbeatConfig(HIDO_INT32 _i32SockID, HIDO_UINT8 *_pu8Data, HIDO_UINT32 _u32Len, HIDO_UINT32 _u32HeartbeatFreq)
+{
+ ST_SocketData *pstSocketData = &l_astSocketData[_i32SockID];
+
+ if(_i32SockID < 0 || _i32SockID >= SOCKET_NUM)
+ {
+ return HIDO_ERR;
+ }
+
+ pstSocketData->m_bUseHeartbeat = HIDO_TRUE;
+ pstSocketData->m_u32HeartbeatFreq = _u32HeartbeatFreq;
+ HIDO_UtilByteArrayToHexString(_pu8Data, _u32Len, pstSocketData->m_acHeartbeatData, sizeof(pstSocketData->m_acHeartbeatData), HIDO_FALSE);
+
+ return HIDO_OK;
+}
+
+/*******************************************************************************
+ * Function Name : Socket_GetHeartbeatFreq
+ *******************************************************************************/
+HIDO_UINT32 Socket_GetHeartbeatFreq(HIDO_INT32 _i32SockID)
+{
+ ST_SocketData *pstSocketData = &l_astSocketData[_i32SockID];
+
+ if(_i32SockID < 0 || _i32SockID >= SOCKET_NUM)
+ {
+ return 300;
+ }
+
+ return pstSocketData->m_u32HeartbeatFreq;
+}
+
+/*******************************************************************************
+ * Function Name : Socket_GetHeartbeatFreq
+ *******************************************************************************/
+HIDO_CHAR *Socket_GetHeartbeatData(HIDO_INT32 _i32SockID)
+{
+ ST_SocketData *pstSocketData = &l_astSocketData[_i32SockID];
+
+ if(_i32SockID < 0 || _i32SockID >= SOCKET_NUM)
+ {
+ return 300;
+ }
+
+ return pstSocketData->m_acHeartbeatData;
+}
+
+/*******************************************************************************
* Function Name : Socket_Recv
* Description : 从Socket接收队列中读取数据
* Input : _i32Sock Socket描述符
--
Gitblit v1.9.3