Index: firmware/App/Modes/ModeTreatmentParams.c
===================================================================
diff -u -rf6b78d1fe6741043de38707211710ab0e8a08483 -r1f91b5a53bda942b0967817bbd5e68a499dbf816
--- firmware/App/Modes/ModeTreatmentParams.c	(.../ModeTreatmentParams.c)	(revision f6b78d1fe6741043de38707211710ab0e8a08483)
+++ firmware/App/Modes/ModeTreatmentParams.c	(.../ModeTreatmentParams.c)	(revision 1f91b5a53bda942b0967817bbd5e68a499dbf816)
@@ -1,14 +1,14 @@
 /**************************************************************************
 *
-* Copyright (c) 2020-2022 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2020-2023 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)      Michael Garthwaite
-* @date    (last)      18-Feb-2022
+* @date    (last)      19-Jan-2023
 *
 * @author  (original)  Sean Nash
 * @date    (original)  29-May-2020
@@ -59,9 +59,9 @@
     { 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=3},    {.uInt=0}    }, // TREATMENT_PARAM_ACID_CONCENTRATE
+    { CRITICAL_DATA_TYPE_U32, {.uInt=0},    {.uInt=2},    {.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=5},    {.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
@@ -170,6 +170,10 @@
         stagedParams[ param ].uInt = 0;
     }
 
+    // NOTE: the syringe pump's monitor requires these two parameters to be set to 0
+    setTreatmentParameterF32( TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME, 0.0 );
+    setTreatmentParameterF32( TREATMENT_PARAM_HEPARIN_DISPENSE_RATE, 0.0 );
+
     // Zero original parameter values
     origTreatmentParams.bloodFlowRate_mL_min = 0;
     origTreatmentParams.dialysateFlowRate_mL_min = 0;
@@ -272,6 +276,7 @@
  *************************************************************************/
 U32 execTreatParamsMode( void )
 {
+    HD_TREATMENT_PARAMS_MODE_STATE_T priorSubState = currentTreatmentParamsState;
     BOOL stop = isStopButtonPressed();
 
     if ( TRUE == stop )
@@ -300,6 +305,11 @@
 
     }
 
+    if ( priorSubState != currentTreatmentParamsState )
+    {
+        SEND_EVENT_WITH_2_U32_DATA( HD_EVENT_SUB_STATE_CHANGE, priorSubState, currentTreatmentParamsState );
+    }
+
     return (U32)currentTreatmentParamsState;
 }
 
@@ -714,7 +724,7 @@
 
     memcpy( &respPayload[0], &reasons[0], sizeof(TREATMENT_PARAMS_DATA_PAYLOAD_T) );
 
-    sendTreatmentParametersResponseMsg( accepted, (U08*)(&respPayload[0]), ( NUM_OF_TREATMENT_PARAMS - 1 ) * sizeof(U32) ); // UF vol. param not included in reject reasons
+    sendTreatmentParametersResponseMsg( accepted, (U08*)(&respPayload[0]), ( NUM_OF_TREATMENT_PARAMS - 1 ) ); // UF vol. param not included in reject reasons
 }
 
 /*********************************************************************//**