Index: sources/model/hd/alarm/MAlarmMapping.cpp
===================================================================
diff -u -r006759c774d5fc4e56f57d93f2cb0c7b49d2d86c -ra3c81c8b9daf5c65523fe048774171fd0b18e0eb
--- sources/model/hd/alarm/MAlarmMapping.cpp	(.../MAlarmMapping.cpp)	(revision 006759c774d5fc4e56f57d93f2cb0c7b49d2d86c)
+++ sources/model/hd/alarm/MAlarmMapping.cpp	(.../MAlarmMapping.cpp)	(revision a3c81c8b9daf5c65523fe048774171fd0b18e0eb)
@@ -7,7 +7,7 @@
  *                                                                                 
  * \file    MAlarmMapping.cpp                                                     
  * \author  (last)      Behrouz NematiPour                                        
- * \date    (last)      11-Nov-2022                                                        
+ * \date    (last)      17-Nov-2022                                                        
  * \author  (original)  Behrouz NematiPour                                        
  * \date    (original)  03-May-2021                                               
  *                                                                                 
@@ -79,11 +79,11 @@
 /*0043*/case GuiAlarmID::ALARM_ID_DG_MAIN_PRIMARY_HEATER_FPGA_FAULT                    : { result = QObject::tr("DG main primary heater FPGA fault."                                                                                                          ); break; } /*  43*/
 /*0044*/case GuiAlarmID::ALARM_ID_UI_COMM_TIMEOUT                                      : { result = QObject::tr("User interface communication timeout."                                                                                                       ); break; } /*  44*/
 /*0045*/case GuiAlarmID::ALARM_ID_HD_COMM_TOO_MANY_BAD_CRCS                            : { result = QObject::tr("HD too many bad communications CRC."                                                                                                         ); break; } /*  45*/
-/*0046*/case GuiAlarmID::ALARM_ID_CAN_MESSAGE_NOT_ACKED                                : { result = QObject::tr("System message that required acknowledgment was not acknowledged."                                                                           ); break; } /*  46*/
+/*0046*/case GuiAlarmID::ALARM_ID_HD_CAN_MESSAGE_NOT_ACKED                             : { result = QObject::tr("HD System message that required acknowledgment was not acknowledged."                                                                        ); break; } /*  46*/
 /*0047*/case GuiAlarmID::ALARM_ID_UF_RATE_TOO_HIGH_ERROR                               : { result = QObject::tr("Ultrafiltration rate is too high error during treatment."                                                                                    ); break; } /*  47*/
 /*0048*/case GuiAlarmID::ALARM_ID_UF_VOLUME_ACCURACY_ERROR                             : { result = QObject::tr("Ultrafiltration volume accuracy error during treatment."                                                                                     ); break; } /*  48*/
 /*0049*/case GuiAlarmID::ALARM_ID_HD_FPGA_COMM_TIMEOUT                                 : { result = QObject::tr("HD FPGA communication down for too long."                                                                                                    ); break; } /*  49*/
-/*0050*/case GuiAlarmID::ALARM_ID_VALVE_CONTROL_FAILURE                                : { result = QObject::tr("FPGA not accepting commanded valve states."                                                                                                  ); break; } /*  50*/
+/*0050*/case GuiAlarmID::ALARM_ID_DG_VALVE_CONTROL_FAILURE                             : { result = QObject::tr("DG FPGA not accepting commanded valve states."                                                                                               ); break; } /*  50*/
 /*0051*/case GuiAlarmID::ALARM_ID_BLOOD_PUMP_MOTOR_SPEED_CHECK                         : { result = QObject::tr("Blood pump failed motor speed check.\nMeasured vs commanded."                                                                                ); break; } /*  51*/
 /*0052*/case GuiAlarmID::ALARM_ID_DIAL_IN_PUMP_MOTOR_SPEED_CHECK                       : { result = QObject::tr("Dialysate inlet pump failed motor speed check.\nMeasured vs commanded."                                                                      ); break; } /*  52*/
 /*0053*/case GuiAlarmID::ALARM_ID_DIAL_OUT_PUMP_MOTOR_SPEED_CHECK                      : { result = QObject::tr("Dialysate outlet pump failed motor speed check.\nMeasured vs commanded."                                                                     ); break; } /*  53*/
@@ -177,7 +177,7 @@
 /*0141*/case GuiAlarmID::ALARM_ID_AIR_TRAP_FILL_DURING_TREATMENT                       : { result = QObject::tr("Air trap fill timeout during treatment."                                                                                                     ); break; } /* 141*/
 /*0142*/case GuiAlarmID::ALARM_ID_OCCLUSION_BLOOD_PUMP                                 : { result = QObject::tr("Blood pump occlusion detected."                                                                                                              ); break; } /* 142*/
 /*0143*/case GuiAlarmID::ALARM_ID_DG_DIALYSATE_TEMPERATURE_SENSORS_OUT_OF_RANGE        : { result = QObject::tr("DG dialysate temperature sensors out of range."                                                                                              ); break; } /* 143*/
-/*0144*/case GuiAlarmID::ALARM_ID_DG_RO_FLOW_SENSOR_INVALID_CAL_RECORD                 : { result = QObject::tr("DG RO flow sensor invalid calibration record."                                                                                               ); break; } /* 144*/
+/*0144*/case GuiAlarmID::ALARM_ID__AVAILABLE_1                                         : { result = QObject::tr("Alarm ID available for use."                                                                                                                 ); break; } /* 144*/
 /*0145*/case GuiAlarmID::ALARM_ID_ACID_CONDUCTIVITY_OUT_OF_RANGE                       : { result = QObject::tr("Concentrate conductivity after adding acid out of range alarm."                                                                              ); break; } /* 145*/
 /*0146*/case GuiAlarmID::ALARM_ID_DG_RTC_OR_TIMER_ACCURACY_FAILURE                     : { result = QObject::tr("DG RTC or timer accuracy failure."                                                                                                           ); break; } /* 146*/
 /*0147*/case GuiAlarmID::ALARM_ID_CREATING_DIALYSATE_PLEASE_WAIT                       : { result = QObject::tr("Wait for the DG to produce dialysate."                                                                                                       ); break; } /* 147*/