fixed merge conflicts

linux/fsfwconfig/OBSWConfig.h.in

@@ -7,9 +7,9 @@
 #define FSFWCONFIG_OBSWCONFIG_H_
 
 #ifdef RASPBERRY_PI
-#include <rpi_config.h>
+#include "rpiConfig.h"
 #elif defined(XIPHOS_Q7S)
-#include <q7s_config.h>
+#include "q7sConfig.h"
 #endif
 #include "commonConfig.h"
 #include "OBSWVersion.h"

linux/fsfwconfig/events/translateEvents.cpp

@@ -1,7 +1,7 @@
 /**
  * @brief    Auto-generated event translation file. Contains 83 translations.
  * @details
- * Generated on: 2021-05-18 16:15:50
+ * Generated on: 2021-06-08 17:09:32
  */
 #include "translateEvents.h"
 

linux/fsfwconfig/objects/systemObjectList.h

@@ -1,9 +1,9 @@
 #ifndef HOSTED_CONFIG_OBJECTS_SYSTEMOBJECTLIST_H_
 #define HOSTED_CONFIG_OBJECTS_SYSTEMOBJECTLIST_H_
 
-#include <cstdint>
+#include "commonObjects.h"
 #include <fsfw/objectmanager/frameworkObjects.h>
-#include <commonObjects.h>
+#include <cstdint>
 
 // The objects will be instantiated in the ID order
 namespace objects {
@@ -14,12 +14,7 @@ namespace objects {
 
 		CCSDS_IP_CORE_BRIDGE = 0x50000500,
 
-		PUS_SERVICE_3 = 0x51000300,
-		PUS_SERVICE_5 = 0x51000400,
 		PUS_SERVICE_6 = 0x51000500,
-		PUS_SERVICE_8 = 0x51000800,
-		PUS_SERVICE_23 = 0x51002300,
-		PUS_SERVICE_201 = 0x51020100,
 
 		TM_FUNNEL = 0x52000002,
 

linux/fsfwconfig/returnvalues/classIds.h

@@ -2,7 +2,7 @@
 #define FSFWCONFIG_RETURNVALUES_CLASSIDS_H_
 
 #include <fsfw/returnvalues/FwClassIds.h>
-#include "commonClassIds.h"
+#include <common/config/commonClassIds.h>
 
 /**
  * Source IDs starts at 73 for now