clean up op done

linux/CMakeLists.txt

@@ -1,10 +1,11 @@
 add_subdirectory(utility)
 add_subdirectory(callbacks)
 add_subdirectory(boardtest)
-add_subdirectory(devices)
 add_subdirectory(ipcore)
 add_subdirectory(com)
 add_subdirectory(acs)
+add_subdirectory(tcs)
+add_subdirectory(payload)
 
 if(EIVE_ADD_LINUX_FSFWCONFIG)
   add_subdirectory(fsfwconfig)
@@ -12,7 +13,7 @@ endif()
 
 # Dependency on proprietary library
 if(TGT_BSP MATCHES "arm/q7s")
-  add_subdirectory(csp)
+  add_subdirectory(power)
 endif()
 
 target_sources(${OBSW_NAME} PUBLIC ObjectFactory.cpp scheduling.cpp)

linux/ObjectFactory.cpp

@@ -10,16 +10,16 @@
 #include <fsfw_hal/linux/spi/SpiCookie.h>
 #include <linux/acs/SusPolling.h>
 #include <linux/callbacks/gpioCallbacks.h>
-#include <linux/devices/Max31865RtdPolling.h>
+#include <linux/tcs/Max31865RtdPolling.h>
 #include <mission/acs/SusHandler.h>
 #include <mission/controller/AcsController.h>
-#include <mission/core/GenericFactory.h>
-#include <mission/devices/Max31865EiveHandler.h>
-#include <mission/devices/ScexDeviceHandler.h>
+#include <mission/genericFactory.h>
+#include <mission/payload/ScexDeviceHandler.h>
 #include <mission/system/acs/SusAssembly.h>
 #include <mission/system/acs/SusFdir.h>
 #include <mission/system/fdir/RtdFdir.h>
 #include <mission/system/objects/TcsBoardAssembly.h>
+#include <mission/tcs/Max31865EiveHandler.h>
 
 #include "OBSWConfig.h"
 #include "devConf.h"

linux/ObjectFactory.h

@@ -5,14 +5,13 @@
 #include <fsfw_hal/linux/gpio/LinuxLibgpioIF.h>
 #include <mission/com/CcsdsIpCoreHandler.h>
 #include <mission/memory/SdCardMountedIF.h>
+#include <mission/tcs/HeaterHandler.h>
 #include <mission/tmtc/CfdpTmFunnel.h>
 #include <mission/tmtc/PusTmFunnel.h>
 
 #include <optional>
 #include <string>
 
-#include "mission/devices/HeaterHandler.h"
-
 class GpioIF;
 class SpiComIF;
 class PowerSwitchIF;

linux/acs/GpsHyperionLinuxController.h

@@ -2,12 +2,12 @@
 #define MISSION_DEVICES_GPSHYPERIONHANDLER_H_
 
 #include <mission/acs/archive/GPSDefinitions.h>
+#include <mission/utility/trace.h>
 
 #include "eive/eventSubsystemIds.h"
 #include "fsfw/FSFW.h"
 #include "fsfw/controller/ExtendedControllerBase.h"
 #include "fsfw/devicehandlers/DeviceHandlerBase.h"
-#include "mission/trace.h"
 
 #ifdef FSFW_OSAL_LINUX
 #include <gps.h>

linux/acs/SusPolling.cpp

@@ -4,12 +4,11 @@
 #include <fsfw/tasks/TaskFactory.h>
 #include <fsfw/timemanager/Stopwatch.h>
 #include <fsfw_hal/linux/spi/SpiCookie.h>
+#include <mission/acs/susMax1227Helpers.h>
 #include <mission/controller/acs/AcsParameters.h>
-#include <mission/devices/max1227.h>
+#include <mission/tcs/max1227.h>
 #include <unistd.h>
 
-#include "mission/devices/devicedefinitions/susMax1227Helpers.h"
-
 using namespace returnvalue;
 
 SusPolling::SusPolling(object_id_t objectId, SpiComIF& spiComIF, GpioIF& gpioIF)

linux/boardtest/SpiTestClass.cpp

@@ -18,8 +18,9 @@
 #if defined(XIPHOS_Q7S)
 #include "busConf.h"
 #endif
+#include <mission/tcs/max1227.h>
+
 #include "devices/gpioIds.h"
