Index: firmware/App/Modes/ModeTreatment.c
===================================================================
diff -u -reef41b7363d82763095a1317f1757f360f0d9ec1 -r316cb40192e5d6be69682d5c9df01d890e2c213f
--- firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision eef41b7363d82763095a1317f1757f360f0d9ec1)
+++ firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 316cb40192e5d6be69682d5c9df01d890e2c213f)
@@ -20,6 +20,7 @@
 #include "Bubbles.h"
 #include "Buttons.h"
 #include "DDInterface.h"
+#include "Messaging.h"
 #include "ModeService.h"
 #include "ModeTreatment.h"
 //#include "NVDataMgmt.h"
@@ -177,7 +178,7 @@
  *************************************************************************/
 U32 transitionToTreatmentMode( void )
 {
-//    PRESSURE_LIMIT_CHANGE_RESPONSE_T respRecord;
+    PRESSURE_LIMIT_CHANGE_RESPONSE_T respRecord;
 
     // don't re-initialize treatment if tester is jumping to Tx mode
 //    if ( getPreviousOperationMode() != MODE_PRET )
@@ -212,14 +213,17 @@
     // Direct DD to generate dialysate and bypass while priming blood
     cmdStartGenerateDialysate( (F32)getTreatmentParameterU32( TREATMENT_PARAM_DIALYSATE_FLOW ), presUFRateLHr,
                                getTreatmentParameterF32( TREATMENT_PARAM_DIALYSATE_TEMPERATURE ), TRUE,
-                               (ACID_CONCENTRATE_TYPE_T)getTreatmentParameterU32( TREATMENT_PARAM_ACID_CONCENTRATE ),
-                               (BICARB_CONCENTRATE_TYPE_T)getTreatmentParameterU32( TREATMENT_PARAM_BICARB_CONCENTRATE ) );
+                               getTreatmentParameterF32( TREATMENT_PARAM_ACID_K_PLUS ),
+                               getTreatmentParameterF32( TREATMENT_PARAM_ACID_CA2_PLUS ),
+                               getTreatmentParameterU32( TREATMENT_PARAM_SODIUM ),
+                               getTreatmentParameterU32( TREATMENT_PARAM_BICARBONATE ) );
     // Read back limits for transmit to UI.
-//    respRecord.artPresLimitWindowmmHg     = getTreatmentParameterS32( TREATMENT_PARAM_ART_PRES_LIMIT_WINDOW );
-//    respRecord.venPresLimitWindowmmHg     = getTreatmentParameterS32( TREATMENT_PARAM_VEN_PRES_LIMIT_WINDOW );
-//    respRecord.venPresLimitAsymmetricmmHg = getTreatmentParameterS32( TREATMENT_PARAM_VEN_PRES_LIMIT_ASYMMETRIC );
+    respRecord.artPresLimitWindowmmHg     = getTreatmentParameterU32( TREATMENT_PARAM_ART_PRES_LIMIT_WINDOW );
+    respRecord.venPresLimitWindowmmHg     = getTreatmentParameterU32( TREATMENT_PARAM_VEN_PRES_LIMIT_WINDOW );
+    respRecord.venPresLimitAsymmetricmmHg = getTreatmentParameterU32( TREATMENT_PARAM_VEN_PRES_LIMIT_ASYMMETRIC );
+    respRecord.tmpPresLimitWindowmmHg     = getTreatmentParameterU32( TREATMENT_PARAM_TMP_PRES_LIMIT_WINDOW );
     // Send response
-//    sendPressureLimitsChangeResponse( &respRecord );
+    sendPressureLimitsChangeResponse( &respRecord );
 
     return currentTreatmentState;
 }
@@ -512,6 +516,35 @@
 
 /*********************************************************************//**
  * @brief
+ * The sendPressureLimitsChangeResponse function constructs a change
+ * pressure limits response to the UI and queues the msg for transmit on the
+ * appropriate CAN channel.
+ * @details Inputs: none
+ * @details Outputs: Pressure limits change response msg constructed and queued.
+ * @param data response data record
+ * @return TRUE if msg successfully queued for transmit, FALSE if not
+ *************************************************************************/
+BOOL sendPressureLimitsChangeResponse( PRESSURE_LIMIT_CHANGE_RESPONSE_T *data )
+{
+    BOOL result;
+    MESSAGE_T msg;
+    U08 *payloadPtr = msg.payload;
+
+    // Create a message record
+    blankMessage( &msg );
+    msg.hdr.msgID = MSG_ID_TD_PRESSURE_LIMITS_CHANGE_RESPONSE;
+    msg.hdr.payloadLen = sizeof( PRESSURE_LIMIT_CHANGE_RESPONSE_T );
+
+    memcpy( payloadPtr, (U08*)data, sizeof( PRESSURE_LIMIT_CHANGE_RESPONSE_T ) );
+
+    // Serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer
+    result = serializeMessage( msg, COMM_BUFFER_OUT_CAN_TD_2_UI, ACK_REQUIRED );
+
+    return result;
+}
+
+/*********************************************************************//**
+ * @brief
  * The handleTreatmentStartState function handles the Start state of
  * the Treatment Mode state machine.  Should only pass through this state
  * once at very beginning of treatment.
@@ -1080,7 +1113,7 @@
     {
         SALINE_BOLUS_DATA_PAYLOAD_T data;
 
-        data.tgtSalineVolumeMl = getTreatmentParameterU32( TREATMENT_PARAM_SALINE_BOLUS_VOLUME );
+        data.tgtSalineVolumeMl = getTreatmentParameterU32( TREATMENT_PARAM_FLUID_BOLUS_VOLUME );
         data.cumSalineVolumeMl = 0.0F;  // TODO
         data.bolSalineVolumeMl = 0.0F;  // TODO