forked from M-Labs/nix-servo
246 lines
9.3 KiB
Diff
246 lines
9.3 KiB
Diff
diff --git a/linien-gui/linien_gui/ui/general_panel.ui b/linien_gui/ui/general_panel.ui
|
|
index 7cf74a7..6c2bd45 100644
|
|
--- a/linien-gui/linien_gui/ui/general_panel.ui
|
|
+++ b/linien_gui/ui/general_panel.ui
|
|
@@ -128,11 +128,6 @@
|
|
<string>FAST OUT 2</string>
|
|
</property>
|
|
</item>
|
|
- <item>
|
|
- <property name="text">
|
|
- <string>ANALOG OUT 0</string>
|
|
- </property>
|
|
- </item>
|
|
</widget>
|
|
</item>
|
|
</layout>
|
|
@@ -213,11 +208,6 @@
|
|
<string>FAST OUT 2</string>
|
|
</property>
|
|
</item>
|
|
- <item>
|
|
- <property name="text">
|
|
- <string>ANALOG OUT 0</string>
|
|
- </property>
|
|
- </item>
|
|
<item>
|
|
<property name="text">
|
|
<string>disabled</string>
|
|
@@ -389,6 +379,9 @@
|
|
<property name="text">
|
|
<string>ANALOG OUT 0</string>
|
|
</property>
|
|
+ <property name="visible">
|
|
+ <bool>false</bool>
|
|
+ </property>
|
|
</widget>
|
|
</item>
|
|
<item>
|
|
@@ -399,6 +392,9 @@
|
|
<verstretch>0</verstretch>
|
|
</sizepolicy>
|
|
</property>
|
|
+ <property name="visible">
|
|
+ <bool>false</bool>
|
|
+ </property>
|
|
<item>
|
|
<property name="text">
|
|
<string>positive</string>
|
|
@@ -619,6 +615,9 @@
|
|
<property name="title">
|
|
<string>Slow Analog Outputs (0-1.8V)</string>
|
|
</property>
|
|
+ <property name="visible">
|
|
+ <bool>false</bool>
|
|
+ </property>
|
|
<layout class="QVBoxLayout" name="verticalLayout_2">
|
|
<item>
|
|
<widget class="QLabel" name="label_20">
|
|
diff --git a/linien-gui/linien_gui/ui/main_window.ui b/linien_gui/ui/main_window.ui
|
|
index 3d8b8bf..72f6159 100644
|
|
--- a/linien-gui/linien_gui/ui/main_window.ui
|
|
+++ b/linien_gui/ui/main_window.ui
|
|
@@ -145,10 +145,10 @@ p, li { white-space: pre-wrap; }
|
|
<number>3</number>
|
|
</property>
|
|
<property name="minimum">
|
|
- <double>-1.000000000000000</double>
|
|
+ <double>-0.50000000000000</double>
|
|
</property>
|
|
<property name="maximum">
|
|
- <double>1.000000000000000</double>
|
|
+ <double>0.50000000000000</double>
|
|
</property>
|
|
<property name="singleStep">
|
|
<double>0.100000000000000</double>
|
|
@@ -199,13 +199,13 @@ p, li { white-space: pre-wrap; }lin
|
|
<double>0.000000000000000</double>
|
|
</property>
|
|
<property name="maximum">
|
|
- <double>1.000000000000000</double>
|
|
+ <double>0.50000000000000</double>
|
|
</property>
|
|
<property name="singleStep">
|
|
<double>0.100000000000000</double>
|
|
</property>
|
|
<property name="value">
|
|
- <double>1.000000000000000</double>
|
|
+ <double>0.500000000000000</double>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
@@ -242,7 +242,6 @@ p, li { white-space: pre-wrap; }
|
|
<widget class="QLabel" name="label_4">
|
|
<property name="font">
|
|
<font>
|
|
- <weight>75</weight>
|
|
<bold>true</bold>
|
|
</font>
|
|
</property>
|
|
@@ -278,7 +277,6 @@ p, li { white-space: pre-wrap; }
|
|
<widget class="QLabel" name="label_5">
|
|
<property name="font">
|
|
<font>
|
|
- <weight>75</weight>
|
|
<bold>true</bold>
|
|
</font>
|
|
</property>
|
|
@@ -366,7 +364,6 @@ p, li { white-space: pre-wrap; }
|
|
<widget class="QLabel" name="label">
|
|
<property name="font">
|
|
<font>
|
|
- <weight>75</weight>
|
|
<bold>true</bold>
|
|
</font>
|
|
</property>
|
|
diff --git a/linien-gui/linien_gui/ui/modulation_sweep_panel.ui b/linien_gui/ui/modulation_sweep_panel.ui
|
|
index 6d8af14..29c8a63 100644
|
|
--- a/linien-gui/linien_gui/ui/modulation_sweep_panel.ui
|
|
+++ b/linien_gui/ui/modulation_sweep_panel.ui
|
|
@@ -68,7 +68,7 @@
|
|
<number>3</number>
|
|
</property>
|
|
<property name="maximum">
|
|
- <double>2.000000000000000</double>
|
|
+ <double>1.000000000000000</double>
|
|
</property>
|
|
<property name="singleStep">
|
|
<double>0.100000000000000</double>
|
|
diff --git a/linien-gui/linien_gui/ui/optimization_panel.ui b/linien-gui/linien_gui/ui/optimization_panel.ui
|
|
index 3bf165f..6694112 100644
|
|
--- a/linien-gui/linien_gui/ui/optimization_panel.ui
|
|
+++ b/linien-gui/linien_gui/ui/optimization_panel.ui
|
|
@@ -61,7 +61,11 @@
|
|
<number>30</number>
|
|
</property>
|
|
<item>
|
|
- <widget class="CustomDoubleSpinBoxNoSign" name="optimization_mod_freq_min"/>
|
|
+ <widget class="CustomDoubleSpinBoxNoSign" name="optimization_mod_freq_min">
|
|
+ <property name="decimals">
|
|
+ <number>4</number>
|
|
+ </property>
|
|
+ </widget>
|
|
</item>
|
|
<item>
|
|
<widget class="QLabel" name="label_24">
|
|
@@ -84,6 +88,9 @@
|
|
<verstretch>0</verstretch>
|
|
</sizepolicy>
|
|
</property>
|
|
+ <property name="decimals">
|
|
+ <number>4</number>
|
|
+ </property>
|
|
<property name="value">
|
|
<double>10.000000000000000</double>
|
|
</property>
|
|
@@ -115,7 +122,10 @@
|
|
<item>
|
|
<widget class="CustomDoubleSpinBoxNoSign" name="optimization_mod_amp_min">
|
|
<property name="maximum">
|
|
- <double>2.000000000000000</double>
|
|
+ <double>1.000000000000000</double>
|
|
+ </property>
|
|
+ <property name="singleStep">
|
|
+ <double>0.100000000000000</double>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
@@ -135,10 +145,13 @@
|
|
<item>
|
|
<widget class="CustomDoubleSpinBoxNoSign" name="optimization_mod_amp_max">
|
|
<property name="maximum">
|
|
- <double>2.000000000000000</double>
|
|
+ <double>1.000000000000000</double>
|
|
+ </property>
|
|
+ <property name="singleStep">
|
|
+ <double>0.100000000000000</double>
|
|
</property>
|
|
<property name="value">
|
|
- <double>2.000000000000000</double>
|
|
+ <double>1.000000000000000</double>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
diff --git a/linien-gui/linien_gui/ui/new_device_dialog.ui b/linien-gui/linien_gui/ui/new_device_dialog.ui
|
|
index 38c3513..e543744 100644
|
|
--- a/linien-gui/linien_gui/ui/new_device_dialog.ui
|
|
+++ b/linien-gui/linien_gui/ui/new_device_dialog.ui
|
|
@@ -52,7 +52,7 @@
|
|
<item>
|
|
<widget class="QLineEdit" name="host">
|
|
<property name="text">
|
|
- <string>rp-xxxxxx.local</string>
|
|
+ <string>192.168.1.129</string>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
@@ -67,6 +67,9 @@
|
|
<property name="wordWrap">
|
|
<bool>true</bool>
|
|
</property>
|
|
+ <property name="visible">
|
|
+ <bool>false</bool>
|
|
+ </property>
|
|
</widget>
|
|
</item>
|
|
</layout>
|
|
diff --git a/linien-gui/linien_gui/ui/sweep_control.py b/linien-gui/linien_gui/ui/sweep_control.py
|
|
index 7d2bb2d..e98c169 100644
|
|
--- a/linien-gui/linien_gui/ui/sweep_control.py
|
|
+++ b/linien-gui/linien_gui/ui/sweep_control.py
|
|
@@ -109,6 +109,6 @@ class SweepSlider(superqt.QDoubleRangeSlider):
|
|
|
|
def ready(self):
|
|
# set control boundaries
|
|
- self.setMinimum(-1.0)
|
|
- self.setMaximum(1.0)
|
|
+ self.setMinimum(-0.5)
|
|
+ self.setMaximum(0.5)
|
|
self.setSingleStep(0.001)
|
|
diff --git a/linien-client/linien_client/device.py b/linien-client/linien_client/device.py
|
|
index 727fbba..2f0f704 100644
|
|
--- a/linien-client/linien_client/device.py
|
|
+++ b/linien-client/linien_client/device.py
|
|
@@ -48,7 +48,7 @@ class Device:
|
|
|
|
def __post_init__(self):
|
|
if self.host == "":
|
|
- self.host = "rp-xxxxxx.local"
|
|
+ self.host = "192.168.1.129"
|
|
if self.username == "":
|
|
self.username = "root"
|
|
if self.password == "":
|
|
diff --git a/linien-gui/linien_gui/ui/device_manager.py b/linien-gui/linien_gui/ui/device_manager.py
|
|
index 16994ad..85abcf2 100644
|
|
--- a/linien-gui/linien_gui/ui/device_manager.py
|
|
+++ b/linien-gui/linien_gui/ui/device_manager.py
|
|
@@ -151,7 +151,7 @@ class DeviceManager(QtWidgets.QMainWindow):
|
|
]
|
|
) -> None:
|
|
question = (
|
|
- "Linien on RedPitaya is running with different parameters than the "
|
|
+ "Linien on Fast-Servo is running with different parameters than the "
|
|
"ones saved locally on this machine. Do you want to upload the local "
|
|
"parameters or keep the remote ones? Note that remote parameters are "
|
|
"only saved if Linien server was shut down properly, not when "
|