From 34f6893ffa45a2eeb3636605d5b7c6289d879aa4 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期六, 20 九月 2025 13:42:48 +0800
Subject: [PATCH] 1.修复和测试Bath调度，更新数据应用到Master时出错的问题；
---
SourceCode/Bond/Servo/CGlass.cpp | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/SourceCode/Bond/Servo/CGlass.cpp b/SourceCode/Bond/Servo/CGlass.cpp
index b249b79..f7e71ca 100644
--- a/SourceCode/Bond/Servo/CGlass.cpp
+++ b/SourceCode/Bond/Servo/CGlass.cpp
@@ -1,5 +1,6 @@
#include "stdafx.h"
#include "CGlass.h"
+#include "Log.h"
namespace SERVO {
@@ -31,6 +32,7 @@
if (m_pBuddy != nullptr) {
m_pBuddy->release();
+ m_pBuddy = nullptr;
}
}
@@ -115,12 +117,12 @@
CPath* pTemp = m_pPath;
while (pTemp != nullptr) {
pTemp->getSimpleDescription(strPath);
- strOut.append(strPath);
+ if (strPath.compare("ARM1") != 0 && strPath.compare("ARM2") != 0) {
+ if (!strOut.empty()) strOut.append(" -> ");
+ strOut.append(strPath);
+ }
pTemp = pTemp->getNext();
- if (pTemp != nullptr) {
- strOut.append(" -> ");
- }
}
return strOut;
@@ -140,9 +142,9 @@
return nullptr;
}
- void CGlass::addPath(unsigned int nEqId, unsigned int nUnit)
+ void CGlass::addPath(unsigned int nEqId, unsigned int nUnit, unsigned int slot)
{
- CPath* pPath = new CPath(nEqId, nUnit);
+ CPath* pPath = new CPath(nEqId, nUnit, slot);
if (m_pPath == nullptr) {
m_pPath = pPath;
}
@@ -320,8 +322,10 @@
}
bool CGlass::queue() {
+ LOGI("CGlass::queue 01 %s", m_strID.c_str());
if (m_state != GlsState::NoState) return false;
markQueued();
+ LOGI("CGlass::queue 02 %s", m_strID.c_str());
return true;
}
@@ -346,9 +350,11 @@
}
bool CGlass::complete() {
+ LOGI("CGlass::complete 01 %s", m_strID.c_str());
if (m_state != GlsState::InProcess && m_state != GlsState::Paused) return false;
m_state = GlsState::Completed;
markEnd();
+ LOGI("CGlass::complete 02 %s", m_strID.c_str());
return true;
}
--
Gitblit v1.9.3