eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 1 Releases 121 Wiki Activity

fixed merge conflicts

Browse Source
This commit is contained in:
Robin Müller
2022-03-25 18:49:34 +01:00
parent 4bf0521a5d 15d1da8199
commit 2f6d9ab7f1
67 changed files with 2539 additions and 340 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
linux/fsfwconfig/objects/translateObjects.cpp
View File

@ -1,8 +1,13 @@
/**
* @brief Auto-generated object translation file.
* @details
<<<<<<< HEAD
* Contains 114 translations.
* Generated on: 2022-03-25 09:54:13
=======
* Contains 115 translations.
* Generated on: 2022-03-22 20:43:04
>>>>>>> develop
*/
#include "translateObjects.h"
@ -117,6 +122,9 @@ const char *DUMMY_HANDLER_STRING = "DUMMY_HANDLER";
const char *DUMMY_INTERFACE_STRING = "DUMMY_INTERFACE";
const char *LIBGPIOD_TEST_STRING = "LIBGPIOD_TEST";
const char *TEST_TASK_STRING = "TEST_TASK";
const char *ACS_BOARD_ASS_STRING = "ACS_BOARD_ASS";
const char *SUS_BOARD_ASS_STRING = "SUS_BOARD_ASS";
const char *TCS_BOARD_ASS_STRING = "TCS_BOARD_ASS";
const char *TM_FUNNEL_STRING = "TM_FUNNEL";
const char *CCSDS_IP_CORE_BRIDGE_STRING = "CCSDS_IP_CORE_BRIDGE";
const char *NO_OBJECT_STRING = "NO_OBJECT";
@ -345,6 +353,12 @@ const char *translateObject(object_id_t object) {
return LIBGPIOD_TEST_STRING;
case 0x54694269:
return TEST_TASK_STRING;
case 0x73000001:
return ACS_BOARD_ASS_STRING;
case 0x73000002:
return SUS_BOARD_ASS_STRING;
case 0x73000003:
return TCS_BOARD_ASS_STRING;
case 0x73000100:
return TM_FUNNEL_STRING;
case 0x73500000: