Index: firmware/App/Controllers/AirTrap.c
===================================================================
diff -u -r7c10a7dc0c191b2680ae51af8d2dff2bd6b70878 -r68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7
--- firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision 7c10a7dc0c191b2680ae51af8d2dff2bd6b70878)
+++ firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision 68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7)
@@ -1,6 +1,6 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2022 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
Index: firmware/App/Controllers/AlarmLamp.c
===================================================================
diff -u -rb0cfdf88d0aeba4bea316388158d77fb0d0f4537 -r68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7
--- firmware/App/Controllers/AlarmLamp.c	(.../AlarmLamp.c)	(revision b0cfdf88d0aeba4bea316388158d77fb0d0f4537)
+++ firmware/App/Controllers/AlarmLamp.c	(.../AlarmLamp.c)	(revision 68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7)
@@ -1,6 +1,6 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2022 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
Index: firmware/App/Controllers/BloodFlow.c
===================================================================
diff -u -r96aec7a73db8d83d001eec977d509f02703b7788 -r68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7
--- firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision 96aec7a73db8d83d001eec977d509f02703b7788)
+++ firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision 68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7)
@@ -1,14 +1,14 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2022 Diality Inc. - All Rights Reserved.
 *
 * 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    BloodFlow.c
 *
-* @author  (last)      Sean Nash
-* @date    (last)      15-Nov-2021
+* @author  (last)      Hung Nguyen
+* @date    (last)      04-Jan-2022
 *
 * @author  (original)  Sean Nash
 * @date    (original)  07-Nov-2019
