1、合并master与2021.1

This commit is contained in:
xiejunjie
2021-12-03 11:25:35 +08:00
parent dc07b8879b
commit 4bd7d1b80b
981 changed files with 384342 additions and 6470 deletions
@@ -14,7 +14,7 @@
#define MAX_SOCKET 56
#define PLC_MAX_SENSOR_STATE 20
#define MAX_CCD_ADDR 120
#define MAX_CCD_ADDR 1024
#define MAX_DM_PAGE_NUMBER 10000
@@ -132,16 +132,27 @@ public:
BOOL Response_PLC_DM200_R(short _StartAddr,short _DataSize);//PLC State
BOOL Response_PLC_DM5000_R(short _StartAddr,short _DataSize);//PLC State
BOOL Response_PLC_DM10000_R(short _StartAddr,short _DataSize);//CCD
BOOL Response_PLC_DM20000_R(short _StartAddr,short _DataSize);//CCD
BOOL RESPONSE_PLC_DM_UNKNOWN();
BOOL RESPONSE_PLC_DM_UNKNOWN(short _DataSize);
BOOL RESPONSE_PLC_DM36000_R(short _StartAddr,short _DataSize);
LRESULT OnSocket(WPARAM wParam, LPARAM lParam);
static unsigned __stdcall m_Thread(LPVOID pThis) ;
static HANDLE m_Thread_Id;
static HANDLE m_Thread_Mutex;
static int m_Thread_State;
static HANDLE m_MultiThread_Mutex;
static WSAEVENT m_SocketEvents[WSA_MAXIMUM_WAIT_EVENTS];
static SOCKET m_ClientSocket[WSA_MAXIMUM_WAIT_EVENTS];
static int m_nClients;
void Create_Thread();
void Exit_Thread();
private:
HWND m_hMsgWnd;
BOOL m_ServerStarted;
SOCKET m_Socket;
SOCKET m_ClientSocket[MAX_SOCKET];
int m_nClients;
int m_nActiveClient;
in_addr m_SreverIPAddress;
u_short m_iServerPortNumber;