Index: firmware/App/Modes/ModePostTreat.c =================================================================== diff -u -re63c54262fd4ccd8ffd9ef9bb49e66458893528f -r40e0116bbada6d1780bfa832a9c4684ba9fcfcc8 --- firmware/App/Modes/ModePostTreat.c (.../ModePostTreat.c) (revision e63c54262fd4ccd8ffd9ef9bb49e66458893528f) +++ firmware/App/Modes/ModePostTreat.c (.../ModePostTreat.c) (revision 40e0116bbada6d1780bfa832a9c4684ba9fcfcc8) @@ -203,19 +203,6 @@ /*********************************************************************//** * @brief - * The setTreatmentDateTime sets treatment date and time to treatment log. - * @details Inputs: treatmentLogData - * @details Outputs: Sent treatment log data to UI - * @param dateTime date and time to save to treatment log - * @return none - *************************************************************************/ -void setTreatmentDateTime( U32 dateTime ) -{ - treatmentLogData.treatmentDateAndTime = dateTime; -} - -/*********************************************************************//** - * @brief * The signalUserConfirmPatientDisconnection signals post-treatment mode * user has confirmed patient disconnection. * @details Inputs: none @@ -423,16 +410,16 @@ // treatmentLogData.avgDialysateTemperature_degC; treatmentLogData.targetUFVolume_L = getTreatmentParameterF32( TREATMENT_PARAM_UF_VOLUME ); - treatmentLogData.actualUFVolume_L = getTotalMeasuredUFVolumeInMl(); + treatmentLogData.actualUFVolume_L = getUltrafiltrationVolumeCollected(); treatmentLogData.targetUFRate_mL_min = getTreatmentParameterF32( TREATMENT_PARAM_UF_VOLUME ) * ML_PER_LITER / treatmentLogData.treatmentDuration_min; - treatmentLogData.actualUFRate_mL_min = getTotalMeasuredUFVolumeInMl() / treatmentLogData.actualTreatmentDur_min; -// treatmentLogData.salineBolusVolume_mL; + treatmentLogData.actualUFRate_mL_min = getUltrafiltrationVolumeCollected() / treatmentLogData.actualTreatmentDur_min; + treatmentLogData.salineBolusVolume_mL = getTotalSalineBolusVolumeDelivered(); // treatmentLogData.heparinType; treatmentLogData.heparinBolusVolume_mL = getTreatmentParameterF32( TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME ); treatmentLogData.heparinDispenseRate_mL_hr = getTreatmentParameterF32( TREATMENT_PARAM_HEPARIN_DISPENSE_RATE ); treatmentLogData.heparinPreStop_min = getTreatmentParameterU32( TREATMENT_PARAM_HEPARIN_PRE_STOP_TIME ); -// treatmentLogData.heparinDeliveredVolume_mL; + treatmentLogData.heparinDeliveredVolume_mL = getSyringePumpVolumeDelivered(); // treatmentLogData.endTreatmentEarlyAlarm; // treatmentLogData.deviceID;