Merge branch 'develop' into feature/add-relock

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/psf/black
-    rev: 24.4.2
+    rev: 24.8.0
     hooks:
       - id: black
         exclude: ^(gateware/logic/|gateware/lowlevel/|gateware/linien_module.py|linien-server/linien_server/csrmap.py)
@@ -12,7 +12,7 @@ repos:
         name: isort (python)
 
   - repo: https://github.com/pycqa/flake8
-    rev: 7.0.0
+    rev: 7.1.1
     hooks:
       - id: flake8
         exclude: linien-server/linien_server/csrmap.py

CHANGELOG.md

@@ -7,11 +7,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [2.1.0]
+
 ### Added
 * Show differences when local and remote parameters do not match by @bleykauf in https://github.com/linien-org/linien/pull/400
 * Show voltage on the x-axis when sweeping by @bleykauf in https://github.com/linien-org/linien/pull/404
 * Added loss-of-lock detection and automatic relocking by @bleykauf in https://github.com/linien-org/linien/pull/403
 
+### Changed
+* Switched to Tableau color scheme and make colors consistent, i.e. signals have the same color while sweeping and when locked. By @bleykauf in https://github.com/linien-org/linien/pull/419.
+* Increase upper version constraint for `importlib-metadata` by @doronbehar in https://github.com/linien-org/linien/pull/416
+
+### Fixed
+
+* Fixed example code in the readme by @bleykauf in https://github.com/linien-org/linien/pull/420, thanks to @Andrew-wi for reporting this issue
+* Fixed a bug preventing the selection of a PSD algorithm via the GUI by @bleykauf in https://github.com/linien-org/linien/pull/421, thanks to @martinssonh for reporting this issue
+
 ## [2.0.4] - 2024-05-30
 
 ### Fixed
@@ -236,7 +247,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 * **Bug fixes and performance improvements**
 
-[Unreleased]: https://github.com/linien-org/linien/compare/v2.0.4...HEAD
+[Unreleased]: https://github.com/linien-org/linien/compare/v2.1.0...HEAD
+[2.1.0]: https://github.com/linien-org/linien/compare/v2.0.4...v2.1.0
 [2.0.4]: https://github.com/linien-org/linien/compare/v2.0.3...v2.0.4
 [2.0.3]: https://github.com/linien-org/linien/compare/v2.0.2...v2.0.3
 [2.0.2]: https://github.com/linien-org/linien/compare/v2.0.1...v2.0.2

README.md

@@ -89,10 +89,10 @@ from linien_client.deploy import install_remote_server
 
 device = Device(
     host="rp-xxxxxx.local",
-    user="root",
+    username="root",
     password="root"    
 )
