Skip to content
Merged
Changes from all commits
Commits
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
32 changes: 31 additions & 1 deletion mavros/src/lib/mavros_uas.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ using plugin::Plugin;
using plugin::PluginFactory;
using utils::enum_value;

static bool pattern_match(const std::string & pattern, const std::string & pl_name);

UAS::UAS(
const rclcpp::NodeOptions & options_,
const std::string & name_,
Expand Down Expand Up @@ -154,7 +156,35 @@ UAS::UAS(
plugin_denylist.emplace_back("*");
}

for (auto & name : plugin_factory_loader.getDeclaredClasses()) {
const auto declared_plugins = plugin_factory_loader.getDeclaredClasses();
const auto warn_unmatched_plugin_patterns =
[this, &declared_plugins](
const StrV & patterns,
const std::string & parameter_name)
{
for (auto & pattern : patterns) {
bool matched = false;

for (auto & plugin : declared_plugins) {
if (pattern_match(pattern, plugin)) {
matched = true;
break;
}
}

if (!matched) {
RCLCPP_WARN(
get_logger(),
"%s pattern '%s' does not match any declared plugin",
parameter_name.c_str(), pattern.c_str());
}
}
};

warn_unmatched_plugin_patterns(plugin_allowlist, "plugin_allowlist");
warn_unmatched_plugin_patterns(plugin_denylist, "plugin_denylist");

for (auto & name : declared_plugins) {
add_plugin(name);
}

Expand Down
Loading