Index: dialin/dg/concentrate_pumps.py =================================================================== diff -u -r7ea4b936cef531b2cde9053ae58b7119a3bf0e6c -r045cdab2571feecc53accc6aab0a2f569941d457 --- dialin/dg/concentrate_pumps.py (.../concentrate_pumps.py) (revision 7ea4b936cef531b2cde9053ae58b7119a3bf0e6c) +++ dialin/dg/concentrate_pumps.py (.../concentrate_pumps.py) (revision 045cdab2571feecc53accc6aab0a2f569941d457) @@ -67,6 +67,8 @@ self.concentrate_pump_cp2_measured_speed = 0.0 self.concentrate_pump_cp1_current_state = 0.0 self.concentrate_pump_cp2_current_state = 0.0 + self.concentrate_pump_cp1_target_speed = 0.0 + self.concentrate_pump_cp2_target_speed = 0.0 self.cp1_temp_pulse = 0.0 self.cp2_temp_pulse = 0.0 @@ -84,7 +86,8 @@ @publish(["concentrate_pump_cp1_current_set_speed", "concentrate_pump_cp1_measured_speed", "concentrate_pump_cp2_current_set_speed", "concentrate_pump_cp2_measured_speed", - "concentrate_pump_cp1_current_state", "concentrate_pump_cp2_current_state"]) + "concentrate_pump_cp1_current_state", "concentrate_pump_cp2_current_state", + "concentrate_pump_cp1_target_speed", "concentrate_pump_cp2_target_speed"]) def _handler_concentrate_pumps_sync(self, message): """ Handles published concentrate pumps' data messages. Concentrate pumps' speed data are captured @@ -112,6 +115,11 @@ self.cp2_temp_pulse = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8]))[0] + self.concentrate_pump_cp1_target_speed = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9]))[0] + self.concentrate_pump_cp2_target_speed = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_10:MsgFieldPositions.END_POS_FIELD_10]))[0] + def cmd_concentrate_pump_state_change_request(self, pump_id: int, on: bool = False) -> int: """ Constructs and sends the concentrate pump state change request command Index: dialin/dg/load_cells.py =================================================================== diff -u -r438d803f6042b14c39ffb9bbbfdf61a3d9e59d17 -r045cdab2571feecc53accc6aab0a2f569941d457 --- dialin/dg/load_cells.py (.../load_cells.py) (revision 438d803f6042b14c39ffb9bbbfdf61a3d9e59d17) +++ dialin/dg/load_cells.py (.../load_cells.py) (revision 045cdab2571feecc53accc6aab0a2f569941d457) @@ -56,11 +56,6 @@ self.load_cell_B1 = 0.0 self.load_cell_B2 = 0.0 - self.load_cell_A1_raw = 0.0 - self.load_cell_A2_raw = 0.0 - self.load_cell_B1_raw = 0.0 - self.load_cell_B2_raw = 0.0 - def get_load_cells(self): """ Gets the current load cell weights @@ -87,14 +82,6 @@ message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0] self.load_cell_B2 = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0] - self.load_cell_A1_raw = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0] - self.load_cell_A2_raw = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6]))[0] - self.load_cell_B1_raw = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7]))[0] - self.load_cell_B2_raw = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8]))[0] def cmd_load_cell_override(self, sensor: int, grams: float, reset: int = NO_RESET) -> int: """ Index: tests/dg_nvm_scripts.py =================================================================== diff -u -r438d803f6042b14c39ffb9bbbfdf61a3d9e59d17 -r045cdab2571feecc53accc6aab0a2f569941d457 --- tests/dg_nvm_scripts.py (.../dg_nvm_scripts.py) (revision 438d803f6042b14c39ffb9bbbfdf61a3d9e59d17) +++ tests/dg_nvm_scripts.py (.../dg_nvm_scripts.py) (revision 045cdab2571feecc53accc6aab0a2f569941d457) @@ -32,7 +32,7 @@ # Use cmd_set_dg_sw_config_record() 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 - dg.sw_configs.cmd_update_dg_sw_config_record('/home/fw/projects/DG_NV_Records/2022-07-16-DG-SW-CONFIGS-Record.xlsx') + dg.sw_configs.cmd_update_dg_sw_config_record('/home/fw/projects/DG_NV_Records/2022-08-02-DG-SW-CONFIGS-Record.xlsx') # Use this function to reset the configuration records to all be 0 #dg.sw_configs.cmd_reset_dg_sw_config_record() @@ -83,9 +83,9 @@ if dg.cmd_log_in_to_dg(): - #run_sw_configs_commands() + run_sw_configs_commands() - run_calibration_commands() + #run_calibration_commands() #run_system_commands() Index: tests/dg_tests.py =================================================================== diff -u -r6f64f72d83c3500fccf4dc3e235da4dd226ca2dd -r045cdab2571feecc53accc6aab0a2f569941d457 --- tests/dg_tests.py (.../dg_tests.py) (revision 6f64f72d83c3500fccf4dc3e235da4dd226ca2dd) +++ tests/dg_tests.py (.../dg_tests.py) (revision 045cdab2571feecc53accc6aab0a2f569941d457) @@ -261,9 +261,10 @@ def get_concentrate_pumps_info(): - info = ('Bicarb_tgt_speed, {:5.3f}, Bicarb_speed, {:5.3f}, Acid_tgt_speed, {:5.3f}, Acid_speed, {:5.3f}, ' + info = ('Bicarb_curr_speed, {:5.3f}, Bicarb_speed, {:5.3f}, Acid_curr_speed, {:5.3f}, Acid_speed, {:5.3f}, ' 'CPo, {:5.3f}, CD1, {:5.3f}, CD2, {:5.3f}, CP1_state, {}, CP2_state, {}, CPi_status, {}, CPo_status, {}, ' - 'CD1_status, {}, CD2_status, {}, CP1_pulse, {:5.3f}, CP2_pulse, {:5.3f}, ' + 'CD1_status, {}, CD2_status, {}, CP1_pulse, {:5.3f}, CP2_pulse, {:5.3f}, Acid_tgt_speed, {:5.3f}, ' + 'Bicarb_tgt_speed, {:5.3f}, ' .format(dg.concentrate_pumps.concentrate_pump_cp2_current_set_speed, dg.concentrate_pumps.concentrate_pump_cp2_measured_speed, dg.concentrate_pumps.concentrate_pump_cp1_current_set_speed, @@ -274,7 +275,9 @@ DGConcentratePumpsStates(dg.concentrate_pumps.concentrate_pump_cp2_current_state).name, dg.conductivity_sensors.cpi_sensor_status, dg.conductivity_sensors.cpo_sensor_status, dg.conductivity_sensors.cd1_sensor_status, dg.conductivity_sensors.cd2_sensor_status, - dg.concentrate_pumps.cp1_temp_pulse, dg.concentrate_pumps.cp2_temp_pulse)) + dg.concentrate_pumps.cp1_temp_pulse, dg.concentrate_pumps.cp2_temp_pulse, + dg.concentrate_pumps.concentrate_pump_cp1_target_speed, + dg.concentrate_pumps.concentrate_pump_cp2_target_speed)) return info @@ -397,6 +400,8 @@ #dg.heaters.cmd_heaters_broadcast_interval_override(50) #sleep(1) #dg.voltages.cmd_monitored_voltages_broadcast_interval_override(50) + #dg.concentrate_pumps.cmd_concentrate_pump_broadcast_interval_override(50) + #sleep(0.5) try: while True: @@ -674,7 +679,7 @@ # cmd_set_disinfect_ui_screen() - #collect_treatment_data() + collect_treatment_data() #collect_hd_treatment() @@ -705,5 +710,5 @@ # print(get_heaters_info()) # sleep(1) - dg.ro_pump.cmd_set_ro_flow_rate(0.6) + #dg.ro_pump.cmd_set_ro_flow_rate(0.6) Index: tests/hd_blood_leak_data.py =================================================================== diff -u -r5eb006b08eb1d7b641b22fff20072ab7b685cfec -r045cdab2571feecc53accc6aab0a2f569941d457 --- tests/hd_blood_leak_data.py (.../hd_blood_leak_data.py) (revision 5eb006b08eb1d7b641b22fff20072ab7b685cfec) +++ tests/hd_blood_leak_data.py (.../hd_blood_leak_data.py) (revision 045cdab2571feecc53accc6aab0a2f569941d457) @@ -43,13 +43,18 @@ #hd.blood_leak.cmd_blood_leak_zero_request() - """ + #hd.blood_leak.cmd_blood_leak_data_broadcast_interval_override(50) hd.blood_leak.cmd_blood_leak_set_to_embedded_mode() print(hd.blood_leak.get_blood_leak_emb_mode_command_response()) + hd.blood_leak.cmd_blood_leak_set_embedded_mode_command(EmbModeCommands.SP.value, msg_payload=30) + + print(hd.blood_leak.get_blood_leak_emb_mode_command_response()) + + """ while True: hd.blood_leak.cmd_blood_leak_set_embedded_mode_command(EmbModeCommands.I.value, msg_payload=125) @@ -75,7 +80,7 @@ print(hd.blood_leak.get_blood_leak_emb_mode_command_response()) """ - + """ f = open("/home/fw/projects/dialin/tests/blood_leak.log", "w") try: @@ -89,5 +94,6 @@ sleep(1) except KeyboardInterrupt: f.close() + """