CHANGELOG.md

@@ -33,6 +33,7 @@ will consitute of a breaking change warranting a new major release:
   CMake from selecting wrong cross-compilers if multiple cross-compilers with the same name are used
   on the same system.
 - Add ACS board for EM by default now.
+- Add support for MPSoC HK packet.
 
 ## Added
 

linux/payload/PlocMpsocHandler.cpp

@@ -792,6 +792,175 @@ ReturnValue_t PlocMPSoCHandler::handleGetHkReport(const uint8_t* data) {
     return result;
   }
   SpacePacketReader packetReader(data, foundPacketLen);
+  const uint8_t* dataStart = data + 6;
+  PoolReadGuard pg(&hkReport);
+  size_t deserLen = mpsoc::SIZE_TM_HK_REPORT;
+  SerializeIF::Endianness endianness = SerializeIF::Endianness::NETWORK;
+  result = SerializeAdapter::deSerialize(&hkReport.status.value, &dataStart, &deserLen, endianness);
+  if (result != returnvalue::OK) {
+    return result;
+  }
+  result = SerializeAdapter::deSerialize(&hkReport.mode.value, &dataStart, &deserLen, endianness);
+  if (result != returnvalue::OK) {
+    return result;
+  }
+  result = SerializeAdapter::deSerialize(&hkReport.downlinkPwrOn.value, &dataStart, &deserLen,
+                                         endianness);
+  if (result != returnvalue::OK) {
+    return result;
+  }
+  result = SerializeAdapter::deSerialize(&hkReport.downlinkReplyActive.value, &dataStart, &deserLen,
+                                         endianness);
+  if (result != returnvalue::OK) {
+    return result;
+  }
+  result = SerializeAdapter::deSerialize(&hkReport.downlinkJesdSyncStatus.value, &dataStart,
+                                         &deserLen, endianness);
+  if (result != returnvalue::OK) {
+    return result;
+  }
+  result = SerializeAdapter::deSerialize(&hkReport.downlinkDacStatus.value, &dataStart, &deserLen,
+                                         endianness);
+  if (result != returnvalue::OK) {
+    return result;
+  }
+  result =
+      SerializeAdapter::deSerialize(&hkReport.camStatus.value, &dataStart, &deserLen, endianness);
+  if (result != returnvalue::OK) {
+    return result;
+  }
+  result = SerializeAdapter::deSerialize(&hkReport.camSdiStatus.value, &dataStart, &deserLen,
+                                         endianness);
+  if (result != returnvalue::OK) {
+    return result;
+  }
+  result =
+      SerializeAdapter::deSerialize(&hkReport.camFpgaTemp.value, &dataStart, &deserLen, endianness);
+  if (result != returnvalue::OK) {
+    return result;
+  }
+  result =
+      SerializeAdapter::deSerialize(&hkReport.sysmonTemp.value, &dataStart, &deserLen, endianness);
+  if (result != returnvalue::OK) {
+    return result;
+  }
+  result = SerializeAdapter::deSerialize(&hkReport.sysmonVccInt.value, &dataStart, &deserLen,
+                                         endianness);
+  if (result != returnvalue::OK) {
+    return result;
+  }
+  result = SerializeAdapter::deSerialize(&hkReport.sysmonVccAux.value, &dataStart, &deserLen,
+                                         endianness);
+  if (result != returnvalue::OK) {
+    return result;
+  }
+  result = SerializeAdapter::deSerialize(&hkReport.sysmonVccBram.value, &dataStart, &deserLen,
+                                         endianness);
+  if (result != returnvalue::OK) {
+    return result;
+  }
+  result = SerializeAdapter::deSerialize(&hkReport.sysmonVccPaux.value, &dataStart, &deserLen,
+                                         endianness);
+  if (result != returnvalue::OK) {
+    return result;
+  }
+  result = SerializeAdapter::deSerialize(&hkReport.sysmonVccPint.value, &dataStart, &deserLen,
+                                         endianness);
+  if (result != returnvalue::OK) {
+    return result;
+  }
+  result = SerializeAdapter::deSerialize(&hkReport.sysmonVccPdro.value, &dataStart, &deserLen,
+                                         endianness);
+  if (result != returnvalue::OK) {
+    return result;
+  }
+  result =
+      SerializeAdapter::deSerialize(&hkReport.sysmonMb12V.value, &dataStart, &deserLen, endianness);
+  if (result != returnvalue::OK) {
+    return result;
+  }
+  result =
+      SerializeAdapter::deSerialize(&hkReport.sysmonMb3V3.value, &dataStart, &deserLen, endianness);
+  if (result != returnvalue::OK) {
+    return result;
+  }
+  result =
+      SerializeAdapter::deSerialize(&hkReport.sysmonMb1V8.value, &dataStart, &deserLen, endianness);
+  if (result != returnvalue::OK) {
+    return result;
+  }
+  result = SerializeAdapter::deSerialize(&hkReport.sysmonVcc12V.value, &dataStart, &deserLen,
+                                         endianness);
+  if (result != returnvalue::OK) {
+    return result;
+  }
+  result =
+      SerializeAdapter::deSerialize(&hkReport.sysmonVcc5V.value, &dataStart, &deserLen, endianness);
+  if (result != returnvalue::OK) {
+    return result;
+  }
+  result = SerializeAdapter::deSerialize(&hkReport.sysmonVcc3V3.value, &dataStart, &deserLen,
+                                         endianness);
+  if (result != returnvalue::OK) {
+    return result;
+  }
+  result = SerializeAdapter::deSerialize(&hkReport.sysmonVcc3V3VA.value, &dataStart, &deserLen,
+                                         endianness);
+  if (result != returnvalue::OK) {
+    return result;
+  }
+  result = SerializeAdapter::deSerialize(&hkReport.sysmonVcc2V5DDR.value, &dataStart, &deserLen,
+                                         endianness);
+  if (result != returnvalue::OK) {
+    return result;
+  }
+  result = SerializeAdapter::deSerialize(&hkReport.sysmonVcc1V2DDR.value, &dataStart, &deserLen,
+                                         endianness);
+  if (result != returnvalue::OK) {
+    return result;
+  }
+  result = SerializeAdapter::deSerialize(&hkReport.sysmonVcc0V9.value, &dataStart, &deserLen,
+                                         endianness);
+  if (result != returnvalue::OK) {
+    return result;
+  }
+  result = SerializeAdapter::deSerialize(&hkReport.sysmonVcc0V6VTT.value, &dataStart, &deserLen,
+                                         endianness);
+  if (result != returnvalue::OK) {
+    return result;
+  }
+  result = SerializeAdapter::deSerialize(&hkReport.sysmonSafeCotsCur.value, &dataStart, &deserLen,
+                                         endianness);
+  if (result != returnvalue::OK) {
+    return result;
+  }
+  result = SerializeAdapter::deSerialize(&hkReport.sysmonNvm4XoCur.value, &dataStart, &deserLen,
+                                         endianness);
+  if (result != returnvalue::OK) {
+    return result;
+  }
+  result = SerializeAdapter::deSerialize(&hkReport.semUncorrectableErrs.value, &dataStart,
+                                         &deserLen, endianness);
+  if (result != returnvalue::OK) {
+    return result;
+  }
+  result = SerializeAdapter::deSerialize(&hkReport.semCorrectableErrs.value, &dataStart, &deserLen,
+                                         endianness);
+  if (result != returnvalue::OK) {
+    return result;
+  }
+  result =
+      SerializeAdapter::deSerialize(&hkReport.semStatus.value, &dataStart, &deserLen, endianness);
+  if (result != returnvalue::OK) {
+    return result;
+  }
+  // Skip the weird filename
+  dataStart += 256;
+  result = SerializeAdapter::deSerialize(&hkReport.rebootMpsocRequired, &dataStart, &deserLen,
+                                         endianness);
+  if (result != returnvalue::OK) {
+    return result;
+  }
   return returnvalue::OK;
 }
 
