forked from M-Labs/nix-servo
86 lines
4.2 KiB
Diff
86 lines
4.2 KiB
Diff
diff --git a/linien-server/linien_server/parameters.py b/linien-server/linien_server/parameters.py
|
|
index 12f16ed..287f304 100644
|
|
--- a/linien-server/linien_server/parameters.py
|
|
+++ b/linien-server/linien_server/parameters.py
|
|
@@ -311,7 +311,7 @@ class Parameters:
|
|
# ------------------- MODULATION PARAMETERS ------------------------------------
|
|
|
|
self.modulation_amplitude = Parameter(
|
|
- min_=0, max_=(1 << 14) - 1, start=1 * Vpp, restorable=True, loggable=True
|
|
+ min_=0, max_=(1 << 14) - 1, start=0.1 * Vpp, restorable=True, loggable=True
|
|
)
|
|
"""
|
|
The amplitude of the modulation in internal units. Use Vpp for conversion to
|
|
@@ -320,7 +320,7 @@ class Parameters:
|
|
"""
|
|
|
|
self.modulation_frequency = Parameter(
|
|
- min_=0, max_=0xFFFFFFFF, start=15 * MHz, restorable=True, loggable=True
|
|
+ min_=0, max_=0xFFFFFFFF, start=1 * MHz, restorable=True, loggable=True
|
|
)
|
|
"""
|
|
Frequency of the modulation in internal units. Use MHz for conversion to
|
|
diff --git a/linien-server/linien_server/parameters.py b/linien-server/linien_server/parameters.py
|
|
index fe482d7..04a3c24 100644
|
|
--- a/linien-server/linien_server/parameters.py
|
|
+++ b/linien-server/linien_server/parameters.py
|
|
@@ -292,14 +292,14 @@ class Parameters:
|
|
|
|
# ------------------- SWEEP PARAMETERS -----------------------------------------
|
|
|
|
- self.sweep_amplitude = Parameter(min_=0.001, max_=1, start=1, loggable=True)
|
|
+ self.sweep_amplitude = Parameter(min_=0.001, max_=0.5, start=0.5, loggable=True)
|
|
"""
|
|
Amplitude of the sweep in units of 0.5 * Vpp of the output (2 V for fast outputs
|
|
(range +/- 1 V) and 0.9 V for slow outputs (range 0 V to 1.8 V)). That means an
|
|
amplitude of 1.0 corresponds to the full sweep range in both cases.
|
|
"""
|
|
|
|
- self.sweep_center = Parameter(min_=-1, max_=1, start=0, loggable=True)
|
|
+ self.sweep_center = Parameter(min_=-0.5, max_=0.5, start=0, loggable=True)
|
|
"""
|
|
The center position of the sweep. If a fast output is used for the sweep this is
|
|
the sweep center position in volts. If the slow output is used the interval
|
|
diff --git a/linien-server/linien_server/registers.py b/linien-server/linien_server/registers.py
|
|
index 2b8f697..65e9732 100644
|
|
--- a/linien-server/linien_server/registers.py
|
|
+++ b/linien-server/linien_server/registers.py
|
|
@@ -94,12 +94,12 @@ class Registers:
|
|
logic_sweep_pause=int(self.parameters.sweep_pause.value),
|
|
logic_sweep_step=int(
|
|
DEFAULT_SWEEP_SPEED
|
|
- * self.parameters.sweep_amplitude.value
|
|
+ * self.parameters.sweep_amplitude.value
|
|
/ (2**self.parameters.sweep_speed.value)
|
|
),
|
|
# NOTE: Sweep center is set by `logic_out_offset`.
|
|
- logic_sweep_min=-1 * max_(self.parameters.sweep_amplitude.value * 8191),
|
|
- logic_sweep_max=max_(self.parameters.sweep_amplitude.value * 8191),
|
|
+ logic_sweep_min=-1 * max_(self.parameters.sweep_amplitude.value * 16384),
|
|
+ logic_sweep_max=max_(self.parameters.sweep_amplitude.value * 16384),
|
|
logic_mod_freq=(
|
|
self.parameters.modulation_frequency.value
|
|
if not self.parameters.pid_only_mode.value
|
|
@@ -121,7 +121,7 @@ class Registers:
|
|
logic_chain_b_offset=twos_complement(
|
|
int(self.parameters.offset_b.value), 14
|
|
),
|
|
- logic_out_offset=int(self.parameters.sweep_center.value * 8191),
|
|
+ logic_out_offset=int(self.parameters.sweep_center.value * 16384),
|
|
logic_combined_offset=twos_complement(
|
|
self.parameters.combined_offset.value, 14
|
|
),
|
|
diff --git a/linien-common/linien_common/config.py b/linien-common/linien_common/config.py
|
|
index 6ba92e6..8d8c554 100644
|
|
--- a/linien-common/linien_common/config.py
|
|
+++ b/linien-common/linien_common/config.py
|
|
@@ -24,7 +24,7 @@ logger.setLevel(logging.DEBUG)
|
|
|
|
ACQUISITION_PORT = 19321
|
|
SERVER_PORT = 18862
|
|
-DEFAULT_SWEEP_SPEED = (125 * 2048) << 6
|
|
+DEFAULT_SWEEP_SPEED = 2 ** 40 / (125 * 10 ** 6 ) * 3800
|
|
|
|
USER_DATA_PATH = Path(AppDirs("linien").user_data_dir)
|
|
USER_DATA_PATH.mkdir(parents=True, exist_ok=True)
|