Index: firmware/App/Modes/Dialysis.c =================================================================== diff -u -rc48ea51c06c9d002f1b9b6a1d7b72d69756f183d -r8466e63f95f65a3ffb18c3af85ac99328e41167b --- firmware/App/Modes/Dialysis.c (.../Dialysis.c) (revision c48ea51c06c9d002f1b9b6a1d7b72d69756f183d) +++ firmware/App/Modes/Dialysis.c (.../Dialysis.c) (revision 8466e63f95f65a3ffb18c3af85ac99328e41167b) @@ -442,22 +442,20 @@ * @brief * The getUltrafiltrationVolumeCollected function gets the current ultrafiltration * volume collected so far for current treatment. - * @details Inputs: measUFVolume, measUFVolumeFromPriorReservoirs + * @details Inputs: measUFVolume * @details Outputs: none * @return measUFVolume *************************************************************************/ F32 getUltrafiltrationVolumeCollected( void ) { - F32 result = measUFVolume; - - return result; + return measUFVolume; } /*********************************************************************//** * @brief * The getUltrafiltrationReferenceVolume function gets the current ultrafiltration * reference volume. - * @details Inputs: measUFVolume, measUFVolumeFromPriorReservoirs + * @details Inputs: refUFVolume * @details Outputs: none * @return refUFVolume *************************************************************************/ @@ -468,6 +466,19 @@ /*********************************************************************//** * @brief + * The getTotalSalineBolusVolumeDelivered function gets the current total + * saline volume delivered. + * @details Inputs: totalSalineVolumeDelivered + * @details Outputs: none + * @return totalSalineVolumeDelivered + *************************************************************************/ +F32 getTotalSalineBolusVolumeDelivered( void ) +{ + return totalSalineVolumeDelivered; +} + +/*********************************************************************//** + * @brief * The pauseUF function pauses ultrafiltration. * @details Inputs: currentDialysisState, currentUFState * @details Outputs: currentUFState, outlet pump set point @@ -488,6 +499,7 @@ setDialOutPumpTargetRate( setDialysateFlowRate, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_CLOSED_LOOP ); // Go to UF paused state currentUFState = UF_PAUSED_STATE; + sendTreatmentLogEventData( UF_PAUSE_RESUME_EVENT, UF_RUNNING_STATE, UF_PAUSED_STATE ); } else { @@ -539,6 +551,7 @@ lastUFTimeStamp = getMSTimerCount(); // Go to UF running state currentUFState = UF_RUNNING_STATE; + sendTreatmentLogEventData( UF_PAUSE_RESUME_EVENT, UF_PAUSED_STATE, UF_RUNNING_STATE ); } else { @@ -950,9 +963,10 @@ signalBloodPumpHardStop(); signalDialInPumpHardStop(); // Send last saline bolus data - bolusSalineVolumeDelivered = 0.0; salineBolusBroadcastTimerCtr = SALINE_BOLUS_DATA_PUB_INTERVAL; publishSalineBolusData(); + sendTreatmentLogEventData( SALINE_BOLUSES_CHANGE_EVENT, bolusSalineVolumeDelivered, totalSalineVolumeDelivered ); + bolusSalineVolumeDelivered = 0.0; // Dialysis back to UF state *dialysisState = DIALYSIS_UF_STATE; // End dialyzer bypass and resume dialysis if no alarms triggered