printf support for array printer

globalfunctions/arrayprinter.cpp

@@ -10,9 +10,12 @@ void arrayprinter::print(const uint8_t *data, size_t size, OutputType type,
     }
     sif::info << "[";
 #else
-	// TODO: Use %zu or %lu depending on whether C99 support is given.
+#if FSFW_NO_C99_IO == 1
     sif::printInfo("Printing data with size %lu: [", static_cast<unsigned long>(size));
-#endif
+#else
+    sif::printInfo("Printing data with size %zu: [", size);
+#endif /* FSFW_NO_C99_IO == 1 */
+#endif /* FSFW_CPP_OSTREAM_ENABLED == 1 */
     if(type == OutputType::HEX) {
         arrayprinter::printHex(data, size, maxCharPerLine);
     }
@@ -30,7 +33,7 @@ void arrayprinter::printHex(const uint8_t *data, size_t size,
     sif::info << std::hex;
     for(size_t i = 0; i < size; i++) {
         sif::info << "0x" << static_cast<int>(data[i]);
-		if(i < size - 1){
+        if(i < size - 1) {
             sif::info << " , ";
             if(i > 0 and i % maxCharPerLine == 0) {
                 sif::info << std::endl;
@@ -41,7 +44,24 @@ void arrayprinter::printHex(const uint8_t *data, size_t size,
     sif::info << std::dec;
     sif::info << "]" << std::endl;
 #else
-	// how much memory to reserve for printout?
+    // General format: 0x01, 0x02, 0x03 so it is number of chars times 6
+    // plus line break plus small safety margin.
+    char printBuffer[(size + 1) * 7 + 1];
+    size_t currentPos = 0;
+    for(size_t i = 0; i < size; i++) {
+        // To avoid buffer overflows.
+        if(sizeof(printBuffer) - currentPos <= 7) {
+            break;
+        }
+
+        currentPos += snprintf(printBuffer + currentPos, 6, "0x%02x", data[i]);
+        if(i < size - 1) {
+            currentPos += sprintf(printBuffer + currentPos, ", ");
+            if(i > 0 and i % maxCharPerLine == 0) {
+                currentPos += sprintf(printBuffer + currentPos, "\n");
+            }
+        }
+    }
 #endif
 }
 
@@ -60,7 +80,24 @@ void arrayprinter::printDec(const uint8_t *data, size_t size,
     }
     sif::info << "]" << std::endl;
 #else
-	// how much memory to reserve for printout?
+    // General format: 32, 243, -12 so it is number of chars times 5
+    // plus line break plus small safety margin.
+    char printBuffer[(size + 1) * 5 + 1];
+    size_t currentPos = 0;
+    for(size_t i = 0; i < size; i++) {
+        // To avoid buffer overflows.
+        if(sizeof(printBuffer) - currentPos <= 5) {
+            break;
+        }
+
+        currentPos += snprintf(printBuffer + currentPos, 3, "%d", data[i]);
+        if(i < size - 1) {
+            currentPos += sprintf(printBuffer + currentPos, ", ");
+            if(i > 0 and i % maxCharPerLine == 0) {
+                currentPos += sprintf(printBuffer + currentPos, "\n");
+            }
+        }
+    }
 #endif
 }
 
@@ -68,11 +105,14 @@ void arrayprinter::printBin(const uint8_t *data, size_t size) {
 #if FSFW_CPP_OSTREAM_ENABLED == 1
     sif::info << "\n" << std::flush;
     for(size_t i = 0; i < size; i++) {
-        sif::info << "Byte " << i + 1 << ": 0b"<<
+        sif::info << "Byte " << i + 1 << ": 0b" <<  std::bitset<8>(data[i]) << "," << std::endl;
-                std::bitset<8>(data[i]) << ",\n" << std::flush;
     }
     sif::info << "]" << std::endl;
 #else
-    // how much memory to reserve for printout?
+    sif::printInfo("\n");
+    for(size_t i = 0; i < size; i++) {
+        sif::printInfo("Byte %d: 0b" BYTE_TO_BINARY_PATTERN ",\n", BYTE_TO_BINARY(data[i]));
+    }
+    sif::printInfo("]\n");
 #endif
 }

globalfunctions/arrayprinter.h

@@ -1,5 +1,6 @@
 #ifndef FRAMEWORK_GLOBALFUNCTIONS_ARRAYPRINTER_H_
 #define FRAMEWORK_GLOBALFUNCTIONS_ARRAYPRINTER_H_
+
 #include <cstdint>
 #include <cstddef>
 
@@ -9,12 +10,15 @@ enum class OutputType {
     BIN
 };
 
+//! TODO: Write unit tests for this module.
 namespace arrayprinter {
+
 void print(const uint8_t* data, size_t size, OutputType type = OutputType::HEX,
         bool printInfo = true, size_t maxCharPerLine = 12);
 void printHex(const uint8_t* data, size_t size, size_t maxCharPerLine = 12);
 void printDec(const uint8_t* data, size_t size, size_t maxCharPerLine = 12);
 void printBin(const uint8_t* data, size_t size);
+
 }
 
 #endif /* FRAMEWORK_GLOBALFUNCTIONS_ARRAYPRINTER_H_ */