Implemented frequency sweep range.

This commit is contained in:
jupfi 2023-08-10 10:09:20 +02:00
parent a19cc3b8b4
commit 519b4ddcfa
2 changed files with 62 additions and 8 deletions

View file

@ -22,7 +22,10 @@ class AutoTMController(ModuleController):
logger.debug("Found device: %s", device) logger.debug("Found device: %s", device)
def connect(self, device : str) -> None: def connect(self, device : str) -> None:
"""Connect to the specified device. """ """Connect to the specified device.
Args:
device (str): The device port to connect to."""
logger.debug("Connecting to device %s", device) logger.debug("Connecting to device %s", device)
try: try:
self.module.model.serial = QtSerialPort.QSerialPort(device, baudRate=self.BAUDRATE, readyRead=self.on_ready_read) self.module.model.serial = QtSerialPort.QSerialPort(device, baudRate=self.BAUDRATE, readyRead=self.on_ready_read)
@ -34,18 +37,55 @@ class AutoTMController(ModuleController):
except Exception as e: except Exception as e:
logger.error("Could not connect to device %s: %s", device, e) logger.error("Could not connect to device %s: %s", device, e)
def start_frequency_sweep(self, start_frequency : float, stop_frequency : float) -> None: def start_frequency_sweep(self, start_frequency : str, stop_frequency : str) -> None:
""" This starts a frequency sweep on the device in the specified range.""" """ This starts a frequency sweep on the device in the specified range.
logger.debug("Starting frequency sweep from %s to %s", start_frequency, stop_frequency)
Args:
start_frequency (str): The start frequency in MHz.
stop_frequency (str): The stop frequency in MHz.
"""
FREQUENCY_STEP = 50000 # Hz
MIN_FREQUENCY = 35e6 # Hz
MAX_FREQUENCY = 300e6 # Hz
try:
start_frequency = float(start_frequency) * 1e6
stop_frequency = float(stop_frequency) * 1e6
except ValueError:
error = "Could not start frequency sweep. Start and stop frequency must be floats"
logger.error(error)
self.module.view.add_info_text(error)
return
if start_frequency > stop_frequency:
error = "Could not start frequency sweep. Start frequency must be smaller than stop frequency"
logger.error(error)
self.module.view.add_info_text(error)
return
if start_frequency < 0 or stop_frequency < 0:
error = "Could not start frequency sweep. Start and stop frequency must be positive"
logger.error(error)
self.module.view.add_info_text(error)
return
if start_frequency < MIN_FREQUENCY or stop_frequency > MAX_FREQUENCY:
error = "Could not start frequency sweep. Start and stop frequency must be between %s and %s MHz" % (MIN_FREQUENCY / 1e6, MAX_FREQUENCY / 1e6)
logger.error(error)
self.module.view.add_info_text(error)
return
logger.debug("Starting frequency sweep from %s to %s with step size %s", start_frequency, stop_frequency, FREQUENCY_STEP)
# We create the frequency sweep spinner dialog # We create the frequency sweep spinner dialog
self.module.model.clear_data_points() self.module.model.clear_data_points()
self.module.view.create_frequency_sweep_spinner_dialog() self.module.view.create_frequency_sweep_spinner_dialog()
# Print the command 'f <start> <stop>' to the serial connection # Print the command 'f<start>f<stop>' to the serial connection
try: try:
command = "f %s %s" % (start_frequency, stop_frequency) command = "f%sf%sf%s" % (start_frequency, stop_frequency, FREQUENCY_STEP)
self.module.model.serial.write(command.encode('utf-8')) self.module.model.serial.write(command.encode('utf-8'))
except AttributeError: except AttributeError:
logger.error("Could not start frequency sweep. No device connected.") logger.error("Could not start frequency sweep. No device connected.")
self.module.view.frequency_sweep_spinner.hide()
def on_ready_read(self) -> None: def on_ready_read(self) -> None:

View file

@ -40,8 +40,8 @@ class AutoTMView(ModuleView):
# On clicking of the start button call the start_frequency_sweep method # On clicking of the start button call the start_frequency_sweep method
self._ui_form.startButton.clicked.connect(lambda: self.module.controller.start_frequency_sweep( self._ui_form.startButton.clicked.connect(lambda: self.module.controller.start_frequency_sweep(
float(self._ui_form.startEdit.text()), self._ui_form.startEdit.text(),
float(self._ui_form.stopEdit.text()) self._ui_form.stopEdit.text()
)) ))
# On clicking of the calibration button call the on_calibration_button_clicked method # On clicking of the calibration button call the on_calibration_button_clicked method
@ -206,6 +206,20 @@ class AutoTMView(ModuleView):
self._ui_form.scrollAreaWidgetContents.layout().addWidget(text_label) self._ui_form.scrollAreaWidgetContents.layout().addWidget(text_label)
self._ui_form.scrollArea.verticalScrollBar().setValue(self._ui_form.scrollArea.verticalScrollBar().maximum()) self._ui_form.scrollArea.verticalScrollBar().setValue(self._ui_form.scrollArea.verticalScrollBar().maximum())
def add_error_text(self, text : str) -> None:
""" Adds text to the error text box.
Args:
text (str): Text to add to the error text box.
"""
# Add a timestamp to the text
timestamp = datetime.now().strftime("%H:%M:%S")
text = "[%s] %s ERROR:" % (timestamp, text)
text_label = QLabel(text)
text_label.setStyleSheet("font-size: 25px; color: red;")
self._ui_form.scrollAreaWidgetContents.layout().addWidget(text_label)
self._ui_form.scrollArea.verticalScrollBar().setValue(self._ui_form.scrollArea.verticalScrollBar().maximum())
def create_frequency_sweep_spinner_dialog(self) -> None: def create_frequency_sweep_spinner_dialog(self) -> None:
"""Creates a frequency sweep spinner dialog. """ """Creates a frequency sweep spinner dialog. """
self.frequency_sweep_spinner = self.FrequencySweepSpinner() self.frequency_sweep_spinner = self.FrequencySweepSpinner()