Index: AlarmMapping.csv
===================================================================
diff -u -ra7dd3f0c4be47bc29b0ef93a15e4fe47af0c64fa -r93223f7d403a66dcb0d72a31802181c1b38e7ce3
--- AlarmMapping.csv	(.../AlarmMapping.csv)	(revision a7dd3f0c4be47bc29b0ef93a15e4fe47af0c64fa)
+++ AlarmMapping.csv	(.../AlarmMapping.csv)	(revision 93223f7d403a66dcb0d72a31802181c1b38e7ce3)
@@ -306,4 +306,9 @@
  305,"HD processor RAM error."                                                                                                                     
  306,"HD air trap over-fill alarm."                                                                                                                
  307,"HD AC power lost second alarm."                                                                                                              
- 308,"Total number of alarms."                                                                                                                     
+ 308,"DG CPi conductivity sensor invalid character received."                                                                                      
+ 309,"DG CPo conductivity sensor invalid character received."                                                                                      
+ 310,"DG CD1 conductivity sensor invalid character received."                                                                                      
+ 311,"DG CD2 conductivity sensor invalid character received."                                                                                      
+ 312,"HD measured flow checks against estimated flow failure."                                                                                     
+ 313,"Total number of alarms."                                                                                                                     
Index: cppcheck.err
===================================================================
diff -u -r7823da721f8041d6d39c37cd040e162ea9d35e7f -r93223f7d403a66dcb0d72a31802181c1b38e7ce3
--- cppcheck.err	(.../cppcheck.err)	(revision 7823da721f8041d6d39c37cd040e162ea9d35e7f)
+++ cppcheck.err	(.../cppcheck.err)	(revision 93223f7d403a66dcb0d72a31802181c1b38e7ce3)
@@ -1,3 +1,5 @@
+11/03/2022 14:42
+Behrouz NematiPour
 [sources/storage/FileHandler.h:95] -> [sources/storage/FileHandler.h:102]: (style) Condition '!createFolder' is always false
 [sources/ApplicationPost.cpp:109] -> [sources/ApplicationPost.cpp:111]: (style) Condition '!ok' is always false
 [sources/ApplicationPost.cpp:204] -> [sources/ApplicationPost.cpp:206]: (style) Condition '!ok' is always false
Index: cppcheck.log
===================================================================
diff -u -r142f2ddb8ce284c52c0add2acf3ac81f471b78de -r93223f7d403a66dcb0d72a31802181c1b38e7ce3
--- cppcheck.log	(.../cppcheck.log)	(revision 142f2ddb8ce284c52c0add2acf3ac81f471b78de)
+++ cppcheck.log	(.../cppcheck.log)	(revision 93223f7d403a66dcb0d72a31802181c1b38e7ce3)
@@ -1,3 +1,5 @@
+11/03/2022 14:42
+Behrouz NematiPour
 (information) Couldn't find path given by -I './/sources/configuration/'
 Checking main.cpp ...
 Defines: 
Index: cppcheck.sh
===================================================================
diff -u -re961fc7bcdeba8ffab9c96da20244b07405f8f99 -r93223f7d403a66dcb0d72a31802181c1b38e7ce3
--- cppcheck.sh	(.../cppcheck.sh)	(revision e961fc7bcdeba8ffab9c96da20244b07405f8f99)
+++ cppcheck.sh	(.../cppcheck.sh)	(revision 93223f7d403a66dcb0d72a31802181c1b38e7ce3)
@@ -16,6 +16,13 @@
 app_path=./
 cppcheck=cppcheck
 echo $($cppcheck --version)
+
+echo $(date +"%m/%d/%Y %_H:%M")        > $app_path/cppcheck.log
+echo $(git config --global user.name) >> $app_path/cppcheck.log
+echo $(date +"%m/%d/%Y %_H:%M")        > $app_path/cppcheck.err
+echo $(git config --global user.name) >> $app_path/cppcheck.err
+
+
 $cppcheck $app_path \
     --enable=all \
     -v \
@@ -25,8 +32,8 @@
     -I$app_path/sources/storage \
     -I$app_path/sources/configuration \
     -I$app_path/sources/canbus \
-    1>$app_path/cppcheck.log \
-    2>$app_path/cppcheck.err  
+   1>>$app_path/cppcheck.log \
+   2>>$app_path/cppcheck.err
 
 # grep -nir "(warning)" ./cppcheck.err
 # grep -nir "(error)"   ./cppcheck.err
