First commit with jazzy as default branch. Version 3.0.1 (#657)

brettpac · web-flow · commit fe068fbc02ee · 2025-11-16T16:11:40.000-08:00
* First commit with jazzy as default branch. Version 3.0.1

* Attempted ci-format fix from copliot

* Fixing ci-format issues

* Updating CHANGELOG
diff --git a/.github/workflows/ci-format.yml b/.github/workflows/ci-format.yml
@@ -20,9 +20,8 @@ jobs:
     - name: Install clang-format
       run: |
        apt update
-       apt install -y python3-pip clang-format ros-jazzy-ament-cppcheck
+       apt install -y python3-pip clang-format ros-jazzy-ament-cppcheck pre-commit
        git config --global --add safe.directory `pwd`
-       pip install pre-commit
     - name: pre-commit
       shell: bash
       run: |
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -35,7 +35,7 @@ To send us a pull request, please:
 1. Fork the repository.
 2. Modify the source; please focus on the specific change you are contributing.
   If you also reformat all the code, it will be hard for us to focus on your change.
-3. Ensure local tests pass. (`colcon test` and `pre-commit run -a` (requires you to install pre-commit by `pip3 install pre-commit`)
+3. Ensure local tests pass. (`colcon test` and `pre-commit run -a` (requires you to install pre-commit by `sudo apt install pre-commit` on Ubuntu 24.04+)
 4. Commit to your fork using clear commit messages.
 5. Send a pull request, answering any default questions in the pull request interface.
 6. Pay attention to any automated CI failures reported in the pull request, and stay involved in the conversation.
diff --git a/README.md b/README.md
@@ -29,9 +29,9 @@ ROS 2 Distro | Branch | Build status | Documentation | Released packages
 
 1. [Install ROS 2 Jazzy](https://docs.ros.org/en/jazzy/Installation/Ubuntu-Install-Debians.html).
 
-2. Make sure that `colcon`, its extensions and `vcs` are installed:
+2. Make sure that `colcon`, its extensions, `vcs`, and development tools are installed:
    ```
-   sudo apt install python3-colcon-common-extensions python3-vcstool
+   sudo apt install python3-colcon-common-extensions python3-vcstool clang-format pre-commit
    ```
 3. Create a new ROS 2 workspace if necessary:
    ```
@@ -82,9 +82,9 @@ ROS 2 Distro | Branch | Build status | Documentation | Released packages
 
 1. [Install ROS 2 Humble](https://docs.ros.org/en/humble/Installation/Ubuntu-Install-Debians.html).
 
-2. Make sure that `colcon`, its extensions and `vcs` are installed:
+2. Make sure that `colcon`, its extensions, `vcs`, and development tools are installed:
    ```
-   sudo apt install python3-colcon-common-extensions python3-vcstool
+   sudo apt install python3-colcon-common-extensions python3-vcstool clang-format pre-commit
    ```
 3. Create a new ROS 2 workspace if necessary:
    ```
@@ -135,9 +135,9 @@ ROS 2 Distro | Branch | Build status | Documentation | Released packages
 
 1. [Install ROS 2 Foxy](https://docs.ros.org/en/foxy/Installation/Ubuntu-Install-Debians.html).
 
-2. Make sure that `colcon`, its extensions and `vcs` are installed:
+2. Make sure that `colcon`, its extensions, `vcs`, and development tools are installed:
    ```
-   sudo apt install python3-colcon-common-extensions python3-vcstool
+   sudo apt install python3-colcon-common-extensions python3-vcstool clang-format pre-commit
    ```
 3. Create a new ROS 2 workspace if necessary:
    ```
diff --git a/smacc2/CHANGELOG.rst b/smacc2/CHANGELOG.rst
@@ -1,6 +1,33 @@
 Changelog for package smacc2
 ================================
 
+3.0.1 (2025-01-16)
+-------------------
+### Added
+- **ROS2 Jazzy Support**: Official support for ROS2 Jazzy Jalisco
+
+  SMACC2 now defaults to ROS2 Jazzy (Ubuntu 24.04 Noble) as the primary development branch.
+  This marks the transition to the latest LTS ROS2 distribution with improved performance
+  and new features.
+
+### Fixed
+- **CI Format Pipeline**: Fixed PEP 668 externally-managed-environment errors in GitHub Actions
+
+  Updated CI workflow and documentation to use apt-installed `pre-commit` and `clang-format`
+  instead of pip, ensuring compatibility with Ubuntu 24.04's PEP 668 Python packaging
+  restrictions. This provides a more robust and future-proof CI/CD pipeline.
+
+  - Updated `.github/workflows/ci-format.yml` to install pre-commit via apt
+  - Updated `CONTRIBUTING.md` with correct installation instructions
+  - Updated `README.md` to include development tools in setup instructions
+
+### Documentation
+- Enhanced developer documentation for Ubuntu 24.04+ environments
+- Added comprehensive PEP 668 compliance documentation
+
+### Contributors
+- Brett Aldrich (@brettpac)
+
 2.3.20 (2025-11-01)
 -------------------
 ### Fixed
diff --git a/smacc2/package.xml b/smacc2/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>smacc2</name>
-  <version>3.0.0</version>
+  <version>3.0.1</version>
 
   <description>An Event-Driven, Asynchronous, Behavioral State Machine Library for ROS2 (Robotic Operating System) applications written in C++.</description>
 
diff --git a/smacc2/src/smacc2/orthogonal.cpp b/smacc2/src/smacc2/orthogonal.cpp
@@ -107,7 +107,8 @@ void ISmaccOrthogonal::onEntry()
 
       try
       {
-        TRACETOOLS_TRACEPOINT(smacc2_client_behavior_on_entry_start, statename, orthogonalName, cbName);
+        TRACETOOLS_TRACEPOINT(
+          smacc2_client_behavior_on_entry_start, statename, orthogonalName, cbName);
         clBehavior->executeOnEntry();
       }
       catch (const std::exception & e)
@@ -142,7 +143,8 @@ void ISmaccOrthogonal::onExit()
         getLogger(), "[Orthogonal: %s] OnExit, current Behavior: %s", orthogonalName, cbName);
       try
       {
-        TRACETOOLS_TRACEPOINT(smacc2_client_behavior_on_exit_start, statename, orthogonalName, cbName);
+        TRACETOOLS_TRACEPOINT(
+          smacc2_client_behavior_on_exit_start, statename, orthogonalName, cbName);
         clBehavior->executeOnExit();
       }
       catch (const std::exception & e)
diff --git a/smacc2/src/smacc2/smacc_client_behavior_base.cpp b/smacc2/src/smacc2/smacc_client_behavior_base.cpp
@@ -30,9 +30,7 @@ ISmaccClientBehavior::ISmaccClientBehavior()
 
 ISmaccClientBehavior::~ISmaccClientBehavior()
 {
-  RCLCPP_WARN_STREAM(
-    getLogger(), "[" << getName() << "]"
-                     << " Client behavior deallocated");
+  RCLCPP_WARN_STREAM(getLogger(), "[" << getName() << "]" << " Client behavior deallocated");
 }
 
 std::string ISmaccClientBehavior::getName() const { return demangleSymbol(typeid(*this).name()); }
diff --git a/smacc2/src/smacc2/smacc_tracing.cpp b/smacc2/src/smacc2/smacc_tracing.cpp
@@ -72,32 +72,28 @@ void ros_trace_smacc2_state_onExit_end(const char * state_name)
 }
 
 void ros_trace_smacc2_client_behavior_on_entry_start(
-  const char * state_name, const char * orthogonal_name,
-  const char * client_behavior_name)
+  const char * state_name, const char * orthogonal_name, const char * client_behavior_name)
 {
   CONDITIONAL_TP(
     smacc2_client_behavior_on_entry_start, state_name, orthogonal_name, client_behavior_name);
 }
 
 void ros_trace_smacc2_client_behavior_on_entry_end(
-  const char * state_name, const char * orthogonal_name,
-  const char * client_behavior_name)
+  const char * state_name, const char * orthogonal_name, const char * client_behavior_name)
 {
   CONDITIONAL_TP(
     smacc2_client_behavior_on_entry_end, state_name, orthogonal_name, client_behavior_name);
 }
 
 void ros_trace_smacc2_client_behavior_on_exit_start(
-  const char * state_name, const char * orthogonal_name,
-  const char * client_behavior_name)
+  const char * state_name, const char * orthogonal_name, const char * client_behavior_name)
 {
   CONDITIONAL_TP(
     smacc2_client_behavior_on_exit_start, state_name, orthogonal_name, client_behavior_name);
 }
 
 void ros_trace_smacc2_client_behavior_on_exit_end(
-  const char * state_name, const char * orthogonal_name,
-  const char * client_behavior_name)
+  const char * state_name, const char * orthogonal_name, const char * client_behavior_name)
 {
   CONDITIONAL_TP(
     smacc2_client_behavior_on_exit_end, state_name, orthogonal_name, client_behavior_name);
diff --git a/smacc2_client_library/cl_keyboard/package.xml b/smacc2_client_library/cl_keyboard/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
  <name>cl_keyboard</name>
-  <version>3.0.0</version>
+  <version>3.0.1</version>
   <description>The cl_keyboard package</description>
   <maintainer email="brett@robosoft.ai">Brett Aldrich</maintainer>
   <license>Apache-2.0</license>
diff --git a/smacc2_client_library/cl_moveit2z/package.xml b/smacc2_client_library/cl_moveit2z/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>cl_moveit2z</name>
-  <version>3.0.0</version>
+  <version>3.0.1</version>
 
   <description>The cl_moveit2z package</description>
   <maintainer email="brett@robosoft.ai">Brett Aldrich</maintainer>
diff --git a/smacc2_client_library/cl_nav2z/package.xml b/smacc2_client_library/cl_nav2z/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>cl_nav2z</name>
-  <version>3.0.0</version>
+  <version>3.0.1</version>
   <description>The cl_nav2z package</description>
 
   <maintainer email="brett@robosoft.ai">Brett Aldrich</maintainer>
diff --git a/smacc2_client_library/cl_nav2z/src/cl_nav2z/client_behaviors/cb_navigate_forward.cpp b/smacc2_client_library/cl_nav2z/src/cl_nav2z/client_behaviors/cb_navigate_forward.cpp
@@ -72,18 +72,15 @@ void CbNavigateForward::onEntry()
   auto referenceFrame = p->getReferenceFrame();
   auto currentPoseMsg = p->toPoseMsg();
 
-  RCLCPP_INFO_STREAM(
-    getLogger(), "[" << getName() << "]"
-                     << "current pose: " << currentPoseMsg);
+  RCLCPP_INFO_STREAM(getLogger(), "[" << getName() << "]" << "current pose: " << currentPoseMsg);
 
   // force global orientation if it is requested
   if (options.forceInitialOrientation)
   {
     currentPoseMsg.orientation = *(options.forceInitialOrientation);
     RCLCPP_WARN_STREAM(
-      getLogger(),
-      "[" << getName() << "]"
-          << "Forcing initial straight motion orientation: " << currentPoseMsg.orientation);
+      getLogger(), "[" << getName() << "]" << "Forcing initial straight motion orientation: "
+                       << currentPoseMsg.orientation);
   }
 
   tf2::Transform currentPose;
@@ -120,8 +117,7 @@ void CbNavigateForward::onEntry()
   //goal.pose.header.stamp = getNode()->now();
   tf2::toMsg(targetPose, goal.pose.pose);
   RCLCPP_INFO_STREAM(
-    getLogger(), "[" << getName() << "]"
-                     << " TARGET POSE FORWARD: " << goal.pose.pose);
+    getLogger(), "[" << getName() << "]" << " TARGET POSE FORWARD: " << goal.pose.pose);
 
   // current pose
   geometry_msgs::msg::PoseStamped currentStampedPoseMsg;
diff --git a/smacc2_client_library/cl_ros2_timer/package.xml b/smacc2_client_library/cl_ros2_timer/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>cl_ros2_timer</name>
-  <version>3.0.0</version>
+  <version>3.0.1</version>
   <description>The cl_ros2_timer package</description>
   <maintainer email="brett@robosoft.ai">Brett Aldrich</maintainer>
   <license>Apache-2.0</license>
diff --git a/smacc2_client_library/http_client/package.xml b/smacc2_client_library/http_client/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
  <name>http_client</name>
-  <version>3.0.0</version>
+  <version>3.0.1</version>
   <description>The http_client package</description>
   <maintainer email="jaycee.lock@proton.me">Jaycee Lock</maintainer>
   <license>Apache-2.0</license>
diff --git a/smacc2_client_library/lifecyclenode_client/package.xml b/smacc2_client_library/lifecyclenode_client/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>lifecyclenode_client</name>
-  <version>3.0.0</version>
+  <version>3.0.1</version>
   <description>The lifecyclenode_client package implements SMACC Action Client Plugin for the ROS Navigation State - move_base node.  Developed by Reel Robotics.</description>
 
   <maintainer email="pablo@ibrobotics.com">Pablo Inigo Blasco</maintainer>
diff --git a/smacc2_client_library/multirole_sensor_client/package.xml b/smacc2_client_library/multirole_sensor_client/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>multirole_sensor_client</name>
-  <version>3.0.0</version>
+  <version>3.0.1</version>
   <description>The multirole_sensor_client package</description>
   <maintainer email="pablo@ibrobotics.com">Pablo Iñigo Blasco</maintainer>
   <license>Apache-2.0</license>
diff --git a/smacc2_dev_tools/sm_reference_lib_run_commands.md b/smacc2_dev_tools/sm_reference_lib_run_commands.md
@@ -20,4 +20,4 @@ ros2 launch sm_atomic_mode_states sm_atomic_mode_states.py
 
 ```
 ros2 launch sm_atomic_lifecycle sm_atomic_lifecycle.py
-```
+```
diff --git a/smacc2_event_generator_library/eg_conditional_generator/package.xml b/smacc2_event_generator_library/eg_conditional_generator/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>eg_conditional_generator</name>
-  <version>3.0.0</version>
+  <version>3.0.1</version>
   <description>The eg_random_generator package</description>
 
   <maintainer email="pablo@ibrobotics.com">Pablo Iñigo Blasco</maintainer>
diff --git a/smacc2_event_generator_library/eg_random_generator/package.xml b/smacc2_event_generator_library/eg_random_generator/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>eg_random_generator</name>
-   <version>3.0.0</version>
+   <version>3.0.1</version>
    <description>The eg_random_generator package</description>
    <maintainer email="pablo@ibrobotics.com">Pablo Iñigo Blasco</maintainer>
    <license>Apache-2.0</license>
diff --git a/smacc2_msgs/package.xml b/smacc2_msgs/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>smacc2_msgs</name>
-  <version>3.0.0</version>
+  <version>3.0.1</version>
 
   <description>Messages and services used in smacc2.</description>
 
diff --git a/smacc2_performance_tools/performance_tests/sm_atomic_performance_trace_1/package.xml b/smacc2_performance_tools/performance_tests/sm_atomic_performance_trace_1/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>sm_atomic_performance_trace_1</name>
-  <version>3.0.0</version>
+  <version>3.0.1</version>
   <description>The sm_atomic_performance_trace_1 package</description>
   <maintainer email="pablo@ibrobotics.com">Pablo Inigo Blasco</maintainer>
   <license>Apache-2.0</license>
diff --git a/smacc2_performance_tools/performance_tests/sm_atomic_subscribers_performance_test/package.xml b/smacc2_performance_tools/performance_tests/sm_atomic_subscribers_performance_test/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>sm_atomic_subscribers_performance_test</name>
-  <version>3.0.0</version>
+  <version>3.0.1</version>
   <description>The sm_atomic_subscribers_performance_test package</description>
   <maintainer email="pablo@ibrobotics.com">Pablo Inigo Blasco</maintainer>
   <license>Apache-2.0</license>
diff --git a/smacc2_performance_tools/performance_tests/sm_coretest_transition_speed_1/package.xml b/smacc2_performance_tools/performance_tests/sm_coretest_transition_speed_1/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>sm_coretest_transition_speed_1</name>
-  <version>3.0.0</version>
+  <version>3.0.1</version>
   <description>The sm_coretest_transition_speed_1 package</description>
   <maintainer email="smacc2@smacc2.cool">SMACC2 is cool</maintainer>
   <license>Apache-2.0</license>
diff --git a/smacc2_sm_reference_library/sm_advanced_recovery_1/package.xml b/smacc2_sm_reference_library/sm_advanced_recovery_1/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>sm_advanced_recovery_1</name>
-  <version>3.0.0</version>
+  <version>3.0.1</version>
   <description>The sm_advanced_recovery_1 package</description>
   <maintainer email="pablo@ibrobotics.com">geus</maintainer>
   <license>Apache-2.0</license>
diff --git a/smacc2_sm_reference_library/sm_atomic/package.xml b/smacc2_sm_reference_library/sm_atomic/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>sm_atomic</name>
-  <version>3.0.0</version>
+  <version>3.0.1</version>
   <description>The sm_atomic package</description>
   <maintainer email="pablo@ibrobotics.com">Pablo Inigo Blasco</maintainer>
   <license>Apache-2.0</license>
diff --git a/smacc2_sm_reference_library/sm_atomic_http/package.xml b/smacc2_sm_reference_library/sm_atomic_http/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>sm_atomic_http</name>
-  <version>3.0.0</version>
+  <version>3.0.1</version>
   <description>The sm_atomic_http package</description>
   <maintainer email="jaycee.lock@gmail.com">Jaycee Lock</maintainer>
   <license>Apache-2.0</license>
diff --git a/smacc2_sm_reference_library/sm_atomic_lifecycle/launch/sm_atomic_lifecycle.py b/smacc2_sm_reference_library/sm_atomic_lifecycle/launch/sm_atomic_lifecycle.py
@@ -26,7 +26,9 @@ def setup_log_directory():
     timestamp = datetime.now().strftime("%Y-%m-%d-%H-%M-%S-%f")
 
     # Primary log directory location
-    log_dir = os.path.join(os.path.expanduser("~"), ".ros", "log", f"{timestamp}-sm_atomic_lifecycle")
+    log_dir = os.path.join(
+        os.path.expanduser("~"), ".ros", "log", f"{timestamp}-sm_atomic_lifecycle"
+    )
 
     try:
         os.makedirs(log_dir, mode=0o755, exist_ok=True)
diff --git a/smacc2_sm_reference_library/sm_atomic_lifecycle/package.xml b/smacc2_sm_reference_library/sm_atomic_lifecycle/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>sm_atomic_lifecycle</name>
-  <version>3.0.0</version>
+  <version>3.0.1</version>
   <description>The sm_atomic_lifecycle package</description>
   <maintainer email="pablo@ibrobotics.com">Pablo Inigo Blasco</maintainer>
   <license>Apache-2.0</license>
diff --git a/smacc2_sm_reference_library/sm_atomic_mode_states/package.xml b/smacc2_sm_reference_library/sm_atomic_mode_states/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>sm_atomic_mode_states</name>
-  <version>3.0.0</version>
+  <version>3.0.1</version>
   <description>The sm_atomic_mode_states package</description>
   <maintainer email="pablo@ibrobotics.com">Pablo Inigo Blasco</maintainer>
   <license>Apache-2.0</license>
diff --git a/smacc2_sm_reference_library/sm_branching/package.xml b/smacc2_sm_reference_library/sm_branching/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>sm_branching</name>
-  <version>3.0.0</version>
+  <version>3.0.1</version>
   <description>The sm_branching package</description>
   <maintainer email="pablo@ibrobotics.com">Pablo Inigo Blasco</maintainer>
   <license>Apache-2.0</license>
diff --git a/smacc2_sm_reference_library/sm_cl_keyboard_unit_test_1/package.xml b/smacc2_sm_reference_library/sm_cl_keyboard_unit_test_1/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>sm_cl_keyboard_unit_test_1</name>
-  <version>3.0.0</version>
+  <version>3.0.1</version>
   <description>The sm_cl_keyboard_unit_test_1 package</description>
   <maintainer email="pablo@ibrobotics.com">Pablo Inigo Blasco</maintainer>
   <license>Apache-2.0</license>
diff --git a/smacc2_sm_reference_library/sm_cl_ros2_timer_unit_test_1/package.xml b/smacc2_sm_reference_library/sm_cl_ros2_timer_unit_test_1/package.xml
diff --git a/smacc2_sm_reference_library/sm_multi_stage_1/package.xml b/smacc2_sm_reference_library/sm_multi_stage_1/package.xml
diff --git a/smacc2_sm_reference_library/sm_multithread_test_1/package.xml b/smacc2_sm_reference_library/sm_multithread_test_1/package.xml
diff --git a/smacc2_sm_reference_library/sm_pack_ml/package.xml b/smacc2_sm_reference_library/sm_pack_ml/package.xml
diff --git a/smacc2_sm_reference_library/sm_panda_cl_moveit2z_cb_inventory/package.xml b/smacc2_sm_reference_library/sm_panda_cl_moveit2z_cb_inventory/package.xml
diff --git a/smacc2_sm_reference_library/sm_simple_action_client/package.xml b/smacc2_sm_reference_library/sm_simple_action_client/package.xml
diff --git a/smacc2_sm_reference_library/sm_three_some/package.xml b/smacc2_sm_reference_library/sm_three_some/package.xml
diff --git a/smacc2_state_reactor_library/sr_all_events_go/package.xml b/smacc2_state_reactor_library/sr_all_events_go/package.xml
diff --git a/smacc2_state_reactor_library/sr_conditional/package.xml b/smacc2_state_reactor_library/sr_conditional/package.xml
diff --git a/smacc2_state_reactor_library/sr_event_countdown/package.xml b/smacc2_state_reactor_library/sr_event_countdown/package.xml

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,8 @@ void ISmaccOrthogonal::onEntry()`
`107`	`107`
`108`	`108`	`try`
`109`	`109`	`{`
`110`		`- TRACETOOLS_TRACEPOINT(smacc2_client_behavior_on_entry_start, statename, orthogonalName, cbName);`
	`110`	`+ TRACETOOLS_TRACEPOINT(`
	`111`	`+ smacc2_client_behavior_on_entry_start, statename, orthogonalName, cbName);`
`111`	`112`	`clBehavior->executeOnEntry();`
`112`	`113`	`}`
`113`	`114`	`catch (const std::exception & e)`
`@@ -142,7 +143,8 @@ void ISmaccOrthogonal::onExit()`
`142`	`143`	`getLogger(), "[Orthogonal: %s] OnExit, current Behavior: %s", orthogonalName, cbName);`
`143`	`144`	`try`
`144`	`145`	`{`
`145`		`- TRACETOOLS_TRACEPOINT(smacc2_client_behavior_on_exit_start, statename, orthogonalName, cbName);`
	`146`	`+ TRACETOOLS_TRACEPOINT(`
	`147`	`+ smacc2_client_behavior_on_exit_start, statename, orthogonalName, cbName);`
`146`	`148`	`clBehavior->executeOnExit();`
`147`	`149`	`}`
`148`	`150`	`catch (const std::exception & e)`
Original file line number	Diff line number	Diff line change
`@@ -30,9 +30,7 @@ ISmaccClientBehavior::ISmaccClientBehavior()`
`30`	`30`
`31`	`31`	`ISmaccClientBehavior::~ISmaccClientBehavior()`
`32`	`32`	`{`
`33`		`- RCLCPP_WARN_STREAM(`
`34`		`- getLogger(), "[" << getName() << "]"`
`35`		`- << " Client behavior deallocated");`
	`33`	`+ RCLCPP_WARN_STREAM(getLogger(), "[" << getName() << "]" << " Client behavior deallocated");`
`36`	`34`	`}`
`37`	`35`
`38`	`36`	`std::string ISmaccClientBehavior::getName() const { return demangleSymbol(typeid(*this).name()); }`
Original file line number	Diff line number	Diff line change
`@@ -72,32 +72,28 @@ void ros_trace_smacc2_state_onExit_end(const char * state_name)`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`void ros_trace_smacc2_client_behavior_on_entry_start(`
`75`		`- const char * state_name, const char * orthogonal_name,`
`76`		`- const char * client_behavior_name)`
	`75`	`+ const char * state_name, const char * orthogonal_name, const char * client_behavior_name)`
`77`	`76`	`{`
`78`	`77`	`CONDITIONAL_TP(`
`79`	`78`	`smacc2_client_behavior_on_entry_start, state_name, orthogonal_name, client_behavior_name);`
`80`	`79`	`}`
`81`	`80`
`82`	`81`	`void ros_trace_smacc2_client_behavior_on_entry_end(`
`83`		`- const char * state_name, const char * orthogonal_name,`
`84`		`- const char * client_behavior_name)`
	`82`	`+ const char * state_name, const char * orthogonal_name, const char * client_behavior_name)`
`85`	`83`	`{`
`86`	`84`	`CONDITIONAL_TP(`
`87`	`85`	`smacc2_client_behavior_on_entry_end, state_name, orthogonal_name, client_behavior_name);`
`88`	`86`	`}`
`89`	`87`
`90`	`88`	`void ros_trace_smacc2_client_behavior_on_exit_start(`
`91`		`- const char * state_name, const char * orthogonal_name,`
`92`		`- const char * client_behavior_name)`
	`89`	`+ const char * state_name, const char * orthogonal_name, const char * client_behavior_name)`
`93`	`90`	`{`
`94`	`91`	`CONDITIONAL_TP(`
`95`	`92`	`smacc2_client_behavior_on_exit_start, state_name, orthogonal_name, client_behavior_name);`
`96`	`93`	`}`
`97`	`94`
`98`	`95`	`void ros_trace_smacc2_client_behavior_on_exit_end(`
`99`		`- const char * state_name, const char * orthogonal_name,`
`100`		`- const char * client_behavior_name)`
	`96`	`+ const char * state_name, const char * orthogonal_name, const char * client_behavior_name)`
`101`	`97`	`{`
`102`	`98`	`CONDITIONAL_TP(`
`103`	`99`	`smacc2_client_behavior_on_exit_end, state_name, orthogonal_name, client_behavior_name);`