Merge branch 'master' into mueller/FixedTimeslotUpdate

2020-09-26 14:14:50 +02:00 · 2020-09-26 14:14:50 +02:00 · 40558835c7
commit 40558835c7
parent d0f912f32b d1fb512c1f
2 changed files with 1 additions and 1 deletions
--- a/events/fwSubsystemIdRanges.h
+++ b/events/fwSubsystemIdRanges.h
@ -19,6 +19,7 @@ enum {
 	SYSTEM_MANAGER_1 = 75,
 	SYSTEM_1 = 79,
 	PUS_SERVICE_1 = 80,
+	PUS_SERVICE_9 = 89,
 	PUS_SERVICE_17 = 97,
 	FW_SUBSYSTEM_ID_RANGE
 };
--- a/returnvalues/FwClassIds.h
+++ b/returnvalues/FwClassIds.h
@ -56,7 +56,6 @@ enum {
 	DEVICE_COMMUNICATION_IF, //DC
 	BSP, //BSP
 	TIME_STAMPER_IF, //TSI 53
-	//TODO This will shift all IDs for FLP
 	SGP4PROPAGATOR_CLASS, //SGP4 54
 	MUTEX_IF, //MUX 55
 	MESSAGE_QUEUE_IF,//MQI 56