From f7818c63ec939ece5819e481e7e37b52065a3769 Mon Sep 17 00:00:00 2001 From: Russell Gilbert Date: Sat, 21 Feb 2026 08:23:21 +0000 Subject: [PATCH] Refactors source file naming convention Updates source file names to adhere to a consistent lowercase convention, improving code maintainability and readability. This change ensures consistency across the codebase and aligns with common coding standards. --- src/RobotNode/CMakeLists.txt | 16 ++++++++-------- .../CardioCenter/{Heart.cpp => heart.cpp} | 4 ++-- src/RobotNode/CardioCenter/{Heart.h => heart.h} | 4 ++-- .../{DixonBrain.cpp => dixon_brain.cpp} | 4 ++-- src/RobotNode/{DixonBrain.h => dixon_brain.h} | 8 ++++---- .../{DixonNodeState.cpp => dixon_node_state.cpp} | 2 +- .../{DixonNodeState.h => dixon_node_state.h} | 4 ++-- .../DixonLogger.h => logging/dixon_logger.h} | 2 +- src/RobotNode/main.cpp | 8 ++++---- src/RobotNode/{Version.h.in => version.h.in} | 0 src/RobotNode/version.txt | 2 +- 11 files changed, 27 insertions(+), 27 deletions(-) rename src/RobotNode/CardioCenter/{Heart.cpp => heart.cpp} (97%) rename src/RobotNode/CardioCenter/{Heart.h => heart.h} (90%) rename src/RobotNode/{DixonBrain.cpp => dixon_brain.cpp} (94%) rename src/RobotNode/{DixonBrain.h => dixon_brain.h} (66%) rename src/RobotNode/{DixonNodeState.cpp => dixon_node_state.cpp} (95%) rename src/RobotNode/{DixonNodeState.h => dixon_node_state.h} (92%) rename src/RobotNode/{Logging/DixonLogger.h => logging/dixon_logger.h} (99%) rename src/RobotNode/{Version.h.in => version.h.in} (100%) diff --git a/src/RobotNode/CMakeLists.txt b/src/RobotNode/CMakeLists.txt index ef4d75a..2274eaa 100644 --- a/src/RobotNode/CMakeLists.txt +++ b/src/RobotNode/CMakeLists.txt @@ -24,20 +24,20 @@ set(CMAKE_CXX_STANDARD 20) # Define the executable and its source files add_executable(dixon main.cpp - DixonNodeState.cpp - DixonNodeState.h - DixonBrain.cpp - DixonBrain.h - CardioCenter/Heart.cpp - CardioCenter/Heart.h - Logging/DixonLogger.h) + dixon_node_state.cpp + dixon_node_state.h + dixon_brain.cpp + dixon_brain.h + CardioCenter/heart.cpp + CardioCenter/heart.h + logging/dixon_logger.h) # Create the Dependency # This tells CMake: "Before you build Dixon, you MUST run BumpVersion." add_dependencies(dixon BumpVersion) # Generate the header from the template -configure_file(Version.h.in "${CMAKE_CURRENT_BINARY_DIR}/Version.h") +configure_file(version.h.in "${CMAKE_CURRENT_BINARY_DIR}/Version.h") # Consolidated Include Paths target_include_directories(dixon PRIVATE diff --git a/src/RobotNode/CardioCenter/Heart.cpp b/src/RobotNode/CardioCenter/heart.cpp similarity index 97% rename from src/RobotNode/CardioCenter/Heart.cpp rename to src/RobotNode/CardioCenter/heart.cpp index d7b724b..d2abbbe 100644 --- a/src/RobotNode/CardioCenter/Heart.cpp +++ b/src/RobotNode/CardioCenter/heart.cpp @@ -1,7 +1,7 @@ -#include "Heart.h" +#include "heart.h" #include -#include "../DixonNodeState.h" +#include "../dixon_node_state.h" namespace cardio { diff --git a/src/RobotNode/CardioCenter/Heart.h b/src/RobotNode/CardioCenter/heart.h similarity index 90% rename from src/RobotNode/CardioCenter/Heart.h rename to src/RobotNode/CardioCenter/heart.h index 6208aee..784a033 100644 --- a/src/RobotNode/CardioCenter/Heart.h +++ b/src/RobotNode/CardioCenter/heart.h @@ -1,5 +1,5 @@ #pragma once -#include "../Logging/DixonLogger.h" +#include "../logging/dixon_logger.h" #include #include @@ -22,6 +22,6 @@ namespace cardio gpiod::chip chip_; bool isOn_; gpiod::line_request request_; - Dixon::DixonLogger logger_; + dixon::DixonLogger logger_; }; } diff --git a/src/RobotNode/DixonBrain.cpp b/src/RobotNode/dixon_brain.cpp similarity index 94% rename from src/RobotNode/DixonBrain.cpp rename to src/RobotNode/dixon_brain.cpp index 8443bf3..bbdc0b5 100644 --- a/src/RobotNode/DixonBrain.cpp +++ b/src/RobotNode/dixon_brain.cpp @@ -1,8 +1,8 @@ -#include "DixonBrain.h" +#include "dixon_brain.h" #include #include #include -#include "Logging/DixonLogger.h" +#include "logging/dixon_logger.h" DixonBrain::DixonBrain() : heart_(), diff --git a/src/RobotNode/DixonBrain.h b/src/RobotNode/dixon_brain.h similarity index 66% rename from src/RobotNode/DixonBrain.h rename to src/RobotNode/dixon_brain.h index 8fbd01c..fb9b913 100644 --- a/src/RobotNode/DixonBrain.h +++ b/src/RobotNode/dixon_brain.h @@ -1,8 +1,8 @@ #pragma once #include -#include "DixonNodeState.h" -#include "CardioCenter/Heart.h" -#include "Logging/DixonLogger.h" +#include "dixon_node_state.h" +#include "CardioCenter/heart.h" +#include "logging/dixon_logger.h" class DixonBrain { @@ -20,5 +20,5 @@ private: cardio::Heart heart_; DixonNodeState& state_; std::thread loopThread_; - Dixon::DixonLogger logger_; + dixon::DixonLogger logger_; }; \ No newline at end of file diff --git a/src/RobotNode/DixonNodeState.cpp b/src/RobotNode/dixon_node_state.cpp similarity index 95% rename from src/RobotNode/DixonNodeState.cpp rename to src/RobotNode/dixon_node_state.cpp index e3d9778..c528797 100644 --- a/src/RobotNode/DixonNodeState.cpp +++ b/src/RobotNode/dixon_node_state.cpp @@ -1,4 +1,4 @@ -#include "DixonNodeState.h" +#include "dixon_node_state.h" #include #include diff --git a/src/RobotNode/DixonNodeState.h b/src/RobotNode/dixon_node_state.h similarity index 92% rename from src/RobotNode/DixonNodeState.h rename to src/RobotNode/dixon_node_state.h index c9235c3..7f4b8c4 100644 --- a/src/RobotNode/DixonNodeState.h +++ b/src/RobotNode/dixon_node_state.h @@ -1,6 +1,6 @@ #pragma once #include -#include "Logging/DixonLogger.h" +#include "logging/dixon_logger.h" enum class NodeStatus : int { @@ -31,7 +31,7 @@ private: DixonNodeState() : logger_("DixonNodeState"){} ~DixonNodeState() = default; - Dixon::DixonLogger logger_; + dixon::DixonLogger logger_; std::atomic connected_ = false; std::atomic node_status_ = NodeStatus::Stopped; diff --git a/src/RobotNode/Logging/DixonLogger.h b/src/RobotNode/logging/dixon_logger.h similarity index 99% rename from src/RobotNode/Logging/DixonLogger.h rename to src/RobotNode/logging/dixon_logger.h index 15d6f39..512d26a 100644 --- a/src/RobotNode/Logging/DixonLogger.h +++ b/src/RobotNode/logging/dixon_logger.h @@ -5,7 +5,7 @@ #include #include -namespace Dixon { +namespace dixon { class DixonLogger { private: std::string_view m_name; diff --git a/src/RobotNode/main.cpp b/src/RobotNode/main.cpp index b132916..c3e3de6 100644 --- a/src/RobotNode/main.cpp +++ b/src/RobotNode/main.cpp @@ -1,13 +1,13 @@ #include #include -#include "DixonBrain.h" +#include "dixon_brain.h" #include "Version.h" // The generated header -#include "Logging/DixonLogger.h" +#include "logging/dixon_logger.h" void signal_thread_func(sigset_t set) { int sig; - Dixon::DixonLogger logger("signal_thread_func"); + dixon::DixonLogger logger("signal_thread_func"); while (true) { // This blocks until a signal actually happens @@ -43,7 +43,7 @@ sigset_t prepare_signal_set() int main() { - Dixon::DixonLogger logger("main"); + dixon::DixonLogger logger("main"); // The "Splash Screen" logger.info("Dixon core is starting. Version: {}", DIXON_VERSION); diff --git a/src/RobotNode/Version.h.in b/src/RobotNode/version.h.in similarity index 100% rename from src/RobotNode/Version.h.in rename to src/RobotNode/version.h.in diff --git a/src/RobotNode/version.txt b/src/RobotNode/version.txt index 91cc3fe..4ded4f9 100644 --- a/src/RobotNode/version.txt +++ b/src/RobotNode/version.txt @@ -1 +1 @@ -1.0.57 \ No newline at end of file +1.0.58 \ No newline at end of file