update Touptek & oem lib, version: 54.23231.20230823 (#826)

indilib · Aug 25, 2023 · 690c0cc · 690c0cc
1 parent 9827668
commit 690c0cc
Show file tree

Hide file tree

Showing 54 changed files with 216 additions and 126 deletions.
diff --git a/libaltaircam/CMakeLists.txt b/libaltaircam/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required (VERSION 3.0)
 project (libaltaircam)
 
-set (LIBALTAIRCAM_VERSION "54.23041")
+set (LIBALTAIRCAM_VERSION "54.23231")
 set (LIBALTAIRCAM_SOVERSION "54")
 
 list (APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules/")

diff --git a/libaltaircam/altaircam.h b/libaltaircam/altaircam.h
@@ -1,7 +1,7 @@
 #ifndef __altaircam_h__
 #define __altaircam_h__
 
-/* Version: 54.23041.20230731 */
+/* Version: 54.23231.20230823 */
 /*
    Platform & Architecture:
        (1) Win32:
@@ -231,11 +231,11 @@ typedef struct Altaircam_t { int unused; } *HAltaircam;
 #define ALTAIRCAM_AE_PERCENT_DEF           10
 #define ALTAIRCAM_NOPACKET_TIMEOUT_MIN     500     /* no packet timeout minimum: 500ms */
 #define ALTAIRCAM_NOFRAME_TIMEOUT_MIN      500     /* no frame timeout minimum: 500ms */
-#define ALTAIRCAM_DYNAMIC_DEFECT_T1_MIN    10      /* dynamic defect pixel correction */
-#define ALTAIRCAM_DYNAMIC_DEFECT_T1_MAX    100
-#define ALTAIRCAM_DYNAMIC_DEFECT_T1_DEF    13
-#define ALTAIRCAM_DYNAMIC_DEFECT_T2_MIN    0
-#define ALTAIRCAM_DYNAMIC_DEFECT_T2_MAX    100
+#define ALTAIRCAM_DYNAMIC_DEFECT_T1_MIN    10      /* dynamic defect pixel correction, threshold, means: 1.0 */
+#define ALTAIRCAM_DYNAMIC_DEFECT_T1_MAX    100     /* means: 10.0 */
+#define ALTAIRCAM_DYNAMIC_DEFECT_T1_DEF    13      /* means: 1.3 */
+#define ALTAIRCAM_DYNAMIC_DEFECT_T2_MIN    0       /* dynamic defect pixel correction, value, means: 0.00 */
+#define ALTAIRCAM_DYNAMIC_DEFECT_T2_MAX    100     /* means: 1.00 */
 #define ALTAIRCAM_DYNAMIC_DEFECT_T2_DEF    100
 #define ALTAIRCAM_HDR_K_MIN                1       /* HDR synthesize */
 #define ALTAIRCAM_HDR_K_MAX                25500
@@ -281,7 +281,7 @@ typedef struct {
 } AltaircamDeviceV2; /* camera instance for enumerating */
 
 /*
-    get the version of this dll/so/dylib, which is: 54.23041.20230731
+    get the version of this dll/so/dylib, which is: 54.23231.20230823
 */
 #if defined(_WIN32)
 ALTAIRCAM_API(const wchar_t*)   Altaircam_Version();
@@ -379,6 +379,8 @@ typedef struct {
 } AltaircamFrameInfoV3;
 
 /*
+    nWaitMS: The timeout interval, in milliseconds. If a nonzero value is specified, the function waits until the image is ok or the interval elapses.
+             If nWaitMS is zero, the function does not enter a wait state if the image is not available; it always returns immediately; this is equal to Altaircam_PullImageV3.
     bStill: to pull still image, set to 1, otherwise 0
     bits: 24 (RGB24), 32 (RGB32), 48 (RGB48), 8 (Grey), 16 (Grey), 64 (RGB64).
           In RAW mode, this parameter is ignored.
@@ -419,6 +421,7 @@ typedef struct {
             |-----------|------------------------|-------------------------------|-----------------------|
 */
 ALTAIRCAM_API(HRESULT)  Altaircam_PullImageV3(HAltaircam h, void* pImageData, int bStill, int bits, int rowPitch, AltaircamFrameInfoV3* pInfo);
+ALTAIRCAM_API(HRESULT)  Altaircam_WaitImageV3(HAltaircam h, unsigned nWaitMS, void* pImageData, int bStill, int bits, int rowPitch, AltaircamFrameInfoV3* pInfo);
 
 typedef struct {
     unsigned            width;
@@ -800,7 +803,7 @@ ALTAIRCAM_API(HRESULT)  Altaircam_feed_Pipe(HAltaircam h, unsigned pipeId);
 
 #define ALTAIRCAM_OPTION_NOFRAME_TIMEOUT        0x01       /* no frame timeout: 0 => disable, positive value (>= ALTAIRCAM_NOFRAME_TIMEOUT_MIN) => timeout milliseconds. default: disable */
 #define ALTAIRCAM_OPTION_THREAD_PRIORITY        0x02       /* set the priority of the internal thread which grab data from the usb device.
-                                                             Win: iValue: 0 = THREAD_PRIORITY_NORMAL; 1 = THREAD_PRIORITY_ABOVE_NORMAL; 2 = THREAD_PRIORITY_HIGHEST; 3 = THREAD_PRIORITY_TIME_CRITICAL; default: 1; see: https://docs.microsoft.com/en-us/windows/win32/api/processthreadsapi/nf-processthreadsapi-setthreadpriority
+                                                             Win: iValue: 0 => THREAD_PRIORITY_NORMAL; 1 => THREAD_PRIORITY_ABOVE_NORMAL; 2 => THREAD_PRIORITY_HIGHEST; 3 => THREAD_PRIORITY_TIME_CRITICAL; default: 1; see: https://docs.microsoft.com/en-us/windows/win32/api/processthreadsapi/nf-processthreadsapi-setthreadpriority
                                                              Linux & macOS: The high 16 bits for the scheduling policy, and the low 16 bits for the priority; see: https://linux.die.net/man/3/pthread_setschedparam
                                                          */
 #define ALTAIRCAM_OPTION_PROCESSMODE            0x03       /* obsolete & useless, noop. 0 = better image quality, more cpu usage. this is the default value; 1 = lower image quality, less cpu usage */
@@ -979,17 +982,16 @@ ALTAIRCAM_API(HRESULT)  Altaircam_feed_Pipe(HAltaircam h, unsigned pipeId);
                                                          */
 #define ALTAIRCAM_OPTION_HIGH_FULLWELL          0x55       /* high fullwell capacity: 0 => disable, 1 => enable */
 #define ALTAIRCAM_OPTION_DYNAMIC_DEFECT         0x56       /* dynamic defect pixel correction:
-                                                            threshold:
-                                                                 t1 (high 16 bits): [1, 100]
-                                                                 t2 (low 16 bits): [0, 100]
+                                                                threshold, t1: (high 16 bits): [10, 100], means: [1.0, 10.0]
+                                                                value, t2: (low 16 bits): [0, 100], means: [0.00, 1.00]
                                                          */
 #define ALTAIRCAM_OPTION_HDR_KB                 0x57       /* HDR synthesize
                                                                 K (high 16 bits): [1, 25500]
                                                                 B (low 16 bits): [0, 65535]
                                                                 0xffffffff => set to default
                                                          */
-#define ALTAIRCAM_OPTION_HDR_THRESHOLD          0x58       /* HDR synthesize 
-                                                                threshold: [1, 4095]
+#define ALTAIRCAM_OPTION_HDR_THRESHOLD          0x58       /* HDR synthesize
+                                                                threshold: [1, 4094]
                                                                 0xffffffff => set to default
                                                          */
 #define ALTAIRCAM_OPTION_GIGETIMEOUT            0x5a       /* For GigE cameras, the application periodically sends heartbeat signals to the camera to keep the connection to the camera alive.
@@ -1004,6 +1006,13 @@ ALTAIRCAM_API(HRESULT)  Altaircam_feed_Pipe(HAltaircam h, unsigned pipeId);
 #define ALTAIRCAM_OPTION_OVERCLOCK_MAX          0x5c       /* get overclock range: [0, max] */
 #define ALTAIRCAM_OPTION_OVERCLOCK              0x5d       /* overclock, default: 0 */
 #define ALTAIRCAM_OPTION_RESET_SENSOR           0x5e       /* reset sensor */
+#define ALTAIRCAM_OPTION_ADC                    0x08000000 /* Analog-Digital Conversion:
+                                                                get:
+                                                                    (option | 'C'): get the current value
+                                                                    (option | 'N'): get the supported ADC number
+                                                                    (option | n): get the nth supported ADC value, such as 11bits, 12bits, etc; the first value is the default
+                                                                set: val = ADC value, such as 11bits, 12bits, etc
+                                                         */
 
 /* pixel format */
 #define ALTAIRCAM_PIXELFORMAT_RAW8              0x00
@@ -1136,6 +1145,7 @@ ALTAIRCAM_API(HRESULT)  Altaircam_get_AfParam(HAltaircam h, AltaircamAfParam* pA
 #define ALTAIRCAM_IOCONTROLTYPE_SET_EXEVT_ACTIVE_MODE       0x36
 #define ALTAIRCAM_IOCONTROLTYPE_GET_OUTPUTCOUNTERVALUE      0x37 /* Output Counter Value, range: [0 ~ 65535] */
 #define ALTAIRCAM_IOCONTROLTYPE_SET_OUTPUTCOUNTERVALUE      0x38
+#define ALTAIRCAM_IOCONTROLTYPE_SET_OUTPUT_PAUSE            0x3a /* Output pause: 1 => puase, 0 => unpause */
 
 #define ALTAIRCAM_IOCONTROL_DELAYTIME_MAX                   (5 * 1000 * 1000)
 

diff --git a/libaltaircam/arm64/libaltaircam.bin b/libaltaircam/arm64/libaltaircam.bin
diff --git a/libaltaircam/armhf/libaltaircam.bin b/libaltaircam/armhf/libaltaircam.bin
diff --git a/libaltaircam/mac/libaltaircam.bin b/libaltaircam/mac/libaltaircam.bin
diff --git a/libaltaircam/x64/libaltaircam.bin b/libaltaircam/x64/libaltaircam.bin
diff --git a/libbressercam/CMakeLists.txt b/libbressercam/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required (VERSION 3.0)
 project (libbressercam)
 
-set (LIBBRESSERCAM_VERSION "54.23041")
+set (LIBBRESSERCAM_VERSION "54.23231")
 set (LIBBRESSERCAM_SOVERSION "54")
 
 list (APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules/")

diff --git a/libbressercam/arm64/libbressercam.bin b/libbressercam/arm64/libbressercam.bin
diff --git a/libbressercam/armhf/libbressercam.bin b/libbressercam/armhf/libbressercam.bin
diff --git a/libbressercam/bressercam.h b/libbressercam/bressercam.h
@@ -1,7 +1,7 @@
 #ifndef __bressercam_h__
 #define __bressercam_h__
 
-/* Version: 54.23041.20230731 */
+/* Version: 54.23231.20230823 */
 /*
    Platform & Architecture:
        (1) Win32:
@@ -231,11 +231,11 @@ typedef struct Bressercam_t { int unused; } *HBressercam;
 #define BRESSERCAM_AE_PERCENT_DEF           10
 #define BRESSERCAM_NOPACKET_TIMEOUT_MIN     500     /* no packet timeout minimum: 500ms */
 #define BRESSERCAM_NOFRAME_TIMEOUT_MIN      500     /* no frame timeout minimum: 500ms */
-#define BRESSERCAM_DYNAMIC_DEFECT_T1_MIN    10      /* dynamic defect pixel correction */
-#define BRESSERCAM_DYNAMIC_DEFECT_T1_MAX    100
-#define BRESSERCAM_DYNAMIC_DEFECT_T1_DEF    13
-#define BRESSERCAM_DYNAMIC_DEFECT_T2_MIN    0
-#define BRESSERCAM_DYNAMIC_DEFECT_T2_MAX    100
+#define BRESSERCAM_DYNAMIC_DEFECT_T1_MIN    10      /* dynamic defect pixel correction, threshold, means: 1.0 */
+#define BRESSERCAM_DYNAMIC_DEFECT_T1_MAX    100     /* means: 10.0 */
+#define BRESSERCAM_DYNAMIC_DEFECT_T1_DEF    13      /* means: 1.3 */
+#define BRESSERCAM_DYNAMIC_DEFECT_T2_MIN    0       /* dynamic defect pixel correction, value, means: 0.00 */
+#define BRESSERCAM_DYNAMIC_DEFECT_T2_MAX    100     /* means: 1.00 */
 #define BRESSERCAM_DYNAMIC_DEFECT_T2_DEF    100
 #define BRESSERCAM_HDR_K_MIN                1       /* HDR synthesize */
 #define BRESSERCAM_HDR_K_MAX                25500
@@ -281,7 +281,7 @@ typedef struct {
 } BressercamDeviceV2; /* camera instance for enumerating */
 
 /*
-    get the version of this dll/so/dylib, which is: 54.23041.20230731
+    get the version of this dll/so/dylib, which is: 54.23231.20230823
 */
 #if defined(_WIN32)
 BRESSERCAM_API(const wchar_t*)   Bressercam_Version();
@@ -379,6 +379,8 @@ typedef struct {
 } BressercamFrameInfoV3;
 
 /*
+    nWaitMS: The timeout interval, in milliseconds. If a nonzero value is specified, the function waits until the image is ok or the interval elapses.
+             If nWaitMS is zero, the function does not enter a wait state if the image is not available; it always returns immediately; this is equal to Bressercam_PullImageV3.
     bStill: to pull still image, set to 1, otherwise 0
     bits: 24 (RGB24), 32 (RGB32), 48 (RGB48), 8 (Grey), 16 (Grey), 64 (RGB64).
           In RAW mode, this parameter is ignored.
@@ -419,6 +421,7 @@ typedef struct {
             |-----------|------------------------|-------------------------------|-----------------------|
 */
 BRESSERCAM_API(HRESULT)  Bressercam_PullImageV3(HBressercam h, void* pImageData, int bStill, int bits, int rowPitch, BressercamFrameInfoV3* pInfo);
+BRESSERCAM_API(HRESULT)  Bressercam_WaitImageV3(HBressercam h, unsigned nWaitMS, void* pImageData, int bStill, int bits, int rowPitch, BressercamFrameInfoV3* pInfo);
 
 typedef struct {
     unsigned            width;
@@ -800,7 +803,7 @@ BRESSERCAM_API(HRESULT)  Bressercam_feed_Pipe(HBressercam h, unsigned pipeId);
 
 #define BRESSERCAM_OPTION_NOFRAME_TIMEOUT        0x01       /* no frame timeout: 0 => disable, positive value (>= BRESSERCAM_NOFRAME_TIMEOUT_MIN) => timeout milliseconds. default: disable */
 #define BRESSERCAM_OPTION_THREAD_PRIORITY        0x02       /* set the priority of the internal thread which grab data from the usb device.
-                                                             Win: iValue: 0 = THREAD_PRIORITY_NORMAL; 1 = THREAD_PRIORITY_ABOVE_NORMAL; 2 = THREAD_PRIORITY_HIGHEST; 3 = THREAD_PRIORITY_TIME_CRITICAL; default: 1; see: https://docs.microsoft.com/en-us/windows/win32/api/processthreadsapi/nf-processthreadsapi-setthreadpriority
+                                                             Win: iValue: 0 => THREAD_PRIORITY_NORMAL; 1 => THREAD_PRIORITY_ABOVE_NORMAL; 2 => THREAD_PRIORITY_HIGHEST; 3 => THREAD_PRIORITY_TIME_CRITICAL; default: 1; see: https://docs.microsoft.com/en-us/windows/win32/api/processthreadsapi/nf-processthreadsapi-setthreadpriority
                                                              Linux & macOS: The high 16 bits for the scheduling policy, and the low 16 bits for the priority; see: https://linux.die.net/man/3/pthread_setschedparam
                                                          */
 #define BRESSERCAM_OPTION_PROCESSMODE            0x03       /* obsolete & useless, noop. 0 = better image quality, more cpu usage. this is the default value; 1 = lower image quality, less cpu usage */
@@ -979,17 +982,16 @@ BRESSERCAM_API(HRESULT)  Bressercam_feed_Pipe(HBressercam h, unsigned pipeId);
                                                          */
 #define BRESSERCAM_OPTION_HIGH_FULLWELL          0x55       /* high fullwell capacity: 0 => disable, 1 => enable */
 #define BRESSERCAM_OPTION_DYNAMIC_DEFECT         0x56       /* dynamic defect pixel correction:
-                                                            threshold:
-                                                                 t1 (high 16 bits): [1, 100]
-                                                                 t2 (low 16 bits): [0, 100]
+                                                                threshold, t1: (high 16 bits): [10, 100], means: [1.0, 10.0]
+                                                                value, t2: (low 16 bits): [0, 100], means: [0.00, 1.00]
                                                          */
 #define BRESSERCAM_OPTION_HDR_KB                 0x57       /* HDR synthesize
                                                                 K (high 16 bits): [1, 25500]
                                                                 B (low 16 bits): [0, 65535]
                                                                 0xffffffff => set to default
                                                          */
-#define BRESSERCAM_OPTION_HDR_THRESHOLD          0x58       /* HDR synthesize 
-                                                                threshold: [1, 4095]
+#define BRESSERCAM_OPTION_HDR_THRESHOLD          0x58       /* HDR synthesize
+                                                                threshold: [1, 4094]
                                                                 0xffffffff => set to default
                                                          */
 #define BRESSERCAM_OPTION_GIGETIMEOUT            0x5a       /* For GigE cameras, the application periodically sends heartbeat signals to the camera to keep the connection to the camera alive.
@@ -1004,6 +1006,13 @@ BRESSERCAM_API(HRESULT)  Bressercam_feed_Pipe(HBressercam h, unsigned pipeId);
 #define BRESSERCAM_OPTION_OVERCLOCK_MAX          0x5c       /* get overclock range: [0, max] */
 #define BRESSERCAM_OPTION_OVERCLOCK              0x5d       /* overclock, default: 0 */
 #define BRESSERCAM_OPTION_RESET_SENSOR           0x5e       /* reset sensor */
+#define BRESSERCAM_OPTION_ADC                    0x08000000 /* Analog-Digital Conversion:
+                                                                get:
+                                                                    (option | 'C'): get the current value
+                                                                    (option | 'N'): get the supported ADC number
+                                                                    (option | n): get the nth supported ADC value, such as 11bits, 12bits, etc; the first value is the default
+                                                                set: val = ADC value, such as 11bits, 12bits, etc
+                                                         */
 
 /* pixel format */
 #define BRESSERCAM_PIXELFORMAT_RAW8              0x00
@@ -1136,6 +1145,7 @@ BRESSERCAM_API(HRESULT)  Bressercam_get_AfParam(HBressercam h, BressercamAfParam
 #define BRESSERCAM_IOCONTROLTYPE_SET_EXEVT_ACTIVE_MODE       0x36
 #define BRESSERCAM_IOCONTROLTYPE_GET_OUTPUTCOUNTERVALUE      0x37 /* Output Counter Value, range: [0 ~ 65535] */
 #define BRESSERCAM_IOCONTROLTYPE_SET_OUTPUTCOUNTERVALUE      0x38
+#define BRESSERCAM_IOCONTROLTYPE_SET_OUTPUT_PAUSE            0x3a /* Output pause: 1 => puase, 0 => unpause */
 
 #define BRESSERCAM_IOCONTROL_DELAYTIME_MAX                   (5 * 1000 * 1000)
 

diff --git a/libbressercam/mac/libbressercam.bin b/libbressercam/mac/libbressercam.bin
diff --git a/libbressercam/x64/libbressercam.bin b/libbressercam/x64/libbressercam.bin
diff --git a/libmallincam/CMakeLists.txt b/libmallincam/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required (VERSION 3.0)
 project (libmallincam)
 
-set (LIBMALLINCAM_VERSION "54.23041")
+set (LIBMALLINCAM_VERSION "54.23231")
 set (LIBMALLINCAM_SOVERSION "54")
 
 list (APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules/")

diff --git a/libmallincam/arm64/libmallincam.bin b/libmallincam/arm64/libmallincam.bin
diff --git a/libmallincam/armhf/libmallincam.bin b/libmallincam/armhf/libmallincam.bin
diff --git a/libmallincam/mac/libmallincam.bin b/libmallincam/mac/libmallincam.bin