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

WIP: SCEX Init #272

Closed
muellerr wants to merge 62 commits from irini into develop
pull from: irini
merge into: eive:develop
Conversation 1 Commits 62 Files Changed 40 -3
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 35f2d2cb9c - Show all commits

3
linux/devices/CMakeLists.txt
View File

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