Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r120487ddf3e3d69d1de5094d5252c037588e2ed8 -r934ce8fc097623360b8db3619194348fb4fad09f
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 120487ddf3e3d69d1de5094d5252c037588e2ed8)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 934ce8fc097623360b8db3619194348fb4fad09f)
@@ -27,6 +27,8 @@
 #include "Switches.h"
 #include "SystemCommTD.h"
 #include "TxParams.h"
+#include "Valve3Way.h"
+#include "Valves.h"
 
 /**
  *  @addtogroup TDStandbyMode
@@ -42,6 +44,7 @@
 
 static TD_STANDBY_STATE_T currentStandbyState;                                                 ///< Current state (sub-mode) of standby mode.
 static BOOL treatStartReqReceived;                                                             ///< Flag indicates user has requested initiation of a treatment.
+static BOOL homingInitiated;                                                                   ///< Flag indicates actuators have been homed.
 
 // ********** private function prototypes **********
 
@@ -52,13 +55,14 @@
  * @brief
  * The initStandbyMode function initializes the Standby Mode Unit.
  * @details \b Inputs: none
- * @details \b Outputs: currentStandbyState, treatStartReqReceived
+ * @details \b Outputs: Standby mode variables initialized.
  * @return none
  *************************************************************************/
 void initStandbyMode( void )
 {
     currentStandbyState   = STANDBY_START_STATE;
     treatStartReqReceived = FALSE;
+    homingInitiated = FALSE;
 }
 
 /*********************************************************************//**
@@ -84,15 +88,22 @@
     setAlarmUserActionEnabled( ALARM_USER_ACTION_END_TREATMENT, FALSE );
 
     // Pumps should be off
-//    signalBloodPumpHardStop();
+    signalBloodPumpHardStop();
 //    stopSyringePump();
 
     // Set valves to default positions
-//    setValveAirTrap( VALVE_3WAY_COMMON_TO_CLOSED_STATE );
-//    setValvePosition( H1_VALV, VALVE_POSITION_A_INSERT_EJECT );
-//    setValvePosition( H19, VALVE_POSITION_A_INSERT_EJECT );
+    set3WayValveState( H13_VALV, VALVE_3WAY_COMMON_TO_CLOSED_STATE );
+    set3WayValveState( H20_VALV, VALVE_3WAY_COMMON_TO_CLOSED_STATE );
+    if ( getValveState( H1_VALV ) < VALVE_STATE_IDLE )
+    {
+        setValvePosition( H1_VALV, VALVE_POSITION_A_INSERT_EJECT );
+    }
+    if ( getValveState( H19_VALV ) < VALVE_STATE_IDLE )
+    {
+        setValvePosition( H19_VALV, VALVE_POSITION_A_INSERT_EJECT );
+    }
 
-//    doorClosedRequired( FALSE );             // door no longer required to be closed in standby mode
+    doorClosedRequired( FALSE );             // door no longer required to be closed in standby mode
 
     // Request DD service record and usage information from DD
 //    sendDGServiceRequestToDG();
@@ -153,23 +164,23 @@
     // Wait for door to be closed so we can home actuators
 //    if ( STATE_CLOSED == getSwitchState( H9_SWCH ) )
 //    {
-//        // If we haven't already initiated homing of actuators, initiate now
-//        if ( homingInitiated != TRUE )
-//        {
-//            VALVE_T valve;
-//
-//            // Home pumps and valves
-//            for ( valve = VDI; valve < NUM_OF_VALVES; ++valve )
-//            {
-//                homeValve( valve, VALVE_NO_FORCE_HOME, VALVE_CARTRIDGE_MAY_BE_PRESENT );
-//            }
+        // If we haven't already initiated homing of actuators, initiate now
+        if ( homingInitiated != TRUE )
+        {
+            VALVE_T valve;
+
+            // Home pumps and valves
+            for ( valve = FIRST_VALVE; valve < NUM_OF_VALVES; ++valve )
+            {
+                homeValve( valve, FALSE, TRUE );
+            }
 //            homeBloodPump();
 //            homeDialInPump();
 //            homeDialOutPump();
 //            retractSyringePump();
-//
-//            homingInitiated = TRUE;
-//        }
+
+            homingInitiated = TRUE;
+        }
 //        else
 //        {
 //            // If homing has been initiated, wait for syringe pump to home and the verify force sensor calibration
Index: firmware/App/Modes/StateTxBloodPrime.c
===================================================================
diff -u -r9c833ef5623ce842267e284d958820ac0dc3a7fc -r934ce8fc097623360b8db3619194348fb4fad09f
--- firmware/App/Modes/StateTxBloodPrime.c	(.../StateTxBloodPrime.c)	(revision 9c833ef5623ce842267e284d958820ac0dc3a7fc)
+++ firmware/App/Modes/StateTxBloodPrime.c	(.../StateTxBloodPrime.c)	(revision 934ce8fc097623360b8db3619194348fb4fad09f)
@@ -123,7 +123,7 @@
     cumulativeBloodPrimeVolume_mL.data = 0.0;
     resetBloodPrimeFlags();
 
-    bloodPrimeTargetVolume_mL = TUBING_BLOOD_PRIME_VOLUME_ML + (F32)( getDialyzerBloodVolume( getTreatmentParameterU32( TREATMENT_PARAM_DIALYZER_TYPE ) ) );
+    bloodPrimeTargetVolume_mL = (F32)TUBING_BLOOD_PRIME_VOLUME_ML + (F32)( getDialyzerBloodVolume( (DIALYZER_TYPE_T)getTreatmentParameterU32( TREATMENT_PARAM_DIALYZER_TYPE ) ) );
     bloodPrimeRampFlowRate_mL_min = (F32)BLOOD_PRIME_INIT_BP_FLOW_RATE_ML_MIN;
 
     // Calculate BP ramp step size
Index: firmware/App/Services/AlarmMgmtSWFaults.h
===================================================================
diff -u -rb777859b2667c350c6ca9fda60a668c9eb5fe02d -r934ce8fc097623360b8db3619194348fb4fad09f
--- firmware/App/Services/AlarmMgmtSWFaults.h	(.../AlarmMgmtSWFaults.h)	(revision b777859b2667c350c6ca9fda60a668c9eb5fe02d)
+++ firmware/App/Services/AlarmMgmtSWFaults.h	(.../AlarmMgmtSWFaults.h)	(revision 934ce8fc097623360b8db3619194348fb4fad09f)
@@ -7,28 +7,28 @@
 *
 * @file    AlarmMgmtSWFaults.h
 *
-* @author  (last)      Raghu Kallala
-* @date    (last)      29-Apr-2026
+* @author  (last)      Vijay Pamula
+* @date    (last)      12-Jun-2026
 *
 * @author  (original)  Sean Nash
 * @date    (original)  01-Aug-2024
 *
 ***************************************************************************/
