Implement parse_bool and refactor a few (#1014)

ros-controls · May 10, 2023 · c9709f3 · c9709f3
1 parent e3f38cc
commit c9709f3
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/hardware_interface/include/hardware_interface/component_parser.hpp b/hardware_interface/include/hardware_interface/component_parser.hpp
@@ -33,5 +33,8 @@ namespace hardware_interface
 HARDWARE_INTERFACE_PUBLIC
 std::vector<HardwareInfo> parse_control_resources_from_urdf(const std::string & urdf);
 
+HARDWARE_INTERFACE_PUBLIC
+bool parse_bool(const std::string & bool_string);
+
 } // namespace hardware_interface
 #endif // HARDWARE_INTERFACE__COMPONENT_PARSER_HPP_
diff --git a/hardware_interface/src/component_parser.cpp b/hardware_interface/src/component_parser.cpp
@@ -224,7 +224,7 @@ std::string parse_data_type_attribute(const tinyxml2::XMLElement * elem)
 bool parse_is_async_attribute(const tinyxml2::XMLElement * elem)
 {
  const tinyxml2::XMLAttribute * attr = elem->FindAttribute(kIsAsyncAttribute);
- return attr ? strcasecmp(attr->Value(), "true") == 0 : false;
+ return attr ? parse_bool(attr->Value()) : false;
 }
 
 /// Search XML snippet from URDF for parameters.
@@ -612,4 +612,9 @@ std::vector<HardwareInfo> parse_control_resources_from_urdf(const std::string &
  return hardware_info;
 }
 
+bool parse_bool(const std::string & bool_string)
+{
+ return bool_string == "true" || bool_string == "True";
+}
+
 } // namespace hardware_interface
diff --git a/hardware_interface/src/mock_components/generic_system.cpp b/hardware_interface/src/mock_components/generic_system.cpp
@@ -25,6 +25,7 @@
 #include <string>
 #include <vector>
 
+#include "hardware_interface/component_parser.hpp"
 #include "hardware_interface/types/hardware_interface_type_values.hpp"
 #include "rcutils/logging_macros.h"
 
@@ -74,16 +75,15 @@ CallbackReturn GenericSystem::on_init(const hardware_interface::HardwareInfo & i
  auto it = info_.hardware_parameters.find("mock_sensor_commands");
  if (it != info_.hardware_parameters.end())
  {
- // TODO(anyone): change this to parse_bool() (see ros2_control#339)
- use_mock_sensor_command_interfaces_ = it->second == "true" || it->second == "True";
+ use_mock_sensor_command_interfaces_ = hardware_interface::parse_bool(it->second);
  }
  else
  {
  // check if fake_sensor_commands was set instead and issue warning.
  it = info_.hardware_parameters.find("fake_sensor_commands");
  if (it != info_.hardware_parameters.end())
  {
- use_mock_sensor_command_interfaces_ = it->second == "true" || it->second == "True";
+ use_mock_sensor_command_interfaces_ = hardware_interface::parse_bool(it->second);
  RCUTILS_LOG_WARN_NAMED(
  "fake_generic_system",
  "Parameter 'fake_sensor_commands' has been deprecated from usage. Use"
@@ -99,8 +99,7 @@ CallbackReturn GenericSystem::on_init(const hardware_interface::HardwareInfo & i
  it = info_.hardware_parameters.find("fake_gpio_commands");
  if (it != info_.hardware_parameters.end())
  {
- // TODO(anyone): change this to parse_bool() (see ros2_control#339)
- use_fake_gpio_command_interfaces_ = it->second == "true" || it->second == "True";
+ use_fake_gpio_command_interfaces_ = hardware_interface::parse_bool(it->second);
  }
  else
  {