-#include "mission/devices/max1227.h"
 
 SpiTestClass::SpiTestClass(object_id_t objectId, GpioIF *gpioIF)
     : TestTask(objectId), gpioIF(gpioIF) {

linux/boardtest/UartTestClass.cpp

@@ -4,9 +4,10 @@
 #include <fcntl.h>  // Contains file controls like O_RDWR
 #include <fsfw/tasks/TaskFactory.h>
 #include <fsfw_hal/linux/serial/SerialCookie.h>
-#include <linux/devices/ScexDleParser.h>
-#include <linux/devices/ScexHelper.h>
-#include <linux/devices/ScexUartReader.h>
+#include <linux/payload/ScexDleParser.h>
+#include <linux/payload/ScexHelper.h>
+#include <linux/payload/ScexUartReader.h>
+#include <mission/payload/scexHelpers.h>
 #include <unistd.h>  // write(), read(), close()
 
 #include <random>
@@ -18,7 +19,6 @@
 #include "fsfw/globalfunctions/DleEncoder.h"
 #include "fsfw/globalfunctions/arrayprinter.h"
 #include "fsfw/serviceinterface.h"
-#include "mission/devices/devicedefinitions/ScexDefinitions.h"
 
 #define GPS_REPLY_WIRETAPPING 0
 

linux/boardtest/UartTestClass.h

@@ -6,12 +6,12 @@
 #include <fsfw/globalfunctions/DleParser.h>
 #include <fsfw/timemanager/Countdown.h>
 #include <fsfw_hal/linux/serial/SerialCookie.h>
+#include <mission/payload/scexHelpers.h>
 #include <termios.h>  // Contains POSIX terminal control definitions
 
 #include <array>
 
 //#include "lwgps/lwgps.h"
-#include "mission/devices/devicedefinitions/ScexDefinitions.h"
 #include "test/TestTask.h"
 
 class ScexUartReader;

linux/devices/CMakeLists.txt

@@ -1,4 +0,0 @@
-target_sources(${OBSW_NAME} PRIVATE Max31865RtdPolling.cpp ScexUartReader.cpp
-                                    ScexDleParser.cpp ScexHelper.cpp)
-
-add_subdirectory(ploc)

linux/devices/ploc/CMakeLists.txt

@@ -1,4 +0,0 @@
-target_sources(
-  ${OBSW_NAME}
-  PRIVATE PlocSupervisorHandler.cpp PlocMemoryDumper.cpp PlocMPSoCHandler.cpp
-          PlocMPSoCHelper.cpp PlocSupvUartMan.cpp)

linux/fsfwconfig/events/translateEvents.cpp

@@ -1,7 +1,7 @@
 /**
  * @brief    Auto-generated event translation file. Contains 279 translations.
  * @details
- * Generated on: 2023-03-24 21:09:31
+ * Generated on: 2023-03-26 16:40:57
  */
 #include "translateEvents.h"
 

linux/fsfwconfig/objects/translateObjects.cpp

@@ -2,7 +2,7 @@
  * @brief  Auto-generated object translation file.
  * @details
  * Contains 173 translations.
- * Generated on: 2023-03-24 21:09:31
+ * Generated on: 2023-03-26 16:40:57
  */
 #include "translateObjects.h"
 

linux/payload/CMakeLists.txt

@@ -0,0 +1,10 @@
+target_sources(
+  ${OBSW_NAME}
+  PUBLIC PlocMemoryDumper.cpp
+         PlocMpsocHandler.cpp
+         PlocMpsocHelper.cpp
+         PlocSupervisorHandler.cpp
+         PlocSupvUartMan.cpp
+         ScexDleParser.cpp
+         ScexHelper.cpp
+         ScexUartReader.cpp)

linux/payload/PlocMemoryDumper.cpp

@@ -1,6 +1,5 @@
-#include "PlocMemoryDumper.h"
-
 #include <fsfw/src/fsfw/serialize/SerializeAdapter.h>
+#include <linux/payload/PlocMemoryDumper.h>
 
 #include <filesystem>
 #include <fstream>

linux/payload/PlocMemoryDumper.h

@@ -1,8 +1,8 @@
 #ifndef MISSION_DEVICES_PLOCMEMORYDUMPER_H_
 #define MISSION_DEVICES_PLOCMEMORYDUMPER_H_
 
-#include <linux/devices/devicedefinitions/PlocMemDumpDefinitions.h>
-#include <linux/devices/devicedefinitions/PlocSupervisorDefinitions.h>
+#include <linux/payload/plocMemDumpDefs.h>
+#include <linux/payload/plocSupvDefs.h>
 
 #include "OBSWConfig.h"
 

linux/payload/PlocMpsocHandler.cpp

@@ -1,11 +1,11 @@
-#include "PlocMPSoCHandler.h"
+#include <linux/payload/PlocMpsocHandler.h>
+#include <linux/payload/plocSupvDefs.h>
 
 #include <sstream>
 
 #include "OBSWConfig.h"
 #include "fsfw/datapool/PoolReadGuard.h"
 #include "fsfw/globalfunctions/CRC.h"
-#include "linux/devices/devicedefinitions/PlocSupervisorDefinitions.h"
 
 PlocMPSoCHandler::PlocMPSoCHandler(object_id_t objectId, object_id_t uartComIFid,
                                    CookieIF* comCookie, PlocMPSoCHelper* plocMPSoCHelper,

linux/payload/PlocMpsocHandler.h

@@ -1,9 +1,13 @@
 #ifndef BSP_Q7S_DEVICES_PLOC_PLOCMPSOCHANDLER_H_
 #define BSP_Q7S_DEVICES_PLOC_PLOCMPSOCHANDLER_H_
 
+#include <linux/payload/PlocMpsocHelper.h>
+#include <linux/payload/mpsocRetvals.h>
+#include <linux/payload/plocMpscoDefs.h>
+#include <linux/payload/plocSupvDefs.h>
+
 #include <string>
 
-#include "PlocMPSoCHelper.h"
 #include "fsfw/action/CommandActionHelper.h"
 #include "fsfw/action/CommandsActionsIF.h"
 #include "fsfw/devicehandlers/DeviceHandlerBase.h"
@@ -11,9 +15,6 @@
 #include "fsfw/tmtcservices/SourceSequenceCounter.h"
 #include "fsfw_hal/linux/gpio/Gpio.h"
 #include "fsfw_hal/linux/serial/SerialComIF.h"
-#include "linux/devices/devicedefinitions/MPSoCReturnValuesIF.h"
-#include "linux/devices/devicedefinitions/PlocMPSoCDefinitions.h"
-#include "linux/devices/devicedefinitions/PlocSupervisorDefinitions.h"
 
 /**
  * @brief	This is the device handler for the MPSoC of the payload computer.

linux/payload/PlocMpsocHelper.cpp

@@ -1,4 +1,4 @@
-#include "PlocMPSoCHelper.h"
+#include <linux/payload/PlocMpsocHelper.h>
 
 #include <filesystem>
 #include <fstream>

linux/payload/PlocMpsocHelper.h

@@ -1,6 +1,9 @@
 #ifndef BSP_Q7S_DEVICES_PLOCMPSOCHELPER_H_
 #define BSP_Q7S_DEVICES_PLOCMPSOCHELPER_H_
 
+#include <linux/payload/plocMpscoDefs.h>
+#include <mission/utility/trace.h>
+
 #include <string>
 
 #include "fsfw/devicehandlers/CookieIF.h"
@@ -10,8 +13,6 @@
 #include "fsfw/tasks/ExecutableObjectIF.h"
 #include "fsfw/tmtcservices/SourceSequenceCounter.h"
 #include "fsfw_hal/linux/serial/SerialComIF.h"
-#include "linux/devices/devicedefinitions/PlocMPSoCDefinitions.h"
-#include "mission/trace.h"
 #ifdef XIPHOS_Q7S
 #include "bsp_q7s/fs/SdCardManager.h"
 #endif

linux/payload/PlocSupervisorHandler.h

@@ -1,7 +1,8 @@
 #ifndef MISSION_DEVICES_PLOCSUPERVISORHANDLER_H_
 #define MISSION_DEVICES_PLOCSUPERVISORHANDLER_H_
 
-#include <linux/devices/ploc/PlocSupvUartMan.h>
+#include <linux/payload/PlocSupvUartMan.h>
+#include <linux/payload/plocSupvDefs.h>
 
 #include "OBSWConfig.h"
 #include "devices/powerSwitcherList.h"
@@ -10,7 +11,6 @@
 #include "fsfw_hal/linux/gpio/Gpio.h"
 #include "fsfw_hal/linux/gpio/LinuxLibgpioIF.h"
 #include "fsfw_hal/linux/serial/SerialComIF.h"
-#include "linux/devices/devicedefinitions/PlocSupervisorDefinitions.h"
 
 #ifdef XIPHOS_Q7S
 #include "bsp_q7s/fs/SdCardManager.h"

linux/payload/PlocSupvUartMan.cpp

@@ -3,7 +3,7 @@
 #include <fsfw/filesystem/HasFileSystemIF.h>
 #include <fsfw/globalfunctions/arrayprinter.h>
 #include <fsfw/tasks/SemaphoreFactory.h>
-#include <linux/devices/ploc/PlocSupvUartMan.h>
+#include <linux/payload/PlocSupvUartMan.h>
 #include <unistd.h>
 
 #include <cmath>

linux/payload/PlocSupvUartMan.h

@@ -2,6 +2,8 @@
 #define BSP_Q7S_DEVICES_PLOCSUPVHELPER_H_
 
 #include <fsfw/container/SimpleRingBuffer.h>
+#include <linux/payload/plocSupvDefs.h>
+#include <mission/utility/trace.h>
 #include <termios.h>
 
 #include <string>
@@ -14,8 +16,6 @@
 #include "fsfw/returnvalues/returnvalue.h"
 #include "fsfw/tasks/ExecutableObjectIF.h"
 #include "fsfw_hal/linux/serial/SerialComIF.h"
-#include "linux/devices/devicedefinitions/PlocSupervisorDefinitions.h"
-#include "mission/trace.h"
 #include "tas/crc.h"
 
 #ifdef XIPHOS_Q7S

linux/payload/ScexDleParser.cpp

@@ -1,4 +1,4 @@
-#include "ScexDleParser.h"
+#include <linux/payload/ScexDleParser.h>
 
 ScexDleParser::ScexDleParser(SimpleRingBuffer &decodeRingBuf, DleEncoder &decoder,
                              BufPair encodedBuf, BufPair decodedBuf)

linux/payload/ScexHelper.cpp

@@ -1,6 +1,5 @@
-#include "ScexHelper.h"
-
 #include <fsfw/globalfunctions/CRC.h>
+#include <linux/payload/ScexHelper.h>
 
 #include "fsfw/serviceinterface.h"
 

linux/payload/ScexHelper.h

@@ -1,7 +1,7 @@
-#ifndef LINUX_DEVICES_SCEXHELPER_H_
-#define LINUX_DEVICES_SCEXHELPER_H_
+#ifndef LINUX_PAYLOAD_SCEXHELPER_H_
+#define LINUX_PAYLOAD_SCEXHELPER_H_
 #include <fsfw/serialize/SerializeIF.h>
-#include <mission/devices/devicedefinitions/ScexDefinitions.h>
+#include <mission/payload/scexHelpers.h>
 
 #include <cstddef>
 #include <cstdint>
@@ -43,4 +43,4 @@ class ScexHelper : public SerializeIF {
   size_t totalPacketLen = 0;
 };
 
-#endif /* LINUX_DEVICES_SCEXHELPER_H_ */
+#endif /* LINUX_PAYLOAD_SCEXHELPER_H_ */

linux/payload/ScexUartReader.cpp

@@ -1,5 +1,3 @@
-#include "ScexUartReader.h"
-
 #include <fcntl.h>  // Contains file controls like O_RDWR
 #include <fsfw/globalfunctions/arrayprinter.h>
 #include <fsfw/ipc/MutexFactory.h>
@@ -7,6 +5,7 @@
 #include <fsfw/tasks/SemaphoreFactory.h>
 #include <fsfw/tasks/TaskFactory.h>
 #include <fsfw_hal/linux/serial/SerialCookie.h>
+#include <linux/payload/ScexUartReader.h>
 #include <unistd.h>  // write(), read(), close()
 
 #include <cerrno>  // Error integer and strerror() function

linux/payload/ScexUartReader.h

@@ -7,7 +7,7 @@
 #include <fsfw/objectmanager/SystemObject.h>
 #include <fsfw/tasks/ExecutableObjectIF.h>
 #include <fsfw/timemanager/Countdown.h>
-#include <linux/devices/ScexDleParser.h>
+#include <linux/payload/ScexDleParser.h>
 #include <termios.h>  // Contains POSIX terminal control definitions
 
 class SemaphoreIF;

linux/payload/plocMpscoDefs.h

@@ -1,12 +1,14 @@
 #ifndef MISSION_DEVICES_DEVICEDEFINITIONS_PLOCMPSOCDEFINITIONS_H_
 #define MISSION_DEVICES_DEVICEDEFINITIONS_PLOCMPSOCDEFINITIONS_H_
 
-#include "MPSoCReturnValuesIF.h"
+#include <fsfw/devicehandlers/DeviceHandlerIF.h>
+#include <linux/payload/mpsocRetvals.h>
+#include <mission/payload/plocSpBase.h>
+
 #include "OBSWConfig.h"
 #include "eive/definitions.h"
 #include "fsfw/globalfunctions/CRC.h"
 #include "fsfw/serialize/SerializeAdapter.h"
-#include "mission/devices/devicedefinitions/SpBase.h"
 
 namespace mpsoc {
 

linux/payload/plocSupvDefs.h

@@ -8,11 +8,11 @@
 #include <fsfw/timemanager/Clock.h>
 #include <fsfw/tmtcpacket/ccsds/SpacePacketCreator.h>
 #include <fsfw/tmtcpacket/ccsds/SpacePacketReader.h>
+#include <mission/payload/plocSpBase.h>
 
 #include <optional>
 
 #include "eive/resultClassIds.h"
-#include "mission/devices/devicedefinitions/SpBase.h"
 
 namespace supv {
 

linux/power/CspComIF.cpp

@@ -1,8 +1,7 @@
-#include "CspComIF.h"
-
 #include <csp/drivers/can_socketcan.h>
 #include <fsfw/serialize/SerializeAdapter.h>
 #include <fsfw/serviceinterface/ServiceInterfaceStream.h>
+#include <linux/power/CspComIF.h>
 #include <mission/power/CspCookie.h>
 #include <mission/power/gsDefs.h>
 #include <p60acu.h>

linux/power/CspComIF.h

@@ -1,5 +1,5 @@
-#ifndef LINUX_CSP_CSPCOMIF_H_
-#define LINUX_CSP_CSPCOMIF_H_
+#ifndef LINUX_POWER_CSPCOMIF_H_
+#define LINUX_POWER_CSPCOMIF_H_
 
 #include <csp/csp.h>
 #include <csp/csp_autoconfig.h>
@@ -90,4 +90,4 @@ class CspComIF : public DeviceCommunicationIF, public SystemObject {
   static void *routerWorkWrapper(void *args);
 };
 
-#endif /* LINUX_CSP_CSPCOMIF_H_ */
+#endif /* LINUX_POWER_CSPCOMIF_H_ */

linux/tcs/CMakeLists.txt

@@ -0,0 +1 @@
+target_sources(${OBSW_NAME} PUBLIC Max31865RtdPolling.cpp)

linux/tcs/Max31865RtdPolling.cpp

@@ -1,7 +1,7 @@
 #include <fsfw/tasks/TaskFactory.h>
 #include <fsfw/timemanager/Stopwatch.h>
 #include <fsfw_hal/linux/spi/ManualCsLockGuard.h>
-#include <linux/devices/Max31865RtdPolling.h>
+#include <linux/tcs/Max31865RtdPolling.h>
 
 #define OBSW_RTD_AUTO_MODE 1
 

linux/tcs/Max31865RtdPolling.h

@@ -6,10 +6,10 @@
 #include <fsfw/timemanager/clockDefinitions.h>
 #include <fsfw_hal/linux/spi/SpiComIF.h>
 #include <fsfw_hal/linux/spi/SpiCookie.h>
+#include <mission/tcs/Max31865Definitions.h>
 
 #include "devConf.h"
 #include "fsfw/devicehandlers/DeviceCommunicationIF.h"
-#include "mission/devices/devicedefinitions/Max31865Definitions.h"
 
 struct Max31865ReaderCookie : public CookieIF {
   Max31865ReaderCookie(){};