Index: dialin/hd/dialysate_outlet_flow.py =================================================================== diff -u -rcb130637058af1a50ece54c74965099f3ac4a9b1 -r4bee32def1d9ae6146cead4cadff5afd41e90a11 --- dialin/hd/dialysate_outlet_flow.py (.../dialysate_outlet_flow.py) (revision cb130637058af1a50ece54c74965099f3ac4a9b1) +++ dialin/hd/dialysate_outlet_flow.py (.../dialysate_outlet_flow.py) (revision 4bee32def1d9ae6146cead4cadff5afd41e90a11) @@ -55,6 +55,8 @@ self.dialysate_outlet_pump_calc_rate = 0.0 self.uf_calculated_rate = 0.0 self.rotor_hall_state = 0 + self.uf_set_rate = 0.0 + self.dialysate_outlet_pump_state = 0 self.hd_dial_outlet_flow_timestamp = 0.0 @@ -120,6 +122,22 @@ """ return self.rotor_hall_state + def get_uf_set_rate(self): + """ + Gets the prescribed UF set rate. + + @return: the prescribed UF set rate + """ + return self.uf_set_rate + + def get_dial_outlet_pump_state(self): + """ + Gets the dialysate outlet pump state. + + @return: the current dialysate outlet pump state (0 = Pump Off, 1 = Ramp up, 2 = Ramp down, 3 = Control to Target) + """ + return self.dialysate_outlet_pump_state + @publish([ "hd_dial_outlet_flow_timestamp", "reference_dialysate_outlet_uf_volume", @@ -132,7 +150,9 @@ "dialysate_outlet_pump_calc_rate", "uf_calculated_rate", "pwm_duty_cycle_pct", - "rotor_hall_state" + "rotor_hall_state", + "uf_set_rate", + "dialysate_outlet_pump_state" ]) def _handler_dialysate_outlet_flow_sync(self, message, timestamp=0.0): """ @@ -165,6 +185,10 @@ message['message'][MsgFieldPositions.START_POS_FIELD_10:MsgFieldPositions.END_POS_FIELD_10])) hal = struct.unpack('I', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_11:MsgFieldPositions.END_POS_FIELD_11])) + ufsrate = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_12:MsgFieldPositions.END_POS_FIELD_12])) + dopstate = struct.unpack('I', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_13:MsgFieldPositions.END_POS_FIELD_13])) self.reference_dialysate_outlet_uf_volume = refvol[0] self.measured_dialysate_outlet_uf_volume = measvol[0] @@ -177,6 +201,8 @@ self.dialysate_outlet_pump_calc_rate = dopcrate[0] self.uf_calculated_rate = ufcrate[0] self.rotor_hall_state = hal[0] + self.uf_set_rate = ufsrate[0] + self.dialysate_outlet_pump_state = dopstate[0] self.hd_dial_outlet_flow_timestamp = timestamp def cmd_dialysate_outlet_flow_set_point_override(self,