Merge branch 'development' into mueller/tmstorage

This commit is contained in:
Steffen Gaisser 2020-12-22 17:30:27 +01:00
commit bc8c3da1b7

View File

@ -22,6 +22,7 @@ enum framework_objects {
//IDs for PUS Packet Communication //IDs for PUS Packet Communication
TC_STORE = 0x534f0100, TC_STORE = 0x534f0100,
TM_STORE = 0x534f0200, TM_STORE = 0x534f0200,
TIME_STAMPER = 0x53500010,
NO_OBJECT = 0xFFFFFFFF NO_OBJECT = 0xFFFFFFFF
}; };