Skip to content

Commit

Permalink
QHY SDK v24.1.4
Browse files Browse the repository at this point in the history
  • Loading branch information
knro committed Jan 4, 2024
1 parent 74d40e1 commit 95f9ffa
Show file tree
Hide file tree
Showing 19 changed files with 41 additions and 9 deletions.
6 changes: 6 additions & 0 deletions debian/libqhy/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
libqhy (24.1.4) bullseye; urgency=medium

* Upstream release.

-- Jasem Mutlaq <[email protected]> Thu, 4 Jan 2024 14:00:00 +0300

libqhy (23.7.16) bullseye; urgency=medium

* Upstream release.
Expand Down
2 changes: 2 additions & 0 deletions libqhy/85-qhyccd.rules
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ ATTRS{idVendor}=="1618", ATTRS{idProduct}=="0200", RUN+="/sbin/fxload -t fx3 -I
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}=="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}"

#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}"
Expand Down Expand Up @@ -174,5 +175,6 @@ ATTRS{idVendor}=="0547", MODE="0666"

# QHYCCD
ATTRS{idVendor}=="1618", MODE="0666"
ATTRS{idVendor}=="706d", MODE="0666"

LABEL="qhy_end"
6 changes: 3 additions & 3 deletions libqhy/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
cmake_minimum_required(VERSION 3.16)
project (libqhy)

# QHY SDK 23.07.16
set (LIBQHY_VERSION "23.7.16")
set (LIBQHY_SOVERSION "23")
# QHY SDK 24.01.04
set (LIBQHY_VERSION "24.1.4")
set (LIBQHY_SOVERSION "24")

list (APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules/")
list (APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../cmake_modules/")
Expand Down
Binary file modified libqhy/firmware/QHY1253.img
Binary file not shown.
Binary file modified libqhy/firmware/QHY1920.img
Binary file not shown.
Binary file modified libqhy/firmware/QHY4040PRO.img
Binary file not shown.
Binary file modified libqhy/firmware/QHY432.img
Binary file not shown.
Binary file modified libqhy/firmware/QHY461.img
Binary file not shown.
Binary file modified libqhy/firmware/QHY530.img
Binary file not shown.
Binary file modified libqhy/firmware/QHY5III178.img
Binary file not shown.
Binary file added libqhy/firmware/QHY5III568.img
Binary file not shown.
Binary file modified libqhy/firmware/QHY5III585.img
Binary file not shown.
Binary file modified libqhy/firmware/QHY9701.img
Binary file not shown.
Binary file modified libqhy/libqhyccd.dylib
Binary file not shown.
Binary file modified libqhy/libqhyccd_armv8.bin
Binary file not shown.
Binary file modified libqhy/libqhyccd_x86_64.bin
Binary file not shown.
15 changes: 14 additions & 1 deletion libqhy/qhyccd.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ EXPORTC void STDCALL SetQHYCCDLogLevel(uint8_t logLevel);

#if (defined(__linux__ )&&!defined (__ANDROID__)) ||(defined (__APPLE__)&&defined( __MACH__)) ||(defined(__linux__ )&&defined (__ANDROID__))

//EXPORTC void STDCALL SetQHYCCDLogFunction(std::function<void(const std::string &message)> logFunction);
EXPORTC void STDCALL SetQHYCCDLogFunction(std::function<void(const std::string &message)> logFunction);
EXPORTC void STDCALL SetQHYCCDBufferNumber(uint32_t BufNumber);

#endif
Expand Down Expand Up @@ -948,6 +948,14 @@ EXPORTFUNC int STDCALL QHYCCD_fpga_send(int chnl, void * data, int len, int dest
EXPORTFUNC int STDCALL QHYCCD_fpga_recv(int chnl, void * data, int len, uint64_t timeout);
EXPORTFUNC void STDCALL QHYCCD_fpga_reset();

EXPORTFUNC uint32_t STDCALL SetQHYCCDLoadCalibrationFrames(qhyccd_handle *handle, uint32_t ImgW, uint32_t ImgH, uint32_t ImgBits, uint32_t ImgChannel, char *DarkFile, char *FlatFile, char *BiasFile);
EXPORTFUNC uint32_t STDCALL SetQHYCCDCalibrationOnOff(qhyccd_handle *handle, bool onoff);

EXPORTFUNC uint32_t STDCALL SetQHYCCDFrameDetectPos(qhyccd_handle *handle, uint32_t pos);
EXPORTFUNC uint32_t STDCALL SetQHYCCDFrameDetectCode(qhyccd_handle *handle, uint8_t code);
EXPORTFUNC uint32_t STDCALL SetQHYCCDFrameDetectOnOff(qhyccd_handle *handle, bool onoff);

EXPORTFUNC uint32_t STDCALL GetQHYCCDSensorName(qhyccd_handle *handle, char *name);

#if 0//PCIE_MODE_TEST

Expand Down Expand Up @@ -1027,3 +1035,8 @@ EXPORTFUNC void RegisterPnpEventOut( void (*in_pnp_event_out_func)(char *id));
EXPORTFUNC void RegisterTransferEventError( void (*transfer_event_error_func)());
EXPORTFUNC uint32_t STDCALL PCIEClearDDR(qhyccd_handle *handle);
EXPORTFUNC uint32_t STDCALL PCIEWriteCameraRegister2(qhyccd_handle *handle, unsigned char idx, unsigned char val);
EXPORTFUNC uint32_t STDCALL QHYCCD_DbGainToGainValue(qhyccd_handle *h,double dbgain,double *gainvalue);
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);
3 changes: 3 additions & 0 deletions libqhy/qhyccdcamdef.h
Original file line number Diff line number Diff line change
Expand Up @@ -436,6 +436,9 @@
#define DEVICETYPE_QHY268M_OEM 4134
#define DEVICETYPE_QHY268C_OEM 4135

#define DEVICETYPE_QHY5III568M 4136
#define DEVICETYPE_QHY5III568C 4137

/**
* Type define for QHY5IIIEND*/
#define DEVICETYPE_QHY5IIIEND 4999
Expand Down
18 changes: 13 additions & 5 deletions libqhy/qhyccdstruct.h
Original file line number Diff line number Diff line change
Expand Up @@ -247,19 +247,27 @@ enum CONTROL_ID
/*76*/ CAM_BIN8X8MODE, //!< check if camera has bin8x8 mode
/*77*/ CAM_GlobalSensorGPSLED, ///Show GPS LED tab on sharpCap
/*78*/ CONTROL_ImgProc, /// Process image
/*79*/ CONTROL_RemoveRBI, /// Remove single RBI
/*79*/ CONTROL_RemoveRBI, /// RBI, Remove single residual image
/*80*/ CONTROL_GlobalReset, //!<image stabilization

/*81*/ CONTROL_FrameDetect,
/*82*/ CAM_GainDBConversion, //!<Supports the conversion between db and gain
/*83*/ CAM_CurveSystemGain, //!
/*84*/ CAM_CurveFullWell,
/*85*/ CAM_CurveReadoutNoise,
/*86*/ CAM_UseAverageBinning,

/* 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_ImageStabilization, //!<image stabilization
/*1027*/ CONTROL_GAINdB //!<set gain with dB //CONTROL_dB_TO_GAIN
/*1028*/ //TEST_OFFSET//20230330
/*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)
};

/**
Expand Down

0 comments on commit 95f9ffa

Please sign in to comment.