Index: sources/view/settings/VAdjustmentVersions.cpp =================================================================== diff -u -r13d6a4fae2f910ab6e289ac9280258a94f734405 -r6c6f1f5d466badd9b4fd67be7c907234c342b2a2 --- sources/view/settings/VAdjustmentVersions.cpp (.../VAdjustmentVersions.cpp) (revision 13d6a4fae2f910ab6e289ac9280258a94f734405) +++ sources/view/settings/VAdjustmentVersions.cpp (.../VAdjustmentVersions.cpp) (revision 6c6f1f5d466badd9b4fd67be7c907234c342b2a2) @@ -1,50 +1,62 @@ /*! * - * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * Copyright (c) 2021-2023 Diality Inc. - All Rights Reserved. * \copyright * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * - * \file VAdjustmentVersions.cpp - * \author (last) Peman Montazemi - * \date (last) 6-Nov-2020 - * \author (original) Peman Montazemi - * \date (original) 6-Nov-2020 + * \file VAdjustmentVersions.cpp + * \author (last) Michael Garthwaite + * \date (last) 28-Feb-2022 + * \author (original) Behrouz NematiPour + * \date (original) 16-Apr-2021 * */ #include "VAdjustmentVersions.h" // Project #include "GuiController.h" +#include "encryption.h" VIEW_DEF_CLASS_ADJUSTMENT(VAdjustmentVersions) void VAdjustmentVersions::initConnections() { ADJUST_VIEW_CONNECTION( AdjustVersionsRequestData); + ADJUST_VIEW_CONNECTION( AdjustVersionsResponseData); + + ACTION_VIEW_CONNECTION( AdjustVersionsHDRequestData); ACTION_VIEW_CONNECTION(AdjustVersionsHDResponseData); ACTION_VIEW_CONNECTION(AdjustVersionsDGResponseData); ACTION_VIEW_CONNECTION(AdjustSerialNumberHDResponseData); ACTION_VIEW_CONNECTION(AdjustSerialNumberDGResponseData); } +void VAdjustmentVersions::onActionReceive(const AdjustVersionsHDRequestData &) +{ + AdjustVersionsResponseData data; + emit didAdjustment(data); +} + void VAdjustmentVersions::onActionReceive(const AdjustVersionsHDResponseData &vData) { // HD versions data - hdVerMajor ( vData.mMajor ); - hdVerMinor ( vData.mMinor ); - hdVerMicro ( vData.mMicro ); - hdVerBuild ( vData.mBuild ); - hdVerFPGAId ( vData.mFPGAId ); - hdVerFPGAMajor ( vData.mFPGAMajor ); - hdVerFPGAMinor ( vData.mFPGAMinor ); - hdVerFPGALab ( vData.mFPGALab ); + hdVerMajor ( vData.mMajor ); + hdVerMinor ( vData.mMinor ); + hdVerMicro ( vData.mMicro ); + hdVerBuild ( vData.mBuild ); + hdVerFPGAId ( vData.mFPGAId ); + hdVerFPGAMajor ( vData.mFPGAMajor ); + hdVerFPGAMinor ( vData.mFPGAMinor ); + hdVerFPGALab ( vData.mFPGALab ); + hdVerCompatibilityRev ( vData.mCompatibilityRev ); hdVerDevice ( _hdVerDeviceFormat - .arg ( vData.mMajor ) - .arg ( vData.mMinor ) - .arg ( vData.mMicro ) - .arg ( vData.mBuild )); + .arg ( vData.mMajor ) + .arg ( vData.mMinor ) + .arg ( vData.mMicro ) + .arg ( vData.mBuild ) + .arg ( vData.mCompatibilityRev )); hdVerFPGA ( _hdVerFPGAFormat .arg ( vData.mFPGAId ) @@ -60,21 +72,23 @@ void VAdjustmentVersions::onActionReceive(const AdjustVersionsDGResponseData &vData) { // DG versions data - dgVerMajor ( vData.mMajor ); - dgVerMinor ( vData.mMinor ); - dgVerMicro ( vData.mMicro ); - dgVerBuild ( vData.mBuild ); - dgVerFPGAId ( vData.mFPGAId ); - dgVerFPGAMajor ( vData.mFPGAMajor ); - dgVerFPGAMinor ( vData.mFPGAMinor ); - dgVerFPGALab ( vData.mFPGALab ); + dgVerMajor ( vData.mMajor ); + dgVerMinor ( vData.mMinor ); + dgVerMicro ( vData.mMicro ); + dgVerBuild ( vData.mBuild ); + dgVerFPGAId ( vData.mFPGAId ); + dgVerFPGAMajor ( vData.mFPGAMajor ); + dgVerFPGAMinor ( vData.mFPGAMinor ); + dgVerFPGALab ( vData.mFPGALab ); + dgVerCompatibilityRev ( vData.mCompatibilityRev ); dgVerDevice ( _dgVerDeviceFormat - .arg ( vData.mMajor ) - .arg ( vData.mMinor ) - .arg ( vData.mMicro ) - .arg ( vData.mBuild )); + .arg ( vData.mMajor ) + .arg ( vData.mMinor ) + .arg ( vData.mMicro ) + .arg ( vData.mBuild ) + .arg ( vData.mCompatibilityRev )); dgVerFPGA ( _dgVerFPGAFormat .arg ( vData.mFPGAId )