eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 1 Releases 121 Wiki Activity

CFDP source handler #776

Merged
muellerr merged 96 commits from cfdp-source-handler into main 2023-10-19 11:11:31 +02:00
Conversation 1 Commits 96 Files Changed 56 +1275 -2262
88 changed files with 1275 additions and 2262 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit fa7443d4a9 - Show all commits

4
mission/com/LiveTmTask.cpp
View File

@@ -53,7 +53,7 @@ ReturnValue_t LiveTmTask::performOperation(uint8_t opCode) {
} }
} }
} }
if (channel.isBusy()) { if (channel.isBusy() and not signals::CFDP_CHANNEL_THROTTLE_SIGNAL) {
// Throttle CFDP packet creator. It is by far the most relevant data creator, so throttling // Throttle CFDP packet creator. It is by far the most relevant data creator, so throttling
// it is the easiest way to handle back pressure for now in a sensible way. It is cleared // it is the easiest way to handle back pressure for now in a sensible way. It is cleared
// by the data creator. // by the data creator.
@@ -80,8 +80,6 @@ ReturnValue_t LiveTmTask::performOperation(uint8_t opCode) {
} }
// 40 ms IDLE delay. Might tweak this in the future. // 40 ms IDLE delay. Might tweak this in the future.
TaskFactory::delayTask(40); TaskFactory::delayTask(40);
} else {
packetCounter++;
} }
} }
} }

1
mission/com/LiveTmTask.h
View File

@@ -38,7 +38,6 @@ class LiveTmTask : public SystemObject,
PusTmFunnel& pusFunnel; PusTmFunnel& pusFunnel;
CfdpTmFunnel& cfdpFunnel; CfdpTmFunnel& cfdpFunnel;
VirtualChannel& channel; VirtualChannel& channel;
uint32_t packetCounter = 0;
const std::atomic_bool& ptmeLocked; const std::atomic_bool& ptmeLocked;
void readCommandQueue(void); void readCommandQueue(void);

2
tmtc

Submodule tmtc updated: 8d28b321d4...bf399c3d91