QHYCCD SDK v21.3.15

indilib · Mar 15, 2021 · 5b5a94e · 5b5a94e
1 parent 6d899da
commit 5b5a94e
Show file tree

Hide file tree

Showing 35 changed files with 23 additions and 15 deletions.
diff --git a/debian/libqhy/changelog b/debian/libqhy/changelog
@@ -1,3 +1,9 @@
+libqhy (21.3.15) bionic; urgency=medium
+
+  * Upstream release.
+
+ -- Jasem Mutlaq <mutlaqja@ikarustech.com>  Mon, 15 Mar 2020 14:00:00 +0300
+
 libqhy (21.2.11) bionic; urgency=medium
 
   * Upstream release.

diff --git a/libqhy/85-qhyccd.rules b/libqhy/85-qhyccd.rules
@@ -22,7 +22,6 @@
 # 1. Increase usbfs memory limit
 #===============================================================================
 # QHY-Based camera by other vendors
-# QHYCCD
 
 #===============================================================================
 # 2. Pre-enumerated device IDs:

diff --git a/libqhy/CMakeLists.txt b/libqhy/CMakeLists.txt
@@ -3,8 +3,8 @@ PROJECT(libqhy C CXX)
 
 include(GNUInstallDirs)
 
-# QHY SDK 21.2.11
-set(LIBQHY_VERSION "21.2.11")
+# QHY SDK 21.3.15
+set(LIBQHY_VERSION "21.3.15")
 set(LIBQHY_SOVERSION "21")
 
 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-error")

