KSat/fsfw
16
5
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests Releases Wiki Activity

clean up PR

Browse Source
This commit is contained in:
Robin Müller 2024-11-07 15:52:58 +01:00
parent 401db7def6
commit efbcb0569f
Signed by: muellerr
GPG Key ID: A649FB78196E3849
4 changed files with 5 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/fsfw/datapool/AccessLocalPoolF.h
View File

@ -1,23 +0,0 @@
#pragma once
class LocalPoolManager;
class MutexIF;
/**
* @brief Accessor class which can be used by classes which like to use the pool manager.
*/
class AccessPoolManagerIF {
public:
virtual ~AccessPoolManagerIF() {};
virtual MutexIF* getLocalPoolMutex() = 0;
/**
* Can be used to get a handle to the local data pool manager.
* This function is protected because it should only be used by the
* class imlementing the interface.
*/
virtual LocalPoolManager* getPoolManagerHandle() = 0;
protected:
};

8
src/fsfw/datapool/PoolDataSetIF.h
View File

@ -10,7 +10,7 @@
*/ */
class PoolDataSetIF : virtual public DataSetIF, virtual public ReadCommitIF { class PoolDataSetIF : virtual public DataSetIF, virtual public ReadCommitIF {
public: public:
virtual ~PoolDataSetIF() {}; ~PoolDataSetIF() override = default;
/** /**
* @brief Most underlying data structures will have a pool like structure * @brief Most underlying data structures will have a pool like structure
@ -18,17 +18,13 @@ class PoolDataSetIF : virtual public DataSetIF, virtual public ReadCommitIF {
* thread-safety * thread-safety
* @return Lock operation result * @return Lock operation result
*/ */
virtual ReturnValue_t lockDataPool( virtual ReturnValue_t lockDataPool(MutexIF::TimeoutType timeoutType, uint32_t timeoutMs) = 0;
MutexIF::TimeoutType timeoutType = MutexIF::TimeoutType::WAITING,
uint32_t timeoutMs = 20) = 0;
/** /**
* @brief Unlock call corresponding to the lock call. * @brief Unlock call corresponding to the lock call.
* @return Unlock operation result * @return Unlock operation result
*/ */
virtual ReturnValue_t unlockDataPool() = 0; virtual ReturnValue_t unlockDataPool() = 0;
// virtual bool isValid() const = 0;
}; };
#endif /* FSFW_DATAPOOL_POOLDATASETIF_H_ */ #endif /* FSFW_DATAPOOL_POOLDATASETIF_H_ */

13
src/fsfw/devicehandlers/DeviceHandlerBase.h
View File

@ -1,5 +1,4 @@
#ifndef FSFW_DEVICEHANDLERS_DEVICEHANDLERBASE_H_ #pragma once
#define FSFW_DEVICEHANDLERS_DEVICEHANDLERBASE_H_
#include <fsfw/housekeeping/PeriodicHkHelper.h> #include <fsfw/housekeeping/PeriodicHkHelper.h>
@ -999,12 +998,6 @@ class DeviceHandlerBase : public DeviceHandlerIF,
*/ */
virtual void doOnActivity(); virtual void doOnActivity();
/**
* Required for HasLocalDataPoolIF, return a handle to the local pool manager.
* @return
*/
// PeriodicHkGenerationHelper *getHkManagerHandle() override;
const HasHealthIF *getOptHealthIF() const override; const HasHealthIF *getOptHealthIF() const override;
const HasModesIF &getModeIF() const override; const HasModesIF &getModeIF() const override;
@ -1396,8 +1389,6 @@ class DeviceHandlerBase : public DeviceHandlerIF,
ReturnValue_t handleDeviceHandlerMessage(CommandMessage *message); ReturnValue_t handleDeviceHandlerMessage(CommandMessage *message);
// virtual dur_millis_t getPeriodicOperationFrequency() const override;
void parseReply(const uint8_t *receivedData, size_t receivedDataLen); void parseReply(const uint8_t *receivedData, size_t receivedDataLen);
void handleTransitionToOnMode(Mode_t commandedMode, Submode_t commandedSubmode); void handleTransitionToOnMode(Mode_t commandedMode, Submode_t commandedSubmode);
@ -1418,5 +1409,3 @@ class DeviceHandlerBase : public DeviceHandlerIF,
*/ */
void disableCommandsAndReplies(); void disableCommandsAndReplies();
}; };
#endif /* FSFW_DEVICEHANDLERS_DEVICEHANDLERBASE_H_ */

6
src/fsfw/devicehandlers/FreshDeviceHandlerBase.h
View File

@ -112,10 +112,6 @@ class FreshDeviceHandlerBase : public SystemObject,
*/ */
virtual ReturnValue_t handleCommandMessage(CommandMessage* message) = 0; virtual ReturnValue_t handleCommandMessage(CommandMessage* message) = 0;
// HK manager abstract functions.
// ReturnValue_t initializeLocalDataPool(localpool::DataPool& localDataPoolMap,
// PeriodicHkGenerationHelper& poolManager) override = 0;
// Mode abstract functions // Mode abstract functions
ReturnValue_t checkModeCommand(Mode_t mode, Submode_t submode, ReturnValue_t checkModeCommand(Mode_t mode, Submode_t submode,
uint32_t* msToReachTheMode) override = 0; uint32_t* msToReachTheMode) override = 0;
@ -125,7 +121,7 @@ class FreshDeviceHandlerBase : public SystemObject,
ReturnValue_t executeAction(ActionId_t actionId, MessageQueueId_t commandedBy, ReturnValue_t executeAction(ActionId_t actionId, MessageQueueId_t commandedBy,
const uint8_t* data, size_t size) override = 0; const uint8_t* data, size_t size) override = 0;
// Executable overrides. // Executable overrides.
virtual ReturnValue_t performOperation(uint8_t opCode) override; ReturnValue_t performOperation(uint8_t opCode) override;
/** /**
* This calls the FDIR instance event trigger function. * This calls the FDIR instance event trigger function.