eive/eive-obsw
eive
/
eive-obsw
12
3
Fork 0
Code Issues 3 Pull Requests 2 Releases 117 Wiki Activity

Merge remote-tracking branch 'origin/develop' into mueller/split-acu-hk
EIVE/eive-obsw/pipeline/pr-develop This commit looks good Details

This commit is contained in:
Robin Müller 2022-05-23 18:37:28 +02:00
parent a2fad6061a 7d9ef6f887
commit 40b02aa46b
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
linux/devices/CMakeLists.txt
View File

@ -2,9 +2,7 @@ if(EIVE_BUILD_GPSD_GPS_HANDLER)
target_sources(${OBSW_NAME} PRIVATE GPSHyperionLinuxController.cpp)
endif()
target_sources(${OBSW_NAME} PRIVATE
Max31865RtdLowlevelHandler.cpp
)
target_sources(${OBSW_NAME} PRIVATE Max31865RtdLowlevelHandler.cpp)
add_subdirectory(ploc)
add_subdirectory(startracker)

2
mission/utility/ProgressPrinter.cpp
View File

@ -1,7 +1,7 @@
#include "ProgressPrinter.h"
#include <iomanip>
#include <cmath>
#include <iomanip>
#include "fsfw/serviceinterface/ServiceInterfaceStream.h"