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

Merge remote-tracking branch 'origin/develop' into irini
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
Details

Browse Source
This commit is contained in:
Irini Kosmidou
2022-04-08 15:21:31 +02:00
parent df712c7100 ff5e271f88
commit 188f8863d0
158 changed files with 7250 additions and 4588 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
linux/devices/CMakeLists.txt
View File

@ -4,7 +4,11 @@ if(EIVE_BUILD_GPSD_GPS_HANDLER)
)
endif()
<<<<<<< HEAD
target_sources(${OBSW_NAME} PRIVATE
ScexUartReader.cpp
)
=======
add_subdirectory(ploc)
>>>>>>> origin/develop
add_subdirectory(startracker)