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/BoounionPLC/Model.h | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/SourceCode/Bond/BoounionPLC/Model.h b/SourceCode/Bond/BoounionPLC/Model.h index b4a4992..55401e4 100644 --- a/SourceCode/Bond/BoounionPLC/Model.h +++ b/SourceCode/Bond/BoounionPLC/Model.h @@ -1,5 +1,7 @@ #pragma once #include "Configuration.h" +#include "PLC.h" +#include <map> class CModel @@ -14,6 +16,13 @@ int init(); int term(); void onTimer(UINT nTimerid); + std::map<std::string, CPLC*>& getPlcMap(); + int addPlc(const char* pszName, const char* pszIp, const unsigned int port); + int removePlc(const char* pszName); + + // 设置/获取当前PLC + void setCurrentPlc(CPLC* pPlc); + CPLC* getCurrentPlc(); public: int notify(int code); @@ -32,11 +41,12 @@ public: CConfiguration m_configuration; - private: IObservable* m_pObservable; IObservableEmitter* m_pObservableEmitter; CString m_strWorkDir; + std::map<std::string, CPLC*> m_mapPlc; + CPLC* m_pActivePlc; private: int m_nTimerID; -- Gitblit v1.9.3