Skip to content

CANModule to fit CAN into app restructure #407

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
upadhyaydhruv wants to merge 12 commits into
base: master
Choose a base branch
from
Draft

CANModule to fit CAN into app restructure #407

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
b489be4
Create modules skeleton for new app structure (#382)
cindyli-13 Jun 22, 2021
20010f1
Create watchdog module (#389)
jahnavithota2011 Aug 18, 2021
1a488c7
Create PDB monitoring module (#392)
jahnavithota2011 Aug 26, 2021
4de2cff
fix folder structure
cindyli-13 Oct 17, 2021
3f052b1
fix common modules not found
cindyli-13 Oct 17, 2021
d1c8689
created CANModule and fixed txProcessor function
upadhyaydhruv Jan 15, 2022
5de8de9
fixed rxClient function for modular use
upadhyaydhruv Jan 15, 2022
2c23625
made CMake linking changes for CANModule
upadhyaydhruv Jan 15, 2022
541583d
implemented most changes as requested by Melvion and Cindy
upadhyaydhruv Feb 3, 2022
6947dd6
added all changes requested, hw bridge issue persists
upadhyaydhruv Feb 4, 2022
a667ffa
fixed issues preventing compilation
upadhyaydhruv Feb 10, 2022
a0d658b
added wrapper for other CANInterface functions
upadhyaydhruv Feb 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix folder structure
  • Loading branch information
@cindyli-13 @upadhyaydhruv
cindyli-13 authored and upadhyaydhruv committed Feb 4, 2022
commit 4de2cffcc52d14cdd4899f3162a696ae0a07511f
11 changes: 2 additions & 9 deletions rover-apps/arm_2021/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
0 rover-apps/arm/include/AppConfig.h → rover-apps/arm_2021/include/AppConfig.h
View file
Open in desktop
File renamed without changes.
11 changes: 2 additions & 9 deletions rover-apps/gimbal_2021/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
0 rover-apps/gimbal/include/AppConfig.h → rover-apps/gimbal_2021/include/AppConfig.h
View file
Open in desktop
File renamed without changes.
25 changes: 0 additions & 25 deletions rover-apps/pdb/CMakeLists.txt
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions rover-apps/pdb_2021/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions rover-apps/pdb/include/AppConfig.h → rover-apps/pdb_2021/include/AppConfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
};
0 rover-apps/pdb/include/PDBMonitoring.h → rover-apps/pdb_2021/include/PDBMonitoring.h
View file
Open in desktop
File renamed without changes.
0 rover-apps/pdb/src/PDBMonitoring.cpp → rover-apps/pdb_2021/src/PDBMonitoring.cpp
View file
Open in desktop
File renamed without changes.
11 changes: 2 additions & 9 deletions rover-apps/science_2021/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
0 rover-apps/science/include/AppConfig.h → rover-apps/science_2021/include/AppConfig.h
View file
Open in desktop
File renamed without changes.