From 6126f6a78b14297cefb02f06ba58806767d424b5 Mon Sep 17 00:00:00 2001
From: QuakeGod <QuakeGod@sina.com>
Date: 星期三, 01 二月 2023 12:05:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/FP0' into kNet
---
Inc/KBus.h | 48 ++++++++++++++++++++++++++++++------------------
1 files changed, 30 insertions(+), 18 deletions(-)
diff --git a/Inc/KBus.h b/Inc/KBus.h
index 0bee8da..aef83a4 100644
--- a/Inc/KBus.h
+++ b/Inc/KBus.h
@@ -41,25 +41,38 @@
extern unsigned char PacketBuf1[128];
extern unsigned char PacketBuf2[128];
+typedef struct tagKBusRunStat
+{
+ unsigned char bMaster;
+ unsigned char nStationID;
+ unsigned char nChildren;
+ unsigned char nCurPollId;
+ unsigned char nSeq;
+
+ unsigned char bMasterRecved;
+ unsigned char bMasterRecvOK;
+ unsigned char bSlaveRecved;
+ unsigned int nSendTimeuS;
+
+}stKBusRunStat , * pstKBusRunStat;
+
extern unsigned char BufferIn[16];
extern unsigned char BufferOut[16];
-extern unsigned char nAddr;
+extern unsigned char nStationID;
extern unsigned char nChilds;
extern int ChildStat[16];
extern unsigned char nCurPollId;
extern unsigned char nSeq;
-extern volatile unsigned char MasterRecved;
-extern volatile unsigned char MasterRecvOK;
-extern volatile unsigned char SlaveRecved;
-extern unsigned int SendTimeuS;
-extern volatile int RecvTimeuS;
-extern int DelayuS;
-extern int MaxDelayuS;
+extern volatile unsigned char KBusMasterRecved;
+extern volatile unsigned char KBusMasterRecvOK;
+extern volatile unsigned char KBusSlaveRecved;
+extern unsigned int KBusSendTimeuS;
+extern volatile int KBusRecvTimeuS;
+extern int KBusDelayuS;
+extern int KBusMaxDelayuS;
extern volatile unsigned int nSlaveTick;
-
-
typedef struct tagVerInfo
{
@@ -107,8 +120,7 @@
unsigned char OutPutCount;
unsigned char InDWCount;
unsigned char OutDWCount;
-
- unsigned char Online;
+ unsigned char bOnline;
};
#pragma anon_unions
@@ -144,7 +156,7 @@
};
} stChnStat;
-extern stChnStat ChnStats[8];
+extern stChnStat KBusChnStats[8];
typedef struct tagSlaveStat
{
@@ -188,7 +200,7 @@
evClosed = 4,
};
-typedef struct tagPacket
+typedef struct tagKBPacket
{
unsigned char Sign; //璧峰鏍囪
unsigned char DstHost; //鐩爣鍦板潃
@@ -197,7 +209,7 @@
unsigned char nSEQ; //搴忓垪鍙�
unsigned char PacketLen; //鏁版嵁杞借嵎闀垮害 涓嶅寘鎷ご閮�5涓瓧鑺傦紝涓嶅寘鎷熬閮˙CC銆�
unsigned char data[1]; //鏁版嵁杞借嵎,鏈�鏈熬鏄疊CC锛屾暟鎹暱搴︿负0鏃讹紝瀹為檯涔熸湁涓�涓暟鎹��
- }stPacket,* pPacket;
+ }stKBPacket,* pKBPacket;
enum eResult
{
@@ -210,13 +222,13 @@
unsigned char KBusBCC(void * pData, int nSize);
//
/* Make a Packet and return Packet Length */
-int KBusMakePacket(pPacket p1,uchar Src, uchar Dst, uchar nType, uchar nSEQ, uchar DataLen, void *pData );
+int KBusMakePacket(pKBPacket p1,uchar Src, uchar Dst, uchar nType, uchar nSEQ, uchar DataLen, void *pData );
/* */
-int KBusCheckPacket(int nChn, pPacket p1, int len1);
+int KBusCheckPacket(int nChn, pKBPacket p1, int len1);
/* */
-int KBusParsePacket(int nChn, pPacket p1, int Len1);
+int KBusParsePacket(int nChn, pKBPacket p1, int Len1);
typedef struct tagMachineConfig
{
int bKBusMaster;
--
Gitblit v1.9.1