Index: dialin/hd/pressure_occlusion.py =================================================================== diff -u -rcd9d98248537d10d9cf188307ae2237c8cf8e6e4 -r1d827991f6c7bff31397413562b3db994d6062be --- dialin/hd/pressure_occlusion.py (.../pressure_occlusion.py) (revision cd9d98248537d10d9cf188307ae2237c8cf8e6e4) +++ dialin/hd/pressure_occlusion.py (.../pressure_occlusion.py) (revision 1d827991f6c7bff31397413562b3db994d6062be) @@ -45,14 +45,14 @@ self.arterial_pressure = 0 self.venous_pressure = 0.0 - self.blood_pump_occlusion = 0.0 - self.dialysate_inlet_pump_occlusion = 0.0 - self.dialysate_outlet_pump_occlusion = 0.0 + self.blood_pump_occlusion = 0 + self.dialysate_inlet_pump_occlusion = 0 + self.dialysate_outlet_pump_occlusion = 0 def get_arterial_pressure(self): """ Gets the arterial pressure. - @return: (int) The arterial pressure + @return: (float) The arterial pressure """ return self.arterial_pressure @@ -68,23 +68,23 @@ """ Gets the blood pump occlusion - @return: (float) The blood pump occlusion + @return: (int) The blood pump occlusion """ return self.blood_pump_occlusion def get_dialysate_inlet_pump_occlusion(self): """ Gets the dialysate inlet pump occlusion - @return: (float)The dialysate inlet pump occlusion + @return: (int)The dialysate inlet pump occlusion """ return self.dialysate_inlet_pump_occlusion def get_dialysate_outlet_pump_occlusion(self): """ Gets the dialysate outlet pump occlusion - @return: (float)The dialysate outlet pump occlusion + @return: (int)The dialysate outlet pump occlusion """ return self.dialysate_outlet_pump_occlusion @@ -108,11 +108,11 @@ message['message'][MsgFldPositions.START_POS_FIELD_1:MsgFldPositions.END_POS_FIELD_1])) ven = struct.unpack('f', bytearray( message['message'][MsgFldPositions.START_POS_FIELD_2:MsgFldPositions.END_POS_FIELD_2])) - bp = struct.unpack('f', bytearray( + bp = struct.unpack('i', bytearray( message['message'][MsgFldPositions.START_POS_FIELD_3:MsgFldPositions.END_POS_FIELD_3])) - dpi = struct.unpack('f', bytearray( + dpi = struct.unpack('i', bytearray( message['message'][MsgFldPositions.START_POS_FIELD_4:MsgFldPositions.END_POS_FIELD_4])) - dpo = struct.unpack('f', bytearray( + dpo = struct.unpack('i', bytearray( message['message'][MsgFldPositions.START_POS_FIELD_5:MsgFldPositions.END_POS_FIELD_5])) self.arterial_pressure = art[0] @@ -204,13 +204,13 @@ Constraints: Must be logged into HD. - @param occl: float - pressure (in mmHg) to override with + @param occl: integer - pressure (in counts) to override with @param reset: integer - 1 to reset a previous override, 0 to override @return: 1 if successful, zero otherwise """ rst = integer_to_bytearray(reset) - occ = float_to_bytearray(occl) + occ = integer_to_bytearray(occl) payload = rst + occ message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, @@ -243,13 +243,13 @@ Constraints: Must be logged into HD. - @param occl: float - pressure (in mmHg) to override with + @param occl: integer - pressure (in counts) to override with @param reset: integer - 1 to reset a previous override, 0 to override @return: 1 if successful, zero otherwise """ rst = integer_to_bytearray(reset) - occ = float_to_bytearray(occl) + occ = integer_to_bytearray(occl) payload = rst + occ message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, @@ -282,13 +282,13 @@ Constraints: Must be logged into HD. - @param occl: float - pressure (in mmHg) to override with + @param occl: integer - pressure (in counts) to override with @param reset: integer - 1 to reset a previous override, 0 to override @return: 1 if successful, zero otherwise """ rst = integer_to_bytearray(reset) - occ = float_to_bytearray(occl) + occ = integer_to_bytearray(occl) payload = rst + occ message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,