eive/eive-obsw
eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 1 Releases 120 Wiki Activity

Host Fixes and CMakeLists.txt update #229

Merged
meierj merged 8 commits from mueller/host-fixes-fsfw-update into develop 2022-04-28 17:16:14 +02:00
Conversation 0 Commits 8 Files Changed 26 +2 -6
4 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 49b3120ada - Show all commits

3
.gitmodules vendored
View File

@ -1,6 +1,3 @@
[submodule "etl"]
path = thirdparty/etl
url = https://github.com/ETLCPP/etl.git
[submodule "arduino"] [submodule "arduino"]
path = arduino path = arduino
url = https://egit.irs.uni-stuttgart.de/eive/eive_arduino_interface.git url = https://egit.irs.uni-stuttgart.de/eive/eive_arduino_interface.git

2
CMakeLists.txt
View File

@ -307,7 +307,7 @@ add_executable(${UNITTEST_NAME} EXCLUDE_FROM_ALL)
if(EIVE_ADD_ETL_LIB) if(EIVE_ADD_ETL_LIB)
add_subdirectory(${LIB_ETL_PATH}) # add_subdirectory(${LIB_ETL_PATH})
endif() endif()
if(EIVE_ADD_JSON_LIB) if(EIVE_ADD_JSON_LIB)

2
fsfw

@ -1 +1 @@
Subproject commit 1739edd9b07933ddbdfcbfd19cf98146815ebe3f Subproject commit 3d047f9629c3a6fe25514f92dd008bd34d0784dd

1
thirdparty/etl vendored

@ -1 +0,0 @@
Subproject commit c308dc427b7a34e54f33860fb2e244564b2740b4