-instalL_remote_server(device)
+install_remote_server(device)
 ```
 
 Finally, you can install the server manually, by connecting to the RedPitaya via SSH and
@@ -240,7 +240,7 @@ from linien_common.common import  MHz, Vpp, ANALOG_OUT_V
 
 dev = Device(
     host="rp-xxxxxx.local",
-    user="root",
+    username="root",
     password="root"    
 )
 c = LinienClient(dev)
@@ -335,7 +335,7 @@ from time import sleep
 
 c = LinienClient(
     host="rp-xxxxxx.local",
-    user="root",
+    username="root",
     password="root"
 )
 c.connect(autostart_server=True, use_parameter_cache=True)
@@ -496,7 +496,9 @@ Linien ‒ User-friendly locking of lasers using RedPitaya (STEMlab 125-14) that
 Copyright © 2014-2015 Robert Jördens\
 Copyright © 2018-2022 Benjamin Wiegand\
 Copyright © 2021-2024 Bastian Leykauf\
-Copyright © 2022 Christian Freier
+Copyright © 2022 Christian Freier\
+Copyright © 2023-2024 Doron Behar\
+
 
 Linien is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
 

gateware/bit2bin.py

@@ -1,7 +1,7 @@
-# Copyright 2014-2015 Robert Jördens <[email protected]>
-#
 # This file is part of Linien and based on redpid.
 #
+# Copyright (C) 2016-2024 Linien Authors (https://github.com/linien-org/linien#license)
+#
 # Linien is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or

gateware/fpga_image_helper.py

@@ -1,8 +1,7 @@
-# Copyright 2014-2015 Robert Jördens <[email protected]>
-# Copyright 2018-2022 Benjamin Wiegand <[email protected]>
-#
 # This file is part of Linien and based on redpid.
 #
+# Copyright (C) 2016-2024 Linien Authors (https://github.com/linien-org/linien#license)
+#
 # Linien is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or

gateware/hw_platform.py

@@ -1,9 +1,7 @@
-# Copyright 2014-2015 Robert Jördens <[email protected]>
-# Copyright 2018-2022 Benjamin Wiegand <[email protected]>
-# Copyright 2021-2022 Bastian Leykauf <[email protected]>
-#
 # This file is part of Linien and based on redpid.
 #
+# Copyright (C) 2016-2024 Linien Authors (https://github.com/linien-org/linien#license)
+#
 # Linien is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or

gateware/linien_module.py

@@ -1,10 +1,7 @@
-# Copyright 2014-2015 Robert Jördens <[email protected]>
-# Copyright 2018-2022 Benjamin Wiegand <[email protected]>
-# Copyright 2021-2023 Bastian Leykauf <[email protected]>
-# Copyright 2022 Christian Freier <[email protected]>
-#
 # This file is part of Linien and based on redpid.
 #
+# Copyright (C) 2016-2024 Linien Authors (https://github.com/linien-org/linien#license)
+#
 # Linien is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or

gateware/logic/autolock.py

@@ -1,8 +1,7 @@
-# Copyright 2018-2022 Benjamin Wiegand <[email protected]>
-# Copyright 2021-2022 Bastian Leykauf <[email protected]>
-#
 # This file is part of Linien and based on redpid.
 #
+# Copyright (C) 2016-2024 Linien Authors (https://github.com/linien-org/linien#license)
+#
 # Linien is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or

gateware/logic/autolock_utils.py

@@ -1,8 +1,7 @@
-# Copyright 2018-2022 Benjamin Wiegand <[email protected]>
-# Copyright 2021-2022 Bastian Leykauf <[email protected]>
-#
 # This file is part of Linien and based on redpid.
 #
+# Copyright (C) 2016-2024 Linien Authors (https://github.com/linien-org/linien#license)
+#
 # Linien is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or

gateware/logic/chains.py

@@ -1,9 +1,7 @@
-# Copyright 2014-2015 Robert Jördens <[email protected]>
-# Copyright 2018-2022 Benjamin Wiegand <[email protected]>
-# Copyright 2021-2022 Bastian Leykauf <[email protected]>
-#
 # This file is part of Linien and based on redpid.
 #
+# Copyright (C) 2016-2024 Linien Authors (https://github.com/linien-org/linien#license)
+#
 # Linien is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or

gateware/logic/cordic.py

@@ -1,9 +1,7 @@
-# Copyright 2014-2015 Robert Jördens <[email protected]>
-# Copyright 2018-2022 Benjamin Wiegand <[email protected]>
-# Copyright 2021-2022 Bastian Leykauf <[email protected]>
-#
 # This file is part of Linien and based on redpid.
 #
+# Copyright (C) 2016-2024 Linien Authors (https://github.com/linien-org/linien#license)
+#
 # Linien is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or

gateware/logic/decimation.py

@@ -1,8 +1,7 @@
-# Copyright 2018-2022 Benjamin Wiegand <[email protected]>
-# Copyright 2021-2022 Bastian Leykauf <[email protected]>
-#
 # This file is part of Linien and based on redpid.
 #
+# Copyright (C) 2016-2024 Linien Authors (https://github.com/linien-org/linien#license)
+#
 # Linien is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or

gateware/logic/delta_sigma.py

@@ -1,9 +1,7 @@
-# Copyright 2014-2015 Robert Jördens <[email protected]>
-# Copyright 2018-2022 Benjamin Wiegand <[email protected]>
-# Copyright 2021-2022 Bastian Leykauf <[email protected]>
-#
 # This file is part of Linien and based on redpid.
 #
+# Copyright (C) 2016-2024 Linien Authors (https://github.com/linien-org/linien#license)
+#
 # Linien is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or

gateware/logic/filter.py

@@ -1,9 +1,7 @@
-# Copyright 2014-2015 Robert Jördens <[email protected]>
-# Copyright 2018-2022 Benjamin Wiegand <[email protected]>
-# Copyright 2021-2022 Bastian Leykauf <[email protected]>
-#
 # This file is part of Linien and based on redpid.
 #
+# Copyright (C) 2016-2024 Linien Authors (https://github.com/linien-org/linien#license)
+#
 # Linien is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or

gateware/logic/iir.py

@@ -1,9 +1,7 @@
-# Copyright 2014-2015 Robert Jördens <[email protected]>
-# Copyright 2018-2022 Benjamin Wiegand <[email protected]>
-# Copyright 2021-2022 Bastian Leykauf <[email protected]>
-#
 # This file is part of Linien and based on redpid.
 #
+# Copyright (C) 2016-2024 Linien Authors (https://github.com/linien-org/linien#license)
+#
 # Linien is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or

gateware/logic/limit.py

@@ -1,9 +1,7 @@
-# Copyright 2014-2015 Robert Jördens <[email protected]>
-# Copyright 2018-2022 Benjamin Wiegand <[email protected]>
-# Copyright 2021-2022 Bastian Leykauf <[email protected]>
-#
 # This file is part of Linien and based on redpid.
 #
+# Copyright (C) 2016-2024 Linien Authors (https://github.com/linien-org/linien#license)
+#
 # Linien is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or

gateware/logic/modulate.py

@@ -1,9 +1,7 @@
-# Copyright 2014-2015 Robert Jördens <[email protected]>
-# Copyright 2018-2022 Benjamin Wiegand <[email protected]>
-# Copyright 2021-2022 Bastian Leykauf <[email protected]>
-#
 # This file is part of Linien and based on redpid.
 #
+# Copyright (C) 2016-2024 Linien Authors (https://github.com/linien-org/linien#license)
+#
 # Linien is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or

gateware/logic/pid.py

@@ -1,8 +1,7 @@
-# Copyright 2018-2022 Benjamin Wiegand <[email protected]>
-# Copyright 2021-2022 Bastian Leykauf <[email protected]>
-#
 # This file is part of Linien and based on redpid.
 #
+# Copyright (C) 2016-2024 Linien Authors (https://github.com/linien-org/linien#license)
+#
 # Linien is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or

gateware/logic/sweep.py

@@ -1,9 +1,7 @@
-# Copyright 2014-2015 Robert Jördens <[email protected]>
-# Copyright 2018-2022 Benjamin Wiegand <[email protected]>
-# Copyright 2021-2022 Bastian Leykauf <[email protected]>
-#
 # This file is part of Linien and based on redpid.
 #
+# Copyright (C) 2016-2024 Linien Authors (https://github.com/linien-org/linien#license)
+#
 # Linien is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or

gateware/lowlevel/analog.py

@@ -1,9 +1,7 @@
-# Copyright 2014-2015 Robert Jördens <[email protected]>
-# Copyright 2018-2022 Benjamin Wiegand <[email protected]>
-# Copyright 2021-2022 Bastian Leykauf <[email protected]>
-#
 # This file is part of Linien and based on redpid.
 #
+# Copyright (C) 2016-2024 Linien Authors (https://github.com/linien-org/linien#license)
+#
 # Linien is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or

gateware/lowlevel/crg.py

@@ -1,9 +1,7 @@
-# Copyright 2014-2015 Robert Jördens <[email protected]>
-# Copyright 2018-2022 Benjamin Wiegand <[email protected]>
-# Copyright 2021-2022 Bastian Leykauf <[email protected]>
-#
 # This file is part of Linien and based on redpid.
 #
+# Copyright (C) 2016-2024 Linien Authors (https://github.com/linien-org/linien#license)
+#
 # Linien is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or

gateware/lowlevel/dna.py

@@ -1,9 +1,7 @@
-# Copyright 2014-2015 Robert Jördens <[email protected]>
-# Copyright 2018-2022 Benjamin Wiegand <[email protected]>
-# Copyright 2021-2022 Bastian Leykauf <[email protected]>
-#
 # This file is part of Linien and based on redpid.
 #
+# Copyright (C) 2016-2024 Linien Authors (https://github.com/linien-org/linien#license)
+#
 # Linien is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or

gateware/lowlevel/gpio.py

@@ -1,9 +1,7 @@
-# Copyright 2014-2015 Robert Jördens <[email protected]>
-# Copyright 2018-2022 Benjamin Wiegand <[email protected]>
-# Copyright 2021-2022 Bastian Leykauf <[email protected]>
-#
 # This file is part of Linien and based on redpid.
 #
+# Copyright (C) 2016-2024 Linien Authors (https://github.com/linien-org/linien#license)
+#
 # Linien is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or

gateware/lowlevel/pitaya_ps.py

@@ -1,9 +1,7 @@
-# Copyright 2014-2015 Robert Jördens <[email protected]>
-# Copyright 2018-2022 Benjamin Wiegand <[email protected]>
-# Copyright 2021-2022 Bastian Leykauf <[email protected]>
-#
 # This file is part of Linien and based on redpid.
 #
+# Copyright (C) 2016-2024 Linien Authors (https://github.com/linien-org/linien#license)
+#
 # Linien is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or

gateware/lowlevel/scopegen.py

@@ -1,8 +1,7 @@
-# Copyright 2018-2022 Benjamin Wiegand <[email protected]>
-# Copyright 2021-2022 Bastian Leykauf <[email protected]>
-#
 # This file is part of Linien and based on redpid.
 #
+# Copyright (C) 2016-2024 Linien Authors (https://github.com/linien-org/linien#license)
+#
 # Linien is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or

gateware/lowlevel/xadc.py

@@ -1,9 +1,7 @@
-# Copyright 2014-2015 Robert Jördens <[email protected]>
-# Copyright 2018-2022 Benjamin Wiegand <[email protected]>
-# Copyright 2021-2022 Bastian Leykauf <[email protected]>
-#
 # This file is part of Linien and based on redpid.
 #
+# Copyright (C) 2016-2024 Linien Authors (https://github.com/linien-org/linien#license)
+#
 # Linien is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or

linien-client/linien_client/__init__.py

@@ -1,3 +1,20 @@
+# This file is part of Linien and based on redpid.
+#
+# Copyright (C) 2016-2024 Linien Authors (https://github.com/linien-org/linien#license)
+#
+# Linien is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Linien is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Linien.  If not, see <http://www.gnu.org/licenses/>.
+
 import importlib.metadata
 import logging
 from logging.handlers import RotatingFileHandler

linien-client/linien_client/connection.py

@@ -1,8 +1,7 @@
-# Copyright 2018-2022 Benjamin Wiegand <[email protected]>
-# Copyright 2021-2023 Bastian Leykauf <[email protected]>
-#
 # This file is part of Linien and based on redpid.
 #
+# Copyright (C) 2016-2024 Linien Authors (https://github.com/linien-org/linien#license)
+#
 # Linien is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or