From 6fa60de2b0d0237054aa7571191df0f291838031 Mon Sep 17 00:00:00 2001
From: QuakeGod <quakegod@sina.com>
Date: 星期五, 20 十月 2023 22:27:53 +0800
Subject: [PATCH] fix conflict
---
MTerm1/MTerm1Doc.h | 100 +++++++++++++++++++++++++-------------------------
1 files changed, 50 insertions(+), 50 deletions(-)
diff --git a/MTerm1/MTerm1Doc.h b/MTerm1/MTerm1Doc.h
index 0d421cf..dfe7c38 100644
--- a/MTerm1/MTerm1Doc.h
+++ b/MTerm1/MTerm1Doc.h
@@ -78,49 +78,48 @@
stKMem KMem;
- enum enParamTypes
+ enum enParamTypes //鍙傛暟绫诲瀷
{
- KLParamCoil,
- KLParamWord,
- KLParamNum,
-
+ KLParamCoil, //鍙傛暟涓虹嚎鍦堬紝1bit
+ KLParamWord, //鍙傛暟涓哄瓧绫诲瀷, 16bit
+ KLParamNum, //鍙傛暟涓虹珛鍗虫暟
};
- struct stOpDef
+ struct stOpDef //鎸囦护瀹氫箟
{
- int nOpType1;
- CStringA OpTxt;
- int nParamCount;
- int nParamType;
- CStringA ShowTxt;
+ int nOpType1; //鎸囦护绫诲瀷
+ CStringA OpTxt; //鎸囦护鏂囨湰鏄剧ず
+ int nParamCount; //鎸囦护鐨勫弬鏁颁釜鏁�
+ int nParamType; //鎸囦护鐨勫弬鏁扮被鍨�
+ CStringA ShowTxt; //鎸囦护鐨勬樉绀烘枃鏈�
};
static stOpDef OpDef[];
static int nOpDefCount;
- struct stParam
+ struct stParam //鍙傛暟瀹氫箟
{
- CStringA sParamStr;
- int nParamType;
- int nParamAddr;
+ CStringA sParamStr; //鍙傛暟鏄剧ず鏂囨湰
+ int nParamType; //鍙傛暟绫诲瀷
+ int nParamAddr; //鍙傛暟鍦板潃.
};
- struct stProg
+ struct stProg //绋嬪簭瀹氫箟
{
- int nOpType1;
- int nBinStep;
- int nParamCount;
- stParam Params[3];
- int PairTo;
+ int nOpType1; //鎸囦护绫诲瀷
+ int nBinStep; //鎸囦护姝�
+ int nParamCount; //鍙傛暟鏁伴噺
+ stParam Params[3]; //鍙傛暟浠�
+ int PairTo; //瀵瑰簲鎸囦护
};
- struct stCoilAnno
+ struct stCoilAnno //绾垮湀娉ㄩ噴瀹氫箟
{
- unsigned short nType;
- unsigned short nAddr;
- CString sCoilName;
- CString sAnno;
+ unsigned short nType; //绫诲瀷
+ unsigned short nAddr; //鍦板潃
+ CString sCoilName; //绾垮湀鍚嶇О
+ CString sAnno; //娉ㄩ噴鏂囨湰
};
- stCoilAnno mCoilAnnos[10000]=
+ stCoilAnno mCoilAnnos[10000] =
{
};
@@ -128,21 +127,21 @@
- enum enSection {
- SectionNone = 0,
- SectionSysCfg = 1,
- SectionProg = 2,
- SectionAnno = 3,
- SectionCoilList = 4,
- SectionDataList = 5,
+ enum enSection { //鏁版嵁鑺傜被鍨嬪畾涔�
+ SectionNone = 0, //
+ SectionSysCfg = 1, //绯荤粺閰嶇疆鑺�
+ SectionProg = 2, //绋嬪簭鑺�
+ SectionAnno = 3, //娉ㄩ噴鑺�
+ SectionCoilList = 4, //绾垮湀鍒楄〃鑺�
+ SectionDataList = 5, //鏁版嵁鍒楄〃鑺�
};
- struct stSectionDef
+ struct stSectionDef
{
int nSectionType;
CStringA SectionName;
};
- stSectionDef SectionDef[5]=
+ stSectionDef SectionDef[5] =
{
{SectionSysCfg,"SYSCFG"},
{SectionProg,"PROG"},
@@ -150,22 +149,23 @@
{SectionCoilList,"MONCOILLIST"},
{SectionDataList,"MONDATALIST"},
};
- int nSectionDefCount = sizeof(SectionDef) / sizeof(stSectionDef);
- int TxtToSection(CStringA txt);
- int GetSectionTxt(int nSectionType, CStringA & txt);
- int ScanSections();
- struct stSection{
- int nSectionType;
- int nSectionLineNo;
- int nLines;
- };
- stSection Sections[100] = { 0 };
- int nSectionCount;
-
- int GetSectionPos(int nSectionType, int * nSectionLine, int * nSectionLines);
+ int nSectionDefCount = sizeof(SectionDef) / sizeof(stSectionDef);
+ int TxtToSection(CStringA txt);
+ int GetSectionTxt(int nSectionType, CStringA& txt);
+ int ScanSections();
-// 鎿嶄綔
+ struct stSection {
+ int nSectionType;
+ int nSectionLineNo;
+ int nLines;
+ };
+ stSection Sections[100] = { 0 };
+ int nSectionCount;
+
+ int GetSectionPos(int nSectionType, int* nSectionLine, int* nSectionLines);
+
+ // 鎿嶄綔
public:
int TxtToOp(CStringA optxt, int* ParamCount, int* ParamType);
int OpToTxt(int nOp, CStringA & OpTxt);
--
Gitblit v1.9.1