Index: firmware/App/Modes/ModePostTreat.h
===================================================================
diff -u -r7a7bf19d0cf16745566956f45cef57f8eb5df445 -r8466e63f95f65a3ffb18c3af85ac99328e41167b
--- firmware/App/Modes/ModePostTreat.h	(.../ModePostTreat.h)	(revision 7a7bf19d0cf16745566956f45cef57f8eb5df445)
+++ firmware/App/Modes/ModePostTreat.h	(.../ModePostTreat.h)	(revision 8466e63f95f65a3ffb18c3af85ac99328e41167b)
@@ -37,8 +37,8 @@
 {
     U32 bloodFlowRate_mL_min;                   ///< Blood flow rate (in mL/min)
     U32 dialysateFlowRate_mL_min;               ///< Dialysate flow rate (in mL/min)
-    U32 treatmentDuration_min;                  ///< Selected treatment duration (in min)
-    U32 actualTreatmentDur_min;                 ///< Actual treatment duration (in min)
+    U32 treatmentDuration_sec;                  ///< Selected treatment duration (in sec)
+    U32 actualTreatmentDur_sec;                 ///< Actual treatment duration (in sec)
 
     U32 acidConcentrate;                        ///< Acid concentrate option
     U32 bicarbConcentrate;                      ///< Bicarbonate concentrate option
@@ -49,7 +49,8 @@
 
     F32 dialysateTemperature_degC;              ///< Dialysate temperature (in deg C)
     U32 dialyzerType;                           ///< Dialyzer type option
-    U32 treatmentDateAndTime;                   ///< Treatment date and time in epoch time (in seconds)
+    U32 treatmentStartDateAndTime;              ///< Treatment start date and time in epoch time (in seconds)
+    U32 treatmentEndDateAndTime;                ///< Treatment end date and time in epoch time (in seconds)
 
     F32 avgBloodFlow_mL_min;                    ///< Average blood flow rate during treatment (in mL/min)
     F32 avgDialysateFlow_mL_min;                ///< Average dialysate flow rate during treatment (in mL/min)
@@ -62,8 +63,6 @@
     F32 actualUFRate_mL_min;                    ///< Actual ultrafiltration rate (in mL/min)
 
     U32 salineBolusVolume_mL;                   ///< Saline bolus volume (in mL)
-    U32 heparinType;                            ///< Heparin type
-    U32 heparinConcentration_IU_mL;             ///< Heparin concentration (in IU/mL)
     F32 heparinBolusVolume_mL;                  ///< Heparin bolus volume (in mL)
     F32 heparinDispenseRate_mL_hr;              ///< Heparin dispense rate (in mL/hr)
     U32 heparinPreStop_min;                     ///< Heparin pre-stop time (in min)
@@ -72,7 +71,6 @@
     F32 avgArterialPressure_mmHg;               ///< Average arterial pressure (in mmHg)
     F32 avgVenousPressure_mmHg;                 ///< Average venous pressure (in mmHg)
 
-    U32 endTreatmentEarlyAlarm;                 ///< Alarm that causes treatment to end early
     U32 deviceID;                               ///< Serial number or UID
     U32 waterSampleTestResult;                  ///< Pass or fail
 } TREATMENT_LOG_DATA_PAYLOAD_T;
@@ -83,7 +81,9 @@
 void transitionToPostTreatmentMode( void );                         // Prepares for transition to post-treatment mode
 U32  execPostTreatmentMode( void );                                 // Execute the post-treatment mode state machine (call from OperationModes)
 
-void handleTreatmentLogDataRequest( void );
+void collectTreatmentLogData( void );
+void sendTreatmentLogDataToUI( void );
+
 void signalUserConfirmPatientDisconnection( void );
 void signalUserConfirmDisposableRemoval( void );
 void signalAlarmActionToPostTreatmentMode( ALARM_ACTION_T action ); // Execute alarm action as appropriate for post-treatment mode