Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Made assert clickable (#1847) #2022

Merged
merged 2 commits into from
May 24, 2023
Merged

Made assert clickable (#1847) #2022

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c15b89b
Made assert clickable (#1847)
May 13, 2023
485c16a
Update asserts with file id
SMorettini May 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Fw/Logger/LogAssert.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#define fileIdFs "Assert file ID %d: Line: %d "
#define ASSERT_CAST static_cast<POINTER_CAST>
#else
#define fileIdFs "Assert file \"%s\": Line: %d "
#define fileIdFs "Assert: \"%s:%d\""
#define ASSERT_CAST reinterpret_cast<POINTER_CAST>
#endif

Expand Down
2 changes: 1 addition & 1 deletion Fw/Test/UnitTestAssert.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ namespace Test {
#if FW_ASSERT_LEVEL == FW_FILEID_ASSERT
(void)fprintf(stderr,"Assert File: 0x%" PRIx32 ", Line: %" 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
}

Expand Down
2 changes: 1 addition & 1 deletion Fw/Types/Assert.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#if FW_ASSERT_LEVEL == FW_FILEID_ASSERT
#define fileIdFs "Assert file ID 0x%08" PRIx32 ": Line: %" PRI_PlatformUIntType
LeStarch marked this conversation as resolved.
Show resolved Hide resolved
#else
#define fileIdFs "Assert file \"%s\": Line: %" PRI_PlatformUIntType
#define fileIdFs "Assert: \"%s:%" PRI_PlatformUIntType "\""
#endif

namespace Fw {
Expand Down