moved fsfwconfig into linux folder

CMakeLists.txt

@@ -72,8 +72,7 @@ if(TGT_BSP)
     if(${TGT_BSP} MATCHES "arm/q7s" OR ${TGT_BSP} MATCHES "arm/raspberrypi" 
             OR ${TGT_BSP} MATCHES "arm/beagleboneblack"
     )
-        set(ROOT_CONFIG_FOLDER TRUE)
+        set(FSFW_CONFIG_PATH "linux/fsfwconfig")
-        set(FSFW_CONFIG_PATH "fsfwconfig")
         set(ADD_LINUX_FILES TRUE)
         set(ADD_CSP_LIB TRUE)
         set(FSFW_HAL_ADD_LINUX ON)
@@ -108,11 +107,6 @@ set(LWGPS_CONFIG_PATH "${COMMON_PATH}/config")
 # Add executable
 add_executable(${TARGET_NAME})
 
-# Add subdirectories
-if(ROOT_CONFIG_FOLDER)
-    add_subdirectory(${FSFW_CONFIG_PATH})
-endif()
-
 if(ADD_CSP_LIB)
     add_subdirectory(${CSP_LIB_PATH})
 endif()

bsp_q7s/InitMission.cpp

@@ -1,6 +1,7 @@
 #include "InitMission.h"
 #include "ObjectFactory.h"
-#include <OBSWConfig.h>
+#include "OBSWConfig.h"
+#include "pollingsequence/pollingSequenceFactory.h"
 
 #include <mission/utility/InitMission.h>
 
@@ -11,7 +12,7 @@
 #include <fsfw/tasks/FixedTimeslotTaskIF.h>
 #include <fsfw/tasks/PeriodicTaskIF.h>
 #include <fsfw/tasks/TaskFactory.h>
-#include <fsfwconfig/pollingsequence/pollingSequenceFactory.h>
+
 #include <iostream>
 
 /* This is configured for linux without CR */

fsfwconfig/ipc/MissionMessageTypes.cpp

@@ -1,11 +0,0 @@
-#include <fsfw/ipc/CommandMessage.h>
-#include <fsfwconfig/ipc/MissionMessageTypes.h>
-
-void messagetypes::clearMissionMessage(CommandMessage* message) {
-//	switch(message->getMessageType()) {
-//	default:
-//		break;
-//	}
-}
-
-

generators/events/event_parser.py

@@ -41,7 +41,7 @@ BSP_SELECT = BspType.BSP_Q7S
 BSP_DIR_NAME = BSP_SELECT.value
 
 if BSP_SELECT == BspType.BSP_Q7S or BSP_SELECT == BspType.BSP_LINUX_BOARD:
-    FSFW_CONFIG_ROOT = f"../../fsfwconfig"
+    FSFW_CONFIG_ROOT = f"../../linux/fsfwconfig"
 
 else:
     FSFW_CONFIG_ROOT = f"../../{BSP_DIR_NAME}/fsfwconfig"

generators/mib_objects.csv

@@ -1,6 +1,13 @@
-0x42694269;TEST_TASK
+0x00005060;P60DOCK_TEST_TASK
-0x4400AFFE;DUMMY_HANDLER
+0x44001000;PCDU_HANDLER
+0x44001001;SOLAR_ARRAY_DEPL_HANDLER
+0x44001002;SYRLINKS_HK_HANDLER
+0x47000001;GPIO_IF
 0x49000001;ARDUINO_COM_IF
+0x49000002;CSP_COM_IF
+0x49000003;I2C_COM_IF
+0x49000004;UART_COM_IF
+0x49000005;SPI_COM_IF
 0x51000300;PUS_SERVICE_3
 0x51000400;PUS_SERVICE_5
 0x51000500;PUS_SERVICE_6
@@ -27,5 +34,27 @@
 0x534f0300;IPC_STORE
 0x53500010;TIME_STAMPER
 0x53ffffff;FSFW_OBJECTS_END
-0xCAFECAFE;DUMMY_INTERFACE
+0x54000003;HEATER_HANDLER
+0x54000004;RTD_IC3
+0x54000005;RTD_IC4
+0x54000006;RTD_IC5
+0x54000007;RTD_IC6
+0x54000008;RTD_IC7
+0x54000009;RTD_IC8
+0x5400000A;RTD_IC9
+0x5400000B;RTD_IC10
+0x5400000C;RTD_IC11
+0x5400000D;RTD_IC12
+0x5400000E;RTD_IC13
+0x5400000F;RTD_IC14
+0x54000010;SPI_TEST
+0x5400001F;RTD_IC15
+0x5400002F;RTD_IC16
+0x5400003F;RTD_IC17
+0x5400004F;RTD_IC18
+0x54000050;RAD_SENSOR
+0x5400AFFE;DUMMY_HANDLER
+0x5400CAFE;DUMMY_INTERFACE
+0x54123456;LIBGPIOD_TEST
+0x54694269;TEST_TASK
 0xFFFFFFFF;NO_OBJECT

