From 2a66178ddd4e1e4831d44ab1bd06ad8512e160d5 Mon Sep 17 00:00:00 2001
From: Bastian Leykauf <leykauf@physik.hu-berlin.de>
Date: Wed, 12 Jul 2023 08:39:12 +0200
Subject: [PATCH] rename linien.bin to gateware.bin

---
 gateware/build_fpga_image.sh                             | 2 +-
 gateware/fpga_image_helper.py                            | 2 +-
 linien-server/linien_server/acquisition.py               | 2 +-
 linien-server/linien_server/{linien.bin => gateware.bin} | 0
 linien-server/setup.py                                   | 2 +-
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename linien-server/linien_server/{linien.bin => gateware.bin} (100%)

diff --git a/gateware/build_fpga_image.sh b/gateware/build_fpga_image.sh
index 7371162d..f8224025 100644
--- a/gateware/build_fpga_image.sh
+++ b/gateware/build_fpga_image.sh
@@ -14,6 +14,6 @@ fi
 
 export PATH=$VIVADOPATH:$PATH
 
-rm linien-server/linien_server/linien.bin -f
+rm linien-server/linien_server/gateware.bin -f
 # run with -m option to avoid errors related to relative imports without breaking pytest
 python3 -m gateware.fpga_image_helper
\ No newline at end of file
diff --git a/gateware/fpga_image_helper.py b/gateware/fpga_image_helper.py
index 686922a3..6c34429b 100644
--- a/gateware/fpga_image_helper.py
+++ b/gateware/fpga_image_helper.py
@@ -74,6 +74,6 @@ def py_csrmap(it, fil):
     platform.build(root, build_name="top", build_dir=build_dir)
     bit2bin(
         build_dir / "top.bit",
-        REPO_ROOT_DIR / "linien-server" / "linien_server" / "linien.bin",
+        REPO_ROOT_DIR / "linien-server" / "linien_server" / "gateware.bin",
         flip=True,
     )
diff --git a/linien-server/linien_server/acquisition.py b/linien-server/linien_server/acquisition.py
index 9f6cdb0a..c9ae10cb 100644
--- a/linien-server/linien_server/acquisition.py
+++ b/linien-server/linien_server/acquisition.py
@@ -306,7 +306,7 @@ def exposed_continue_acquisition(self, uuid: Optional[float]) -> None:
 
 
 def flash_fpga():
-    filepath = Path(__file__).resolve().parent / "linien.bin"
+    filepath = Path(__file__).resolve().parent / "gateware.bin"
 
     # On redpitaya os < 2, flashing fpga works by copying the bit file /dev/xdevcfg. On
     # recent versions, there is a dedicated command for this
diff --git a/linien-server/linien_server/linien.bin b/linien-server/linien_server/gateware.bin
similarity index 100%
rename from linien-server/linien_server/linien.bin
rename to linien-server/linien_server/gateware.bin
diff --git a/linien-server/setup.py b/linien-server/setup.py
index 8839eb2b..a4a623ed 100644
--- a/linien-server/setup.py
+++ b/linien-server/setup.py
@@ -57,7 +57,7 @@
     ],
     package_data={
         "": [
-            "linien.bin",
+            "gateware.bin",
             "linien_start_server.sh",
             "linien_stop_server.sh",
             "linien_install_requirements.sh",