Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make Player and Recorder Composable (#902) #1419

Merged
merged 62 commits into from
Dec 11, 2023
Merged
Changes from 1 commit
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
f50821d
Squasgh to ease rebase
roncapat Jul 13, 2023
a08c5d1
Remove TODO for keyboard handlers
roncapat Sep 27, 2023
26ecb08
Change structure
roncapat Sep 27, 2023
c89ce76
Fix
roncapat Sep 27, 2023
2ada177
Fix
roncapat Sep 27, 2023
2c80a2a
QoS parsing
roncapat Sep 27, 2023
3d7f98d
Fix
roncapat Sep 27, 2023
f1e0340
Uncrustify
roncapat Sep 27, 2023
1899416
Draft comparison of passed vs parsed params
roncapat Sep 30, 2023
ee37afc
Fix shared_from_this() issue, param file & paths
roncapat Oct 1, 2023
863ab6b
Fixes after rebase
roncapat Nov 10, 2023
4e65cf0
Fixes to handle durations
roncapat Nov 10, 2023
874d60d
Better test output
roncapat Nov 10, 2023
9f31e3c
Drafting record param test
roncapat Nov 12, 2023
52495f8
Fixing recorder issues
roncapat Nov 13, 2023
645b985
Fixes
roncapat Nov 13, 2023
6287cd6
Draft component load test
roncapat Nov 14, 2023
0aa4cd5
Composition tests working
roncapat Nov 14, 2023
68bfcb4
Uncrustify
roncapat Nov 14, 2023
95c9d13
Cpplint
roncapat Nov 14, 2023
0205966
Cpplint
roncapat Nov 14, 2023
edbb544
Fix play_offset bug
roncapat Nov 20, 2023
490dc48
Fix storage defaults bug
roncapat Nov 20, 2023
21399f2
Get rid of temporal conversion crutches using map<string, Rosbag2QoS>
morlov-apexai Nov 18, 2023
50f0755
Use const ref to node in the options getter functions
morlov-apexai Nov 18, 2023
30b1699
Cleanups in get_storage(/play/record)_options functions
morlov-apexai Nov 18, 2023
cfeb0bb
Move RosBag2RecordTestFixture insight test_record_params.cpp
morlov-apexai Nov 18, 2023
571a25e
Rename overrides.yaml to the qos_profile_overrides.yaml file
morlov-apexai Nov 18, 2023
2aa2f8d
Rename params_player.yaml to the player_node_params.yaml
morlov-apexai Nov 18, 2023
fa6e556
Rename params_recorder.yaml to the recorder_node_params.yaml
morlov-apexai Nov 18, 2023
2d4931c
Replace Rosbag2Duration by rclcpp::Duration
morlov-apexai Nov 18, 2023
b493987
Cleanup in functions which are getting values from node parameters
morlov-apexai Nov 21, 2023
e98be6e
Bugfix. Adjust min-max ranges for get_duration_from_node_param(..)
morlov-apexai Nov 21, 2023
d396e3c
Initial comparisons
roncapat Nov 21, 2023
e588657
Move component manager in fixture
roncapat Nov 21, 2023
fa3eae7
Merge branch 'rolling' into patch-2
roncapat Nov 29, 2023
89b6736
Uncrustify
roncapat Nov 29, 2023
2c70406
Remove residual AMENT_DEPS after merge
roncapat Nov 29, 2023
95ab353
Complete test_play_params
roncapat Nov 29, 2023
913e49f
Finish param tests
roncapat Nov 29, 2023
9756edd
Uncrustify
roncapat Nov 29, 2023
0e57485
Cleanups in player/recorder parameters and load components tests
morlov-apexai Nov 30, 2023
0641884
Renames in player/recorder parameters and load components tests
morlov-apexai Nov 30, 2023
4e3f460
Namespaced parameters
roncapat Dec 6, 2023
04948e3
Fix load_composable_components test
roncapat Dec 6, 2023
1e1d5c3
Automatically start playback in "composable" Player constructor
morlov-apexai Dec 6, 2023
786a08c
Add integration test for composable player
morlov-apexai Dec 6, 2023
a611726
Add missing dependencies to the mock_player.hpp
morlov-apexai Dec 6, 2023
37d7e29
Automatically start recording in "composable" Recorder constructor
morlov-apexai Dec 6, 2023
4da289e
Adopt existent tests for auto starting recording after composition
morlov-apexai Dec 6, 2023
6192305
Add integration test for composable recorder
morlov-apexai Dec 6, 2023
e89614c
Add missed parameters prefixes after rebase
morlov-apexai Dec 6, 2023
8c283b8
Fix for failing test with wrong check for playback_until_timestamp
morlov-apexai Dec 8, 2023
0d446e4
Fix for failing tests with wrong parameters deduction
morlov-apexai Dec 8, 2023
812d9da
Close recorder before trying to delete temp files on test destruction
morlov-apexai Dec 8, 2023
ee16b40
Update rosbag2_transport/test/rosbag2_transport/composition_manager_t…
roncapat Dec 9, 2023
db3aa34
Update rosbag2_transport/test/rosbag2_transport/test_composable_recor…
roncapat Dec 9, 2023
af07a04
Update rosbag2_transport/CMakeLists.txt
roncapat Dec 9, 2023
6f9bbe8
Update rosbag2_transport/CMakeLists.txt
roncapat Dec 9, 2023
723a7a8
Address warnings from Windows CI job in composable player and recorder
morlov-apexai Dec 10, 2023
9110f65
Update rosbag2_transport/src/rosbag2_transport/config_options_from_no…
roncapat Dec 11, 2023
8737b72
Update rosbag2_transport/test/rosbag2_transport/test_composable_playe…
roncapat Dec 11, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Rename overrides.yaml to the qos_profile_overrides.yaml file
Signed-off-by: Michael Orlov <[email protected]>
morlov-apexai authored and roncapat committed Nov 29, 2023
commit 571a25e70a7ba540aa867204d0f5c7df24390434
Original file line number Diff line number Diff line change
@@ -66,7 +66,7 @@ TEST_F(TestComponentManager, test_load_components)
}

