Merge branch 'development' into mueller/tmstorage

2020-12-22 17:30:27 +01:00 · 2020-12-22 17:30:27 +01:00 · bc8c3da1b7
commit bc8c3da1b7
parent 09161f22d0 2706669011
1 changed files with 1 additions and 0 deletions
--- a/objectmanager/frameworkObjects.h
+++ b/objectmanager/frameworkObjects.h
@ -22,6 +22,7 @@ enum framework_objects {
 	//IDs for PUS Packet Communication
 	TC_STORE = 0x534f0100,
 	TM_STORE = 0x534f0200,
+	TIME_STAMPER = 0x53500010,

 	NO_OBJECT = 0xFFFFFFFF
 };