This commit is contained in:
2026-08-11 12:42:16 +03:00
parent 60dbba7a5f
commit 4491f27c68
3 changed files with 94 additions and 4 deletions

View File

@@ -42,6 +42,8 @@ public:
using base_t::isValid;
using base_t::key;
using base_t::value;
using base_t::valueSeq;
AdcNetworkMessage() = default;
@@ -70,6 +72,35 @@ public:
return std::ranges::equal(this->_key, ADCLIB_NETMSG_KEYWORD_GET);
}
error_t fromCharRange(snplib::snplib_input_char_range_c auto&& bytes)
requires(!std::same_as<CharRangeT, std::remove_cvref_t<decltype(bytes)>>)
{
if constexpr (requires(CharRangeT t) { t.clear(std::declval<size_t>()); }) {
this->_ownByteSeq.clear();
} else {
this->_ownByteSeq = CharRangeT();
}
std::ranges::copy(std::forward<decltype(bytes)>(bytes), std::back_inserter(this->_ownByteSeq));
return fromCharRange(this->_ownByteSeq);
}
error_t fromCharRange(CharRangeT& bytes)
{
auto err = base_t::fromCharRange(bytes, {.keyval_delim = ADCLIB_NETMSG_KEYWORD_PARAM_DELIM,
.valseq_delim = ADCLIB_NETMSG_PARAM_PARAM_DELIM});
if (err) {
return err;
}
if (!std::ranges::contains(ADCLIB_NETMSG_VALID_KEYWORDS, key())) {
this->_isValid = false;
// return an error here!!!
}
return {};
}
error_t createACK()
{
@@ -86,33 +117,56 @@ public:
requires(sizeof...(ArgTs) > 0)
error_t createSET(ATTR_NAME_T&& attr_name, ArgTs&&... args)
{
this->_isValid = false;
auto err = this->setKeyValue(ADCLIB_NETMSG_KEYWORD_SET, std::forward<ATTR_NAME_T>(attr_name));
if (err) {
return err;
}
return this->appendValue(std::forward<ArgTs>(args)...);
err = this->appendValue(std::forward<ArgTs>(args)...);
if (err) {
return err;
}
this->_isValid = true;
return err;
}
template <snplib::snplib_serializable_c ATTR_NAME_T, typename... ArgTs>
error_t createGET(ATTR_NAME_T&& attr_name, ArgTs&&... args)
{
this->_isValid = false;
auto err = this->setKeyValue(ADCLIB_NETMSG_KEYWORD_GET, std::forward<ATTR_NAME_T>(attr_name));
if (err) {
return err;
}
this->_isValid = true;
if constexpr (sizeof...(ArgTs)) {
return this->appendValue(std::forward<ArgTs>(args)...);
err = this->appendValue(std::forward<ArgTs>(args)...);
if (err) {
this->_isValid = false;
}
}
return {};
return err;
}
template <snplib::snplib_serializable_c CMD_NAME_T>
error_t createCMD(CMD_NAME_T&& cmd_name)
{
return this->setKeyValue(ADCLIB_NETMSG_KEYWORD_CMD, std::forward<CMD_NAME_T>(cmd_name));
this->_isValid = false;
auto err = this->setKeyValue(ADCLIB_NETMSG_KEYWORD_CMD, std::forward<CMD_NAME_T>(cmd_name));
if (!err) {
this->_isValid = true;
}
return err;
}
};