nqrduck/nqrduck-autotm
1
0
Fork 0
mirror of https://github.com/nqrduck/nqrduck-autotm.git synced 2024-11-09 11:40:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Added reflection measurement to tune_and_match confirm signal.

Browse source
This commit is contained in:
jupfi 2023-12-12 18:32:08 +01:00
parent d01af53751
commit 7b9f680b96
2 changed files with 26 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/nqrduck_autotm/controller.py
View file

@ -48,10 +48,18 @@ class AutoTMController(ModuleController):
return return
elif self.module.model.LUT.TYPE == "Electrical": elif self.module.model.LUT.TYPE == "Electrical":
tunning_voltage, matching_voltage = self.module.model.LUT.get_voltages(frequency) tunning_voltage, matching_voltage = self.module.model.LUT.get_voltages(frequency)
self.set_voltages(str(tunning_voltage), str(matching_voltage)) confirmation = self.set_voltages(str(tunning_voltage), str(matching_voltage))
if confirmation:
reflection = self.read_reflection(frequency)
self.module.nqrduck_signal.emit("confirm_tune_and_match", reflection)
elif self.module.model.LUT.TYPE == "Mechanical": elif self.module.model.LUT.TYPE == "Mechanical":
pass tuning_position, matching_position = self.module.model.LUT.get_positions(frequency)
self.go_to_position(tuning_position, matching_position)
reflection = self.read_reflection(frequency)
self.module.nqrduck_signal.emit("confirm_tune_and_match", reflection)
def find_devices(self) -> None: def find_devices(self) -> None:
"""Scan for available serial devices and add them to the model as available devices.""" """Scan for available serial devices and add them to the model as available devices."""
@ -520,8 +528,10 @@ class AutoTMController(ModuleController):
confirmation = self.send_command(command) confirmation = self.send_command(command)
if confirmation: if confirmation:
logger.debug("Voltages set successfully") logger.debug("Voltages set successfully")
return True
# Emit nqrduck signal that T&M was successful # Emit nqrduck signal that T&M was successful
self.module.nqrduck_signal.emit("confirm_tune_and_match", None) # Maybe we measure the reflection first so we don't damage the PA lol
# The broadband module can then decide what to do with the signal
### Electrical Lookup Table ### ### Electrical Lookup Table ###
@ -967,6 +977,7 @@ class AutoTMController(ModuleController):
self.module.model.mech_lut = LUT self.module.model.mech_lut = LUT
self.module.model.LUT = LUT self.module.model.LUT = LUT
self.module.view.mech_LUT_spinner.hide() self.module.view.mech_LUT_spinner.hide()
self.module.nqrduck_signal.emit("LUT_finished", LUT)
def go_to_position(self, tuning_position : int, matching_position : int) -> None: def go_to_position(self, tuning_position : int, matching_position : int) -> None:
"""Go to the specified position. """Go to the specified position.
@ -976,11 +987,13 @@ class AutoTMController(ModuleController):
""" """
confirmation = self.on_absolute_move(tuning_position, self.module.model.tuning_stepper) confirmation = self.on_absolute_move(tuning_position, self.module.model.tuning_stepper)
if confirmation: if confirmation:
self.on_absolute_move(matching_position, self.module.model.matching_stepper) confirmation = self.on_absolute_move(matching_position, self.module.model.matching_stepper)
if confirmation:
return True
# This method isn't used anymore but it might be useful in the future so I'll keep it here # This method isn't used anymore but it might be useful in the future so I'll keep it here
def read_reflection(self, frequency) -> tuple: def read_reflection(self, frequency) -> float:
"""Starts a reflection measurement and reads the reflection at the specified frequency.""" """Starts a reflection measurement and reads the reflection at the specified frequency."""
# We send the command to the atm system # We send the command to the atm system
command = f"r{frequency}" command = f"r{frequency}"
@ -1009,7 +1022,12 @@ class AutoTMController(ModuleController):
# Reset the reflection cache # Reset the reflection cache
self.module.model.last_reflection = None self.module.model.last_reflection = None
return reflection magnitude = reflection[0]
CENTER_POINT_MAGNITUDE = 900 # mV
MAGNITUDE_SLOPE = 30 # dB/mV
magnitude = (magnitude - CENTER_POINT_MAGNITUDE) / MAGNITUDE_SLOPE
return -magnitude
else: else:
logger.error("Could not read reflection. No confirmation received") logger.error("Could not read reflection. No confirmation received")

4
src/nqrduck_autotm/model.py
View file

@ -240,7 +240,7 @@ class ElectricalLookupTable(LookupTable):
def init_voltages(self) -> None: def init_voltages(self) -> None:
"""Initialize the lookup table with default values.""" """Initialize the lookup table with default values."""
for frequency in np.arange( for frequency in np.arange(
self.start_frequency, self.stop_frequency, self.frequency_step self.start_frequency, self.stop_frequency + self.frequency_step, self.frequency_step
): ):
self.started_frequency = frequency self.started_frequency = frequency
self.add_voltages(None, None) self.add_voltages(None, None)
@ -305,7 +305,7 @@ class MechanicalLookupTable(LookupTable):
def init_positions(self) -> None: def init_positions(self) -> None:
"""Initialize the lookup table with default values.""" """Initialize the lookup table with default values."""
for frequency in np.arange( for frequency in np.arange(
self.start_frequency, self.stop_frequency, self.frequency_step self.start_frequency, self.stop_frequency + self.frequency_step, self.frequency_step
): ):
self.started_frequency = frequency self.started_frequency = frequency
self.add_positions(None, None) self.add_positions(None, None)