Index: sources/gui/qml/AlarmItem.qml
===================================================================
diff -u -re961fc7bcdeba8ffab9c96da20244b07405f8f99 -r93223f7d403a66dcb0d72a31802181c1b38e7ce3
--- sources/gui/qml/AlarmItem.qml	(.../AlarmItem.qml)	(revision e961fc7bcdeba8ffab9c96da20244b07405f8f99)
+++ sources/gui/qml/AlarmItem.qml	(.../AlarmItem.qml)	(revision 93223f7d403a66dcb0d72a31802181c1b38e7ce3)
@@ -134,7 +134,7 @@
         minVisible          : ! vAlarmStatus.alarm_Flag_noMinimize
         titleFading         :   vHDOperationMode.fault
         countDown           :   vTreatmentStop.countDown
-        countDownVisible    :   vHDOperationMode.inTreatment && vHDTreatmentStates.txStop && vTreatmentStop.total
+        countDownVisible    :   vHDOperationMode.inTreatment && (vHDTreatmentStates.txStop ||  vHDTreatmentStates.txRinseback) && vTreatmentStop.total
 
         onMuteClicked       : vAlarmStatus.doSilence            ()
         onResumeClicked     : vAlarmStatus.doUserActionResume   ()
Index: sources/model/hd/alarm/MAlarmMapping.cpp
===================================================================
diff -u -r90d82dd976c80c34517499ad50f8606d95973c24 -r93223f7d403a66dcb0d72a31802181c1b38e7ce3
--- sources/model/hd/alarm/MAlarmMapping.cpp	(.../MAlarmMapping.cpp)	(revision 90d82dd976c80c34517499ad50f8606d95973c24)
+++ sources/model/hd/alarm/MAlarmMapping.cpp	(.../MAlarmMapping.cpp)	(revision 93223f7d403a66dcb0d72a31802181c1b38e7ce3)
@@ -7,7 +7,7 @@
  *                                                                                 
  * \file    MAlarmMapping.cpp                                                     
  * \author  (last)      Behrouz NematiPour                                        
- * \date    (last)      25-Oct-2022                                                        
+ * \date    (last)      03-Nov-2022                                                        
  * \author  (original)  Behrouz NematiPour                                        
  * \date    (original)  03-May-2021                                               
  *                                                                                 
@@ -341,7 +341,12 @@
 /*0305*/case GuiAlarmID::ALARM_ID_HD_CPU_RAM_ERROR                                     : { result = QObject::tr("HD processor RAM error."                                                                                                                     ); break; } /* 305*/
 /*0306*/case GuiAlarmID::ALARM_ID_HD_AIR_TRAP_OVERFILL                                 : { result = QObject::tr("HD air trap over-fill alarm."                                                                                                                ); break; } /* 306*/
 /*0307*/case GuiAlarmID::ALARM_ID_HD_AC_POWER_LOST_IN_TREATMENT                        : { result = QObject::tr("HD AC power lost second alarm."                                                                                                              ); break; } /* 307*/
-/*0308*/case GuiAlarmID::NUM_OF_ALARM_IDS                                              : { result = QObject::tr("Total number of alarms."                                                                                                                     ); break; } /* 308*/
+/*0308*/case GuiAlarmID::ALARM_ID_DG_CPI_COND_SENSOR_INVALID_CHAR                      : { result = QObject::tr("DG CPi conductivity sensor invalid character received."                                                                                      ); break; } /* 308*/
+/*0309*/case GuiAlarmID::ALARM_ID_DG_CPO_COND_SENSOR_INVALID_CHAR                      : { result = QObject::tr("DG CPo conductivity sensor invalid character received."                                                                                      ); break; } /* 309*/
+/*0310*/case GuiAlarmID::ALARM_ID_DG_CD1_COND_SENSOR_INVALID_CHAR                      : { result = QObject::tr("DG CD1 conductivity sensor invalid character received."                                                                                      ); break; } /* 310*/
+/*0311*/case GuiAlarmID::ALARM_ID_DG_CD2_COND_SENSOR_INVALID_CHAR                      : { result = QObject::tr("DG CD2 conductivity sensor invalid character received."                                                                                      ); break; } /* 311*/
+/*0312*/case GuiAlarmID::ALARM_ID_HD_DIAL_IN_FLOW_CHECK_FAILURE                        : { result = QObject::tr("HD measured flow checks against estimated flow failure."                                                                                     ); break; } /* 312*/
+/*0313*/case GuiAlarmID::NUM_OF_ALARM_IDS                                              : { result = QObject::tr("Total number of alarms."                                                                                                                     ); break; } /* 313*/
                                                                                    
     default:                                                                       
         result = QObject::tr("ALARM_ID_UNDEFINED [%1]").arg(int(vAlarmID));