From e42e8364112e97d89eeaecd13f043dff42179949 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期二, 27 五月 2025 17:19:02 +0800
Subject: [PATCH] 1.enum修改为enum class, 理顺CLoadPort各成员变量在调度中的判定作用；
---
SourceCode/Bond/Servo/CEquipment.h | 71 -----------------------------------
1 files changed, 1 insertions(+), 70 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEquipment.h b/SourceCode/Bond/Servo/CEquipment.h
index 6357114..c1d73c7 100644
--- a/SourceCode/Bond/Servo/CEquipment.h
+++ b/SourceCode/Bond/Servo/CEquipment.h
@@ -1,5 +1,6 @@
#pragma once
#include "Log.h"
+#include "ServoCommo.h"
#include "CCLinkIEControl.h"
#include "CSample.h"
#include "CPin.h"
@@ -36,10 +37,6 @@
namespace SERVO {
-#define BLOCK_BUFFER_MAX 1024
-#define ALIVE_TIMEOUT 15
-#define VCR_MAX 1
-#define ARM_ALL 99
typedef std::function<void(void* pEiuipment, BOOL bAlive)> ONALIVE;
typedef std::function<void(void* pEiuipment, int code)> ONDATACHANGED;
@@ -54,78 +51,12 @@
ONVCREVENTREPORT onVcrEventReport;
} EquipmentListener;
- // Memory Block 结构体定义
- typedef struct _MemoryBlock {
- unsigned int type;
- unsigned int start;
- unsigned int end;
- unsigned int size;
- char buffer[BLOCK_BUFFER_MAX];
- } MemoryBlock;
-
- // ALIVE
- typedef struct _ALIVE {
- BOOL flag;
- int count;
- BOOL alive;
- } ALIVE;
-
- enum DISPATCHING_MODE {
- EAS = 1,
- Local = 2
- };
-
- enum IDNEXER_OPERATION_MODE {
- Normal = 1,
- Clear_Out = 2,
- Cold_Run = 2,
- Start = 10,
- Stop = 11,
- Pause = 12,
- Resume = 13,
- Abort = 14,
- Cancel = 15,
- };
-
- enum RCMD {
- Robot_home = 1,
- Transfer,
- Move,
- Get,
- Put,
- One_Action_Exchange,
- Two_Action_Exchange,
- Command_Clear,
- Batch_get,
- Batch_put
- };
-
- enum VCR_Reply_Code {
- OK = 1,
- NG,
- Job_Data_Request,
- VCR_Mismatch
- };
-
- // Robot cmd param
-#define ROBOT_CMD_PARAM_SIZE 16 /* 防止以后修改ROBOT_CMD_PARAM为不是4的整数倍 */
- typedef struct _ROBOT_CMD_PARAM {
- short sequenceNo;
- short rcmd;
- short armNo;
- short getPosition;
- short putPosition;
- short getSlotNo;
- short putSlotNo;
- short subCmd;
- } ROBOT_CMD_PARAM;
class CEquipment
{
public:
CEquipment();
virtual ~CEquipment();
-
public:
virtual const char* getClassName() = 0;
--
Gitblit v1.9.3