generators/objects/objects.py

@@ -32,25 +32,23 @@ GENERATE_HEADER = True
 BSP_SELECT = BspType.BSP_Q7S
 
 BSP_DIR_NAME = BSP_SELECT.value
+if BSP_SELECT == BspType.BSP_Q7S or BSP_SELECT == BspType.BSP_LINUX_BOARD:
+    FSFW_CONFIG_ROOT = f"../../linux/fsfwconfig"
+
+else:
+    FSFW_CONFIG_ROOT = f"../../{BSP_DIR_NAME}/fsfwconfig"
 
 EXPORT_TO_SQL = True
 
-if BSP_SELECT == BspType.BSP_Q7S or BSP_SELECT == BspType.BSP_LINUX_BOARD:
+CPP_COPY_DESTINATION = f"{FSFW_CONFIG_ROOT}/objects/"
-    CPP_COPY_DESTINATION = f"../../fsfwconfig/objects/"
-else:
-    CPP_COPY_DESTINATION = f"../../{BSP_DIR_NAME}/fsfwconfig/objects/"
-
 CSV_MOVE_DESTINATION = "../"
 CPP_FILENAME = "translateObjects.cpp"
 CPP_H_FILENAME = "translateObjects.h"
 CSV_OBJECT_FILENAME = "mib_objects.csv"
 FILE_SEPARATOR = ";"
 
-if BSP_SELECT == BspType.BSP_Q7S or BSP_SELECT == BspType.BSP_LINUX_BOARD:
-    SUBSYSTEM_DEFINITION_DESTINATION = f"../../fsfwconfig/objects/systemObjectList.h"
-else:
-    SUBSYSTEM_DEFINITION_DESTINATION = f"../../{BSP_DIR_NAME}/fsfwconfig/objects/systemObjectList.h"
 
+SUBSYSTEM_DEFINITION_DESTINATION = f"{FSFW_CONFIG_ROOT}/objects/systemObjectList.h"
 FRAMEWORK_SUBSYSTEM_DEFINITION_DESTINATION = "../../fsfw/objectmanager/frameworkObjects.h"
 OBJECTS_DEFINITIONS = [SUBSYSTEM_DEFINITION_DESTINATION, FRAMEWORK_SUBSYSTEM_DEFINITION_DESTINATION]
 

generators/objects/translateObjects.cpp

@@ -1,14 +1,21 @@
 /** 
  * @brief	Auto-generated object translation file.
  * @details
- * Contains 31 translations.
+ * Contains 60 translations.
- * Generated on: 2021-05-17 19:12:49
+ * Generated on: 2021-05-17 19:57:25
  */
 #include "translateObjects.h"
 
-const char *TEST_TASK_STRING = "TEST_TASK";
+const char *P60DOCK_TEST_TASK_STRING = "P60DOCK_TEST_TASK";
-const char *DUMMY_HANDLER_STRING = "DUMMY_HANDLER";
+const char *PCDU_HANDLER_STRING = "PCDU_HANDLER";
+const char *SOLAR_ARRAY_DEPL_HANDLER_STRING = "SOLAR_ARRAY_DEPL_HANDLER";
+const char *SYRLINKS_HK_HANDLER_STRING = "SYRLINKS_HK_HANDLER";
+const char *GPIO_IF_STRING = "GPIO_IF";
 const char *ARDUINO_COM_IF_STRING = "ARDUINO_COM_IF";
+const char *CSP_COM_IF_STRING = "CSP_COM_IF";
+const char *I2C_COM_IF_STRING = "I2C_COM_IF";
+const char *UART_COM_IF_STRING = "UART_COM_IF";
+const char *SPI_COM_IF_STRING = "SPI_COM_IF";
 const char *PUS_SERVICE_3_STRING = "PUS_SERVICE_3";
 const char *PUS_SERVICE_5_STRING = "PUS_SERVICE_5";
 const char *PUS_SERVICE_6_STRING = "PUS_SERVICE_6";
@@ -35,17 +42,53 @@ const char *TM_STORE_STRING = "TM_STORE";
 const char *IPC_STORE_STRING = "IPC_STORE";
 const char *TIME_STAMPER_STRING = "TIME_STAMPER";
 const char *FSFW_OBJECTS_END_STRING = "FSFW_OBJECTS_END";
