Merge pull request #9 from NathanaelGandhi/ng/rename-thermalzonenode

fix: rename ThermalZoneNode from ThermalZonePublisherNode
NathanaelGandhi · May 15, 2024 · 2a00255 · 2a00255
2 parents 404c84f + 0c5ecbf
commit 2a00255
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 12 deletions.
diff --git a/include/thermal_zone/thermal_zone_node.hpp b/include/thermal_zone/thermal_zone_node.hpp
@@ -5,11 +5,11 @@
 
 #include "thermal_zone_interfaces/msg/thermal_zone.hpp"
 
-class ThermalZonePublisherNode : public rclcpp::Node
+class ThermalZoneNode : public rclcpp::Node
 {
 public:
-  explicit ThermalZonePublisherNode(const std::string & node_name);
-  ~ThermalZonePublisherNode();
+  explicit ThermalZoneNode(const std::string & node_name);
+  ~ThermalZoneNode();
 
 protected:
 private:

diff --git a/src/thermal_zone.cpp b/src/thermal_zone.cpp
@@ -8,7 +8,7 @@ int main(int argc, char ** argv)
   rclcpp::init(argc, argv);
 
   rclcpp::executors::SingleThreadedExecutor exec;
-  exec.add_node(std::make_shared<ThermalZonePublisherNode>("thermal_zone_publisher"));
+  exec.add_node(std::make_shared<ThermalZoneNode>("thermal_zone_node"));
   exec.spin();
 
   rclcpp::shutdown();

diff --git a/src/thermal_zone_node.cpp b/src/thermal_zone_node.cpp
@@ -7,15 +7,14 @@
 
 // PUBLIC FUNCTIONS
 
-ThermalZonePublisherNode::ThermalZonePublisherNode(const std::string & node_name)
-: rclcpp::Node(node_name)
+ThermalZoneNode::ThermalZoneNode(const std::string & node_name) : rclcpp::Node(node_name)
 {
   RCLCPP_INFO_STREAM(this->get_logger(), "default constructor executed");
 
   std::vector<thermal_zone_interfaces::msg::ThermalZone> msgs = GetZoneMsgVector();
 }
 
-ThermalZonePublisherNode::~ThermalZonePublisherNode()
+ThermalZoneNode::~ThermalZoneNode()
 {
   RCLCPP_INFO_STREAM(this->get_logger(), "destructor executed");
 }
@@ -24,7 +23,7 @@ ThermalZonePublisherNode::~ThermalZonePublisherNode()
 
 // PRIVATE FUNCTIONS
 
-uint8_t ThermalZonePublisherNode::CountMatchingDirectories(const std::string & pattern)
+uint8_t ThermalZoneNode::CountMatchingDirectories(const std::string & pattern)
 {
   uint8_t count = 0;
 
@@ -38,8 +37,7 @@ uint8_t ThermalZonePublisherNode::CountMatchingDirectories(const std::string & p
   return count;
 }
 
-std::vector<thermal_zone_interfaces::msg::ThermalZone> ThermalZonePublisherNode::GetZoneMsgVector(
-  void)
+std::vector<thermal_zone_interfaces::msg::ThermalZone> ThermalZoneNode::GetZoneMsgVector(void)
 {
   std::vector<thermal_zone_interfaces::msg::ThermalZone> msgs;
   const std::string key = "thermal_zone";
@@ -56,7 +54,7 @@ std::vector<thermal_zone_interfaces::msg::ThermalZone> ThermalZonePublisherNode:
   return msgs;
 }
 
-thermal_zone_interfaces::msg::ThermalZone ThermalZonePublisherNode::GetZoneMsg(
+thermal_zone_interfaces::msg::ThermalZone ThermalZoneNode::GetZoneMsg(
   std::string key, uint8_t zone_index)
 {
   std::string prefix = "/sys/class/thermal/";
@@ -75,7 +73,7 @@ thermal_zone_interfaces::msg::ThermalZone ThermalZonePublisherNode::GetZoneMsg(
   return msg;
 }
 
-double ThermalZonePublisherNode::GetZoneTemperature(std::string thermal_zone_dir)
+double ThermalZoneNode::GetZoneTemperature(std::string thermal_zone_dir)
 {
   std::string filename = "/temp";
   std::string filepath = thermal_zone_dir + filename;