diff --git a/debian/indi-playerone/changelog b/debian/indi-playerone/changelog index d1fad0e3f..7a91ed509 100644 --- a/debian/indi-playerone/changelog +++ b/debian/indi-playerone/changelog @@ -1,3 +1,9 @@ +indi-playerone (1.7) bionic; urgency=low + + * Update PlayerOneCamera SDK v3.3.0 + + -- Hiroshi SAITO Tue, 9 Feb 2023 12:00:00 +0900 + indi-playerone (1.6) bionic; urgency=low * Update libplayerone with PlayerOnePW SDK v1.2.0 diff --git a/debian/libplayerone/changelog b/debian/libplayerone/changelog index af33a401e..d44495dc7 100644 --- a/debian/libplayerone/changelog +++ b/debian/libplayerone/changelog @@ -1,3 +1,9 @@ +libplayerone (1.4) bionic; urgency=low + + * Update PlayerOneCamera SDK to v3.3.0 + + -- Hiroshi SAITO Tue, 9 May 2023 08:00:00 +0900 + libplayerone (1.3) bionic; urgency=low * Update PlayerOnePW SDK to v1.2.0 diff --git a/indi-playerone/CMakeLists.txt b/indi-playerone/CMakeLists.txt index dfe1d7a40..175ac3d95 100644 --- a/indi-playerone/CMakeLists.txt +++ b/indi-playerone/CMakeLists.txt @@ -13,7 +13,7 @@ find_package(USB1 REQUIRED) find_package(Threads REQUIRED) set(PLAYERONE_VERSION_MAJOR 1) -set(PLAYERONE_VERSION_MINOR 6) +set(PLAYERONE_VERSION_MINOR 7) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h ) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/indi_playerone.xml.cmake ${CMAKE_CURRENT_BINARY_DIR}/indi_playerone.xml) diff --git a/indi-playerone/ChangeLog b/indi-playerone/ChangeLog index 376fd0689..82aa003fa 100644 --- a/indi-playerone/ChangeLog +++ b/indi-playerone/ChangeLog @@ -1,3 +1,6 @@ +v1.7 +* Update: PlayerOneCamera SDK to v3.3.0 + v1.6 * Update: PlayerOnePW SDK to v1.2.0 diff --git a/indi-playerone/indi-playerone.spec b/indi-playerone/indi-playerone.spec index 1a1e0a563..bebacf950 100644 --- a/indi-playerone/indi-playerone.spec +++ b/indi-playerone/indi-playerone.spec @@ -74,6 +74,8 @@ make DESTDIR=%{buildroot} install %{_datadir}/indi %changelog +* Tue May 09 2023 Hiroshi Saito +- Update PlayerOneCamera SDK to v3.3.0 * Sat May 06 2023 Hiroshi Saito - Update PlayerOnePW SDK to v1.2.0 * Thu Apr 27 2023 Hiroshi Saito diff --git a/libplayerone/CMakeLists.txt b/libplayerone/CMakeLists.txt index 6bba1e527..12c9fc51c 100644 --- a/libplayerone/CMakeLists.txt +++ b/libplayerone/CMakeLists.txt @@ -1,10 +1,10 @@ cmake_minimum_required (VERSION 3.0) project (libplayerone) -# Using PlayerOne Camera SDK Version 3.2.2 updated on 2023-3-15 +# Using PlayerOne Camera SDK Version 3.3.0 updated on 2023-5-06 # Using PlayerOne EFW SDK Version 1.2.0 updated on 2023-3-30 -set (POACAM_VERSION "3.2.2") +set (POACAM_VERSION "3.3.0") set (POACAM_SOVERSION "3") set (POAEFW_VERSION "1.2.0") diff --git a/libplayerone/PlayerOneCamera.h b/libplayerone/PlayerOneCamera.h index e882cee6f..51a9687f0 100644 --- a/libplayerone/PlayerOneCamera.h +++ b/libplayerone/PlayerOneCamera.h @@ -136,8 +136,8 @@ typedef struct _POACameraProperties ///< Camera Properties Definition int bitDepth; ///< ADC depth of CMOS sensor POABool isColorCamera; ///< is a color camera or not POABool isHasST4Port; ///< does the camera have ST4 port, if not, camera don't support ST4 guide - POABool isHasCooler; ///< does the camera have cooler, generally, the cool camera with cooler - POABool isUSB3Speed; ///< is usb3.0 speed + POABool isHasCooler; ///< does the camera have cooler assembly, generally, the cooled camera with cooler, window heater and fan + POABool isUSB3Speed; ///< is usb3.0 speed connection POABayerPattern bayerPattern; ///< the bayer filter pattern of camera double pixelSize; ///< camera pixel size(unit: um) char SN[64]; ///< the serial number of camera,it's unique @@ -145,8 +145,10 @@ typedef struct _POACameraProperties ///< Camera Properties Definition char localPath[256]; ///< the path of the camera in the computer host int bins[8]; ///< bins supported by the camera, 1 == bin1, 2 == bin2,..., end with 0, eg:[1,2,3,4,0,0,0,0] POAImgFormat imgFormats[8]; ///< image data format supported by the camera, end with POA_END, eg:[POA_RAW8, POA_RAW16, POA_END,...] + POABool isSupportHardBin; ///< does the camera sensor support hardware bin (since V3.3.0) + int pID; ///< camera's Product ID, note: the vID of PlayerOne is 0xA0A0 (since V3.3.0) - char reserved[256]; ///< reserved + char reserved[248]; ///< reserved, the size of reserved has changed from 256 to 248 since V3.3.0 } POACameraProperties; typedef union _POAConfigValue ///< Config Value Definition @@ -525,7 +527,7 @@ POACAMERA_API POAErrors POASetImageFormat(int nCameraID, POAImgFormat imgFormat * * @param nCameraID (input), get from in the POACameraProperties structure, use POAGetCameraProperties function * - * @param bSignalFrame (input), POA_TRUE: SnapMode, after the exposure, will not continue, POA_FALSE: continuous exposure + * @param bSingleFrame (input), POA_TRUE: SnapMode, after the exposure, will not continue(Single Shot), POA_FALSE: VideoMode, continuous exposure * * @return POA_OK: operation successful * POA_ERROR_INVALID_ID: no camera with this ID was found or the ID is out of boundary @@ -533,7 +535,7 @@ POACAMERA_API POAErrors POASetImageFormat(int nCameraID, POAImgFormat imgFormat * POA_ERROR_OPERATION_FAILED: operation failed * POA_ERROR_EXPOSING: camera is exposing */ -POACAMERA_API POAErrors POAStartExposure(int nCameraID, POABool bSignalFrame); +POACAMERA_API POAErrors POAStartExposure(int nCameraID, POABool bSingleFrame); /** @@ -708,7 +710,7 @@ POACAMERA_API POAErrors POASetUserCustomID(int nCameraID, const char* pCustomID /** - * @brief POAGetGainOffset: get some preset values + * @brief POAGetGainOffset: get some preset values, Note: deprecated, please use the following function * * @param nCameraID (input), get from in the POACameraProperties structure, use POAGetCameraProperties function * @@ -732,7 +734,7 @@ POACAMERA_API POAErrors POAGetGainOffset(int nCameraID, int *pOffsetHighestDR, * @param nCameraID (input), get from in the POACameraProperties structure, use POAGetCameraProperties function * @param pGainHighestDR (output), gain at highest dynamic range, in most cases, this gain is 0 * @param pHCGain (output), gain at HCG Mode(High Conversion Gain) - * @param pUnityGain (output), unity gain(or standard gain), with this gain, e/ADC will be 1 + * @param pUnityGain (output), unity gain(or standard gain), with this gain, eGain(e/ADU) will be 1 * @param pGainLowestRN (output), aka Maximum Analog Gain, gain at lowest read noise * @param pOffsetHighestDR (output), offset at highest dynamic range * @param pOffsetHCGain (output), offset at HCG Mode @@ -741,7 +743,7 @@ POACAMERA_API POAErrors POAGetGainOffset(int nCameraID, int *pOffsetHighestDR, * @return POA_OK: operation successful * POA_ERROR_INVALID_ID: no camera with this ID was found or the ID is out of boundary */ -POACAMERA_API POAErrors POAGetGainsAndOffsets(int nCameraID, int*pGainHighestDR, int *pHCGain, int *pUnityGain, int *pGainLowestRN, +POACAMERA_API POAErrors POAGetGainsAndOffsets(int nCameraID, int *pGainHighestDR, int *pHCGain, int *pUnityGain, int *pGainLowestRN, int *pOffsetHighestDR, int *pOffsetHCGain, int *pOffsetUnityGain, int *pOffsetLowestRN); diff --git a/libplayerone/armv6/libPlayerOneCamera.bin b/libplayerone/armv6/libPlayerOneCamera.bin index c2b206165..a8f8f3e94 100755 Binary files a/libplayerone/armv6/libPlayerOneCamera.bin and b/libplayerone/armv6/libPlayerOneCamera.bin differ diff --git a/libplayerone/armv7/libPlayerOneCamera.bin b/libplayerone/armv7/libPlayerOneCamera.bin index c2b206165..a8f8f3e94 100755 Binary files a/libplayerone/armv7/libPlayerOneCamera.bin and b/libplayerone/armv7/libPlayerOneCamera.bin differ diff --git a/libplayerone/armv8/libPlayerOneCamera.bin b/libplayerone/armv8/libPlayerOneCamera.bin index 276988ce9..9a45e71f6 100755 Binary files a/libplayerone/armv8/libPlayerOneCamera.bin and b/libplayerone/armv8/libPlayerOneCamera.bin differ diff --git a/libplayerone/libplayerone.spec b/libplayerone/libplayerone.spec index 3de8477de..cbcb5280b 100644 --- a/libplayerone/libplayerone.spec +++ b/libplayerone/libplayerone.spec @@ -87,6 +87,8 @@ make DESTDIR=%{buildroot} install %license libplayerone/license.txt %changelog +* Tue May 9 2023 Hiroshi Saito +- update PlayerOneCamera SDK to v3.3.0 * Sat May 6 2023 Hiroshi Saito - update PlayerOnePW SDK to v1.2.0 * Wed Mar 15 2023 Hiroshi Saito diff --git a/libplayerone/mac/libPlayerOneCamera.bin b/libplayerone/mac/libPlayerOneCamera.bin index 8049002fa..4c5df475c 100755 Binary files a/libplayerone/mac/libPlayerOneCamera.bin and b/libplayerone/mac/libPlayerOneCamera.bin differ diff --git a/libplayerone/x64/libPlayerOneCamera.bin b/libplayerone/x64/libPlayerOneCamera.bin index 17dcb3250..6999c445e 100755 Binary files a/libplayerone/x64/libPlayerOneCamera.bin and b/libplayerone/x64/libPlayerOneCamera.bin differ