Index: firmware/App/Controllers/BloodLeak.c
===================================================================
diff -u -r19a056fb3d8cc1ff53f65989a1a23924113f74b3 -r68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7
--- firmware/App/Controllers/BloodLeak.c	(.../BloodLeak.c)	(revision 19a056fb3d8cc1ff53f65989a1a23924113f74b3)
+++ firmware/App/Controllers/BloodLeak.c	(.../BloodLeak.c)	(revision 68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7)
@@ -1,6 +1,6 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2022 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
Index: firmware/App/Controllers/BloodLeak.h
===================================================================
diff -u -r53dd658c22a8e91597304b1aff96fee43b7b8c49 -r68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7
--- firmware/App/Controllers/BloodLeak.h	(.../BloodLeak.h)	(revision 53dd658c22a8e91597304b1aff96fee43b7b8c49)
+++ firmware/App/Controllers/BloodLeak.h	(.../BloodLeak.h)	(revision 68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7)
@@ -1,6 +1,6 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2022 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
Index: firmware/App/Controllers/Bubble.c
===================================================================
diff -u -r946f42bfd6606dd3d771d9a4a7b50e5678469f62 -r68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7
--- firmware/App/Controllers/Bubble.c	(.../Bubble.c)	(revision 946f42bfd6606dd3d771d9a4a7b50e5678469f62)
+++ firmware/App/Controllers/Bubble.c	(.../Bubble.c)	(revision 68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7)
@@ -1,6 +1,6 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2022 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
Index: firmware/App/Controllers/Bubble.h
===================================================================
diff -u -rdc5fda9a9930d6e1a33c4da0b509b3545acb947d -r68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7
--- firmware/App/Controllers/Bubble.h	(.../Bubble.h)	(revision dc5fda9a9930d6e1a33c4da0b509b3545acb947d)
+++ firmware/App/Controllers/Bubble.h	(.../Bubble.h)	(revision 68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7)
@@ -1,6 +1,6 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2022 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
Index: firmware/App/Controllers/DGInterface.c
===================================================================
diff -u -r62cbfbbd0d1baa7b1f383510b7864921e2dfd054 -r68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7
--- firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision 62cbfbbd0d1baa7b1f383510b7864921e2dfd054)
+++ firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision 68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7)
@@ -1,6 +1,6 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2022 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
Index: firmware/App/Controllers/DGInterface.h
===================================================================
diff -u -r19a056fb3d8cc1ff53f65989a1a23924113f74b3 -r68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7
--- firmware/App/Controllers/DGInterface.h	(.../DGInterface.h)	(revision 19a056fb3d8cc1ff53f65989a1a23924113f74b3)
+++ firmware/App/Controllers/DGInterface.h	(.../DGInterface.h)	(revision 68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7)
@@ -1,6 +1,6 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2022 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
Index: firmware/App/Controllers/DialInFlow.c
===================================================================
diff -u -r96aec7a73db8d83d001eec977d509f02703b7788 -r68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7
--- firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision 96aec7a73db8d83d001eec977d509f02703b7788)
+++ firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision 68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7)
@@ -1,6 +1,6 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2022 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
Index: firmware/App/Controllers/DialOutFlow.c
===================================================================
diff -u -rf80c9e658695bc368e2ab3e0267d4d510659cd61 -r68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7
--- firmware/App/Controllers/DialOutFlow.c	(.../DialOutFlow.c)	(revision f80c9e658695bc368e2ab3e0267d4d510659cd61)
+++ firmware/App/Controllers/DialOutFlow.c	(.../DialOutFlow.c)	(revision 68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7)
@@ -1,6 +1,6 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2022 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
Index: firmware/App/Controllers/DialOutFlow.h
===================================================================
diff -u -rd4811e9467b4bbafe7012ece67365a03190af00a -r68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7
--- firmware/App/Controllers/DialOutFlow.h	(.../DialOutFlow.h)	(revision d4811e9467b4bbafe7012ece67365a03190af00a)
+++ firmware/App/Controllers/DialOutFlow.h	(.../DialOutFlow.h)	(revision 68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7)
@@ -1,6 +1,6 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2022 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
Index: firmware/App/Controllers/Fans.c
===================================================================
diff -u -r53dd658c22a8e91597304b1aff96fee43b7b8c49 -r68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7
--- firmware/App/Controllers/Fans.c	(.../Fans.c)	(revision 53dd658c22a8e91597304b1aff96fee43b7b8c49)
+++ firmware/App/Controllers/Fans.c	(.../Fans.c)	(revision 68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7)
@@ -1,6 +1,6 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2022 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
Index: firmware/App/Controllers/Fans.h
===================================================================
diff -u -r1e323172095bb1ca6969f65976049c9fbe19c489 -r68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7
--- firmware/App/Controllers/Fans.h	(.../Fans.h)	(revision 1e323172095bb1ca6969f65976049c9fbe19c489)
+++ firmware/App/Controllers/Fans.h	(.../Fans.h)	(revision 68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7)
@@ -1,6 +1,6 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2022 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
Index: firmware/App/Controllers/PresOccl.c
===================================================================
diff -u -r946f42bfd6606dd3d771d9a4a7b50e5678469f62 -r68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7
--- firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision 946f42bfd6606dd3d771d9a4a7b50e5678469f62)
+++ firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision 68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7)
@@ -1,6 +1,6 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2022 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
Index: firmware/App/Controllers/SyringePump.c
===================================================================
diff -u -r946f42bfd6606dd3d771d9a4a7b50e5678469f62 -r68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7
--- firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 946f42bfd6606dd3d771d9a4a7b50e5678469f62)
+++ firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7)
@@ -1,14 +1,14 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2022 Diality Inc. - All Rights Reserved.
 *
 * 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    SyringePump.c
 *
-* @author  (last)      Sean Nash
-* @date    (last)      15-Nov-2021
+* @author  (last)      Hung Nguyen
+* @date    (last)      04-Jan-2022
 *
 * @author  (original)  Sean Nash
 * @date    (original)  04-Mar-2021
