Index: dialin/dg/drain_pump.py =================================================================== diff -u -r3a70bfb451b74106348c064c34f19934aadd9119 -rd26df54d17cf3f84471ba2a15e031b6a4f1f04f7 --- dialin/dg/drain_pump.py (.../drain_pump.py) (revision 3a70bfb451b74106348c064c34f19934aadd9119) +++ dialin/dg/drain_pump.py (.../drain_pump.py) (revision d26df54d17cf3f84471ba2a15e031b6a4f1f04f7) @@ -58,6 +58,8 @@ self.drain_pump_state = 0 self.current_drain_pump_rpm = 0 self.target_drain_pump_outlet_pressure = 0.0 + self.drain_pump_current_A = 0.0 + self.drain_pump_direction = 0 def get_target_drain_pump_rpm(self): """ @@ -91,7 +93,8 @@ """ return self.current_drain_pump_rpm - @publish(["target_drain_pump_rpm", "dac_value", "drain_pump_state", "current_drain_pump_rpm"]) + @publish(["target_drain_pump_rpm", "dac_value", "drain_pump_state", "current_drain_pump_rpm", + "drain_pump_current_A", "drain_pump_direction"]) def _handler_drain_pump_sync(self, message): """ Handles published drain pump data messages. Drain pump data are captured @@ -110,6 +113,10 @@ message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0] self.target_drain_pump_outlet_pressure = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0] + self.drain_pump_current_A = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6]))[0] + self.drain_pump_direction = struct.unpack('i', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7]))[0] def cmd_drain_pump_set_outlet_target_pressure(self, pressure: float) -> int: """ Index: tests/dg_nvm_scripts.py =================================================================== diff -u -r3553789d2a6b1a0ff024a45cd7b47a2ba06f96b3 -rd26df54d17cf3f84471ba2a15e031b6a4f1f04f7 --- tests/dg_nvm_scripts.py (.../dg_nvm_scripts.py) (revision 3553789d2a6b1a0ff024a45cd7b47a2ba06f96b3) +++ tests/dg_nvm_scripts.py (.../dg_nvm_scripts.py) (revision d26df54d17cf3f84471ba2a15e031b6a4f1f04f7) @@ -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-10-05-DG-SW-CONFIGS-Record.xlsx') + dg.sw_configs.cmd_update_dg_sw_config_record('/home/fw/projects/DG_NV_Records/2022-10-09-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() Index: tests/dg_tests.py =================================================================== diff -u -r3553789d2a6b1a0ff024a45cd7b47a2ba06f96b3 -rd26df54d17cf3f84471ba2a15e031b6a4f1f04f7 --- tests/dg_tests.py (.../dg_tests.py) (revision 3553789d2a6b1a0ff024a45cd7b47a2ba06f96b3) +++ tests/dg_tests.py (.../dg_tests.py) (revision d26df54d17cf3f84471ba2a15e031b6a4f1f04f7) @@ -164,11 +164,12 @@ def get_drain_states_info(): - info = ('Drain, {}, DAC, {}, Tgt_RPM, {}, Curr_RPM, {}, PRd, {:5.3f}, PDr, {:5.3f}, '. - format(DrainPumpStates(dg.drain_pump.drain_pump_state).name, dg.drain_pump.dac_value, - dg.drain_pump.target_drain_pump_rpm, dg.drain_pump.current_drain_pump_rpm, - dg.pressures.drain_pump_inlet_pressure, - dg.pressures.drain_pump_outlet_pressure)) + info = ('Drain, {}, DAC, {}, Tgt_RPM, {}, Curr_RPM, {}, PRd, {:5.3f}, PDr, {:5.3f}, Drain_curr_A, {:5.3f}, ' + 'Drain_dir, {}, ' + .format(DrainPumpStates(dg.drain_pump.drain_pump_state).name, dg.drain_pump.dac_value, + dg.drain_pump.target_drain_pump_rpm, dg.drain_pump.current_drain_pump_rpm, + dg.pressures.drain_pump_inlet_pressure, dg.pressures.drain_pump_outlet_pressure, + dg.drain_pump.drain_pump_current_A, dg.drain_pump.drain_pump_direction)) return info @@ -514,8 +515,9 @@ dg_fans = get_dg_fans_info() hd_fans = get_hd_fans_info() conc = get_concentrate_pumps_info() + uv = get_uv_reactors_info() - var = disinfect + load_cell + drain + ro + temp + heaters + uv + dg_fans + hd_fans + valves + conc + '\r' + var = disinfect + load_cell + drain + ro + temp + heaters + uv + dg_fans + hd_fans + valves + conc + uv + '\r' print(var) f.write(var) @@ -688,7 +690,7 @@ hd.cmd_log_in_to_hd() sleep(1) - #run_heat_disinfect() + run_heat_disinfect() #run_flush_mode() @@ -698,7 +700,7 @@ # cmd_set_disinfect_ui_screen() - collect_treatment_data() + #collect_treatment_data() #collect_hd_treatment()