chore: move files to new locations.

linien-org · Jun 2, 2022 · 9b936c4 · 9b936c4
1 parent cf16419
commit 9b936c4
Show file tree

Hide file tree

Showing 95 changed files with 27 additions and 30 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,7 +9,6 @@ __pycache__
 /*.v
 /dist
 .eggs
-linien-*
 
 .mypy_cache
 .vscode

diff --git a/MANIFEST.in b/MANIFEST.in
diff --git a/scripts/bit2bin.py → gateware/bit2bin.py b/scripts/bit2bin.py → gateware/bit2bin.py
diff --git a/scripts/build_fpga_image.sh → gateware/build_fpga_image.sh b/scripts/build_fpga_image.sh → gateware/build_fpga_image.sh
diff --git a/scripts/fpga_image_helper.py → gateware/fpga_image_helper.py b/scripts/fpga_image_helper.py → gateware/fpga_image_helper.py
diff --git a/verilog/axi_slave.v → gateware/verilog/axi_slave.v b/verilog/axi_slave.v → gateware/verilog/axi_slave.v
diff --git a/verilog/bus_clk_bridge.v → gateware/verilog/bus_clk_bridge.v b/verilog/bus_clk_bridge.v → gateware/verilog/bus_clk_bridge.v
diff --git a/...cessing_system7_v5_4_processing_system7.v → ...cessing_system7_v5_4_processing_system7.v b/...cessing_system7_v5_4_processing_system7.v → ...cessing_system7_v5_4_processing_system7.v
diff --git a/verilog/red_pitaya_scope.v → gateware/verilog/red_pitaya_scope.v b/verilog/red_pitaya_scope.v → gateware/verilog/red_pitaya_scope.v
diff --git a/verilog/system_processing_system7_0_0.v → ...e/verilog/system_processing_system7_0_0.v b/verilog/system_processing_system7_0_0.v → ...e/verilog/system_processing_system7_0_0.v
diff --git a/verilog/system_processing_system7_0_0.xdc → ...verilog/system_processing_system7_0_0.xdc b/verilog/system_processing_system7_0_0.xdc → ...verilog/system_processing_system7_0_0.xdc
diff --git a/linien/client/__init__.py → ...n/linien-client/linien/client/__init__.py b/linien/client/__init__.py → ...n/linien-client/linien/client/__init__.py
diff --git a/linien/client/connection.py → ...linien-client/linien/client/connection.py b/linien/client/connection.py → ...linien-client/linien/client/connection.py
diff --git a/linien/client/exceptions.py → ...linien-client/linien/client/exceptions.py b/linien/client/exceptions.py → ...linien-client/linien/client/exceptions.py
diff --git a/linien/client/remote_parameters.py → ...client/linien/client/remote_parameters.py b/linien/client/remote_parameters.py → ...client/linien/client/remote_parameters.py
diff --git a/linien/client/utils.py → linien/linien-client/linien/client/utils.py b/linien/client/utils.py → linien/linien-client/linien/client/utils.py
diff --git a/requirements_client.txt → linien/linien-client/requirements.txt b/requirements_client.txt → linien/linien-client/requirements.txt
@@ -1,6 +1,6 @@
-numpy==1.21.0
-paramiko==2.10.1
-plumbum==1.6.9
-rpyc==4.1.5
-scipy==1.4.1
+numpy==1.21.0
+paramiko==2.10.1
+plumbum==1.6.9
+rpyc==4.1.5
+scipy==1.4.1
 uuid==1.30
diff --git a/setup_client.py → linien/linien-client/setup.py b/setup_client.py → linien/linien-client/setup.py
diff --git a/linien/common.py → linien/linien-common/linien/common.py b/linien/common.py → linien/linien-common/linien/common.py
diff --git a/linien/config.py → linien/linien-common/linien/config.py b/linien/config.py → linien/linien-common/linien/config.py
diff --git a/scripts/build_standalone_client.sh → linien/linien-gui/build_standalone_client.sh b/scripts/build_standalone_client.sh → linien/linien-gui/build_standalone_client.sh
diff --git a/linien/gui/__init__.py → linien/linien-gui/linien/gui/__init__.py b/linien/gui/__init__.py → linien/linien-gui/linien/gui/__init__.py
diff --git a/linien/gui/app.py → linien/linien-gui/linien/gui/app.py b/linien/gui/app.py → linien/linien-gui/linien/gui/app.py
diff --git a/linien/gui/config.py → linien/linien-gui/linien/gui/config.py b/linien/gui/config.py → linien/linien-gui/linien/gui/config.py
diff --git a/linien/gui/dialogs.py → linien/linien-gui/linien/gui/dialogs.py b/linien/gui/dialogs.py → linien/linien-gui/linien/gui/dialogs.py
diff --git a/linien/gui/icon.ico → linien/linien-gui/linien/gui/icon.ico b/linien/gui/icon.ico → linien/linien-gui/linien/gui/icon.ico
diff --git a/linien/gui/ui/__init__.py → linien/linien-gui/linien/gui/ui/__init__.py b/linien/gui/ui/__init__.py → linien/linien-gui/linien/gui/ui/__init__.py
diff --git a/linien/gui/ui/device_manager.py → ...inien-gui/linien/gui/ui/device_manager.py b/linien/gui/ui/device_manager.py → ...inien-gui/linien/gui/ui/device_manager.py
diff --git a/linien/gui/ui/device_manager.ui → ...inien-gui/linien/gui/ui/device_manager.ui b/linien/gui/ui/device_manager.ui → ...inien-gui/linien/gui/ui/device_manager.ui
diff --git a/linien/gui/ui/general_panel.py → ...linien-gui/linien/gui/ui/general_panel.py b/linien/gui/ui/general_panel.py → ...linien-gui/linien/gui/ui/general_panel.py
diff --git a/linien/gui/ui/general_panel.ui → ...linien-gui/linien/gui/ui/general_panel.ui b/linien/gui/ui/general_panel.ui → ...linien-gui/linien/gui/ui/general_panel.ui
diff --git a/linien/gui/ui/lock_status_panel.py → ...en-gui/linien/gui/ui/lock_status_panel.py b/linien/gui/ui/lock_status_panel.py → ...en-gui/linien/gui/ui/lock_status_panel.py
diff --git a/linien/gui/ui/locking_panel.py → ...linien-gui/linien/gui/ui/locking_panel.py b/linien/gui/ui/locking_panel.py → ...linien-gui/linien/gui/ui/locking_panel.py
diff --git a/linien/gui/ui/locking_panel.ui → ...linien-gui/linien/gui/ui/locking_panel.ui b/linien/gui/ui/locking_panel.ui → ...linien-gui/linien/gui/ui/locking_panel.ui
diff --git a/linien/gui/ui/main_window.py → ...n/linien-gui/linien/gui/ui/main_window.py b/linien/gui/ui/main_window.py → ...n/linien-gui/linien/gui/ui/main_window.py
diff --git a/linien/gui/ui/main_window.ui → ...n/linien-gui/linien/gui/ui/main_window.ui b/linien/gui/ui/main_window.ui → ...n/linien-gui/linien/gui/ui/main_window.ui
diff --git a/linien/gui/ui/modulation_sweep_panel.py → ...i/linien/gui/ui/modulation_sweep_panel.py b/linien/gui/ui/modulation_sweep_panel.py → ...i/linien/gui/ui/modulation_sweep_panel.py
diff --git a/linien/gui/ui/modulation_sweep_panel.ui → ...i/linien/gui/ui/modulation_sweep_panel.ui b/linien/gui/ui/modulation_sweep_panel.ui → ...i/linien/gui/ui/modulation_sweep_panel.ui
diff --git a/linien/gui/ui/new_device_dialog.py → ...en-gui/linien/gui/ui/new_device_dialog.py b/linien/gui/ui/new_device_dialog.py → ...en-gui/linien/gui/ui/new_device_dialog.py
diff --git a/linien/gui/ui/new_device_dialog.ui → ...en-gui/linien/gui/ui/new_device_dialog.ui b/linien/gui/ui/new_device_dialog.ui → ...en-gui/linien/gui/ui/new_device_dialog.ui
diff --git a/linien/gui/ui/optimization_panel.py → ...n-gui/linien/gui/ui/optimization_panel.py b/linien/gui/ui/optimization_panel.py → ...n-gui/linien/gui/ui/optimization_panel.py
diff --git a/linien/gui/ui/optimization_panel.ui → ...n-gui/linien/gui/ui/optimization_panel.ui b/linien/gui/ui/optimization_panel.ui → ...n-gui/linien/gui/ui/optimization_panel.ui
diff --git a/linien/gui/ui/plot_widget.py → ...n/linien-gui/linien/gui/ui/plot_widget.py b/linien/gui/ui/plot_widget.py → ...n/linien-gui/linien/gui/ui/plot_widget.py
diff --git a/linien/gui/ui/psd_plot_widget.py → ...nien-gui/linien/gui/ui/psd_plot_widget.py b/linien/gui/ui/psd_plot_widget.py → ...nien-gui/linien/gui/ui/psd_plot_widget.py
diff --git a/linien/gui/ui/psd_table_widget.py → ...ien-gui/linien/gui/ui/psd_table_widget.py b/linien/gui/ui/psd_table_widget.py → ...ien-gui/linien/gui/ui/psd_table_widget.py
diff --git a/linien/gui/ui/psd_window.py → ...en/linien-gui/linien/gui/ui/psd_window.py b/linien/gui/ui/psd_window.py → ...en/linien-gui/linien/gui/ui/psd_window.py
diff --git a/linien/gui/ui/psd_window.ui → ...en/linien-gui/linien/gui/ui/psd_window.ui b/linien/gui/ui/psd_window.ui → ...en/linien-gui/linien/gui/ui/psd_window.ui
diff --git a/linien/gui/ui/right_panel.py → ...n/linien-gui/linien/gui/ui/right_panel.py b/linien/gui/ui/right_panel.py → ...n/linien-gui/linien/gui/ui/right_panel.py
diff --git a/linien/gui/ui/spectroscopy_panel.py → ...n-gui/linien/gui/ui/spectroscopy_panel.py b/linien/gui/ui/spectroscopy_panel.py → ...n-gui/linien/gui/ui/spectroscopy_panel.py
diff --git a/linien/gui/ui/spectroscopy_panel.ui → ...n-gui/linien/gui/ui/spectroscopy_panel.ui b/linien/gui/ui/spectroscopy_panel.ui → ...n-gui/linien/gui/ui/spectroscopy_panel.ui
diff --git a/linien/gui/ui/spin_box.py → linien/linien-gui/linien/gui/ui/spin_box.py b/linien/gui/ui/spin_box.py → linien/linien-gui/linien/gui/ui/spin_box.py
diff --git a/linien/gui/ui/sweep_control.py → ...linien-gui/linien/gui/ui/sweep_control.py b/linien/gui/ui/sweep_control.py → ...linien-gui/linien/gui/ui/sweep_control.py
diff --git a/linien/gui/ui/version_checker.py → ...nien-gui/linien/gui/ui/version_checker.py b/linien/gui/ui/version_checker.py → ...nien-gui/linien/gui/ui/version_checker.py
diff --git a/linien/gui/ui/view_panel.py → ...en/linien-gui/linien/gui/ui/view_panel.py b/linien/gui/ui/view_panel.py → ...en/linien-gui/linien/gui/ui/view_panel.py
diff --git a/linien/gui/ui/view_panel.ui → ...en/linien-gui/linien/gui/ui/view_panel.ui b/linien/gui/ui/view_panel.ui → ...en/linien-gui/linien/gui/ui/view_panel.ui
diff --git a/linien/gui/utils_gui.py → linien/linien-gui/linien/gui/utils_gui.py b/linien/gui/utils_gui.py → linien/linien-gui/linien/gui/utils_gui.py
diff --git a/linien/gui/widgets.py → linien/linien-gui/linien/gui/widgets.py b/linien/gui/widgets.py → linien/linien-gui/linien/gui/widgets.py
diff --git a/pyinstaller.spec → linien/linien-gui/pyinstaller.spec b/pyinstaller.spec → linien/linien-gui/pyinstaller.spec
diff --git a/requirements_gui.txt → linien/linien-gui/requirements.txt b/requirements_gui.txt → linien/linien-gui/requirements.txt
@@ -1,23 +1,23 @@
-altgraph==0.17
-appdirs==1.4.4
-bcrypt==3.2.0
-cffi==1.14.2
-click==8.1.2
-cryptography==3.3.2
-future==0.18.2
-numpy==1.21.0
-paramiko==2.10.1
-pefile==2019.4.18
-plumbum==1.6.9
-pycparser==2.20
-PyNaCl==1.4.0
-PyQt5==5.15.0
-PyQt5-sip==12.8.0
-pyqtgraph==0.11.0
-pywin32-ctypes==0.2.0
-rpyc==4.1.5
-scipy==1.4.1
-six==1.15.0
-uuid==1.30
-superqt==0.2.3
+altgraph==0.17
+appdirs==1.4.4
+bcrypt==3.2.0
+cffi==1.14.2
+click==8.1.2
+cryptography==3.3.2
+future==0.18.2
+numpy==1.21.0
+paramiko==2.10.1
+pefile==2019.4.18
+plumbum==1.6.9
+pycparser==2.20
+PyNaCl==1.4.0
+PyQt5==5.15.0
+PyQt5-sip==12.8.0
+pyqtgraph==0.11.0
+pywin32-ctypes==0.2.0
+rpyc==4.1.5
+scipy==1.4.1
+six==1.15.0
+uuid==1.30
+superqt==0.2.3
 packaging==21.3
diff --git a/setup_gui.py → linien/linien-gui/setup.py b/setup_gui.py → linien/linien-gui/setup.py
diff --git a/linien/server/acquisition.py → ...inien-server/linien/server/acquisition.py b/linien/server/acquisition.py → ...inien-server/linien/server/acquisition.py
diff --git a/linien/server/acquisition_process.py → ...rver/linien/server/acquisition_process.py b/linien/server/acquisition_process.py → ...rver/linien/server/acquisition_process.py
diff --git a/linien/server/approach_line.py → ...ien-server/linien/server/approach_line.py b/linien/server/approach_line.py → ...ien-server/linien/server/approach_line.py
diff --git a/linien/server/autolock/__init__.py → ...server/linien/server/autolock/__init__.py b/linien/server/autolock/__init__.py → ...server/linien/server/autolock/__init__.py
diff --git a/...en/server/autolock/algorithm_selection.py → ...en/server/autolock/algorithm_selection.py b/...en/server/autolock/algorithm_selection.py → ...en/server/autolock/algorithm_selection.py
diff --git a/linien/server/autolock/autolock.py → ...server/linien/server/autolock/autolock.py b/linien/server/autolock/autolock.py → ...server/linien/server/autolock/autolock.py
diff --git a/linien/server/autolock/fast.py → ...ien-server/linien/server/autolock/fast.py b/linien/server/autolock/fast.py → ...ien-server/linien/server/autolock/fast.py
diff --git a/linien/server/autolock/robust.py → ...n-server/linien/server/autolock/robust.py b/linien/server/autolock/robust.py → ...n-server/linien/server/autolock/robust.py
diff --git a/linien/server/autolock/utils.py → ...en-server/linien/server/autolock/utils.py b/linien/server/autolock/utils.py → ...en-server/linien/server/autolock/utils.py
diff --git a/linien/server/csr.py → linien/linien-server/linien/server/csr.py b/linien/server/csr.py → linien/linien-server/linien/server/csr.py
diff --git a/linien/server/csrmap.py → linien/linien-server/linien/server/csrmap.py b/linien/server/csrmap.py → linien/linien-server/linien/server/csrmap.py
diff --git a/linien/server/iir_coeffs.py → ...linien-server/linien/server/iir_coeffs.py b/linien/server/iir_coeffs.py → ...linien-server/linien/server/iir_coeffs.py
diff --git a/linien/server/linien.bin → ...en/linien-server/linien/server/linien.bin b/linien/server/linien.bin → ...en/linien-server/linien/server/linien.bin
diff --git a/linien/server/linien_install_requirements.sh → ...ien/server/linien_install_requirements.sh b/linien/server/linien_install_requirements.sh → ...ien/server/linien_install_requirements.sh
diff --git a/.../server/linien_start_ethernet_blinking.sh → .../server/linien_start_ethernet_blinking.sh b/.../server/linien_start_ethernet_blinking.sh → .../server/linien_start_ethernet_blinking.sh
diff --git a/linien/server/linien_start_server.sh → ...rver/linien/server/linien_start_server.sh b/linien/server/linien_start_server.sh → ...rver/linien/server/linien_start_server.sh
diff --git a/...n/server/linien_stop_ethernet_blinking.sh → ...n/server/linien_stop_ethernet_blinking.sh b/...n/server/linien_stop_ethernet_blinking.sh → ...n/server/linien_stop_ethernet_blinking.sh
diff --git a/linien/server/linien_stop_server.sh → ...erver/linien/server/linien_stop_server.sh b/linien/server/linien_stop_server.sh → ...erver/linien/server/linien_stop_server.sh
diff --git a/linien/server/optimization/__init__.py → ...er/linien/server/optimization/__init__.py b/linien/server/optimization/__init__.py → ...er/linien/server/optimization/__init__.py
diff --git a/linien/server/optimization/engine.py → ...rver/linien/server/optimization/engine.py b/linien/server/optimization/engine.py → ...rver/linien/server/optimization/engine.py
diff --git a/linien/server/optimization/general.py → ...ver/linien/server/optimization/general.py b/linien/server/optimization/general.py → ...ver/linien/server/optimization/general.py
diff --git a/linien/server/optimization/optimization.py → ...inien/server/optimization/optimization.py b/linien/server/optimization/optimization.py → ...inien/server/optimization/optimization.py
diff --git a/linien/server/optimization/utils.py → ...erver/linien/server/optimization/utils.py b/linien/server/optimization/utils.py → ...erver/linien/server/optimization/utils.py
diff --git a/linien/server/parameter_store.py → ...n-server/linien/server/parameter_store.py b/linien/server/parameter_store.py → ...n-server/linien/server/parameter_store.py
diff --git a/linien/server/parameters.py → ...linien-server/linien/server/parameters.py b/linien/server/parameters.py → ...linien-server/linien/server/parameters.py
diff --git a/linien/server/parameters_base.py → ...n-server/linien/server/parameters_base.py b/linien/server/parameters_base.py → ...n-server/linien/server/parameters_base.py
diff --git a/linien/server/pid_optimization/__init__.py → ...inien/server/pid_optimization/__init__.py b/linien/server/pid_optimization/__init__.py → ...inien/server/pid_optimization/__init__.py
diff --git a/...rver/pid_optimization/pid_optimization.py → ...rver/pid_optimization/pid_optimization.py b/...rver/pid_optimization/pid_optimization.py → ...rver/pid_optimization/pid_optimization.py
diff --git a/linien/server/registers.py → .../linien-server/linien/server/registers.py b/linien/server/registers.py → .../linien-server/linien/server/registers.py
diff --git a/linien/server/server.py → linien/linien-server/linien/server/server.py b/linien/server/server.py → linien/linien-server/linien/server/server.py
diff --git a/linien/server/utils.py → linien/linien-server/linien/server/utils.py b/linien/server/utils.py → linien/linien-server/linien/server/utils.py
diff --git a/requirements_server.txt → linien/linien-server/requirements.txt b/requirements_server.txt → linien/linien-server/requirements.txt
diff --git a/setup_server.py → linien/linien-server/setup.py b/setup_server.py → linien/linien-server/setup.py
diff --git a/scripts/upload_pypi.sh → linien/upload_pypi.sh b/scripts/upload_pypi.sh → linien/upload_pypi.sh
diff --git a/requirements_dev.txt → requirements.txt b/requirements_dev.txt → requirements.txt
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,7 +9,6 @@ __pycache__ @@
     /*.v
     /dist
     .eggs
-    linien-*
     .mypy_cache
     .vscode
@@ Expand Down @@