From eea0893be9d4ef175ab26e8fea51d41fa33477ce Mon Sep 17 00:00:00 2001
From: Yao Chunli <56721587@qq.com>
Date: 星期六, 28 五月 2022 08:20:57 +0800
Subject: [PATCH] change eventlog
---
MTerm2/MTerm2Doc.h | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/MTerm2/MTerm2Doc.h b/MTerm2/MTerm2Doc.h
index c9167dd..724f64e 100644
--- a/MTerm2/MTerm2Doc.h
+++ b/MTerm2/MTerm2Doc.h
@@ -5,11 +5,15 @@
#pragma once
#include "HvSerialPort.h"
-#include "CAnsiParser.h"
-#include "CDataParser1.h"
+#include "AnsiParser.h"
+#include "DataParser1.h"
#include "KDefine.h"
#include "KLink.h"
#include "KMachine.h"
+
+#include "../KLink2/KLink.h"
+
+#pragma comment(lib,"KLink2.lib")
class CMTerm2Doc : public CDocument
{
@@ -26,7 +30,7 @@
// CSerialCom MySerialCom1;
HvSerialPort myHvSerialPort1;
KMachine myKMachine1;
-
+ KLink2 MyKlink2;
bool m_bCommParamSet = false;
@@ -49,15 +53,15 @@
CString ProgTxt;
- struct stTypeDef
+ struct stTypeNameDef
{
int nType;
CStringA TypeTxt;
};
- static stTypeDef CoilTypeDef[];
+ static stTypeNameDef CoilTypeNameDef[];
static int nCoilTypeDefCount;
- static stTypeDef DataTypeDef[];
+ static stTypeNameDef DataTypeNameDef[];
static int nDataTypeDefCount;
stKMem KMem;
@@ -69,7 +73,7 @@
KLParamNum,
};
- struct stProgDef
+ struct stOpDef
{
int nOpType1;
CStringA OpTxt;
@@ -77,9 +81,9 @@
int nParamType;
CStringA ShowTxt;
};
- static stProgDef ProgDef[];
+ static stOpDef OpDef[];
- static int nProgDefCount;
+ static int nOpDefCount;
struct stParam
{
CStringA sParamStr;
@@ -273,4 +277,8 @@
int AddMonitorData(int nDataType, int nDataAddr, int nDataCount);
int ClearMonitor();
int DoPLCMonitor();
+ afx_msg void OnMenuStatusShow();
+ afx_msg void OnMenuFactCfg();
+ afx_msg void OnMenuDatetimeSet();
+ afx_msg void OnMenuEventLog();
};
--
Gitblit v1.9.1