formatting and smaller stuff

mueller/uart-helper-module
Robin Müller 2 months ago
parent c47bed0760
commit 227535c461
Signed by: muellerr
GPG Key ID: 11D4952C8CCEF814
  1. 5
      src/fsfw/cfdp/handler/CMakeLists.txt
  2. 2
      src/fsfw/cfdp/handler/CfdpHandler.cpp
  3. 6
      src/fsfw/cfdp/handler/CfdpHandler.h
  4. 2
      src/fsfw/osal/common/TcpIpBase.cpp
  5. 3
      src/fsfw/osal/windows/winTaskHelpers.cpp
  6. 1
      src/fsfw/timemanager/TimeReaderIF.h
  7. 5
      src/fsfw/tmtcservices/SpacePacketParser.h
  8. 2
      unittests/mocks/cfdp/FaultHandlerMock.h

@ -1,2 +1,3 @@
target_sources(${LIB_FSFW_NAME} PRIVATE SourceHandler.cpp DestHandler.cpp
FaultHandlerBase.cpp UserBase.cpp CfdpHandler.cpp)
target_sources(
${LIB_FSFW_NAME} PRIVATE SourceHandler.cpp DestHandler.cpp
FaultHandlerBase.cpp UserBase.cpp CfdpHandler.cpp)

@ -17,7 +17,7 @@ CfdpHandler::CfdpHandler(const FsfwHandlerParams& fsfwParams, const CfdpHandlerC
cfdpCfg.userHandler, cfdpCfg.remoteCfgProvider, cfdpCfg.packetInfoList,
cfdpCfg.lostSegmentsList),
FsfwParams(fsfwParams.packetDest, nullptr, this, fsfwParams.tcStore,
fsfwParams.tmStore)) {
fsfwParams.tmStore)) {
destHandler.setMsgQueue(msgQueue);
}

@ -12,7 +12,11 @@
struct FsfwHandlerParams {
FsfwHandlerParams(object_id_t objectId, HasFileSystemIF& vfs, AcceptsTelemetryIF& packetDest,
StorageManagerIF& tcStore, StorageManagerIF& tmStore, MessageQueueIF& msgQueue)
: objectId(objectId), vfs(vfs), packetDest(packetDest), tcStore(tcStore), tmStore(tmStore),
: objectId(objectId),
vfs(vfs),
packetDest(packetDest),
tcStore(tcStore),
tmStore(tmStore),
msgQueue(msgQueue) {}
object_id_t objectId{};
HasFileSystemIF& vfs;

@ -1,7 +1,7 @@
#include "fsfw/osal/common/TcpIpBase.h"
#include "fsfw/serviceinterface.h"
#include "fsfw/platform.h"
#include "fsfw/serviceinterface.h"
#ifdef PLATFORM_UNIX
#include <errno.h>

@ -1,8 +1,9 @@
#include "fsfw/osal/windows/winTaskHelpers.h"
#include <mutex>
#include <windows.h>
#include <mutex>
TaskPriority tasks::makeWinPriority(PriorityClass prioClass, PriorityNumber prioNumber) {
return (static_cast<uint16_t>(prioClass) << 16) | static_cast<uint16_t>(prioNumber);
}

@ -2,6 +2,7 @@
#define FSFW_TIMEMANAGER_TIMEREADERIF_H
#include <cstdlib>
#include "fsfw/platform.h"
#ifdef PLATFORM_WIN

@ -17,7 +17,6 @@
*/
class SpacePacketParser {
public:
struct FoundPacketInfo {
size_t startIdx = 0;
size_t sizeFound = 0;
@ -51,9 +50,7 @@ class SpacePacketParser {
ReturnValue_t parseSpacePackets(const uint8_t** buffer, const size_t maxSize,
FoundPacketInfo& packetInfo);
size_t getAmountRead() {
return amountRead;
}
size_t getAmountRead() { return amountRead; }
void reset() {
nextStartIdx = 0;

@ -17,7 +17,7 @@ class FaultHandlerMock : public FaultHandlerBase {
void noticeOfSuspensionCb(TransactionId& id, ConditionCode code) override;
void noticeOfCancellationCb(TransactionId& id, ConditionCode code) override;
void abandonCb(TransactionId& id,ConditionCode code) override;
void abandonCb(TransactionId& id, ConditionCode code) override;
void ignoreCb(TransactionId& id, ConditionCode code) override;
FaultInfo& getFhInfo(FaultHandlerCode fhCode);

Loading…
Cancel
Save