From 2a803976ed12e59f3e082e7c08941ef5004e6ea1 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期二, 20 五月 2025 11:40:10 +0800
Subject: [PATCH] 1. 添加机器臂命令配置界面
---
SourceCode/Bond/Servo/CMaster.cpp | 42 +++++++++++++++++++++++++-----------------
1 files changed, 25 insertions(+), 17 deletions(-)
diff --git a/SourceCode/Bond/Servo/CMaster.cpp b/SourceCode/Bond/Servo/CMaster.cpp
index 6394380..29ba607 100644
--- a/SourceCode/Bond/Servo/CMaster.cpp
+++ b/SourceCode/Bond/Servo/CMaster.cpp
@@ -34,11 +34,6 @@
CMaster::~CMaster()
{
- for (auto item : m_listEquipment) {
- delete item;
- }
- m_listEquipment.clear();
-
if (m_hEventReadBitsThreadExit[0] != nullptr) {
::CloseHandle(m_hEventReadBitsThreadExit[0]);
m_hEventReadBitsThreadExit[0] = nullptr;
@@ -180,6 +175,11 @@
saveCache();
+ for (auto item : m_listEquipment) {
+ delete item;
+ }
+ m_listEquipment.clear();
+
return 0;
}
@@ -304,8 +304,8 @@
CFliper* pEquipment = new CFliper();
pEquipment->setID(EQ_ID_FLIPER);
pEquipment->setBaseAlarmId(BASE_ALARM_EFEM);
- pEquipment->setName("Fliper");
- pEquipment->setDescription("Fliper.");
+ pEquipment->setName("Fliper(G2)");
+ pEquipment->setDescription("Fliper(G2).");
pEquipment->setReadBitBlock(0x4000, 0x45ff);
pEquipment->setStation(0, 255);
addToEquipmentList(pEquipment);
@@ -321,8 +321,8 @@
CVacuumBake* pEquipment = new CVacuumBake();
pEquipment->setID(EQ_ID_VACUUMBAKE);
pEquipment->setBaseAlarmId(BASE_ALARM_EFEM);
- pEquipment->setName("VacuumBake");
- pEquipment->setDescription("VacuumBake.");
+ pEquipment->setName("VacuumBake(G1)");
+ pEquipment->setDescription("VacuumBake(G1).");
pEquipment->setReadBitBlock(0x4000, 0x45ff);
pEquipment->setStation(0, 255);
addToEquipmentList(pEquipment);
@@ -602,15 +602,23 @@
int CMaster::readCache()
{
- CFile file;
- if (!file.Open(m_strFilepath.c_str(), CFile::modeRead)) {
- return -1;
- }
+ try {
+ CFile file;
+ if (!file.Open(m_strFilepath.c_str(), CFile::modeRead)) {
+ return -1;
+ }
- CArchive ar(&file, CArchive::load);
- serialize(ar);
- ar.Close();
- file.Close();
+ CArchive ar(&file, CArchive::load);
+ serialize(ar);
+ ar.Close();
+ file.Close();
+ }
+ catch (CFileException* e) {
+ TCHAR szErr[512];
+ e->GetErrorMessage(szErr, 512);
+ AfxMessageBox(szErr);
+ e->Delete();
+ }
return 0;
}
--
Gitblit v1.9.3