diff --git a/libqhy/firmware/QHY128PRO.img b/libqhy/firmware/QHY128PRO.img
diff --git a/libqhy/firmware/QHY163.img b/libqhy/firmware/QHY163.img
diff --git a/libqhy/firmware/QHY168.img b/libqhy/firmware/QHY168.img
diff --git a/libqhy/firmware/QHY174.img b/libqhy/firmware/QHY174.img
diff --git a/libqhy/firmware/QHY178.img b/libqhy/firmware/QHY178.img
diff --git a/libqhy/firmware/QHY183.img b/libqhy/firmware/QHY183.img
diff --git a/libqhy/firmware/QHY2020.img b/libqhy/firmware/QHY2020.img
diff --git a/libqhy/firmware/QHY247.img b/libqhy/firmware/QHY247.img
diff --git a/libqhy/firmware/QHY268.img b/libqhy/firmware/QHY268.img
diff --git a/libqhy/firmware/QHY290.img b/libqhy/firmware/QHY290.img
diff --git a/libqhy/firmware/QHY294PRO.img b/libqhy/firmware/QHY294PRO.img
diff --git a/libqhy/firmware/QHY367PRO.img b/libqhy/firmware/QHY367PRO.img
diff --git a/libqhy/firmware/QHY4040.img b/libqhy/firmware/QHY4040.img
diff --git a/libqhy/firmware/QHY4040PRO.img b/libqhy/firmware/QHY4040PRO.img
diff --git a/libqhy/firmware/QHY410.img b/libqhy/firmware/QHY410.img
diff --git a/libqhy/firmware/QHY411ERIS.img b/libqhy/firmware/QHY411ERIS.img
diff --git a/libqhy/firmware/QHY42PRO.img b/libqhy/firmware/QHY42PRO.img
diff --git a/libqhy/firmware/QHY461.img b/libqhy/firmware/QHY461.img
diff --git a/libqhy/firmware/QHY550.img b/libqhy/firmware/QHY550.img
diff --git a/libqhy/firmware/QHY5III174.img b/libqhy/firmware/QHY5III174.img
diff --git a/libqhy/firmware/QHY5III178.img b/libqhy/firmware/QHY5III178.img
diff --git a/libqhy/firmware/QHY5III290.img b/libqhy/firmware/QHY5III290.img
diff --git a/libqhy/firmware/QHY5III462.img b/libqhy/firmware/QHY5III462.img
diff --git a/libqhy/firmware/QHY5III485.img b/libqhy/firmware/QHY5III485.img
diff --git a/libqhy/firmware/QHY600.img b/libqhy/firmware/QHY600.img
diff --git a/libqhy/firmware/QHY6060.img b/libqhy/firmware/QHY6060.img
diff --git a/libqhy/libqhyccd.dylib b/libqhy/libqhyccd.dylib
diff --git a/libqhy/libqhyccd_armv6.bin b/libqhy/libqhyccd_armv6.bin
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
@@ -229,6 +229,7 @@ EXPORTC uint32_t STDCALL GetQHYCCDSingleFrame(qhyccd_handle *handle,uint32_t *w,
 
 /**
   @fn uint32_t CancelQHYCCDExposing(qhyccd_handle *handle)
+  @brief force stop the camera long exposure. But host software must readout the image data. Please note not all camera can use this method.
   @param handle camera control handle
   @return
   on success,return QHYCCD_SUCCESS \n
@@ -238,32 +239,33 @@ EXPORTC uint32_t STDCALL CancelQHYCCDExposing(qhyccd_handle *handle);
 
 /**
   @fn uint32_t CancelQHYCCDExposingAndReadout(qhyccd_handle *handle)
-  @brief stop the camera exposing and readout
+  @brief force stop the camera long exposure. And also camera does not send back the image data. Host software must not readout the data. All camera support this mode. 
   @param handle camera control handle
   @return
   on success,return QHYCCD_SUCCESS \n
   another QHYCCD_ERROR code on other failures
   */
 EXPORTC uint32_t STDCALL CancelQHYCCDExposingAndReadout(qhyccd_handle *handle);
 
-/** \fn uint32_t BeginQHYCCDLive(qhyccd_handle *handle)
-      \brief start continue exposing
-	  \param handle camera control handle
-	  \return
-	  on success,return QHYCCD_SUCCESS \n
-	  another QHYCCD_ERROR code on other failures
+/** 
+  @fn uint32_t BeginQHYCCDLive(qhyccd_handle *handle)
+  @brief in live video mode, start continue exposing. Only need to start once before StopQHYCCDLive.
+	@param handle camera control handle
+  @return
+	on success,return QHYCCD_SUCCESS \n
+	another QHYCCD_ERROR code on other failures
   */
 EXPORTC uint32_t STDCALL BeginQHYCCDLive(qhyccd_handle *handle);
 
 /**
-      @fn uint32_t GetQHYCCDLiveFrame(qhyccd_handle *handle,uint32_t *w,uint32_t *h,uint32_t *bpp,uint32_t *channels,uint8_t *imgdata)
-      @brief get live frame data from camera
+    @fn uint32_t GetQHYCCDLiveFrame(qhyccd_handle *handle,uint32_t *w,uint32_t *h,uint32_t *bpp,uint32_t *channels,uint8_t *imgdata)
+    @brief get live frame data from camera
 	  @param handle camera control handle
 	  @param *w pointer to width of ouput image
 	  @param *h pointer to height of ouput image
-      @param *bpp pointer to depth of ouput image
-      @param *channels pointer to channels of ouput image
-      @param *imgdata image data buffer
+    @param *bpp pointer to depth of ouput image
+    @param *channels pointer to channels of ouput image
+    @param *imgdata image data buffer
 	  @return
 	  on success,return QHYCCD_SUCCESS \n
 	  QHYCCD_ERROR_GETTINGFAILED,if get data failed \n

diff --git a/libqhy/qhyccdcamdef.h b/libqhy/qhyccdcamdef.h
@@ -538,6 +538,7 @@
 #define DEVICETYPE_QHY4040PROPCIE  		0X66184043
 #define DEVICETYPE_QHY411ERISPCIE  		0X6618c414
 #define DEVICETYPE_QHY600PCIE      		0X6618c603
+#define DEVICETYPE_QHY268PCIE      		0X6618c269