Index: dialin/ui/hd_simulator.py =================================================================== diff -u -r7c40736c7dd4ead43359fe9a26af72e827004aa4 -r979a84608c047c3bb83f2b419f925e424304f75a --- dialin/ui/hd_simulator.py (.../hd_simulator.py) (revision 7c40736c7dd4ead43359fe9a26af72e827004aa4) +++ dialin/ui/hd_simulator.py (.../hd_simulator.py) (revision 979a84608c047c3bb83f2b419f925e424304f75a) @@ -887,8 +887,13 @@ self.cmd_set_pressure_occlusion_data(arterial_prs=self.arterial_pressure_mmHg, venous_prs=self.venous_pressure_mmHg, blood_pump_occlusion=0, - dialysate_inlet_pump_occlusion=0, - dialysate_outlet_pump_occlusion=0) + pressure_limit_state=0, + arterial_min_limt=0, #MG: Pressure limits need to be updated + arterial_max_limt=0, # What about window stabilization? + venous_min_limit=0, + venous_max_limit=0, + arterial_long_filtered_pressure=0, + venous_long_filtered_pressure=0 ) ## DIALYSIS GROUP ------------------------------------------------- @@ -940,7 +945,8 @@ self.cmd_set_treatment_blood_flow_rate(flow_set_pt=self.blood_flow_set_point_ml_per_min, measured_flow=self.blood_flow_measured_ml_per_min, rot_speed=0, mot_speed=0, mc_speed=0, - mc_current=0, pwm=0, rotor_count=0) + mc_current=0, pwm=0, rotor_count=0, + pres_flow=0, rotor_hall=0) # MSG_ID_DIALYSATE_FLOW_DATA self.dialysate_flow_measured_ml_per_min += (random() - 0.5) * 5 # TBD! replace magic numbers @@ -952,7 +958,10 @@ mot_speed=0.0, mc_speed=0.0, mc_current=0.0, - pwm=0.0) + pwm=0.0, + rotor_count=0, + presFlow=0, + rotorHall=0) # MSG_ID_PRESSURE_OCCLUSION_DATA self.arterial_pressure_mmHg += (random() - 0.5) * 10 # TBD! replace magic wander numbers @@ -964,8 +973,13 @@ self.cmd_set_pressure_occlusion_data(arterial_prs=self.arterial_pressure_mmHg, venous_prs=self.venous_pressure_mmHg, blood_pump_occlusion=0, - dialysate_inlet_pump_occlusion=0, - dialysate_outlet_pump_occlusion=0) + pressure_limit_state=0, + arterial_min_limt=0, #MG: Pressure limits need to be updated + arterial_max_limt=0, # What about window stabilization? + venous_min_limit=0, + venous_max_limit=0, + arterial_long_filtered_pressure=0, + venous_long_filtered_pressure=0 ) # MSG_ID_RTC_EPOCH # tbd! @@ -979,7 +993,9 @@ self.cmd_set_treatment_ultrafiltration_outlet_flow_data(ref_uf_vol=self.uf_volume_out_l * 1000.0, measured_uf_vol=self.uf_volume_set_l * 1000.0, rot_speed=0.0, mot_speed=0.0, mc_speed=0.0, - mc_current=0.0, pwm=0.0) + mc_current=0.0, pwm=0.0, corr_offset=0.0, + pump_calculated_rate=0.0, uf_calculated_rate=0.0, + rotor_hall=0) # MSG_ID_LOAD_CELL_READINGS @@ -1736,7 +1752,7 @@ def cmd_set_treatment_blood_flow_rate(self, flow_set_pt: int, measured_flow: float, rot_speed: float, mot_speed: float, mc_speed: float, mc_current: float, pwm: float, rotor_count: int, - presFlow: int, rotorHall: int) -> None: + pres_flow: int, rotor_hall: int) -> None: """ The Blood Flow Data message setter/sender method @@ -1752,8 +1768,8 @@ @param mc_current: (float) MC Current @param pwm: (float) PWM @param rotor_count: (int) Rotor Count - @param presFlow: (int) Prescribed Blood Flow - @param rotorHall: (int) RotorHall sensor + @param pres_flow: (int) Prescribed Blood Flow + @param rotor_hall: (int) Rotor Hall sensor @return: None """ @@ -1765,8 +1781,8 @@ payload += float_to_bytearray(mc_current) payload += float_to_bytearray(pwm) payload += integer_to_bytearray(rotor_count) - payload += integer_to_bytearray(presFlow) - payload += integer_to_bytearray(rotorHall) + payload += integer_to_bytearray(pres_flow) + payload += integer_to_bytearray(rotor_hall) message = DenaliMessage.build_message(channel_id=DenaliChannels.hd_sync_broadcast_ch_id, message_id=MsgIds.MSG_ID_BLOOD_FLOW_DATA.value,