Index: dialin/dg/heaters.py =================================================================== diff -u -r3a70bfb451b74106348c064c34f19934aadd9119 -r6b1fd68e4a48f7ee6520da5cd319d40fce1ac5fc --- dialin/dg/heaters.py (.../heaters.py) (revision 3a70bfb451b74106348c064c34f19934aadd9119) +++ dialin/dg/heaters.py (.../heaters.py) (revision 6b1fd68e4a48f7ee6520da5cd319d40fce1ac5fc) @@ -65,11 +65,9 @@ self.primary_heater_state = 0 self.trimmer_heater_state = 0 self.primary_efficiency = 0.0 + self.primary_calc_target_temperature = 0.0 + self.trimmer_calc_target_temperature = 0.0 - self.temporary_remove_flow = 0.0 - self.temporary_internal_target = 0.0 - self.temporary_target_ro_flow = 0.0 - if self.can_interface is not None: channel_id = DenaliChannels.dg_sync_broadcast_ch_id msg_id = MsgIds.MSG_ID_DG_HEATERS_DATA.value @@ -141,14 +139,12 @@ message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7]))[0] self.primary_efficiency = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8]))[0] - - self.temporary_remove_flow = struct.unpack('f', bytearray( + self.primary_calc_target_temperature = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9]))[0] - self.temporary_internal_target = struct.unpack('f', bytearray( + self.trimmer_calc_target_temperature = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_10:MsgFieldPositions.END_POS_FIELD_10]))[0] - self.temporary_target_ro_flow = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_11:MsgFieldPositions.END_POS_FIELD_11]))[0] + def cmd_start_stop_primary_heater(self, state: int = HeatersStartStop.STOP.name) -> None: """ Constructs and sends a start/stop primary heater command Index: tests/dg_nvm_scripts.py =================================================================== diff -u -r0c84db7884e7943ab5a57044a4670f1595ee60df -r6b1fd68e4a48f7ee6520da5cd319d40fce1ac5fc --- tests/dg_nvm_scripts.py (.../dg_nvm_scripts.py) (revision 0c84db7884e7943ab5a57044a4670f1595ee60df) +++ tests/dg_nvm_scripts.py (.../dg_nvm_scripts.py) (revision 6b1fd68e4a48f7ee6520da5cd319d40fce1ac5fc) @@ -27,12 +27,12 @@ # It creates a folder called DG_NV_Records in the destination that is called # If no address is provided, the default location is one folder above the dialin folder wherever it is installed # in your computer. - dg.sw_configs.cmd_get_dg_sw_config_record() + #dg.sw_configs.cmd_get_dg_sw_config_record() # 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-04-20-DG-SW-CONFIGS-Record.xlsx') + dg.sw_configs.cmd_update_dg_sw_config_record('/home/fw/projects/DG_NV_Records/2022-04-20-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() @@ -49,12 +49,12 @@ # It creates a folder called DG_NV_Records in the destination that is called # If no address is provided, the default location is one folder above the dialin folder wherever it is installed # in you computer. - #dg.calibration_record.cmd_get_dg_calibration_record_report() + dg.calibration_record.cmd_get_dg_calibration_record_report() # 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-15-DG-Record.xlsx') + #dg.calibration_record.cmd_set_dg_calibration_excel_to_fw('/home/fw/projects/DG_NV_Records/2022-06-19-DG-Record.xlsx') # For resetting the calibration record to benign values, use the function below #dg.calibration_record.cmd_reset_dg_calibration_record() @@ -66,9 +66,9 @@ if dg.cmd_log_in_to_dg(): - #run_sw_configs_commands() + run_sw_configs_commands() - run_calibration_commands() + #run_calibration_commands() #dg.usage_record.cmd_get_dg_usage_info_record() #dg.usage_record.cmd_update_dg_usage_info_record('/home/fw/projects/DG_NV_Records/2022-04-22-DG-Record.xlsx') Index: tests/dg_tests.py =================================================================== diff -u -r0c84db7884e7943ab5a57044a4670f1595ee60df -r6b1fd68e4a48f7ee6520da5cd319d40fce1ac5fc --- tests/dg_tests.py (.../dg_tests.py) (revision 0c84db7884e7943ab5a57044a4670f1595ee60df) +++ tests/dg_tests.py (.../dg_tests.py) (revision 6b1fd68e4a48f7ee6520da5cd319d40fce1ac5fc) @@ -190,13 +190,13 @@ def get_heaters_info(): info = ('Pri_main_DC, {:5.3f}, Pri_state, {}, Trimmer_DC, {:5.3f}, Trimmer_state, {}, ' - 'Primary_target_temp, {:5.3f}, Trimmer_target_temp, {:5.3f}, Primary_eff, {:5.3f}, Dia_flow, {:5.3f}, ' - 'Interim_int_temp, {:5.3f}, Heater_RO_flow, {:5.3f}, Primary_volt, {:5.3f}, Trimmer_volt, {:5.3f}, '. + 'Primary_target_temp, {:5.3f}, Trimmer_target_temp, {:5.3f}, Primary_eff, {:5.3f}, ' + 'Primary_calc_temp, {:5.3f}, Trimmer_calc_temp, {:5.3f}, Primary_volt, {:5.3f}, Trimmer_volt, {:5.3f}, '. 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.temporary_remove_flow, - dg.heaters.temporary_internal_target, dg.heaters.temporary_target_ro_flow, + dg.heaters.primary_efficiency, dg.heaters.primary_heaters_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])) return info @@ -635,7 +635,7 @@ # cmd_set_disinfect_ui_screen() - #collect_treatment_data() + collect_treatment_data() #collect_hd_treatment() @@ -647,7 +647,7 @@ #print(hd.hd_debug_events) # sleep(1) - ui = HDSimulator() - ui.cmd_send_hd_operation_mode(3, 1) + #ui = HDSimulator() + #ui.cmd_send_hd_operation_mode(3, 1) Index: tests/hd_nvm_scripts.py =================================================================== diff -u -r0c84db7884e7943ab5a57044a4670f1595ee60df -r6b1fd68e4a48f7ee6520da5cd319d40fce1ac5fc --- tests/hd_nvm_scripts.py (.../hd_nvm_scripts.py) (revision 0c84db7884e7943ab5a57044a4670f1595ee60df) +++ tests/hd_nvm_scripts.py (.../hd_nvm_scripts.py) (revision 6b1fd68e4a48f7ee6520da5cd319d40fce1ac5fc) @@ -33,7 +33,7 @@ # Use cmd_update_hd_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 - hd.sw_configs.cmd_update_hd_sw_config_record('/home/fw/projects/HD_NV_Records/2022-04-25-HD-SW-CONFIGS-Record.xlsx') + hd.sw_configs.cmd_update_hd_sw_config_record('/home/fw/projects/HD_NV_Records/2022-06-07-HD-SW-CONFIGS-Record.xlsx') # Use this function to reset the configuration records to all be 0 #hd.sw_configs.cmd_reset_hd_sw_config_record() @@ -68,12 +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() - hd.system_record.cmd_request_hd_system_record() - sleep(1) - print(hd.system_record.get_hd_system_record()) - Index: tests/peter/set_RTCs.py =================================================================== diff -u -rc7c9198f7c16d6661ae35e67d02e5b46af14065d -r6b1fd68e4a48f7ee6520da5cd319d40fce1ac5fc --- tests/peter/set_RTCs.py (.../set_RTCs.py) (revision c7c9198f7c16d6661ae35e67d02e5b46af14065d) +++ tests/peter/set_RTCs.py (.../set_RTCs.py) (revision 6b1fd68e4a48f7ee6520da5cd319d40fce1ac5fc) @@ -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,4 +48,4 @@ current_time.tm_mon, current_time.tm_year) print("Successfully set DG rtc") - """ +