Index: dialin/squish/denaliMessages.py =================================================================== diff -u -r9bd3a42ae6a864faa467aa7a58b7c895ffaaad1c -rf2eae55355eb0b8b8df7bd7bf7a1b2ed2ca79201 --- dialin/squish/denaliMessages.py (.../denaliMessages.py) (revision 9bd3a42ae6a864faa467aa7a58b7c895ffaaad1c) +++ dialin/squish/denaliMessages.py (.../denaliMessages.py) (revision f2eae55355eb0b8b8df7bd7bf7a1b2ed2ca79201) @@ -42,6 +42,11 @@ TREATMENT_DIALYSIS_STATE = 1 +class rejectReason: + REQUEST_REJECT_REASON_UF_NOT_IN_PROGESS = 14 # Ultrafiltration is not currently in progress + REQUEST_REJECT_REASON_UF_NOT_PAUSED = 15 # Ultrafiltration is not currently paused + REQUEST_REJECT_REASON_SALINE_BOLUS_IN_PROGRESS = 16 # A saline bolus is in progress + class EResponse: Rejected = 0 Accepted = 1 @@ -458,20 +463,20 @@ waitForMessageToBeSent() -def setTreatmentAdjustUltrafiltrationAccepted(): +def setTreatmentAdjustUltrafiltrationAccepted(vState): """ a convenient method for setTreatmentAdjustUltrafiltrationStateResponse which sends accept true :return: none """ - setTreatmentAdjustUltrafiltrationStateResponse( EResponse.Accepted, 20, txStates.UF_PAUSED_STATE ) + setTreatmentAdjustUltrafiltrationStateResponse( EResponse.Accepted, 0, vState ) -def setTreatmentAdjustUltrafiltrationRejected(): +def setTreatmentAdjustUltrafiltrationRejected(vReason, vState): """ a convenient method for setTreatmentAdjustUltrafiltrationStateResponse which sends accept false :return: none """ - setTreatmentAdjustUltrafiltrationStateResponse( EResponse.Rejected, 0, txStates.UF_OFF_STATE ) + setTreatmentAdjustUltrafiltrationStateResponse( EResponse.Rejected, vReason, vState ) def buildTreatmentAdjustUltrafiltrationEditResponse(vAccepted, vReason, vVolume, vDuration, vDurationDiff, vRate, vRateDiff, vRateOld):