Skip to content

Commit

Permalink
update Touptek & oem lib, version: 54.23926.20231119 (#855)
Browse files Browse the repository at this point in the history
  • Loading branch information
@touptek
touptek authored Nov 20, 2023
1 parent 0c02db0 commit d29edea
Show file tree
Hide file tree
Showing 54 changed files with 1,761 additions and 1,536 deletions.
2 changes: 1 addition & 1 deletion libaltaircam/CMakeLists.txt
View file
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.23585")
set (LIBALTAIRCAM_VERSION "54.23926")
set (LIBALTAIRCAM_SOVERSION "54")

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

/* Version: 54.23585.20231015 */
/* Version: 54.23926.20231119 */
/*
Platform & Architecture:
(1) Win32:
Expand Down Expand Up @@ -230,9 +230,9 @@ typedef struct Altaircam_t { int unused; } *HAltaircam;
#define ALTAIRCAM_TEC_TARGET_MAX 400 /* TEC target: 40.0 degrees Celsius */
#define ALTAIRCAM_HEARTBEAT_MIN 100 /* millisecond */
#define ALTAIRCAM_HEARTBEAT_MAX 10000 /* millisecond */
#define ALTAIRCAM_AE_PERCENT_MIN 0 /* auto exposure percent, 0 => full roi average */
#define ALTAIRCAM_AE_PERCENT_MIN 0 /* auto exposure percent; 0 or 100 => full roi average, means "disabled" */
#define ALTAIRCAM_AE_PERCENT_MAX 100
#define ALTAIRCAM_AE_PERCENT_DEF 10
#define ALTAIRCAM_AE_PERCENT_DEF 10 /* auto exposure percent: enabled, percentage = 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, threshold, means: 1.0 */
Expand Down Expand Up @@ -285,7 +285,7 @@ typedef struct {
} AltaircamDeviceV2; /* camera instance for enumerating */

/*
get the version of this dll/so/dylib, which is: 54.23585.20231015
get the version of this dll/so/dylib, which is: 54.23926.20231119
*/
#if defined(_WIN32)
ALTAIRCAM_API(const wchar_t*) Altaircam_Version();
Expand Down Expand Up @@ -966,9 +966,9 @@ ALTAIRCAM_API(HRESULT) Altaircam_feed_Pipe(HAltaircam h, unsigned pipeId);
*/
#define ALTAIRCAM_OPTION_AUTOEXPOSURE_PERCENT 0x4a /* auto exposure percent to average:
1~99: peak percent average
0 or 100: full roi average
0 or 100: full roi average, means "disabled"
*/
#define ALTAIRCAM_OPTION_ANTI_SHUTTER_EFFECT 0x4b /* anti shutter effect: 1 => disable, 0 => disable; default: 1 */
#define ALTAIRCAM_OPTION_ANTI_SHUTTER_EFFECT 0x4b /* anti shutter effect: 1 => disable, 0 => disable; default: 0 */
#define ALTAIRCAM_OPTION_CHAMBER_HT 0x4c /* get chamber humidity & temperature:
high 16 bits: humidity, in 0.1%, such as: 325 means humidity is 32.5%
low 16 bits: temperature, in 0.1 degrees Celsius, such as: 32 means 3.2 degrees Celsius
Expand Down Expand Up @@ -1024,7 +1024,32 @@ ALTAIRCAM_API(HRESULT) Altaircam_feed_Pipe(HAltaircam h, unsigned pipeId);
#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 */
#define ALTAIRCAM_OPTION_PSEUDO_COLOR_ENABLE 0x65 /* Pseudo: -1 => custom: use startcolor & endcolor to generate the colormap
0 => disable
1 => spot
2 => spring
3 => summer
4 => autumn
5 => winter
6 => bone
7 => jet
8 => rainbow
9 => deepgreen
10 => ocean
11 => cool
12 => hsv
13 => pink
14 => hot
15 => parula
16 => magma
17 => inferno
18 => plasma
19 => viridis
20 => cividis
21 => twilight
22 => twilight_shifted
23 => turbo
*/

/* pixel format */
#define ALTAIRCAM_PIXELFORMAT_RAW8 0x00
Expand Down
Binary file modified libaltaircam/arm64/libaltaircam.bin
View file
Binary file not shown.
Binary file modified libaltaircam/armhf/libaltaircam.bin
View file
Binary file not shown.
Binary file modified libaltaircam/mac/libaltaircam.bin
View file
Binary file not shown.
Binary file modified libaltaircam/x64/libaltaircam.bin
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion libbressercam/CMakeLists.txt
View file
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.23585")
set (LIBBRESSERCAM_VERSION "54.23926")
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
Binary file not shown.
Binary file modified libbressercam/armhf/libbressercam.bin
View file
Binary file not shown.
39 changes: 32 additions & 7 deletions libbressercam/bressercam.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#ifndef __bressercam_h__
#define __bressercam_h__

/* Version: 54.23585.20231015 */
/* Version: 54.23926.20231119 */
/*
Platform & Architecture:
(1) Win32:
Expand Down Expand Up @@ -230,9 +230,9 @@ typedef struct Bressercam_t { int unused; } *HBressercam;
#define BRESSERCAM_TEC_TARGET_MAX 400 /* TEC target: 40.0 degrees Celsius */
#define BRESSERCAM_HEARTBEAT_MIN 100 /* millisecond */
#define BRESSERCAM_HEARTBEAT_MAX 10000 /* millisecond */
#define BRESSERCAM_AE_PERCENT_MIN 0 /* auto exposure percent, 0 => full roi average */
#define BRESSERCAM_AE_PERCENT_MIN 0 /* auto exposure percent; 0 or 100 => full roi average, means "disabled" */
#define BRESSERCAM_AE_PERCENT_MAX 100
#define BRESSERCAM_AE_PERCENT_DEF 10
#define BRESSERCAM_AE_PERCENT_DEF 10 /* auto exposure percent: enabled, percentage = 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, threshold, means: 1.0 */
Expand Down Expand Up @@ -285,7 +285,7 @@ typedef struct {
} BressercamDeviceV2; /* camera instance for enumerating */

/*
get the version of this dll/so/dylib, which is: 54.23585.20231015
get the version of this dll/so/dylib, which is: 54.23926.20231119
*/
#if defined(_WIN32)
BRESSERCAM_API(const wchar_t*) Bressercam_Version();
Expand Down Expand Up @@ -966,9 +966,9 @@ BRESSERCAM_API(HRESULT) Bressercam_feed_Pipe(HBressercam h, unsigned pipeId);
*/
#define BRESSERCAM_OPTION_AUTOEXPOSURE_PERCENT 0x4a /* auto exposure percent to average:
1~99: peak percent average
0 or 100: full roi average
0 or 100: full roi average, means "disabled"
*/
#define BRESSERCAM_OPTION_ANTI_SHUTTER_EFFECT 0x4b /* anti shutter effect: 1 => disable, 0 => disable; default: 1 */
#define BRESSERCAM_OPTION_ANTI_SHUTTER_EFFECT 0x4b /* anti shutter effect: 1 => disable, 0 => disable; default: 0 */
#define BRESSERCAM_OPTION_CHAMBER_HT 0x4c /* get chamber humidity & temperature:
high 16 bits: humidity, in 0.1%, such as: 325 means humidity is 32.5%
low 16 bits: temperature, in 0.1 degrees Celsius, such as: 32 means 3.2 degrees Celsius
Expand Down Expand Up @@ -1024,7 +1024,32 @@ BRESSERCAM_API(HRESULT) Bressercam_feed_Pipe(HBressercam h, unsigned pipeId);
#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 */
#define BRESSERCAM_OPTION_PSEUDO_COLOR_ENABLE 0x65 /* Pseudo: -1 => custom: use startcolor & endcolor to generate the colormap
0 => disable
1 => spot
2 => spring
3 => summer
4 => autumn
5 => winter
6 => bone
7 => jet
8 => rainbow
9 => deepgreen
10 => ocean
11 => cool
12 => hsv
13 => pink
14 => hot
15 => parula
16 => magma
17 => inferno
18 => plasma
19 => viridis
20 => cividis
21 => twilight
22 => twilight_shifted
23 => turbo
*/

/* pixel format */
#define BRESSERCAM_PIXELFORMAT_RAW8 0x00
Expand Down
Binary file modified libbressercam/mac/libbressercam.bin
View file
Binary file not shown.
Binary file modified libbressercam/x64/libbressercam.bin
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion libmallincam/CMakeLists.txt
View file
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.23585")
set (LIBMALLINCAM_VERSION "54.23926")
set (LIBMALLINCAM_SOVERSION "54")

list (APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules/")
Expand Down
Loading

0 comments on commit d29edea

Please sign in to comment.