rclcpp::Parameter qos_profile_overrides_path("qos_profile_overrides_path",
rclcpp::ParameterValue(_SRC_RESOURCES_DIR_PATH "/overrides.yaml"));
rclcpp::ParameterValue(_SRC_RESOURCES_DIR_PATH "/qos_profile_overrides.yaml"));

rclcpp::Parameter uri("uri",
rclcpp::ParameterValue(_SRC_RESOURCES_DIR_PATH "//sqlite3/test_bag_for_seek"));
@@ -96,7 +96,7 @@ TEST_F(TestComponentManager, test_load_components)
}

rclcpp::Parameter qos_profile_overrides_path("qos_profile_overrides_path",
rclcpp::ParameterValue(_SRC_RESOURCES_DIR_PATH "/overrides.yaml"));
rclcpp::ParameterValue(_SRC_RESOURCES_DIR_PATH "/qos_profile_overrides.yaml"));

request->parameters.push_back(qos_profile_overrides_path.to_parameter_msg());

6 changes: 3 additions & 3 deletions rosbag2_transport/test/rosbag2_transport/test_play_params.cpp
Original file line number Diff line number Diff line change
@@ -38,7 +38,7 @@ TEST_F(RosBag2PlayTestFixture, parse_parameter_from_file) {
});
opts.append_parameter_override(
"qos_profile_overrides_path",
_SRC_RESOURCES_DIR_PATH "/overrides.yaml");
_SRC_RESOURCES_DIR_PATH "/qos_profile_overrides.yaml");
opts.append_parameter_override(
"uri",
_SRC_RESOURCES_DIR_PATH "/sqlite3/test_bag_for_seek");
@@ -51,13 +51,13 @@ TEST_F(RosBag2PlayTestFixture, parse_parameter_from_file) {
storage_options);

auto param_node = YAML::LoadFile(_SRC_RESOURCES_DIR_PATH "/params_player.yaml");
auto qos_node = YAML::LoadFile(_SRC_RESOURCES_DIR_PATH "/overrides.yaml");
auto qos_node = YAML::LoadFile(_SRC_RESOURCES_DIR_PATH "/qos_profile_overrides.yaml");

YAML::Emitter emitter;
emitter
<< YAML::Newline << YAML::Comment("params_player.yaml")
<< param_node << YAML::Newline
<< YAML::Newline << YAML::Comment("overrides.yaml")
<< YAML::Newline << YAML::Comment("qos_profile_overrides.yaml")
<< qos_node << YAML::Newline
<< YAML::Newline << YAML::Comment("node play parameters")
<< yaml_play_opt << YAML::Newline
Original file line number Diff line number Diff line change
@@ -57,7 +57,7 @@ TEST_F(RecordParamsTestFixture, parse_parameter_from_file) {
});
opts.append_parameter_override(
"qos_profile_overrides_path",
_SRC_RESOURCES_DIR_PATH "/overrides.yaml");
_SRC_RESOURCES_DIR_PATH "/qos_profile_overrides.yaml");
opts.append_parameter_override(
"uri",
_SRC_RESOURCES_DIR_PATH "/sqlite3/test_bag_for_seek");
@@ -71,13 +71,13 @@ TEST_F(RecordParamsTestFixture, parse_parameter_from_file) {
storage_options);

auto param_node = YAML::LoadFile(_SRC_RESOURCES_DIR_PATH "/params_recorder.yaml");
auto qos_node = YAML::LoadFile(_SRC_RESOURCES_DIR_PATH "/overrides.yaml");
auto qos_node = YAML::LoadFile(_SRC_RESOURCES_DIR_PATH "/qos_profile_overrides.yaml");

YAML::Emitter emitter;
emitter
<< YAML::Newline << YAML::Comment("params.yaml")
<< param_node << YAML::Newline
<< YAML::Newline << YAML::Comment("overrides.yaml")
<< YAML::Newline << YAML::Comment("qos_profile_overrides.yaml")
<< qos_node << YAML::Newline
<< YAML::Newline << YAML::Comment("node record parameters")
<< yaml_record_opt << YAML::Newline