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

Update EIVE FSFW #8

Merged
meierj merged 31 commits from mueller/master into eive/develop 2021-08-05 16:35:24 +02:00
Conversation 1 Commits 31 Files Changed 162 +7 -3
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b2c102b2c1 - Show all commits

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

@ -180,5 +180,5 @@ ReturnValue_t CommandExecutor::executeBlocking() {
lastError = result;
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
int32_t charCount = sprintf(parsePosition,
"%s: | %02" SCNu32 ":%02" SCNu32 ":%02" SCNu32 ".%03" SCNu32 " | ",
this->logMessage.c_str(), loggerTime.hour,
"%s%s | %02" SCNu32 ":%02" SCNu32 ":%02" SCNu32 ".%03" SCNu32 " | ",
this->logMessage.c_str(), sif::ANSI_COLOR_RESET, loggerTime.hour,
loggerTime.minute,
loggerTime.second,
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: ");
}
#if FSFW_COLORED_OUTPUT == 1
len += sprintf(bufferPosition, sif::ANSI_COLOR_RESET);
#endif
Clock::TimeOfDay_t now;
Clock::getDateAndTime(&now);
/*