Index: dialin/dg/chemical_disinfect.py =================================================================== diff -u -rd784180e6543330849bf7fbb6bd9acfd36323706 -rcdcedbbbbae8cbc38fb3eb667cd3b5969212c7d0 --- dialin/dg/chemical_disinfect.py (.../chemical_disinfect.py) (revision d784180e6543330849bf7fbb6bd9acfd36323706) +++ dialin/dg/chemical_disinfect.py (.../chemical_disinfect.py) (revision cdcedbbbbae8cbc38fb3eb667cd3b5969212c7d0) @@ -83,7 +83,7 @@ self.chemical_disinfect_ui_state = 0 @publish(["dg_chem_disinfect_time_timestamp","chemical_disinfect_elapsed_time", "chemical_disinfect_target_time"]) - def _handler_chemical_disinfect_to_ui_sync(self, message, timestamp = 0.0): + def _handler_chemical_disinfect_to_ui_sync(self, message, timestamp=0.0): """ Handles published chemical disinfect message Index: dialin/dg/ro_permeate_sample.py =================================================================== diff -u -r8bc7a5336b8f69192918eafc465ee1094537f96d -rcdcedbbbbae8cbc38fb3eb667cd3b5969212c7d0 --- dialin/dg/ro_permeate_sample.py (.../ro_permeate_sample.py) (revision 8bc7a5336b8f69192918eafc465ee1094537f96d) +++ dialin/dg/ro_permeate_sample.py (.../ro_permeate_sample.py) (revision cdcedbbbbae8cbc38fb3eb667cd3b5969212c7d0) @@ -51,6 +51,7 @@ self.state_elapsed_time = 0 self.dispensed_volume_ml = 0.0 self.ro_permeate_dispense_message_status = 0 + self.ro_permeate_sample_timestamp = 0 def get_ro_permeate_sample_state(self) -> int: """ @@ -69,7 +70,11 @@ return self.dispensed_volume_ml def cmd_send_hd_dg_is_ready_to_dispense(self): + """ + Sends HD a message on behalf of DG to inform DG is ready to dispense more fluid per request + @return: 1 if successful, zero otherwise + """ message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, message_id=MsgIds.MSG_ID_DG_SEND_RO_PERMEATE_SAMPLE_DISPENSE_READY_TO_HD.value) @@ -86,8 +91,8 @@ self.logger.debug("Timeout!!!!") return False - @publish(["ro_permeate_sample_state", "overall_elapsed_time", "state_elapsed_time", "dispensed_volume_ml", - "ro_permeate_dispense_message_status"]) + @publish(["ro_permeate_sample_timestamp", "ro_permeate_sample_state", "overall_elapsed_time", "state_elapsed_time", + "dispensed_volume_ml", "ro_permeate_dispense_message_status"]) def _handler_ro_permeate_sample_sync(self, message, timestamp=0.0): """ Handles published RO permeate sample message @@ -108,5 +113,5 @@ self.state_elapsed_time = int(state_elapsed_time / 1000) self.dispensed_volume_ml = dispensed_vol_ml self.ro_permeate_dispense_message_status = dispense_msg + self.ro_permeate_sample_timestamp = timestamp - Index: tests/dg_nvm_scripts.py =================================================================== diff -u -r8bc7a5336b8f69192918eafc465ee1094537f96d -rcdcedbbbbae8cbc38fb3eb667cd3b5969212c7d0 --- tests/dg_nvm_scripts.py (.../dg_nvm_scripts.py) (revision 8bc7a5336b8f69192918eafc465ee1094537f96d) +++ tests/dg_nvm_scripts.py (.../dg_nvm_scripts.py) (revision cdcedbbbbae8cbc38fb3eb667cd3b5969212c7d0) @@ -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/2023-06-10-DG-SW-CONFIGS-Record.xlsx') + dg.sw_configs.cmd_update_dg_sw_config_record('/home/fw/projects/DG_NV_Records/2023-06-11-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() @@ -112,14 +112,14 @@ if dg.cmd_log_in_to_dg(): - #run_sw_configs_commands() + run_sw_configs_commands() #run_calibration_commands() #run_system_commands() #run_usage_info_commands() - run_service_commands() + #run_service_commands() Index: tests/dg_tests.py =================================================================== diff -u -r8bc7a5336b8f69192918eafc465ee1094537f96d -rcdcedbbbbae8cbc38fb3eb667cd3b5969212c7d0 --- tests/dg_tests.py (.../dg_tests.py) (revision 8bc7a5336b8f69192918eafc465ee1094537f96d) +++ tests/dg_tests.py (.../dg_tests.py) (revision cdcedbbbbae8cbc38fb3eb667cd3b5969212c7d0) @@ -76,10 +76,10 @@ 'Cancellation_mode, {}, R1_level, {:5.3f}, R2_level, {:5.3f}, Current_rinse_count, {}, ' 'Total_rinse_count, {}, UI_state, {}, Top_alarm, {}, ' .format(state, overall_elapsed_time, state_elapsed_time, - dg.chemical_disinfect.chemical_disinfect_elapsed_time, + dg.chemical_disinfect.chemical_disinfect_target_time, ChemCancellationModes(dg.chemical_disinfect.cancellation_mode).name, dg.chemical_disinfect.r1_level, - dg.chemical_disinfect.r2_level, dg.chemical_disinfect_flush.rinse_count, 0, - #dg.chemical_disinfect_flush.target_rinse_count, + dg.chemical_disinfect.r2_level, dg.chemical_disinfect_flush.rinse_count, + dg.chemical_disinfect_flush.rinse_count, DGChemDisinfectUIStates(dg.chemical_disinfect.chemical_disinfect_ui_state).name, hd.alarms.alarm_top)) return info @@ -488,8 +488,10 @@ complete_counter = 1 address = os.path.join(os.getcwd(), "ro_permeate_sample.log") f = open(address, "w") - dg.hd_proxy.cmd_start_stop_dg_ro_permeate_sample() + #dg.hd_proxy.cmd_start_stop_dg_ro_permeate_sample() + dg.temperatures.cmd_temperatures_value_override(0, 49) + try: while True: ro_perm = get_ro_permeate_sample_mode_info() @@ -568,8 +570,10 @@ complete_counter = 1 f = open("/home/fw/projects/dialin/tests/chemical_disinfect.log", "w") #dg.hd_proxy.cmd_start_stop_dg_chemical_disinfect() - dg.hd_proxy.cmd_start_stop_dg_chemical_disinfect_flush() + #dg.hd_proxy.cmd_start_stop_dg_chemical_disinfect_flush() + dg.test_configs.cmd_set_test_config(DGTestConfigOptions.TEST_CONFIG_MIX_WITH_WATER.value) + try: while True: @@ -731,9 +735,9 @@ # cmd_set_disinfect_ui_screen() - collect_treatment_data() + #collect_treatment_data() - #run_ro_permeate_sample() + run_ro_permeate_sample() #collect_hd_treatment()