From b4681349d93333187ece2198663353018630b4cd Mon Sep 17 00:00:00 2001 From: Carl Laufer Date: Wed, 18 May 2022 06:37:05 +0100 Subject: [PATCH] bias tee daq controls --- _UI/_web_interface/kraken_web_interface.py | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/_UI/_web_interface/kraken_web_interface.py b/_UI/_web_interface/kraken_web_interface.py index 562ca82..764bd1c 100755 --- a/_UI/_web_interface/kraken_web_interface.py +++ b/_UI/_web_interface/kraken_web_interface.py @@ -260,6 +260,7 @@ def read_config_file_dict(config_fname=daq_config_filename): ini_data['config_name'] = parser.get('meta', 'config_name') ini_data['num_ch'] = parser.getint('hw', 'num_ch') + ini_data['en_bias_tee'] = parser.get('hw', 'en_bias_tee') ini_data['daq_buffer_size'] = parser.getint('daq','daq_buffer_size') ini_data['sample_rate'] = parser.getint('daq','sample_rate') ini_data['en_noise_source_ctr'] = parser.getint('daq','en_noise_source_ctr') @@ -296,6 +297,7 @@ def write_config_file_dict(param_dict): parser['meta']['config_name']=str(param_dict['config_name']) parser['hw']['num_ch']=str(param_dict['num_ch']) + parser['hw']['en_bias_tee']=str(param_dict['en_bias_tee']) parser['daq']['daq_buffer_size']=str(param_dict['daq_buffer_size']) parser['daq']['sample_rate']=str(param_dict['sample_rate']) parser['daq']['en_noise_source_ctr']=str(param_dict['en_noise_source_ctr']) @@ -651,6 +653,12 @@ def generate_config_page_layout(webInterface_inst): html.Div("# RX Channels:", className="field-label"), dcc.Input(id='cfg_rx_channels', value=daq_cfg_dict['num_ch'], type='number', debounce=True, className="field-body-textbox") ], className="field"), + + html.Div([ + html.Div("Bias Tee Control:", className="field-label"), + dcc.Input(id='cfg_en_bias_tee', value=daq_cfg_dict['en_bias_tee'], type='text', debounce=True, className="field-body-textbox") + ], className="field"), + html.H3("DAQ", id="cfg_group_daq"), html.Div([ html.Div("DAQ Buffer Size:", className="field-label", id="label_daq_buffer_size"), @@ -1335,9 +1343,8 @@ def update_dsp_params(update_freq, en_pr, en_persist, persist_decay, max_bistati Input('cfg_data_block_len' ,'value'), Input('cfg_decimated_bw' ,'value'), Input('cfg_recal_interval' ,'value'), - Input('daq_cfg_files' , 'value'), - -] + Input('cfg_en_bias_tee' ,'value'), + Input('daq_cfg_files' , 'value')] ) def update_daq_ini_params( cfg_rx_channels,cfg_daq_buffer_size,cfg_sample_rate,en_noise_source_ctr, \ @@ -1346,7 +1353,7 @@ def update_daq_ini_params( cfg_std_ch_ind,en_iq_cal,cfg_gain_lock,en_req_track_lock_intervention, \ cfg_cal_track_mode,cfg_amplitude_cal_mode,cfg_cal_frame_interval, \ cfg_cal_frame_burst_size, cfg_amplitude_tolerance,cfg_phase_tolerance, \ - cfg_max_sync_fails, cfg_data_block_len, cfg_decimated_bw, cfg_recal_interval, config_fname): + cfg_max_sync_fails, cfg_data_block_len, cfg_decimated_bw, cfg_recal_interval, cfg_en_bias_tee, config_fname): # TODO: Use disctionarry instead of parameter list ctx = dash.callback_context @@ -1367,8 +1374,8 @@ def update_daq_ini_params( en_iq_cal_values =[1] if daq_cfg_dict['en_iq_cal'] else [] en_req_track_lock_values =[1] if daq_cfg_dict['require_track_lock_intervention'] else [] - en_persist_values =[1] if webInterface_inst.en_persist else [] - en_pr_values =[1] if webInterface_inst.module_signal_processor.en_PR else [] + #en_persist_values =[1] if webInterface_inst.en_persist else [] + #en_pr_values =[1] if webInterface_inst.module_signal_processor.en_PR else [] en_advanced_daq_cfg =[1] if webInterface_inst.en_advanced_daq_cfg else [] @@ -1455,6 +1462,7 @@ def update_daq_ini_params( param_dict = webInterface_inst.daq_ini_cfg_dict param_dict['config_name'] = "Custom" param_dict['num_ch'] = cfg_rx_channels + param_dict['en_bias_tee'] = cfg_en_bias_tee param_dict['daq_buffer_size'] = cfg_daq_buffer_size param_dict['sample_rate'] = int(cfg_sample_rate*10**6) param_dict['en_noise_source_ctr'] = 1 if len(en_noise_source_ctr) else 0