improvements and fixes

CMakeLists.txt

@@ -186,4 +186,4 @@ target_compile_options(${LIB_FSFW_NAME} PRIVATE
 
 target_link_libraries(${LIB_FSFW_NAME} PRIVATE
     ${FSFW_ADDITIONAL_LINK_LIBS}
-)
+)

src/fsfw/FSFW.h.in

@@ -20,6 +20,14 @@
 #define FSFW_TCP_RECV_WIRETAPPING_ENABLED   0
 #endif
 
+#ifndef FSFW_USE_PUS_C_TELEMETRY
+#define FSFW_USE_PUS_C_TELEMETRY            1
+#endif
+
+#ifndef FSFW_USE_PUS_C_TELECOMMANDS
+#define FSFW_USE_PUS_C_TELECOMMANDS         1
+#endif
+
 // Can be used for low-level debugging of the SPI bus
 #ifndef FSFW_HAL_SPI_WIRETAPPING
 #define FSFW_HAL_SPI_WIRETAPPING            0

src/fsfw/osal/common/TcpTmTcServer.cpp

@@ -210,7 +210,11 @@ void TcpTmTcServer::handleServerOperation(socket_t& connSocket) {
 
 ReturnValue_t TcpTmTcServer::handleTcReception(uint8_t* spacePacket, size_t packetSize) {
     if(wiretappingEnabled) {
+#if FSFW_CPP_OSTREAM_ENABLED == 1
         sif::info << "Received TC:" << std::endl;
+#else
+        sif::printInfo("Received TC:\n");
+#endif
         arrayprinter::print(spacePacket, packetSize);
     }
 
@@ -278,7 +282,11 @@ ReturnValue_t TcpTmTcServer::handleTmSending(socket_t connSocket, bool& tmSent)
             return result;
         }
         if(wiretappingEnabled) {
+#if FSFW_CPP_OSTREAM_ENABLED == 1
             sif::info << "Sending TM:" << std::endl;
+#else
+            sif::printInfo("Sending TM:\n");
+#endif
             arrayprinter::print(storeAccessor.data(), storeAccessor.size());
         }
         int retval = send(connSocket,

src/fsfw/osal/linux/CommandExecutor.cpp

@@ -62,8 +62,13 @@ ReturnValue_t CommandExecutor::close() {
 
 void CommandExecutor::printLastError(std::string funcName) const {
     if(lastError != 0) {
-        sif::error << funcName << " pclose failed with code " <<
-                lastError << ": " << strerror(lastError) << std::endl;
+#if FSFW_CPP_OSTREAM_ENABLED == 1
+        sif::warning << funcName << " pclose failed with code " << lastError << ": " <<
+                strerror(lastError) << std::endl;
+#else
+        sif::printError("%s pclose failed with code %d: %s\n",
+                funcName, lastError, strerror(lastError));
+#endif
     }
 }
 
@@ -98,15 +103,23 @@ ReturnValue_t CommandExecutor::check(bool& bytesRead) {
             ssize_t readBytes = read(currentFd, readVec.data(), readVec.size());
             if(readBytes == 0) {
                 // Should not happen
-                sif::warning << "CommandExecutor::check: "
-                        "No bytes read after poll event.." << std::endl;
+#if FSFW_CPP_OSTREAM_ENABLED == 1
+                sif::warning << "CommandExecutor::check: No bytes read "
+                        "after poll event.." << std::endl;
+#else
+                sif::printWarning("CommandExecutor::check: No bytes read after poll event..\n");
+#endif
                 break;
             }
             else if(readBytes > 0) {
                 bytesRead = true;
                 if(printOutput) {
                     // It is assumed the command output is line terminated
+#if FSFW_CPP_OSTREAM_ENABLED == 1
                     sif::info << currentCmd << " | " << readVec.data();
+#else
+                    sif::printInfo("%s | %s", currentCmd, readVec.data());
+#endif
                 }
                 if(ringBuffer != nullptr) {
                     ringBuffer->writeData(reinterpret_cast<const uint8_t*>(
@@ -121,12 +134,20 @@ ReturnValue_t CommandExecutor::check(bool& bytesRead) {
             }
             else {
                 // Should also not happen
+#if FSFW_CPP_OSTREAM_ENABLED == 1
                 sif::warning << "CommandExecutor::check: Error " << errno << ": " <<
                         strerror(errno) << std::endl;
+#else
+                sif::printWarning("CommandExecutor::check: Error %d: %s\n", errno, strerror(errno));
+#endif
             }
         }
         else if(waiter.revents & POLLERR) {
+#if FSFW_CPP_OSTREAM_ENABLED == 1
             sif::warning << "CommandExecuter::check: Poll error" << std::endl;
+#else
+            sif::printWarning("CommandExecuter::check: Poll error\n");
+#endif
             return COMMAND_ERROR;
         }
         else if(waiter.revents & POLLHUP) {
@@ -165,7 +186,11 @@ ReturnValue_t CommandExecutor::executeBlocking() {
     while(fgets(readVec.data(), readVec.size(), currentCmdFile) != nullptr) {
         std::string output(readVec.data());
         if(printOutput) {
+#if FSFW_CPP_OSTREAM_ENABLED == 1
             sif::info << currentCmd << " | " << output;
+#else
+            sif::printInfo("%s | %s", currentCmd, output);
+#endif
         }
         if(ringBuffer != nullptr) {
             ringBuffer->writeData(reinterpret_cast<const uint8_t*>(output.data()), output.size());

src/fsfw/tmtcpacket/pus/tm/TmPacketStoredPusC.cpp

@@ -77,9 +77,9 @@ TmPacketStoredPusC::TmPacketStoredPusC(uint16_t apid, uint8_t service,
                     "%d too large\n", sizeToReserve);
             break;
         }
-#endif
 #endif
         }
+#endif
         TmPacketStoredBase::checkAndReportLostTm();
         return;
     }