QHY SDK v25.1.19

indilib · Jan 19, 2025 · 8f07ef5 · 8f07ef5
1 parent 37b0827
commit 8f07ef5
Show file tree

Hide file tree

Showing 18 changed files with 53 additions and 19 deletions.
diff --git a/debian/libqhy/changelog b/debian/libqhy/changelog
@@ -1,3 +1,9 @@
+libqhy (25.1.19) bullseye; urgency=medium
+
+  * Upstream release.
+
+ -- Jasem Mutlaq <[email protected]>  Mon, 19 Jan 2025 14:00:00 +0300
+
 libqhy (24.7.29) bullseye; urgency=medium
 
   * Upstream release.

diff --git a/indi-qhy/CMakeLists.txt b/indi-qhy/CMakeLists.txt
@@ -37,7 +37,7 @@ include_directories( ${QHY_INCLUDE_DIR})
 include_directories( ${USB1_INCLUDE_DIRS})
 include_directories( ${NOVA_INCLUDE_DIRS})
 
-add_definitions(-DCALLBACK_MODE_SUPPORT)
+add_definitions(-DCALLBACK_MODE_SUPPORT -D__CPP_MODE__)
 
 include(CMakeCommon)
 

diff --git a/libqhy/85-qhyccd.rules b/libqhy/85-qhyccd.rules
@@ -112,7 +112,7 @@ ATTRS{idVendor}=="1618", ATTRS{idProduct}=="0415", RUN+="/sbin/fxload -t fx3 -I
 ATTRS{idVendor}=="1618", ATTRS{idProduct}=="0200", RUN+="/sbin/fxload -t fx3 -I /lib/firmware/qhy/QHY5III200.img -D $env{DEVNAME}"
 ATTRS{idVendor}=="1618", ATTRS{idProduct}=="0585", RUN+="/sbin/fxload -t fx3 -I /lib/firmware/qhy/QHY5III585.img -D $env{DEVNAME}"
 ATTRS{idVendor}=="1618", ATTRS{idProduct}=="0678", RUN+="/sbin/fxload -t fx3 -I /lib/firmware/qhy/QHY5III678.img -D $env{DEVNAME}"
-ATTRS{idVendor}=="19b4", ATTRS{idProduct}=="0677", RUN+="/sbin/fxload -t fx3 -I /lib/firmware/qhy/Origin678.img -D $env{DEVNAME}"
+ATTRS{idVendor}=="19b4", ATTRS{idProduct}=="0677", RUN+="/sbin/fxload -t fx3 -I /lib/firmware/qhy/Origin678C.img -D $env{DEVNAME}"
 ATTRS{idVendor}=="1618", ATTRS{idProduct}=="0715", RUN+="/sbin/fxload -t fx3 -I /lib/firmware/qhy/QHY5III715.img -D $env{DEVNAME}"
 ATTRS{idVendor}=="1618", ATTRS{idProduct}=="0568", RUN+="/sbin/fxload -t fx3 -I /lib/firmware/qhy/QHY5III568.img -D $env{DEVNAME}"
 ATTRS{idVendor}=="1618", ATTRS{idProduct}=="0587", RUN+="/sbin/fxload -t fx3 -I /lib/firmware/qhy/miniCam8.img -D $env{DEVNAME}"
@@ -165,6 +165,8 @@ ATTRS{idVendor}=="1618", ATTRS{idProduct}=="c192", RUN+="/sbin/fxload -t fx3 -I
 ATTRS{idVendor}=="1618", ATTRS{idProduct}=="0768", RUN+="/sbin/fxload -t fx3 -I /lib/firmware/qhy/QHY10768.img -D $env{DEVNAME}"
 ATTRS{idVendor}=="1618", ATTRS{idProduct}=="c992", RUN+="/sbin/fxload -t fx3 -I /lib/firmware/qhy/QHY992.img -D $env{DEVNAME}"
 ATTRS{idVendor}=="1618", ATTRS{idProduct}=="c487", RUN+="/sbin/fxload -t fx3 -I /lib/firmware/qhy/QHY487.img -D $env{DEVNAME}"
