From f56051fa3102feb35ea60650ebda80f49e62d025 Mon Sep 17 00:00:00 2001 From: mrDarker <mr.darker@163.com> Date: 星期二, 05 八月 2025 14:54:24 +0800 Subject: [PATCH] 1. SGMeasurement实现规划的地址 2. 优化读取位时输入的地址不是8的倍数的问题 3. 添加读写心跳的功能 --- SourceCode/Bond/Servo/CGlass.h | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/SourceCode/Bond/Servo/CGlass.h b/SourceCode/Bond/Servo/CGlass.h index 86115ef..844822b 100644 --- a/SourceCode/Bond/Servo/CGlass.h +++ b/SourceCode/Bond/Servo/CGlass.h @@ -24,18 +24,25 @@ void setType(MaterialsType type); void setID(const char* pszID); std::string& getID(); + void setOriginPort(int port, int slot); + void getOrginPort(int& port, int& slot); + BOOL isScheduledForProcessing(); + void setScheduledForProcessing(BOOL bProcessing); CPath* getPathWithEq(unsigned int nEqId, unsigned int nUnit); CPath* getPath(); void addPath(unsigned int nEqId, unsigned int nUnit); void serialize(CArchive& ar); void setJobDataS(CJobDataS* pJobDataS); + void updateJobDataS(CJobDataS* pJobDataS); CJobDataS* getJobDataS(); BOOL setBuddy(CGlass* pGlass); BOOL forceSetBuddy(CGlass* pGlass); CGlass* getBuddy(); std::string& getBuddyId(); - void processEnd(unsigned int nEqId, unsigned int nUnit); + int processEnd(unsigned int nEqId, unsigned int nUnit); BOOL isProcessed(unsigned int nEqId, unsigned int nUnit); + int setInspResult(unsigned int nEqId, unsigned int nUnit, InspResult result); + InspResult getInspResult(unsigned int nEqId, unsigned int nUnit); private: MaterialsType m_type; @@ -44,6 +51,9 @@ CJobDataS m_jobDataS; CGlass* m_pBuddy; std::string m_strBuddyId; + int m_nOriginPort; + int m_nOriginSlot; + BOOL m_bScheduledForProcessing; /* 是否将加工处理 */ }; } -- Gitblit v1.9.3