Index: firmware/App/Drivers/Comm.c
===================================================================
diff -u -r9ac7866cce73b5281c34626ab5903409778e2b19 -r68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7
--- firmware/App/Drivers/Comm.c	(.../Comm.c)	(revision 9ac7866cce73b5281c34626ab5903409778e2b19)
+++ firmware/App/Drivers/Comm.c	(.../Comm.c)	(revision 68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7)
@@ -1,6 +1,6 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2022 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
Index: firmware/App/Drivers/Comm.h
===================================================================
diff -u -r9ac7866cce73b5281c34626ab5903409778e2b19 -r68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7
--- firmware/App/Drivers/Comm.h	(.../Comm.h)	(revision 9ac7866cce73b5281c34626ab5903409778e2b19)
+++ firmware/App/Drivers/Comm.h	(.../Comm.h)	(revision 68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7)
@@ -1,6 +1,6 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2022 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
Index: firmware/App/Drivers/InternalADC.c
===================================================================
diff -u -r893b25a778d71b4d779ff14aa7361914f388e87e -r68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7
--- firmware/App/Drivers/InternalADC.c	(.../InternalADC.c)	(revision 893b25a778d71b4d779ff14aa7361914f388e87e)
+++ firmware/App/Drivers/InternalADC.c	(.../InternalADC.c)	(revision 68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7)
@@ -1,6 +1,6 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2022 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
Index: firmware/App/Drivers/SafetyShutdown.c
===================================================================
diff -u -rb3375bb1bc7910b7f45922d2eb4e55bb1dcc3c16 -r68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7
--- firmware/App/Drivers/SafetyShutdown.c	(.../SafetyShutdown.c)	(revision b3375bb1bc7910b7f45922d2eb4e55bb1dcc3c16)
+++ firmware/App/Drivers/SafetyShutdown.c	(.../SafetyShutdown.c)	(revision 68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7)
@@ -1,6 +1,6 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2022 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
Index: firmware/App/HDCommon.h
===================================================================
diff -u -r1e323172095bb1ca6969f65976049c9fbe19c489 -r68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7
--- firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 1e323172095bb1ca6969f65976049c9fbe19c489)
+++ firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7)
@@ -1,14 +1,14 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2022 Diality Inc. - All Rights Reserved.
 *
 * 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    HDCommon.h
 *
-* @author  (last)      Sean Nash
-* @date    (last)      12-Nov-2021
+* @author  (last)      Hung Nguyen
+* @date    (last)      04-Jan-2022
 *
 * @author  (original)  Sean
 * @date    (original)  27-Feb-2020
@@ -24,8 +24,8 @@
 
 #define HD_VERSION_MAJOR        0
 #define HD_VERSION_MINOR        6
-#define HD_VERSION_MICRO        5
-#define HD_VERSION_BUILD        25
+#define HD_VERSION_MICRO        0
+#define HD_VERSION_BUILD        30
 
 // ********** development build switches **********
 
@@ -59,6 +59,7 @@
     #define DISABLE_PRESSURE_CHECKS         1           // Do not error on HD pressure checks
     #define DISABLE_ARTERIAL_PRESSURE_CHECK 1           // Do not error on arterial pressure out of range
     #define DISABLE_VENOUS_PRESSURE_CHECK   1           // Do not error on venous pressure out of range
+
 //    #define DISABLE_UF_ALARMS               1           // Do not error on HD ultrafiltration checks
     #define DISABLE_DIALYSATE_TEMP_CHECK    1           // Disable dialysate temperature check
 //    #define DISABLE_VALVE_ALARMS            1           // Do not error on HD valve position
@@ -87,12 +88,12 @@
     #define IGNORE_BLOOD_LEAK_ALARM         1           // Ignore blood leak alarm
 
     // Skip Pre-Treatment and get to treatment as soon as possible
-    #define SKIP_UI_INTERACTION             1           // Skip UI interaction.
+//    #define SKIP_UI_INTERACTION             1           // Skip UI interaction.
     #define SKIP_SAMPLE_WATER               1           // Skip pre-treatment sample water
     #define SKIP_CONSUMABLE_TESTS           1           // Skip pre-treatment consumable Self-tests
     #define SKIP_DRY_SELF_TESTS             1           // Skip pre-treatment dry self-tests
-    #define SKIP_PRIMING                    1           // Skip Pre-treatment Prime
-    #define SKIP_WET_SELF_TESTS             1           // Skip Pre-treatment prime wet self-tests
+//    #define SKIP_PRIMING                    1           // Skip Pre-treatment Prime
+//    #define SKIP_WET_SELF_TESTS             1           // Skip Pre-treatment prime wet self-tests
 
     #include <stdio.h>
     #include <strings.h>
