Merge branch 'wip' into develop

Change-Id: Ib5084b8750b31523819c688f4954c52cef4d4a0c
2023-05-31 14:06:05 +02:00
parent 0771cb6899 726665ebd8
commit dc0cc590ed
167 changed files with 15251 additions and 188 deletions
--- a/cfg/lockin_cfg.py
+++ b/cfg/lockin_cfg.py
@@ -14,4 +14,3 @@ Mod('XY',
    'XY channels',
    io='io',
    )
-