Index: dialin/dg/dialysate_flow_sensor.py =================================================================== diff -u -r5ec51022d4c81fba0406aecfbb9b5cdfe4f7d068 -r920d1a0826639951cd7f6cfa07b41dc175083043 --- dialin/dg/dialysate_flow_sensor.py (.../dialysate_flow_sensor.py) (revision 5ec51022d4c81fba0406aecfbb9b5cdfe4f7d068) +++ dialin/dg/dialysate_flow_sensor.py (.../dialysate_flow_sensor.py) (revision 920d1a0826639951cd7f6cfa07b41dc175083043) @@ -56,7 +56,6 @@ self.can_interface.register_receiving_publication_function(channel_id, MsgIds.MSG_ID_DG_FLOW_SENSORS_DATA.value, self._handler_flow_sensors_sync) - def get_flow_rate(self): """ Gets a flow value from the sensor Index: dialin/dg/reservoirs.py =================================================================== diff -u -r9790d4c89a67940465d74dc98ee13834bee8565c -r920d1a0826639951cd7f6cfa07b41dc175083043 --- dialin/dg/reservoirs.py (.../reservoirs.py) (revision 9790d4c89a67940465d74dc98ee13834bee8565c) +++ dialin/dg/reservoirs.py (.../reservoirs.py) (revision 920d1a0826639951cd7f6cfa07b41dc175083043) @@ -166,5 +166,5 @@ message['message'][MsgFieldPositions.START_POS_FIELD_10:MsgFieldPositions.END_POS_FIELD_10]))[0] self.temp_last_fill = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_11:MsgFieldPositions.END_POS_FIELD_11]))[0] - self.time_rsrvr_fill= struct.unpack('f', bytearray( + self.time_rsrvr_fill = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_12:MsgFieldPositions.END_POS_FIELD_12]))[0] Index: dialin/hd/calibration_record.py =================================================================== diff -u -r4c63e5617400d2246d2e0290a9c63da4defbb2fc -r920d1a0826639951cd7f6cfa07b41dc175083043 --- dialin/hd/calibration_record.py (.../calibration_record.py) (revision 4c63e5617400d2246d2e0290a9c63da4defbb2fc) +++ dialin/hd/calibration_record.py (.../calibration_record.py) (revision 920d1a0826639951cd7f6cfa07b41dc175083043) @@ -393,7 +393,7 @@ @return: temperature sensors hardware group dictionary and the byte size of this hardware group """ - hardware_names = ['onboard_ntc', 'power_supply_1', 'fpga_board', 'venous_pres', 'pba_adc'] + hardware_names = ['onboard_ntc', 'power_supply_1', 'fpga_board', 'venous_pres', 'pba_adc', 'arterial_pres'] group_byte_size = 0 group_name = 'temperature_sensors' Index: tests/dg_tests.py =================================================================== diff -u -r5ec51022d4c81fba0406aecfbb9b5cdfe4f7d068 -r920d1a0826639951cd7f6cfa07b41dc175083043 --- tests/dg_tests.py (.../dg_tests.py) (revision 5ec51022d4c81fba0406aecfbb9b5cdfe4f7d068) +++ tests/dg_tests.py (.../dg_tests.py) (revision 920d1a0826639951cd7f6cfa07b41dc175083043) @@ -113,7 +113,7 @@ def get_dg_reservoirs_info(): info = ('Time_rsrvr_cycle, {}, Time_rsrvr_fill_2_switch, {}, Time_uf_decay, {:5.3f}, Temp_uf_fill, {:5.3f}, ' 'Temp_rsrvr_use_actual, {:5.3f}, Temp_rsrvr_end_fill, {:5.3}, Temp_avg_fill, {:5.3f}, ' - 'Temp_last_fill, {:5.3f}, Time_rsrvr_fill, ' + 'Temp_last_fill, {:5.3f}, Time_rsrvr_fill, {:5.3f}, ' .format(dg.reservoirs.time_reservoir_cycle, dg.reservoirs.time_reservoir_fill_2_switch, dg.reservoirs.time_uf_decay, dg.reservoirs.temp_uf_fill, dg.reservoirs.temp_reservoir_use_actual, dg.reservoirs.temp_reservoir_end_fill, dg.reservoirs.temp_avg_fill, dg.reservoirs.temp_last_fill, @@ -203,7 +203,7 @@ .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.primary_heaters_target_temperature, + dg.heaters.primary_efficiency, dg.heaters.primary_calc_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])) @@ -609,11 +609,11 @@ dg.concentrate_pumps.cmd_concentrate_pump_state_change_request(0, True) sleep(1) - dg.concentrate_pumps.cmd_concentrate_pump_state_change_request(1, True) - sleep(1) - dg.concentrate_pumps.cmd_concentrate_pump_target_speed_override(0, 20) - sleep(1) - dg.concentrate_pumps.cmd_concentrate_pump_target_speed_override(1, 20) + #dg.concentrate_pumps.cmd_concentrate_pump_state_change_request(1, True) + # sleep(1) + dg.concentrate_pumps.cmd_concentrate_pump_target_speed_override(0, 35) + #sleep(1) + #dg.concentrate_pumps.cmd_concentrate_pump_target_speed_override(1, 20) try: while True: @@ -625,6 +625,22 @@ dg.concentrate_pumps.cmd_concentrate_pump_state_change_request(1, False) +def test_hd_valves(): + while True: + + #VALVE_POSITION_A_INSERT_EJECT = 1 + #VALVE_POSITION_B_OPEN = 2 + #VALVE_POSITION_C_CLOSE = 3 + # + + hd.valves.cmd_set_hd_valve_position(3,3) + sleep(2) + hd.valves.cmd_set_hd_valve_position(3,2) + sleep(2) + hd.valves.cmd_set_hd_valve_position(3,1) + sleep(2) + + if __name__ == "__main__": dg = DG(log_level='DEBUG') dg.cmd_log_in_to_dg() @@ -641,7 +657,7 @@ # cmd_set_disinfect_ui_screen() - collect_treatment_data() + #collect_treatment_data() #collect_hd_treatment() @@ -657,9 +673,12 @@ #test_dvt_drain_pump() - #test_conc_pumps() + test_conc_pumps() #ui = HDSimulator() #ui.cmd_send_hd_operation_mode(3, 1) + #test_hd_valves() + + Index: tests/hd_nvm_scripts.py =================================================================== diff -u -r5ec51022d4c81fba0406aecfbb9b5cdfe4f7d068 -r920d1a0826639951cd7f6cfa07b41dc175083043 --- tests/hd_nvm_scripts.py (.../hd_nvm_scripts.py) (revision 5ec51022d4c81fba0406aecfbb9b5cdfe4f7d068) +++ tests/hd_nvm_scripts.py (.../hd_nvm_scripts.py) (revision 920d1a0826639951cd7f6cfa07b41dc175083043) @@ -55,7 +55,7 @@ # Use cmd_set_hd_calibration_excel_to_fw() set the changes back to firmware # This function requires an address for the excel report. Use the absolute address of your excel report like the # example below - hd.calibration_record.cmd_set_hd_calibration_excel_to_fw('/home/fw/projects/HD_NV_Records/2022-07-20-HD-Record.xlsx') + hd.calibration_record.cmd_set_hd_calibration_excel_to_fw('/home/fw/projects/HD_NV_Records/2022-07-26-HD-Record.xlsx') # For resetting the calibration record to benign values, use the function below #hd.calibration_record.cmd_reset_hd_calibration_record() @@ -68,8 +68,8 @@ if hd.cmd_log_in_to_hd(): # Comment this function if not needed - run_sw_configs_commands() + #run_sw_configs_commands() # Comment this function if not needed - #run_calibration_commands() + run_calibration_commands() Index: tests/test_flush.py =================================================================== diff -u -r3a70bfb451b74106348c064c34f19934aadd9119 -r920d1a0826639951cd7f6cfa07b41dc175083043 --- tests/test_flush.py (.../test_flush.py) (revision 3a70bfb451b74106348c064c34f19934aadd9119) +++ tests/test_flush.py (.../test_flush.py) (revision 920d1a0826639951cd7f6cfa07b41dc175083043) @@ -110,7 +110,7 @@ complete_counter = 1 f = open("/home/fw/projects/dialin/tests/flush_mode.log", "w") - #dg.hd_proxy.cmd_start_stop_dg_flush() + dg.hd_proxy.cmd_start_stop_dg_flush() #dg.cmd_dg_software_reset_request() try: