Merge remote-tracking branch 'origin/develop' into thermal_controller

2023-03-14 15:34:25 +01:00
parent d3bf70243b 551a4fe00f
commit a51a680396
11 changed files with 834 additions and 833 deletions
--- a/linux/fsfwconfig/events/translateEvents.cpp
+++ b/linux/fsfwconfig/events/translateEvents.cpp
@ -1,7 +1,7 @@
 /**
 * @brief    Auto-generated event translation file. Contains 276 translations.
 * @details
- * Generated on: 2023-03-14 14:24:51
+ * Generated on: 2023-03-14 15:33:44
 */
 #include "translateEvents.h"

--- a/linux/fsfwconfig/objects/translateObjects.cpp
+++ b/linux/fsfwconfig/objects/translateObjects.cpp
@ -2,7 +2,7 @@
 * @brief  Auto-generated object translation file.
 * @details
 * Contains 173 translations.
- * Generated on: 2023-03-14 14:24:51
+ * Generated on: 2023-03-14 15:33:44
 */
 #include "translateObjects.h"