Merge pull request #370 from linien-org/release/v1.0.1

Release v1.0.1
linien-org · Dec 22, 2023 · 0328dcd · 0328dcd
2 parents b0ba398 + 93f1f50
commit 0328dcd
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 22 deletions.
diff --git a/README.md b/README.md
@@ -129,8 +129,6 @@ When you're done, head over to *Modulation, Sweep & Spectroscopy* to configure m
 The bright red line is the demodulated spectroscopy signal. The dark red area is the signal strength obtained by [iq demodulation](https://en.wikipedia.org/wiki/In-phase_and_quadrature_components), i.e. the demodulation signal obtained when demodulating in phase at this point.
 
 ### PID-only mode
-| :exclamation: Please make sure that the modulation frequency/amplitude are set to 0 if using PID-only mode. See [this issue](https://github.com/linien-org/linien/issues/314). |
-|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 
 PID-only mode is intended for bare PID operation (no demodulation or filtering), bypassing most of the FPGA functionality. If enabled, the signal flow is FAST IN 1 → PID → FAST OUT 2. This is useful, if aiming for a high control bandwidth: PID-only mode reduces propagation delay from 320 ns to 125 ns which may make a difference when phase-locking lasers.
 

diff --git a/linien-client/setup.py b/linien-client/setup.py
@@ -18,7 +18,7 @@
 
 from setuptools import find_packages, setup
 
-version = "1.0.0"
+version = "1.0.1"
 
 setup(
     name="linien-client",
@@ -41,6 +41,6 @@
     install_requires=[
         "fabric>=2.7.0",
         "typing_extensions>=4.5.0",
-        "linien-common==1.0.0",
+        "linien-common==1.0.1",
     ],
 )
diff --git a/linien-common/setup.py b/linien-common/setup.py
@@ -19,7 +19,7 @@
 
 setup(
     name="linien-common",
-    version="1.0.0",
+    version="1.0.1",
     author="Benjamin Wiegand",
     author_email="[email protected]",
     maintainer="Bastian Leykauf",

diff --git a/linien-gui/setup.py b/linien-gui/setup.py
@@ -18,11 +18,9 @@
 
 from setuptools import find_packages, setup
 
-version = "1.0.0"
-
 setup(
     name="linien-gui",
-    version=version,
+    version="1.0.1",
     author="Benjamin Wiegand",
     author_email="[email protected]",
     maintainer="Bastian Leykauf",
@@ -44,7 +42,7 @@
         "pyqtgraph>=0.10.0",
         "PyQt5>=5.12.0",
         "superqt>=0.2.3",
-        "linien_client==1.0.0",
+        "linien_client==1.0.1",
     ],
     package_data={
         # IMPORTANT: any changes have to be made in pyinstaller.spec, too

diff --git a/linien-server/linien_server/linien_start_server.sh b/linien-server/linien_server/linien_start_server.sh
@@ -1,13 +1,8 @@
 #!/bin/bash
 
 # quit any remaining screen session
-if [ -x "$(command -v linien_stop_server.sh)" ]; then
-    linien_stop_server.sh
-fi
-screen -X -S linien-server quit
-# start a new one
-screen -S linien-server -d -m
+linien_stop_server.sh
 
 # stop ethernet blinking and start the server inside the screen session. Start ethernet blinking again after server stopped.
 # Regarding ethernet blinking, see https://github.com/RedPitaya/RedPitaya/issues/205
-screen -r linien-server -X stuff $"mdio-tool w eth0 0x1b 0x0000; linien-server $1; mdio-tool w eth0 0x1b 0x0f00; \n"
+screen -dmS linien-server bash -c "mdio-tool w eth0 0x1b 0x0000;linien-server;mdio-tool w eth0 0x1b 0x0f00"
diff --git a/linien-server/linien_server/linien_stop_server.sh b/linien-server/linien_server/linien_stop_server.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
 
 # Close screen session and start ethernet blinking again, see https://github.com/RedPitaya/RedPitaya/issues/205
-screen -X -S linien-server quit
+screen -XS linien-server quit
 mdio-tool w eth0 0x1b 0x0f00
diff --git a/linien-server/setup.py b/linien-server/setup.py
@@ -18,11 +18,9 @@
 
 from setuptools import find_packages, setup
 
-version = "1.0.0"
-
 setup(
     name="linien-server",
-    version=version,
+    version="1.0.1",
     author="Benjamin Wiegand",
     author_email="[email protected]",
     maintainer="Bastian Leykauf",
@@ -47,7 +45,7 @@
         "pyrp3>=1.1.0,<2.0;platform_machine=='armv7l'",  # only install on RedPitaya
         "requests==2.25.1;python_version<'3.10'",  # pinned because of bug in pip 9.0.1, see #339 # noqa: E501
         "requests>=2.25.1;python_version>='3.10'",
-        "linien-common==1.0.0",
+        "linien-common==1.0.1",
     ],
     scripts=[
         "linien_server/linien_start_server.sh",

diff --git a/version-info.json b/version-info.json
@@ -1,3 +1,3 @@
 {
-    "latest": "1.0.0"
+    "latest": "1.0.1"
 }