Index: sources/model/hd/alarm/MAlarmMapping.cpp
===================================================================
diff -u -r2b60348e3baeb08d56bb3724996f6fc46c6734b4 -r3173a2080bad33841efcc46c83f5872eb996f016
--- sources/model/hd/alarm/MAlarmMapping.cpp	(.../MAlarmMapping.cpp)	(revision 2b60348e3baeb08d56bb3724996f6fc46c6734b4)
+++ sources/model/hd/alarm/MAlarmMapping.cpp	(.../MAlarmMapping.cpp)	(revision 3173a2080bad33841efcc46c83f5872eb996f016)
@@ -7,7 +7,7 @@
  *                                                                                 
  * \file    MAlarmMapping.cpp                                                     
  * \author  (last)      Behrouz NematiPour                                        
- * \date    (last)      20-Aug-2021                                                        
+ * \date    (last)      19-Sep-2021                                                        
  * \author  (original)  Behrouz NematiPour                                        
  * \date    (original)  03-May-2021                                               
  *                                                                                 
@@ -195,8 +195,8 @@
 /*0165*/case GuiAlarmID::ALARM_ID_TREATMENT_RINSEBACK_TIMEOUT_ALARM              : { result = QObject::tr("HD in treatment rinseback operation timeout."                                                                                                ); break; } /* 165*/
 /*0166*/case GuiAlarmID::ALARM_ID_TREATMENT_RECIRC_TIMEOUT_ALARM                 : { result = QObject::tr("HD in treatment re-circ sub-mode for too long."                                                                                              ); break; } /* 166*/
 /*0167*/case GuiAlarmID::ALARM_ID_CARTRIDGE_DOOR_OPENED                          : { result = QObject::tr("HD cartridge door opened alarm."                                                                                                             ); break; } /* 167*/
-/*0168*/case GuiAlarmID::ALARM_ID_DIALYSATE_TEMPERATURE_TOO_HIGH                 : { result = QObject::tr("HD dialysate temperature too high alarm."                                                                                                    ); break; } /* 168*/
-/*0169*/case GuiAlarmID::ALARM_ID_DIALYSATE_TEMPERATURE_TOO_LOW                  : { result = QObject::tr("HD dialysate temperature too low alarm."                                                                                                     ); break; } /* 169*/
+/*0168*/case GuiAlarmID::ALARM_ID____AVAILABLE_1                                 : { result = QObject::tr("This alarm ID is available for use."                                                                                                         ); break; } /* 168*/
+/*0169*/case GuiAlarmID::ALARM_ID____AVAILABLE_2                                 : { result = QObject::tr("This alarm ID is available for use."                                                                                                         ); break; } /* 169*/
 /*0170*/case GuiAlarmID::ALARM_ID_HD_SYRINGE_PUMP_SYRINGE_EMPTY                  : { result = QObject::tr("HD syringe empty alarm."                                                                                                                     ); break; } /* 170*/
 /*0171*/case GuiAlarmID::ALARM_ID_HD_SYRINGE_PUMP_OCCLUSION                      : { result = QObject::tr("HD syringe pump occlusion alarm."                                                                                                            ); break; } /* 171*/
 /*0172*/case GuiAlarmID::ALARM_ID_HD_SYRINGE_PUMP_NOT_ENOUGH_HEPARIN_ALARM       : { result = QObject::tr("HD syringe pump not enough Heparin alarm."                                                                                                   ); break; } /* 172*/
@@ -235,7 +235,7 @@
 /*0205*/case GuiAlarmID::ALARM_ID_CONDUCTIVITY_SENSOR_FAULT                      : { result = QObject::tr("Conductivity sensor fault."                                                                                                                  ); break; } /* 205*/
 /*0206*/case GuiAlarmID::ALARM_ID_DG_DIALYSATE_FILL_OUT_OF_TIME                  : { result = QObject::tr("DG dialysate fill runs out of time."                                                                                                         ); break; } /* 206*/
 /*0207*/case GuiAlarmID::ALARM_ID_DG_FLOW_METER_CHECK_FAILURE                    : { result = QObject::tr("DG flow meter check failure alarm."                                                                                                          ); break; } /* 207*/
