From 43eecd151c04515b996c087a2972ed45d1e32907 Mon Sep 17 00:00:00 2001 From: Alexander Entinger Date: Mon, 9 Jan 2023 07:34:36 +0100 Subject: [PATCH] Rename API to create_service_server to be consistent with create_service_client. --- .../OpenCyphal-Service-Server/OpenCyphal-Service-Server.ino | 2 +- src/Node.hpp | 6 +++--- src/Node.ipp | 6 +++--- src/nodeinfo/NodeInfo.cpp | 2 +- src/register/RegisterList.cpp | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/examples/OpenCyphal-Service-Server/OpenCyphal-Service-Server.ino b/examples/OpenCyphal-Service-Server/OpenCyphal-Service-Server.ino index ab241019..fdb61618 100644 --- a/examples/OpenCyphal-Service-Server/OpenCyphal-Service-Server.ino +++ b/examples/OpenCyphal-Service-Server/OpenCyphal-Service-Server.ino @@ -52,7 +52,7 @@ Node::Heap node_heap; CircularBuffer::Heap node_rx_queue; Node node_hdl(node_heap.data(), node_heap.size(), node_rx_queue.data(), node_rx_queue.size(), micros); -ServiceServer execute_command_srv = node_hdl.create_service, ExecuteCommand_1_0::Response<>>( +ServiceServer execute_command_srv = node_hdl.create_service_server, ExecuteCommand_1_0::Response<>>( ExecuteCommand_1_0::Request<>::PORT_ID, 2*1000*1000UL, onExecuteCommand_1_0_Request_Received); diff --git a/src/Node.hpp b/src/Node.hpp index 3ccf410b..2d8708ca 100644 --- a/src/Node.hpp +++ b/src/Node.hpp @@ -82,9 +82,9 @@ class Node OnReceiveCb&& on_receive_cb); template - ServiceServer create_service(CanardPortID const port_id, - CanardMicrosecond const tx_timeout_usec, - OnRequestCb&& on_request_cb); + ServiceServer create_service_server(CanardPortID const port_id, + CanardMicrosecond const tx_timeout_usec, + OnRequestCb&& on_request_cb); template ServiceClient create_service_client(CanardPortID const port_id, diff --git a/src/Node.ipp b/src/Node.ipp index ac52e2f6..9aa17844 100644 --- a/src/Node.ipp +++ b/src/Node.ipp @@ -44,9 +44,9 @@ Subscription Node::create_subscription(CanardPortID const port_id, } template -ServiceServer Node::create_service(CanardPortID const port_id, - CanardMicrosecond const tx_timeout_usec, - OnRequestCb&& on_request_cb) +ServiceServer Node::create_service_server(CanardPortID const port_id, + CanardMicrosecond const tx_timeout_usec, + OnRequestCb&& on_request_cb) { auto srv = std::make_shared>( *this, diff --git a/src/nodeinfo/NodeInfo.cpp b/src/nodeinfo/NodeInfo.cpp index b390c140..40237054 100644 --- a/src/nodeinfo/NodeInfo.cpp +++ b/src/nodeinfo/NodeInfo.cpp @@ -45,7 +45,7 @@ NodeInfo::NodeInfo(Node & node_hdl, typedef uavcan::node::GetInfo_1_0::Request<> TGetInfoRequest; typedef uavcan::node::GetInfo_1_0::Response<> TGetInfoResponse; - _node_info_srv = node_hdl.create_service( + _node_info_srv = node_hdl.create_service_server( TGetInfoRequest::PORT_ID, 2*1000*1000UL, [this](TGetInfoRequest const & req) -> TGetInfoResponse diff --git a/src/register/RegisterList.cpp b/src/register/RegisterList.cpp index 6e17ead6..32ac5f52 100644 --- a/src/register/RegisterList.cpp +++ b/src/register/RegisterList.cpp @@ -229,7 +229,7 @@ RegisterList::RegisterList(Node & node_hdl) }; - _reg_list_srv = node_hdl.create_service( + _reg_list_srv = node_hdl.create_service_server( TListRequest::PORT_ID, 2*1000*1000UL, [this](TListRequest const & req) @@ -238,7 +238,7 @@ RegisterList::RegisterList(Node & node_hdl) }); - _reg_access_srv = node_hdl.create_service( + _reg_access_srv = node_hdl.create_service_server( TAccessRequest::PORT_ID, 2*1000*1000UL, [this](TAccessRequest const & req)