Index: dialin/squish/denaliMessages.py =================================================================== diff -u -r8f34fae7dbbda912cc004214573187ba8ed4660f -r79bba98a0f081de37d1e9fa4a0b481cf381fffd5 --- dialin/squish/denaliMessages.py (.../denaliMessages.py) (revision 8f34fae7dbbda912cc004214573187ba8ed4660f) +++ dialin/squish/denaliMessages.py (.../denaliMessages.py) (revision 79bba98a0f081de37d1e9fa4a0b481cf381fffd5) @@ -86,8 +86,8 @@ AdjustUltrafiltrationConfirmReq = 21 AdjustUltrafiltrationConfirmRsp = 46 - AdjustArterialVenousLimitsReq = 70 - AdjustArterialVenousLimitsRsp = 71 + AdjustPressuresLimitsReq = 70 + AdjustPressuresLimitsRsp = 71 TreatmentRanges = 26 @@ -384,7 +384,7 @@ waitForMessageToBeSent() -def buildTreatmentAdjustArterialVenousLimitsResponse(vAccepted, vReason, vArterialLow, vArterialHigh, vVenousLow, vVenousHigh): +def buildTreatmentAdjustPressuresLimitsResponse(vAccepted, vReason, vArterialLow, vArterialHigh, vVenousLow, vVenousHigh): """ the Blood/dialysate rate change Response message builder method | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | #1:(U32) | #2:(U32) | #3:(S32) | #4:(S32) | #3:(S32) | #4:(S32) | @@ -398,7 +398,7 @@ :param mVenousHigh: (int) Venous Pressure Limit High (mmHg) :return: (str) built message frame(s) """ - msg = messageBuilder.buildMessage(GuiActionType.AdjustArterialVenousLimitsRsp, 6 * 4, True, + msg = messageBuilder.buildMessage(GuiActionType.AdjustPressuresLimitsRsp, 6 * 4, True, utils.toI32(vAccepted), utils.toI32(vReason), utils.toI32(vArterialLow), @@ -409,7 +409,7 @@ return messageBuilder.toFrames(msg) -def sendTreatmentAdjustArterialVenousLimitsResponse(vAccepted, vReason, vArterialLow, vArterialHigh, vVenousLow, vVenousHigh): +def sendTreatmentAdjustPressuresLimitsResponse(vAccepted, vReason, vArterialLow, vArterialHigh, vVenousLow, vVenousHigh): """ the Blood/dialysate rate change Response message setter/sender method :param vAccepted: (int) boolean accept/reject response @@ -420,7 +420,7 @@ :param mVenousHigh: (int) Venous Pressure Limit High (mmHg) :return: none """ - frames = buildTreatmentAdjustArterialVenousLimitsResponse(vAccepted, vReason, vArterialLow, vArterialHigh, vVenousLow, vVenousHigh) + frames = buildTreatmentAdjustPressuresLimitsResponse(vAccepted, vReason, vArterialLow, vArterialHigh, vVenousLow, vVenousHigh) frames = messageBuilder.toCandumpFormat(frames) for frame in frames: subprocess.call(['cansend', 'can0', '020#{}'.format(frame)])