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

bump tmtc, small tweaks

Browse Source
This commit is contained in:
Robin Müller 2023-09-14 12:28:40 +02:00
parent 8071a5713f
commit fa7443d4a9
Signed by: muellerr
GPG Key ID: A649FB78196E3849
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1 +1 @@
Subproject commit 8d28b321d4a1fa4ba7f375bbb0cb36d843c7dcf5 Subproject commit bf399c3d910a034112121f3bfb08494f40d46bf2