linux/boardtest/UartTestClass.cpp

@@ -23,15 +23,15 @@
 UartTestClass::UartTestClass(object_id_t objectId, ScexUartReader* reader)
     : TestTask(objectId), reader(reader) {
   mode = TestModes::SCEX;
-	scexMode = ScexModes::SIMPLE;
-	currCmd = scex::ScexCmds::FRAM;
+  scexMode = ScexModes::READER_TASK;
+  currCmd = scex::ScexCmds::PING;
   if (scexMode == ScexModes::SIMPLE) {
     auto encodingBuf = new std::array<uint8_t, 4096>;
     DleParser::BufPair encodingBufPair{encodingBuf->data(), encodingBuf->size()};
     auto decodedBuf = new std::array<uint8_t, 4096>;
     DleParser::BufPair decodingBufPair{decodedBuf->data(), decodedBuf->size()};
-		dleParser =
-				new ScexDleParser(*(new SimpleRingBuffer(4096, true)), dleEncoder, encodingBufPair, decodingBufPair, &foundDlePacketHandler, this);
+    dleParser = new ScexDleParser(*(new SimpleRingBuffer(4096, true)), dleEncoder, encodingBufPair,
+                                  decodingBufPair, &foundDlePacketHandler, this);
   }
 }
 
@@ -187,8 +187,11 @@ void UartTestClass::scexPeriodic() {
       ReturnValue_t result = reader->readReceivedMessage(uartCookie, &decodedPacket, &len);
 
       if (len > 0) {
-				sif::info<<"CmdByte: "<<(int)decodedPacket[0]<<endl;
+        sif::info << "CmdByte: " << std::setw(2) << std::setfill('0') << std::hex
+                  << (int)decodedPacket[0] << std::dec << endl;
         scex::ScexCmds cmd = static_cast<scex::ScexCmds>((decodedPacket[0] >> 1) & 0b11111);
+        sif::info << "Command: 0x" << std::setw(2) << std::setfill('0') << std::hex
+                  << static_cast<int>(cmd) << std::dec << std::endl;
         size_t packetCounter = decodedPacket[1];
         sif::info << "PacketCounter: " << packetCounter << endl;
         size_t totalPacketCounter = decodedPacket[2];
@@ -199,8 +202,8 @@ void UartTestClass::scexPeriodic() {
 
         sif::info << "ExpectedPacketLength: " << packetLen + 7 << endl;
         if (expectedPacketLen != len) {
-					sif::warning<<"ExpectedPacketLength "  << expectedPacketLen <<" is not Length"<< len<<endl;
-
+          sif::warning << "ExpectedPacketLength " << expectedPacketLen << " is not Length" << len
+                       << endl;
         }
         if (CRC::crc16ccitt(decodedPacket, expectedPacketLen) != 0) {
           sif::warning << "CRC invalid" << endl;
@@ -211,16 +214,15 @@ void UartTestClass::scexPeriodic() {
           reader->finish();
           sif::info << "Reader is finished" << endl;
           cmdDone = true;
-					if(cmd == scex::ScexCmds::PING){
+          // TODO: Bug in firmware, other command will be returned
           cmdSent = false;
+          // if (cmd == scex::ScexCmds::PING) {
+          //   cmdSent = false;
+          // }
         }
       }
-
     }
   }
-
-	}
-
 }
 
 void UartTestClass::scexSimpleInit() {
@@ -249,8 +251,8 @@ void UartTestClass::scexSimpleInit() {
 
   // Non-blocking mode, read until either line is 0.1 second idle or maximum of 255 bytes are
   // received in one go
-	tty.c_cc[VTIME] = 10;  // In units of 0.1 seconds
-	tty.c_cc[VMIN] = 255;  // Read up to 255 bytes
+  tty.c_cc[VTIME] = 0;  // In units of 0.1 seconds
+  tty.c_cc[VMIN] = 0;   // Read up to 255 bytes
 
   // Q7S UART Lite has fixed baud rate. For other linux systems, set baud rate here.
 #if !defined(XIPHOS_Q7S)

linux/devices/ScexUartReader.cpp

@@ -5,6 +5,7 @@
 #include <fsfw/ipc/MutexFactory.h>
 #include <fsfw/ipc/MutexGuard.h>
 #include <fsfw/tasks/SemaphoreFactory.h>
+#include <fsfw/tasks/TaskFactory.h>
 #include <fsfw_hal/linux/uart/UartCookie.h>
 #include <linux/devices/ScexDleParser.h>
 #include <unistd.h>  // write(), read(), close()
@@ -39,11 +40,12 @@ ReturnValue_t ScexUartReader::performOperation(uint8_t operationCode) {
                        static_cast<unsigned int>(recBuf.size()));
       if (bytesRead == 0) {
         MutexGuard mg(lock);
-        States currentState = state;
-        if (currentState == States::FINISH) {
+        if (state == States::FINISH) {
+          sif::debug << "finish detected" << std::endl;
           state = States::IDLE;
           break;
         }
+        TaskFactory::delayTask(1000);
       } else if (bytesRead < 0) {
         sif::warning << "ScexUartReader::performOperation: read call failed with error [" << errno
                      << ", " << strerror(errno) << "]" << std::endl;
@@ -63,7 +65,7 @@ ReturnValue_t ScexUartReader::performOperation(uint8_t operationCode) {
       }
     };
     // task block comes here
-    std::cout << "done" << std::endl;
+    sif::info << "task was stopped" << std::endl;
   }
   return RETURN_OK;
 }
@@ -94,8 +96,8 @@ ReturnValue_t ScexUartReader::initializeInterface(CookieIF *cookie) {
   tty.c_lflag &= ~(ICANON | ECHO);
 
   // Non-blocking mode, use polling
-  tty.c_cc[VTIME] = 10;  // Read for up to 1 seconds
-  tty.c_cc[VMIN] = 255;   // Read as much as there is available
+  tty.c_cc[VTIME] = 0;
+  tty.c_cc[VMIN] = 0;
 
   // Q7S UART Lite has fixed baud rate. For other linux systems, set baud rate here.
 #if !defined(XIPHOS_Q7S)
@@ -109,7 +111,7 @@ ReturnValue_t ScexUartReader::initializeInterface(CookieIF *cookie) {
                  << std::endl;
   }
   // Flush received and unread data
-  tcflush(serialPort, TCIFLUSH);
+  tcflush(serialPort, TCIOFLUSH);
   return RETURN_OK;
 }
 
@@ -189,7 +191,8 @@ ReturnValue_t ScexUartReader::readReceivedMessage(CookieIF *cookie, uint8_t **bu
     *size = 0;
     return RETURN_OK;
   }
-  *size = ipcQueue.pop();
+  sif::info << "returning data" << std::endl;
+  ipcQueue.retrieve(size);
   *buffer = ipcBuffer.data();
   ReturnValue_t result = ipcRingBuf.readData(ipcBuffer.data(), *size, true);
   if (result != RETURN_OK) {

tmtc

@@ -1 +1 @@
-Subproject commit ecb973c37fe43954d0be1f19b0735b3546d2ef1b
+Subproject commit 8a30f669f075c284494d7c1c6618e42e2aec8f15