timur/ADC
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

...

Browse Source
This commit is contained in:
Timur A. Fatkhullin 2024-12-15 10:33:13 +03:00
parent c45dceaf0e
commit b7e88b36ce
2 changed files with 39 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
device/adc_device_attribute.h
View File

@ -739,8 +739,6 @@ protected:
if constexpr (!std::is_same_v<VT, elem_t>) { if constexpr (!std::is_same_v<VT, elem_t>) {
addConvertFunc([](const VT& v) { return static_cast<elem_t>(v); }, addConvertFunc([](const VT& v) { return static_cast<elem_t>(v); },
[](const elem_t& v) { return static_cast<VT>(v); }); [](const elem_t& v) { return static_cast<VT>(v); });
} else {
std::cout << "SKIP! I = " << I << "\n";
} }
setupTrivialConvertFuncImpl<VT, I + 1, TupleT>(); setupTrivialConvertFuncImpl<VT, I + 1, TupleT>();

72
tests/adc_dev_test.cpp
View File

@ -107,28 +107,7 @@ int main()
dev_t dev1("DEV1"); dev_t dev1("DEV1");
int attr1_val = 10; int attr1_val = 10;
dev1.addAttribute( // dev1.addAttribute(
"ATTR1",
[&attr1_val]() {
std::cout << "ATTR1 getter\n";
return attr1_val;
},
[&attr1_val](const int& v) {
std::cout << "ATTR1 setter\n";
attr1_val = v;
});
dev1.addAttribute(
"ATTR2",
[&attr1_val]() {
std::cout << "ATTR2 getter\n";
return attr1_val + 10;
},
[&attr1_val](const int& v) {
std::cout << "ATTR2 setter\n";
attr1_val = v;
},
utils::AdcDefaultValueConverter<>::serialize<dev_t::attribute_t::serialized_t, int>);
// dev1.addAttribute(dev_t::attribute_t::makeArithAttr(
// "ATTR1", // "ATTR1",
// [&attr1_val]() { // [&attr1_val]() {
// std::cout << "ATTR1 getter\n"; // std::cout << "ATTR1 getter\n";
@ -137,34 +116,61 @@ int main()
// [&attr1_val](const int& v) { // [&attr1_val](const int& v) {
// std::cout << "ATTR1 setter\n"; // std::cout << "ATTR1 setter\n";
// attr1_val = v; // attr1_val = v;
// })); // });
// dev1.addAttribute(dev_t::attribute_t::makeArithAttr( // dev1.addAttribute(
// "ATTR2", // "ATTR2",
// [&attr1_val]() { // [&attr1_val]() {
// std::cout << "ATTR2 getter\n"; // std::cout << "ATTR2 getter\n";
// return (long)attr1_val + 10; // return attr1_val + 10;
// }, // },
// [&attr1_val](const long& v) { // [&attr1_val](const int& v) {
// std::cout << "ATTR2 setter\n"; // std::cout << "ATTR2 setter\n";
// attr1_val = v; // attr1_val = v;
// }, // },
// utils::AdcDefaultValueConverter<>::serialize<dev_t::attribute_t::serialized_t, long>)); // utils::AdcDefaultValueConverter<>::serialize<dev_t::attribute_t::serialized_t, int>);
dev1.addAttribute(dev_t::attribute_t::makeArithAttr(
"ATTR1",
[&attr1_val]() {
std::cout << "ATTR1 getter\n";
return attr1_val;
},
[&attr1_val](const int& v) {
std::cout << "ATTR1 setter\n";
attr1_val = v;
}));
dev1.addAttribute(dev_t::attribute_t::makeArithAttr(
"ATTR2",
[&attr1_val]() {
std::cout << "ATTR2 getter\n";
return (long)attr1_val + 10;
},
[&attr1_val](const long& v) {
std::cout << "ATTR2 setter\n";
attr1_val = v;
},
utils::AdcDefaultValueConverter<>::serialize<dev_t::attribute_t::serialized_t, long>));
devs.push_back({&dev1, {'D', '1'}}); devs.push_back({&dev1, {'D', '1'}});
serialized_t sn; serialized_t sn1, sn2;
// std::ranges::copy(std::string_view("ATTR2"), std::back_inserter(sn)); std::ranges::copy(std::string_view("ATTR1"), std::back_inserter(sn1));
std::ranges::copy(std::string_view("ATTR1"), std::back_inserter(sn)); std::ranges::copy(std::string_view("ATTR2"), std::back_inserter(sn2));
devs[0].setAttr(sn, {'7', '7'}); devs[0].setAttr(sn1, {'7', '7'});
auto r = getAttr(0, sn); auto r = getAttr(0, sn1);
std::string rs; std::string rs;
std::ranges::copy(r, std::back_inserter(rs)); std::ranges::copy(r, std::back_inserter(rs));
// std::cout << "ATTR2 = " << rs << "\n";
std::cout << "ATTR1 = " << rs << "\n"; std::cout << "ATTR1 = " << rs << "\n";
devs[0].setAttr(sn2, {'7', '7'});
r = getAttr(0, sn2);
rs.clear();
std::ranges::copy(r, std::back_inserter(rs));
std::cout << "ATTR2 = " << rs << "\n";
return 0; return 0;
} }