QHY SDK 24.7.29. Update SOVERSION to 20 since it is fixed for QHY

indilib · Jul 30, 2024 · 2252321 · 2252321
1 parent 15bcfc8
commit 2252321
Show file tree

Hide file tree

Showing 18 changed files with 36 additions and 15 deletions.
diff --git a/debian/libqhy/changelog b/debian/libqhy/changelog
@@ -1,3 +1,9 @@
+libqhy (24.7.29) bullseye; urgency=medium
+
+  * Upstream release.
+
+ -- Jasem Mutlaq <[email protected]>  Tue, 30 Jul 2024 14:00:00 +0300
+
 libqhy (24.4.1) bullseye; urgency=medium
 
   * Upstream release.

diff --git a/libqhy/85-qhyccd.rules b/libqhy/85-qhyccd.rules
@@ -114,6 +114,7 @@ ATTRS{idVendor}=="1618", ATTRS{idProduct}=="0585", RUN+="/sbin/fxload -t fx3 -I
 ATTRS{idVendor}=="1618", ATTRS{idProduct}=="0678", RUN+="/sbin/fxload -t fx3 -I /lib/firmware/qhy/QHY5III678.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}"
 
 #QHYCCD Scientific Camera (7:QHY42,QHY42PRO,QHY2020,QHY4040,QHY4040PRO,QHY6060,QHY411,QHY461)
 ATTRS{idVendor}=="1618", ATTRS{idProduct}=="4200", RUN+="/sbin/fxload -t fx3 -I /lib/firmware/qhy/QHY42.img -D $env{DEVNAME}"
@@ -161,7 +162,8 @@ ATTRS{idVendor}=="1618", ATTRS{idProduct}=="d183", RUN+="/sbin/fxload -t fx3 -I
 ATTRS{idVendor}=="1618", ATTRS{idProduct}=="d991", RUN+="/sbin/fxload -t fx3 -I /lib/firmware/qhy/QHY991.img -D $env{DEVNAME}"
 ATTRS{idVendor}=="1618", ATTRS{idProduct}=="c192", RUN+="/sbin/fxload -t fx3 -I /lib/firmware/qhy/QHY1920.img -D $env{DEVNAME}"
 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}"
 
 #===============================================================================
 # 2. Make all devices accessible by the user by fixing the permission.

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

diff --git a/libqhy/firmware/QHY1253.img b/libqhy/firmware/QHY1253.img
diff --git a/libqhy/firmware/QHY268.img b/libqhy/firmware/QHY268.img
diff --git a/libqhy/firmware/QHY487.img b/libqhy/firmware/QHY487.img
diff --git a/libqhy/firmware/QHY5III485.img b/libqhy/firmware/QHY5III485.img
diff --git a/libqhy/firmware/QHY9701.img b/libqhy/firmware/QHY9701.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
@@ -957,6 +957,9 @@ EXPORTFUNC uint32_t STDCALL SetQHYCCDFrameDetectOnOff(qhyccd_handle *handle, boo
 
 EXPORTFUNC uint32_t STDCALL GetQHYCCDSensorName(qhyccd_handle *handle, char *name);
 
+EXPORTFUNC uint8_t STDCALL GetCameraIsSuperSpeedFromID(char* id);
+
+EXPORTC void STDCALL EnableSupportOICamera(char* password);
 #if 0//PCIE_MODE_TEST
 
 #include "riffa.h"

diff --git a/libqhy/qhyccdcamdef.h b/libqhy/qhyccdcamdef.h
@@ -445,7 +445,17 @@
 #define DEVICETYPE_QHY533M_OEM             4140
 #define DEVICETYPE_QHY533C_OEM             4141
 
-#define DEVICETYPE_QHY487              4142
+#define DEVICETYPE_QHY487                  4142
+#define DEVICETYPE_QHY992                  4143
+
+#define DEVICETYPE_QHY533M_OI533M          4144
+#define DEVICETYPE_QHY533C_OI533C          4145
+
+#define DEVICETYPE_QHY268M_OI268M          4146
+#define DEVICETYPE_QHY268C_OI268C          4147
+
+#define DEVICETYPE_QHY600M_C600MC2         4148
+
 /**
  * Type define for QHY5IIIEND*/
 #define DEVICETYPE_QHY5IIIEND   	4999

diff --git a/libqhy/qhyccdstruct.h b/libqhy/qhyccdstruct.h
@@ -257,22 +257,22 @@ enum CONTROL_ID
 /*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
+/*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_AUTOEXPTargetBrightness,//CONTROL_AUTOEXPmessureValue,
-/*1027*/ CONTROL_AUTOEXPSampleArea,//CONTROL_AUTOEXPmessureMethod,
-/*1028*/ CONTROL_AUTOEXPexpMaxMS,       //!<auto exposure max exp(ms)
-/*1029*/ CONTROL_AUTOEXPgainMax,        //!<auto exposure max gain
+///*1025*/ CONTROL_AUTOEXPOSURE,			//!<auto exposure
+///*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)