From ea83fa3e67ec0f8a6b8e3f70b63509f1483be25a Mon Sep 17 00:00:00 2001
From: QuakeGod <QuakeGod@sina.com>
Date: 星期一, 17 十月 2022 02:28:53 +0800
Subject: [PATCH] Merge branch 'dev1' of file://hasee-k680e/GitBase/F030C8xx_KLink into dev1
---
Inc/KMachine.h | 54 +++++++++++++-------------
Inc/KBus.h | 14 +++---
Inc/functions.h | 3 -
3 files changed, 35 insertions(+), 36 deletions(-)
diff --git a/Inc/KBus.h b/Inc/KBus.h
index 3436a55..f877f79 100644
--- a/Inc/KBus.h
+++ b/Inc/KBus.h
@@ -190,13 +190,13 @@
typedef struct tagPacket
{
- 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时，实际也有一个数据。
+ 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;
enum eResult
diff --git a/Inc/KMachine.h b/Inc/KMachine.h
index 64545c7..1be757b 100644
--- a/Inc/KMachine.h
+++ b/Inc/KMachine.h
@@ -49,9 +49,9 @@
#define LoHofB(x) ((x)&0xf)
#define HiHofB(x) (((x)>>4)&0xf)
-// 信息块
-// 工厂参数配置块
-// 用户/系统参数配置块
+// 锟斤拷息锟斤拷
+// 锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟矫匡拷
+// 锟矫伙拷/系统锟斤拷锟斤拷锟斤拷锟矫匡拷
//
//
@@ -103,26 +103,26 @@
enum enPortType
{
- PortType_Com = 0, //计算机通讯
- PortType_Gen = 1, //通用通讯，自由口
+ PortType_Com = 0, //锟斤拷锟斤拷锟酵ㄑ�
+ PortType_Gen = 1, //通锟斤拷通讯锟斤拷锟斤拷锟缴匡拷
PortType_KLink = 2, //Klink通讯
PortType_KBus = 3, //KBus通讯
PortType_KNet = 4, // KNet通讯
PortType_ModbusRTU = 5, //Modbus RTU 通讯
};
-//每个模块有 0/1/2/3/4/5/6/7/8个 通讯port
-//不限于 UART, 网口，无线，单总线等，都是port
-//甚至可以有虚拟的port
+//每锟斤拷模锟斤拷锟斤拷 0/1/2/3/4/5/6/7/8锟斤拷 通讯port
+//锟斤拷锟斤拷锟斤拷 UART, 锟斤拷锟节ｏ拷锟斤拷锟竭ｏ拷锟斤拷锟斤拷锟竭等ｏ拷锟斤拷锟斤拷port
+//锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟絧ort
typedef struct tagPortStat
{
- UCHAR nWorking; //工作中
- UCHAR nStation; //自己站号
- UCHAR bBus; //总线?,,全双工?
- UCHAR bMaster; //主机
- UCHAR PortType; //端口工作模式
- UCHAR nDevices; //连接的设备数量//不包括自己 //device list;
+ UCHAR nWorking; //锟斤拷锟斤拷锟斤拷
+ UCHAR nStation; //锟皆硷拷站锟斤拷
+ UCHAR bBus; //锟斤拷锟斤拷?,,全双锟斤拷?
+ UCHAR bMaster; //锟斤拷锟斤拷
+ UCHAR PortType; //锟剿口癸拷锟斤拷模式
+ UCHAR nDevices; //锟斤拷锟接碉拷锟借备锟斤拷锟斤拷//锟斤拷锟斤拷锟斤拷锟皆硷拷 //device list;
}stPortStat,*pPortStat;
@@ -146,11 +146,11 @@
typedef struct tagKMFuncParam
{
- USHORT EnablePLC:1; //使能内部PLC功能
- USHORT RunMode; //工作模式
+ USHORT EnablePLC:1; //使锟斤拷锟节诧拷PLC锟斤拷锟斤拷
+ USHORT RunMode; //锟斤拷锟斤拷模式
}stKMFuncParam;
-// 输入输出地址映射
+// 锟斤拷锟斤拷锟斤拷锟斤拷锟街酚筹拷锟�
typedef struct tagComPortParam //4 Bytes
{
@@ -190,7 +190,7 @@
USHORT workmode; // SC1 // 2 Bytes 0=From jumper
USHORT SwitchFunc; // SC2 // 2 Bytes
- USHORT OutMappings[6]; //12 Bytes //输出映射
+ USHORT OutMappings[6]; //12 Bytes //锟斤拷锟接筹拷锟�
stComPortParam PortParams[2]; // 8 Bytes
stOutputHoldParam OutputParams[16]; //16 Bytes
@@ -238,7 +238,7 @@
}stFactData;
*/
-typedef struct tagFactoryData //工厂量产参数，数据
+typedef struct tagFactoryData //锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷
{
USHORT Sign1;
USHORT Seq1;
@@ -397,12 +397,12 @@
stTimer Timers[TOTALTIMERS];
union {
- unsigned short WX[KLDataWXCount]; //本机的X和Y
+ unsigned short WX[KLDataWXCount]; //锟斤拷锟斤拷锟斤拷X锟斤拷Y
unsigned char WXB[KLDataWXCount*2];
};
union {
- unsigned short WY[KLDataWYCount]; //本机的X和Y
- unsigned char WYB[KLDataWYCount*2]; //本机的X和Y
+ unsigned short WY[KLDataWYCount]; //锟斤拷锟斤拷锟斤拷X锟斤拷Y
+ unsigned char WYB[KLDataWYCount*2]; //锟斤拷锟斤拷锟斤拷X锟斤拷Y
};
unsigned short WR[KLDataWRCount];
@@ -413,7 +413,7 @@
unsigned short SV[KLDataSVCount];
- unsigned short WLX[16]; //虚拟的X和Y，远程通讯时映射用。
+ unsigned short WLX[16]; //锟斤拷锟斤拷锟絏锟斤拷Y锟斤拷远锟斤拷通讯时映锟斤拷锟矫★拷
unsigned short WLY[16];
unsigned short WLR[16];
unsigned short WSR[16];
@@ -424,10 +424,10 @@
unsigned char DTB[KLDataDTCount*2];
};
- // 配置寄存器
- // 系统状态寄存器
- // 特殊寄存器
- // 调试，监控寄存器
+ // 锟斤拷锟矫寄达拷锟斤拷
+ // 系统状态锟侥达拷锟斤拷
+ // 锟斤拷锟斤拷拇锟斤拷锟�
+ // 锟斤拷锟皆ｏ拷锟斤拷丶拇锟斤拷锟�
union {
unsigned int SDD[KLDataSDTCount/2];
unsigned short SDT[KLDataSDTCount];
diff --git a/Inc/functions.h b/Inc/functions.h
index 7a8fe6c..b03c0c6 100644
--- a/Inc/functions.h
+++ b/Inc/functions.h
@@ -21,7 +21,7 @@
extern volatile unsigned int CurTickuS;
//extern volatile unsigned int ThisRunTime;
//extern volatile unsigned int TotalRunTime;
-//extern volatile unsigned int PwrCount; //开机次数
+//extern volatile unsigned int PwrCount; //锟斤拷锟斤拷锟斤拷锟斤拷
typedef unsigned char uint8_t;
typedef unsigned char uchar;
@@ -74,5 +74,4 @@
void EnableDisIn(uchar bEnable);
void displayInput(unsigned int cc);
void PutOutputSPI1(unsigned int Y);
-
#endif /* __MYFUNCTIONS_H__ */
--
Gitblit v1.9.1