fixed merge conflicts

2021-06-21 17:51:08 +02:00
parent 8d8bb41334 0407aad611
commit ba5832d30e
24 changed files with 269 additions and 57 deletions
--- a/linux/fsfwconfig/objects/systemObjectList.h
+++ b/linux/fsfwconfig/objects/systemObjectList.h
@ -67,6 +67,7 @@ namespace objects {
        TEST_TASK = 0x54694269,
        LIBGPIOD_TEST = 0x54123456,
        SPI_TEST = 0x54000010,
+        UART_TEST = 0x54000020,
        DUMMY_INTERFACE = 0x5400CAFE,
        DUMMY_HANDLER = 0x5400AFFE,
        P60DOCK_TEST_TASK = 0x00005060