fixed merge conflicts

2021-04-26 17:50:36 +02:00
parent ebdc492ed1 ec76222907
commit d63c825c7f
17 changed files with 929 additions and 23 deletions
--- a/fsfwconfig/objects/systemObjectList.h
+++ b/fsfwconfig/objects/systemObjectList.h
@ -52,6 +52,7 @@ namespace objects {
 		GYRO_2_L3G_HANDLER = 0x44000013,

 		IMTQ_HANDLER = 0x44000014,
+		PLOC_HANDLER = 0x44000015,

 		/* Custom device handler */
 		PCDU_HANDLER = 0x44001000,