Merge branch 'development' into mueller/master

2021-03-09 21:15:55 +01:00
parent bdd66072d1 c815905b5a
commit 7598eb6b56
10 changed files with 31 additions and 26 deletions
--- a/osal/windows/TmTcWinUdpBridge.cpp
+++ b/osal/windows/TmTcWinUdpBridge.cpp
@ -112,7 +112,7 @@ ReturnValue_t TmTcWinUdpBridge::sendTm(const uint8_t *data, size_t dataLen) {
 }

 void TmTcWinUdpBridge::checkAndSetClientAddress(sockaddr_in newAddress) {
-    MutexHelper lock(mutex, MutexIF::TimeoutType::WAITING, 10);
+    MutexGuard lock(mutex, MutexIF::TimeoutType::WAITING, 10);

 //  char ipAddress [15];
 #if FSFW_CPP_OSTREAM_ENABLED == 1