Merge remote-tracking branch 'upstream/mueller/tc-11-tweaks' into mueller/tc-11-tweaks-eive

2022-05-20 15:39:40 +02:00
parent e758f0be2e 0b53b4873f
commit 942bfafaa3
64 changed files with 378 additions and 546 deletions
--- a/src/fsfw/objectmanager/CMakeLists.txt
+++ b/src/fsfw/objectmanager/CMakeLists.txt
@ -1,5 +1 @@
-target_sources(${LIB_FSFW_NAME} 
-	PRIVATE 
-		ObjectManager.cpp
-		SystemObject.cpp
-)
+target_sources(${LIB_FSFW_NAME} PRIVATE ObjectManager.cpp SystemObject.cpp)
--- a/src/fsfw/objectmanager/frameworkObjects.h
+++ b/src/fsfw/objectmanager/frameworkObjects.h
@ -14,6 +14,7 @@ enum framework_objects : object_id_t {
  PUS_SERVICE_5_EVENT_REPORTING = 0x53000005,
  PUS_SERVICE_8_FUNCTION_MGMT = 0x53000008,
  PUS_SERVICE_9_TIME_MGMT = 0x53000009,
+  PUS_SERVICE_11_TC_SCHEDULER = 0x53000011,
  PUS_SERVICE_17_TEST = 0x53000017,
  PUS_SERVICE_20_PARAMETERS = 0x53000020,
  PUS_SERVICE_200_MODE_MGMT = 0x53000200,