fsfw/fsfw
11
3
Fork 6
Code Issues 32 Pull Requests 4 Releases 10 Wiki Activity

Colored prefix option only if colored output is enabled #449

Merged
muellerr merged 6 commits from meier/ColeredDebugOutput into development 2021-07-27 13:07:16 +02:00
Conversation 3 Commits 6 Files Changed 6 +9 -4
meierj commented 2021-07-24 07:21:30 +02:00
Owner
Copy Link
  • added missing preprocessor directives to make colored output optional
* added missing preprocessor directives to make colored output optional
muellerr was assigned by meierj 2021-07-24 07:21:30 +02:00
meierj added 2 commits 2021-07-24 07:21:31 +02:00
renamed freertos includes 5e960f118f
fixed merge conflicts a918c672a5
muellerr requested changes 2021-07-27 10:03:25 +02:00
osal/FreeRTOS/MessageQueue.h Outdated
@@ -11,6 +11,8 @@
#include "FreeRTOS.h"
#include "queue.h"
#include "FreeRTOS.h"
muellerr commented 2021-07-26 14:43:24 +02:00
Owner
Copy Link

double include

double include
meierj marked this conversation as resolved
muellerr added 1 commit 2021-07-27 10:03:37 +02:00
Merge branch 'development' into meier/ColeredDebugOutput 3895806a2b
muellerr changed title from meier/ColeredDebugOutput to Colored prefix option only if colored output is enabled 2021-07-27 10:06:12 +02:00
meierj added 2 commits 2021-07-27 10:10:38 +02:00
removed double include 2489276350
Merge branch 'meier/ColeredDebugOutput' of https://egit.irs.uni-stuttgart.de/fsfw/fsfw into meier/ColeredDebugOutput ebc9d99022
muellerr requested changes 2021-07-27 10:13:49 +02:00
serviceinterface/ServiceInterfaceBuffer.cpp Outdated
@@ -175,2 +174,2 @@
this->colorPrefix = colorPrefix;
}
#if FSFW_COLORED_OUTPUT == 1
void ServiceInterfaceBuffer::setAsciiColorPrefix(std::string colorPrefix) {
muellerr commented 2021-07-27 10:05:20 +02:00
Owner
Copy Link

Usually code in preprocessor defines has not been indented yet. I'd keep it consistent

Usually code in preprocessor defines has not been indented yet. I'd keep it consistent
meierj marked this conversation as resolved
unittest/tests/mocks/MessageQueueMockBase.h Outdated
@@ -4,3 +4,3 @@
#include <fsfw/ipc/MessageQueueIF.h>
#include <fsfw/ipc/MessageQueueMessage.h>
#include <unittest/core/CatchDefinitions.h>
#include <unittest/user/unittest/core/CatchDefinitions.h>
muellerr commented 2021-07-27 10:07:40 +02:00
Owner
Copy Link

I think this needs to remain #include <unittest/core/CatchDefinitions.h> but I'd need to check fsfw-test for that again.. Unless you are sure this is the correct include, I'd leave it the old way

I think this needs to remain `#include <unittest/core/CatchDefinitions.h>` but I'd need to check `fsfw-test` for that again.. Unless you are sure this is the correct include, I'd leave it the old way
meierj marked this conversation as resolved
meierj added 1 commit 2021-07-27 12:59:25 +02:00
added proposed changes 3d80d5d036
muellerr approved these changes 2021-07-27 13:07:03 +02:00
muellerr merged commit 2d667cfb95 into development 2021-07-27 13:07:16 +02:00
muellerr deleted branch meier/ColeredDebugOutput 2021-07-27 13:07:23 +02:00
Sign in to join this conversation.
Reviewers
No Reviewers
muellerr
Labels
Clear labels
API Change
Changes the API, so Users need to adapted
 Breaking API Change
Changes the API in a non backwards compatible way
 bug
Something is not working
 build
Issues related to the buildsystem, including CI
 cosmetics
Small change most users won't notice
 Documentation
Improvement of code documentation
 duplicate
This issue or pull request already exists
 feature
New feature
 help wanted
Need some help
 hotfix
Quick or important fix that is merged directly into master, causing a new revision
 invalid
#worksforme
 question
More information is needed
 Refactor
Contains a refactoring of some code
 Tests
Issues related to testing code
 wontfix
This won't be fixed
No Label
Milestone
No items
No Milestone
Assignees
Clear assignees
ahinkel dwoodward gaisser hanke jenkins_buildfix lrajer meierj mohr muellerr taheran tbaumgartl
No Assignees muellerr
2 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: fsfw/fsfw#449
Delete Branch "meier/ColeredDebugOutput"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?