Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update Touptek & oem lib, version: 54.23585.20231015 #850

Merged
merged 1 commit into from
Oct 19, 2023
Merged

update Touptek & oem lib, version: 54.23585.20231015 #850

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion libaltaircam/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cmake_minimum_required (VERSION 3.0)
project (libaltaircam)

set (LIBALTAIRCAM_VERSION "54.23231")
set (LIBALTAIRCAM_VERSION "54.23585")
set (LIBALTAIRCAM_SOVERSION "54")

list (APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules/")
Expand Down
45 changes: 29 additions & 16 deletions libaltaircam/altaircam.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#ifndef __altaircam_h__
#define __altaircam_h__

/* Version: 54.23231.20230823 */
/* Version: 54.23585.20231015 */
/*
Platform & Architecture:
(1) Win32:
Expand Down Expand Up @@ -167,6 +167,7 @@ typedef struct Altaircam_t { int unused; } *HAltaircam;
#define ALTAIRCAM_FLAG_LIGHT_SOURCE 0x0004000000000000 /* stand alone light source */
#define ALTAIRCAM_FLAG_CAMERALINK 0x0008000000000000 /* camera link */
#define ALTAIRCAM_FLAG_CXP 0x0010000000000000 /* CXP: CoaXPress */
#define ALTAIRCAM_FLAG_RAW12PACK 0x0020000000000000 /* pixel format, RAW 12bits packed */

#define ALTAIRCAM_EXPOGAIN_DEF 100 /* exposure gain, default value */
#define ALTAIRCAM_EXPOGAIN_MIN 100 /* exposure gain, minimum value */
Expand Down Expand Up @@ -198,11 +199,11 @@ typedef struct Altaircam_t { int unused; } *HAltaircam;
#define ALTAIRCAM_WBGAIN_MIN (-127) /* white balance gain */
#define ALTAIRCAM_WBGAIN_MAX 127 /* white balance gain */
#define ALTAIRCAM_BLACKLEVEL_MIN 0 /* minimum black level */
#define ALTAIRCAM_BLACKLEVEL8_MAX 31 /* maximum black level for bit depth = 8 */
#define ALTAIRCAM_BLACKLEVEL10_MAX (31 * 4) /* maximum black level for bit depth = 10 */
#define ALTAIRCAM_BLACKLEVEL12_MAX (31 * 16) /* maximum black level for bit depth = 12 */
#define ALTAIRCAM_BLACKLEVEL14_MAX (31 * 64) /* maximum black level for bit depth = 14 */
#define ALTAIRCAM_BLACKLEVEL16_MAX (31 * 256) /* maximum black level for bit depth = 16 */
#define ALTAIRCAM_BLACKLEVEL8_MAX 31 /* maximum black level for bitdepth = 8 */
#define ALTAIRCAM_BLACKLEVEL10_MAX (31 * 4) /* maximum black level for bitdepth = 10 */
#define ALTAIRCAM_BLACKLEVEL12_MAX (31 * 16) /* maximum black level for bitdepth = 12 */
#define ALTAIRCAM_BLACKLEVEL14_MAX (31 * 64) /* maximum black level for bitdepth = 14 */
#define ALTAIRCAM_BLACKLEVEL16_MAX (31 * 256) /* maximum black level for bitdepth = 16 */
#define ALTAIRCAM_SHARPENING_STRENGTH_DEF 0 /* sharpening strength */
#define ALTAIRCAM_SHARPENING_STRENGTH_MIN 0 /* sharpening strength */
#define ALTAIRCAM_SHARPENING_STRENGTH_MAX 500 /* sharpening strength */
Expand All @@ -215,6 +216,9 @@ typedef struct Altaircam_t { int unused; } *HAltaircam;
#define ALTAIRCAM_AUTOEXPO_THRESHOLD_DEF 5 /* auto exposure threshold */
#define ALTAIRCAM_AUTOEXPO_THRESHOLD_MIN 2 /* auto exposure threshold */
#define ALTAIRCAM_AUTOEXPO_THRESHOLD_MAX 15 /* auto exposure threshold */
#define ALTAIRCAM_AUTOEXPO_STEP_DEF 1000 /* auto exposure step: thousandths */
#define ALTAIRCAM_AUTOEXPO_STEP_MIN 1 /* auto exposure step: thousandths */
#define ALTAIRCAM_AUTOEXPO_STEP_MAX 1000 /* auto exposure step: thousandths */
#define ALTAIRCAM_BANDWIDTH_DEF 100 /* bandwidth */
#define ALTAIRCAM_BANDWIDTH_MIN 1 /* bandwidth */
#define ALTAIRCAM_BANDWIDTH_MAX 100 /* bandwidth */
Expand Down Expand Up @@ -281,7 +285,7 @@ typedef struct {
} AltaircamDeviceV2; /* camera instance for enumerating */

/*
get the version of this dll/so/dylib, which is: 54.23231.20230823
get the version of this dll/so/dylib, which is: 54.23585.20231015
*/
#if defined(_WIN32)
ALTAIRCAM_API(const wchar_t*) Altaircam_Version();
Expand Down Expand Up @@ -358,13 +362,13 @@ ALTAIRCAM_API(HRESULT) Altaircam_StartPullModeWithWndMsg(HAltaircam h, HWND hWn
typedef void (__stdcall* PALTAIRCAM_EVENT_CALLBACK)(unsigned nEvent, void* ctxEvent);
ALTAIRCAM_API(HRESULT) Altaircam_StartPullModeWithCallback(HAltaircam h, PALTAIRCAM_EVENT_CALLBACK funEvent, void* ctxEvent);

#define ALTAIRCAM_FRAMEINFO_FLAG_SEQ 0x0001 /* frame sequence number */
#define ALTAIRCAM_FRAMEINFO_FLAG_TIMESTAMP 0x0002 /* timestamp */
#define ALTAIRCAM_FRAMEINFO_FLAG_EXPOTIME 0x0004 /* exposure time */
#define ALTAIRCAM_FRAMEINFO_FLAG_EXPOGAIN 0x0008 /* exposure gain */
#define ALTAIRCAM_FRAMEINFO_FLAG_BLACKLEVEL 0x0010 /* black level */
#define ALTAIRCAM_FRAMEINFO_FLAG_SHUTTERSEQ 0x0020 /* sequence shutter counter */
#define ALTAIRCAM_FRAMEINFO_FLAG_STILL 0x8000 /* still image */
#define ALTAIRCAM_FRAMEINFO_FLAG_SEQ 0x00000001 /* frame sequence number */
#define ALTAIRCAM_FRAMEINFO_FLAG_TIMESTAMP 0x00000002 /* timestamp */
#define ALTAIRCAM_FRAMEINFO_FLAG_EXPOTIME 0x00000004 /* exposure time */
#define ALTAIRCAM_FRAMEINFO_FLAG_EXPOGAIN 0x00000008 /* exposure gain */
#define ALTAIRCAM_FRAMEINFO_FLAG_BLACKLEVEL 0x00000010 /* black level */
#define ALTAIRCAM_FRAMEINFO_FLAG_SHUTTERSEQ 0x00000020 /* sequence shutter counter */
#define ALTAIRCAM_FRAMEINFO_FLAG_STILL 0x00008000 /* still image */

typedef struct {
unsigned width;
Expand Down Expand Up @@ -401,7 +405,7 @@ typedef struct {
| bits = 8 | Convert to 8 | NA | Convert to 8 | 8 | NA | NA |
|--------------------|---------------|---------------|---------------|---------------|---------------|---------------|
| bits = 16 | NA | Convert to 16 | NA | NA | 16 | Convert to 16 |
|--------------------|---------------|-----------|-------------------|---------------|---------------|---------------|
|--------------------|---------------|---------------|---------------|---------------|---------------|---------------|
| bits = 64 | NA | Convert to 64 | NA | NA | Convert to 64 | 64 |
|--------------------|---------------|---------------|---------------|---------------|---------------|---------------|

Expand Down Expand Up @@ -663,7 +667,7 @@ ALTAIRCAM_API(HRESULT) Altaircam_get_MaxSpeed(HAltaircam h); /* get the maximum

ALTAIRCAM_API(HRESULT) Altaircam_get_FanMaxSpeed(HAltaircam h); /* get the maximum fan speed, the fan speed range = [0, max], closed interval */

ALTAIRCAM_API(HRESULT) Altaircam_get_MaxBitDepth(HAltaircam h); /* get the max bit depth of this camera, such as 8, 10, 12, 14, 16 */
ALTAIRCAM_API(HRESULT) Altaircam_get_MaxBitDepth(HAltaircam h); /* get the max bitdepth of this camera, such as 8, 10, 12, 14, 16 */

/* power supply of lighting:
0 => 60HZ AC
Expand Down Expand Up @@ -1013,6 +1017,14 @@ ALTAIRCAM_API(HRESULT) Altaircam_feed_Pipe(HAltaircam h, unsigned pipeId);
(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
*/
#define ALTAIRCAM_OPTION_ISP 0x5f /* Enable hardware ISP: 0 => auto (disable in RAW mode, otherwise enable), 1 => enable, -1 => disable; default: 0 */
#define ALTAIRCAM_OPTION_AUTOEXP_EXPOTIME_STEP 0x60 /* Auto exposure: time step (thousandths) */
#define ALTAIRCAM_OPTION_AUTOEXP_GAIN_STEP 0x61 /* Auto exposure: gain step (thousandths) */
#define ALTAIRCAM_OPTION_MOTOR_NUMBER 0x62 /* range: [1, 20] */
#define ALTAIRCAM_OPTION_MOTOR_POS 0x10000000 /* range: [1, 702] */
#define ALTAIRCAM_OPTION_PSEUDO_COLOR_START 0x63 /* Pseudo: start color, BGR format */
#define ALTAIRCAM_OPTION_PSEUDO_COLOR_END 0x64 /* Pseudo: end color, BGR format */
#define ALTAIRCAM_OPTION_PSEUDO_COLOR_ENABLE 0x65 /* Pseudo: 1 => enable, 0 => disable */

/* pixel format */
#define ALTAIRCAM_PIXELFORMAT_RAW8 0x00
Expand All @@ -1027,6 +1039,7 @@ ALTAIRCAM_API(HRESULT) Altaircam_feed_Pipe(HAltaircam h, unsigned pipeId);
#define ALTAIRCAM_PIXELFORMAT_GMCY8 0x09 /* map to RGGB 8 bits */
#define ALTAIRCAM_PIXELFORMAT_GMCY12 0x0a /* map to RGGB 12 bits */
#define ALTAIRCAM_PIXELFORMAT_UYVY 0x0b
#define ALTAIRCAM_PIXELFORMAT_RAW12PACK 0x0c

ALTAIRCAM_API(HRESULT) Altaircam_put_Option(HAltaircam h, unsigned iOption, int iValue);
ALTAIRCAM_API(HRESULT) Altaircam_get_Option(HAltaircam h, unsigned iOption, int* piValue);
Expand Down
Binary file modified libaltaircam/arm64/libaltaircam.bin
View file
Open in desktop
Binary file not shown.
Binary file modified libaltaircam/armhf/libaltaircam.bin
View file
Open in desktop
Binary file not shown.
Binary file modified libaltaircam/mac/libaltaircam.bin
View file
Open in desktop
Binary file not shown.
Binary file modified libaltaircam/x64/libaltaircam.bin
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion libbressercam/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cmake_minimum_required (VERSION 3.0)
project (libbressercam)

set (LIBBRESSERCAM_VERSION "54.23231")
set (LIBBRESSERCAM_VERSION "54.23585")
set (LIBBRESSERCAM_SOVERSION "54")

list (APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules/")
Expand Down
Binary file modified libbressercam/arm64/libbressercam.bin
View file
Open in desktop
Binary file not shown.
Binary file modified libbressercam/armhf/libbressercam.bin
View file
Open in desktop
Binary file not shown.
45 changes: 29 additions & 16 deletions libbressercam/bressercam.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#ifndef __bressercam_h__
#define __bressercam_h__

/* Version: 54.23231.20230823 */
/* Version: 54.23585.20231015 */
/*
Platform & Architecture:
(1) Win32:
Expand Down Expand Up @@ -167,6 +167,7 @@ typedef struct Bressercam_t { int unused; } *HBressercam;
#define BRESSERCAM_FLAG_LIGHT_SOURCE 0x0004000000000000 /* stand alone light source */
#define BRESSERCAM_FLAG_CAMERALINK 0x0008000000000000 /* camera link */
#define BRESSERCAM_FLAG_CXP 0x0010000000000000 /* CXP: CoaXPress */
#define BRESSERCAM_FLAG_RAW12PACK 0x0020000000000000 /* pixel format, RAW 12bits packed */

#define BRESSERCAM_EXPOGAIN_DEF 100 /* exposure gain, default value */
#define BRESSERCAM_EXPOGAIN_MIN 100 /* exposure gain, minimum value */
Expand Down Expand Up @@ -198,11 +199,11 @@ typedef struct Bressercam_t { int unused; } *HBressercam;
#define BRESSERCAM_WBGAIN_MIN (-127) /* white balance gain */
#define BRESSERCAM_WBGAIN_MAX 127 /* white balance gain */
#define BRESSERCAM_BLACKLEVEL_MIN 0 /* minimum black level */
#define BRESSERCAM_BLACKLEVEL8_MAX 31 /* maximum black level for bit depth = 8 */
#define BRESSERCAM_BLACKLEVEL10_MAX (31 * 4) /* maximum black level for bit depth = 10 */
#define BRESSERCAM_BLACKLEVEL12_MAX (31 * 16) /* maximum black level for bit depth = 12 */
#define BRESSERCAM_BLACKLEVEL14_MAX (31 * 64) /* maximum black level for bit depth = 14 */
#define BRESSERCAM_BLACKLEVEL16_MAX (31 * 256) /* maximum black level for bit depth = 16 */
#define BRESSERCAM_BLACKLEVEL8_MAX 31 /* maximum black level for bitdepth = 8 */
#define BRESSERCAM_BLACKLEVEL10_MAX (31 * 4) /* maximum black level for bitdepth = 10 */
#define BRESSERCAM_BLACKLEVEL12_MAX (31 * 16) /* maximum black level for bitdepth = 12 */
#define BRESSERCAM_BLACKLEVEL14_MAX (31 * 64) /* maximum black level for bitdepth = 14 */
#define BRESSERCAM_BLACKLEVEL16_MAX (31 * 256) /* maximum black level for bitdepth = 16 */
#define BRESSERCAM_SHARPENING_STRENGTH_DEF 0 /* sharpening strength */
#define BRESSERCAM_SHARPENING_STRENGTH_MIN 0 /* sharpening strength */
#define BRESSERCAM_SHARPENING_STRENGTH_MAX 500 /* sharpening strength */
Expand All @@ -215,6 +216,9 @@ typedef struct Bressercam_t { int unused; } *HBressercam;
#define BRESSERCAM_AUTOEXPO_THRESHOLD_DEF 5 /* auto exposure threshold */
#define BRESSERCAM_AUTOEXPO_THRESHOLD_MIN 2 /* auto exposure threshold */
#define BRESSERCAM_AUTOEXPO_THRESHOLD_MAX 15 /* auto exposure threshold */
#define BRESSERCAM_AUTOEXPO_STEP_DEF 1000 /* auto exposure step: thousandths */
#define BRESSERCAM_AUTOEXPO_STEP_MIN 1 /* auto exposure step: thousandths */
#define BRESSERCAM_AUTOEXPO_STEP_MAX 1000 /* auto exposure step: thousandths */
#define BRESSERCAM_BANDWIDTH_DEF 100 /* bandwidth */
#define BRESSERCAM_BANDWIDTH_MIN 1 /* bandwidth */
#define BRESSERCAM_BANDWIDTH_MAX 100 /* bandwidth */
Expand Down Expand Up @@ -281,7 +285,7 @@ typedef struct {
} BressercamDeviceV2; /* camera instance for enumerating */

/*
get the version of this dll/so/dylib, which is: 54.23231.20230823
get the version of this dll/so/dylib, which is: 54.23585.20231015
*/
#if defined(_WIN32)
BRESSERCAM_API(const wchar_t*) Bressercam_Version();
Expand Down Expand Up @@ -358,13 +362,13 @@ BRESSERCAM_API(HRESULT) Bressercam_StartPullModeWithWndMsg(HBressercam h, HWND
typedef void (__stdcall* PBRESSERCAM_EVENT_CALLBACK)(unsigned nEvent, void* ctxEvent);
BRESSERCAM_API(HRESULT) Bressercam_StartPullModeWithCallback(HBressercam h, PBRESSERCAM_EVENT_CALLBACK funEvent, void* ctxEvent);

#define BRESSERCAM_FRAMEINFO_FLAG_SEQ 0x0001 /* frame sequence number */
#define BRESSERCAM_FRAMEINFO_FLAG_TIMESTAMP 0x0002 /* timestamp */
#define BRESSERCAM_FRAMEINFO_FLAG_EXPOTIME 0x0004 /* exposure time */
#define BRESSERCAM_FRAMEINFO_FLAG_EXPOGAIN 0x0008 /* exposure gain */
#define BRESSERCAM_FRAMEINFO_FLAG_BLACKLEVEL 0x0010 /* black level */
#define BRESSERCAM_FRAMEINFO_FLAG_SHUTTERSEQ 0x0020 /* sequence shutter counter */
#define BRESSERCAM_FRAMEINFO_FLAG_STILL 0x8000 /* still image */
#define BRESSERCAM_FRAMEINFO_FLAG_SEQ 0x00000001 /* frame sequence number */
#define BRESSERCAM_FRAMEINFO_FLAG_TIMESTAMP 0x00000002 /* timestamp */
#define BRESSERCAM_FRAMEINFO_FLAG_EXPOTIME 0x00000004 /* exposure time */
#define BRESSERCAM_FRAMEINFO_FLAG_EXPOGAIN 0x00000008 /* exposure gain */
#define BRESSERCAM_FRAMEINFO_FLAG_BLACKLEVEL 0x00000010 /* black level */
#define BRESSERCAM_FRAMEINFO_FLAG_SHUTTERSEQ 0x00000020 /* sequence shutter counter */
#define BRESSERCAM_FRAMEINFO_FLAG_STILL 0x00008000 /* still image */

typedef struct {
unsigned width;
Expand Down Expand Up @@ -401,7 +405,7 @@ typedef struct {
| bits = 8 | Convert to 8 | NA | Convert to 8 | 8 | NA | NA |
|--------------------|---------------|---------------|---------------|---------------|---------------|---------------|
| bits = 16 | NA | Convert to 16 | NA | NA | 16 | Convert to 16 |
|--------------------|---------------|-----------|-------------------|---------------|---------------|---------------|
|--------------------|---------------|---------------|---------------|---------------|---------------|---------------|
| bits = 64 | NA | Convert to 64 | NA | NA | Convert to 64 | 64 |
|--------------------|---------------|---------------|---------------|---------------|---------------|---------------|

Expand Down Expand Up @@ -663,7 +667,7 @@ BRESSERCAM_API(HRESULT) Bressercam_get_MaxSpeed(HBressercam h); /* get the maxi

BRESSERCAM_API(HRESULT) Bressercam_get_FanMaxSpeed(HBressercam h); /* get the maximum fan speed, the fan speed range = [0, max], closed interval */

BRESSERCAM_API(HRESULT) Bressercam_get_MaxBitDepth(HBressercam h); /* get the max bit depth of this camera, such as 8, 10, 12, 14, 16 */
BRESSERCAM_API(HRESULT) Bressercam_get_MaxBitDepth(HBressercam h); /* get the max bitdepth of this camera, such as 8, 10, 12, 14, 16 */

/* power supply of lighting:
0 => 60HZ AC
Expand Down Expand Up @@ -1013,6 +1017,14 @@ BRESSERCAM_API(HRESULT) Bressercam_feed_Pipe(HBressercam h, unsigned pipeId);
(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
*/
#define BRESSERCAM_OPTION_ISP 0x5f /* Enable hardware ISP: 0 => auto (disable in RAW mode, otherwise enable), 1 => enable, -1 => disable; default: 0 */
#define BRESSERCAM_OPTION_AUTOEXP_EXPOTIME_STEP 0x60 /* Auto exposure: time step (thousandths) */
#define BRESSERCAM_OPTION_AUTOEXP_GAIN_STEP 0x61 /* Auto exposure: gain step (thousandths) */
#define BRESSERCAM_OPTION_MOTOR_NUMBER 0x62 /* range: [1, 20] */
#define BRESSERCAM_OPTION_MOTOR_POS 0x10000000 /* range: [1, 702] */
#define BRESSERCAM_OPTION_PSEUDO_COLOR_START 0x63 /* Pseudo: start color, BGR format */
#define BRESSERCAM_OPTION_PSEUDO_COLOR_END 0x64 /* Pseudo: end color, BGR format */
#define BRESSERCAM_OPTION_PSEUDO_COLOR_ENABLE 0x65 /* Pseudo: 1 => enable, 0 => disable */

/* pixel format */
#define BRESSERCAM_PIXELFORMAT_RAW8 0x00
Expand All @@ -1027,6 +1039,7 @@ BRESSERCAM_API(HRESULT) Bressercam_feed_Pipe(HBressercam h, unsigned pipeId);
#define BRESSERCAM_PIXELFORMAT_GMCY8 0x09 /* map to RGGB 8 bits */
#define BRESSERCAM_PIXELFORMAT_GMCY12 0x0a /* map to RGGB 12 bits */
#define BRESSERCAM_PIXELFORMAT_UYVY 0x0b
#define BRESSERCAM_PIXELFORMAT_RAW12PACK 0x0c

BRESSERCAM_API(HRESULT) Bressercam_put_Option(HBressercam h, unsigned iOption, int iValue);
BRESSERCAM_API(HRESULT) Bressercam_get_Option(HBressercam h, unsigned iOption, int* piValue);
Expand Down
Binary file modified libbressercam/mac/libbressercam.bin
View file
Open in desktop
Binary file not shown.
Binary file modified libbressercam/x64/libbressercam.bin
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion libmallincam/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cmake_minimum_required (VERSION 3.0)
project (libmallincam)

set (LIBMALLINCAM_VERSION "54.23231")
set (LIBMALLINCAM_VERSION "54.23585")
set (LIBMALLINCAM_SOVERSION "54")

list (APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules/")
Expand Down
Binary file modified libmallincam/arm64/libmallincam.bin
View file
Open in desktop
Binary file not shown.
Binary file modified libmallincam/armhf/libmallincam.bin
View file
Open in desktop
Binary file not shown.
Binary file modified libmallincam/mac/libmallincam.bin
View file
Open in desktop
Binary file not shown.
Loading
Loading