From 331f447bb0e5eccf0b3161ab287c1372b14b8480 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期五, 08 八月 2025 11:53:58 +0800
Subject: [PATCH] 1.增加千传计数,保存计数，重启软件时恢复； 2.千传测试模式，打印相关日志，方便后期提取，用于统计； 3.千传模式时烘烤两腔体都要进入； 4.千传模式时，Fliper到Bonder修改为用手臂2取料； 5.修复千传模式不计运行时的问题； 6.千传模式，最后收料强制放入第一层； 6.修复Buf， 当任务未生成（在符合条件后仍有1秒间隙）而机器单元发送FetchOutJob时，数据检验失败的问题，增加Sleep, 缩小间隙；
---
SourceCode/Bond/Servo/HsmsPassive.h | 28 +++++++++++++++++++++++++++-
1 files changed, 27 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/Servo/HsmsPassive.h b/SourceCode/Bond/Servo/HsmsPassive.h
index 64bccc0..f542cf7 100644
--- a/SourceCode/Bond/Servo/HsmsPassive.h
+++ b/SourceCode/Bond/Servo/HsmsPassive.h
@@ -23,7 +23,18 @@
#define ER_NO_EVENT -4
#define ER_UNLINK_EVENT_REPORT -5
#define ER_NO_PPID_LIST -6
+#define ER_NOT_SUPPORTED -7
+
+/* CAACK */
+
+#define CAACK_0 0 /* ok */
+#define CAACK_1 1 /* invalid command */
+#define CAACK_2 2 /* cannot perform now */
+#define CAACK_3 3 /* invalid data or argument */
+#define CAACK_4 4 /* initiated for asynchronous completion */
+#define CAACK_5 5 /* rejected - invalid state */
+#define CAACK_6 6 /* command performed with errors */
/*
* 常量数据结构
@@ -69,6 +80,12 @@
typedef std::function<void(void* pFrom, bool bEnable, std::vector<unsigned int>& ids)> EDEVENTREPORT;
typedef std::function<void(void* pFrom, bool bEnable, unsigned int id)> EDALARMREPORT;
typedef std::function<std::vector<std::string> (void* pFrom)> QUERYPPIDLIST;
+typedef std::function<unsigned int (void* pFrom,
+ unsigned int DATAID,
+ const char* pszCarrierAction,
+ const char* pszCarrierId,
+ unsigned char PTN,
+ std::string& strErrorTxt)> CARRIERACTION;
typedef struct _SECSListener
{
SECSEQOFFLINE onEQOffLine;
@@ -80,6 +97,7 @@
EDEVENTREPORT onEnableDisableEventReport;
EDALARMREPORT onEnableDisableAlarmReport;
QUERYPPIDLIST onQueryPPIDList;
+ CARRIERACTION onCarrierAction;
} SECSListener;
@@ -118,6 +136,11 @@
// 取得指定Variable
SERVO::CVariable* getVariable(int variableId);
+ SERVO::CVariable* getVariable(const char* pszName);
+
+ // 设置变量值
+ void setVariableValue(const char* pszName, __int64 value);
+ void setVariableValue(const char* pszName, const char* value);
// 从文件中加载CReport列表
int loadReports(const char* pszFilepath);
@@ -155,7 +178,9 @@
/* request开头的函数为主动发送数据的函数 */
int requestAreYouThere();
int requestAlarmReport(int ALCD, int ALID, const char* ALTX);
- int requestEventReportSend(unsigned int DATAID, unsigned int CEID, const std::vector<std::string>& values);
+ int requestEventReportSend(unsigned int CEID);
+ int requestEventReportSend(const char* pszEventName);
+ int requestEventReportSend_CarrierID_Readed();
private:
void replyAck(int s, int f, unsigned int systemBytes, BYTE ack, const char* pszAckName);
@@ -173,6 +198,7 @@
int replyEanbleDisableEventReport(IMessage* pRecv);
int replyCommand(IMessage* pRecv);
int replyConfigureSpooling(IMessage* pRecv);
+ int replyCarrierAction(IMessage* pRecv);
int replyEanbleDisableAlarmReport(IMessage* pRecv);
int replyPurgeSpooledData(IMessage* pRecv);
int replyQueryPPIDList(IMessage* pRecv);
--
Gitblit v1.9.3