ad9102 prestored saw done
This commit is contained in:
@ -44,6 +44,31 @@ def get_float(values, strId):
|
||||
window['-StartCycle-'].update(disabled = True)
|
||||
return value
|
||||
|
||||
def parse_optional_int(value):
|
||||
if value is None:
|
||||
return None
|
||||
s = str(value).strip()
|
||||
if s == "":
|
||||
return None
|
||||
try:
|
||||
return int(s, 0)
|
||||
except Exception:
|
||||
print(f"Invalid integer value: {s}")
|
||||
return None
|
||||
|
||||
def parse_optional_float(value):
|
||||
if value is None:
|
||||
return None
|
||||
s = str(value).strip()
|
||||
if s == "":
|
||||
return None
|
||||
s = s.replace(",", ".")
|
||||
try:
|
||||
return float(s)
|
||||
except Exception:
|
||||
print(f"Invalid float value: {s}")
|
||||
return None
|
||||
|
||||
def shorten(i):
|
||||
return "{:.2f}".format(round(i, 2))
|
||||
|
||||
@ -73,6 +98,13 @@ def set_initial_params():
|
||||
params['Delta_Current_2'] = 0.05
|
||||
params['Delta_Time'] = 50
|
||||
params['Tau'] = 10
|
||||
params['RampFreq'] = ''
|
||||
params['RampDuty'] = ''
|
||||
params['RampSawStep'] = ''
|
||||
params['RampPatPeriod'] = ''
|
||||
params['RampPatBase'] = 2
|
||||
params['RampDacClk'] = ''
|
||||
params['RampTriangle'] = True
|
||||
return params
|
||||
|
||||
def update_data_lists():
|
||||
@ -423,6 +455,23 @@ if __name__ == "__main__":
|
||||
params['Iset_2'] = float(values['-InputI2-'])
|
||||
dev.send_control_parameters(prt, params)
|
||||
#print(sending_param)
|
||||
elif event == '-StartRamp-':
|
||||
freq_hz = parse_optional_float(values.get('-RampFreq-'))
|
||||
duty = parse_optional_float(values.get('-RampDuty-'))
|
||||
if duty is not None:
|
||||
if duty > 1.0:
|
||||
duty = duty / 100.0
|
||||
if duty <= 0:
|
||||
duty = None
|
||||
saw_step = parse_optional_int(values.get('-RampSawStep-'))
|
||||
pat_period = parse_optional_int(values.get('-RampPatPeriod-'))
|
||||
pat_period_base = parse_optional_int(values.get('-RampPatBase-'))
|
||||
dac_clk_mhz = parse_optional_float(values.get('-RampDacClk-'))
|
||||
dac_clk_hz = dac_clk_mhz * 1e6 if dac_clk_mhz is not None else None
|
||||
triangle = values.get('-RampTriangle-', True)
|
||||
dev.start_ramp_max(prt, freq_hz=freq_hz, duty=duty, saw_step=saw_step,
|
||||
pat_period=pat_period, pat_period_base=pat_period_base,
|
||||
dac_clk_hz=dac_clk_hz, triangle=triangle)
|
||||
elif event == '-StopCycle-':
|
||||
window['-StopCycle-'].update(disabled = True)
|
||||
current_and_temperature_settings_available = True
|
||||
@ -466,4 +515,3 @@ if __name__ == "__main__":
|
||||
|
||||
dev.close_connection(prt)
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user