Merge branch '2506-missing-commit' into 'main'

v1.0.0-rc.45: missing commits

See merge request jungfraujoch/nextgendcu!130

docs/conf.py

@@ -9,7 +9,7 @@
 project = 'Jungfraujoch'
 copyright = '2024, Paul Scherrer Institute'
 author = 'Filip Leonarski'
-release = '1.0.0-rc.44'
+release = '1.0.0-rc.45'
 
 # -- General configuration ---------------------------------------------------
 # https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration

docs/python_client/README.md

@@ -6,8 +6,8 @@ Jungfraujoch uses FPGA boards to acquire data at high data rates.
 
 This Python package is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:
 
-- API version: 1.0.0-rc.44
-- Package version: 1.0.0-rc.44
+- API version: 1.0.0-rc.45
+- Package version: 1.0.0-rc.45
 - Generator version: 7.8.0
 - Build package: org.openapitools.codegen.languages.PythonClientCodegen
 

fpga/hdl/action_config.v

@@ -8,7 +8,7 @@
 `define JFJOCH_FPGA_MAJOR_VERSION 8'd1
 `define JFJOCH_FPGA_MINOR_VERSION 8'd0
 `define JFJOCH_FPGA_PATCH_VERSION 8'd0
-`define JFJOCH_FPGA_PRERELEASE 64'h34342E6372
+`define JFJOCH_FPGA_PRERELEASE 64'h35342E6372
 
 `define GIT_SHA1 32'h
 `define MAX_MODULES_FPGA 32'd16

fpga/pcie_driver/dkms.conf

@@ -1,5 +1,5 @@
 PACKAGE_NAME=jfjoch
-PACKAGE_VERSION=1.0.0-rc.44
+PACKAGE_VERSION=1.0.0-rc.45
 
 DEST_MODULE_LOCATION=/extra
 BUILT_MODULE_NAME=jfjoch

fpga/pcie_driver/install_dkms.sh

@@ -2,7 +2,7 @@
 
 # Copyright (2019-2024) Paul Scherrer Institute
 
-VERSION=1.0.0-rc.44
+VERSION=1.0.0-rc.45
 
 mkdir -p /usr/src/jfjoch-${VERSION}/src
 cp dkms.conf /usr/src/jfjoch-${VERSION}

fpga/pcie_driver/jfjoch_drv.c

@@ -12,7 +12,7 @@
 MODULE_AUTHOR("Filip Leonarski; Paul Scherrer Institute");
 MODULE_DESCRIPTION("Jungfraujoch device module");
 MODULE_LICENSE("GPL");
-MODULE_VERSION("1.0.0-rc.44");
+MODULE_VERSION("1.0.0-rc.45");
 
 #define PCI_DEV_ID_JUNGFRAUJOCH        (0x3450)
 

fpga/pcie_driver/postinstall.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 # Taken from https://schneide.blog/2015/08/10/packaging-kernel-modulesdrivers-using-dkms/
 
-VERSION=1.0.0-rc.44
+VERSION=1.0.0-rc.45
 
 occurrences=`/usr/sbin/dkms status | grep jfjoch | grep ${VERSION} | wc -l`
 

fpga/pcie_driver/preuninstall.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 # Taken from https://schneide.blog/2015/08/10/packaging-kernel-modulesdrivers-using-dkms/
 
-VERSION=1.0.0-rc.44
+VERSION=1.0.0-rc.45
 
 /usr/sbin/dkms remove -m jfjoch -v ${VERSION} --all
 

frontend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jungfraujoch-frontend",
-  "version": "1.0.0-rc.44",
+  "version": "1.0.0-rc.45",
   "license": "GPL-3.0",
   "private": true,
   "homepage": "/frontend",

resonet/jfjoch_inference_server.py

@@ -3,7 +3,7 @@ from fastapi.responses import PlainTextResponse
 import torch
 import numpy as np
 
-VERSION = "1.0.0-rc.44"
+VERSION = "1.0.0-rc.45"
 
 def create_app(dev: str, model_path: str):
     app = FastAPI()