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/Servo/CStep.h | 41 ++++++++++++++++-------------------------
1 files changed, 16 insertions(+), 25 deletions(-)
diff --git a/SourceCode/Bond/Servo/CStep.h b/SourceCode/Bond/Servo/CStep.h
index 628f116..6e40acf 100644
--- a/SourceCode/Bond/Servo/CStep.h
+++ b/SourceCode/Bond/Servo/CStep.h
@@ -1,16 +1,13 @@
#pragma once
#include "CCLinkIEControl.h"
+#include "CAttributeVector.h"
+#include "ToolUnits.h"
+#include <map>
namespace SERVO {
#define STEP_EVENT_READDATA 0x01
#define STEP_EVENT_COMPLETE 0x02
-
- typedef std::function<void(void* pStep, int code, void* pData)> ONSTEPEVENT;
- typedef struct _StepListener
- {
- ONSTEPEVENT onEvent;
- } StepListener;
class CEquipment;
class CStep
@@ -20,42 +17,36 @@
virtual ~CStep();
public:
- unsigned WorkingProc();
- void setListener(StepListener listener);
void setCcLink(CCCLinkIEControl* pCcLink);
void setEquipment(CEquipment* pEquipment);
CEquipment* getEquipment();
+ void setID(int id);
+ int getID();
void setName(const char* pszName);
std::string& getName();
- virtual void setWriteSignalDev(int dev);
+ CAttributeVector& attributeVector();
+ virtual void getAttributeVector(CAttributeVector& attrubutes);
virtual void init();
- virtual void CStep::term();
- virtual void onSignal(BOOL bSignal);
- virtual int onReadData();
- virtual int onComplete();
- virtual int onTimeout();
+ virtual void term();
+ void setProp(const char* pszKey, void* pValue);
+ void* getProp(const char* pszKey);
+ void addAttribute(CAttribute* pAttribute);
+ void addAttributeVector(CAttributeVector& attributeVector);
protected:
inline void Lock() { EnterCriticalSection(&m_criticalSection); }
inline void Unlock() { LeaveCriticalSection(&m_criticalSection); }
- inline void nextStep();
- inline void resetStep();
+ void convertString(const char* pszBuffer, int size, std::string& strOut);
protected:
- StepListener m_listener;
+ int m_nID;
StationIdentifier m_station;
std::string m_strName;
CEquipment* m_pEquipment;
CCCLinkIEControl* m_pCclink;
CRITICAL_SECTION m_criticalSection;
- std::string strName;
- HANDLE m_hWorkThreadHandle;
- unsigned m_nWordThreadAddr;
- HANDLE m_hWorkStop;
- HANDLE m_hSignalOn;
- HANDLE m_hSignalOff;
- int m_nCurStep;
- int m_nWriteSignalDev; // 对方BIT地址
+ std::map<std::string, void*> m_mapProp;
+ CAttributeVector m_attributeVector;
};
}
--
Gitblit v1.9.3