From 6dc80508b1c0f431007f8a8c947c152ec00c3d15 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期一, 08 九月 2025 09:24:05 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/CBakeCooling.h | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/Servo/CBakeCooling.h b/SourceCode/Bond/Servo/CBakeCooling.h
index 86edf49..2cb07d6 100644
--- a/SourceCode/Bond/Servo/CBakeCooling.h
+++ b/SourceCode/Bond/Servo/CBakeCooling.h
@@ -22,8 +22,9 @@
virtual void getAttributeVector(CAttributeVector& attrubutes);
virtual int recvIntent(CPin* pPin, CIntent* pIntent);
virtual int getIndexerOperationModeBaseValue();
- virtual short getSlotUnit(short slot) { return slot % 2 == 1 ? 0 : 1; };
+ virtual short getSlotUnit(short slotNo) { return slotNo % 2 == 1 ? 0 : 1; };
virtual bool isSlotProcessed(int slot);
+ virtual int parsingParams(const char* pszData, size_t size, std::vector<CParam>& parsms);
};
}
--
Gitblit v1.9.3