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

CFDP Source Handler Testing #803

Merged
muellerr merged 14 commits from cfdp-source-handler-testing into cfdp-source-handler 2023-10-13 17:10:44 +02:00
Conversation 0 Commits 14 Files Changed 23 +2 -8
5 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2f25ac8e7d - Show all commits

3
common/config/eive/definitions.h
View File

@ -65,8 +65,7 @@ static constexpr uint32_t CFDP_STORE_QUEUE_SIZE = 300;
static constexpr uint32_t LIVE_CHANNEL_NORMAL_QUEUE_SIZE = 250; static constexpr uint32_t LIVE_CHANNEL_NORMAL_QUEUE_SIZE = 250;
static constexpr uint32_t LIVE_CHANNEL_CFDP_QUEUE_SIZE = 400; static constexpr uint32_t LIVE_CHANNEL_CFDP_QUEUE_SIZE = 400;
static constexpr uint32_t CFDP_THROTTLE_PERIOD_MS = 200; static constexpr uint32_t CFDP_MAX_FSM_CALL_COUNT_SRC_HANDLER = 60;
static constexpr uint32_t CFDP_MAX_FSM_CALL_COUNT_SRC_HANDLER = 20;
static constexpr uint32_t CFDP_MAX_FSM_CALL_COUNT_DEST_HANDLER = 300; static constexpr uint32_t CFDP_MAX_FSM_CALL_COUNT_DEST_HANDLER = 300;
static constexpr uint32_t CFDP_SHORT_DELAY_MS = 50; static constexpr uint32_t CFDP_SHORT_DELAY_MS = 50;
static constexpr uint32_t CFDP_REGULAR_DELAY_MS = 200; static constexpr uint32_t CFDP_REGULAR_DELAY_MS = 200;

1
linux/ipcore/PapbVcInterface.cpp
View File

@ -58,6 +58,7 @@ ReturnValue_t PapbVcInterface::write(const uint8_t* data, size_t size, size_t& w
void PapbVcInterface::startPacketTransfer(ByteWidthCfg initWidth) { void PapbVcInterface::startPacketTransfer(ByteWidthCfg initWidth) {
*vcBaseReg = CONFIG_DATA_INPUT | initWidth; *vcBaseReg = CONFIG_DATA_INPUT | initWidth;
writeActiveStatus = true;
} }
bool PapbVcInterface::pollReadyForPacket() const { bool PapbVcInterface::pollReadyForPacket() const {

3
mission/cfdp/CfdpHandler.cpp
View File

@ -98,9 +98,6 @@ ReturnValue_t CfdpHandler::initialize() {
} }
fsmCount++; fsmCount++;
} }
if (signals::CFDP_MSG_COUNTER > 0) {
sif::debug << "CFDP msg count: " << signals::CFDP_MSG_COUNTER << std::endl;
}
} }
if (shortDelay) { if (shortDelay) {
TaskFactory::delayTask(config::CFDP_SHORT_DELAY_MS); TaskFactory::delayTask(config::CFDP_SHORT_DELAY_MS);

2
mission/com/LiveTmTask.cpp
View File

@ -199,13 +199,11 @@ ReturnValue_t LiveTmTask::handleGenericTmQueue(MessageQueueIF& queue, bool isCfd
void LiveTmTask::throttleCfdp() { void LiveTmTask::throttleCfdp() {
throttlePeriodOngoing = true; throttlePeriodOngoing = true;
signals::CFDP_CHANNEL_THROTTLE_SIGNAL = true; signals::CFDP_CHANNEL_THROTTLE_SIGNAL = true;
sif::debug << "throttling CFDP" << std::endl;
} }
void LiveTmTask::releaseCfdp() { void LiveTmTask::releaseCfdp() {
throttlePeriodOngoing = false; throttlePeriodOngoing = false;
signals::CFDP_CHANNEL_THROTTLE_SIGNAL = false; signals::CFDP_CHANNEL_THROTTLE_SIGNAL = false;
sif::debug << "releasing CFDP" << std::endl;
} }
void LiveTmTask::updateBusyFlag() { void LiveTmTask::updateBusyFlag() {

1
mission/com/VirtualChannel.cpp
View File

@ -67,7 +67,6 @@ ReturnValue_t VirtualChannel::handleWriteCompletionSynchronously(size_t& written
} }
ReturnValue_t result = advanceWrite(writtenSize); ReturnValue_t result = advanceWrite(writtenSize);
if (result == returnvalue::OK) { if (result == returnvalue::OK) {
sif::debug << "last write after" << delayMs << std::endl;
// Transfer complete // Transfer complete
return result; return result;
} else if (result != PARTIALLY_WRITTEN) { } else if (result != PARTIALLY_WRITTEN) {