Index: firmware/App/Modes/ModeTreatment.c
===================================================================
diff -u -r8a18b5d1fb4598c6b7facb3e7e233252941eaded -r3477dd649f67442ad4bdea810ce5a251c1b0a2bf
--- firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 8a18b5d1fb4598c6b7facb3e7e233252941eaded)
+++ firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 3477dd649f67442ad4bdea810ce5a251c1b0a2bf)
@@ -1,18 +1,19 @@
-/**********************************************************************//**
- *
- *  Copyright (c) 2019-2020 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 ModeTreatment.c
- *
- *  @date 19-Sep-2019
- *  @author S. Nash
- *
- *  @brief Top-level state machine for the treatment mode.
- *
- **************************************************************************/
+/**************************************************************************
+*
+* Copyright (c) 2019-2020 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 ModeTreatment.c
+*
+* @author (last) Sean Nash
+* @date (last) 02-Jul-2020
+*
+* @author (original) Dara Navaei
+* @date (original) 05-Nov-2019
+*
+***************************************************************************/
 
 #include "AlarmLamp.h"
 #include "BloodFlow.h"
@@ -225,7 +226,7 @@
             break;
 
         default:
-            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, SW_FAULT_ID_MODE_TREATMENT_INVALID_STATE, currentTreatmentState );
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_MODE_TREATMENT_INVALID_STATE, currentTreatmentState );
             currentTreatmentState = TREATMENT_END_STATE;
             break;
     }
@@ -555,7 +556,6 @@
     BOOL result = FALSE;
     REQUEST_REJECT_REASON_CODE_T rejectReason = REQUEST_REJECT_REASON_NONE;
     HD_OP_MODE_T currMode = getCurrentOperationMode();
-    F32 oldUFRate = presUFRate;
 
     // user confirmed UF settings change(s)?
     if ( ( MODE_TREA == currMode ) && ( FALSE == didTimeout( pendingParamChangesTimer, USER_CONFIRM_CHANGE_TIMEOUT_MS ) ) )
@@ -691,7 +691,7 @@
         U32 timeRemaining = presTreatmentTimeSecs - elapsedTreatmentTimeInSecs;
         DIALYSIS_STATE_T dialysisState = getDialysisState();
         UF_STATE_T uFState = getUltrafiltrationState();
-        BOOL salineBolusInProgress = ( dialysisState == DIALYSIS_SOLUTION_INFUSION_STATE ? TRUE : FALSE );
+        BOOL salineBolusInProgress = ( dialysisState == DIALYSIS_SALINE_BOLUS_STATE ? TRUE : FALSE );
 
         broadcastTreatmentTime( presTreatmentTimeSecs, elapsedTreatmentTimeInSecs, timeRemaining );
         broadcastTreatmentState( currentTreatmentState, uFState, salineBolusInProgress );