Index: firmware/App/Modes/BloodPrime.c
===================================================================
diff -u -r42ce27a9c940f5fd8a858aca69cbe8dd635ccf8d -r68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7
--- firmware/App/Modes/BloodPrime.c	(.../BloodPrime.c)	(revision 42ce27a9c940f5fd8a858aca69cbe8dd635ccf8d)
+++ firmware/App/Modes/BloodPrime.c	(.../BloodPrime.c)	(revision 68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7)
@@ -1,6 +1,6 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2022 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
Index: firmware/App/Modes/ConsumableSelfTest.c
===================================================================
diff -u -r182a81ed78f66f05ef286e2456c6c86f5e4f3e28 -r68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7
--- firmware/App/Modes/ConsumableSelfTest.c	(.../ConsumableSelfTest.c)	(revision 182a81ed78f66f05ef286e2456c6c86f5e4f3e28)
+++ firmware/App/Modes/ConsumableSelfTest.c	(.../ConsumableSelfTest.c)	(revision 68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7)
@@ -1,6 +1,6 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2022 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
Index: firmware/App/Modes/Dialysis.c
===================================================================
diff -u -rd4670b91145b97cb5a4a35dea604bff6c849c62d -r68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7
--- firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision d4670b91145b97cb5a4a35dea604bff6c849c62d)
+++ firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision 68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7)
@@ -1,6 +1,6 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2022 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
Index: firmware/App/Modes/Dialysis.h
===================================================================
diff -u -r549119eae64732f124d22df66de4fc88c56193c0 -r68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7
--- firmware/App/Modes/Dialysis.h	(.../Dialysis.h)	(revision 549119eae64732f124d22df66de4fc88c56193c0)
+++ firmware/App/Modes/Dialysis.h	(.../Dialysis.h)	(revision 68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7)
@@ -1,6 +1,6 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2022 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
Index: firmware/App/Modes/ModeInitPOST.c
===================================================================
diff -u -r1e323172095bb1ca6969f65976049c9fbe19c489 -r68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7
--- firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision 1e323172095bb1ca6969f65976049c9fbe19c489)
+++ firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision 68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7)
@@ -1,6 +1,6 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2022 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -rf3c8ef49b4bef41b606325e3db0e053a7a72d98f -r68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision f3c8ef49b4bef41b606325e3db0e053a7a72d98f)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7)
@@ -1,6 +1,6 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2022 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
Index: firmware/App/Modes/ModeTreatment.c
===================================================================
diff -u -r075210a84af3deede4bf07f83091f14aca6d12c9 -r68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7
--- firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 075210a84af3deede4bf07f83091f14aca6d12c9)
+++ firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7)
@@ -1,6 +1,6 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2022 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
Index: firmware/App/Modes/ModeTreatment.h
===================================================================
diff -u -r58afeb5a318882fa028894b51aefba526b2fb1f0 -r68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7
--- firmware/App/Modes/ModeTreatment.h	(.../ModeTreatment.h)	(revision 58afeb5a318882fa028894b51aefba526b2fb1f0)
+++ firmware/App/Modes/ModeTreatment.h	(.../ModeTreatment.h)	(revision 68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7)
@@ -1,6 +1,6 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2022 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
Index: firmware/App/Modes/ModeTreatmentParams.c
===================================================================
diff -u -r9a45dcbdfae33fc06479d99b8d52bada8f682194 -r68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7
--- firmware/App/Modes/ModeTreatmentParams.c	(.../ModeTreatmentParams.c)	(revision 9a45dcbdfae33fc06479d99b8d52bada8f682194)
+++ firmware/App/Modes/ModeTreatmentParams.c	(.../ModeTreatmentParams.c)	(revision 68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7)
@@ -1,14 +1,14 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2022 Diality Inc. - All Rights Reserved.
 *
 * 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    ModeTreatmentParams.c
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      12-Nov-2021
+* @author  (last)      Behrouz NematiPour
+* @date    (last)      04-Jan-2022
 *
 * @author  (original)  Sean Nash
 * @date    (original)  29-May-2020
@@ -59,9 +59,10 @@
     { CRITICAL_DATA_TYPE_U32, {.uInt=60},   {.uInt=480},  {.uInt=240}  }, // TREATMENT_PARAM_TREATMENT_DURATION
     { CRITICAL_DATA_TYPE_U32, {.uInt=0},    {.uInt=480},  {.uInt=0}    }, // TREATMENT_PARAM_HEPARIN_PRE_STOP_TIME
     { CRITICAL_DATA_TYPE_U32, {.uInt=100},  {.uInt=300},  {.uInt=100}  }, // TREATMENT_PARAM_SALINE_BOLUS_VOLUME
