Merge branch 'master' into set/switch_controller/default/strictness

saikishor · web-flow · commit 6342970d0ab0 · 2025-05-02T08:59:06.000+02:00
diff --git a/controller_manager/src/controller_manager.cpp b/controller_manager/src/controller_manager.cpp
@@ -3774,7 +3774,7 @@ void ControllerManager::hardware_components_diagnostic_callback(
                                                      .periodicity.standard_deviation.error)
           {
             diag_level = diagnostic_msgs::msg::DiagnosticStatus::ERROR;
-            add_element_to_list(bad_periodicity_async_hw, comp_name);
+            ros2_control::add_item(bad_periodicity_async_hw, comp_name);
           }
           else if (
             periodicity_error >
@@ -3786,7 +3786,7 @@ void ControllerManager::hardware_components_diagnostic_callback(
             {
               diag_level = diagnostic_msgs::msg::DiagnosticStatus::WARN;
             }
-            add_element_to_list(bad_periodicity_async_hw, comp_name);
+            ros2_control::add_item(bad_periodicity_async_hw, comp_name);
           }
         }
         const double max_exp_exec_time =

Original file line number	Diff line number	Diff line change
`@@ -3774,7 +3774,7 @@ void ControllerManager::hardware_components_diagnostic_callback(`
`3774`	`3774`	`.periodicity.standard_deviation.error)`
`3775`	`3775`	`{`
`3776`	`3776`	`diag_level = diagnostic_msgs::msg::DiagnosticStatus::ERROR;`
`3777`		`- add_element_to_list(bad_periodicity_async_hw, comp_name);`
	`3777`	`+ ros2_control::add_item(bad_periodicity_async_hw, comp_name);`
`3778`	`3778`	`}`
`3779`	`3779`	`else if (`
`3780`	`3780`	`periodicity_error >`
`@@ -3786,7 +3786,7 @@ void ControllerManager::hardware_components_diagnostic_callback(`
`3786`	`3786`	`{`
`3787`	`3787`	`diag_level = diagnostic_msgs::msg::DiagnosticStatus::WARN;`
`3788`	`3788`	`}`
`3789`		`- add_element_to_list(bad_periodicity_async_hw, comp_name);`
	`3789`	`+ ros2_control::add_item(bad_periodicity_async_hw, comp_name);`
`3790`	`3790`	`}`
`3791`	`3791`	`}`
`3792`	`3792`	`const double max_exp_exec_time =`