From 828d914304e29f5d8202df87393ce6744e528fdd Mon Sep 17 00:00:00 2001
From: QuakeGod <QuakeGod@sina.com>
Date: 星期三, 01 二月 2023 11:59:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/klink' into kNet
---
Inc/KLink.h | 38 +++++++++++++++++++-------------------
1 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/Inc/KLink.h b/Inc/KLink.h
index ead7ddb..d86948c 100644
--- a/Inc/KLink.h
+++ b/Inc/KLink.h
@@ -28,8 +28,8 @@
} ;
-enum {KLSignStart='%',
- KLSignReply='U',
+enum {KLSignStart='%', //0x25
+ KLSignReply='U', //0x55
KLSignEnd=0x0D,
KLMaxPacketLength=64,
};
@@ -189,20 +189,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 +210,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;
*/
@@ -228,10 +228,10 @@
int KLMakeRplyPacket(void * pBuf1, uchar Dst, uchar Status, uchar nCmd, uchar DataLen, const void *pData );
/* */
-int KLCheckPacket(void * pBuf1,int len1);
+int KLCheckPacket(int nChn, void * pBuf1, int len1);
/* */
-int KLParsePacket(void * pBuf1, int Len1);
+int KLParsePacket(int nChn, void * pBuf1, int Len1);
//int ReadData(void);
--
Gitblit v1.9.1