Merge remote-tracking branch 'upstream/development' into eive/develop

2022-03-07 15:34:11 +01:00
parent c3c2e1c0dd 5912ddd2a2
commit d6c1041133
20 changed files with 174 additions and 123 deletions
--- a/hal/src/fsfw_hal/linux/uart/UartComIF.cpp
+++ b/hal/src/fsfw_hal/linux/uart/UartComIF.cpp
@ -471,7 +471,7 @@ ReturnValue_t UartComIF::handleNoncanonicalRead(UartCookie& uartCookie, UartDevi
  auto bufferPtr = iter->second.replyBuffer.data();
  // Size check to prevent buffer overflow
  if (requestLen > uartCookie.getMaxReplyLen()) {
-#if OBSW_VERBOSE_LEVEL >= 1
+#if FSFW_VERBOSE_LEVEL >= 1
 #if FSFW_CPP_OSTREAM_ENABLED == 1
    sif::warning << "UartComIF::requestReceiveMessage: Next read would cause overflow!"
                 << std::endl;