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

Merge pull request 'Arrayprinter format improvements' (#514) from KSat/fsfw:mueller/arrayprinter-improvements into development

Browse Source 
Reviewed-on: fsfw/fsfw#514
This commit is contained in:
Ulrich Mohr 2021-10-25 14:09:25 +02:00
commit 0e653378c3
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/fsfw/globalfunctions/arrayprinter.cpp
View File

@ -45,18 +45,18 @@ void arrayprinter::printHex(const uint8_t *data, size_t size,
std::cout << "\r" << std::endl; std::cout << "\r" << std::endl;
} }
std::cout << "[" << std::hex; std::cout << "hex [" << std::setfill('0') << std::hex;
for(size_t i = 0; i < size; i++) { for(size_t i = 0; i < size; i++) {
std::cout << "0x" << static_cast<int>(data[i]); std::cout << std::setw(2) << static_cast<int>(data[i]);
if(i < size - 1) { if(i < size - 1) {
std::cout << " , "; std::cout << ",";
if(i > 0 and (i + 1) % maxCharPerLine == 0) { if(i > 0 and (i + 1) % maxCharPerLine == 0) {
std::cout << std::endl; std::cout << std::endl;
} }
} }
} }
std::cout << std::dec; std::cout << std::dec << std::setfill(' ');
std::cout << "]" << std::endl; std::cout << "]" << std::endl;
#else #else
// General format: 0x01, 0x02, 0x03 so it is number of chars times 6 // General format: 0x01, 0x02, 0x03 so it is number of chars times 6
@ -69,16 +69,16 @@ void arrayprinter::printHex(const uint8_t *data, size_t size,
break; break;
} }
currentPos += snprintf(printBuffer + currentPos, 6, "0x%02x", data[i]); currentPos += snprintf(printBuffer + currentPos, 6, "%02x", data[i]);
if(i < size - 1) { if(i < size - 1) {
currentPos += sprintf(printBuffer + currentPos, ", "); currentPos += sprintf(printBuffer + currentPos, ",");
if(i > 0 and (i + 1) % maxCharPerLine == 0) { if(i > 0 and (i + 1) % maxCharPerLine == 0) {
currentPos += sprintf(printBuffer + currentPos, "\n"); currentPos += sprintf(printBuffer + currentPos, "\n");
} }
} }
} }
#if FSFW_DISABLE_PRINTOUT == 0 #if FSFW_DISABLE_PRINTOUT == 0
printf("[%s]\n", printBuffer); printf("hex [%s]\n", printBuffer);
#endif /* FSFW_DISABLE_PRINTOUT == 0 */ #endif /* FSFW_DISABLE_PRINTOUT == 0 */
#endif #endif
} }
@ -90,11 +90,11 @@ void arrayprinter::printDec(const uint8_t *data, size_t size,
std::cout << "\r" << std::endl; std::cout << "\r" << std::endl;
} }
std::cout << "[" << std::dec; std::cout << "dec [" << std::dec;
for(size_t i = 0; i < size; i++) { for(size_t i = 0; i < size; i++) {
std::cout << static_cast<int>(data[i]); std::cout << static_cast<int>(data[i]);
if(i < size - 1){ if(i < size - 1){
std::cout << " , "; std::cout << ",";
if(i > 0 and (i + 1) % maxCharPerLine == 0) { if(i > 0 and (i + 1) % maxCharPerLine == 0) {
std::cout << std::endl; std::cout << std::endl;
} }
@ -114,14 +114,14 @@ void arrayprinter::printDec(const uint8_t *data, size_t size,
currentPos += snprintf(printBuffer + currentPos, 3, "%d", data[i]); currentPos += snprintf(printBuffer + currentPos, 3, "%d", data[i]);
if(i < size - 1) { if(i < size - 1) {
currentPos += sprintf(printBuffer + currentPos, ", "); currentPos += sprintf(printBuffer + currentPos, ",");
if(i > 0 and (i + 1) % maxCharPerLine == 0) { if(i > 0 and (i + 1) % maxCharPerLine == 0) {
currentPos += sprintf(printBuffer + currentPos, "\n"); currentPos += sprintf(printBuffer + currentPos, "\n");
} }
} }
} }
#if FSFW_DISABLE_PRINTOUT == 0 #if FSFW_DISABLE_PRINTOUT == 0
printf("[%s]\n", printBuffer); printf("dec [%s]\n", printBuffer);
#endif /* FSFW_DISABLE_PRINTOUT == 0 */ #endif /* FSFW_DISABLE_PRINTOUT == 0 */
#endif #endif
} }