From 7ea198f40fe0fea12db1b916d597d0148ba91240 Mon Sep 17 00:00:00 2001 From: Christian Ahrens Date: Mon, 5 Sep 2022 09:18:25 +0200 Subject: [PATCH] Fixed OcaLiteDeviceTimeManager::Execute for GET_DEVICE_TIME_PTP by adding missing call to actual GetDeviceTimePTP --- .../Managers/OcaLiteDeviceTimeManager.cpp | 30 ++++++++++--------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/OCAMicro/OCAMicro/Src/common/OCALite/OCC/ControlClasses/Managers/OcaLiteDeviceTimeManager.cpp b/OCAMicro/OCAMicro/Src/common/OCALite/OCC/ControlClasses/Managers/OcaLiteDeviceTimeManager.cpp index b68e852..3084f04 100644 --- a/OCAMicro/OCAMicro/Src/common/OCALite/OCC/ControlClasses/Managers/OcaLiteDeviceTimeManager.cpp +++ b/OCAMicro/OCAMicro/Src/common/OCALite/OCC/ControlClasses/Managers/OcaLiteDeviceTimeManager.cpp @@ -372,22 +372,24 @@ ::OcaLiteStatus OcaLiteDeviceTimeManager::Execute(const ::IOcaLiteReader& reader (0 == numberOfParameters)) { ::OcaLiteTimePTP deviceTime; - ::OcaUint32 responseSize(::GetSizeValue< ::OcaUint8>(static_cast<::OcaUint8>(1), writer) + - deviceTime.GetSize(writer)); - responseBuffer = ::OcaLiteCommandHandler::GetInstance().GetResponseBuffer(responseSize); - if (NULL != responseBuffer) + rc = GetDeviceTimePTP(deviceTime); + if (OCASTATUS_OK == rc) { - rc = OCASTATUS_OK; - - ::OcaUint8* pResponse(responseBuffer); - writer.Write(static_cast<::OcaUint8>(1/*NrParameters*/), &pResponse); - deviceTime.Marshal(&pResponse, writer); + ::OcaUint32 responseSize(::GetSizeValue< ::OcaUint8>(static_cast<::OcaUint8>(1), writer) + + deviceTime.GetSize(writer)); + responseBuffer = ::OcaLiteCommandHandler::GetInstance().GetResponseBuffer(responseSize); + if (NULL != responseBuffer) + { + ::OcaUint8* pResponse(responseBuffer); + writer.Write(static_cast<::OcaUint8>(1/*NrParameters*/), &pResponse); + deviceTime.Marshal(&pResponse, writer); - *response = responseBuffer; - } - else - { - rc = OCASTATUS_BUFFER_OVERFLOW; + *response = responseBuffer; + } + else + { + rc = OCASTATUS_BUFFER_OVERFLOW; + } } } }