Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -rd6775171de59386445ffdf70d6b32bcdfc1db07e -r88816d9971ae12f9c6d66b4fee68774caa3ba8d3
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision d6775171de59386445ffdf70d6b32bcdfc1db07e)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 88816d9971ae12f9c6d66b4fee68774caa3ba8d3)
@@ -46,7 +46,7 @@
 static BOOL treatStartReqReceived;                                                             ///< Flag indicates user has requested initiation of a treatment.
 static BOOL homingInitiated;                                                                   ///< Flag indicates actuators have been homed.
 static FLUID_TYPE_T fluidType;                                                                 ///< Fluid type assigned based on user selection.
-static U32 modality;                                                                           ///< Modality from the treatment initiation.
+static TREATMENT_TYPE_T modality;                                                              ///< Modality from the treatment initiation.
 
 // ********** private function prototypes **********
 
@@ -64,7 +64,7 @@
 {
     currentStandbyState   = STANDBY_START_STATE;
     treatStartReqReceived = FALSE;
-    homingInitiated = FALSE;
+    homingInitiated       = FALSE;
     fluidType             = FLUID_TYPE_UNKNOWN;
     modality              = TREATMENT_MODALITY_HD_SALINE_FLUID;
 }
@@ -297,10 +297,10 @@
  * treatment selection from the home screen.
  * @details \b Inputs: none
  * @details \b Outputs: fluidType
- * @param type Fluid type selected by user (saline or substitution fluid).
+ * @param modality Treatment modality selected by the user on the home screen.
  * @return none
  *************************************************************************/
-void setFluidType( U32 modality )
+void setFluidType( TREATMENT_TYPE_T modality )
 {
     if ( TREATMENT_MODALITY_HD_SALINE_FLUID == modality )
     {
@@ -394,7 +394,7 @@
                 result                = TRUE;
                 treatStartReqReceived = TRUE;
                 // Save modality to set later
-                modality = request.modality;
+                modality              = (TREATMENT_TYPE_T)request.modality;
             }
         }
         else if ( USER_COMMAND_CANCEL == cmd )
Index: firmware/App/Modes/ModeStandby.h
===================================================================
diff -u -r0bb0852cf1b7abcd56df89f3b0328efeec37b15c -r88816d9971ae12f9c6d66b4fee68774caa3ba8d3
--- firmware/App/Modes/ModeStandby.h	(.../ModeStandby.h)	(revision 0bb0852cf1b7abcd56df89f3b0328efeec37b15c)
+++ firmware/App/Modes/ModeStandby.h	(.../ModeStandby.h)	(revision 88816d9971ae12f9c6d66b4fee68774caa3ba8d3)
@@ -48,7 +48,7 @@
 BOOL signalUserInitiateTreatment( MESSAGE_T *message );         // User has initiated/cancelled treatment workflow
 void signalAlarmActionToStandbyMode( ALARM_ACTION_T action );   // Execute alarm action as appropriate for Standby mode
 
-void setFluidType( U32 modality );                              // Set a specific fluid type
+void setFluidType( TREATMENT_TYPE_T modality );                 // Set a specific fluid type
 FLUID_TYPE_T getFluidType( void );                              // Get a specific fluid type
 TREATMENT_TYPE_T getModality( void );                           // Get a specific modality