+const char *HEATER_HANDLER_STRING = "HEATER_HANDLER";
+const char *RTD_IC3_STRING = "RTD_IC3";
+const char *RTD_IC4_STRING = "RTD_IC4";
+const char *RTD_IC5_STRING = "RTD_IC5";
+const char *RTD_IC6_STRING = "RTD_IC6";
+const char *RTD_IC7_STRING = "RTD_IC7";
+const char *RTD_IC8_STRING = "RTD_IC8";
+const char *RTD_IC9_STRING = "RTD_IC9";
+const char *RTD_IC10_STRING = "RTD_IC10";
+const char *RTD_IC11_STRING = "RTD_IC11";
+const char *RTD_IC12_STRING = "RTD_IC12";
+const char *RTD_IC13_STRING = "RTD_IC13";
+const char *RTD_IC14_STRING = "RTD_IC14";
+const char *SPI_TEST_STRING = "SPI_TEST";
+const char *RTD_IC15_STRING = "RTD_IC15";
+const char *RTD_IC16_STRING = "RTD_IC16";
+const char *RTD_IC17_STRING = "RTD_IC17";
+const char *RTD_IC18_STRING = "RTD_IC18";
+const char *RAD_SENSOR_STRING = "RAD_SENSOR";
+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 *NO_OBJECT_STRING = "NO_OBJECT";
 
 const char* translateObject(object_id_t object) {
 	switch( (object & 0xFFFFFFFF) ) {
-	case 0x42694269:
+	case 0x00005060:
-		return TEST_TASK_STRING;
+		return P60DOCK_TEST_TASK_STRING;
-	case 0x4400AFFE:
+	case 0x44001000:
-		return DUMMY_HANDLER_STRING;
+		return PCDU_HANDLER_STRING;
+	case 0x44001001:
+		return SOLAR_ARRAY_DEPL_HANDLER_STRING;
+	case 0x44001002:
+		return SYRLINKS_HK_HANDLER_STRING;
+	case 0x47000001:
+		return GPIO_IF_STRING;
 	case 0x49000001:
 		return ARDUINO_COM_IF_STRING;
+	case 0x49000002:
+		return CSP_COM_IF_STRING;
+	case 0x49000003:
+		return I2C_COM_IF_STRING;
+	case 0x49000004:
+		return UART_COM_IF_STRING;
+	case 0x49000005:
+		return SPI_COM_IF_STRING;
 	case 0x51000300:
 		return PUS_SERVICE_3_STRING;
 	case 0x51000400:
@@ -98,8 +141,52 @@ const char* translateObject(object_id_t object) {
 		return TIME_STAMPER_STRING;
 	case 0x53ffffff:
 		return FSFW_OBJECTS_END_STRING;
-	case 0xCAFECAFE:
+	case 0x54000003:
+		return HEATER_HANDLER_STRING;
+	case 0x54000004:
+		return RTD_IC3_STRING;
+	case 0x54000005:
+		return RTD_IC4_STRING;
+	case 0x54000006:
+		return RTD_IC5_STRING;
+	case 0x54000007:
+		return RTD_IC6_STRING;
+	case 0x54000008:
+		return RTD_IC7_STRING;
+	case 0x54000009:
+		return RTD_IC8_STRING;
+	case 0x5400000A:
+		return RTD_IC9_STRING;
+	case 0x5400000B:
+		return RTD_IC10_STRING;
+	case 0x5400000C:
+		return RTD_IC11_STRING;
+	case 0x5400000D:
+		return RTD_IC12_STRING;
+	case 0x5400000E:
+		return RTD_IC13_STRING;
+	case 0x5400000F:
+		return RTD_IC14_STRING;
+	case 0x54000010:
+		return SPI_TEST_STRING;
+	case 0x5400001F:
+		return RTD_IC15_STRING;
+	case 0x5400002F:
+		return RTD_IC16_STRING;
+	case 0x5400003F:
+		return RTD_IC17_STRING;
+	case 0x5400004F:
+		return RTD_IC18_STRING;
+	case 0x54000050:
+		return RAD_SENSOR_STRING;
+	case 0x5400AFFE:
+		return DUMMY_HANDLER_STRING;
+	case 0x5400CAFE:
 		return DUMMY_INTERFACE_STRING;
+	case 0x54123456:
+		return LIBGPIOD_TEST_STRING;
+	case 0x54694269:
+		return TEST_TASK_STRING;
 	case 0xFFFFFFFF:
 		return NO_OBJECT_STRING;
 	default:

linux/CMakeLists.txt

@@ -3,3 +3,4 @@ add_subdirectory(uart)
 add_subdirectory(utility)
 add_subdirectory(boardtest)
 add_subdirectory(devices)
+add_subdirectory(fsfwconfig)

linux/boardtest/LibgpiodTest.cpp

@@ -1,6 +1,7 @@
 #include "LibgpiodTest.h"
 
-#include <fsfwconfig/devices/gpioIds.h>
+#include "devices/gpioIds.h"
+
 #include <fsfw/serviceinterface/ServiceInterfaceStream.h>
 #include <fsfw/objectmanager/ObjectManagerIF.h>
 #include <fsfw/tasks/TaskFactory.h>

linux/boardtest/SpiTestClass.cpp

@@ -1,6 +1,6 @@
 #include "SpiTestClass.h"
 
-#include <fsfwconfig/devices/gpioIds.h>
+#include "devices/gpioIds.h"
 
 #include <fsfw/serviceinterface/ServiceInterface.h>
 #include <fsfw/globalfunctions/arrayprinter.h>

linux/devices/HeaterHandler.h

@@ -1,12 +1,13 @@
 #ifndef MISSION_DEVICES_HEATERHANDLER_H_
 #define MISSION_DEVICES_HEATERHANDLER_H_
 
+#include "devices/heaterSwitcherList.h"
+
 #include <fsfw/objectmanager/SystemObject.h>
 #include <fsfw/tasks/ExecutableObjectIF.h>
 #include <fsfw/returnvalues/HasReturnvaluesIF.h>
 #include <fsfw/action/HasActionsIF.h>
 #include <fsfw/power/PowerSwitchIF.h>
-#include <fsfwconfig/devices/heaterSwitcherList.h>
 #include <fsfw/devicehandlers/DeviceHandlerIF.h>
 #include <fsfw/devicehandlers/CookieIF.h>
 #include <fsfw/timemanager/Countdown.h>

linux/fsfwconfig/devices/addresses.h

@@ -2,7 +2,7 @@
 #define FSFWCONFIG_DEVICES_ADDRESSES_H_
 
 #include <fsfw/devicehandlers/CookieIF.h>
-#include <fsfwconfig/objects/systemObjectList.h>
+#include "objects/systemObjectList.h"
 #include <cstdint>
 
 namespace addresses {

linux/fsfwconfig/devices/heaterSwitcherList.h

@@ -1,6 +1,8 @@
 #ifndef FSFWCONFIG_DEVICES_HEATERSWITCHERLIST_H_
 #define FSFWCONFIG_DEVICES_HEATERSWITCHERLIST_H_
 
+#include <cstdint>
+
 namespace heaterSwitches {
 	enum switcherList: uint8_t {
 		HEATER_0,
@@ -15,6 +17,4 @@ namespace heaterSwitches {
 	};
 }
 
-
-
 #endif /* FSFWCONFIG_DEVICES_HEATERSWITCHERLIST_H_ */

linux/fsfwconfig/devices/powerSwitcherList.h

@@ -1,7 +1,7 @@
 #ifndef FSFWCONFIG_DEVICES_POWERSWITCHERLIST_H_
 #define FSFWCONFIG_DEVICES_POWERSWITCHERLIST_H_
 
-#include <fsfwconfig/OBSWConfig.h>
+#include "OBSWConfig.h"
 
 namespace pcduSwitches {
 	/* Switches are uint8_t datatype and go from 0 to 255 */

linux/fsfwconfig/ipc/MissionMessageTypes.cpp

@@ -0,0 +1,12 @@
+#include "MissionMessageTypes.h"
+#include <fsfw/ipc/CommandMessage.h>
+
+
+void messagetypes::clearMissionMessage(CommandMessage* message) {
+	switch(message->getMessageType()) {
+	default:
+		break;
+	}
+}
+
+

linux/fsfwconfig/objects/translateObjects.cpp

@@ -2,7 +2,7 @@
  * @brief	Auto-generated object translation file.
  * @details
  * Contains 60 translations.
- * Generated on: 2021-05-17 19:11:51
+ * Generated on: 2021-05-17 19:57:25
  */
 #include "translateObjects.h"
 

linux/fsfwconfig/pollingsequence/pollingSequenceFactory.cpp

@@ -6,7 +6,7 @@
 #include <fsfw/serviceinterface/ServiceInterfaceStream.h>
 #include <fsfw/devicehandlers/DeviceHandlerIF.h>
 #include <fsfw/tasks/FixedTimeslotTaskIF.h>
-#include <fsfwconfig/objects/systemObjectList.h>
+#include "objects/systemObjectList.h"
 
 
 ReturnValue_t pst::pollingSequenceInitDefault(FixedTimeslotTaskIF *thisSequence)

mission/devices/devicedefinitions/Max31865Definitions.h

@@ -4,7 +4,7 @@
 #include <fsfw/datapoollocal/StaticLocalDataSet.h>
 #include <fsfw/datapoollocal/LocalPoolVariable.h>
 #include <fsfw/devicehandlers/DeviceHandlerIF.h>
-#include <fsfwconfig/objects/systemObjectList.h>
+#include "objects/systemObjectList.h"
 
 namespace Max31865Definitions {