Merge branch 'develop' into mohr/cmake

2022-02-10 16:22:28 +01:00
parent e59a98f11c 20f091d54e
commit 50cf01376f
45 changed files with 1898 additions and 780 deletions
--- a/linux/obc/CMakeLists.txt
+++ b/linux/obc/CMakeLists.txt
@ -3,8 +3,8 @@ target_sources(${OBSW_NAME} PUBLIC
 	Ptme.cpp
 	PdecHandler.cpp
 	PdecConfig.cpp
-	PtmeRateSetter.cpp
-	PtmeAxiConfig.cpp
+	PtmeConfig.cpp
+	AxiPtmeConfig.cpp
 )