From bea6407b376a4e426f0b120bae569fba6ab867db Mon Sep 17 00:00:00 2001 From: chenluhua1980 <Chenluhua@qq.com> Date: 星期六, 08 十一月 2025 17:55:47 +0800 Subject: [PATCH] 1.CMaster.cpp 第 1644/1667/1691 行在记录 SV 曲线时通过 getGlassFromSlot(0) 取玻璃,而各设备的 initSlots() 都是从 1 开始编号(例如 CBonder.cpp (line 408)、CVacuumBake.cpp (line 415) 等)。槽位 0 永远不存在,所以 pGlass 始终是 nullptr,pGlass->addSVData(...) 的分支从未执行。结果 SERVO::CGlass::m_svDatas 里没有任何曲线数据,GlassJson::ToPrettyString 生成的 pretty 字符串也就没有 sv_datas,导出 CSV 时自然读不到曲线。 同一段代码还有一个潜在 Bug:虽然判断了 channel - 1 < bonderTypes.size(),但真正索引却用的是 bonderTypes[channel]。索引偏移会导致数据类型错位,最后一个通道甚至可能越界。即使修正了槽位,这里也需要同步改成 bonderTypes[channel - 1](另外两处 vacuumbakeTypes、coolingTypes 也一样)。 --- SourceCode/Bond/EAPSimulator/CHsmsActive.h | 35 +++++++++++++++++++++++++++++++++++ 1 files changed, 35 insertions(+), 0 deletions(-) diff --git a/SourceCode/Bond/EAPSimulator/CHsmsActive.h b/SourceCode/Bond/EAPSimulator/CHsmsActive.h index e171c75..29abeb5 100644 --- a/SourceCode/Bond/EAPSimulator/CHsmsActive.h +++ b/SourceCode/Bond/EAPSimulator/CHsmsActive.h @@ -4,6 +4,12 @@ #include <map> #include <set> #include "CCollectionEvent.h" +#include "ProcessJob.h" + + +#define SVID_CJobSpace 5001 +#define SVID_PJobSpace 5002 +#define SVID_PJobQueued 5003 typedef std::function<void(void* pFrom, ACTIVESTATE state)> STATECHANGED; @@ -57,6 +63,35 @@ // Configure Spooling int hsmsConfigureSpooling(std::map<unsigned int, std::set<unsigned int>>& spoolingConfig); + // 发送或清空缓存的消息 + int hsmsTransmitSpooledData(); + int hsmsPurgeSpooledData(); + + // 查询变量 + int hsmsSelectedEquipmentStatusRequest(unsigned int SVID); + + // 查询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); + + // S16F15 + int hsmsPRJobMultiCreate(std::vector<SERVO::CProcessJob*>& pjs); + + // S14F9 + int hsmsCreateControlJob(const char* pszControlJobId, std::vector<std::string>& processJobIds); + // 通过的reply函数 void replyAck(int s, int f, unsigned int systemBytes, BYTE ack, const char* pszAckName); -- Gitblit v1.9.3