Merge pull request #534 from DigitalHolography/dev

patch 13.5.1

CHANGELOG.md

@@ -1,5 +1,9 @@
 ## Changelog
 
+### 13.5.1
+
+- Adjusted S711 ini configuration file
+
 ### 13.5.0
 
 - Create option in CLI for frame skip and fps for mp4 records

CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.24)
 
 project(Holovibes
-	VERSION 13.5.0
+	VERSION 13.5.1
 	DESCRIPTION "Holovibes"
 	LANGUAGES CXX CUDA
 )

Camera/configs/ametek_s711_euresys_coaxlink_qsfp+.ini

@@ -21,8 +21,8 @@ NbImagesPerBuffer = 64
 NbGrabbers = 2
 
 ; Camera settings
-FullHeight = 512
-Width = 512
+FullHeight = 384
+Width = 384
 
 ; Mono8 | Mono12 | BayerGB8 | BayerGB12
 PixelFormat = Mono8
@@ -50,10 +50,10 @@ FlatFieldCorrection = Off
 BalanceWhiteMarker = Off
 
 ; Any value in microseconds 
-ExposureTime = 40
+ExposureTime = 27
 
 ; Any value in microseconds 
-CycleMinimumPeriod = 43
+CycleMinimumPeriod = 30
 
 ; Grabber Stripe Offsets Layout (Default: 0, 8 OR 8, 0 depending of the acquisition cards layout)
 Offset0 = 0

Camera/include/camera_config.hh

@@ -11,7 +11,7 @@
 namespace holovibes::settings
 {
 // Very ugly to redefine the version in the "camera" folder but we have no choice if we want to define it only once.
-#define __HOLOVIBES_VERSION__ "13.5.0"
+#define __HOLOVIBES_VERSION__ "13.5.1"
 #define __APPNAME__ "Holovibes"
 
 #define __CAMERAS_CONFIG_FOLDER__ "cameras_config"

build/.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 13.5.0
+current_version = 13.5.1
 commit = True
 message = bump(version): {current_version} -> {new_version}
 tag = True

dev.py

@@ -44,7 +44,7 @@ def goal(func, name: str = None):
 @goal
 def install(args: GoalArgs) -> int:
     build_mode = build_utils.get_build_mode(args.build_mode)
-    build_mode = "RelWithDebInfo" if build_mode == "Release" else "Debug"
+    build_mode = "Debug" if build_mode in ["d", "D", "Debug", "debug"] else "RelWithDebInfo"
     build_dir = build_utils.get_build_dir(args.build_dir)
 
     # if build dir exist, remove it
@@ -91,7 +91,7 @@ def conan_build_goal(args: GoalArgs, option: str) -> int:
             return 1
 
     build = "--build" if option == "--build" else ""
-    preset = "conan-debug" if args.build_mode == "Debug" else "conan-relwithdebinfo"
+    preset = "conan-debug" if args.build_mode in ["d", "D", "Debug", "debug"] else "conan-relwithdebinfo"
     cmd = [
         os.path.join(DEFAULT_BUILD_FOLDER if args.build_dir is None else args.build_dir, "generators", "conanbuild.bat"), "&&", "cmake", build, "--preset", preset
     ] + args.goal_args
@@ -372,7 +372,7 @@ def parse_args():
     build.add_argument(
         "-b",
         choices=RELEASE_OPT + DEBUG_OPT,
-        default=None,
+        default="Debug",
         help="Choose between Release mode and Debug mode (Default: Debug)",
     )
     # build.add_argument(