eive/fsfw
eive/fsfw
15
1
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests Releases 1 Wiki Activity

FSFW Update #21

Merged
meierj merged 26 commits from mueller/unittest-fixes into eive/develop 2021-09-29 15:45:40 +02:00
Conversation 1 Commits 26 Files Changed 16 +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 be8623a4f8 - 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
*/