-    { CRITICAL_DATA_TYPE_U32, {.uInt=0},    {.uInt=2},    {.uInt=0}    }, // TREATMENT_PARAM_ACID_CONCENTRATE
+    { CRITICAL_DATA_TYPE_U32, {.uInt=0},    {.uInt=3},    {.uInt=0}    }, // TREATMENT_PARAM_ACID_CONCENTRATE
     { CRITICAL_DATA_TYPE_U32, {.uInt=0},    {.uInt=0},    {.uInt=0}    }, // TREATMENT_PARAM_BICARB_CONCENTRATE
     { CRITICAL_DATA_TYPE_U32, {.uInt=0},    {.uInt=4},    {.uInt=0}    }, // TREATMENT_PARAM_DIALYZER_TYPE
+    { CRITICAL_DATA_TYPE_U32, {.uInt=0},    {.uInt=0},    {.uInt=0}    }, // TREATMENT_PARAM_HEPARIN_TYPE
     { CRITICAL_DATA_TYPE_U32, {.uInt=0},    {.uInt=60},   {.uInt=30}   }, // TREATMENT_PARAM_BP_MEAS_INTERVAL
     { CRITICAL_DATA_TYPE_U32, {.uInt=50},   {.uInt=150},  {.uInt=75}   }, // TREATMENT_PARAM_RINSEBACK_FLOW_RATE
     { CRITICAL_DATA_TYPE_S32, {.sInt=-300}, {.sInt=-30},  {.sInt=-300} }, // TREATMENT_PARAM_ART_PRESSURE_LOW_LIMIT
@@ -415,6 +416,9 @@
 
     if ( TRUE == accepted )
     {
+        // store the user set ultrafiltration volume in pre-treatment parameters setup, if it is validated, otherwise keep the initial 0.0
+        origTreatmentParams.uFVolume_L = uFVolumeL;
+
         U32 treatmentDuration = getTreatmentParameterU32( TREATMENT_PARAM_TREATMENT_DURATION );
 
         if ( treatmentDuration > 0 )
@@ -837,7 +841,36 @@
     return result;
 }
 
+/*********************************************************************//**
+ * @brief
+ * The getUltrafiltrationVolumeOriginal function gets the floating point value
+ * of the original set treatment parameter's ultrafiltration volume by user in
+ * Pre-Treatment mode.
+ * @details Inputs: none
+ * @details Outputs: origTreatmentParams.uFVolume_L
+ * @param none
+ * @return the original ultrafiltration volume value in liter
+ *************************************************************************/
+F32 getUltrafiltrationVolumeOriginal( void )
+{
+    return origTreatmentParams.uFVolume_L;
+}
 
+/*********************************************************************//**
+ * @brief
+ * The getUltrafiltrationRateOriginal function gets the floating point value
+ * of the original ultrafiltration rate calculated by the set treatment parameter's
+ * ultrafiltration volume and treatment duration by user in Pre-Treatment mode.
+ * @details Inputs: origTreatmentParams.uFVolume_L, origTreatmentParams.treatmentDuration_min
+ * @details Outputs: none
+ * @param none
+ * @return the original ultrafiltration rate value in mL/min
+ *************************************************************************/
+F32 getUltrafiltrationRateOriginal( void )
+{
+    return ( ( origTreatmentParams.uFVolume_L * ML_PER_LITER ) / origTreatmentParams.treatmentDuration_min );
+}
+
 /*************************************************************************
  *                       TEST SUPPORT FUNCTIONS
  *************************************************************************/
Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r7f081cedd7f33097485ea29552ba69d4cc1910e1 -r68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 7f081cedd7f33097485ea29552ba69d4cc1910e1)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7)
@@ -1,14 +1,14 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2022 Diality Inc. - All Rights Reserved.
 *
 * 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    SelfTests.c
 *
-* @author  (last)      Sean Nash
-* @date    (last)      12-Nov-2021
+* @author  (last)      Hung Nguyen
+* @date    (last)      04-Jan-2022
 *
 * @author  (original)  Quang Nguyen
 * @date    (original)  28-Jan-2021
