greek64/rtps-fpga
2
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

BUG FIX: Service uses 2 seperate Typenames for Request/response

Browse Source
This commit is contained in:
Greek 2022-01-28 10:19:52 +01:00 committed by Greek64
parent 854b62a379
commit a2e00cf0f5
6 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/ros2/TEMPLATE_ros_config.vhd
View File

@ -60,7 +60,8 @@ package ros_config is
0 => ( 0 => (
node_id => 0, node_id => 0,
SERVICENAME => gen_user_string("Service1"), SERVICENAME => gen_user_string("Service1"),
TYPENAME => gen_user_string("Type3"), RQ_TYPENAME => gen_user_string("Type3_Request"),
RR_TYPENAME => gen_user_string("Type3_Response"),
QOS => ROS_QOS_PROFILE_SERVICES_DEFAULT, QOS => ROS_QOS_PROFILE_SERVICES_DEFAULT,
MAX_RQ_SIZE => 10, MAX_RQ_SIZE => 10,
MAX_RR_SIZE => 10, MAX_RR_SIZE => 10,

3
src/ros2/Tests/Level_2/L2_Testbench_ROS_Lib2_config.vhd
View File

@ -61,7 +61,8 @@ package ros_config is
0 => ( 0 => (
node_id => 0, node_id => 0,
SERVICENAME => gen_user_string("add_two_ints"), SERVICENAME => gen_user_string("add_two_ints"),
TYPENAME => gen_user_string("example_interfaces::srv::dds_::AddTwoInts_Request_"), RQ_TYPENAME => gen_user_string("example_interfaces::srv::dds_::AddTwoInts_Request_"),
RR_TYPENAME => gen_user_string("example_interfaces::srv::dds_::AddTwoInts_Response_"),
QOS => ROS_QOS_PROFILE_TRANSIENT, QOS => ROS_QOS_PROFILE_TRANSIENT,
MAX_RQ_SIZE => MAX_ADDTWOINTS_RQ_SIZE, MAX_RQ_SIZE => MAX_ADDTWOINTS_RQ_SIZE,
MAX_RR_SIZE => MAX_ADDTWOINTS_RR_SIZE, MAX_RR_SIZE => MAX_ADDTWOINTS_RR_SIZE,

3
src/ros2/Tests/Level_2/L2_Testbench_ROS_Lib3_config.vhd
View File

@ -61,7 +61,8 @@ package ros_config is
0 => ( 0 => (
node_id => 0, node_id => 0,
SERVICENAME => gen_user_string("add_two_ints"), SERVICENAME => gen_user_string("add_two_ints"),
TYPENAME => gen_user_string("example_interfaces::srv::dds_::AddTwoInts_Request_"), RQ_TYPENAME => gen_user_string("example_interfaces::srv::dds_::AddTwoInts_Request_"),
RR_TYPENAME => gen_user_string("example_interfaces::srv::dds_::AddTwoInts_Response_"),
QOS => ROS_QOS_PROFILE_TRANSIENT, QOS => ROS_QOS_PROFILE_TRANSIENT,
MAX_RQ_SIZE => MAX_ADDTWOINTS_RQ_SIZE, MAX_RQ_SIZE => MAX_ADDTWOINTS_RQ_SIZE,
MAX_RR_SIZE => MAX_ADDTWOINTS_RR_SIZE, MAX_RR_SIZE => MAX_ADDTWOINTS_RR_SIZE,

6
src/ros2/dds_user_config.vhd
View File

@ -132,14 +132,15 @@ package body user_config is
ret(index) := DEFAULT_READER_CONFIG; ret(index) := DEFAULT_READER_CONFIG;
set_from_qos_profile(ROS_SERVICES(i).QOS, ret(index)); set_from_qos_profile(ROS_SERVICES(i).QOS, ret(index));
set_sim_timing(ret(index),SIMULATION_TIMING); set_sim_timing(ret(index),SIMULATION_TIMING);
ret(index).TYPENAME := ROS_SERVICES(i).TYPENAME;
tmp := gen_fqn(ROS_NODES(ROS_SERVICES(i).node_id).namespace, ROS_NODES(ROS_SERVICES(i).node_id).name, ROS_SERVICES(i).SERVICENAME); tmp := gen_fqn(ROS_NODES(ROS_SERVICES(i).node_id).namespace, ROS_NODES(ROS_SERVICES(i).node_id).name, ROS_SERVICES(i).SERVICENAME);
if (ROS_SERVICES(i).is_client) then if (ROS_SERVICES(i).is_client) then
ret(index).TOPICNAME := concat("rr",concat(tmp,"Reply")); ret(index).TOPICNAME := concat("rr",concat(tmp,"Reply"));
ret(index).MAX_PAYLOAD_SIZE := ROS_SERVICES(i).MAX_RR_SIZE; ret(index).MAX_PAYLOAD_SIZE := ROS_SERVICES(i).MAX_RR_SIZE;
ret(index).TYPENAME := ROS_SERVICES(i).RR_TYPENAME;
else else
ret(index).TOPICNAME := concat("rq",concat(tmp,"Request")); ret(index).TOPICNAME := concat("rq",concat(tmp,"Request"));
ret(index).MAX_PAYLOAD_SIZE := ROS_SERVICES(i).MAX_RQ_SIZE; ret(index).MAX_PAYLOAD_SIZE := ROS_SERVICES(i).MAX_RQ_SIZE;
ret(index).TYPENAME := ROS_SERVICES(i).RQ_TYPENAME;
end if; end if;
index := index + 1; index := index + 1;
end loop; end loop;
@ -163,14 +164,15 @@ package body user_config is
ret(index) := DEFAULT_WRITER_CONFIG; ret(index) := DEFAULT_WRITER_CONFIG;
set_from_qos_profile(ROS_SERVICES(i).QOS, ret(index)); set_from_qos_profile(ROS_SERVICES(i).QOS, ret(index));
set_sim_timing(ret(index),SIMULATION_TIMING); set_sim_timing(ret(index),SIMULATION_TIMING);
ret(index).TYPENAME := ROS_SERVICES(i).TYPENAME;
tmp := gen_fqn(ROS_NODES(ROS_SERVICES(i).node_id).namespace, ROS_NODES(ROS_SERVICES(i).node_id).name, ROS_SERVICES(i).SERVICENAME); tmp := gen_fqn(ROS_NODES(ROS_SERVICES(i).node_id).namespace, ROS_NODES(ROS_SERVICES(i).node_id).name, ROS_SERVICES(i).SERVICENAME);
if (ROS_SERVICES(i).is_client) then if (ROS_SERVICES(i).is_client) then
ret(index).TOPICNAME := concat("rq",concat(tmp,"Request")); ret(index).TOPICNAME := concat("rq",concat(tmp,"Request"));
ret(index).MAX_PAYLOAD_SIZE := ROS_SERVICES(i).MAX_RQ_SIZE; ret(index).MAX_PAYLOAD_SIZE := ROS_SERVICES(i).MAX_RQ_SIZE;
ret(index).TYPENAME := ROS_SERVICES(i).RQ_TYPENAME;
else else
ret(index).TOPICNAME := concat("rr",concat(tmp,"Reply")); ret(index).TOPICNAME := concat("rr",concat(tmp,"Reply"));
ret(index).MAX_PAYLOAD_SIZE := ROS_SERVICES(i).MAX_RR_SIZE; ret(index).MAX_PAYLOAD_SIZE := ROS_SERVICES(i).MAX_RR_SIZE;
ret(index).TYPENAME := ROS_SERVICES(i).RR_TYPENAME;
end if; end if;
index := index + 1; index := index + 1;
end loop; end loop;

3
src/ros2/ros_package.vhd
View File

@ -129,7 +129,8 @@ package ros_package is
type ROS_SERVICE_TYPE is record type ROS_SERVICE_TYPE is record
node_id : natural; node_id : natural;
SERVICENAME : USER_STRING_TYPE; SERVICENAME : USER_STRING_TYPE;
TYPENAME : USER_STRING_TYPE; RQ_TYPENAME : USER_STRING_TYPE;
RR_TYPENAME : USER_STRING_TYPE;
QOS : ROS_QOS_PROFILE_TYPE; QOS : ROS_QOS_PROFILE_TYPE;
MAX_RQ_SIZE : natural; MAX_RQ_SIZE : natural;
MAX_RR_SIZE : natural; MAX_RR_SIZE : natural;

3
syn/syn_ros_service_config.vhd
View File

@ -61,7 +61,8 @@ package ros_config is
0 => ( 0 => (
node_id => 0, node_id => 0,
SERVICENAME => gen_user_string("add_two_ints"), SERVICENAME => gen_user_string("add_two_ints"),
TYPENAME => gen_user_string("example_interfaces::srv::dds_::AddTwoInts_Request_"), RQ_TYPENAME => gen_user_string("example_interfaces::srv::dds_::AddTwoInts_Request_"),
RR_TYPENAME => gen_user_string("example_interfaces::srv::dds_::AddTwoInts_Response_"),
QOS => ROS_QOS_PROFILE_SERVICES_DEFAULT, QOS => ROS_QOS_PROFILE_SERVICES_DEFAULT,
MAX_RQ_SIZE => MAX_ADDTWOINTS_RQ_SIZE, MAX_RQ_SIZE => MAX_ADDTWOINTS_RQ_SIZE,
MAX_RR_SIZE => MAX_ADDTWOINTS_RR_SIZE, MAX_RR_SIZE => MAX_ADDTWOINTS_RR_SIZE,