From b6290b94cac76a5634cd90b495b65d91ee92d85e Mon Sep 17 00:00:00 2001
From: QuakeGod <QuakeGod@sina.com>
Date: 星期三, 22 二月 2023 08:57:38 +0800
Subject: [PATCH] fix conflict
---
Inc/KLink.h | 37 ++++++++++++++++++++-----------------
1 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/Inc/KLink.h b/Inc/KLink.h
index edf976c..20a10ef 100644
--- a/Inc/KLink.h
+++ b/Inc/KLink.h
@@ -85,6 +85,8 @@
KLCmdReadData = 0x35,
KLCmdWriteData = 0x36 ,
+ KLCmdStopBlinkLED = 0x4F,
+ KLCmdBlinkLED = 0x50,
KLCmdReadProg = 0x51,
KLCmdWriteProg,
@@ -93,6 +95,7 @@
KLCmdSaveSysCfg,
KLCmdSaveRunStat,
KLCmdReadRunStat,
+ KLCmdClearRunStat,
KLCmdEraseFlashPage = 0x61,
KLCmdWriteToFlash = 0x62,
@@ -131,7 +134,7 @@
extern unsigned char KLBufferIn[16];
extern unsigned char KLBufferOut[16];
-extern unsigned char nKLAddr;
+extern unsigned char nKLStationId;
extern unsigned char nKLSeq;
extern int KLThisuS;
@@ -189,20 +192,20 @@
/*
typedef struct tagKLPktHdr
{
- unsigned char StSign; //起始标记
- unsigned char SrcAddr; //源地址
- unsigned char DstHost; //目标地址
- unsigned char nCMD; //命令
+ unsigned char StSign; //璧峰鏍囪
+ unsigned char SrcAddr; //婧愬湴鍧�
+ unsigned char DstHost; //鐩爣鍦板潃
+ unsigned char nCMD; //鍛戒护
}stKLPtHdr, * pKLPktHdr;
*/
/*
typedef struct tagKLRdPkt
{
- unsigned char StSign; //起始标记
- unsigned char SrcAddr; //源地址
- unsigned char DstHost; //目标地址
- unsigned char nCMD; //命令
+ unsigned char StSign; //璧峰鏍囪
+ unsigned char SrcAddr; //婧愬湴鍧�
+ unsigned char DstHost; //鐩爣鍦板潃
+ unsigned char nCMD; //鍛戒护
unsigned char nType;
unsigned char nAddr; //
}stKLRdPkt,* pKLRdKpt;
@@ -210,13 +213,13 @@
/*
typedef struct tagKLPacket
{
- unsigned char StSign; //起始标记
- unsigned char SrcAddr; //源地址
- unsigned char DstHost; //目标地址
- unsigned char nCMD; //命令
- unsigned char nSEQ; //序列号
- unsigned char LoadLen; //数据载荷长度 不包括头部5个字节，不包括尾部BCC。
- unsigned char data[1]; //数据载荷,最末尾是BCC，数据长度为0时，实际也有一个数据。
+ unsigned char StSign; //璧峰鏍囪
+ unsigned char SrcAddr; //婧愬湴鍧�
+ unsigned char DstHost; //鐩爣鍦板潃
+ unsigned char nCMD; //鍛戒护
+ unsigned char nSEQ; //搴忓垪鍙�
+ unsigned char LoadLen; //鏁版嵁杞借嵎闀垮害 涓嶅寘鎷ご閮�5涓瓧鑺傦紝涓嶅寘鎷熬閮˙CC銆�
+ unsigned char data[1]; //鏁版嵁杞借嵎,鏈�鏈熬鏄疊CC锛屾暟鎹暱搴︿负0鏃讹紝瀹為檯涔熸湁涓�涓暟鎹��
}stKLPacket,* pKLPacket;
*/
@@ -224,7 +227,7 @@
//
/* Make a Packet and return Packet Length */
-int KLMakeReqPacket(void * pBuf1,uchar Src, uchar Dst, uchar nType, uchar nSEQ, uchar DataLen, void *pData );
+int KLMakeReqPacket(void * pBuf1, uchar Src, uchar Dst, uchar nType, uchar nSEQ, uchar DataLen, void *pData );
int KLMakeRplyPacket(void * pBuf1, uchar Dst, uchar Status, uchar nCmd, uchar DataLen, const void *pData );
/* */
--
Gitblit v1.9.1