KSat/fsfw
15
4
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests Releases Wiki Activity

Update FSFW #25

Merged
muellerr merged 89 commits from mueller/master into master 2021-10-05 20:21:44 +02:00
Conversation 0 Commits 89 Files Changed 28 +4 -3
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1622e23f1c - Show all commits

2
src/fsfw/osal/common/TcpTmTcServer.cpp
View File

@ -187,7 +187,7 @@ void TcpTmTcServer::handleServerOperation(socket_t& connSocket) {
return;
}
if(not tcAvailable and not tmSent) {
TaskFactory::delayTask(DEFAULT_LOOP_DELAY_MS);
TaskFactory::delayTask(tcpConfig.tcpLoopDelay);
}
}
else {

5
src/fsfw/osal/common/TcpTmTcServer.h
View File

@ -59,9 +59,10 @@ public:
int tcpBacklog = 3;
/**
* Passed to the select call which is used to ensure non-blocking TC reception
* If no telecommands packets are being received and no telemetry is being sent,
* the TCP server will delay periodically by this amount to decrease the CPU load
*/
//uint32_t selectTimeoutMs = DEFAULT_SELECT_TIMEOUT_MS;
uint32_t tcpLoopDelay = DEFAULT_LOOP_DELAY_MS ;
/**
* Passed to the send call
*/