fix: Clean up VD Project

Remove unused `app.h` file. Update CMake structure since build system changed since this branch started. Rename some files from `.h` to `.hpp`
macformula · Jan 6, 2025 · b5e83cc · b5e83cc
1 parent 7a9b38f
commit b5e83cc
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 265 deletions.
diff --git a/firmware/projects/VD_Interface/CMakeLists.txt b/firmware/projects/VD_Interface/CMakeLists.txt
@@ -6,15 +6,7 @@
 
 # include("${CMAKE_SOURCE_DIR}/cmake/cangen.cmake")
 
-target_sources(main	PRIVATE	main.cc)
-
-target_include_directories(main
-	PRIVATE
-	${CMAKE_CURRENT_SOURCE_DIR}/inc
-	${CMAKE_CURRENT_SOURCE_DIR}/generated/can
-)
-
-message("SOURCES: ${SOURCES}")
+target_sources(main PRIVATE main.cc)
 
 # Notice that we don't include any mcal/ subdirectory in this CMake file.
 # The master CMakeLists handles platform selection and library linking.
diff --git a/firmware/projects/VD_Interface/config.yaml b/firmware/projects/VD_Interface/config.yaml
diff --git a/firmware/projects/VD_Interface/inc/app.h b/firmware/projects/VD_Interface/inc/app.h
diff --git a/firmware/projects/VD_Interface/inc/simp_vd_interface.cc b/firmware/projects/VD_Interface/inc/simp_vd_interface.cc
@@ -1,7 +1,7 @@
 /// @author Teghveer Singh Ateliey
 /// @date 2024-11-23
 
-#include "simp_vd_interface.h"
+#include "simp_vd_interface.hpp"
 
 using namespace ctrl;
 

diff --git a/...ects/VD_Interface/inc/simp_vd_interface.h → ...ts/VD_Interface/inc/simp_vd_interface.hpp b/...ects/VD_Interface/inc/simp_vd_interface.h → ...ts/VD_Interface/inc/simp_vd_interface.hpp
@@ -3,11 +3,12 @@
 
 #pragma once
 
-#include "app.h"
+#include <cstdint>
+
 #include "shared/controls/motor_torque.h"
 #include "shared/controls/tc_scale_factor.h"
 #include "shared/controls/tvFactor.h"
-#include "shared/util/mappers/lookup_table.h"
+#include "shared/util/mappers/lookup_table.hpp"
 
 struct VdInput {
     float driver_torque_request;

diff --git a/firmware/projects/VD_Interface/inc/simp_vd_interface_test.cc b/firmware/projects/VD_Interface/inc/simp_vd_interface_test.cc
@@ -1,7 +1,7 @@
 /// @author Teghveer Singh Ateliey
 /// @date 2024-11-23
 
-#include "simp_vd_interface.h"
+#include "simp_vd_interface.hpp"
 
 #include <cassert>
 #include <iostream>

diff --git a/firmware/projects/VD_Interface/main.cc b/firmware/projects/VD_Interface/main.cc
@@ -2,7 +2,7 @@
 /// @date 2025-01-04
 
 #include "inc/simp_vd_interface_test.cc"
-#include "inc/simp_vd_interface.h"
+#include "inc/simp_vd_interface.hpp"
 #include "inc/simp_vd_interface.cc"
 
 int main(void) {

diff --git a/firmware/projects/VD_Interface/platforms/cli/CMakeLists.txt b/firmware/projects/VD_Interface/platforms/cli/CMakeLists.txt
@@ -1,2 +1,2 @@
-target_sources(bindings PRIVATE bindings.cc)
-target_link_libraries(bindings PRIVATE mcal-cli)
+target_sources(main PRIVATE bindings.cc)
+target_link_libraries(main PRIVATE mcal-cli)
diff --git a/firmware/shared/controls/motor_torque.h b/firmware/shared/controls/motor_torque.h
@@ -1,7 +1,7 @@
 #pragma once
 #include <tuple>
 
-#include "shared/util/moving_average.h"
+#include "shared/util/moving_average.hpp"
 
 // Peter Jabra and Aleeza Ali Zar
 namespace ctrl {

diff --git a/firmware/shared/controls/tvFactor.h b/firmware/shared/controls/tvFactor.h
@@ -1,9 +1,10 @@
 #pragma once
 #include <algorithm>
 #include <tuple>
-#include "../util/mappers/lookup_table.h"
 
-namespace ctrl{
+#include "shared/util/mappers/lookup_table.hpp"
+
+namespace ctrl {
 
 template <typename T>
 T CreateTorqueVectoringFactor(T steering_angle) {
@@ -41,4 +42,4 @@ std::tuple<T, T> AdjustTorqueVectoring(T steering_angle,
 
     return std::tuple(left_torque_vector, right_torque_vector);
 }
-}
+}  // namespace ctrl