Index: dialin/squish/denaliMessages.py =================================================================== diff -u -rf2eae55355eb0b8b8df7bd7bf7a1b2ed2ca79201 -r1b53979cb65a132fb794e58a808fdee3e3e3a6c8 --- dialin/squish/denaliMessages.py (.../denaliMessages.py) (revision f2eae55355eb0b8b8df7bd7bf7a1b2ed2ca79201) +++ dialin/squish/denaliMessages.py (.../denaliMessages.py) (revision 1b53979cb65a132fb794e58a808fdee3e3e3a6c8) @@ -681,22 +681,22 @@ def buildPressureOcclusionData(vArterialPressure, vVenousPressure, vBloodPumpOcclusion, vDialysateInletPumpOcclusion, vDialysateOutletPumpOcclusion): """ the Pressure/Occlusion Data messages builder mehtod - | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | #1:(F32) | #2:(F32) | #3:(F32) | #4:(F32) | #5:(F32) | + | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | #1:(F32) | #2:(F32) | #3:(U32) | #4:(U32) | #5:(U32) | |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: |:--: |:--: |:--: |:--: |:--: | |0x0900| 0x040 | 7 | 1 Hz | N | HD | All | PressureOcclusion Data | \ref Data::mArterialPressure | \ref Data::mVenousPressure | \ref Data::mBloodPumpOcclusion | \ref Data::mDialysateInletPumpOcclusion | \ref Data::mDialysateOutletPumpOcclusion | :param vArterialPressure: (float) Arterial Pressure :param vVenousPressure: (float) Venous Pressure - :param vBloodPumpOcclusion: (float) Blood Pump Occlusion - :param vDialysateInletPumpOcclusion: (float) Dialysate Inlet Pump Occlusion - :param vDialysateOutletPumpOcclusion: (float) Dialysate Outlet Pump Occlusion + :param vBloodPumpOcclusion: (uint) Blood Pump Occlusion + :param vDialysateInletPumpOcclusion: (uint) Dialysate Inlet Pump Occlusion + :param vDialysateOutletPumpOcclusion: (uint) Dialysate Outlet Pump Occlusion :return: (str) built message frame(s) """ msg = messageBuilder.buildMessage( 0x0009, 4+4+4+4+4, False, utils.toF32(vArterialPressure ), utils.toF32(vVenousPressure ), - utils.toF32(vBloodPumpOcclusion ), - utils.toF32(vDialysateInletPumpOcclusion ), - utils.toF32(vDialysateOutletPumpOcclusion)) + utils.toI32(vBloodPumpOcclusion ), + utils.toI32(vDialysateInletPumpOcclusion ), + utils.toI32(vDialysateOutletPumpOcclusion)) return messageBuilder.toFrames(msg) @@ -705,9 +705,9 @@ the Pressure/Occlusion Data messages setter/sender mehtod :param vArterialPressure: (float) Arterial Pressure :param vVenousPressure: (float) Venous Pressure - :param vBloodPumpOcclusion: (float) Blood Pump Occlusion - :param vDialysateInletPumpOcclusion: (float) Dialysate Inlet Pump Occlusion - :param vDialysateOutletPumpOcclusion: (float) Dialysate Outlet Pump Occlusion + :param vBloodPumpOcclusion: (uint) Blood Pump Occlusion + :param vDialysateInletPumpOcclusion: (uint) Dialysate Inlet Pump Occlusion + :param vDialysateOutletPumpOcclusion: (uint) Dialysate Outlet Pump Occlusion :return: none """ frames = buildPressureOcclusionData(vArterialPressure, vVenousPressure, vBloodPumpOcclusion, vDialysateInletPumpOcclusion, vDialysateOutletPumpOcclusion)