Index: firmware/App/Controllers/BloodLeak.h
===================================================================
diff -u -ra28daf72bbc8bd7313425471555d5189d946af13 -rcca326f2741163d8626ed764f4f673bdf453e7d9
--- firmware/App/Controllers/BloodLeak.h	(.../BloodLeak.h)	(revision a28daf72bbc8bd7313425471555d5189d946af13)
+++ firmware/App/Controllers/BloodLeak.h	(.../BloodLeak.h)	(revision cca326f2741163d8626ed764f4f673bdf453e7d9)
@@ -1,6 +1,6 @@
 /**************************************************************************
 *
-* Copyright (c) 2021-2025 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2021-2026 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 -re7bc9d045b2da257ac8034a1d406525b8040a5d7 -rcca326f2741163d8626ed764f4f673bdf453e7d9
--- firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision e7bc9d045b2da257ac8034a1d406525b8040a5d7)
+++ firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision cca326f2741163d8626ed764f4f673bdf453e7d9)
@@ -1,14 +1,14 @@
 /**************************************************************************
 *
-* Copyright (c) 2020-2025 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2020-2026 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    DGInterface.c
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      20-May-2025
+* @date    (last)      29-Apr-2026
 *
 * @author  (original)  Sean
 * @date    (original)  08-Apr-2020
Index: firmware/App/Controllers/DGInterface.h
===================================================================
diff -u -ra28daf72bbc8bd7313425471555d5189d946af13 -rcca326f2741163d8626ed764f4f673bdf453e7d9
--- firmware/App/Controllers/DGInterface.h	(.../DGInterface.h)	(revision a28daf72bbc8bd7313425471555d5189d946af13)
+++ firmware/App/Controllers/DGInterface.h	(.../DGInterface.h)	(revision cca326f2741163d8626ed764f4f673bdf453e7d9)
@@ -1,6 +1,6 @@
 /**************************************************************************
 *
-* Copyright (c) 2020-2025 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2020-2026 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 -re7bc9d045b2da257ac8034a1d406525b8040a5d7 -rcca326f2741163d8626ed764f4f673bdf453e7d9
--- firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision e7bc9d045b2da257ac8034a1d406525b8040a5d7)
+++ firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision cca326f2741163d8626ed764f4f673bdf453e7d9)
@@ -1,14 +1,14 @@
 /**************************************************************************
 *
-* Copyright (c) 2020-2025 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2020-2026 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    PresOccl.c
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      06-Nov-2025
+* @date    (last)      29-Apr-2026
 *
 * @author  (original)  Sean
 * @date    (original)  15-Jan-2020
Index: firmware/App/Controllers/SyringePump.c
===================================================================
diff -u -re7bc9d045b2da257ac8034a1d406525b8040a5d7 -rcca326f2741163d8626ed764f4f673bdf453e7d9
--- firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision e7bc9d045b2da257ac8034a1d406525b8040a5d7)
+++ firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision cca326f2741163d8626ed764f4f673bdf453e7d9)
@@ -1,14 +1,14 @@
 /**************************************************************************
 *
-* Copyright (c) 2021-2025 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2021-2026 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)      05-Apr-2024
+* @author  (last)      Dara Navaei
+* @date    (last)      29-Apr-2026
 *
 * @author  (original)  Sean Nash
 * @date    (original)  04-Mar-2021
Index: firmware/App/Controllers/Temperatures.c
===================================================================
diff -u -ra28daf72bbc8bd7313425471555d5189d946af13 -rcca326f2741163d8626ed764f4f673bdf453e7d9
--- firmware/App/Controllers/Temperatures.c	(.../Temperatures.c)	(revision a28daf72bbc8bd7313425471555d5189d946af13)
+++ firmware/App/Controllers/Temperatures.c	(.../Temperatures.c)	(revision cca326f2741163d8626ed764f4f673bdf453e7d9)
@@ -1,6 +1,6 @@
 /**************************************************************************
 *
-* Copyright (c) 2021-2025 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2021-2026 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/Valves.c
===================================================================
diff -u -re7bc9d045b2da257ac8034a1d406525b8040a5d7 -rcca326f2741163d8626ed764f4f673bdf453e7d9
--- firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision e7bc9d045b2da257ac8034a1d406525b8040a5d7)
+++ firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision cca326f2741163d8626ed764f4f673bdf453e7d9)
@@ -1,14 +1,14 @@
 /**************************************************************************
 *
-* Copyright (c) 2020-2025 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2020-2026 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    Valves.c
 *
-* @author  (last)      Sean Nash
-* @date    (last)      12-Feb-2024
+* @author  (last)      Dara Navaei
+* @date    (last)      29-Apr-2026
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  07-Aug-2020
@@ -364,7 +364,7 @@
     }
     else
     {
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_HD_VALVES_INVALID_VALVE_SELECTED, (U32)valve );
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_HD_VALVES_INVALID_VALVE_SELECTED1, (U32)valve );
     }
 
     return result;
@@ -393,19 +393,20 @@
     }
     else
     {
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_HD_VALVES_INVALID_VALVE_SELECTED, (U32)valve );
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_HD_VALVES_INVALID_VALVE_SELECTED2, (U32)valve );
     }
 
     return result;
 }
 
 /*********************************************************************//**
  * @brief
- * The getValvePosition function returns the current position of a valve.
+ * The getValvePosition function returns the current position of a
+ * given valve.
  * @details Inputs: none
  * @details Outputs: valvesStatus
- * @param valve that the position is requested
- * @return returns the current position of the valve in enum
+ * @param valve Valve to get the position of
+ * @return returns the current position of the given valve
  *************************************************************************/
 VALVE_POSITION_T getValvePosition( VALVE_T valve )
 {
@@ -417,14 +418,39 @@
     }
     else
     {
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_HD_VALVES_INVALID_VALVE_SELECTED, (U32)valve );
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_HD_VALVES_INVALID_VALVE_SELECTED3, (U32)valve );
     }
 
     return position;
 }
 
 /*********************************************************************//**
  * @brief
+ * The getSetValvePosition function returns the commanded position of a
+ * given valve.
+ * @details Inputs: none
+ * @details Outputs: valvesStatus
+ * @param valve Valve to get the commanded position of
+ * @return returns the current commanded position of the given valve
+ *************************************************************************/
+VALVE_POSITION_T getSetValvePosition( VALVE_T valve )
+{
+    VALVE_POSITION_T position = VALVE_POSITION_NOT_IN_POSITION;
+
+    if ( valve < NUM_OF_VALVES )
+    {
+        position = valvesStatus[ valve ].commandedPosition;
+    }
+    else
+    {
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_HD_VALVES_INVALID_VALVE_SELECTED4, (U32)valve );
+    }
+
+    return position;
+}
+
+/*********************************************************************//**
+ * @brief
  * The getValveCurrent function returns the current of a valve.
  * @details Inputs: valvesStatus
  * @details Outputs: valvesStatus
@@ -1122,7 +1148,7 @@
             break;
 
         default:
-            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_HD_VALVES_INVALID_VALVE_SELECTED, (U32)valve );
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_HD_VALVES_INVALID_VALVE_SELECTED5, (U32)valve );
             break;
     }
 }
@@ -1446,7 +1472,7 @@
             break;
 
         default:
-            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_HD_VALVES_INVALID_VALVE_SELECTED, (U32)valve );
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_HD_VALVES_INVALID_VALVE_SELECTED6, (U32)valve );
             break;
     }
 }
Index: firmware/App/Drivers/Battery.c
===================================================================
diff -u -ra28daf72bbc8bd7313425471555d5189d946af13 -rcca326f2741163d8626ed764f4f673bdf453e7d9
--- firmware/App/Drivers/Battery.c	(.../Battery.c)	(revision a28daf72bbc8bd7313425471555d5189d946af13)
+++ firmware/App/Drivers/Battery.c	(.../Battery.c)	(revision cca326f2741163d8626ed764f4f673bdf453e7d9)
@@ -1,6 +1,6 @@
 /**************************************************************************
 *
-* Copyright (c) 2021-2025 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2021-2026 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 -rb08f2ab5b3ac46b1a111f4b9e7951d9b054cb1fc -rcca326f2741163d8626ed764f4f673bdf453e7d9
--- firmware/App/HDCommon.h	(.../HDCommon.h)	(revision b08f2ab5b3ac46b1a111f4b9e7951d9b054cb1fc)
+++ firmware/App/HDCommon.h	(.../HDCommon.h)	(revision cca326f2741163d8626ed764f4f673bdf453e7d9)
@@ -1,6 +1,6 @@
 /**************************************************************************
 *
-* Copyright (c) 2020-2025 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2020-2026 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 -ra28daf72bbc8bd7313425471555d5189d946af13 -rcca326f2741163d8626ed764f4f673bdf453e7d9
--- firmware/App/Modes/ConsumableSelfTest.c	(.../ConsumableSelfTest.c)	(revision a28daf72bbc8bd7313425471555d5189d946af13)
+++ firmware/App/Modes/ConsumableSelfTest.c	(.../ConsumableSelfTest.c)	(revision cca326f2741163d8626ed764f4f673bdf453e7d9)
@@ -1,6 +1,6 @@
 /**************************************************************************
 *
-* Copyright (c) 2021-2025 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2021-2026 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/TreatmentRecirc.c
===================================================================
diff -u -r9d21272d8c5c0b5f1d72bd5f0e9ef4e4ee41e764 -rcca326f2741163d8626ed764f4f673bdf453e7d9
--- firmware/App/Modes/TreatmentRecirc.c	(.../TreatmentRecirc.c)	(revision 9d21272d8c5c0b5f1d72bd5f0e9ef4e4ee41e764)
+++ firmware/App/Modes/TreatmentRecirc.c	(.../TreatmentRecirc.c)	(revision cca326f2741163d8626ed764f4f673bdf453e7d9)
@@ -1,6 +1,6 @@
 /**************************************************************************
 *
-* Copyright (c) 2021-2025 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2021-2026 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.c
===================================================================
diff -u -r9d21272d8c5c0b5f1d72bd5f0e9ef4e4ee41e764 -rcca326f2741163d8626ed764f4f673bdf453e7d9
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 9d21272d8c5c0b5f1d72bd5f0e9ef4e4ee41e764)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision cca326f2741163d8626ed764f4f673bdf453e7d9)
@@ -1,6 +1,6 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2025 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2026 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 -r9d21272d8c5c0b5f1d72bd5f0e9ef4e4ee41e764 -rcca326f2741163d8626ed764f4f673bdf453e7d9
--- firmware/App/Services/AlarmMgmt.h	(.../AlarmMgmt.h)	(revision 9d21272d8c5c0b5f1d72bd5f0e9ef4e4ee41e764)
+++ firmware/App/Services/AlarmMgmt.h	(.../AlarmMgmt.h)	(revision cca326f2741163d8626ed764f4f673bdf453e7d9)
@@ -1,6 +1,6 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2025 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2026 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 -rf7f615ed00ea829b9fc8941e6e06c91ab6a88991 -rcca326f2741163d8626ed764f4f673bdf453e7d9
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision f7f615ed00ea829b9fc8941e6e06c91ab6a88991)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision cca326f2741163d8626ed764f4f673bdf453e7d9)
@@ -1,6 +1,6 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2025 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2026 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.h
===================================================================
diff -u -rdd9b59ba0d52b9cc17ecc56a05716a81aa1a6b65 -rcca326f2741163d8626ed764f4f673bdf453e7d9
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision dd9b59ba0d52b9cc17ecc56a05716a81aa1a6b65)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision cca326f2741163d8626ed764f4f673bdf453e7d9)
@@ -1,6 +1,6 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2025 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2026 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 -ra28daf72bbc8bd7313425471555d5189d946af13 -rcca326f2741163d8626ed764f4f673bdf453e7d9
--- firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision a28daf72bbc8bd7313425471555d5189d946af13)
+++ firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision cca326f2741163d8626ed764f4f673bdf453e7d9)
@@ -1,6 +1,6 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2025 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2026 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.