nqrduck/nqrduck-autotm
1
0
Fork 0
mirror of https://github.com/nqrduck/nqrduck-autotm.git synced 2024-12-30 11:28:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'main' of https://github.com/jupfi/AutoTM

Browse source
This commit is contained in:
jupfi 2023-12-20 09:25:49 +01:00
commit dd28f9fb2e
1 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/nqrduck_autotm/controller.py
View file

@ -51,13 +51,12 @@ class AutoTMController(ModuleController):
elif self.module.model.LUT.TYPE == "Electrical": elif self.module.model.LUT.TYPE == "Electrical":
tuning_voltage, matching_voltage = self.module.model.LUT.get_voltages(frequency) tuning_voltage, matching_voltage = self.module.model.LUT.get_voltages(frequency)
confirmation = self.set_voltages(str(tuning_voltage), str(matching_voltage)) confirmation = self.set_voltages(str(tuning_voltage), str(matching_voltage))
if confirmation: # We need to change the signal pathway to preamp to measure the reflection
# We need to change the signal pathway to preamp to measure the reflection self.switch_to_atm()
self.switch_to_atm() reflection = self.read_reflection(frequency)
reflection = self.read_reflection(frequency) # We need to change the signal pathway back to atm to perform a measurement
# We need to change the signal pathway back to atm to perform a measurement self.switch_to_preamp()
self.switch_to_preamp() self.module.nqrduck_signal.emit("confirm_tune_and_match", reflection)
self.module.nqrduck_signal.emit("confirm_tune_and_match", reflection)
elif self.module.model.LUT.TYPE == "Mechanical": elif self.module.model.LUT.TYPE == "Mechanical":
tuning_position, matching_position = self.module.model.LUT.get_positions(frequency) tuning_position, matching_position = self.module.model.LUT.get_positions(frequency)
@ -595,13 +594,12 @@ class AutoTMController(ModuleController):
start_time = time.time() start_time = time.time()
confirmation = self.send_command(command) confirmation = self.send_command(command)
if confirmation: while matching_voltage != self.module.model.matching_voltage and tuning_voltage != self.module.model.tuning_voltage:
while matching_voltage != self.module.model.matching_voltage and tuning_voltage != self.module.model.tuning_voltage: QApplication.processEvents()
QApplication.processEvents() # Check for timeout
# Check for timeout if time.time() - start_time > timeout_duration:
if time.time() - start_time > timeout_duration: logger.error("Voltage setting timed out")
logger.error("Voltage setting timed out") break
break
logger.debug("Voltages set successfully") logger.debug("Voltages set successfully")
return confirmation return confirmation