From 863f21995955fb3e9aa471430218967d4e642c27 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期四, 29 五月 2025 16:11:24 +0800
Subject: [PATCH] Merge branch 'liuyang'

---
 SourceCode/Bond/Servo/CEquipment.h |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/SourceCode/Bond/Servo/CEquipment.h b/SourceCode/Bond/Servo/CEquipment.h
index 81b7bc0..6357114 100644
--- a/SourceCode/Bond/Servo/CEquipment.h
+++ b/SourceCode/Bond/Servo/CEquipment.h
@@ -32,12 +32,14 @@
 #include "CJobDataC.h"
 #include "CJobDataS.h"
 #include "CProcessData.h"
+#include "CPortStatusReport.h"
 
 
 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;

--
Gitblit v1.9.3