forked from zietzm/Helmholtz_Test_Bench
Introduce global to limit max field
This commit is contained in:
1 parent
03eaf8330c
commit
982a7d7a20
2 files changed
+7
-4
No files matched your search
@@ -50,3 +50,6 @@ default_psu_config = {
|
||||
# Configuration for socket interface
|
||||
SOCKET_PORT = 6677
|
||||
SOCKET_MAX_CONNECTIONS = 5
|
||||
|
||||
# Hardware safety limits
|
||||
MAG_MAG_FIELD = 3*37*1e-6 # [µT=A*µT/A] min coil constant x PSU current limit
|
||||
@@ -1361,7 +1361,7 @@ class CalibrateMagnetometerSimple(Frame):
|
||||
calibration_points = self.calibration_points_var.get()
|
||||
calibration_interval = self.calibration_interval_var.get()
|
||||
calibration_mag_field = self.mag_field_magnitude_var.get() * 1e-6 # converted to micro Tesla
|
||||
if calibration_mag_field <= 0 or calibration_mag_field > 110e-6:
|
||||
if calibration_mag_field <= 0 or calibration_mag_field > MAG_MAG_FIELD:
|
||||
raise MagFieldOutOfBounds
|
||||
self.calibration_thread = MagnetometerCalibrationSimple(self.view_mpi_queue,
|
||||
calibration_points,
|
||||
@@ -1370,7 +1370,7 @@ class CalibrateMagnetometerSimple(Frame):
|
||||
self.mgm_to_helmholtz_cos_trans)
|
||||
self.calibration_thread.start()
|
||||
self.deactivate_buttons()
|
||||
except (MagFieldOutOfBounds) as e:
|
||||
except MagFieldOutOfBounds as e:
|
||||
messagebox.showwarning("Calibration failed", "\n{}".format(e))
|
||||
except (DeviceAccessError, TclError) as e:
|
||||
messagebox.showwarning("Calibration failed", "Failed to start calibration:\n{}".format(e))
|
||||
@@ -1857,7 +1857,7 @@ class CalibrateMagnetometerComplete(Frame):
|
||||
calibration_points = self.calibration_points_var.get()
|
||||
calibration_interval = self.calibration_interval_var.get()
|
||||
calibration_mag_field = self.mag_field_magnitude_var.get() * 1e-6 # converted to micro Tesla
|
||||
if calibration_mag_field <= 0 or calibration_mag_field > 110e-6:
|
||||
if calibration_mag_field <= 0 or calibration_mag_field > MAG_MAG_FIELD:
|
||||
raise MagFieldOutOfBounds
|
||||
self.calibration_thread = MagnetometerCalibrationComplete(self.view_mpi_queue,
|
||||
calibration_points,
|
||||
@@ -1867,7 +1867,7 @@ class CalibrateMagnetometerComplete(Frame):
|
||||
self.right_column)
|
||||
self.calibration_thread.start()
|
||||
self.deactivate_buttons()
|
||||
except (MagFieldOutOfBounds) as e:
|
||||
except MagFieldOutOfBounds as e:
|
||||
messagebox.showwarning("Calibration failed", "\n{}".format(e))
|
||||
except (DeviceAccessError, TclError) as e:
|
||||
messagebox.showwarning("Calibration failed", "Failed to start calibration:\n{}".format(e))
|
||||
|
||||
Reference in new issue
Block a user