fixed merge conflicts

2021-07-23 17:48:11 +02:00
parent 0cc454d891 62fe0571b1
commit a2e62b28c3
70 changed files with 1597 additions and 606 deletions
--- a/common/config/commonObjects.h
+++ b/common/config/commonObjects.h
@ -10,6 +10,7 @@ enum commonObjects: uint32_t {
    PUS_PACKET_DISTRIBUTOR = 0x50000200,
    UDP_BRIDGE = 0x50000300,
    UDP_POLLING_TASK = 0x50000400,
+    FILE_SYSTEM_HANDLER = 0x50000500,

    /* 0x43 ('C') for Controllers */
    THERMAL_CONTROLLER = 0x43400001,