@@ -830,7 +999,7 @@ ReturnValue_t PlocMPSoCHandler::enableReplyInReplyMap(DeviceCommandMap::iterator
                  << mpsoc::TM_MEMORY_READ_REPORT << " not in replyMap" << std::endl;
       return result;
     }
-    break;
+    return returnvalue::OK;
   };
   switch (command->first) {
     case mpsoc::TC_MEM_WRITE:
@@ -849,15 +1018,24 @@ ReturnValue_t PlocMPSoCHandler::enableReplyInReplyMap(DeviceCommandMap::iterator
       enabledReplies = 2;
       break;
     case mpsoc::TC_GET_HK_REPORT: {
-      enableThreeReplies(mpsoc::TM_GET_HK_REPORT);
+      result = enableThreeReplies(mpsoc::TM_GET_HK_REPORT);
+      if (result != returnvalue::OK) {
+        return result;
+      }
       break;
     }
     case mpsoc::TC_MEM_READ: {
-      enableThreeReplies(mpsoc::TM_MEMORY_READ_REPORT);
+      result = enableThreeReplies(mpsoc::TM_MEMORY_READ_REPORT);
+      if (result != returnvalue::OK) {
+        return result;
+      }
       break;
     }
     case mpsoc::TC_CAM_CMD_SEND: {
-      enableThreeReplies(mpsoc::TM_CAM_CMD_RPT);
+      result = enableThreeReplies(mpsoc::TM_CAM_CMD_RPT);
+      if (result != returnvalue::OK) {
+        return result;
+      }
       break;
     }
     case mpsoc::OBSW_RESET_SEQ_COUNT:
@@ -1065,7 +1243,7 @@ void PlocMPSoCHandler::disableAllReplies() {
 
   DeviceCommandId_t commandId = getPendingCommand();
 
-  auto disableCommandWithReply = [](DeviceCommandId_t replyId) {
+  auto disableCommandWithReply = [&](DeviceCommandId_t replyId) {
     iter = deviceReplyMap.find(replyId);
     info = &(iter->second);
     info->delayCycles = 0;