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/EAPSimulator/CHsmsActive.h | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 47 insertions(+), 0 deletions(-) diff --git a/SourceCode/Bond/EAPSimulator/CHsmsActive.h b/SourceCode/Bond/EAPSimulator/CHsmsActive.h index 664193a..b814d4b 100644 --- a/SourceCode/Bond/EAPSimulator/CHsmsActive.h +++ b/SourceCode/Bond/EAPSimulator/CHsmsActive.h @@ -1,5 +1,10 @@ #pragma once #include <string> +#include <vector> +#include <map> +#include <set> +#include "CCollectionEvent.h" + typedef std::function<void(void* pFrom, ACTIVESTATE state)> STATECHANGED; typedef struct _ACTIVEListener @@ -37,6 +42,48 @@ // terminal display int hsmsTerminalDisplay(BYTE tid, const char* pszText); + // Enable/Disable Event Report + int hsmsEDEventReport(bool bEnable, std::vector<int>& ids); + + // Enable/Disable Alarm Report + int hsmsEDAlarmReport(bool bEnable, unsigned int id); + + // Define reports + int hsmsDefineReports(std::map<unsigned int, std::vector<unsigned int>>& mapReport); + + // Line Event Report + int hsmsLinkEventReport(std::map<unsigned int, std::vector<unsigned int>>& mapEvent); + + // Configure Spooling + int hsmsConfigureSpooling(std::map<unsigned int, std::set<unsigned int>>& spoolingConfig); + + // 发送或清空缓存的消息 + int hsmsTransmitSpooledData(); + int hsmsPurgeSpooledData(); + + // 查询PPID List + int hsmsQueryPPIDList(); + + // S3F17 + // 卡匣动作请求 + int hsmsCarrierActionRequest(unsigned int DATAID, + const char* pszCarrierAction, + const char* pszCarrierId, + unsigned char PTN); + int hsmsProceedWithCarrier(unsigned int DATAID, + const char* pszCarrierId, + unsigned char PTN); + int CHsmsActive::hsmsCarrierRelease(unsigned int DATAID, + const char* pszCarrierId, + unsigned char PTN); + + + // 通过的reply函数 + void replyAck(int s, int f, unsigned int systemBytes, BYTE ack, const char* pszAckName); + + // reply ack0 + int replyAck0(IMessage* pMessage); + private: ACTIVEListener m_listener; IActive* m_pActive; -- Gitblit v1.9.3