From a27262246e7205a605329d9392a21cf4facb3f68 Mon Sep 17 00:00:00 2001 From: Jean-Michel DECORET Date: Thu, 28 Nov 2019 07:57:25 +0100 Subject: [PATCH 1/3] Make Metadata functions static Convert function (to manage MetaDataField to/from Int) has static --- cpp/src/Node.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cpp/src/Node.h b/cpp/src/Node.h index 374b7bc49b..89a5ba28fe 100644 --- a/cpp/src/Node.h +++ b/cpp/src/Node.h @@ -902,8 +902,8 @@ namespace OpenZWave string description; }; string const GetMetaData(MetaDataFields); - MetaDataFields GetMetaDataId(string); - string const GetMetaDataString(MetaDataFields); + static MetaDataFields GetMetaDataId(string); + static string const GetMetaDataString(MetaDataFields); ChangeLogEntry const GetChangeLog(uint32_t); private: From 6ad1a3a2268176f0504fe230ccfc7c51b0e970bd Mon Sep 17 00:00:00 2001 From: Jean-Michel DECORET Date: Fri, 29 Nov 2019 10:17:24 +0100 Subject: [PATCH 2/3] Add Metadata (from/to string) methods into Manager --- cpp/src/Manager.cpp | 19 +++++++++++++++++++ cpp/src/Manager.h | 12 ++++++++++++ 2 files changed, 31 insertions(+) diff --git a/cpp/src/Manager.cpp b/cpp/src/Manager.cpp index f6966b24c0..9d7f2fd6ec 100644 --- a/cpp/src/Manager.cpp +++ b/cpp/src/Manager.cpp @@ -4821,6 +4821,25 @@ if (Driver* driver = GetDriver(_homeId)) return ""; } +//----------------------------------------------------------------------------- +// +// Retrieve metadata from its name +//----------------------------------------------------------------------------- +Node::MetaDataFields Manager::GetMetaDataId(const string& metaDataFiledtoParse) +{ + return Node::GetMetaDataId(metaDataFiledtoParse); +} + + +//----------------------------------------------------------------------------- +// +// Get the MetaData string representation +//----------------------------------------------------------------------------- +string const Manager::GetMetaDataString(Node::MetaDataFields metaData) +{ + return Node::GetMetaDataString(metaData); +} + //----------------------------------------------------------------------------- // // Retrieve ChangeLog of a Configuration File about a Node. diff --git a/cpp/src/Manager.h b/cpp/src/Manager.h index 3abe392f53..08fe45f0bd 100644 --- a/cpp/src/Manager.h +++ b/cpp/src/Manager.h @@ -2645,6 +2645,18 @@ namespace OpenZWave * \return a string containing the requested metadata */ string const GetMetaData(uint32 const _homeId, uint8 const _nodeId, Node::MetaDataFields _metadata); + /** + * \brief Retrieve metadata from its name + * \param metaDataFiledtoParse the string to parse (careful, case sensitive) + * \return the found metaDataField if parsing is successful, or MetaData_Invalid + */ + Node::MetaDataFields GetMetaDataId(const string & metaDataFiledtoParse); + /** + * \brief Get the MetaData string representation + * \param metaData the metaData enum + * \return the metaData name (or empty string if not found) + */ + string const GetMetaDataString(Node::MetaDataFields metaData); /** * \brief Retrieve ChangeLogs about a configuration revision * \param _homeId The Home ID of the driver for the node From 769cafd1eea79affabe094fbf72c1a4a40fe68cb Mon Sep 17 00:00:00 2001 From: Jean-Michel DECORET Date: Mon, 2 Dec 2019 10:07:54 +0100 Subject: [PATCH 3/3] Fix typo --- cpp/src/Manager.cpp | 4 ++-- cpp/src/Manager.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cpp/src/Manager.cpp b/cpp/src/Manager.cpp index 9d7f2fd6ec..1c8aa12016 100644 --- a/cpp/src/Manager.cpp +++ b/cpp/src/Manager.cpp @@ -4825,9 +4825,9 @@ return ""; // // Retrieve metadata from its name //----------------------------------------------------------------------------- -Node::MetaDataFields Manager::GetMetaDataId(const string& metaDataFiledtoParse) +Node::MetaDataFields Manager::GetMetaDataId(const string& metaDataFiledToParse) { - return Node::GetMetaDataId(metaDataFiledtoParse); + return Node::GetMetaDataId(metaDataFiledToParse); } diff --git a/cpp/src/Manager.h b/cpp/src/Manager.h index 08fe45f0bd..1a77cd57f8 100644 --- a/cpp/src/Manager.h +++ b/cpp/src/Manager.h @@ -2647,10 +2647,10 @@ namespace OpenZWave string const GetMetaData(uint32 const _homeId, uint8 const _nodeId, Node::MetaDataFields _metadata); /** * \brief Retrieve metadata from its name - * \param metaDataFiledtoParse the string to parse (careful, case sensitive) + * \param metaDataFiledToParse the string to parse (careful, case sensitive) * \return the found metaDataField if parsing is successful, or MetaData_Invalid */ - Node::MetaDataFields GetMetaDataId(const string & metaDataFiledtoParse); + Node::MetaDataFields GetMetaDataId(const string & metaDataFiledToParse); /** * \brief Get the MetaData string representation * \param metaData the metaData enum