Index: sources/model/hd/alarm/MAlarmMapping.cpp
===================================================================
diff -u -rd929655171352cc0851cff015f1ae2a6bec61f34 -r376859852f4d1a07263c44524aec347db29e0133
--- sources/model/hd/alarm/MAlarmMapping.cpp	(.../MAlarmMapping.cpp)	(revision d929655171352cc0851cff015f1ae2a6bec61f34)
+++ sources/model/hd/alarm/MAlarmMapping.cpp	(.../MAlarmMapping.cpp)	(revision 376859852f4d1a07263c44524aec347db29e0133)
@@ -7,7 +7,7 @@
  *                                                                                 
  * \file    MAlarmMapping.cpp                                                     
  * \author  (last)      Behrouz NematiPour                                        
- * \date    (last)      24-May-2021                                                        
+ * \date    (last)      26-May-2021                                                        
  * \author  (original)  Behrouz NematiPour                                        
  * \date    (original)  03-May-2021                                               
  *                                                                                 
@@ -241,13 +241,13 @@
         case GuiAlarmID::ALARM_ID_DG_CHEM_DISINFECT_TARGET_TEMP_TIMEOUT          : { result = QObject::tr("DG chemical disinfect could not reach to target temperature."                                                                                ); break; }
         case GuiAlarmID::ALARM_ID_DG_FPGA_POST_TEST_FAILED                       : { result = QObject::tr("DG FPGA POST failure."                                                                                                                       ); break; }
         case GuiAlarmID::ALARM_ID_HD_ARTERIAL_BUBBLE_SELF_TEST_FAILURE           : { result = QObject::tr("HD arterial air bubble detector self-test failure."                                                                                          ); break; }
-        case GuiAlarmID::ALARM_ID_HD_ARTERIAL_BUBBLE_DETECTOR_FAULT              : { result = QObject::tr("HD arterial air bubble detector fault."                                                                                                      ); break; }
+        case GuiAlarmID::ALARM_ID_HD_ARTERIAL_BUBBLE_DETECTED_RINSEBACK          : { result = QObject::tr("HD arterial air bubble detected rinseback alarm."                                                                                            ); break; }
         case GuiAlarmID::ALARM_ID_DG_HEATERS_SELF_TEST_FAILURE                   : { result = QObject::tr("DG heaters failed POST."                                                                                                                     ); break; }
         case GuiAlarmID::ALARM_ID_HD_VENOUS_BUBBLE_SELF_TEST_FAILURE             : { result = QObject::tr("HD venous air bubble detector self-test failure."                                                                                            ); break; }
-        case GuiAlarmID::ALARM_ID_HD_VENOUS_BUBBLE_DETECTOR_TREATMENT_FAULT      : { result = QObject::tr("HD venous air bubble detector treatment fault."                                                                                              ); break; }
-        case GuiAlarmID::ALARM_ID_HD_VENOUS_BUBBLE_DETECTOR_RINSEBACK_FAULT      : { result = QObject::tr("HD venous air bubble detector rinseback fault."                                                                                              ); break; }
-        case GuiAlarmID::ALARM_ID_HD_ARTERIAL_BUBBLE_DETECTED                    : { result = QObject::tr("HD arterial bubble detected alarm."                                                                                                          ); break; }
-        case GuiAlarmID::ALARM_ID_HD_VENOUS_BUBBLE_DETECTED                      : { result = QObject::tr("HD venous bubble detected alarm."                                                                                                            ); break; }
+        case GuiAlarmID::ALARM_ID_AVAILABLE_6                                    : { result = QObject::tr("HD venous air bubble detector treatment fault."                                                                                              ); break; }
+        case GuiAlarmID::ALARM_ID_HD_VENOUS_BUBBLE_DETECTED_RINSEBACK            : { result = QObject::tr("HD venous air bubble detected rinseback alarm."                                                                                              ); break; }
+        case GuiAlarmID::ALARM_ID_HD_ARTERIAL_BUBBLE_DETECTED                    : { result = QObject::tr("HD arterial air bubble detected alarm."                                                                                                      ); break; }
+        case GuiAlarmID::ALARM_ID_HD_VENOUS_BUBBLE_DETECTED                      : { result = QObject::tr("HD venous air bubble detected alarm."                                                                                                        ); break; }
         case GuiAlarmID::ALARM_ID_HD_BP_FLOW_SLOW_READ_TIMEOUT_ERROR             : { result = QObject::tr("HD blood flow sensor not being read - slow packet."                                                                                          ); break; }
         case GuiAlarmID::ALARM_ID_HD_DP_FLOW_SLOW_READ_TIMEOUT_ERROR             : { result = QObject::tr("HD dialysate flow sensor not being read - slow packet."                                                                                      ); break; }
         case GuiAlarmID::ALARM_ID_HD_PUMP_DIRECTION_STATUS_ERROR                 : { result = QObject::tr("HD pump direction status error."                                                                                                             ); break; }
@@ -259,6 +259,9 @@
         case GuiAlarmID::ALARM_ID_HD_NO_CART_SELF_TEST_TIMEOUT                   : { result = QObject::tr("HD no cartridge self-test timeout."                                                                                                          ); break; }
         case GuiAlarmID::ALARM_ID_HD_DRY_SELF_TEST_TIMEOUT                       : { result = QObject::tr("HD dry self-test timeout."                                                                                                                   ); break; }
         case GuiAlarmID::ALARM_ID_DG_TEMPERATURE_SENSOR_FAULT                    : { result = QObject::tr("DG temperature sensor error flag fault."                                                                                                     ); break; }
+        case GuiAlarmID::ALARM_ID_HD_RESERVOIR_FULL_AND_DG_NOT_READY_TO_SWITCH   : { result = QObject::tr("HD active reservoir is full during treatment and DG not ready to switch reservoirs."                                                         ); break; }
+        case GuiAlarmID::ALARM_ID_HD_BLOOD_FLOW_INVALID_CALIBRATION              : { result = QObject::tr("HD blood flow invalid calibration."                                                                                                          ); break; }
+        case GuiAlarmID::ALARM_ID_HD_DIALYSATE_FLOW_INVALID_CALIBRATION          : { result = QObject::tr("HD dialysate flow invalid calibration."                                                                                                      ); break; }
         case GuiAlarmID::NUM_OF_ALARM_IDS                                        : { result = QObject::tr("Total number of alarms."                                                                                                                     ); break; }
                                                                                    
     default: