Merge remote-tracking branch 'origin/develop' into mueller/master
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit

This commit is contained in:
Robin Müller 2022-03-04 14:55:42 +01:00
commit a0897c3afb
No known key found for this signature in database
GPG Key ID: 11D4952C8CCEF814
6 changed files with 27 additions and 5 deletions

View File

@ -391,3 +391,25 @@ void initmission::createTestTasks(TaskFactory& factory,
#endif // OBSW_ADD_TEST_TASK == 1 && OBSW_ADD_TEST_CODE == 1 #endif // OBSW_ADD_TEST_TASK == 1 && OBSW_ADD_TEST_CODE == 1
} }
/**
**/

View File

@ -1,7 +1,7 @@
/** /**
* @brief Auto-generated event translation file. Contains 152 translations. * @brief Auto-generated event translation file. Contains 152 translations.
* @details * @details
* Generated on: 2022-03-04 11:00:31 * Generated on: 2022-03-04 14:55:20
*/ */
#include "translateEvents.h" #include "translateEvents.h"

View File

@ -2,7 +2,7 @@
* @brief Auto-generated object translation file. * @brief Auto-generated object translation file.
* @details * @details
* Contains 112 translations. * Contains 112 translations.
* Generated on: 2022-03-04 10:30:45 * Generated on: 2022-03-04 14:55:17
*/ */
#include "translateObjects.h" #include "translateObjects.h"

View File

@ -1,7 +1,7 @@
/** /**
* @brief Auto-generated event translation file. Contains 152 translations. * @brief Auto-generated event translation file. Contains 152 translations.
* @details * @details
* Generated on: 2022-03-04 11:00:31 * Generated on: 2022-03-04 14:55:20
*/ */
#include "translateEvents.h" #include "translateEvents.h"

View File

@ -2,7 +2,7 @@
* @brief Auto-generated object translation file. * @brief Auto-generated object translation file.
* @details * @details
* Contains 112 translations. * Contains 112 translations.
* Generated on: 2022-03-04 10:30:45 * Generated on: 2022-03-04 14:55:17
*/ */
#include "translateObjects.h" #include "translateObjects.h"

2
tmtc

@ -1 +1 @@
Subproject commit 454ef636a10bd7851d57c275f521433a19dc9c0b Subproject commit 35ca0d9d6ee2d6755f48452c36049b679a33875f