diff options
| author | David Crocker <dcrocker@eschertech.com> | 2022-02-22 20:09:29 +0300 |
|---|---|---|
| committer | David Crocker <dcrocker@eschertech.com> | 2022-02-22 20:09:29 +0300 |
| commit | e584f0dba4fa7751a45b7dd67b417ac7cb41b8db (patch) | |
| tree | c16eec22e0f55eff46692ce57fc139dded8c8760 | |
| parent | 36c6c6d4248e253f5dc6eb5490b89172cdf0c5a9 (diff) | |
Populate boards[].name for expansion boards3.4.0rc2
| -rw-r--r-- | src/CAN/ExpansionManager.cpp | 3 | ||||
| -rw-r--r-- | src/ObjectModel/ObjectModel.cpp | 3 | ||||
| -rw-r--r-- | src/ObjectModel/ObjectModel.h | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/src/CAN/ExpansionManager.cpp b/src/CAN/ExpansionManager.cpp index 60ca48af..7e78157f 100644 --- a/src/CAN/ExpansionManager.cpp +++ b/src/CAN/ExpansionManager.cpp @@ -35,6 +35,7 @@ constexpr ObjectModelTableEntry ExpansionManager::objectModelTable[] = { "firmwareVersion", OBJECT_MODEL_FUNC(self->FindIndexedBoard(context.GetLastIndex()).typeName, ExpansionDetail::firmwareVersion), ObjectModelEntryFlags::none }, { "maxMotors", OBJECT_MODEL_FUNC((int32_t)self->FindIndexedBoard(context.GetLastIndex()).numDrivers), ObjectModelEntryFlags::none }, { "mcuTemp", OBJECT_MODEL_FUNC_IF(self->FindIndexedBoard(context.GetLastIndex()).hasMcuTemp, self, 1), ObjectModelEntryFlags::live }, + { "name", OBJECT_MODEL_FUNC(self->FindIndexedBoard(context.GetLastIndex()).typeName, ExpansionDetail::longName), ObjectModelEntryFlags::none }, { "shortName", OBJECT_MODEL_FUNC(self->FindIndexedBoard(context.GetLastIndex()).typeName, ExpansionDetail::shortName), ObjectModelEntryFlags::none }, { "state", OBJECT_MODEL_FUNC(self->FindIndexedBoard(context.GetLastIndex()).state.ToString()), ObjectModelEntryFlags::none }, { "uniqueId", OBJECT_MODEL_FUNC_IF(self->FindIndexedBoard(context.GetLastIndex()).uniqueId.IsValid(), @@ -69,7 +70,7 @@ constexpr ObjectModelTableEntry ExpansionManager::objectModelTable[] = constexpr uint8_t ExpansionManager::objectModelTableDescriptor[] = { 6, // number of sections - 13, // section 0: boards[] + 14, // section 0: boards[] 3, // section 1: mcuTemp 3, // section 2: vIn 3, // section 3: v12 diff --git a/src/ObjectModel/ObjectModel.cpp b/src/ObjectModel/ObjectModel.cpp index 714f4470..6376f1e3 100644 --- a/src/ObjectModel/ObjectModel.cpp +++ b/src/ObjectModel/ObjectModel.cpp @@ -213,6 +213,9 @@ void ExpressionValue::ExtractRequestedPart(const StringRef& rslt) const noexcept switch((ExpansionDetail)param) { + case ExpansionDetail::longName: + rslt.cat("Duet 3 Expansion "); + // no break case ExpansionDetail::shortName: rslt.catn(sVal, indexOfDivider1); break; diff --git a/src/ObjectModel/ObjectModel.h b/src/ObjectModel/ObjectModel.h index 5a9227f2..a957aff6 100644 --- a/src/ObjectModel/ObjectModel.h +++ b/src/ObjectModel/ObjectModel.h @@ -56,7 +56,7 @@ class CanExpansionBoardDetails; enum class ExpansionDetail : uint32_t { - shortName, firmwareVersion, firmwareFileName, firmwareDate + shortName, firmwareVersion, firmwareFileName, firmwareDate, longName }; #endif |