From 6747bc043d0af20d6fa02a6cf385d81eb44643d0 Mon Sep 17 00:00:00 2001 From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com> Date: 星期六, 28 六月 2025 11:29:42 +0800 Subject: [PATCH] 1.自绘按钮，修改为支持文字在按钮下，或在按钮右。 2.日志页，修改为“包含”和“排除”关键字，以及正则表达式的支持，便于在调试过程中快速观察日志 --- SourceCode/Bond/Servo/CEquipment.h | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/SourceCode/Bond/Servo/CEquipment.h b/SourceCode/Bond/Servo/CEquipment.h index 8807f13..c2e880b 100644 --- a/SourceCode/Bond/Servo/CEquipment.h +++ b/SourceCode/Bond/Servo/CEquipment.h @@ -43,7 +43,7 @@ #define SIGNAL_UPSTREAM_TROUBLE 1 #define SIGNAL_INTERLOCK 2 #define SIGNAL_SEND_ABLE 3 -#define SIGNAL_RECEIVE_ABLE 4 +#define SIGNAL_RECEIVE_ABLE 3 typedef std::function<void(int writeCode, int retCode)> ONWRITEDRET; @@ -126,7 +126,7 @@ virtual int onStoredJob(int port, CJobDataB* pJobDataB); virtual int onProcessData(CProcessData* pProcessData); virtual int onSendAble(); - virtual int onRecieveAble(); + virtual int onReceiveAble(); virtual int onProcessStateChanged(PROCESS_STATE state); virtual int getIndexerOperationModeBaseValue(); bool isAlarmStep(SERVO::CStep* pStep); @@ -167,6 +167,7 @@ // 获取一个指定物料类型(G1,G2,G1&G2)的空槽位 CSlot* getAvailableSlotForGlass(MaterialsType type); + CSlot* getAvailableSlotForGlassExcludeSignal(MaterialsType type); // 在指定的槽列表中，获取一个指定物料类型(G1,G2,G1&G2)的空槽位 CSlot* getAvailableSlotForGlass2(MaterialsType type, const std::vector<int>& candidates); @@ -231,6 +232,8 @@ int decodePanelDataReport(CStep* pStep, const char* pszData, size_t size); int decodeFacDataReport(CStep* pStep, const char* pszData, size_t size); int decodeJobDataRequest(CStep* pStep, const char* pszData, size_t size); + int decodeJobProcessStartReport(CStep* pStep, const char* pszData, size_t size); + int decodeJobProcessEndReport(CStep* pStep, const char* pszData, size_t size); BOOL compareJobData(CJobDataB* pJobDataB, CJobDataS* pJobDataS); void setProcessState(PROCESS_STATE state); -- Gitblit v1.9.3