diff --git a/orbbec_camera/SDK/include/libobsensor/h/Device.h b/orbbec_camera/SDK/include/libobsensor/h/Device.h index 4cfcf9da..55aae304 100644 --- a/orbbec_camera/SDK/include/libobsensor/h/Device.h +++ b/orbbec_camera/SDK/include/libobsensor/h/Device.h @@ -95,7 +95,10 @@ ob_device *ob_device_list_get_device(ob_device_list *list, uint32_t index, ob_er ob_device *ob_device_list_get_device_by_serial_number(ob_device_list *list, const char *serial_number, ob_error **error); /** - * @brief Create a device. + * @brief Create device by uid + * @brief On Linux platform, the uid of the device is composed of bus-port-dev, for example 1-1.2-1. But the SDK will remove the dev number and only keep the + * bus-port as the uid to create the device, for example 1-1.2, so that we can create a device connected to the specified USB port. Similarly, users can also + * directly pass in bus-port as uid to create device. * * @attention If the device has already been acquired and created elsewhere, repeated acquisitions will return an error. * @@ -605,18 +608,6 @@ ob_depth_work_mode_list *ob_device_get_depth_work_mode_list(ob_device *device, o */ void ob_device_reboot(ob_device *device, ob_error **error); -/** - * @brief Device reboot delay mode - * @attention The device will be disconnected and reconnected. After the device is disconnected, the interface access to the device handle may be abnormal. - * Please use the ob_delete_device interface to delete the handle directly. After the device is reconnected, it can be obtained again. - * Support devices: Gemini2 L - * - * @param[in] device Device object - * @param[in] delay_ms Time unit:ms。delay_ms == 0:No delay;delay_ms > 0, Delay millisecond connect to host device after reboot - * @param[out] error Log error messages - */ -void ob_device_reboot_delay_mode(ob_device *device, uint32_t delay_ms, ob_error **error); - /** * @brief Get the current device synchronization configuration * @brief Device synchronization: including exposure synchronization function and multi-camera synchronization function of different sensors within a single diff --git a/orbbec_camera/SDK/include/libobsensor/h/Property.h b/orbbec_camera/SDK/include/libobsensor/h/Property.h index 1ff1dfa8..24765ddf 100644 --- a/orbbec_camera/SDK/include/libobsensor/h/Property.h +++ b/orbbec_camera/SDK/include/libobsensor/h/Property.h @@ -359,6 +359,11 @@ typedef enum { */ OB_PROP_CAPTURE_IMAGE_NUMBER_INTERVAL_INT = 136, + /** + * @brief Reboot device delay mode. Delay time unit: ms, range: [0, 8000). + */ + OB_PROP_DEVICE_REBOOT_DELAY_INT = 142, + /** * @brief Baseline calibration parameters */ diff --git a/orbbec_camera/SDK/include/libobsensor/hpp/Device.hpp b/orbbec_camera/SDK/include/libobsensor/hpp/Device.hpp index ea0ed245..e3540807 100644 --- a/orbbec_camera/SDK/include/libobsensor/hpp/Device.hpp +++ b/orbbec_camera/SDK/include/libobsensor/hpp/Device.hpp @@ -609,12 +609,15 @@ public: std::shared_ptr getDeviceBySN(const char *serialNumber); /** - * @brief Get the device object with the specified UID + * @brief Get the specified device object from the device list by uid + * @brief On Linux platform, the uid of the device is composed of bus-port-dev, for example 1-1.2-1. But the SDK will remove the dev number and only keep + * the bus-port as the uid to create the device, for example 1-1.2, so that we can create a device connected to the specified USB port. Similarly, users can + * also directly pass in bus-port as uid to create device. * - * @attention If the device has already been acquired and created elsewhere, repeated acquisition will throw an exception + * @attention If the device has been acquired and created elsewhere, repeated acquisition will throw an exception * - * @param uid the UID of the device to create - * @return std::shared_ptr the device object + * @param uid The uid of the device to be created + * @return std::shared_ptr returns the device object */ std::shared_ptr getDeviceByUid(const char *uid); }; diff --git a/orbbec_camera/SDK/lib/arm32/libOrbbecSDK.so.1.6.1 b/orbbec_camera/SDK/lib/arm32/libOrbbecSDK.so.1.6.1 index 519d3e3d..6f9b4e6a 100644 Binary files a/orbbec_camera/SDK/lib/arm32/libOrbbecSDK.so.1.6.1 and b/orbbec_camera/SDK/lib/arm32/libOrbbecSDK.so.1.6.1 differ diff --git a/orbbec_camera/SDK/lib/arm64/libOrbbecSDK.so.1.6.1 b/orbbec_camera/SDK/lib/arm64/libOrbbecSDK.so.1.6.1 index c3016d84..b07d92bf 100644 Binary files a/orbbec_camera/SDK/lib/arm64/libOrbbecSDK.so.1.6.1 and b/orbbec_camera/SDK/lib/arm64/libOrbbecSDK.so.1.6.1 differ diff --git a/orbbec_camera/SDK/lib/x64/libOrbbecSDK.so.1.6.1 b/orbbec_camera/SDK/lib/x64/libOrbbecSDK.so.1.6.1 index 9c1f60a4..5e17ad18 100644 Binary files a/orbbec_camera/SDK/lib/x64/libOrbbecSDK.so.1.6.1 and b/orbbec_camera/SDK/lib/x64/libOrbbecSDK.so.1.6.1 differ