diff --git a/roseus_bt/include/roseus_bt/xml_parser.h b/roseus_bt/include/roseus_bt/xml_parser.h index 38281ba82..0ecb342b4 100644 --- a/roseus_bt/include/roseus_bt/xml_parser.h +++ b/roseus_bt/include/roseus_bt/xml_parser.h @@ -164,6 +164,7 @@ void XMLParser::check_xml_file(std::string filename) { name != "RemoteCondition" && name != "Subscriber" && name != "RemoteSubscriber" && + name != "SubTreePlus" && name != "SubTree") { throw XMLError::UnknownNode(node); } diff --git a/roseus_bt/sample/README.md b/roseus_bt/sample/README.md index 43e9cad30..36b272a6e 100644 --- a/roseus_bt/sample/README.md +++ b/roseus_bt/sample/README.md @@ -148,7 +148,7 @@ rosrun groot Groot The fifth example https://github.com/Affonso-Gui/jsk_roseus/blob/roseus_bt/roseus_bt/sample/models/t05_subtrees.xml wraps up the previous task in a subtree and adds another example task. -Nested trees can be defined with multiple `` tags and referenced with the `` tag. +Nested trees can be defined with multiple `` tags and referenced with the `` or `` tag. The `` allows for passing both port mappings and/or static values to the subtree, and should be generally preferred over the `` notation. Each subtree inherits a separate blackboard and accepts remaps in the `inner_name="outer_name"` syntax. diff --git a/roseus_bt/sample/models/t05_subtrees.xml b/roseus_bt/sample/models/t05_subtrees.xml index 3b6787b1b..745a24dbf 100644 --- a/roseus_bt/sample/models/t05_subtrees.xml +++ b/roseus_bt/sample/models/t05_subtrees.xml @@ -6,8 +6,8 @@ - - + + @@ -37,8 +37,8 @@ - - + + diff --git a/roseus_bt/sample/models/t06_reactive.xml b/roseus_bt/sample/models/t06_reactive.xml index 68d056e81..a5c996f42 100644 --- a/roseus_bt/sample/models/t06_reactive.xml +++ b/roseus_bt/sample/models/t06_reactive.xml @@ -9,9 +9,9 @@ - + - + @@ -39,10 +39,10 @@ - + - - + + diff --git a/roseus_bt/sample/models/t07_xacro.xml.xacro b/roseus_bt/sample/models/t07_xacro.xml.xacro index a7c5cd7b5..7111559e5 100644 --- a/roseus_bt/sample/models/t07_xacro.xml.xacro +++ b/roseus_bt/sample/models/t07_xacro.xml.xacro @@ -14,8 +14,8 @@ - - + + @@ -25,8 +25,8 @@ - - + +