sx/map
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
zhouhuang 2024-12-04 19:53:53 +08:00
parent 0eb8e18721
commit b972ce9cef
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
das-dn/hostadsbf/hostadsbf.cpp
View File

@ -5,7 +5,7 @@
#include <ry.h> #include <ry.h>
#define MAX_BLOCKF_SIZE 512 #define MAX_BLOCKF_SIZE 512
#define DATA_BLOCK_BOUNDARY 1000 #define DATA_BLOCK_BOUNDARY 400
#define REGISTER_DATA_TYPE_YC 1 #define REGISTER_DATA_TYPE_YC 1
#define REGISTER_DATA_TYPE_YM 2 #define REGISTER_DATA_TYPE_YM 2
@ -712,6 +712,7 @@ BOOLEAN CHostADSBFProcess::calc(void)
pData = GetUnitYCParamByPoint(uid, n); pData = GetUnitYCParamByPoint(uid, n);
if (pData[4] == 1) continue; if (pData[4] == 1) continue;
registerAddr = MAKEWORD(pData[0], pData[1]); registerAddr = MAKEWORD(pData[0], pData[1]);
vLog(LOG_DEBUG, "registerAddr is: %d\n", registerAddr);
if (registerAddr < DATA_BLOCK_BOUNDARY) if (registerAddr < DATA_BLOCK_BOUNDARY)
{ {
if (!m_adsDatas[0].inuse) m_adsDatas[0].inuse = TRUE; if (!m_adsDatas[0].inuse) m_adsDatas[0].inuse = TRUE;

2
das-dn/third_party/AdsLib/Sockets.cpp vendored
View File

@ -126,7 +126,7 @@ Socket::Socket(const struct addrinfo* const host, const int type)
if (SOCK_STREAM == type) { if (SOCK_STREAM == type) {
if (::connect(m_Socket, rp->ai_addr, rp->ai_addrlen)) { if (::connect(m_Socket, rp->ai_addr, rp->ai_addrlen)) {
LOG_WARN("Socket connect["<<std::string(inet_ntoa(reinterpret_cast<sockaddr_in*>(rp->ai_addr)->sin_addr)) << "] timeout"); LOG_WARN("Socket connect[" << std::string(inet_ntoa(reinterpret_cast<sockaddr_in*>(rp->ai_addr)->sin_addr)) << "] timeout");
closesocket(m_Socket); closesocket(m_Socket);
m_Socket = INVALID_SOCKET; m_Socket = INVALID_SOCKET;
continue; continue;