-
-#ifndef __ALARM_MGMT_SW_FAULTS_H__
-#define __ALARM_MGMT_SW_FAULTS_H__
-
-/**
- *  @addtogroup AlarmManagement
- *  @{
- */
-
-// ********** public definitions **********
-
-/// Listing of specific software faults for logging purposes.
-typedef enum
-{
-    SW_FAULT_ID_NONE = 0,
+
+#ifndef __ALARM_MGMT_SW_FAULTS_H__
+#define __ALARM_MGMT_SW_FAULTS_H__
+
+/**
+ *  @addtogroup AlarmManagement
+ *  @{
+ */
+
+// ********** public definitions **********
+
+/// Listing of specific software faults for logging purposes.
+typedef enum
+{
+    SW_FAULT_ID_NONE = 0,
     SW_FAULT_ID_ALARM_LAMP_INVALID_PATTERN_REQUESTED = 1,
     SW_FAULT_ID_ALARM_LAMP_INVALID_SELF_TEST_STATE = 2,
     SW_FAULT_ID_MODE_INIT_POST_INVALID_POST_STATE = 3,
@@ -61,7 +61,7 @@
     SW_FAULT_ID_CAN_PARITY_ERROR = 30,
     SW_FAULT_ID_CAN_OFF_ERROR = 31,
     SW_FAULT_ID_UNEXPECTED_DMA_INTERRUPT = 32,
-    SW_FAULT_ID_AVAILABLE1 = 33,
+    SW_FAULT_ID_MODE_UPDATE_INVALID_STATE = 33,
     SW_FAULT_ID_MSG_PENDING_ACK_LIST_FULL = 34,
     SW_FAULT_ID_MSG_QUEUES_ADD_QUEUE_FULL = 35,
     SW_FAULT_ID_MSG_QUEUES_ADD_INVALID_QUEUE = 36,
@@ -186,10 +186,21 @@
     SW_FAULT_ID_TD_AIR_PUMP_DUTY_CYCLE_OUT_OF_RANGE = 155,
     SW_FAULT_ID_PI_CTRL_INVALID_CONTROLLER = 156,
     SW_FAULT_ID_INVALID_TREATMENT_MODALITY = 157,
-    SW_FAULT_ID_TD_VALVES_INVALID_VALVE2 = 158,
+    SW_FAULT_ID_INVALID_DD_DIALYSATE_DATA = 158,
+    SW_FAULT_ID_TD_SYRINGE_INVALID_BOLUS_CMD = 159,
+    SW_FAULT_ID_TD_SYRINGE_INVALID_CONT_CMD = 160,
+    SW_FAULT_ID_TD_SYRINGE_INVALID_STATE = 161,
+    SW_FAULT_ID_TD_SYRINGE_INVALID_VREF = 162,
+    SW_FAULT_ID_MODE_PRE_TX_INSTALL_INVALID_STATE = 163,
+    SW_FAULT_ID_MODE_POST_TREATMENT_INVALID_STATE = 164,
+    SW_FAULT_ID_MODE_POST_TREATMENT_INVALID_STATE1 = 165,
+    SW_FAULT_ID_MODE_POST_TX_AUTO_EJECT_INVALID_STATE = 166,
+    SW_FAULT_ID_INVALID_FLUID_BOLUS_STATE = 167,
+    SW_FAULT_ID_PRE_TX_RECIRC_INVALID_STATE = 168,
+    SW_FAULT_ID_TD_VALVES_INVALID_VALVE2 = 169,
     NUM_OF_SW_FAULT_IDS
-} SW_FAULT_ID_T;
-
+} SW_FAULT_ID_T;
+
 /**@}*/
 
-#endif
+#endif