diff --git a/Fw/Logger/LogAssert.cpp b/Fw/Logger/LogAssert.cpp index 4eca41f9b0..b7ea746d97 100644 --- a/Fw/Logger/LogAssert.cpp +++ b/Fw/Logger/LogAssert.cpp @@ -15,10 +15,10 @@ #else #if FW_ASSERT_LEVEL == FW_FILEID_ASSERT -#define fileIdFs "Assert file ID %d: Line: %d " +#define fileIdFs "Assert: %d:%d" #define ASSERT_CAST static_cast #else -#define fileIdFs "Assert file \"%s\": Line: %d " +#define fileIdFs "Assert: \"%s:%d\"" #define ASSERT_CAST reinterpret_cast #endif diff --git a/Fw/Test/UnitTestAssert.cpp b/Fw/Test/UnitTestAssert.cpp index 77a0da89f4..3e651f8ad6 100644 --- a/Fw/Test/UnitTestAssert.cpp +++ b/Fw/Test/UnitTestAssert.cpp @@ -43,9 +43,9 @@ namespace Test { void UnitTestAssert::doAssert() { this->m_assertFailed = true; #if FW_ASSERT_LEVEL == FW_FILEID_ASSERT - (void)fprintf(stderr,"Assert File: 0x%" PRIx32 ", Line: %" PRI_PlatformUIntType "\n", this->m_file, this->m_lineNo); + (void)fprintf(stderr,"Assert: 0x%" PRIx32 ":%" PRI_PlatformUIntType "\n", this->m_file, this->m_lineNo); #else - (void)fprintf(stderr,"Assert File: %s, Line: %" PRI_PlatformUIntType "\n", this->m_file.toChar(), this->m_lineNo); + (void)fprintf(stderr,"Assert: %s:%" PRI_PlatformUIntType "\n", this->m_file.toChar(), this->m_lineNo); #endif } diff --git a/Fw/Types/Assert.cpp b/Fw/Types/Assert.cpp index a9133ff793..68cd74454a 100644 --- a/Fw/Types/Assert.cpp +++ b/Fw/Types/Assert.cpp @@ -10,9 +10,9 @@ #else #if FW_ASSERT_LEVEL == FW_FILEID_ASSERT -#define fileIdFs "Assert file ID 0x%08" PRIx32 ": Line: %" PRI_PlatformUIntType +#define fileIdFs "Assert: 0x%08" PRIx32 ":%" PRI_PlatformUIntType #else -#define fileIdFs "Assert file \"%s\": Line: %" PRI_PlatformUIntType +#define fileIdFs "Assert: \"%s:%" PRI_PlatformUIntType "\"" #endif namespace Fw {