fix folder structure

Author: cindyli-13

rover-apps/arm_2021/CMakeLists.txt

@@ -1,14 +1,7 @@
-<<<<<<< HEAD:rover-apps/arm_2021/CMakeLists.txt
 add_executable(arm_2021)
-target_sources(arm_2021 PRIVATE src/main.cpp)
-target_include_directories(arm_2021 PUBLIC include)
+target_sources(arm_2021 PRIVATE ../common/src/main.cpp)
+target_include_directories(arm_2021 PUBLIC include ../common/include)
 target_link_libraries(arm_2021
-=======
-add_executable(arm)
-target_sources(arm PRIVATE ../common/src/main.cpp)
-target_include_directories(arm PUBLIC include ../common/include)
-target_link_libraries(arm
->>>>>>> Create modules skeleton for new app structure (#382):rover-apps/arm/CMakeLists.txt
         PRIVATE
         #Control
         OpenLoopController

rover-apps/arm/include/AppConfig.h renamed to rover-apps/arm_2021/include/AppConfig.h

@@ -1,14 +1,7 @@
-<<<<<<< HEAD:rover-apps/gimbal_2021/CMakeLists.txt
 add_executable(gimbal_2021)
-target_sources(gimbal_2021 PRIVATE src/main.cpp)
-target_include_directories(gimbal_2021 PUBLIC include)
+target_sources(gimbal_2021 PRIVATE ../common/src/main.cpp)
+target_include_directories(gimbal_2021 PUBLIC include ../common/include)
 target_link_libraries(gimbal_2021
-=======
-add_executable(gimbal)
-target_sources(gimbal PRIVATE ../common/src/main.cpp)
-target_include_directories(gimbal PUBLIC include ../common/include)
-target_link_libraries(gimbal
->>>>>>> Create modules skeleton for new app structure (#382):rover-apps/gimbal/CMakeLists.txt
         PRIVATE
         #Control
         OpenLoopController

rover-apps/gimbal_2021/CMakeLists.txt

@@ -11,8 +11,8 @@ target_link_libraries(PDB_Monitoring
         )
 
 add_executable(pdb_2021)
-target_sources(pdb_2021 PRIVATE src/main.cpp)
-target_include_directories(pdb_2021 PUBLIC include)
+target_sources(pdb_2021 PRIVATE ../common/src/main.cpp)
+target_include_directories(pdb_2021 PUBLIC include ../common/include)
 target_link_libraries(pdb_2021
         PRIVATE
         CANBus

rover-apps/gimbal/include/AppConfig.h renamed to rover-apps/gimbal_2021/include/AppConfig.h

@@ -5,9 +5,9 @@
 #include "Module.h"
 #include "PDBMonitoring.h"
 
-PDBMonitoring PDB;
+PDBMonitoring PDB_monitoring;
 
 std::vector<Module*> gModules = {
     // put modules here
-    &PDB,
+    &PDB_monitoring,
 };

rover-apps/pdb/CMakeLists.txt

@@ -1,14 +1,7 @@
-<<<<<<< HEAD:rover-apps/science_2021/CMakeLists.txt
 add_executable(science_2021)
-target_sources(science_2021 PRIVATE src/main.cpp)
-target_include_directories(science_2021 PUBLIC include)
+target_sources(science_2021 PRIVATE ../common/src/main.cpp)
+target_include_directories(science_2021 PUBLIC include ../common/include)
 target_link_libraries(science_2021
-=======
-add_executable(science)
-target_sources(science PRIVATE ../common/src/main.cpp)
-target_include_directories(science PUBLIC include ../common/include)
-target_link_libraries(science
->>>>>>> Create modules skeleton for new app structure (#382):rover-apps/science/CMakeLists.txt
         PRIVATE
         #Control
         OpenLoopController