KSat/fsfw
15
4
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests 1 Releases Wiki Activity

Merge branch 'master' into mueller/FixedTimeslotUpdate

Browse Source
This commit is contained in:
Robin Müller 2020-09-26 14:14:50 +02:00
commit 40558835c7
2 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
events/fwSubsystemIdRanges.h
View File

@ -19,6 +19,7 @@ enum {
SYSTEM_MANAGER_1 = 75, SYSTEM_MANAGER_1 = 75,
SYSTEM_1 = 79, SYSTEM_1 = 79,
PUS_SERVICE_1 = 80, PUS_SERVICE_1 = 80,
PUS_SERVICE_9 = 89,
PUS_SERVICE_17 = 97, PUS_SERVICE_17 = 97,
FW_SUBSYSTEM_ID_RANGE FW_SUBSYSTEM_ID_RANGE
}; };

1
returnvalues/FwClassIds.h
View File

@ -56,7 +56,6 @@ enum {
DEVICE_COMMUNICATION_IF, //DC DEVICE_COMMUNICATION_IF, //DC
BSP, //BSP BSP, //BSP
TIME_STAMPER_IF, //TSI 53 TIME_STAMPER_IF, //TSI 53
//TODO This will shift all IDs for FLP
SGP4PROPAGATOR_CLASS, //SGP4 54 SGP4PROPAGATOR_CLASS, //SGP4 54
MUTEX_IF, //MUX 55 MUTEX_IF, //MUX 55
MESSAGE_QUEUE_IF,//MQI 56 MESSAGE_QUEUE_IF,//MQI 56