From 9953a49b09ab34d1e75ba1a4ff03ca0b570a0ac6 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Mon, 21 Nov 2022 17:55:56 +0100 Subject: [PATCH] minor improvements for PLOC SUPV update --- linux/devices/ploc/PlocSupvUartMan.cpp | 12 ++++++------ linux/devices/ploc/PlocSupvUartMan.h | 2 +- tmtc | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/linux/devices/ploc/PlocSupvUartMan.cpp b/linux/devices/ploc/PlocSupvUartMan.cpp index 0db0feef..ee91554e 100644 --- a/linux/devices/ploc/PlocSupvUartMan.cpp +++ b/linux/devices/ploc/PlocSupvUartMan.cpp @@ -314,17 +314,17 @@ void PlocSupvUartManager::executeFullCheckMemoryCommand() { sif::info << "PLOC SUPV Mem Check: Selecting Memory" << std::endl; result = selectMemory(); if (result != returnvalue::OK) { - triggerEvent(SUPV_MEM_CHECK_FAIL, result); + triggerEvent(SUPV_MEM_CHECK_FAIL, result, 1); return; } sif::info << "PLOC SUPV Mem Check: Preparing Update" << std::endl; result = prepareUpdate(); if (result != returnvalue::OK) { - triggerEvent(SUPV_MEM_CHECK_FAIL, result); + triggerEvent(SUPV_MEM_CHECK_FAIL, result, 2); return; } sif::info << "PLOC SUPV Mem Check: Memory Check" << std::endl; - handleCheckMemoryCommand(); + handleCheckMemoryCommand(3); } ReturnValue_t PlocSupvUartManager::executeUpdate() { @@ -369,7 +369,7 @@ ReturnValue_t PlocSupvUartManager::updateOperation() { return result; } sif::info << "PlocSupvHelper::performUpdate: Memory Check" << std::endl; - return handleCheckMemoryCommand(); + return handleCheckMemoryCommand(0); } ReturnValue_t PlocSupvUartManager::writeUpdatePackets() { @@ -733,7 +733,7 @@ ReturnValue_t PlocSupvUartManager::calcImageCrc() { return result; } -ReturnValue_t PlocSupvUartManager::handleCheckMemoryCommand() { +ReturnValue_t PlocSupvUartManager::handleCheckMemoryCommand(uint8_t failStep) { ReturnValue_t result = returnvalue::OK; resetSpParams(); supv::CheckMemory tcPacket(spParams); @@ -803,7 +803,7 @@ ReturnValue_t PlocSupvUartManager::handleCheckMemoryCommand() { << std::setfill('0') << std::hex << std::setw(4) << static_cast(update.crc) << " but received CRC 0x" << std::setw(4) << report.getCrc() << std::dec << std::endl; - triggerEvent(SUPV_MEM_CHECK_FAIL, result); + triggerEvent(SUPV_MEM_CHECK_FAIL, result, failStep); } } } diff --git a/linux/devices/ploc/PlocSupvUartMan.h b/linux/devices/ploc/PlocSupvUartMan.h index 9d9e3738..0d191b7e 100644 --- a/linux/devices/ploc/PlocSupvUartMan.h +++ b/linux/devices/ploc/PlocSupvUartMan.h @@ -298,7 +298,7 @@ class PlocSupvUartManager : public DeviceCommunicationIF, // Calculates CRC over image. Will be used for verification after update writing has // finished. ReturnValue_t calcImageCrc(); - ReturnValue_t handleCheckMemoryCommand(); + ReturnValue_t handleCheckMemoryCommand(uint8_t failStep); ReturnValue_t exeReportHandling(); /** * @brief Return size of file with name filename diff --git a/tmtc b/tmtc index f5766ea4..ac2b9cb7 160000 --- a/tmtc +++ b/tmtc @@ -1 +1 @@ -Subproject commit f5766ea419ff2213468dab7e19a81075aefd1ad9 +Subproject commit ac2b9cb712405ee07b9de1950fd6c923a6f184b5