Index: sources/model/hd/alarm/MAlarmStatusData.h
===================================================================
diff -u -rf1e100d1368bfd132d88e09680f833dc53b4d0b0 -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9
--- sources/model/hd/alarm/MAlarmStatusData.h	(.../MAlarmStatusData.h)	(revision f1e100d1368bfd132d88e09680f833dc53b4d0b0)
+++ sources/model/hd/alarm/MAlarmStatusData.h	(.../MAlarmStatusData.h)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
@@ -1,15 +1,15 @@
 /*!
  *
- * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+ * Copyright (c) 2020-2024 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.
+ * 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    MAlarmStatusData.h
  * \author  (last)      Behrouz NematiPour
- * \date    (last)      16-Oct-2020
- * \author  (original)  Behrouz NematiPour
- * \date    (original)  02-Dec-2020
+ * \date    (last)      29-Jul-2023
+ * \author  (original)  Behrouz NemaiPour
+ * \date    (original)  02-Jul-2020
  *
  */
 #pragma once
@@ -46,11 +46,11 @@
  * \sa Data
  *
  * <h2 class="groupheader">Logging info</h2>
- * |              ||
- * |              ||
- * | typeText     | Datum         |
- * | unitText     | HD            |
- * | infoText     | Alarm Status  |
+ * |          ||
+ * |          ||
+ * | typeText | Datum        |
+ * | unitText | HD           |
+ * | infoText | Alarm Status |
  *
  */
 class MAlarmStatus : public MAbstract {
@@ -69,25 +69,8 @@
     } _data;
 
 public:
-    // TODO : Has been negotiated with HD Software team
-    //        and needs to be replaced by an equivalent enum
-    //        shared in common repo
-    enum Flag {
-        eFlag_systemFault    = 0 ,
-        eFlag_stop               ,
-        eFlag_noClear            ,
-        eFlag_noResume           ,
-        eFlag_noRinseback        ,
-        eFlag_noEndTreatment     ,
-        eFlag_noNewTreatment     ,
-        eFlag_bypassDialyzer     ,
-        eFlag_alarmsToEscalate   ,
-        eFlag_alarmsSilenced     ,
-        eFlag_userAcknowledged   ,
-        eFlag_Bits_Length    = 16,
-    };
 
-    Type_Enum    typeText  () const override { return Type_Enum::eEvent      ; }
+    Type_Enum    typeText  () const override { return Type_Enum::eDatum      ; }
     Unit_Enum    unitText  () const override { return Unit_Enum::eHD         ; }
     QString      infoText  () const override { return QString("AlarmStatus") ; }
 
@@ -104,11 +87,11 @@
 
     bool    fromByteArray   (const QByteArray   &vByteArray  , int *vIndex = nullptr)       override;
     Data    data            (                                                       ) const         ;
+    void    data            (const Data         &vData                              )               ;
 
     static QString toText   (Gui::GuiAlarmID vAlarmID);
 
 };
 }
 
 typedef Model::MAlarmStatus::Data AlarmStatusData;
-typedef Model::MAlarmStatus::Flag AlarmStatusFlag;