clean up power code
This commit is contained in:
parent
9af7b6a39b
commit
7c700a9e19
@ -1,9 +1,9 @@
|
||||
#ifndef BSP_Q7S_CALLBACKS_PCDUSWITCHCB_H_
|
||||
#define BSP_Q7S_CALLBACKS_PCDUSWITCHCB_H_
|
||||
|
||||
#include <cstdint>
|
||||
#include <mission/power/gsDefs.h>
|
||||
|
||||
#include "mission/devices/devicedefinitions/GomspaceDefinitions.h"
|
||||
#include <cstdint>
|
||||
|
||||
namespace pcdu {
|
||||
|
||||
|
@ -5,6 +5,7 @@
|
||||
#include <fsfw/container/SimpleRingBuffer.h>
|
||||
#include <fsfw/globalfunctions/PeriodicOperationDivider.h>
|
||||
#include <libxiphos.h>
|
||||
#include <mission/acs/archive/GPSDefinitions.h>
|
||||
|
||||
#include <atomic>
|
||||
#include <cstddef>
|
||||
@ -14,7 +15,6 @@
|
||||
#include "bsp_q7s/fs/SdCardManager.h"
|
||||
#include "events/subsystemIdRanges.h"
|
||||
#include "fsfw/controller/ExtendedControllerBase.h"
|
||||
#include "mission/devices/devicedefinitions/GPSDefinitions.h"
|
||||
#include "mission/trace.h"
|
||||
|
||||
class Timer;
|
||||
|
@ -79,9 +79,13 @@ using gpio::Levels;
|
||||
#include <mission/acs/ImtqHandler.h>
|
||||
#include <mission/acs/rwHelpers.h>
|
||||
#include <mission/com/SyrlinksHandler.h>
|
||||
#include <mission/devices/PcduHandler.h>
|
||||
#include <mission/devices/Pdu1Handler.h>
|
||||
#include <mission/devices/Pdu2Handler.h>
|
||||
#include <mission/power/AcuHandler.h>
|
||||
#include <mission/power/BpxBatteryHandler.h>
|
||||
#include <mission/power/P60DockHandler.h>
|
||||
#include <mission/power/PcduHandler.h>
|
||||
#include <mission/power/Pdu1Handler.h>
|
||||
#include <mission/power/Pdu2Handler.h>
|
||||
#include <mission/power/gsDefs.h>
|
||||
#include <mission/tmtc/VirtualChannelWithQueue.h>
|
||||
|
||||
#include <sstream>
|
||||
@ -106,16 +110,12 @@ using gpio::Levels;
|
||||
#include "mission/com/CcsdsIpCoreHandler.h"
|
||||
#include "mission/com/syrlinksDefs.h"
|
||||
#include "mission/core/GenericFactory.h"
|
||||
#include "mission/devices/ACUHandler.h"
|
||||
#include "mission/devices/BpxBatteryHandler.h"
|
||||
#include "mission/devices/HeaterHandler.h"
|
||||
#include "mission/devices/Max31865PT1000Handler.h"
|
||||
#include "mission/devices/P60DockHandler.h"
|
||||
#include "mission/devices/PayloadPcduHandler.h"
|
||||
#include "mission/devices/RadiationSensorHandler.h"
|
||||
#include "mission/devices/SolarArrayDeploymentHandler.h"
|
||||
#include "mission/devices/Tmp1075Handler.h"
|
||||
#include "mission/devices/devicedefinitions/GomspaceDefinitions.h"
|
||||
#include "mission/devices/devicedefinitions/Max31865Definitions.h"
|
||||
#include "mission/devices/devicedefinitions/RadSensorDefinitions.h"
|
||||
#include "mission/devices/devicedefinitions/payloadPcduDefinitions.h"
|
||||
|
@ -4,7 +4,7 @@
|
||||
#include <fsfw/health/HealthTableIF.h>
|
||||
#include <fsfw/power/DummyPowerSwitcher.h>
|
||||
#include <fsfw_hal/common/gpio/GpioCookie.h>
|
||||
#include <mission/devices/devicedefinitions/GomspaceDefinitions.h>
|
||||
#include <mission/power/gsDefs.h>
|
||||
#include <mission/system/tree/system.h>
|
||||
#include <mission/utility/DummySdCardManager.h>
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
#include <bsp_q7s/callbacks/q7sGpioCallbacks.h>
|
||||
#include <fsfw/storagemanager/LocalPool.h>
|
||||
#include <fsfw/storagemanager/PoolManager.h>
|
||||
#include <mission/devices/devicedefinitions/GomspaceDefinitions.h>
|
||||
#include <mission/power/gsDefs.h>
|
||||
|
||||
#include "OBSWConfig.h"
|
||||
#include "bsp_q7s/core/CoreController.h"
|
||||
|
@ -1,6 +1,6 @@
|
||||
#ifndef FSFWCONFIG_DEVICES_POWERSWITCHERLIST_H_
|
||||
#define FSFWCONFIG_DEVICES_POWERSWITCHERLIST_H_
|
||||
|
||||
#include "mission/devices/devicedefinitions/GomspaceDefinitions.h"
|
||||
#include <mission/power/gsDefs.h>
|
||||
|
||||
#endif /* FSFWCONFIG_DEVICES_POWERSWITCHERLIST_H_ */
|
||||
|
@ -1,6 +1,6 @@
|
||||
#include "AcuDummy.h"
|
||||
|
||||
#include <mission/devices/devicedefinitions/GomspaceDefinitions.h>
|
||||
#include <mission/power/gsDefs.h>
|
||||
|
||||
AcuDummy::AcuDummy(object_id_t objectId, object_id_t comif, CookieIF *comCookie)
|
||||
: DeviceHandlerBase(objectId, comif, comCookie) {}
|
||||
|
@ -1,6 +1,6 @@
|
||||
#include "BpxDummy.h"
|
||||
|
||||
#include <mission/devices/devicedefinitions/BpxBatteryDefinitions.h>
|
||||
#include <mission/power/bpxBattDefs.h>
|
||||
|
||||
BpxDummy::BpxDummy(object_id_t objectId, object_id_t comif, CookieIF *comCookie)
|
||||
: DeviceHandlerBase(objectId, comif, comCookie) {}
|
||||
|
@ -2,7 +2,7 @@
|
||||
#define DUMMIES_GPSCTRLDUMMY_H_
|
||||
|
||||
#include <fsfw/controller/ExtendedControllerBase.h>
|
||||
#include <mission/devices/devicedefinitions/GPSDefinitions.h>
|
||||
#include <mission/acs/archive/GPSDefinitions.h>
|
||||
|
||||
class GpsCtrlDummy : public ExtendedControllerBase {
|
||||
public:
|
||||
|
@ -1,5 +1,5 @@
|
||||
#include <dummies/GpsDhbDummy.h>
|
||||
#include <mission/devices/devicedefinitions/GPSDefinitions.h>
|
||||
#include <mission/acs/archive/GPSDefinitions.h>
|
||||
|
||||
GpsDhbDummy::GpsDhbDummy(object_id_t objectId, object_id_t comif, CookieIF *comCookie)
|
||||
: DeviceHandlerBase(objectId, comif, comCookie) {}
|
||||
|
@ -1,6 +1,6 @@
|
||||
#include "P60DockDummy.h"
|
||||
|
||||
#include <mission/devices/devicedefinitions/GomspaceDefinitions.h>
|
||||
#include <mission/power/gsDefs.h>
|
||||
|
||||
P60DockDummy::P60DockDummy(object_id_t objectId, object_id_t comif, CookieIF *comCookie)
|
||||
: DeviceHandlerBase(objectId, comif, comCookie) {}
|
||||
|
@ -1,6 +1,6 @@
|
||||
#include "PcduHandlerDummy.h"
|
||||
|
||||
#include <mission/devices/devicedefinitions/GomspaceDefinitions.h>
|
||||
#include <mission/power/gsDefs.h>
|
||||
|
||||
PcduHandlerDummy::PcduHandlerDummy(object_id_t objectId, object_id_t comif, CookieIF *comCookie)
|
||||
: DeviceHandlerBase(objectId, comif, comCookie), dummySwitcher(objectId, 18, 18, false) {}
|
||||
|
@ -1,6 +1,6 @@
|
||||
#include "PduDummy.h"
|
||||
|
||||
#include <mission/devices/devicedefinitions/GomspaceDefinitions.h>
|
||||
#include <mission/power/gsDefs.h>
|
||||
|
||||
PduDummy::PduDummy(object_id_t objectId, object_id_t comif, CookieIF *comCookie)
|
||||
: DeviceHandlerBase(objectId, comif, comCookie),
|
||||
|
@ -2,8 +2,7 @@
|
||||
#define DUMMIES_PDUDUMMY_H_
|
||||
|
||||
#include <fsfw/devicehandlers/DeviceHandlerBase.h>
|
||||
|
||||
#include "mission/devices/devicedefinitions/GomspaceDefinitions.h"
|
||||
#include <mission/power/gsDefs.h>
|
||||
|
||||
class PduDummy : public DeviceHandlerBase {
|
||||
public:
|
||||
|
@ -1,6 +1,6 @@
|
||||
#include "PlPcduDummy.h"
|
||||
|
||||
#include <mission/devices/devicedefinitions/GomspaceDefinitions.h>
|
||||
#include <mission/power/gsDefs.h>
|
||||
|
||||
PlPcduDummy::PlPcduDummy(object_id_t objectId, object_id_t comif, CookieIF *comCookie)
|
||||
: DeviceHandlerBase(objectId, comif, comCookie) {}
|
||||
|
@ -25,6 +25,7 @@
|
||||
#include <dummies/SusDummy.h>
|
||||
#include <dummies/SyrlinksDummy.h>
|
||||
#include <fsfw_hal/common/gpio/GpioIF.h>
|
||||
#include <mission/power/gsDefs.h>
|
||||
#include <mission/system/acs/ImtqAssembly.h>
|
||||
#include <mission/system/objects/CamSwitcher.h>
|
||||
#include <mission/system/objects/StrAssembly.h>
|
||||
@ -34,7 +35,6 @@
|
||||
#include "dummies/Max31865Dummy.h"
|
||||
#include "dummies/Tmp1075Dummy.h"
|
||||
#include "mission/core/GenericFactory.h"
|
||||
#include "mission/devices/devicedefinitions/GomspaceDefinitions.h"
|
||||
#include "mission/system/acs/acsModeTree.h"
|
||||
#include "mission/system/com/comModeTree.h"
|
||||
#include "mission/system/tree/payloadModeTree.h"
|
||||
|
@ -1,11 +1,12 @@
|
||||
#ifndef MISSION_DEVICES_GPSHYPERIONHANDLER_H_
|
||||
#define MISSION_DEVICES_GPSHYPERIONHANDLER_H_
|
||||
|
||||
#include <mission/acs/archive/GPSDefinitions.h>
|
||||
|
||||
#include "eive/eventSubsystemIds.h"
|
||||
#include "fsfw/FSFW.h"
|
||||
#include "fsfw/controller/ExtendedControllerBase.h"
|
||||
#include "fsfw/devicehandlers/DeviceHandlerBase.h"
|
||||
#include "mission/devices/devicedefinitions/GPSDefinitions.h"
|
||||
#include "mission/trace.h"
|
||||
|
||||
#ifdef FSFW_OSAL_LINUX
|
||||
|
@ -1,13 +1,12 @@
|
||||
#ifndef LINUX_BOARDTEST_I2CTESTCLASS_H_
|
||||
#define LINUX_BOARDTEST_I2CTESTCLASS_H_
|
||||
|
||||
#include <mission/power/bpxBattDefs.h>
|
||||
#include <test/TestTask.h>
|
||||
|
||||
#include <array>
|
||||
#include <string>
|
||||
|
||||
#include "mission/devices/devicedefinitions/BpxBatteryDefinitions.h"
|
||||
|
||||
class I2cTestClass : public TestTask {
|
||||
public:
|
||||
I2cTestClass(object_id_t objectId, std::string i2cdev);
|
||||
|
@ -3,7 +3,7 @@
|
||||
#include <csp/drivers/can_socketcan.h>
|
||||
#include <fsfw/serialize/SerializeAdapter.h>
|
||||
#include <fsfw/serviceinterface/ServiceInterfaceStream.h>
|
||||
#include <mission/devices/devicedefinitions/GomspaceDefinitions.h>
|
||||
#include <mission/power/gsDefs.h>
|
||||
#include <p60acu.h>
|
||||
#include <p60dock.h>
|
||||
#include <p60pdu.h>
|
||||
|
@ -7,6 +7,7 @@ add_subdirectory(tmtc)
|
||||
add_subdirectory(system)
|
||||
add_subdirectory(com)
|
||||
add_subdirectory(acs)
|
||||
add_subdirectory(power)
|
||||
add_subdirectory(csp)
|
||||
add_subdirectory(cfdp)
|
||||
add_subdirectory(config)
|
||||
|
@ -1,5 +1,5 @@
|
||||
#ifndef MISSION_DEVICES_DEVICEDEFINITIONS_GPSDEFINITIONS_H_
|
||||
#define MISSION_DEVICES_DEVICEDEFINITIONS_GPSDEFINITIONS_H_
|
||||
#ifndef MISSION_ACS_ARCHIVE_GPSDEFINITIONS_H_
|
||||
#define MISSION_ACS_ARCHIVE_GPSDEFINITIONS_H_
|
||||
|
||||
#include "eive/eventSubsystemIds.h"
|
||||
#include "fsfw/datapoollocal/StaticLocalDataSet.h"
|
||||
@ -72,4 +72,4 @@ class GpsPrimaryDataset : public StaticLocalDataSet<18> {
|
||||
: StaticLocalDataSet(hkOwner, GpsHyperion::DATASET_ID) {}
|
||||
};
|
||||
|
||||
#endif /* MISSION_DEVICES_DEVICEDEFINITIONS_GPSDEFINITIONS_H_ */
|
||||
#endif /* MISSION_ACS_ARCHIVE_GPSDEFINITIONS_H_ */
|
@ -1,6 +1,7 @@
|
||||
#include "GPSHyperionHandler.h"
|
||||
|
||||
#include "devicedefinitions/GPSDefinitions.h"
|
||||
#include <mission/acs/archive/GPSDefinitions.h>
|
||||
|
||||
#include "fsfw/datapool/PoolReadGuard.h"
|
||||
#include "fsfw/timemanager/Clock.h"
|
||||
#include "lwgps/lwgps.h"
|
||||
|
@ -1,7 +1,8 @@
|
||||
#ifndef MISSION_DEVICES_GPSHYPERIONHANDLER_H_
|
||||
#define MISSION_DEVICES_GPSHYPERIONHANDLER_H_
|
||||
|
||||
#include "devicedefinitions/GPSDefinitions.h"
|
||||
#include <mission/acs/archive/GPSDefinitions.h>
|
||||
|
||||
#include "fsfw/FSFW.h"
|
||||
#include "fsfw/devicehandlers/DeviceHandlerBase.h"
|
||||
#include "lwgps/lwgps.h"
|
||||
|
@ -10,9 +10,9 @@
|
||||
#include <mission/acs/rwHelpers.h>
|
||||
#include <mission/acs/str/strHelpers.h>
|
||||
#include <mission/com/syrlinksDefs.h>
|
||||
#include <mission/devices/devicedefinitions/BpxBatteryDefinitions.h>
|
||||
#include <mission/devices/devicedefinitions/GomspaceDefinitions.h>
|
||||
#include <mission/devices/devicedefinitions/payloadPcduDefinitions.h>
|
||||
#include <mission/power/bpxBattDefs.h>
|
||||
#include <mission/power/gsDefs.h>
|
||||
#include <objects/systemObjectList.h>
|
||||
|
||||
ThermalController::ThermalController(object_id_t objectId, HeaterHandler& heater)
|
||||
|
@ -13,16 +13,16 @@
|
||||
#include <mission/acs/str/strHelpers.h>
|
||||
#include <mission/com/syrlinksDefs.h>
|
||||
#include <mission/controller/controllerdefinitions/ThermalControllerDefinitions.h>
|
||||
#include <mission/devices/devicedefinitions/BpxBatteryDefinitions.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/power/bpxBattDefs.h>
|
||||
#include <mission/power/gsDefs.h>
|
||||
|
||||
#include <list>
|
||||
|
||||
#include "mission/devices/HeaterHandler.h"
|
||||
#include "mission/devices/devicedefinitions/GomspaceDefinitions.h"
|
||||
#include "mission/trace.h"
|
||||
|
||||
/**
|
||||
|
@ -4,11 +4,11 @@
|
||||
#include <fsfw_hal/devicehandlers/MgmLIS3MDLHandler.h>
|
||||
#include <fsfw_hal/devicehandlers/MgmRM3100Handler.h>
|
||||
#include <fsfw_hal/devicehandlers/devicedefinitions/gyroL3gHelpers.h>
|
||||
#include <mission/acs/archive/GPSDefinitions.h>
|
||||
#include <mission/acs/gyroAdisHelpers.h>
|
||||
#include <mission/acs/imtqHelpers.h>
|
||||
#include <mission/acs/rwHelpers.h>
|
||||
#include <mission/acs/str/strHelpers.h>
|
||||
#include <mission/devices/devicedefinitions/GPSDefinitions.h>
|
||||
#include <mission/devices/devicedefinitions/susMax1227Helpers.h>
|
||||
|
||||
namespace ACS {
|
||||
|
@ -27,8 +27,8 @@
|
||||
#include <fsfw_hal/host/HostFilesystem.h>
|
||||
#include <mission/controller/ThermalController.h>
|
||||
#include <mission/devices/HeaterHandler.h>
|
||||
#include <mission/devices/devicedefinitions/GomspaceDefinitions.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>
|
||||
|
@ -2,12 +2,11 @@
|
||||
#define LINUX_CSP_CSPCOOKIE_H_
|
||||
|
||||
#include <fsfw/devicehandlers/CookieIF.h>
|
||||
#include <mission/power/gsDefs.h>
|
||||
|
||||
#include <cstddef>
|
||||
#include <cstdint>
|
||||
|
||||
#include "mission/devices/devicedefinitions/GomspaceDefinitions.h"
|
||||
|
||||
/**
|
||||
* @brief This is the cookie for devices supporting the CSP (CubeSat Space
|
||||
* Protocol).
|
||||
|
@ -1,13 +1,6 @@
|
||||
target_sources(
|
||||
${LIB_EIVE_MISSION}
|
||||
PRIVATE GomspaceDeviceHandler.cpp
|
||||
BpxBatteryHandler.cpp
|
||||
Tmp1075Handler.cpp
|
||||
PcduHandler.cpp
|
||||
P60DockHandler.cpp
|
||||
Pdu1Handler.cpp
|
||||
Pdu2Handler.cpp
|
||||
ACUHandler.cpp
|
||||
PRIVATE Tmp1075Handler.cpp
|
||||
Max31865EiveHandler.cpp
|
||||
HeaterHandler.cpp
|
||||
RadiationSensorHandler.cpp
|
||||
|
@ -11,7 +11,7 @@
|
||||
#include "fsfw_hal/common/gpio/GpioIF.h"
|
||||
#include "mission/devices/devicedefinitions/payloadPcduDefinitions.h"
|
||||
#include "mission/memory/SdCardMountedIF.h"
|
||||
#include "mission/powerDefs.h"
|
||||
#include "mission/power/defs.h"
|
||||
#include "mission/system/DualLanePowerStateMachine.h"
|
||||
|
||||
#ifdef FSFW_OSAL_LINUX
|
||||
|
@ -2,8 +2,8 @@
|
||||
#include <devices/gpioIds.h>
|
||||
#include <fsfw/datapool/PoolReadGuard.h>
|
||||
#include <mission/devices/RadiationSensorHandler.h>
|
||||
#include <mission/devices/devicedefinitions/GomspaceDefinitions.h>
|
||||
#include <mission/devices/max1227.h>
|
||||
#include <mission/power/gsDefs.h>
|
||||
|
||||
RadiationSensorHandler::RadiationSensorHandler(object_id_t objectId, object_id_t comIF,
|
||||
CookieIF *comCookie, GpioIF *gpioIF,
|
||||
|
@ -1,4 +1,4 @@
|
||||
#include "ACUHandler.h"
|
||||
#include <mission/power/AcuHandler.h>
|
||||
|
||||
#include "OBSWConfig.h"
|
||||
|
@ -1,9 +1,9 @@
|
||||
#ifndef MISSION_DEVICES_ACUHANDLER_H_
|
||||
#define MISSION_DEVICES_ACUHANDLER_H_
|
||||
#ifndef MISSION_POWER_ACUHANDLER_H_
|
||||
#define MISSION_POWER_ACUHANDLER_H_
|
||||
|
||||
#include <mission/devices/devicedefinitions/GomspaceDefinitions.h>
|
||||
#include <mission/power/GomspaceDeviceHandler.h>
|
||||
#include <mission/power/gsDefs.h>
|
||||
|
||||
#include "GomspaceDeviceHandler.h"
|
||||
#include "fsfw/datapool/PoolReadGuard.h"
|
||||
|
||||
/**
|
||||
@ -53,4 +53,4 @@ class ACUHandler : public GomspaceDeviceHandler {
|
||||
void printChannelStats();
|
||||
};
|
||||
|
||||
#endif /* MISSION_DEVICES_ACUHANDLER_H_ */
|
||||
#endif /* MISSION_POWER_ACUHANDLER_H_ */
|
@ -1,6 +1,5 @@
|
||||
#include "BpxBatteryHandler.h"
|
||||
|
||||
#include <fsfw/datapool/PoolReadGuard.h>
|
||||
#include <mission/power/BpxBatteryHandler.h>
|
||||
|
||||
BpxBatteryHandler::BpxBatteryHandler(object_id_t objectId, object_id_t comIF, CookieIF* comCookie)
|
||||
: DeviceHandlerBase(objectId, comIF, comCookie), hkSet(this), cfgSet(this) {}
|
@ -1,9 +1,9 @@
|
||||
#ifndef MISSION_DEVICES_BPXBATTERYHANDLER_H_
|
||||
#define MISSION_DEVICES_BPXBATTERYHANDLER_H_
|
||||
#ifndef MISSION_POWER_BPXBATTERYHANDLER_H_
|
||||
#define MISSION_POWER_BPXBATTERYHANDLER_H_
|
||||
|
||||
#include <fsfw/devicehandlers/DeviceHandlerBase.h>
|
||||
#include <mission/power/bpxBattDefs.h>
|
||||
|
||||
#include "devicedefinitions/BpxBatteryDefinitions.h"
|
||||
#include "mission/trace.h"
|
||||
|
||||
class BpxBatteryHandler : public DeviceHandlerBase {
|
||||
@ -63,4 +63,4 @@ class BpxBatteryHandler : public DeviceHandlerBase {
|
||||
LocalDataPoolManager& poolManager) override;
|
||||
};
|
||||
|
||||
#endif /* MISSION_DEVICES_BPXBATTERYHANDLER_H_ */
|
||||
#endif /* MISSION_POWER_BPXBATTERYHANDLER_H_ */
|
9
mission/power/CMakeLists.txt
Normal file
9
mission/power/CMakeLists.txt
Normal file
@ -0,0 +1,9 @@
|
||||
target_sources(
|
||||
${LIB_EIVE_MISSION}
|
||||
PRIVATE Pdu1Handler.cpp
|
||||
Pdu2Handler.cpp
|
||||
AcuHandler.cpp
|
||||
P60DockHandler.cpp
|
||||
PcduHandler.cpp
|
||||
GomspaceDeviceHandler.cpp
|
||||
BpxBatteryHandler.cpp)
|
@ -1,11 +1,11 @@
|
||||
#ifndef MISSION_DEVICES_DEVICEDEFINITIONS_GOMSPACEPACKETS_H_
|
||||
#define MISSION_DEVICES_DEVICEDEFINITIONS_GOMSPACEPACKETS_H_
|
||||
#ifndef MISSION_POWER_GOMSPACEPACKETS_H_
|
||||
#define MISSION_POWER_GOMSPACEPACKETS_H_
|
||||
|
||||
#include <fsfw/serialize/SerialBufferAdapter.h>
|
||||
#include <fsfw/serialize/SerialFixedArrayListAdapter.h>
|
||||
#include <fsfw/serialize/SerialLinkedListAdapter.h>
|
||||
#include <fsfw/serialize/SerializeElement.h>
|
||||
#include <mission/devices/devicedefinitions/GomspaceDefinitions.h>
|
||||
#include <mission/power/gsDefs.h>
|
||||
|
||||
class CspParamRequestBase : public SerialLinkedListAdapter<SerializeIF> {
|
||||
public:
|
||||
@ -381,4 +381,4 @@ class GetParamMessageUnpacker : public SerialLinkedListAdapter<SerializeIF> {
|
||||
SerializeElement<uint8_t> parameterSize;
|
||||
};
|
||||
|
||||
#endif /* MISSION_DEVICES_DEVICEDEFINITIONS_GOMSPACEPACKETS_H_ */
|
||||
#endif /* MISSION_POWER_GOMSPACEPACKETS_H_ */
|
@ -1,12 +1,10 @@
|
||||
#include "GomspaceDeviceHandler.h"
|
||||
|
||||
#include <fsfw/datapool/PoolReadGuard.h>
|
||||
#include <fsfw/globalfunctions/arrayprinter.h>
|
||||
|
||||
#include <mission/power/defs.h>
|
||||
#include <mission/power/GomSpacePackets.h>
|
||||
#include <mission/power/GomspaceDeviceHandler.h>
|
||||
#include <cassert>
|
||||
|
||||
#include "devicedefinitions/GomSpacePackets.h"
|
||||
#include "devicedefinitions/powerDefinitions.h"
|
||||
#include "eive/objects.h"
|
||||
|
||||
using namespace GOMSPACE;
|
@ -1,11 +1,11 @@
|
||||
#ifndef MISSION_DEVICES_GOMSPACEDEVICEHANDLER_H_
|
||||
#define MISSION_DEVICES_GOMSPACEDEVICEHANDLER_H_
|
||||
#ifndef MISSION_POWER_GOMSPACEDEVICEHANDLER_H_
|
||||
#define MISSION_POWER_GOMSPACEDEVICEHANDLER_H_
|
||||
|
||||
#include <mission/csp/CspCookie.h>
|
||||
#include <mission/devices/devicedefinitions/GomSpacePackets.h>
|
||||
#include <mission/power/GomSpacePackets.h>
|
||||
#include <mission/power/gsDefs.h>
|
||||
|
||||
#include "fsfw/devicehandlers/DeviceHandlerBase.h"
|
||||
#include "mission/devices/devicedefinitions/GomspaceDefinitions.h"
|
||||
#include "returnvalues/classIds.h"
|
||||
|
||||
struct TableConfig {
|
||||
@ -180,4 +180,4 @@ inline T GomspaceDeviceHandler::as(const uint8_t *ptr) {
|
||||
return *(reinterpret_cast<const T *>(ptr));
|
||||
}
|
||||
|
||||
#endif /* MISSION_DEVICES_GOMSPACEDEVICEHANDLER_H_ */
|
||||
#endif /* MISSION_POWER_GOMSPACEDEVICEHANDLER_H_ */
|
@ -1,6 +1,5 @@
|
||||
#include "P60DockHandler.h"
|
||||
|
||||
#include <fsfw/datapool/PoolReadGuard.h>
|
||||
#include <mission/power/P60DockHandler.h>
|
||||
|
||||
#include "OBSWConfig.h"
|
||||
|
@ -1,9 +1,9 @@
|
||||
#ifndef MISSION_DEVICES_P60DOCKHANDLER_H_
|
||||
#define MISSION_DEVICES_P60DOCKHANDLER_H_
|
||||
#ifndef MISSION_POWER_P60DOCKHANDLER_H_
|
||||
#define MISSION_POWER_P60DOCKHANDLER_H_
|
||||
|
||||
#include <mission/devices/devicedefinitions/GomspaceDefinitions.h>
|
||||
#include <mission/power/GomspaceDeviceHandler.h>
|
||||
#include <mission/power/gsDefs.h>
|
||||
|
||||
#include "GomspaceDeviceHandler.h"
|
||||
#include "eive/eventSubsystemIds.h"
|
||||
|
||||
/**
|
||||
@ -71,4 +71,4 @@ class P60DockHandler : public GomspaceDeviceHandler {
|
||||
void parseHkTableReply(const uint8_t* packet);
|
||||
};
|
||||
|
||||
#endif /* MISSION_DEVICES_P60DOCKHANDLER_H_ */
|
||||
#endif /* MISSION_POWER_P60DOCKHANDLER_H_ */
|
@ -4,8 +4,8 @@
|
||||
#include <fsfw/housekeeping/HousekeepingSnapshot.h>
|
||||
#include <fsfw/ipc/MutexFactory.h>
|
||||
#include <fsfw/ipc/QueueFactory.h>
|
||||
#include <mission/devices/PcduHandler.h>
|
||||
#include <mission/devices/devicedefinitions/GomSpacePackets.h>
|
||||
#include <mission/power/GomSpacePackets.h>
|
||||
#include <mission/power/PcduHandler.h>
|
||||
|
||||
PcduHandler::PcduHandler(object_id_t setObjectId, size_t cmdQueueSize)
|
||||
: SystemObject(setObjectId),
|
@ -1,5 +1,5 @@
|
||||
#ifndef MISSION_DEVICES_PCDUHANDLER_H_
|
||||
#define MISSION_DEVICES_PCDUHANDLER_H_
|
||||
#ifndef MISSION_POWER_PCDUHANDLER_H_
|
||||
#define MISSION_POWER_PCDUHANDLER_H_
|
||||
|
||||
#include <devices/powerSwitcherList.h>
|
||||
#include <fsfw/datapool/PoolEntry.h>
|
||||
@ -8,10 +8,9 @@
|
||||
#include <fsfw/power/PowerSwitchIF.h>
|
||||
#include <fsfw/tasks/ExecutableObjectIF.h>
|
||||
#include <fsfw/timemanager/CCSDSTime.h>
|
||||
#include <mission/devices/GomspaceDeviceHandler.h>
|
||||
|
||||
#include "devicedefinitions/GomspaceDefinitions.h"
|
||||
#include "devicedefinitions/powerDefinitions.h"
|
||||
#include <mission/power/defs.h>
|
||||
#include <mission/power/GomspaceDeviceHandler.h>
|
||||
#include <mission/power/gsDefs.h>
|
||||
|
||||
/**
|
||||
* @brief The PCDUHandler provides a compact interface to handle all devices related to the
|
||||
@ -141,4 +140,4 @@ class PcduHandler : public PowerSwitchIF,
|
||||
void checkAndUpdatePduSwitch(GOMSPACE::Pdu pdu, pcdu::Switches switchIdx, uint8_t setValue);
|
||||
};
|
||||
|
||||
#endif /* MISSION_DEVICES_PCDUHANDLER_H_ */
|
||||
#endif /* MISSION_POWER_PCDUHANDLER_H_ */
|
@ -1,6 +1,6 @@
|
||||
#include <fsfw/datapool/PoolReadGuard.h>
|
||||
#include <mission/devices/Pdu1Handler.h>
|
||||
#include <mission/devices/devicedefinitions/GomSpacePackets.h>
|
||||
#include <mission/power/GomSpacePackets.h>
|
||||
#include <mission/power/Pdu1Handler.h>
|
||||
|
||||
#include "devices/powerSwitcherList.h"
|
||||
|
@ -1,8 +1,8 @@
|
||||
#ifndef MISSION_DEVICES_PDU1Handler_H_
|
||||
#define MISSION_DEVICES_PDU1Handler_H_
|
||||
|
||||
#include "GomspaceDeviceHandler.h"
|
||||
#include "devicedefinitions/GomspaceDefinitions.h"
|
||||
#include <mission/power/GomspaceDeviceHandler.h>
|
||||
#include <mission/power/gsDefs.h>
|
||||
|
||||
/**
|
||||
* @brief This is the device handler for the PDU1.
|
@ -1,6 +1,6 @@
|
||||
#include <fsfw/datapool/PoolReadGuard.h>
|
||||
#include <mission/devices/Pdu2Handler.h>
|
||||
#include <mission/devices/devicedefinitions/GomSpacePackets.h>
|
||||
#include <mission/power/GomSpacePackets.h>
|
||||
#include <mission/power/Pdu2Handler.h>
|
||||
|
||||
#include "devices/powerSwitcherList.h"
|
||||
|
@ -1,9 +1,8 @@
|
||||
#ifndef MISSION_DEVICES_PDU2HANDLER_H_
|
||||
#define MISSION_DEVICES_PDU2HANDLER_H_
|
||||
#ifndef MISSION_POWER_PDU2HANDLER_H_
|
||||
#define MISSION_POWER_PDU2HANDLER_H_
|
||||
|
||||
#include <mission/devices/devicedefinitions/GomspaceDefinitions.h>
|
||||
|
||||
#include "GomspaceDeviceHandler.h"
|
||||
#include <mission/power/GomspaceDeviceHandler.h>
|
||||
#include <mission/power/gsDefs.h>
|
||||
|
||||
/**
|
||||
* @brief This is the device handler for the PDU2.
|
||||
@ -56,4 +55,4 @@ class Pdu2Handler : public GomspaceDeviceHandler {
|
||||
void parseHkTableReply(const uint8_t* packet);
|
||||
};
|
||||
|
||||
#endif /* MISSION_DEVICES_PDU2HANDLER_H_ */
|
||||
#endif /* MISSION_POWER_PDU2HANDLER_H_ */
|
@ -1,5 +1,5 @@
|
||||
#ifndef MISSION_DEVICES_DEVICEDEFINITIONS_BPXBATTERYDEFINITIONS_H_
|
||||
#define MISSION_DEVICES_DEVICEDEFINITIONS_BPXBATTERYDEFINITIONS_H_
|
||||
#ifndef MISSION_POWER_BPXBATTDEFS_H_
|
||||
#define MISSION_POWER_BPXBATTDEFS_H_
|
||||
|
||||
#include <fsfw/datapoollocal/StaticLocalDataSet.h>
|
||||
#include <fsfw/serialize/SerialLinkedListAdapter.h>
|
||||
@ -248,4 +248,4 @@ class BpxBatteryCfg : public StaticLocalDataSet<BpxBattery::CFG_ENTRIES> {
|
||||
: StaticLocalDataSet(hkOwner, BpxBattery::CFG_SET_ID) {}
|
||||
};
|
||||
|
||||
#endif /* MISSION_DEVICES_DEVICEDEFINITIONS_BPXBATTERYDEFINITIONS_H_ */
|
||||
#endif /* MISSION_POWER_BPXBATTDEFS_H_ */
|
@ -1,7 +1,8 @@
|
||||
#ifndef MISSION_DEVICES_DEVICEDEFINITIONS_POWERDEFINITIONS_H_
|
||||
#define MISSION_DEVICES_DEVICEDEFINITIONS_POWERDEFINITIONS_H_
|
||||
#ifndef MISSION_POWER_DEFS_H_
|
||||
#define MISSION_POWER_DEFS_H_
|
||||
|
||||
#include <fsfw/events/Event.h>
|
||||
#include <fsfw/modes/ModeMessage.h>
|
||||
|
||||
#include "eive/eventSubsystemIds.h"
|
||||
|
||||
@ -18,6 +19,17 @@ static constexpr Event SWITCHING_Q7S_DENIED = event::makeEvent(SUBSYSTEM_ID, 2,
|
||||
|
||||
static constexpr Event FDIR_REACTION_IGNORED = event::makeEvent(SUBSYSTEM_ID, 3, severity::MEDIUM);
|
||||
|
||||
|
||||
enum class States { IDLE, SWITCHING_POWER, CHECKING_POWER, MODE_COMMANDING };
|
||||
enum class OpCodes { NONE, TO_OFF_DONE, TO_NOT_OFF_DONE, TIMEOUT_OCCURED };
|
||||
|
||||
} // namespace power
|
||||
|
||||
#endif /* MISSION_DEVICES_DEVICEDEFINITIONS_POWERDEFINITIONS_H_ */
|
||||
|
||||
namespace duallane {
|
||||
|
||||
enum Submodes : Submode_t { A_SIDE = 0, B_SIDE = 1, DUAL_MODE = 2 };
|
||||
|
||||
}
|
||||
|
||||
#endif /* MISSION_POWER_DEFS_H_ */
|
@ -1,16 +1,16 @@
|
||||
#ifndef MISSION_DEVICES_DEVICEDEFINITIONS_GOMSPACEDEFINITIONS_H_
|
||||
#define MISSION_DEVICES_DEVICEDEFINITIONS_GOMSPACEDEFINITIONS_H_
|
||||
#ifndef MISSION_POWER_GSDEFS_H_
|
||||
#define MISSION_POWER_GSDEFS_H_
|
||||
|
||||
#include <fsfw/datapoollocal/LocalPoolVariable.h>
|
||||
#include <fsfw/datapoollocal/StaticLocalDataSet.h>
|
||||
#include <fsfw/devicehandlers/DeviceHandlerIF.h>
|
||||
#include <fsfw/power/definitions.h>
|
||||
#include <mission/power/gsLibDefs.h>
|
||||
|
||||
#include <cstdint>
|
||||
|
||||
#include "devices/powerSwitcherList.h"
|
||||
#include "fsfw/platform.h"
|
||||
#include "gomspaceDefines.h"
|
||||
|
||||
namespace GOMSPACE {
|
||||
|
||||
@ -774,4 +774,4 @@ class SwitcherStates : public StaticLocalDataSet<NUMBER_OF_SWITCHES> {
|
||||
};
|
||||
|
||||
} // namespace pcdu
|
||||
#endif /* MISSION_DEVICES_DEVICEDEFINITIONS_GOMSPACEDEFINITIONS_H_ */
|
||||
#endif /* MISSION_POWER_GSDEFS_H_ */
|
@ -1,5 +1,5 @@
|
||||
#ifndef MISSION_DEVICES_DEVICEDEFINITIONS_GOMSPACEDEFINES_H_
|
||||
#define MISSION_DEVICES_DEVICEDEFINITIONS_GOMSPACEDEFINES_H_
|
||||
#ifndef MISSION_POWER_GSLIBDEFS_H_
|
||||
#define MISSION_POWER_GSLIBDEFS_H_
|
||||
|
||||
#include "fsfw/platform.h"
|
||||
|
||||
@ -30,4 +30,4 @@ static constexpr uint32_t P60ACU_PARAM_SIZE = 0x1B;
|
||||
|
||||
} // namespace gsConstants
|
||||
|
||||
#endif /* MISSION_DEVICES_DEVICEDEFINITIONS_GOMSPACEDEFINES_H_ */
|
||||
#endif /* MISSION_POWER_GSLIBDEFS_H_ */
|
@ -1,16 +0,0 @@
|
||||
#pragma once
|
||||
|
||||
#include <fsfw/modes/ModeMessage.h>
|
||||
|
||||
namespace power {
|
||||
|
||||
enum class States { IDLE, SWITCHING_POWER, CHECKING_POWER, MODE_COMMANDING };
|
||||
enum class OpCodes { NONE, TO_OFF_DONE, TO_NOT_OFF_DONE, TIMEOUT_OCCURED };
|
||||
|
||||
} // namespace power
|
||||
|
||||
namespace duallane {
|
||||
|
||||
enum Submodes : Submode_t { A_SIDE = 0, B_SIDE = 1, DUAL_MODE = 2 };
|
||||
|
||||
} // namespace duallane
|
@ -5,7 +5,7 @@
|
||||
#include <fsfw/modes/HasModesIF.h>
|
||||
#include <mission/system/objects/PowerStateMachineBase.h>
|
||||
|
||||
#include "mission/powerDefs.h"
|
||||
#include "mission/power/defs.h"
|
||||
|
||||
class AssemblyBase;
|
||||
class PowerSwitchIF;
|
||||
|
@ -10,7 +10,7 @@
|
||||
|
||||
#include "eive/objects.h"
|
||||
#include "mission/acs/defs.h"
|
||||
#include "mission/powerDefs.h"
|
||||
#include "mission/power/defs.h"
|
||||
#include "mission/system/tree/util.h"
|
||||
|
||||
AcsSubsystem satsystem::acs::ACS_SUBSYSTEM(objects::ACS_SUBSYSTEM, 12, 24);
|
||||
|
@ -1,3 +1,4 @@
|
||||
#include <mission/power/defs.h>
|
||||
#include "GomspacePowerFdir.h"
|
||||
|
||||
#include "fsfw/devicehandlers/DeviceHandlerIF.h"
|
||||
@ -7,7 +8,6 @@
|
||||
#include "fsfw/power/Fuse.h"
|
||||
#include "fsfw/serviceinterface/ServiceInterfaceStream.h"
|
||||
#include "fsfw/thermal/ThermalComponentIF.h"
|
||||
#include "mission/devices/devicedefinitions/powerDefinitions.h"
|
||||
|
||||
GomspacePowerFdir::GomspacePowerFdir(object_id_t devId, object_id_t parentId)
|
||||
: DeviceHandlerFailureIsolation(devId, parentId) {}
|
||||
|
@ -5,7 +5,7 @@
|
||||
#include <fsfw/power/PowerSwitchIF.h>
|
||||
#include <fsfw/timemanager/Countdown.h>
|
||||
|
||||
#include "mission/powerDefs.h"
|
||||
#include "mission/power/defs.h"
|
||||
|
||||
class PowerStateMachineBase {
|
||||
public:
|
||||
|
@ -2,8 +2,7 @@
|
||||
#define MISSION_SYSTEM_OBJECTS_STACK5VHANDLER_H_
|
||||
|
||||
#include <fsfw/power/PowerSwitchIF.h>
|
||||
|
||||
#include "mission/devices/devicedefinitions/GomspaceDefinitions.h"
|
||||
#include <mission/power/gsDefs.h>
|
||||
|
||||
enum class StackCommander { RAD_SENSOR = 0, PL_PCDU = 1 };
|
||||
enum class HandlerState { SWITCH_PENDING, IDLE };
|
||||
|
@ -8,7 +8,7 @@
|
||||
#include "eive/objects.h"
|
||||
#include "mission/devices/devicedefinitions/payloadPcduDefinitions.h"
|
||||
#include "mission/payloadDefs.h"
|
||||
#include "mission/powerDefs.h"
|
||||
#include "mission/power/defs.h"
|
||||
#include "mission/system/objects/PayloadSubsystem.h"
|
||||
#include "util.h"
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user