Index: tests/dg_nvm_scripts.py =================================================================== diff -u -r31c0b4a36d8bafbb69e217803546291b1af30f02 -re67b967e9fe09d1e842efc04fa52e477165f0fb3 --- tests/dg_nvm_scripts.py (.../dg_nvm_scripts.py) (revision 31c0b4a36d8bafbb69e217803546291b1af30f02) +++ tests/dg_nvm_scripts.py (.../dg_nvm_scripts.py) (revision e67b967e9fe09d1e842efc04fa52e477165f0fb3) @@ -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-06-07-DG-SW-CONFIGS-Record.xlsx') + dg.sw_configs.cmd_update_dg_sw_config_record('/home/fw/projects/DG_NV_Records/2022-07-05-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() @@ -54,7 +54,7 @@ # Use cmd_set_dg_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 - dg.calibration_record.cmd_set_dg_calibration_excel_to_fw('/home/fw/projects/DG_NV_Records/2022-06-20-DG-Record.xlsx') + #dg.calibration_record.cmd_set_dg_calibration_excel_to_fw('/home/fw/projects/DG_NV_Records/2022-06-30-DG-Record_Post.xlsx') # For resetting the calibration record to benign values, use the function below #dg.calibration_record.cmd_reset_dg_calibration_record() Index: tests/dg_tests.py =================================================================== diff -u -r2cd447a1cae7c32c9f2fa6048c89252563e9d9e6 -re67b967e9fe09d1e842efc04fa52e477165f0fb3 --- tests/dg_tests.py (.../dg_tests.py) (revision 2cd447a1cae7c32c9f2fa6048c89252563e9d9e6) +++ tests/dg_tests.py (.../dg_tests.py) (revision e67b967e9fe09d1e842efc04fa52e477165f0fb3) @@ -253,12 +253,13 @@ def get_concentrate_pumps_info(): info = ('Bicarb_tgt_speed, {:5.3f}, Bicarb_speed, {:5.3f}, Acid_tgt_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}, ' + 'CPi, {: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}, ' .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, dg.concentrate_pumps.concentrate_pump_cp1_measured_speed, + dg.conductivity_sensors.conductivity_sensor_cpi, dg.conductivity_sensors.conductivity_sensor_cpo, dg.conductivity_sensors.conductivity_sensor_cd1, dg.conductivity_sensors.conductivity_sensor_cd2, DGConcentratePumpsStates(dg.concentrate_pumps.concentrate_pump_cp1_current_state).name, @@ -625,16 +626,20 @@ # cmd_set_disinfect_ui_screen() - #collect_treatment_data() + collect_treatment_data() #collect_hd_treatment() # test_dg_fans_alarms() #test_dvt_drain_pump() - test_conc_pumps() + #test_conc_pumps() + #while True: + # print(get_concentrate_pumps_info()) + # sleep(1) + #ui = HDSimulator() #ui.cmd_send_hd_operation_mode(3, 1) Index: tests/hd_nvm_scripts.py =================================================================== diff -u -r7ea4b936cef531b2cde9053ae58b7119a3bf0e6c -re67b967e9fe09d1e842efc04fa52e477165f0fb3 --- tests/hd_nvm_scripts.py (.../hd_nvm_scripts.py) (revision 7ea4b936cef531b2cde9053ae58b7119a3bf0e6c) +++ tests/hd_nvm_scripts.py (.../hd_nvm_scripts.py) (revision e67b967e9fe09d1e842efc04fa52e477165f0fb3) @@ -55,10 +55,10 @@ # 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-05-17-HD-Record.xlsx') + #hd.calibration_record.cmd_set_hd_calibration_excel_to_fw('/home/fw/projects/HD_NV_Records/2022-06-30-HD-Record.xlsx') # For resetting the calibration record to benign values, use the function below - #hd.calibration_record.cmd_reset_hd_calibration_record() + hd.calibration_record.cmd_reset_hd_calibration_record() if __name__ == "__main__": Index: tests/peter/set_RTCs.py =================================================================== diff -u -r31c0b4a36d8bafbb69e217803546291b1af30f02 -re67b967e9fe09d1e842efc04fa52e477165f0fb3 --- tests/peter/set_RTCs.py (.../set_RTCs.py) (revision 31c0b4a36d8bafbb69e217803546291b1af30f02) +++ tests/peter/set_RTCs.py (.../set_RTCs.py) (revision e67b967e9fe09d1e842efc04fa52e477165f0fb3) @@ -29,7 +29,7 @@ current_time_stamp = time() current_time = localtime(current_time_stamp) print(current_time) - + """ if hd.cmd_log_in_to_hd(): hd.rtc.cmd_set_rtc_time_and_date(current_time.tm_sec, current_time.tm_min, @@ -48,5 +48,5 @@ current_time.tm_mon, current_time.tm_year) print("Successfully set DG rtc") - """ + Index: tests/peter/test_dg_records.py =================================================================== diff -u -rf822b55ab067aba716dc07f7fa3f53ef9cb2c9e3 -re67b967e9fe09d1e842efc04fa52e477165f0fb3 --- tests/peter/test_dg_records.py (.../test_dg_records.py) (revision f822b55ab067aba716dc07f7fa3f53ef9cb2c9e3) +++ tests/peter/test_dg_records.py (.../test_dg_records.py) (revision e67b967e9fe09d1e842efc04fa52e477165f0fb3) @@ -358,10 +358,10 @@ if __name__ == "__main__": - test_dg_reset_record() + #test_dg_reset_record() # test_dg_sw_config_record() #test_dg_calibration_record() # test_dg_service_record() - #test_dg_system_record() + test_dg_system_record() # test_dg_scheduled_runs_record() #test_dg_excel_report()