Index: dialin/hd/ui_proxy.py =================================================================== diff -u -r793aef3c5d08f4c38d44a7c4d881c8f297a84801 -ra83e5728833f7b1ccdfad4b0b3eb3ea40f670d1d --- dialin/hd/ui_proxy.py (.../ui_proxy.py) (revision 793aef3c5d08f4c38d44a7c4d881c8f297a84801) +++ dialin/hd/ui_proxy.py (.../ui_proxy.py) (revision a83e5728833f7b1ccdfad4b0b3eb3ea40f670d1d) @@ -156,8 +156,8 @@ # initialize variables that will be populated by treatment parameter ranges message self.min_treatment_duration_min = 0 self.max_treatment_duration_min = 0 - self.min_uf_volume_ml = 0 - self.max_uf_volume_ml = 0 + self.min_uf_volume_ml = 0.0 + self.max_uf_volume_ml = 0.0 self.min_dialysate_flow_rate_ml_min = 0 self.max_dialysate_flow_rate_ml_min = 0 # initialize variables that will be populated by response from HD to treatment duration change request @@ -168,7 +168,7 @@ # initialize variables that will be populated by response from HD to UF change request self.uf_change_succeeded = False self.uf_change_reject_reason = 0 - self.uf_change_volume_ml = 0 + self.uf_change_volume_ml = 0.0 self.uf_change_time_min = 0 self.uf_change_rate_ml_min = 0.0 self.uf_change_time_diff = 0 @@ -213,8 +213,8 @@ \param message: response message from HD regarding valid treatment parameter ranges.\n U32 Minimum treatment duration setting (in min.). \n U32 Maximum treatment duration setting (in min.). \n - U32 Minimum ultrafiltration volume (in mL). \n - U32 Maximum ultrafiltration volume (in mL). \n + F32 Minimum ultrafiltration volume (in mL). \n + F32 Maximum ultrafiltration volume (in mL). \n U32 Minimum dialysate flow rate (in mL/min). \n U32 Maximum dialysate flow rate (in mL/min). @@ -224,9 +224,9 @@ message['message'][self.START_POS_MIN_TREAT_TIME:self.END_POS_MIN_TREAT_TIME])) maxtime = struct.unpack('i', bytearray( message['message'][self.START_POS_MAX_TREAT_TIME:self.END_POS_MAX_TREAT_TIME])) - minufvol = struct.unpack('i', bytearray( + minufvol = struct.unpack('f', bytearray( message['message'][self.START_POS_MIN_UF_VOL:self.END_POS_MIN_UF_VOL])) - maxufvol = struct.unpack('i', bytearray( + maxufvol = struct.unpack('f', bytearray( message['message'][self.START_POS_MAX_UF_VOL:self.END_POS_MAX_UF_VOL])) mindialrt = struct.unpack('i', bytearray( message['message'][self.START_POS_MIN_DIAL_RATE:self.END_POS_MIN_DIAL_RATE])) @@ -248,7 +248,7 @@ BOOL Accepted \n U32 Reject reason (if not accepted) \n U32 treatment duration (min) \n - U32 UF volue (mL) \n + F32 UF volue (mL) \n \returns none """ @@ -258,7 +258,7 @@ message['message'][self.START_POS_TIME_CHG_RSP_REASON:self.END_POS_TIME_CHG_RSP_REASON])) tim = struct.unpack('i', bytearray( message['message'][self.START_POS_TIME_CHG_RSP_TIME:self.END_POS_TIME_CHG_RSP_TIME])) - vol = struct.unpack('i', bytearray( + vol = struct.unpack('f', bytearray( message['message'][self.START_POS_TIME_CHG_RSP_UF_VOL:self.END_POS_TIME_CHG_RSP_UF_VOL])) self.duration_change_succeeded = rsp[0]