@@ -486,6 +486,7 @@
  *************************************************************************/
 void transitionToWetSelfTests()
 {
+    signalDialInPumpHardStop();   // turn off DPi that was on in previous dialysate bypass state
     wetSelfTestsResult = FALSE;
     currentWetSelfTestsState = WET_SELF_TESTS_START_STATE;
     settleStartTime = 0;
Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -r03843cd217e3beaa24f7ff17a892a44d05b43734 -r68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 03843cd217e3beaa24f7ff17a892a44d05b43734)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7)
@@ -1,6 +1,6 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2022 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
Index: firmware/App/Services/AlarmMgmt.h
===================================================================
diff -u -r03843cd217e3beaa24f7ff17a892a44d05b43734 -r68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7
--- firmware/App/Services/AlarmMgmt.h	(.../AlarmMgmt.h)	(revision 03843cd217e3beaa24f7ff17a892a44d05b43734)
+++ firmware/App/Services/AlarmMgmt.h	(.../AlarmMgmt.h)	(revision 68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7)
@@ -1,6 +1,6 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2022 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
Index: firmware/App/Services/AlarmMgmtSWFaults.h
===================================================================
diff -u -r549119eae64732f124d22df66de4fc88c56193c0 -r68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7
--- firmware/App/Services/AlarmMgmtSWFaults.h	(.../AlarmMgmtSWFaults.h)	(revision 549119eae64732f124d22df66de4fc88c56193c0)
+++ firmware/App/Services/AlarmMgmtSWFaults.h	(.../AlarmMgmtSWFaults.h)	(revision 68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7)
@@ -1,6 +1,6 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2022 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
Index: firmware/App/Services/CommBuffers.h
===================================================================
diff -u -r9ac7866cce73b5281c34626ab5903409778e2b19 -r68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7
--- firmware/App/Services/CommBuffers.h	(.../CommBuffers.h)	(revision 9ac7866cce73b5281c34626ab5903409778e2b19)
+++ firmware/App/Services/CommBuffers.h	(.../CommBuffers.h)	(revision 68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7)
@@ -1,6 +1,6 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2022 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
Index: firmware/App/Services/FPGA.c
===================================================================
diff -u -r71b08e3335b0c111cc57a562089e8ac0b206d258 -r68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7
--- firmware/App/Services/FPGA.c	(.../FPGA.c)	(revision 71b08e3335b0c111cc57a562089e8ac0b206d258)
+++ firmware/App/Services/FPGA.c	(.../FPGA.c)	(revision 68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7)
@@ -1,6 +1,6 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2022 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
Index: firmware/App/Services/FPGA.h
===================================================================
diff -u -r2c9bbece8057254f8389c26a818081002fb69a77 -r68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7
--- firmware/App/Services/FPGA.h	(.../FPGA.h)	(revision 2c9bbece8057254f8389c26a818081002fb69a77)
+++ firmware/App/Services/FPGA.h	(.../FPGA.h)	(revision 68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7)
@@ -1,6 +1,6 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2022 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
Index: firmware/App/Services/Interrupts.c
===================================================================
diff -u -r9ac7866cce73b5281c34626ab5903409778e2b19 -r68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7
--- firmware/App/Services/Interrupts.c	(.../Interrupts.c)	(revision 9ac7866cce73b5281c34626ab5903409778e2b19)
+++ firmware/App/Services/Interrupts.c	(.../Interrupts.c)	(revision 68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7)
@@ -1,6 +1,6 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2022 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
Index: firmware/App/Services/PIControllers.c
===================================================================
diff -u -r3d8d8451d10aaf2ea9fc9d83857699ef1ae1a0be -r68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7
--- firmware/App/Services/PIControllers.c	(.../PIControllers.c)	(revision 3d8d8451d10aaf2ea9fc9d83857699ef1ae1a0be)
+++ firmware/App/Services/PIControllers.c	(.../PIControllers.c)	(revision 68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7)
@@ -1,6 +1,6 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2022 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
Index: firmware/App/Services/PIControllers.h
===================================================================
diff -u -r3d8d8451d10aaf2ea9fc9d83857699ef1ae1a0be -r68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7
--- firmware/App/Services/PIControllers.h	(.../PIControllers.h)	(revision 3d8d8451d10aaf2ea9fc9d83857699ef1ae1a0be)
+++ firmware/App/Services/PIControllers.h	(.../PIControllers.h)	(revision 68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7)
@@ -1,6 +1,6 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2022 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r0ddfb88172db9b6c0b41b1dc5c0cc3e0296068be -r68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 0ddfb88172db9b6c0b41b1dc5c0cc3e0296068be)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7)
@@ -1,14 +1,14 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2022 Diality Inc. - All Rights Reserved.
 *
 * 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    SystemComm.c
 *
