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/KBus.h | 83 ++++++++++++++++++++++-------------------
1 files changed, 45 insertions(+), 38 deletions(-)
diff --git a/Inc/KBus.h b/Inc/KBus.h
index 69341b0..aef83a4 100644
--- a/Inc/KBus.h
+++ b/Inc/KBus.h
@@ -11,7 +11,7 @@
#define __KBUS_H__
typedef unsigned char uchar;
-extern unsigned char bMaster,bSlave,bRepeater;
+extern unsigned char bKBusMaster,bKBusSlave,bKBusRepeater;;
enum enCMDs
{
cmdNone = '0', //Nothing
@@ -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[9];
+extern stChnStat KBusChnStats[8];
typedef struct tagSlaveStat
{
@@ -188,16 +200,16 @@
evClosed = 4,
};
-typedef struct tagPacket
+typedef struct tagKBPacket
{
- unsigned char Sign; //起始标记
- unsigned char DstHost; //目标地址
- unsigned char SrcAddr; //源地址
- unsigned char nCMD; //命令
- unsigned char nSEQ; //序列号
- unsigned char PacketLen; //数据载荷长度 不包括头部5个字节，不包括尾部BCC。
- unsigned char data[1]; //数据载荷,最末尾是BCC，数据长度为0时，实际也有一个数据。
- }stPacket,* pPacket;
+ unsigned char Sign; //璧峰鏍囪
+ unsigned char DstHost; //鐩爣鍦板潃
+ unsigned char SrcAddr; //婧愬湴鍧�
+ unsigned char nCMD; //鍛戒护
+ unsigned char nSEQ; //搴忓垪鍙�
+ unsigned char PacketLen; //鏁版嵁杞借嵎闀垮害 涓嶅寘鎷ご閮�5涓瓧鑺傦紝涓嶅寘鎷熬閮˙CC銆�
+ unsigned char data[1]; //鏁版嵁杞借嵎,鏈�鏈熬鏄疊CC锛屾暟鎹暱搴︿负0鏃讹紝瀹為檯涔熸湁涓�涓暟鎹��
+ }stKBPacket,* pKBPacket;
enum eResult
{
@@ -207,26 +219,22 @@
} ;
-int RepeaterFunc(int nChn);
-int MasterFunc(int nChn);
-int SlaveFunc(int nChn);
-
-unsigned char BCC(void * pData, int nSize);
+unsigned char KBusBCC(void * pData, int nSize);
//
/* Make a Packet and return Packet Length */
-int MakePacket(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 CheckPacket(int nChn, pPacket p1, int len1);
+int KBusCheckPacket(int nChn, pKBPacket p1, int len1);
/* */
-int ParsePacket(int nChn, pPacket p1, int Len1);
+int KBusParsePacket(int nChn, pKBPacket p1, int Len1);
typedef struct tagMachineConfig
{
- int bMaster;
+ int bKBusMaster;
int nAddr;
}stMachineConfig;
-
+/*
int InitMachine(stMachineConfig * pConfig);
int SetConfig(void );
@@ -242,11 +250,10 @@
int WriteData(void);
int GetStat(void);
-
-
-
-
-
+*/
+int KBusRepeaterFunc(int nChn);
+int KBusMasterFunc(int nChn);
+int KBusSlaveFunc(int nChn);
#endif /* __KBUS_H__ */
--
Gitblit v1.9.1