clean up op done

mission/CMakeLists.txt

@@ -1,6 +1,4 @@
 add_subdirectory(controller)
-add_subdirectory(core)
-add_subdirectory(devices)
 add_subdirectory(utility)
 add_subdirectory(memory)
 add_subdirectory(tmtc)
@@ -8,7 +6,12 @@ add_subdirectory(system)
 add_subdirectory(com)
 add_subdirectory(acs)
 add_subdirectory(power)
+add_subdirectory(tcs)
+add_subdirectory(payload)
 add_subdirectory(cfdp)
 add_subdirectory(config)
 
-target_sources(${LIB_EIVE_MISSION} PRIVATE payloadDefs.cpp trace.cpp)
+target_sources(
+  ${LIB_EIVE_MISSION}
+  PRIVATE SolarArrayDeploymentHandler.cpp genericFactory.cpp
+          pollingSeqTables.cpp scheduling.cpp)

mission/SolarArrayDeploymentHandler.cpp

@@ -1,7 +1,7 @@
-#include "SolarArrayDeploymentHandler.h"
-
 #include <fsfw/filesystem/HasFileSystemIF.h>
 #include <fsfw/tasks/TaskFactory.h>
+#include <mission/SolarArrayDeploymentHandler.h>
+#include <mission/utility/trace.h>
 
 #include <filesystem>
 #include <fstream>
@@ -11,7 +11,6 @@
 #include "fsfw/ipc/QueueFactory.h"
 #include "fsfw/objectmanager/ObjectManager.h"
 #include "fsfw_hal/common/gpio/GpioCookie.h"
-#include "mission/trace.h"
 
 static constexpr bool DEBUG_MODE = true;
 

mission/SolarArrayDeploymentHandler.h

@@ -2,6 +2,7 @@
 #define MISSION_DEVICES_SOLARARRAYDEPLOYMENT_H_
 
 #include <fsfw/globalfunctions/PeriodicOperationDivider.h>
+#include <mission/utility/trace.h>
 
 #include <unordered_map>
 
@@ -19,7 +20,6 @@
 #include "fsfw/timemanager/Countdown.h"
 #include "fsfw_hal/common/gpio/GpioIF.h"
 #include "mission/memory/SdCardMountedIF.h"
-#include "mission/trace.h"
 #include "returnvalues/classIds.h"
 
 enum DeploymentChannels : uint8_t { SA_1 = 1, SA_2 = 2 };

mission/acs/SusHandler.cpp

@@ -1,6 +1,6 @@
 #include "SusHandler.h"
 
-#include <mission/devices/max1227.h>
+#include <mission/tcs/max1227.h>
 
 #include <cmath>
 

mission/acs/SusHandler.h

@@ -3,11 +3,11 @@
 
 #include <eive/eventSubsystemIds.h>
 #include <eive/resultClassIds.h>
+#include <mission/acs/susMax1227Helpers.h>
 
 #include "fsfw/devicehandlers/DeviceHandlerBase.h"
 #include "fsfw/globalfunctions/PeriodicOperationDivider.h"
 #include "mission/acs/acsBoardPolling.h"