+ATTRS{idVendor}=="1618", ATTRS{idProduct}=="c661", RUN+="/sbin/fxload -t fx3 -I /lib/firmware/qhy/QHY661.img -D $env{DEVNAME}"
+ATTRS{idVendor}=="1618", ATTRS{idProduct}=="c811", RUN+="/sbin/fxload -t fx3 -I /lib/firmware/qhy/QHY811.img -D $env{DEVNAME}"
 
 #===============================================================================
 # 2. Make all devices accessible by the user by fixing the permission.

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.11.03
-set (LIBQHY_VERSION "24.11.3")
+# QHY SDK 25.01.19
+set (LIBQHY_VERSION "25.01.19")
 set (LIBQHY_SOVERSION "20")
 
 list (APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules/")

diff --git a/libqhy/firmware/QHY268.img b/libqhy/firmware/QHY268.img
diff --git a/libqhy/firmware/QHY294PRO.img b/libqhy/firmware/QHY294PRO.img
diff --git a/libqhy/firmware/QHY432.img b/libqhy/firmware/QHY432.img
diff --git a/libqhy/firmware/QHY600.img b/libqhy/firmware/QHY600.img
diff --git a/libqhy/firmware/QHY990.img b/libqhy/firmware/QHY990.img
diff --git a/libqhy/firmware/QHY991.img b/libqhy/firmware/QHY991.img
diff --git a/libqhy/firmware/QHY992.img b/libqhy/firmware/QHY992.img
diff --git a/libqhy/firmware/miniCam8.img b/libqhy/firmware/miniCam8.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/qhyccd.h b/libqhy/qhyccd.h
@@ -7,6 +7,8 @@
 #if __CPP_MODE__
 #include <functional>
 #include <string>
+#include <algorithm>
+#include <array>
 #endif
 
 
@@ -489,8 +491,7 @@ EXPORTC uint32_t STDCALL OSXInitQHYCCDFirmwareArray();
 
 
 
-EXPORTC uint32_t STDCALL OSXInitQHYCCDAndroidFirmwareArray(int idVendor,int idProduct,
-    qhyccd_handle *handle);
+EXPORTC uint32_t STDCALL OSXInitQHYCCDAndroidFirmwareArray(int idVendor,int idProduct, int fileDescriptor);
 
 
 
@@ -1086,4 +1087,4 @@ EXPORTFUNC uint32_t STDCALL QHYCCD_DbGainToGainValue(qhyccd_handle *h,double dbg
 EXPORTFUNC uint32_t STDCALL QHYCCD_GainValueToDbGain(qhyccd_handle *h,double gainvalue,double *dbgain);
 EXPORTFUNC uint32_t STDCALL QHYCCD_curveSystemGain(qhyccd_handle *handle,double gainV,double *systemgain);
 EXPORTFUNC uint32_t STDCALL QHYCCD_curveFullWell(qhyccd_handle *handle,double gainV,double *fullwell);
-EXPORTFUNC uint32_t STDCALL QHYCCD_curveReadoutNoise(qhyccd_handle *handle,double gainV,double *readoutnoise);
+EXPORTFUNC uint32_t STDCALL QHYCCD_curveReadoutNoise(qhyccd_handle *handle,double gainV,double *readoutnoise);
diff --git a/libqhy/qhyccdcamdef.h b/libqhy/qhyccdcamdef.h
@@ -465,6 +465,8 @@
 #define DEVICETYPE_QHY1920M_OI1920M        4153
 #define DEVICETYPE_QHY1920C_OI1920C        4154
 
+#define DEVICETYPE_QHY811M                 4155
+
 /**
  * Type define for QHY5IIIEND*/
 #define DEVICETYPE_QHY5IIIEND   	4999
@@ -1055,8 +1057,8 @@
 
 /**
  * Type define for QHY-DevelopDev*/
-#define QHY5IIICOMMON_MAX_WIDTH      14304//6280//5336//4144//3864//5680//2712//3864// 2712// 1408    //8432  	
-#define QHY5IIICOMMON_MAX_HEIGHT     10748//4210//4908//3064//2192//3710//1538//2180// 1538// 1052    //5648	  
+#define QHY5IIICOMMON_MAX_WIDTH      19776//14304//6280//5336//4144//3864//5680//2712//3864// 2712// 1408    //8432  	
+#define QHY5IIICOMMON_MAX_HEIGHT     13124//10748//4210//4908//3064//2192//3710//1538//2180// 1538// 1052    //5648	  
 
 /**
  * Type define for QHY247*/
@@ -1140,9 +1142,12 @@
 #define QHY411_MAX_WIDTH        	14304
 #define QHY411_MAX_HEIGHT        	10748
 
-#define QHY661_MAX_WIDTH        	13960
+#define QHY661_MAX_WIDTH        	13968
 #define QHY661_MAX_HEIGHT        	9696
 
+#define QHY811_MAX_WIDTH        	19776
+#define QHY811_MAX_HEIGHT        	13120
+
 // 10802-92-54=10656 max_y-topBlank-bottomBlank=imageHeight
 // 14304-48-48=14208 max_x-leftBlank-rightBlank=imageWidth
 // only y-shift is supported by most sensor

diff --git a/libqhy/qhyccdstruct.h b/libqhy/qhyccdstruct.h
@@ -9,6 +9,7 @@
 #ifndef __QHYCCDSTRUCTDEF_H__
 #define __QHYCCDSTRUCTDEF_H__
 
+#if __CPP_MODE__
 #if defined (_WIN32)
 #ifndef EXPORTFUNC
 #define EXPORTFUNC extern "C" __declspec(dllexport)
@@ -24,6 +25,23 @@
 #define STDCALL
 #define EXPORTC extern "C"
 #endif
+#else
+#if defined (_WIN32)
+#ifndef EXPORTFUNC
+#define EXPORTFUNC
+#endif
+#ifndef STDCALL
+#define STDCALL
+#endif
+#ifndef EXPORTC
+#define EXPORTC
+#endif
+#else
+#define EXPORTFUNC
+#define STDCALL
+#define EXPORTC
+#endif
+#endif
 
 #include "stdint.h"
 
@@ -46,6 +64,10 @@ typedef uint64_t QHYDWORD;
 
 #endif
 
+/**
+ * usb vendor request command
+ */
+#define QHYCCD_REQUEST_RQT  0x00
 
 /**
  * usb vendor request command
@@ -279,11 +301,13 @@ enum CONTROL_ID
 /*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
+/*1035*/ //CONTROL_HDR_H_k,               //!<HDR H k
+/*1036*/ //CONTROL_HDR_H_b,               //!<HDR H b
+/*1035*/ CONTROL_HDR_L_k,               //!<HDR L k
+/*1036*/ CONTROL_HDR_L_b,              //!<HDR L b
+/*1037*/ CONTROL_HDR_x,//,                //!<HDR X
+/*1038*/ CONTROL_HDR_showKB            //!show HDR kb
+//CONTROL_SHOWIMG
 };   
 
 /**
@@ -360,9 +384,5 @@ typedef QHYDWORD  (*QHYCCDProcCallBack) (void *handle,
     QHYDWORD lParam);
 #endif
 
-/**
- * usb vendor request command
- */
-#define QHYCCD_REQUEST_RQT  0x00
 
 #endif