diff --git a/device/adc_device_command.h b/device/adc_device_command.h index ac2d771..998be3c 100644 --- a/device/adc_device_command.h +++ b/device/adc_device_command.h @@ -52,10 +52,16 @@ public: /* PUBLIC METHODS */ - IdentT ident() const { return ident; } + ident_t ident() const + { + return _ident; + } - void operator()() { _execFunc(); } + void operator()() + { + _execFunc(); + } }; diff --git a/net/adc_device_netserver.h b/net/adc_device_netserver.h index c4b8c4d..fc6e84e 100644 --- a/net/adc_device_netserver.h +++ b/net/adc_device_netserver.h @@ -108,9 +108,10 @@ namespace adc class AdcDeviceNetServer : public AdcGenericNetServer { -protected: +public: typedef std::vector serialized_t; +protected: class DeviceWrapper { public: @@ -134,8 +135,8 @@ protected: DeviceWrapper() : _id() { // null device - std::string_view is{"NULL-DEVICE"}; - std::ranges::copy(_id, std::back_inserter(_id)); + std::string_view id{"NULL-DEVICE"}; + std::ranges::copy(id, std::back_inserter(_id)); }; template , + typename IdSerialT = traits::adc_char_identity, typename AttrIdDeserialT = traits::adc_char_identity, typename CmdIdDeserialT = traits::adc_char_identity> AdcDeviceNetServer& addDevice(DeviceT* dev_ptr, diff --git a/tests/adc_asio_netserver_test.cpp b/tests/adc_asio_netserver_test.cpp index 258619e..1e5f213 100644 --- a/tests/adc_asio_netserver_test.cpp +++ b/tests/adc_asio_netserver_test.cpp @@ -78,7 +78,7 @@ int main(int argc, char* argv[]) // read-only attr dev2.addAttribute({0x1, [&dev1_val1]() { return dev1_val1; }}); // write-only - dev2.addAttribute({0x2, [&dev1_val1](const int& v) { dev1_val1 = v; }}); + dev2.addAttribute({0xff, [&dev1_val1](const int& v) { dev1_val1 = v; }}); /* COMMANDLINE OPTS */ @@ -116,12 +116,15 @@ int main(int argc, char* argv[]) asio::signal_set signals(io_ctx, SIGINT, SIGTERM); signals.async_wait([&](std::error_code, int) { io_ctx.stop(); }); + using server_t = adc::impl::AdcDeviceNetServerASIO; adc::impl::AdcDeviceNetServerASIO server("TEST SRV", io_ctx); server.setupSignals(); server.addDevice(&dev1); - server.addDevice(&dev2, adc::traits::adc_char_identity{}, - adc::utils::AdcDefaultValueConverter<>::serialize); + server.addDevice( + &dev2, {}, + // adc::traits::adc_char_identity{}, + adc::utils::AdcDefaultValueConverter<>::deserialize); auto epnt = opt_result["endpoints"].as>();