Index: dialin/common/hd_defs.py =================================================================== diff -u -r2cd826ff1f83d36140d2515d64fa38a7c66ed1e6 -r45f70ed84010200e8582a25ccd8792100f4f4fc4 --- dialin/common/hd_defs.py (.../hd_defs.py) (revision 2cd826ff1f83d36140d2515d64fa38a7c66ed1e6) +++ dialin/common/hd_defs.py (.../hd_defs.py) (revision 45f70ed84010200e8582a25ccd8792100f4f4fc4) @@ -7,8 +7,8 @@ # # @file hd_defs.py # -# @author (last) Micahel Garthwaite -# @date (last) 09-Mar-2022 +# @author (last) Dara Navaei +# @date (last) 13-May-2022 # @author (original) Peter Lucia # @date (original) 04-Dec-2020 # Index: dialin/dg/chemical_disinfect.py =================================================================== diff -u -r628a7b586e102eabed5db5bd4ab6651cd300d11c -r45f70ed84010200e8582a25ccd8792100f4f4fc4 --- dialin/dg/chemical_disinfect.py (.../chemical_disinfect.py) (revision 628a7b586e102eabed5db5bd4ab6651cd300d11c) +++ dialin/dg/chemical_disinfect.py (.../chemical_disinfect.py) (revision 45f70ed84010200e8582a25ccd8792100f4f4fc4) @@ -7,8 +7,8 @@ # # @file chemical_disinfect.py # -# @author (last) Quang Nguyen -# @date (last) 05-Aug-2021 +# @author (last) Dara Navaei +# @date (last) 14-Mar-2022 # @author (original) Dara Navaei # @date (original) 02-May-2021 # Index: dialin/dg/dialysate_generator.py =================================================================== diff -u -r41ce85a8c857a07df740da0e83b28a63bc150e15 -r45f70ed84010200e8582a25ccd8792100f4f4fc4 --- dialin/dg/dialysate_generator.py (.../dialysate_generator.py) (revision 41ce85a8c857a07df740da0e83b28a63bc150e15) +++ dialin/dg/dialysate_generator.py (.../dialysate_generator.py) (revision 45f70ed84010200e8582a25ccd8792100f4f4fc4) @@ -7,8 +7,8 @@ # # @file dialysate_generator.py # -# @author (last) Hung Nguyen -# @date (last) 25-Mar-2022 +# @author (last) Dara Navaei +# @date (last) 20-Jun-2022 # @author (original) Peter Lucia # @date (original) 02-Apr-2020 # Index: dialin/hd/alarms.py =================================================================== diff -u -r565cbfbc0d9c1441dec7c2b51cc7ce52b9e86020 -r45f70ed84010200e8582a25ccd8792100f4f4fc4 --- dialin/hd/alarms.py (.../alarms.py) (revision 565cbfbc0d9c1441dec7c2b51cc7ce52b9e86020) +++ dialin/hd/alarms.py (.../alarms.py) (revision 45f70ed84010200e8582a25ccd8792100f4f4fc4) @@ -7,8 +7,8 @@ # # @file alarms.py # -# @author (last) Dara Navaei -# @date (last) 22-Feb-2022 +# @author (last) Sean Nash +# @date (last) 31-Mar-2022 # @author (original) Peter Lucia # @date (original) 02-Apr-2020 # Index: dialin/hd/fans.py =================================================================== diff -u -r4180ef16e74251c6eb83501a396aaa9a0a892b6b -r45f70ed84010200e8582a25ccd8792100f4f4fc4 --- dialin/hd/fans.py (.../fans.py) (revision 4180ef16e74251c6eb83501a396aaa9a0a892b6b) +++ dialin/hd/fans.py (.../fans.py) (revision 45f70ed84010200e8582a25ccd8792100f4f4fc4) @@ -8,7 +8,7 @@ # @file fans.py # # @author (last) Dara Navaei -# @date (last) 01-Mar-2022 +# @date (last) 27-May-2022 # @author (original) Dara Navaei # @date (original) 04-Aug-2021 # Index: dialin/hd/hemodialysis_device.py =================================================================== diff -u -r421e18bec8df341752541768180281f7a334304c -r45f70ed84010200e8582a25ccd8792100f4f4fc4 --- dialin/hd/hemodialysis_device.py (.../hemodialysis_device.py) (revision 421e18bec8df341752541768180281f7a334304c) +++ dialin/hd/hemodialysis_device.py (.../hemodialysis_device.py) (revision 45f70ed84010200e8582a25ccd8792100f4f4fc4) @@ -7,8 +7,8 @@ # # @file hemodialysis_device.py # -# @author (last) Micahel Garthwaite -# @date (last) 09-Mar-2022 +# @author (last) Dara Navaei +# @date (last) 15-Jun-2022 # @author (original) Peter Lucia # @date (original) 02-Apr-2020 # Index: dialin/hd/pretreatment.py =================================================================== diff -u -rd6827e997b3d9a9eb5a586505802458184e1d68e -r45f70ed84010200e8582a25ccd8792100f4f4fc4 --- dialin/hd/pretreatment.py (.../pretreatment.py) (revision d6827e997b3d9a9eb5a586505802458184e1d68e) +++ dialin/hd/pretreatment.py (.../pretreatment.py) (revision 45f70ed84010200e8582a25ccd8792100f4f4fc4) @@ -7,8 +7,8 @@ # # @file pretreatment.py # -# @author (last) Quang Nguyen -# @date (last) 07-Jul-2021 +# @author (last) Dara Navaei +# @date (last) 18-Jun-2022 # @author (original) Quang Nguyen # @date (original) 02-Mar-2021 # @@ -216,6 +216,14 @@ """ return self.prime_time_countdown + def get_wet_self_test_state(self): + """ + Gets the pre-treatment wet self test state + + @return: The pre-treatment wet self test state + """ + return self.pre_treatment_wet_self_test_state + @publish([ "pre_treatment_submode", "pre_treatment_sample_water_state", @@ -237,21 +245,21 @@ @return: none """ - pt_submode = struct.unpack('i', bytearray( + self.pre_treatment_submode = struct.unpack('i', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0] - pt_sw_state = struct.unpack('i', bytearray( + self.pre_treatment_sample_water_state = struct.unpack('i', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0] - pt_consumable_st_state = struct.unpack('i', bytearray( + self.pre_treatment_consumable_self_test_state = struct.unpack('i', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0] - pt_no_cart_st_state = struct.unpack('i', bytearray( + self.pre_treatment_no_cart_self_test_state = struct.unpack('i', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0] self.pre_treatment_installation_state = struct.unpack('i', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0] - pt_dry_st_state = struct.unpack('i', bytearray( + self.pre_treatment_dry_self_test_state = struct.unpack('i', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6]))[0] - pt_prime_state = struct.unpack('i', bytearray( + self.pre_treatment_prime_state = struct.unpack('i', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7]))[0] - pt_recirc_state = struct.unpack('i', bytearray( + self.pre_treatment_recirc_state = struct.unpack('i', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8]))[0] self.pre_treatment_patient_connection_state = struct.unpack('i', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9]))[0] @@ -261,13 +269,6 @@ self.pre_treatment_reservoir_state = struct.unpack('i', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_11:MsgFieldPositions.END_POS_FIELD_11]))[0] - self.pre_treatment_submode = pt_submode - self.pre_treatment_sample_water_state = pt_sw_state - self.pre_treatment_consumable_self_test_state = pt_consumable_st_state - self.pre_treatment_no_cart_self_test_state = pt_no_cart_st_state - self.pre_treatment_dry_self_test_state = pt_dry_st_state - self.pre_treatment_prime_state = pt_prime_state - self.pre_treatment_recirc_state = pt_recirc_state @publish([ "no_cart_self_test_timeout", @@ -280,7 +281,6 @@ @param message: published no cartridge self-test progress data message @return: None """ - self.no_cart_self_test_timeout = struct.unpack('i', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0] self.no_cart_self_test_time_countdown = struct.unpack('i', bytearray( Index: tests/dg_tests.py =================================================================== diff -u -rd6827e997b3d9a9eb5a586505802458184e1d68e -r45f70ed84010200e8582a25ccd8792100f4f4fc4 --- tests/dg_tests.py (.../dg_tests.py) (revision d6827e997b3d9a9eb5a586505802458184e1d68e) +++ tests/dg_tests.py (.../dg_tests.py) (revision 45f70ed84010200e8582a25ccd8792100f4f4fc4) @@ -8,7 +8,7 @@ # @file dg_tests.py # # @author (last) Dara Navaei -# @date (last) 31-Mar-2022 +# @date (last) 20-Jun-2022 # @author (original) Dara Navaei # @date (original) 16-Jan-2022 # @@ -17,6 +17,7 @@ from dialin.dg.dialysate_generator import DG from dialin.hd.hemodialysis_device import HD +from dialin.ui.hd_simulator import HDSimulator from dialin.common.dg_defs import DGHeatDisinfectStates, DGHeatDisinfectUIStates from dialin.dg.heat_disinfect import HeatCancellationModes from dialin.common.dg_defs import DGChemicalDisinfectStates, DGChemDisinfectUIStates @@ -189,13 +190,13 @@ def get_heaters_info(): info = ('Pri_main_DC, {:5.3f}, Pri_state, {}, Trimmer_DC, {:5.3f}, Trimmer_state, {}, ' - 'Primary_target_temp, {:5.3f}, Trimmer_target_temp, {:5.3f}, Primary_eff, {:5.3f}, Dia_flow, {:5.3f}, ' - 'Interim_int_temp, {:5.3f}, Heater_RO_flow, {:5.3f}, Primary_volt, {:5.3f}, Trimmer_volt, {:5.3f}, '. + 'Primary_target_temp, {:5.3f}, Trimmer_target_temp, {:5.3f}, Primary_eff, {:5.3f}, ' + 'Primary_calc_temp, {:5.3f}, Trimmer_calc_temp, {:5.3f}, Primary_volt, {:5.3f}, Trimmer_volt, {:5.3f}, '. format(dg.heaters.main_primary_heater_duty_cycle, dg.heaters.primary_heater_state, dg.heaters.trimmer_heater_duty_cycle, dg.heaters.trimmer_heater_state, dg.heaters.primary_heaters_target_temperature, dg.heaters.trimmer_heater_target_temperature, - dg.heaters.primary_efficiency, dg.heaters.temporary_remove_flow, - dg.heaters.temporary_internal_target, dg.heaters.temporary_target_ro_flow, + dg.heaters.primary_efficiency, dg.heaters.primary_heaters_target_temperature, + dg.heaters.trimmer_calc_target_temperature, dg.voltages.monitored_voltages[DGMonitoredVoltages.MONITORED_LINE_24V_PRIM_HTR_V.value], dg.voltages.monitored_voltages[DGMonitoredVoltages.MONITORED_LINE_24V_TRIM_HTR_V.value])) return info @@ -633,17 +634,25 @@ # cmd_set_disinfect_ui_screen() - collect_treatment_data() + #collect_treatment_data() #collect_hd_treatment() # test_hd_fans_alarms() # test_dg_fans_alarms() - #while True: - # print(get_dg_fans_info()) + + dg.drain_pump.cmd_drain_pump_set_rpm(2000) + + while True: + print(get_drain_states_info(), get_temperature_sensors_info(), get_dg_fans_info()) #print(hd.hd_debug_events) - # sleep(1) + sleep(1) - #dg.ro_pump.cmd_ro_pump_measured_flow_rate_override(0.0, reset=1) + + + #ui = HDSimulator() + #ui.cmd_send_hd_operation_mode(3, 1) + +