From 623f52398e5abef25e87f1b4b7e631462b0e153b Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Mon, 17 May 2021 20:03:56 +0200 Subject: [PATCH] moved fsfwconfig into linux folder --- CMakeLists.txt | 8 +- bsp_q7s/InitMission.cpp | 5 +- fsfwconfig/ipc/MissionMessageTypes.cpp | 11 -- generators/events/event_parser.py | 2 +- generators/mib_objects.csv | 35 +++++- generators/objects/objects.py | 16 ++- generators/objects/translateObjects.cpp | 105 ++++++++++++++++-- linux/CMakeLists.txt | 1 + linux/boardtest/LibgpiodTest.cpp | 3 +- linux/boardtest/SpiTestClass.cpp | 2 +- linux/devices/HeaterHandler.h | 3 +- .../fsfwconfig}/CMakeLists.txt | 0 {fsfwconfig => linux/fsfwconfig}/FSFWConfig.h | 0 {fsfwconfig => linux/fsfwconfig}/OBSWConfig.h | 0 .../fsfwconfig}/devices/addresses.cpp | 0 .../fsfwconfig}/devices/addresses.h | 2 +- .../fsfwconfig}/devices/gpioIds.h | 0 .../fsfwconfig}/devices/heaterSwitcherList.h | 4 +- .../fsfwconfig}/devices/powerSwitcherList.h | 2 +- .../fsfwconfig}/devices/spi.h | 0 .../fsfwconfig}/events/subsystemIdRanges.h | 0 .../fsfwconfig}/events/translateEvents.cpp | 0 .../fsfwconfig}/events/translateEvents.h | 0 .../fsfwconfig}/fsfwconfig.mk | 0 linux/fsfwconfig/ipc/MissionMessageTypes.cpp | 12 ++ .../fsfwconfig}/ipc/MissionMessageTypes.h | 0 .../fsfwconfig}/objects/systemObjectList.h | 0 .../fsfwconfig}/objects/translateObjects.cpp | 2 +- .../fsfwconfig}/objects/translateObjects.h | 0 .../pollingSequenceFactory.cpp | 2 +- .../pollingsequence/pollingSequenceFactory.h | 0 .../fsfwconfig}/returnvalues/classIds.h | 0 {fsfwconfig => linux/fsfwconfig}/tmtc/apid.h | 0 .../fsfwconfig}/tmtc/pusIds.h | 0 .../devicedefinitions/Max31865Definitions.h | 2 +- 35 files changed, 165 insertions(+), 52 deletions(-) delete mode 100644 fsfwconfig/ipc/MissionMessageTypes.cpp rename {fsfwconfig => linux/fsfwconfig}/CMakeLists.txt (100%) rename {fsfwconfig => linux/fsfwconfig}/FSFWConfig.h (100%) rename {fsfwconfig => linux/fsfwconfig}/OBSWConfig.h (100%) rename {fsfwconfig => linux/fsfwconfig}/devices/addresses.cpp (100%) rename {fsfwconfig => linux/fsfwconfig}/devices/addresses.h (92%) rename {fsfwconfig => linux/fsfwconfig}/devices/gpioIds.h (100%) rename {fsfwconfig => linux/fsfwconfig}/devices/heaterSwitcherList.h (94%) rename {fsfwconfig => linux/fsfwconfig}/devices/powerSwitcherList.h (95%) rename {fsfwconfig => linux/fsfwconfig}/devices/spi.h (100%) rename {fsfwconfig => linux/fsfwconfig}/events/subsystemIdRanges.h (100%) rename {fsfwconfig => linux/fsfwconfig}/events/translateEvents.cpp (100%) rename {fsfwconfig => linux/fsfwconfig}/events/translateEvents.h (100%) rename {fsfwconfig => linux/fsfwconfig}/fsfwconfig.mk (100%) create mode 100644 linux/fsfwconfig/ipc/MissionMessageTypes.cpp rename {fsfwconfig => linux/fsfwconfig}/ipc/MissionMessageTypes.h (100%) rename {fsfwconfig => linux/fsfwconfig}/objects/systemObjectList.h (100%) rename {fsfwconfig => linux/fsfwconfig}/objects/translateObjects.cpp (99%) rename {fsfwconfig => linux/fsfwconfig}/objects/translateObjects.h (100%) rename {fsfwconfig => linux/fsfwconfig}/pollingsequence/pollingSequenceFactory.cpp (99%) rename {fsfwconfig => linux/fsfwconfig}/pollingsequence/pollingSequenceFactory.h (100%) rename {fsfwconfig => linux/fsfwconfig}/returnvalues/classIds.h (100%) rename {fsfwconfig => linux/fsfwconfig}/tmtc/apid.h (100%) rename {fsfwconfig => linux/fsfwconfig}/tmtc/pusIds.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index c799f927..f0887e25 100644 --- a/CMakeLists.txt +++ b/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 "fsfwconfig") + set(FSFW_CONFIG_PATH "linux/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() diff --git a/bsp_q7s/InitMission.cpp b/bsp_q7s/InitMission.cpp index 797c5e71..ce385037 100644 --- a/bsp_q7s/InitMission.cpp +++ b/bsp_q7s/InitMission.cpp @@ -1,6 +1,7 @@ #include "InitMission.h" #include "ObjectFactory.h" -#include +#include "OBSWConfig.h" +#include "pollingsequence/pollingSequenceFactory.h" #include @@ -11,7 +12,7 @@ #include #include #include -#include + #include /* This is configured for linux without CR */ diff --git a/fsfwconfig/ipc/MissionMessageTypes.cpp b/fsfwconfig/ipc/MissionMessageTypes.cpp deleted file mode 100644 index 8536245f..00000000 --- a/fsfwconfig/ipc/MissionMessageTypes.cpp +++ /dev/null @@ -1,11 +0,0 @@ -#include -#include - -void messagetypes::clearMissionMessage(CommandMessage* message) { -// switch(message->getMessageType()) { -// default: -// break; -// } -} - - diff --git a/generators/events/event_parser.py b/generators/events/event_parser.py index bed2c6fd..c04f5dfc 100644 --- a/generators/events/event_parser.py +++ b/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" diff --git a/generators/mib_objects.csv b/generators/mib_objects.csv index 5c0bc321..3e3e8cb6 100644 --- a/generators/mib_objects.csv +++ b/generators/mib_objects.csv @@ -1,6 +1,13 @@ -0x42694269;TEST_TASK -0x4400AFFE;DUMMY_HANDLER +0x00005060;P60DOCK_TEST_TASK +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 diff --git a/generators/objects/objects.py b/generators/objects/objects.py index 966957e5..8709fe22 100644 --- a/generators/objects/objects.py +++ b/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"../../fsfwconfig/objects/" -else: - CPP_COPY_DESTINATION = f"../../{BSP_DIR_NAME}/fsfwconfig/objects/" - +CPP_COPY_DESTINATION = f"{FSFW_CONFIG_ROOT}/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] diff --git a/generators/objects/translateObjects.cpp b/generators/objects/translateObjects.cpp index 9aac2b47..9bdb173f 100644 --- a/generators/objects/translateObjects.cpp +++ b/generators/objects/translateObjects.cpp @@ -1,14 +1,21 @@ /** * @brief Auto-generated object translation file. * @details - * Contains 31 translations. - * Generated on: 2021-05-17 19:12:49 + * Contains 60 translations. + * Generated on: 2021-05-17 19:57:25 */ #include "translateObjects.h" -const char *TEST_TASK_STRING = "TEST_TASK"; -const char *DUMMY_HANDLER_STRING = "DUMMY_HANDLER"; +const char *P60DOCK_TEST_TASK_STRING = "P60DOCK_TEST_TASK"; +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: - return TEST_TASK_STRING; - case 0x4400AFFE: - return DUMMY_HANDLER_STRING; + case 0x00005060: + return P60DOCK_TEST_TASK_STRING; + case 0x44001000: + 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: diff --git a/linux/CMakeLists.txt b/linux/CMakeLists.txt index 1e00391b..a078035a 100644 --- a/linux/CMakeLists.txt +++ b/linux/CMakeLists.txt @@ -3,3 +3,4 @@ add_subdirectory(uart) add_subdirectory(utility) add_subdirectory(boardtest) add_subdirectory(devices) +add_subdirectory(fsfwconfig) \ No newline at end of file diff --git a/linux/boardtest/LibgpiodTest.cpp b/linux/boardtest/LibgpiodTest.cpp index d085671a..3aa9c22a 100644 --- a/linux/boardtest/LibgpiodTest.cpp +++ b/linux/boardtest/LibgpiodTest.cpp @@ -1,6 +1,7 @@ #include "LibgpiodTest.h" -#include +#include "devices/gpioIds.h" + #include #include #include diff --git a/linux/boardtest/SpiTestClass.cpp b/linux/boardtest/SpiTestClass.cpp index 387c7eb5..4fc52f29 100644 --- a/linux/boardtest/SpiTestClass.cpp +++ b/linux/boardtest/SpiTestClass.cpp @@ -1,6 +1,6 @@ #include "SpiTestClass.h" -#include +#include "devices/gpioIds.h" #include #include diff --git a/linux/devices/HeaterHandler.h b/linux/devices/HeaterHandler.h index 8969ebd9..678710df 100644 --- a/linux/devices/HeaterHandler.h +++ b/linux/devices/HeaterHandler.h @@ -1,12 +1,13 @@ #ifndef MISSION_DEVICES_HEATERHANDLER_H_ #define MISSION_DEVICES_HEATERHANDLER_H_ +#include "devices/heaterSwitcherList.h" + #include #include #include #include #include -#include #include #include #include diff --git a/fsfwconfig/CMakeLists.txt b/linux/fsfwconfig/CMakeLists.txt similarity index 100% rename from fsfwconfig/CMakeLists.txt rename to linux/fsfwconfig/CMakeLists.txt diff --git a/fsfwconfig/FSFWConfig.h b/linux/fsfwconfig/FSFWConfig.h similarity index 100% rename from fsfwconfig/FSFWConfig.h rename to linux/fsfwconfig/FSFWConfig.h diff --git a/fsfwconfig/OBSWConfig.h b/linux/fsfwconfig/OBSWConfig.h similarity index 100% rename from fsfwconfig/OBSWConfig.h rename to linux/fsfwconfig/OBSWConfig.h diff --git a/fsfwconfig/devices/addresses.cpp b/linux/fsfwconfig/devices/addresses.cpp similarity index 100% rename from fsfwconfig/devices/addresses.cpp rename to linux/fsfwconfig/devices/addresses.cpp diff --git a/fsfwconfig/devices/addresses.h b/linux/fsfwconfig/devices/addresses.h similarity index 92% rename from fsfwconfig/devices/addresses.h rename to linux/fsfwconfig/devices/addresses.h index 3de3a105..0deb8490 100644 --- a/fsfwconfig/devices/addresses.h +++ b/linux/fsfwconfig/devices/addresses.h @@ -2,7 +2,7 @@ #define FSFWCONFIG_DEVICES_ADDRESSES_H_ #include -#include +#include "objects/systemObjectList.h" #include namespace addresses { diff --git a/fsfwconfig/devices/gpioIds.h b/linux/fsfwconfig/devices/gpioIds.h similarity index 100% rename from fsfwconfig/devices/gpioIds.h rename to linux/fsfwconfig/devices/gpioIds.h diff --git a/fsfwconfig/devices/heaterSwitcherList.h b/linux/fsfwconfig/devices/heaterSwitcherList.h similarity index 94% rename from fsfwconfig/devices/heaterSwitcherList.h rename to linux/fsfwconfig/devices/heaterSwitcherList.h index eeb59068..014e795c 100644 --- a/fsfwconfig/devices/heaterSwitcherList.h +++ b/linux/fsfwconfig/devices/heaterSwitcherList.h @@ -1,6 +1,8 @@ #ifndef FSFWCONFIG_DEVICES_HEATERSWITCHERLIST_H_ #define FSFWCONFIG_DEVICES_HEATERSWITCHERLIST_H_ +#include + namespace heaterSwitches { enum switcherList: uint8_t { HEATER_0, @@ -15,6 +17,4 @@ namespace heaterSwitches { }; } - - #endif /* FSFWCONFIG_DEVICES_HEATERSWITCHERLIST_H_ */ diff --git a/fsfwconfig/devices/powerSwitcherList.h b/linux/fsfwconfig/devices/powerSwitcherList.h similarity index 95% rename from fsfwconfig/devices/powerSwitcherList.h rename to linux/fsfwconfig/devices/powerSwitcherList.h index b8e3f89f..48821db2 100644 --- a/fsfwconfig/devices/powerSwitcherList.h +++ b/linux/fsfwconfig/devices/powerSwitcherList.h @@ -1,7 +1,7 @@ #ifndef FSFWCONFIG_DEVICES_POWERSWITCHERLIST_H_ #define FSFWCONFIG_DEVICES_POWERSWITCHERLIST_H_ -#include +#include "OBSWConfig.h" namespace pcduSwitches { /* Switches are uint8_t datatype and go from 0 to 255 */ diff --git a/fsfwconfig/devices/spi.h b/linux/fsfwconfig/devices/spi.h similarity index 100% rename from fsfwconfig/devices/spi.h rename to linux/fsfwconfig/devices/spi.h diff --git a/fsfwconfig/events/subsystemIdRanges.h b/linux/fsfwconfig/events/subsystemIdRanges.h similarity index 100% rename from fsfwconfig/events/subsystemIdRanges.h rename to linux/fsfwconfig/events/subsystemIdRanges.h diff --git a/fsfwconfig/events/translateEvents.cpp b/linux/fsfwconfig/events/translateEvents.cpp similarity index 100% rename from fsfwconfig/events/translateEvents.cpp rename to linux/fsfwconfig/events/translateEvents.cpp diff --git a/fsfwconfig/events/translateEvents.h b/linux/fsfwconfig/events/translateEvents.h similarity index 100% rename from fsfwconfig/events/translateEvents.h rename to linux/fsfwconfig/events/translateEvents.h diff --git a/fsfwconfig/fsfwconfig.mk b/linux/fsfwconfig/fsfwconfig.mk similarity index 100% rename from fsfwconfig/fsfwconfig.mk rename to linux/fsfwconfig/fsfwconfig.mk diff --git a/linux/fsfwconfig/ipc/MissionMessageTypes.cpp b/linux/fsfwconfig/ipc/MissionMessageTypes.cpp new file mode 100644 index 00000000..9ac6f0f4 --- /dev/null +++ b/linux/fsfwconfig/ipc/MissionMessageTypes.cpp @@ -0,0 +1,12 @@ +#include "MissionMessageTypes.h" +#include + + +void messagetypes::clearMissionMessage(CommandMessage* message) { + switch(message->getMessageType()) { + default: + break; + } +} + + diff --git a/fsfwconfig/ipc/MissionMessageTypes.h b/linux/fsfwconfig/ipc/MissionMessageTypes.h similarity index 100% rename from fsfwconfig/ipc/MissionMessageTypes.h rename to linux/fsfwconfig/ipc/MissionMessageTypes.h diff --git a/fsfwconfig/objects/systemObjectList.h b/linux/fsfwconfig/objects/systemObjectList.h similarity index 100% rename from fsfwconfig/objects/systemObjectList.h rename to linux/fsfwconfig/objects/systemObjectList.h diff --git a/fsfwconfig/objects/translateObjects.cpp b/linux/fsfwconfig/objects/translateObjects.cpp similarity index 99% rename from fsfwconfig/objects/translateObjects.cpp rename to linux/fsfwconfig/objects/translateObjects.cpp index 9eccd0b7..9bdb173f 100644 --- a/fsfwconfig/objects/translateObjects.cpp +++ b/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" diff --git a/fsfwconfig/objects/translateObjects.h b/linux/fsfwconfig/objects/translateObjects.h similarity index 100% rename from fsfwconfig/objects/translateObjects.h rename to linux/fsfwconfig/objects/translateObjects.h diff --git a/fsfwconfig/pollingsequence/pollingSequenceFactory.cpp b/linux/fsfwconfig/pollingsequence/pollingSequenceFactory.cpp similarity index 99% rename from fsfwconfig/pollingsequence/pollingSequenceFactory.cpp rename to linux/fsfwconfig/pollingsequence/pollingSequenceFactory.cpp index 578b0c44..a8c7312b 100644 --- a/fsfwconfig/pollingsequence/pollingSequenceFactory.cpp +++ b/linux/fsfwconfig/pollingsequence/pollingSequenceFactory.cpp @@ -6,7 +6,7 @@ #include #include #include -#include +#include "objects/systemObjectList.h" ReturnValue_t pst::pollingSequenceInitDefault(FixedTimeslotTaskIF *thisSequence) diff --git a/fsfwconfig/pollingsequence/pollingSequenceFactory.h b/linux/fsfwconfig/pollingsequence/pollingSequenceFactory.h similarity index 100% rename from fsfwconfig/pollingsequence/pollingSequenceFactory.h rename to linux/fsfwconfig/pollingsequence/pollingSequenceFactory.h diff --git a/fsfwconfig/returnvalues/classIds.h b/linux/fsfwconfig/returnvalues/classIds.h similarity index 100% rename from fsfwconfig/returnvalues/classIds.h rename to linux/fsfwconfig/returnvalues/classIds.h diff --git a/fsfwconfig/tmtc/apid.h b/linux/fsfwconfig/tmtc/apid.h similarity index 100% rename from fsfwconfig/tmtc/apid.h rename to linux/fsfwconfig/tmtc/apid.h diff --git a/fsfwconfig/tmtc/pusIds.h b/linux/fsfwconfig/tmtc/pusIds.h similarity index 100% rename from fsfwconfig/tmtc/pusIds.h rename to linux/fsfwconfig/tmtc/pusIds.h diff --git a/mission/devices/devicedefinitions/Max31865Definitions.h b/mission/devices/devicedefinitions/Max31865Definitions.h index d21f41e4..bdf82dc8 100644 --- a/mission/devices/devicedefinitions/Max31865Definitions.h +++ b/mission/devices/devicedefinitions/Max31865Definitions.h @@ -4,7 +4,7 @@ #include #include #include -#include +#include "objects/systemObjectList.h" namespace Max31865Definitions {