-#include "mission/devices/devicedefinitions/susMax1227Helpers.h"
 
 class SusHandler : public DeviceHandlerBase {
  public:

mission/acs/archive/LegacySusHandler.h

@@ -2,11 +2,11 @@
 #define MISSION_DEVICES_LEGACYSUSHANDLER_H_
 
 #include <fsfw/devicehandlers/DeviceHandlerBase.h>
-#include <mission/devices/devicedefinitions/susMax1227Helpers.h>
+#include <mission/acs/susMax1227Helpers.h>
+#include <mission/tcs/max1227.h>
 
 #include "events/subsystemIdRanges.h"
 #include "fsfw/globalfunctions/PeriodicOperationDivider.h"
-#include "mission/devices/max1227.h"
 #include "returnvalues/classIds.h"
 
 /**

mission/controller/AcsController.h

@@ -11,8 +11,8 @@
 #include <fsfw_hal/devicehandlers/MgmRM3100Handler.h>
 #include <mission/acs/imtqHelpers.h>
 #include <mission/acs/rwHelpers.h>
-#include <mission/devices/devicedefinitions/susMax1227Helpers.h>
-#include <mission/trace.h>
+#include <mission/acs/susMax1227Helpers.h>
+#include <mission/utility/trace.h>
 
 #include "acs/ActuatorCmd.h"
 #include "acs/Guidance.h"

mission/controller/ThermalController.cpp

@@ -10,7 +10,7 @@
 #include <mission/acs/rwHelpers.h>
 #include <mission/acs/str/strHelpers.h>
 #include <mission/com/syrlinksDefs.h>
-#include <mission/devices/devicedefinitions/payloadPcduDefinitions.h>
+#include <mission/payload/payloadPcduDefinitions.h>
 #include <mission/power/bpxBattDefs.h>
 #include <mission/power/gsDefs.h>
 #include <objects/systemObjectList.h>

mission/controller/ThermalController.h

@@ -11,20 +11,19 @@
 #include <mission/acs/imtqHelpers.h>
 #include <mission/acs/rwHelpers.h>
 #include <mission/acs/str/strHelpers.h>
+#include <mission/acs/susMax1227Helpers.h>
 #include <mission/com/syrlinksDefs.h>
 #include <mission/controller/controllerdefinitions/ThermalControllerDefinitions.h>
-#include <mission/devices/devicedefinitions/Max31865Definitions.h>
-#include <mission/devices/devicedefinitions/Tmp1075Definitions.h>
-#include <mission/devices/devicedefinitions/payloadPcduDefinitions.h>
-#include <mission/devices/devicedefinitions/susMax1227Helpers.h>
+#include <mission/payload/payloadPcduDefinitions.h>
 #include <mission/power/bpxBattDefs.h>
 #include <mission/power/gsDefs.h>
+#include <mission/tcs/HeaterHandler.h>
+#include <mission/tcs/Max31865Definitions.h>
+#include <mission/tcs/Tmp1075Definitions.h>
+#include <mission/utility/trace.h>
 
 #include <list>
 
-#include "mission/devices/HeaterHandler.h"
-#include "mission/trace.h"
-
 /**
  * NOP Limit: Hard limit for device, usually from datasheet. Device damage is possible lif NOP limit
  * is exceeded.

mission/controller/acs/SensorValues.h

@@ -9,7 +9,7 @@
 #include <mission/acs/imtqHelpers.h>
 #include <mission/acs/rwHelpers.h>
 #include <mission/acs/str/strHelpers.h>
-#include <mission/devices/devicedefinitions/susMax1227Helpers.h>
+#include <mission/acs/susMax1227Helpers.h>
 
 namespace ACS {
 

mission/core/CMakeLists.txt

@@ -1,2 +0,0 @@
-target_sources(${LIB_EIVE_MISSION} PRIVATE GenericFactory.cpp scheduling.cpp
-                                           pollingSeqTables.cpp)

mission/devices/CMakeLists.txt

@@ -1,12 +0,0 @@
-target_sources(
-  ${LIB_EIVE_MISSION}
-  PRIVATE Tmp1075Handler.cpp
-          Max31865EiveHandler.cpp
-          HeaterHandler.cpp
-          RadiationSensorHandler.cpp
-          max1227.cpp
-          PayloadPcduHandler.cpp
-          SolarArrayDeploymentHandler.cpp
-          ScexDeviceHandler.cpp)
-
-add_subdirectory(devicedefinitions)

mission/devices/devicedefinitions/CMakeLists.txt

@@ -1 +0,0 @@
-target_sources(${LIB_EIVE_MISSION} PRIVATE ScexDefinitions.cpp)

mission/genericFactory.cpp

@@ -1,5 +1,3 @@
-#include "GenericFactory.h"
-
 #include <fsfw/cfdp/CfdpDistributor.h>
 #include <fsfw/cfdp/handler/CfdpHandler.h>
 #include <fsfw/cfdp/handler/RemoteConfigTableIF.h>
@@ -26,13 +24,14 @@
 #include <fsfw/timemanager/CdsShortTimeStamper.h>
 #include <fsfw_hal/host/HostFilesystem.h>
 #include <mission/controller/ThermalController.h>
-#include <mission/devices/HeaterHandler.h>
+#include <mission/genericFactory.h>
 #include <mission/persistentTmStoreDefs.h>
 #include <mission/power/gsDefs.h>
 #include <mission/system/acs/AcsBoardAssembly.h>
 #include <mission/system/acs/RwAssembly.h>
 #include <mission/system/acs/SusAssembly.h>
 #include <mission/system/objects/TcsBoardAssembly.h>
+#include <mission/tcs/HeaterHandler.h>
 #include <mission/tmtc/CfdpTmFunnel.h>
 #include <mission/tmtc/PersistentTmStore.h>
 #include <mission/tmtc/PersistentTmStoreWithTmQueue.h>

mission/genericFactory.h

@@ -4,12 +4,12 @@
 #include <fsfw/devicehandlers/DeviceHandlerBase.h>
 #include <mission/memory/SdCardMountedIF.h>
 #include <mission/persistentTmStoreDefs.h>
+#include <mission/tcs/Max31865Definitions.h>
 #include <mission/tmtc/PersistentTmStoreWithTmQueue.h>
 
 #include "fsfw/objectmanager/SystemObjectIF.h"
 #include "fsfw/power/PowerSwitchIF.h"
 #include "fsfw_hal/common/gpio/GpioIF.h"
-#include "mission/devices/devicedefinitions/Max31865Definitions.h"
 
 using persTmStore::PersistentTmStores;
 

mission/payload/CMakeLists.txt

@@ -0,0 +1,3 @@
+target_sources(
+  ${LIB_EIVE_MISSION} PRIVATE PayloadPcduHandler.cpp RadiationSensorHandler.cpp
+                              ScexDeviceHandler.cpp scexHelpers.cpp defs.cpp)

mission/payload/PayloadPcduHandler.cpp

@@ -1,6 +1,5 @@
-#include "PayloadPcduHandler.h"
-
 #include <fsfw/src/fsfw/datapool/PoolReadGuard.h>
+#include <mission/payload/PayloadPcduHandler.h>
 
 #include "OBSWConfig.h"
 

mission/payload/PayloadPcduHandler.h

@@ -4,12 +4,12 @@
 #include <fsfw/devicehandlers/DeviceHandlerBase.h>
 #include <fsfw/globalfunctions/PeriodicOperationDivider.h>
 #include <fsfw/timemanager/Countdown.h>
+#include <mission/payload/payloadPcduDefinitions.h>
 #include <mission/system/objects/Stack5VHandler.h>
 
 #include "events/subsystemIdRanges.h"
 #include "fsfw/FSFW.h"
 #include "fsfw_hal/common/gpio/GpioIF.h"
-#include "mission/devices/devicedefinitions/payloadPcduDefinitions.h"
 #include "mission/memory/SdCardMountedIF.h"
 #include "mission/power/defs.h"
 #include "mission/system/DualLanePowerStateMachine.h"

mission/payload/RadiationSensorHandler.cpp

@@ -1,9 +1,9 @@
 #include <OBSWConfig.h>
 #include <devices/gpioIds.h>
 #include <fsfw/datapool/PoolReadGuard.h>
-#include <mission/devices/RadiationSensorHandler.h>
-#include <mission/devices/max1227.h>
+#include <mission/payload/RadiationSensorHandler.h>
 #include <mission/power/gsDefs.h>
+#include <mission/tcs/max1227.h>
 
 RadiationSensorHandler::RadiationSensorHandler(object_id_t objectId, object_id_t comIF,
                                                CookieIF *comCookie, GpioIF *gpioIF,

mission/payload/RadiationSensorHandler.h

@@ -1,9 +1,9 @@
-#ifndef MISSION_DEVICES_RADIATIONSENSORHANDLER_H_
-#define MISSION_DEVICES_RADIATIONSENSORHANDLER_H_
+#ifndef MISSION_PAYLOAD_RADIATIONSENSORHANDLER_H_
+#define MISSION_PAYLOAD_RADIATIONSENSORHANDLER_H_
 
 #include <fsfw/devicehandlers/DeviceHandlerBase.h>
 #include <fsfw_hal/common/gpio/GpioIF.h>
-#include <mission/devices/devicedefinitions/RadSensorDefinitions.h>
+#include <mission/payload/radSensorDefinitions.h>
 #include <mission/system/objects/Stack5VHandler.h>
 
 /**
@@ -54,4 +54,4 @@ class RadiationSensorHandler : public DeviceHandlerBase {
   CommunicationStep communicationStep = CommunicationStep::START_CONVERSION;
 };
 
-#endif /* MISSION_DEVICES_RADIATIONSENSORHANDLER_H_ */
+#endif /* MISSION_PAYLOAD_RADIATIONSENSORHANDLER_H_ */

mission/payload/ScexDeviceHandler.cpp

@@ -1,8 +1,8 @@
-#include "ScexDeviceHandler.h"
-
 #include <fsfw/filesystem/HasFileSystemIF.h>
-#include <linux/devices/ScexHelper.h>
+#include <linux/payload/ScexHelper.h>
 #include <mission/memory/SdCardMountedIF.h>
+#include <mission/payload/ScexDeviceHandler.h>
+#include <mission/payload/scexHelpers.h>
 
 #include <algorithm>
 #include <ctime>
@@ -12,7 +12,6 @@
 #include <random>
 
 #include "fsfw/globalfunctions/CRC.h"
-#include "mission/devices/devicedefinitions/ScexDefinitions.h"
 
 using std::ofstream;
 using namespace returnvalue;

mission/payload/ScexDeviceHandler.h

@@ -1,9 +1,9 @@
-#ifndef MISSION_DEVICES_SCEXDEVICEHANDLER_H_
-#define MISSION_DEVICES_SCEXDEVICEHANDLER_H_
+#ifndef MISSION_PAYLOAD_SCEXDEVICEHANDLER_H_
+#define MISSION_PAYLOAD_SCEXDEVICEHANDLER_H_
 
 #include <fsfw/devicehandlers/DeviceHandlerBase.h>
-#include <linux/devices/ScexHelper.h>
-#include <linux/devices/ScexUartReader.h>
+#include <linux/payload/ScexHelper.h>
+#include <linux/payload/ScexUartReader.h>
 
 #include <optional>
 
@@ -62,4 +62,4 @@ class ScexDeviceHandler : public DeviceHandlerBase {
   void modeChanged() override;
 };
 
-#endif /* MISSION_DEVICES_SCEXDEVICEHANDLER_H_ */
+#endif /* MISSION_PAYLOAD_SCEXDEVICEHANDLER_H_ */

mission/payload/defs.cpp

@@ -1,4 +1,4 @@
-#include "payloadDefs.h"
+#include <mission/payload/defs.h>
 
 const char* payload::getModeStr(Mode mode) {
   static const char* modeStr = "UNKNOWN";

mission/payload/payloadPcduDefinitions.h

@@ -4,13 +4,13 @@
 #include <fsfw/datapoollocal/StaticLocalDataSet.h>
 #include <fsfw/devicehandlers/DeviceHandlerIF.h>
 #include <mission/memory/NvmParameterBase.h>
+#include <mission/tcs/max1227.h>
 
 #include <cstddef>
 #include <filesystem>
 #include <nlohmann/json.hpp>
 
 #include "OBSWConfig.h"
-#include "mission/devices/max1227.h"
 
 namespace plpcdu {
 

mission/payload/plocSpBase.h

@@ -1,6 +1,7 @@
-#ifndef MISSION_DEVICES_DEVICEDEFINITIONS_SPBASE_H_
-#define MISSION_DEVICES_DEVICEDEFINITIONS_SPBASE_H_
+#ifndef MISSION_PAYLOAD_PLOCSPBASE_H_
+#define MISSION_PAYLOAD_PLOCSPBASE_H_
 
+#include <fsfw/globalfunctions/CRC.h>
 #include <fsfw/tmtcpacket/ccsds/SpacePacketCreator.h>
 #include <fsfw/tmtcpacket/ccsds/SpacePacketReader.h>
 
@@ -117,4 +118,4 @@ class SpTmReader : public SpacePacketReader {
 
 }  // namespace ploc
 
-#endif /* MISSION_DEVICES_DEVICEDEFINITIONS_SPBASE_H_ */
+#endif /* MISSION_PAYLOAD_PLOCSPBASE_H_ */

mission/payload/scexHelpers.cpp

@@ -1,6 +1,5 @@
-#include "ScexDefinitions.h"
-
 #include <fsfw/globalfunctions/CRC.h>
+#include <mission/payload/scexHelpers.h>
 
 #include <cstring>
 

mission/payload/scexHelpers.h

@@ -1,5 +1,5 @@
-#ifndef MISSION_DEVICES_DEVICEDEFINITIONS_SCEXDEFINITIONS_H_
-#define MISSION_DEVICES_DEVICEDEFINITIONS_SCEXDEFINITIONS_H_
+#ifndef MISSION_PAYLOAD_SCEXHELPERS_H_
+#define MISSION_PAYLOAD_SCEXHELPERS_H_
 
 #include <fsfw/devicehandlers/DeviceHandlerIF.h>
 #include <fsfw/events/Event.h>
@@ -49,4 +49,4 @@ ReturnValue_t prepareScexCmd(Cmds cmd, std::pair<uint8_t*, size_t> cmdBufPair, s
 
 }  // namespace scex
 
-#endif /* MISSION_DEVICES_DEVICEDEFINITIONS_SCEXDEFINITIONS_H_ */
+#endif /* MISSION_PAYLOAD_SCEXHELPERS_H_ */

mission/pollingSeqTables.cpp

@@ -5,10 +5,10 @@
 #include <fsfw/serviceinterface/ServiceInterfaceStream.h>
 #include <fsfw/tasks/FixedTimeslotTaskIF.h>
 #include <mission/acs/imtqHelpers.h>
+#include <mission/tcs/Max31865Definitions.h>
 
 #include "OBSWConfig.h"
 #include "eive/definitions.h"
-#include "mission/devices/devicedefinitions/Max31865Definitions.h"
 
 #ifndef RPI_TEST_ADIS16507
 #define RPI_TEST_ADIS16507 0

mission/power/BpxBatteryHandler.h

@@ -3,8 +3,7 @@
 
 #include <fsfw/devicehandlers/DeviceHandlerBase.h>
 #include <mission/power/bpxBattDefs.h>
-
-#include "mission/trace.h"
+#include <mission/utility/trace.h>
 
 class BpxBatteryHandler : public DeviceHandlerBase {
  public:

mission/scheduling.cpp

@@ -1,7 +1,8 @@
 #include "scheduling.h"
 
+#include <mission/tcs/Max31865Definitions.h>
+
 #include "fsfw/tasks/PeriodicTaskIF.h"
-#include "mission/devices/devicedefinitions/Max31865Definitions.h"
 
 void scheduling::scheduleTmpTempSensors(PeriodicTaskIF* tmpTask) {
   const std::array<object_id_t, 5> tmpIds = {

mission/system/objects/PayloadSubsystem.cpp

@@ -1,6 +1,6 @@
 #include "PayloadSubsystem.h"
 
-#include "mission/payloadDefs.h"
+#include <mission/payload/defs.h>
 
 PayloadSubsystem::PayloadSubsystem(object_id_t setObjectId, uint32_t maxNumberOfSequences,
                                    uint32_t maxNumberOfTables)

mission/system/tree/payloadModeTree.cpp

@@ -4,10 +4,10 @@
 #include <fsfw/modes/HasModesIF.h>
 #include <fsfw/retval.h>
 #include <fsfw/subsystem/Subsystem.h>
+#include <mission/payload/defs.h>
+#include <mission/payload/payloadPcduDefinitions.h>
 
 #include "eive/objects.h"
-#include "mission/devices/devicedefinitions/payloadPcduDefinitions.h"
-#include "mission/payloadDefs.h"
 #include "mission/power/defs.h"
 #include "mission/system/objects/PayloadSubsystem.h"
 #include "util.h"

mission/tcs/CMakeLists.txt

@@ -0,0 +1,3 @@
+target_sources(
+  ${LIB_EIVE_MISSION} PRIVATE HeaterHandler.cpp max1227.cpp
+                              Max31865EiveHandler.cpp Tmp1075Handler.cpp)

mission/tcs/HeaterHandler.cpp

@@ -1,9 +1,8 @@
-#include "HeaterHandler.h"
-
 #include <fsfw/health/HealthTableIF.h>
 #include <fsfw/ipc/QueueFactory.h>
 #include <fsfw/objectmanager/ObjectManager.h>
 #include <fsfw_hal/common/gpio/GpioCookie.h>
+#include <mission/tcs/HeaterHandler.h>
 
 #include <stdexcept>
 

mission/tcs/HeaterHandler.h

@@ -1,5 +1,5 @@
-#ifndef MISSION_DEVICES_HEATERHANDLER_H_
-#define MISSION_DEVICES_HEATERHANDLER_H_
+#ifndef MISSION_TCS_HEATERHANDLER_H_
+#define MISSION_TCS_HEATERHANDLER_H_
 
 #include <fsfw/action/HasActionsIF.h>
 #include <fsfw/devicehandlers/CookieIF.h>
@@ -209,4 +209,4 @@ class HeaterHandler : public ExecutableObjectIF,
   bool allSwitchesOff();
 };
 
-#endif /* MISSION_DEVICES_HEATERHANDLER_H_ */
+#endif /* MISSION_TCS_HEATERHANDLER_H_ */

mission/tcs/Max31865EiveHandler.cpp

@@ -1,6 +1,5 @@
-#include "Max31865EiveHandler.h"
-
 #include <fsfw/datapool/PoolReadGuard.h>
+#include <mission/tcs/Max31865EiveHandler.h>
 
 Max31865EiveHandler::Max31865EiveHandler(object_id_t objectId, object_id_t comIF,
                                          CookieIF* comCookie)

mission/tcs/Max31865EiveHandler.h

@@ -1,10 +1,9 @@
-#ifndef MISSION_DEVICES_MAX31865EIVEHANDLER_H_
-#define MISSION_DEVICES_MAX31865EIVEHANDLER_H_
+#ifndef MISSION_TCS_MAX31865EIVEHANDLER_H_
+#define MISSION_TCS_MAX31865EIVEHANDLER_H_
 
 #include <fsfw/devicehandlers/DeviceHandlerBase.h>
 #include <fsfw/globalfunctions/PeriodicOperationDivider.h>
-
-#include "devicedefinitions/Max31865Definitions.h"
+#include <mission/tcs/Max31865Definitions.h>
 
 class Max31865EiveHandler : public DeviceHandlerBase {
  public:
@@ -44,4 +43,4 @@ class Max31865EiveHandler : public DeviceHandlerBase {
   bool transitionOk = false;
 };
 
-#endif /* MISSION_DEVICES_MAX31865EIVEHANDLER_H_ */
+#endif /* MISSION_TCS_MAX31865EIVEHANDLER_H_ */

mission/tcs/Max31865PT1000Handler.cpp

@@ -1,4 +1,4 @@
-#include "Max31865PT1000Handler.h"
+#include <mission/tcs/Max31865PT1000Handler.h>
 
 #include <bitset>
 #include <cmath>

mission/tcs/Max31865PT1000Handler.h

@@ -1,15 +1,14 @@
-#ifndef MISSION_DEVICES_MAX31865PT1000HANDLER_H_
-#define MISSION_DEVICES_MAX31865PT1000HANDLER_H_
+#ifndef MISSION_TCS_MAX31865PT1000HANDLER_H_
+#define MISSION_TCS_MAX31865PT1000HANDLER_H_
 
 #include <OBSWConfig.h>
 #include <fsfw/devicehandlers/DeviceHandlerBase.h>
 #include <fsfw/globalfunctions/PeriodicOperationDivider.h>
+#include <mission/tcs/Max31865Definitions.h>
 
 #include <array>
 #include <cstdint>
 
-#include "devicedefinitions/Max31865Definitions.h"
-
 /**
  * @brief       Device Handler for the thermal sensors
  * @details
@@ -122,4 +121,4 @@ class Max31865PT1000Handler : public DeviceHandlerBase {
 #endif
 };
 
-#endif /* MISSION_DEVICES_MAX31865PT1000HANDLER_H_ */
+#endif /* MISSION_TCS_MAX31865PT1000HANDLER_H_ */

mission/tcs/Tmp1075Definitions.h

@@ -1,5 +1,11 @@
-#ifndef MISSION_DEVICES_DEVICEDEFINITIONS_TMP1075DEFINITIONS_H_
-#define MISSION_DEVICES_DEVICEDEFINITIONS_TMP1075DEFINITIONS_H_
+#ifndef MISSION_TCS_TMP1075DEFINITIONS_H_
+#define MISSION_TCS_TMP1075DEFINITIONS_H_
+
+#include <fsfw/datapoollocal/StaticLocalDataSet.h>
+
+#include <cstdint>
+
+#include "fsfw/devicehandlers/DeviceHandlerIF.h"
 
 namespace TMP1075 {
 static const uint8_t TEMP_REG_ADDR = 0x0;
@@ -33,4 +39,4 @@ class Tmp1075Dataset : public StaticLocalDataSet<sizeof(float)> {
 };
 }  // namespace TMP1075
 
-#endif /* MISSION_DEVICES_DEVICEDEFINITIONS_TMP1075DEFINITIONS_H_ */
+#endif /* MISSION_TCS_TMP1075DEFINITIONS_H_ */

mission/tcs/Tmp1075Handler.cpp

@@ -1,6 +1,6 @@
 #include <OBSWConfig.h>
-#include <mission/devices/Tmp1075Handler.h>
-#include <mission/devices/devicedefinitions/Tmp1075Definitions.h>
+#include <mission/tcs/Tmp1075Definitions.h>
+#include <mission/tcs/Tmp1075Handler.h>
 
 Tmp1075Handler::Tmp1075Handler(object_id_t objectId, object_id_t comIF, CookieIF *comCookie)
     : DeviceHandlerBase(objectId, comIF, comCookie), dataset(this) {

mission/tcs/Tmp1075Handler.h

@@ -1,8 +1,8 @@
-#ifndef MISSION_DEVICES_TMP1075HANDLER_H_
-#define MISSION_DEVICES_TMP1075HANDLER_H_
+#ifndef MISSION_TCS_TMP1075HANDLER_H_
+#define MISSION_TCS_TMP1075HANDLER_H_
 
 #include <fsfw/devicehandlers/DeviceHandlerBase.h>
-#include <mission/devices/devicedefinitions/Tmp1075Definitions.h>
+#include <mission/tcs/Tmp1075Definitions.h>
 
 /**
  * @brief	This is the device handler class for the tmp1075 temperature sensor.
@@ -59,4 +59,4 @@ class Tmp1075Handler : public DeviceHandlerBase {
   CommunicationStep communicationStep = CommunicationStep::START_ADC_CONVERSION;
 };
 
-#endif /* MISSION_DEVICES_TMP1075HANDLER_H_ */
+#endif /* MISSION_TCS_TMP1075HANDLER_H_ */

mission/tcs/max1227.cpp

@@ -1,4 +1,4 @@
-#include "max1227.h"
+#include <mission/tcs/max1227.h>
 
 #include <cstring>
 

mission/tcs/max1227.h

@@ -1,5 +1,5 @@
-#ifndef MISSION_DEVICES_MAX1227_H_
-#define MISSION_DEVICES_MAX1227_H_
+#ifndef MISSION_TCS_MAX1227_H_
+#define MISSION_TCS_MAX1227_H_
 
 #include <cstddef>
 #include <cstdint>
@@ -81,4 +81,4 @@ float getTemperature(uint16_t raw);
 
 }  // namespace max1227
 
-#endif /* MISSION_DEVICES_MAX1227_H_ */
+#endif /* MISSION_TCS_MAX1227_H_ */

mission/tmtc/PersistentLogTmStoreTask.h

@@ -5,7 +5,7 @@
 #include <fsfw/storagemanager/StorageManagerIF.h>
 #include <fsfw/tasks/ExecutableObjectIF.h>
 #include <fsfw/tmtcservices/AcceptsTelemetryIF.h>
-#include <mission/core/GenericFactory.h>
+#include <mission/genericFactory.h>
 #include <mission/tmtc/PersistentTmStore.h>
 #include <mission/tmtc/PersistentTmStoreWithTmQueue.h>
 #include <mission/tmtc/TmStoreTaskBase.h>

mission/utility/CMakeLists.txt

@@ -1,3 +1,4 @@
 target_sources(
-  ${LIB_EIVE_MISSION} PRIVATE Timestamp.cpp ProgressPrinter.cpp Filenaming.cpp
-                              GlobalConfigHandler.cpp DummySdCardManager.cpp)
+  ${LIB_EIVE_MISSION}
+  PRIVATE Timestamp.cpp ProgressPrinter.cpp Filenaming.cpp
+          GlobalConfigHandler.cpp DummySdCardManager.cpp trace.cpp)

mission/utility/trace.cpp

@@ -1,4 +1,4 @@
-#include "trace.h"
+#include <mission/utility/trace.h>
 
 #include "fsfw/serviceinterface.h"
 

mission/utility/trace.h

@@ -1,5 +1,5 @@
-#ifndef MISSION_TRACE_H_
-#define MISSION_TRACE_H_
+#ifndef MISSION_UTILITY_TRACE_H_
+#define MISSION_UTILITY_TRACE_H_
 
 #include <cstdint>
 
@@ -11,4 +11,4 @@ void threadTrace(uint32_t& counter, const char* name, unsigned div = 5);
 
 }
 
-#endif /* MISSION_TRACE_H_ */
+#endif /* MISSION_UTILITY_TRACE_H_ */