-/*0208*/case GuiAlarmID::ALARM_ID_DG_HEATERS_ON_WITH_NO_FLOW_TIMEOUT             : { result = QObject::tr("DG heaters on with no flow time out."                                                                                                        ); break; } /* 208*/
+/*0208*/case GuiAlarmID::ALARM_ID_DG_PRIMARY_HEATER_ON_WITH_NO_FLOW_TIMEOUT      : { result = QObject::tr("DG primary heater on with no flow time out."                                                                                                 ); break; } /* 208*/
 /*0209*/case GuiAlarmID::ALARM_ID_DG_DRAIN_CIRCULATION_LINE_TIMEOUT              : { result = QObject::tr("DG drain circulation line timeout."                                                                                                          ); break; } /* 209*/
 /*0210*/case GuiAlarmID::ALARM_ID_HD_BATTERY_PACK_ERROR_DETECTED                 : { result = QObject::tr("HD battery pack detected an error."                                                                                                          ); break; } /* 210*/
 /*0211*/case GuiAlarmID::ALARM_ID_BLOOD_SITTING_WARNING                          : { result = QObject::tr("Blood sitting too long warning (>4 min)."                                                                                                    ); break; } /* 211*/
@@ -312,7 +312,11 @@
 /*0282*/case GuiAlarmID::ALARM_ID_DG_BICARB_BOTTLE_LOW_VOLUME                    : { result = QObject::tr("Bicarbonate concentration bottle low volume alarm."                                                                                          ); break; } /* 282*/
 /*0283*/case GuiAlarmID::ALARM_ID_DG_LOAD_CELL_WEIGHT_OUT_OF_RANGE               : { result = QObject::tr("DG load cells weight out of range."                                                                                                          ); break; } /* 283*/
 /*0284*/case GuiAlarmID::ALARM_ID_DG_LOAD_CELL_PRIMARY_BACKUP_DRIFT_OUT_OF_RANGE : { result = QObject::tr("DG load cells primary/back up drift out of range."                                                                                           ); break; } /* 284*/
-/*0285*/case GuiAlarmID::NUM_OF_ALARM_IDS                                        : { result = QObject::tr("Total number of alarms."                                                                                                                     ); break; } /* 285*/
+/*0285*/case GuiAlarmID::ALARM_ID_HD_TREATMENT_RECIRC_TIMEOUT_WARNING            : { result = QObject::tr("HD treatment recirculate timeout warning."                                                                                                   ); break; } /* 285*/
+/*0286*/case GuiAlarmID::ALARM_ID_HD_TREATMENT_RINSEBACK_TIMEOUT_WARNING         : { result = QObject::tr("HD treatment rinseback complete timeout warning."                                                                                            ); break; } /* 286*/
+/*0287*/case GuiAlarmID::ALARM_ID_HD_FPGA_CLOCK_SPEED_CHECK_FAILURE              : { result = QObject::tr("HD processor clock speed checks against FPGA clock failure."                                                                                 ); break; } /* 287*/
+/*0288*/case GuiAlarmID::ALARM_ID_DG_TRIMMER_HEATER_ON_WITH_NO_FLOW_TIMEOUT      : { result = QObject::tr("DG trimmer heater on with flow timeout."                                                                                                     ); break; } /* 288*/
+/*0289*/case GuiAlarmID::NUM_OF_ALARM_IDS                                        : { result = QObject::tr("Total number of alarms."                                                                                                                     ); break; } /* 289*/
                                                                                    
     default:                                                                       
         result = QObject::tr("ALARM_ID_UNDEFINED [%1]").arg(int(vAlarmID));