QHY SDK Sync

indilib · Apr 1, 2024 · 45c78aa · 45c78aa
1 parent 0c295b7
commit 45c78aa
Show file tree

Hide file tree

Showing 13 changed files with 41 additions and 14 deletions.
diff --git a/debian/libqhy/changelog b/debian/libqhy/changelog
@@ -1,3 +1,9 @@
+libqhy (24.4.1) bullseye; urgency=medium
+
+  * Upstream release.
+
+ -- Jasem Mutlaq <[email protected]>  Mon, 1 Apr 2024 14:00:00 +0300
+
 libqhy (24.1.4) bullseye; urgency=medium
 
   * Upstream release.

diff --git a/libqhy/CMakeLists.txt b/libqhy/CMakeLists.txt
@@ -1,8 +1,8 @@
 cmake_minimum_required(VERSION 3.16)
 project (libqhy)
 
-# QHY SDK 24.01.04
-set (LIBQHY_VERSION "24.1.4")
+# QHY SDK 24.04.01
+set (LIBQHY_VERSION "24.4.1")
 set (LIBQHY_SOVERSION "24")
 
 list (APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules/")

diff --git a/libqhy/firmware/QHY183A.img b/libqhy/firmware/QHY183A.img
diff --git a/libqhy/firmware/QHY342PRO.img b/libqhy/firmware/QHY342PRO.img
diff --git a/libqhy/firmware/QHY4040PRO.img b/libqhy/firmware/QHY4040PRO.img
diff --git a/libqhy/firmware/QHY461.img b/libqhy/firmware/QHY461.img
diff --git a/libqhy/firmware/QHY5III568.img b/libqhy/firmware/QHY5III568.img
diff --git a/libqhy/firmware/QHY991.img b/libqhy/firmware/QHY991.img
diff --git a/libqhy/libqhyccd.dylib b/libqhy/libqhyccd.dylib
diff --git a/libqhy/libqhyccd_armv8.bin b/libqhy/libqhyccd_armv8.bin
diff --git a/libqhy/libqhyccd_x86_64.bin b/libqhy/libqhyccd_x86_64.bin
diff --git a/libqhy/qhyccdcamdef.h b/libqhy/qhyccdcamdef.h
@@ -439,6 +439,13 @@
 #define DEVICETYPE_QHY5III568M             4136
 #define DEVICETYPE_QHY5III568C             4137
 
+#define DEVICETYPE_QHYMINICAM8M            4138
+#define DEVICETYPE_QHYMINICAM8C            4139
+
+#define DEVICETYPE_QHY533M_OEM             4140
+#define DEVICETYPE_QHY533C_OEM             4141
+
+#define DEVICETYPE_QHY487              4142
 /**
  * Type define for QHY5IIIEND*/
 #define DEVICETYPE_QHY5IIIEND   	4999
@@ -609,6 +616,7 @@
 #define DEVICETYPE_QHY991PCIE      		0X6618d992
 #define DEVICETYPE_QHY461PCIE      		0X6618c462
 #define DEVICETYPE_QHY342PCIE      		0X66180345
+#define DEVICETYPE_QHY487PCIE			0X6618c488
 
 
 
@@ -1091,9 +1099,6 @@
 #define QHY4040PRO_MAX_WIDTH        	4096
 #define QHY4040PRO_MAX_HEIGHT        	4118
 
-#define QHY342PRO_MAX_WIDTH        	6488
-#define QHY342PRO_MAX_HEIGHT        	4870
-
 
 #define QHY550_MAX_WIDTH        	2496
 #define QHY550_MAX_HEIGHT        	2080
@@ -1164,8 +1169,8 @@
 #define QHY268C_MAX_WIDTH        6288
 #define QHY268C_MAX_HEIGHT       4210
 
-#define QHY410C_MAX_WIDTH        6112
-#define QHY410C_MAX_HEIGHT       4140-100
+//#define QHY410C_MAX_WIDTH        6112
+//#define QHY410C_MAX_HEIGHT       4140-100
 
 #define QHY432_MAX_WIDTH        1624
 #define QHY432_MAX_HEIGHT       1136

diff --git a/libqhy/qhyccdstruct.h b/libqhy/qhyccdstruct.h
@@ -255,20 +255,36 @@ enum CONTROL_ID
 /*84*/	CAM_CurveFullWell,
 /*85*/	CAM_CurveReadoutNoise,
 /*86*/	CAM_UseAverageBinning,
+/*87*/	CONTROL_OUTSIDE_PUMP_V2, // air pump outside
+
+///*88*/  CONTROL_AUTOEXPOSURE,           //!<auto exposure
+///*89*/  CONTROL_AUTOEXPTargetBrightness,	//!<auto exposure Target Brightness
+///*90*/  CONTROL_AUTOEXPSampleArea,   //!<auto exposure Sample Area
+///*91*/  CONTROL_AUTOEXPexpMaxMS,        //!<auto exposure max exp(ms)
+///*92*/  CONTROL_AUTOEXPgainMax,         //!<auto exposure max gain
 
 /* Do not Put Item after  CONTROL_MAX_ID !! This should be the max index of the list */
 /*Last One */  CONTROL_MAX_ID,
 
 //TEST id name list
 /*1024*/ CONTROL_AUTOWHITEBALANCE=1024, //!<auto white balance  eg.CONTROL_TEST=1024
 /*1025*/ CONTROL_AUTOEXPOSURE,			//!<auto exposure
-/*1026*/ CONTROL_AUTOEXPmessureValue,	
-/*1027*/ CONTROL_AUTOEXPmessureMethod,
-/*1028*/ CONTROL_ImageStabilization,   //!<image stabilization
-/*1029*/ CONTROL_GAINdB,			//!<uesed to test dBGain control  //CONTROL_dB_TO_GAIN
-/*1030*/ CONTROL_DPC,            //!<Turn on or off the image DPC function(Remove thermal noise)
-/*1031*/ CONTROL_DPC_value       //!<value the image DPC function(Remove thermal noise)
-};
+/*1026*/ CONTROL_AUTOEXPTargetBrightness,//CONTROL_AUTOEXPmessureValue,
+/*1027*/ CONTROL_AUTOEXPSampleArea,//CONTROL_AUTOEXPmessureMethod,
+/*1028*/ CONTROL_AUTOEXPexpMaxMS,       //!<auto exposure max exp(ms)
+/*1029*/ CONTROL_AUTOEXPgainMax,        //!<auto exposure max gain
+/*1030*/ CONTROL_ImageStabilization,    //!<image stabilization      
+/*1031*/ CONTROL_GAINdB,                //!<uesed to test dBGain control  //CONTROL_dB_TO_GAIN
+/*1032*/ CONTROL_DPC,                   //!<Turn on or off the image DPC function(Remove thermal noise)
+/*1033*/ CONTROL_DPC_value,             //!<value the image DPC function(Remove thermal noise)
+/*1034*/ CONTROL_HDR,                   //!<HDR For cameras with high gain and low gain channels combined into 16 bits, set combination parameters>
+                    //!<HDR status  0:As-is output  1:Splice according to k and b values  2:Calculate k and b, only once
+/*1035*/ CONTROL_HDR_H_k,               //!<HDR H k
+/*1036*/ CONTROL_HDR_H_b,               //!<HDR H b
+/*1037*/ CONTROL_HDR_L_k,               //!<HDR L k
+/*1038*/ CONTROL_HDR_L_b,              //!<HDR L b
+/*1039*/ CONTROL_HDR_x                  //!<HDR X
+};   
 
 /**
  * debayer mode for mono to color */