Index: sources/view/settings/VAdjustmentVersions.cpp
===================================================================
diff -u -r506a9e3db1a20bda1685e38c5e9041005c9a4a4f -r6c6f1f5d466badd9b4fd67be7c907234c342b2a2
--- sources/view/settings/VAdjustmentVersions.cpp	(.../VAdjustmentVersions.cpp)	(revision 506a9e3db1a20bda1685e38c5e9041005c9a4a4f)
+++ sources/view/settings/VAdjustmentVersions.cpp	(.../VAdjustmentVersions.cpp)	(revision 6c6f1f5d466badd9b4fd67be7c907234c342b2a2)
@@ -1,60 +1,112 @@
 /*!
  *
- * 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() {
-    ACTION_VIEW_CONNECTION(AdjustHDVersionsResponseData);
-    ACTION_VIEW_CONNECTION(AdjustDGVersionsResponseData);
     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 AdjustHDVersionsResponseData &vData)
+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.mCompatibilityRev    ));
+    hdVerFPGA           (
+   _hdVerFPGAFormat
+                .arg    ( vData.mFPGAId      )
+                .arg    ( vData.mFPGAMajor   )
+                .arg    ( vData.mFPGAMinor   )
+                .arg    ( vData.mFPGALab     ));
+
     // *** has to be the last to let the information to be set and then emit the signal ***
     // *** otherwise will use the previous values before being set.                     ***
     adjustmentHD(true); // set here only because adjustment parent needs it, but HD Versions does not
 }
 
-void VAdjustmentVersions::onActionReceive(const AdjustDGVersionsResponseData &vData)
+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.mCompatibilityRev   ));
+    dgVerFPGA           (
+   _dgVerFPGAFormat
+                .arg    ( vData.mFPGAId     )
+                .arg    ( vData.mFPGAMajor  )
+                .arg    ( vData.mFPGAMinor  )
+                .arg    ( vData.mFPGALab    ));
+
     // *** has to be the last to let the information to be set and then emit the signal ***
     // *** otherwise will use the previous values before being set.                     ***
     adjustmentDG(true); // set here only because adjustment parent needs it, but HD Versions does not
 }
+
+void VAdjustmentVersions::onActionReceive(const AdjustSerialNumberHDResponseData &vData)
+{
+    hdSerial( vData.mSerialNumber );
+}
+
+void VAdjustmentVersions::onActionReceive(const AdjustSerialNumberDGResponseData &vData)
+{
+    dgSerial( vData.mSerialNumber );
+}