Skip to content

Commit

Permalink
QHYSDK v21.9.10 release
Browse files Browse the repository at this point in the history
  • Loading branch information
knro committed Sep 9, 2021
1 parent 9673c8b commit 909fc17
Show file tree
Hide file tree
Showing 45 changed files with 46 additions and 6 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 (21.9.10) focal; urgency=medium

* Upstream release.

-- Jasem Mutlaq <mutlaqja@ikarustech.com> Thu, 9 Se[ 2021 14:00:00 +0300

libqhy (21.8.3) focal; urgency=medium

* Upstream release.
Expand Down
1 change: 1 addition & 0 deletions libqhy/85-qhyccd.rules
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ ATTRS{idVendor}=="1618", ATTRS{idProduct}=="c178", RUN+="/sbin/fxload -t fx3 -I
ATTRS{idVendor}=="1618", ATTRS{idProduct}=="c290", RUN+="/sbin/fxload -t fx3 -I /lib/firmware/qhy/QHY290.img -D $env{DEVNAME}"
ATTRS{idVendor}=="1618", ATTRS{idProduct}=="c224", RUN+="/sbin/fxload -t fx3 -I /lib/firmware/qhy/QHY224.img -D $env{DEVNAME}"
ATTRS{idVendor}=="1618", ATTRS{idProduct}=="c550", RUN+="/sbin/fxload -t fx3 -I /lib/firmware/qhy/QHY550.img -D $env{DEVNAME}"
ATTRS{idVendor}=="1618", ATTRS{idProduct}=="c253", RUN+="/sbin/fxload -t fx3 -I /lib/firmware/qhy/QHY1253.img -D $env{DEVNAME}"

#QHYCCD Medium COLDMOS Camera (9:QHY183,QHY163,QHY294,QHY165,QHY168,QHY247,QHY128,QHY367,QHY600)
ATTRS{idVendor}=="1618", ATTRS{idProduct}=="c183", RUN+="/sbin/fxload -t fx3 -I /lib/firmware/qhy/QHY183.img -D $env{DEVNAME}"
Expand Down
4 changes: 2 additions & 2 deletions libqhy/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
cmake_minimum_required (VERSION 3.0)
project (libqhy)

# QHY SDK 21.8.3
set (LIBQHY_VERSION "21.8.3")
# QHY SDK 21.9.10
set (LIBQHY_VERSION "21.9.10")
set (LIBQHY_SOVERSION "21")

list (APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules/")
Expand Down
Binary file added libqhy/firmware/QHY1253.img
Binary file not shown.
Binary file modified libqhy/firmware/QHY128PRO.img
Binary file not shown.
Binary file modified libqhy/firmware/QHY163.img
Binary file not shown.
Binary file modified libqhy/firmware/QHY168.img
Binary file not shown.
Binary file modified libqhy/firmware/QHY174.img
Binary file not shown.
Binary file modified libqhy/firmware/QHY178.img
Binary file not shown.
Binary file modified libqhy/firmware/QHY183.img
Binary file not shown.
Binary file modified libqhy/firmware/QHY183A.img
Binary file not shown.
Binary file modified libqhy/firmware/QHY2020.img
Binary file not shown.
Binary file modified libqhy/firmware/QHY247.img
Binary file not shown.
Binary file modified libqhy/firmware/QHY268.img
Binary file not shown.
Binary file modified libqhy/firmware/QHY290.img
Binary file not shown.
Binary file modified libqhy/firmware/QHY294.img
Binary file not shown.
Binary file modified libqhy/firmware/QHY294PRO.img
Binary file not shown.
Binary file modified libqhy/firmware/QHY342.img
Binary file not shown.
Binary file modified libqhy/firmware/QHY367PRO.img
Binary file not shown.
Binary file modified libqhy/firmware/QHY4040.img
Binary file not shown.
Binary file modified libqhy/firmware/QHY4040PRO.img
Binary file not shown.
Binary file modified libqhy/firmware/QHY410.img
Binary file not shown.
Binary file modified libqhy/firmware/QHY411ERIS.img
Binary file not shown.
Binary file modified libqhy/firmware/QHY42PRO.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/QHY533.img
Binary file not shown.
Binary file modified libqhy/firmware/QHY550.img
Binary file not shown.
Binary file modified libqhy/firmware/QHY5III174.img
Binary file not shown.
Binary file modified libqhy/firmware/QHY5III178.img
Binary file not shown.
Binary file modified libqhy/firmware/QHY5III334.img
Binary file not shown.
Binary file modified libqhy/firmware/QHY5III462.img
Binary file not shown.
Binary file modified libqhy/firmware/QHY5III482.img
Binary file not shown.
Binary file modified libqhy/firmware/QHY5III485.img
Binary file not shown.
Binary file modified libqhy/firmware/QHY600.img
Binary file not shown.
Binary file modified libqhy/firmware/QHY6060.img
Binary file not shown.
Binary file modified libqhy/firmware/QHY990.img
Binary file not shown.
Binary file modified libqhy/firmware/QHY991.img
Binary file not shown.
Binary file modified libqhy/libqhyccd.dylib
Binary file not shown.
Binary file modified libqhy/libqhyccd_armv6.bin
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.
31 changes: 28 additions & 3 deletions libqhy/qhyccd.h
Original file line number Diff line number Diff line change
Expand Up @@ -374,6 +374,12 @@ EXPORTC uint32_t STDCALL GetQHYCCDCFWStatus(qhyccd_handle *handle,char *status);
*/
EXPORTC uint32_t STDCALL IsQHYCCDCFWPlugged(qhyccd_handle *handle);

//Get the number of triger mode for camera
EXPORTC uint32_t STDCALL GetQHYCCDTrigerModeNumber(qhyccd_handle *handle, uint32_t *modeNumber);
//Get the name of for every triger mode
EXPORTC uint32_t STDCALL GetQHYCCDTrigerModeName(qhyccd_handle *handle, uint32_t modeNumber, char *name);
//Setup triger-in mode on/off
EXPORTC uint32_t STDCALL SetQHYCCDTrigerFunction(qhyccd_handle *h,bool value);
/**
\fn uint32_t SetQHYCCDTrigerMode(qhyccd_handle *handle,uint32_t trigerMode)
\brief set camera triger mode
Expand All @@ -383,7 +389,17 @@ EXPORTC uint32_t STDCALL IsQHYCCDCFWPlugged(qhyccd_handle *handle);
on success,return QHYCCD_SUCCESS \n
another QHYCCD_ERROR code on other failures
*/
//Setup triger mode for camera
EXPORTC uint32_t STDCALL SetQHYCCDTrigerMode(qhyccd_handle *handle,uint32_t trigerMode);
//Setup triger-out mode on/off
EXPORTC uint32_t STDCALL EnableQHYCCDTrigerOut(qhyccd_handle *handle);
//Send software triger-in signal to camera
EXPORTC uint32_t STDCALL SendSoftTriger2QHYCCDCam(qhyccd_handle *handle);

EXPORTC uint32_t STDCALL SetQHYCCDTrigerFilterOnOff(qhyccd_handle *handle, bool onoff);

EXPORTC uint32_t STDCALL SetQHYCCDTrigerFilterTime(qhyccd_handle *handle, uint32_t time);


/** \fn void Bits16ToBits8(qhyccd_handle *h,uint8_t *InputData16,uint8_t *OutputData8,uint32_t imageX,uint32_t imageY,uint16_t B,uint16_t W)
\brief turn 16bits data into 8bits
Expand Down Expand Up @@ -469,6 +485,7 @@ EXPORTC uint32_t STDCALL GetQHYCCDEffectiveArea(qhyccd_handle *h,uint32_t *start
*/
EXPORTC uint32_t STDCALL GetQHYCCDOverScanArea(qhyccd_handle *h,uint32_t *startX, uint32_t *startY, uint32_t *sizeX, uint32_t *sizeY);

EXPORTC uint32_t STDCALL GetQHYCCDCurrentROI(qhyccd_handle *handle, uint32_t *startX, uint32_t *startY, uint32_t *sizeX, uint32_t *sizeY);

/** @fn uint32_t SetQHYCCDFocusSetting(qhyccd_handle *h,uint32_t focusCenterX, uint32_t focusCenterY)
@brief Set the camera on focus mode
Expand Down Expand Up @@ -702,8 +719,6 @@ EXPORTC double STDCALL GetQHYCCDReadingProgress(qhyccd_handle *handle);
*/
EXPORTC uint32_t STDCALL TestQHYCCDPIDParas(qhyccd_handle *h, double p, double i, double d);

EXPORTC uint32_t STDCALL SetQHYCCDTrigerFunction(qhyccd_handle *h,bool value);

EXPORTC uint32_t STDCALL DownloadFX3FirmWare(uint16_t vid,uint16_t pid,char *imgpath);

EXPORTC uint32_t STDCALL GetQHYCCDType(qhyccd_handle *h);
Expand Down Expand Up @@ -875,6 +890,13 @@ EXPORTFUNC uint32_t STDCALL GetReadModesNumber(char* deviceID,uint32_t* numModes

EXPORTFUNC uint32_t STDCALL GetReadModeName(char* deviceID, uint32_t modeIndex, char* modeName);

EXPORTFUNC void STDCALL QHYCCDSensorPhaseReTrain(qhyccd_handle *handle);
EXPORTFUNC void STDCALL QHYCCDReadInitConfigFlash(qhyccd_handle *handle, char* configString_raw64);
EXPORTFUNC void STDCALL QHYCCDEraseInitConfigFlash(qhyccd_handle *handle);
EXPORTFUNC void STDCALL QHYCCDResetFlashULVOError(qhyccd_handle *handle);
EXPORTFUNC void STDCALL QHYCCDTestFlashULVOError(qhyccd_handle *handle);
EXPORTFUNC void STDCALL QHYCCDSetFlashInitPWM(qhyccd_handle *handle,uint8_t pwm);
EXPORTFUNC void STDCALL QHYCCDGetDebugDataD3(qhyccd_handle *handle, char* debugData_raw64);


EXPORTFUNC int STDCALL QHYCCD_fpga_list(struct fpga_info_list &list);
Expand Down Expand Up @@ -956,4 +978,7 @@ EXPORTC void STDCALL QHYCCD_fpga_reset();

void call_pnp_event();
void call_data_event_live(char *id, uint8_t *imgdata);
void call_transfer_event_error();
void call_transfer_event_error();
EXPORTFUNC void RegisterPnpEventIn( void (*in_pnp_event_in_func)(char *id));
EXPORTFUNC void RegisterPnpEventOut( void (*in_pnp_event_out_func)(char *id));
EXPORTFUNC void RegisterTransferEventError( void (*transfer_event_error_func)());
2 changes: 2 additions & 0 deletions libqhy/qhyccdcamdef.h
Original file line number Diff line number Diff line change
Expand Up @@ -1340,6 +1340,8 @@
#define SINGLE_MODE 0
#define LIVE_MODE 1

#define FLASH_CONFIG_PAGE_INDEX 1

#define FPGA_MODE_DEFAULT 99
#define FPGA_MODE_12_47M 12 //14bit rigister= 11M 12bit rigister = 47M
#define FPGA_MODE_14_11M 14 //14bit rigister= 11M 12bit rigister = 47M
Expand Down
8 changes: 7 additions & 1 deletion libqhy/qhyccdstruct.h
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ enum CONTROL_ID
/*23*/ CAM_BIN3X3MODE, //!< check if camera has bin3x3 mode
/*24*/ CAM_BIN4X4MODE, //!< check if camera has bin4x4 mode
/*25*/ CAM_MECHANICALSHUTTER, //!< mechanical shutter
/*26*/ CAM_TRIGER_INTERFACE, //!< triger
/*26*/ CAM_TRIGER_INTERFACE, //!< check if camera has triger interface
/*27*/ CAM_TECOVERPROTECT_INTERFACE, //!< tec overprotect
/*28*/ CAM_SINGNALCLAMP_INTERFACE, //!< singnal clamp
/*29*/ CAM_FINETONE_INTERFACE, //!< fine tone
Expand Down Expand Up @@ -234,6 +234,12 @@ enum CONTROL_ID
/*64*/ CONTROL_VACUUM_PUMP, /// if camera has VACUUM PUMP
/*65*/ CONTROL_SensorChamberCycle_PUMP, ///air cycle pump for sensor drying
/*66*/ CAM_32BITS,
/*67*/ CAM_Sensor_ULVO_Status, /// Sensor working status [0:init 1:good 2:checkErr 3:monitorErr 8:good 9:powerChipErr] 410 461 411 600 268 [Eris board]
/*68*/ CAM_SensorPhaseReTrain, /// 2020,4040/PRO,6060,42PRO
/*69*/ CAM_InitConfigFromFlash, /// 2410 461 411 600 268 for now
/*70*/ CAM_TRIGER_MODE, //check if camera has multiple triger mode
/*71*/ CAM_TRIGER_OUT, //check if camera support triger out function
/*72*/ CAM_BURST_MODE, //check if camera support burst mode


/* Do not Put Item after CONTROL_MAX_ID !! This should be the max index of the list */
Expand Down

0 comments on commit 909fc17

Please sign in to comment.