eive/fsfw
eive/fsfw
15
1
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests Releases 1 Wiki Activity

Service Interface and Bugfix

Browse Source 
1. Service Interface looks better now
2. Bugfix in CommandExecutor blocking mode
This commit is contained in:
Robin Müller 2021-08-05 16:13:22 +02:00
parent 4202205182
commit b2c102b2c1
No known key found for this signature in database
GPG Key ID: 11D4952C8CCEF814
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/fsfw/osal/linux/CommandExecutor.cpp
View File

@ -180,5 +180,5 @@ ReturnValue_t CommandExecutor::executeBlocking() {
lastError = result; lastError = result;
return HasReturnvaluesIF::RETURN_FAILED; return HasReturnvaluesIF::RETURN_FAILED;
} }
return EXECUTION_FINISHED; return HasReturnvaluesIF::RETURN_OK;
} }

4
src/fsfw/serviceinterface/ServiceInterfaceBuffer.cpp
View File

@ -146,8 +146,8 @@ std::string* ServiceInterfaceBuffer::getPreamble(size_t * preambleSize) {
#endif #endif
int32_t charCount = sprintf(parsePosition, int32_t charCount = sprintf(parsePosition,
"%s: | %02" SCNu32 ":%02" SCNu32 ":%02" SCNu32 ".%03" SCNu32 " | ", "%s%s | %02" SCNu32 ":%02" SCNu32 ":%02" SCNu32 ".%03" SCNu32 " | ",
this->logMessage.c_str(), loggerTime.hour, this->logMessage.c_str(), sif::ANSI_COLOR_RESET, loggerTime.hour,
loggerTime.minute, loggerTime.minute,
loggerTime.second, loggerTime.second,
loggerTime.usecond /1000); loggerTime.usecond /1000);

4
src/fsfw/serviceinterface/ServiceInterfacePrinter.cpp
View File

@ -69,6 +69,10 @@ void fsfwPrint(sif::PrintLevel printType, const char* fmt, va_list arg) {
len += sprintf(bufferPosition + len, "ERROR: "); len += sprintf(bufferPosition + len, "ERROR: ");
} }
#if FSFW_COLORED_OUTPUT == 1
len += sprintf(bufferPosition, sif::ANSI_COLOR_RESET);
#endif
Clock::TimeOfDay_t now; Clock::TimeOfDay_t now;
Clock::getDateAndTime(&now); Clock::getDateAndTime(&now);
/* /*