-* @author  (last)      Sean Nash
-* @date    (last)      12-Nov-2021
+* @author  (last)      Hung Nguyen
+* @date    (last)      04-Jan-2022
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -26,6 +26,8 @@
 #include "OperationModes.h"
 #include "SystemComm.h"
 #include "SystemCommMessages.h"
+#include "Interrupts.h"
+#include "OperationModes.h"
 #include "Timers.h"
 #include "Utilities.h"
 
@@ -50,13 +52,14 @@
 #define MAX_COMM_CRC_FAILURE_WINDOW_MS  (10 * SEC_PER_MIN * MS_PER_SECOND)  ///< CRC error window
 
 #define MSG_NOT_ACKED_TIMEOUT_MS        150     ///< Maximum time for a Denali message that requires ACK to be ACK'd
-#define MSG_NOT_ACKED_TIMEOUT_MS_INIT   5000    ///< Maximum time for a Denali message that requires ACK to be ACK'd on the INIT state for the first (UI version request) message of the POST
+
+#define MSG_NOT_ACKED_TIMEOUT_MS_INIT   5000    ///< Maximum time for a Denali message that requires ACK to be ACK'd on the INIT state for the first (UI version request) message of the POST
 #define MSG_NOT_ACKED_MAX_RETRIES       3       ///< Maximum number of times a message that requires ACK that was not ACK'd can be re-sent before alarm
 #define PENDING_ACK_LIST_SIZE           25      ///< Maximum number of Denali messages that can be pending ACK at any given time
 
 #pragma pack(push, 1)
 
-/// Record for transmitted message that is pending acknowledgement from receiver.
+/// Record for transmitted message that is pending acknowledgment from receiver.
 typedef struct
 {
     BOOL used;
Index: firmware/App/Services/SystemComm.h
===================================================================
diff -u -r9ac7866cce73b5281c34626ab5903409778e2b19 -r68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7
--- firmware/App/Services/SystemComm.h	(.../SystemComm.h)	(revision 9ac7866cce73b5281c34626ab5903409778e2b19)
+++ firmware/App/Services/SystemComm.h	(.../SystemComm.h)	(revision 68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7)
@@ -1,6 +1,6 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2022 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r62cbfbbd0d1baa7b1f383510b7864921e2dfd054 -r68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 62cbfbbd0d1baa7b1f383510b7864921e2dfd054)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7)
@@ -1,14 +1,14 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2022 Diality Inc. - All Rights Reserved.
 *
 * 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    SystemCommMessages.c
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      12-Nov-2021
+* @author  (last)      Behrouz NematiPour
+* @date    (last)      07-Dec-2021
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -819,8 +819,8 @@
     msg.hdr.msgID = MSG_ID_HD_TREATMENT_LOG_DATA_RESPONSE;
     msg.hdr.payloadLen = sizeof( BOOL ) + sizeof( U32 ) + sizeof( TREATMENT_LOG_DATA_PAYLOAD_T );
 
-    memcpy( payloadPtr, &accepted, sizeof( U32 ) );
-    payloadPtr += sizeof( U32 );
+    memcpy( payloadPtr, &accepted, sizeof( BOOL ) );
+    payloadPtr += sizeof( BOOL );
     memcpy( payloadPtr, &reason, sizeof( U32 ) );
     payloadPtr += sizeof( U32 );
     memcpy( payloadPtr, logDataPtr, sizeof( TREATMENT_LOG_DATA_PAYLOAD_T ) );
Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r2a6ac80309cb52922f856b3eb4ff2c876b44c0d6 -r68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 2a6ac80309cb52922f856b3eb4ff2c876b44c0d6)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7)
@@ -1,6 +1,6 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2022 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
Index: firmware/App/Services/WatchdogMgmt.c
===================================================================
diff -u -rb3375bb1bc7910b7f45922d2eb4e55bb1dcc3c16 -r68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7
--- firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision b3375bb1bc7910b7f45922d2eb4e55bb1dcc3c16)
+++ firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision 68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7)
@@ -1,6 +1,6 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2022 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.