Skip to content

Commit

Permalink
V1.2.7:For more information, please refer to the ReleaseNotes.txt
Browse files Browse the repository at this point in the history
  • Loading branch information
Neal-Shen committed Sep 14, 2023
1 parent 88a97b9 commit 4e8f31a
Show file tree
Hide file tree
Showing 75 changed files with 90 additions and 73 deletions.
7 changes: 4 additions & 3 deletions AArch64/Include/VzenseNebula_types.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
#include <stdint.h>
#include "VzenseNebula_enums.h"

#ifndef __cplusplus
#include <stdbool.h>
#endif

typedef uint16_t VzDepthPixel; //!< Depth image pixel type in 16-bit
typedef uint16_t VzGray16Pixel; //!< Gray image pixel type in 16-bit
typedef uint8_t VzGray8Pixel; //!< Gray image pixel type in 8-bit
Expand Down Expand Up @@ -165,9 +169,6 @@ typedef struct
int exposureTime; //When the control mode is AE, exposureTime represents the maximum exposure time.
//When the control mode is Manual, exposureTime represents the current exposure time.
} VzExposureTimeParams;



/**
* @brief Error informations about the device
*/
Expand Down
Binary file modified AArch64/Lib/Drivers/libgc2053.so
Binary file not shown.
Binary file modified AArch64/Lib/Drivers/libsony_cw_2022.so
Binary file not shown.
Binary file modified AArch64/Lib/libNebula_api.so
Binary file not shown.
Binary file modified AArch64/Lib/libNebula_api.so.1.2
Binary file not shown.
Binary file removed AArch64/Lib/libNebula_api.so.1.2.4
Binary file not shown.
Binary file added AArch64/Lib/libNebula_api.so.1.2.7
Binary file not shown.
11 changes: 11 additions & 0 deletions AArch64/ReleaseNotes.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
Ver1.2.7
1.Add sleep 1000ms in the VZ_SetWorkMode api
2.Optimizate code and fix some errors

Ver1.2.6
1.Optimizate the code for checking the device remove

Ver1.2.5
1.Optimizate the code for checking the device status
2.Add memset before memcy for IP

Ver1.2.4
1.Optimizate code check the time from frame ready to get frame is out of 1s or not

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ bool InitDevice(const int deviceCount)
void HotPlugStateCallback(const VzDeviceInfo *pInfo, int status, void *contex)
{
cout << "uri " << status << " " << pInfo->uri << " " << (status == 0 ? "add" : "remove") << endl;
cout << "alia " << status << " " << pInfo->alias << " " << (status == 0 ? "add" : "remove") << endl;
cout << "alias " << status << " " << pInfo->alias << " " << (status == 0 ? "add" : "remove") << endl;

if (status == 0)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ class Sensor {
void HandleCallback(const VzDeviceInfo* pInfo, int status)
{
cout << "uri " << status << " " << pInfo->uri << " " << (status == 0 ? "add" : "remove") << endl;
cout << "alia " << status << " " << pInfo->alias << " " << (status == 0 ? "add" : "remove") << endl;
cout << "alias " << status << " " << pInfo->alias << " " << (status == 0 ? "add" : "remove") << endl;

if (status == 0)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ bool InitDevice(const int deviceCount)
void HotPlugStateCallback(const VzDeviceInfo *pInfo, int status, void *contex)
{
cout << "uri " << status << " " << pInfo->uri << " " << (status == 0 ? "add" : "remove") << endl;
cout << "alia " << status << " " << pInfo->alias << " " << (status == 0 ? "add" : "remove") << endl;
cout << "alias " << status << " " << pInfo->alias << " " << (status == 0 ? "add" : "remove") << endl;

if (status == 0)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ class Sensor {
void HandleCallback(const VzDeviceInfo* pInfo, int status)
{
cout << "uri " << status << " " << pInfo->uri << " " << (status == 0 ? "add" : "remove") << endl;
cout << "alia " << status << " " << pInfo->alias << " " << (status == 0 ? "add" : "remove") << endl;
cout << "alias " << status << " " << pInfo->alias << " " << (status == 0 ? "add" : "remove") << endl;

if (status == 0)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ bool InitDevice(const int deviceCount)
void HotPlugStateCallback(const VzDeviceInfo *pInfo, int status, void *contex)
{
cout << "uri " << status << " " << pInfo->uri << " " << (status == 0 ? "add" : "remove") << endl;
cout << "alia " << status << " " << pInfo->alias << " " << (status == 0 ? "add" : "remove") << endl;
cout << "alias " << status << " " << pInfo->alias << " " << (status == 0 ? "add" : "remove") << endl;

if (status == 0)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ class Sensor {
void HandleCallback(const VzDeviceInfo* pInfo, int status)
{
cout << "uri " << status << " " << pInfo->uri << " " << (status == 0 ? "add" : "remove") << endl;
cout << "alia " << status << " " << pInfo->alias << " " << (status == 0 ? "add" : "remove") << endl;
cout << "alias " << status << " " << pInfo->alias << " " << (status == 0 ? "add" : "remove") << endl;

if (status == 0)
{
Expand Down
2 changes: 2 additions & 0 deletions Python/API/VzenseDS_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,8 @@ def VZ_StopStream(self):

def VZ_GetFrameReady(self,waitTime = c_uint16(33)):
frameready = VzFrameReady()
if not self.device_handle:
return -3, frameready
return self.vz_cam_lib.VZ_GetFrameReady(self.device_handle, waitTime, byref(frameready)), frameready

def VZ_GetFrame(self, frametype = VzFrameType.VzDepthFrame):
Expand Down
13 changes: 1 addition & 12 deletions Python/Samples/DS77/DevHotPlugCallback/DevHotPlugCallback.py
Original file line number Diff line number Diff line change
Expand Up @@ -78,18 +78,7 @@ def HotPlugStateCallback(type_struct, state = c_int32(0)):
print("startstream failed",ret)

while 1:
ret, frameready = camera.VZ_GetFrameReady(c_uint16(1000))
if ret !=0:
print("VZ_GetFrameReady failed:",ret)
continue

if frameready.depth:
ret,frame = camera.VZ_GetFrame(VzFrameType.VzDepthFrame)
if ret ==0:
print("frameIndex: ",frame.frameIndex)
else:
print("get depth frame failed ",ret)
continue
time.sleep(1)
else:
print('VZ_OpenDeviceByUri failed: ' + str(ret))

Expand Down
13 changes: 1 addition & 12 deletions Python/Samples/DS77C/DevHotPlugCallback/DevHotPlugCallback.py
Original file line number Diff line number Diff line change
Expand Up @@ -78,18 +78,7 @@ def HotPlugStateCallback(type_struct, state = c_int32(0)):
print("startstream failed",ret)

while 1:
ret, frameready = camera.VZ_GetFrameReady(c_uint16(1000))
if ret !=0:
print("VZ_GetFrameReady failed:",ret)
continue

if frameready.depth:
ret,frame = camera.VZ_GetFrame(VzFrameType.VzDepthFrame)
if ret ==0:
print("frameIndex: ",frame.frameIndex)
else:
print("get depth frame failed ",ret)
continue
time.sleep(1)
else:
print('VZ_OpenDeviceByUri failed: ' + str(ret))

Expand Down
13 changes: 1 addition & 12 deletions Python/Samples/DS86/DevHotPlugCallback/DevHotPlugCallback.py
Original file line number Diff line number Diff line change
Expand Up @@ -78,18 +78,7 @@ def HotPlugStateCallback(type_struct, state = c_int32(0)):
print("startstream failed",ret)

while 1:
ret, frameready = camera.VZ_GetFrameReady(c_uint16(1000))
if ret !=0:
print("VZ_GetFrameReady failed:",ret)
continue

if frameready.depth:
ret,frame = camera.VZ_GetFrame(VzFrameType.VzDepthFrame)
if ret ==0:
print("frameIndex: ",frame.frameIndex)
else:
print("get depth frame failed ",ret)
continue
time.sleep(1)
else:
print('VZ_OpenDeviceByUri failed: ' + str(ret))

Expand Down
7 changes: 4 additions & 3 deletions Ubuntu16.04/Include/VzenseNebula_types.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
#include <stdint.h>
#include "VzenseNebula_enums.h"

#ifndef __cplusplus
#include <stdbool.h>
#endif

typedef uint16_t VzDepthPixel; //!< Depth image pixel type in 16-bit
typedef uint16_t VzGray16Pixel; //!< Gray image pixel type in 16-bit
typedef uint8_t VzGray8Pixel; //!< Gray image pixel type in 8-bit
Expand Down Expand Up @@ -165,9 +169,6 @@ typedef struct
int exposureTime; //When the control mode is AE, exposureTime represents the maximum exposure time.
//When the control mode is Manual, exposureTime represents the current exposure time.
} VzExposureTimeParams;



/**
* @brief Error informations about the device
*/
Expand Down
Binary file modified Ubuntu16.04/Lib/Drivers/libgc2053.so
Binary file not shown.
Binary file modified Ubuntu16.04/Lib/Drivers/libsony_cw_2022.so
Binary file not shown.
Binary file modified Ubuntu16.04/Lib/libNebula_api.so
Binary file not shown.
Binary file modified Ubuntu16.04/Lib/libNebula_api.so.1.2
Binary file not shown.
Binary file removed Ubuntu16.04/Lib/libNebula_api.so.1.2.4
Binary file not shown.
Binary file added Ubuntu16.04/Lib/libNebula_api.so.1.2.7
Binary file not shown.
11 changes: 11 additions & 0 deletions Ubuntu16.04/ReleaseNotes.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
Ver1.2.7
1.Add sleep 1000ms in the VZ_SetWorkMode api
2.Optimizate code and fix some errors

Ver1.2.6
1.Optimizate the code for checking the device remove

Ver1.2.5
1.Optimizate the code for checking the device status
2.Add memset before memcy for IP

Ver1.2.4
1.Optimizate code check the time from frame ready to get frame is out of 1s or not

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ bool InitDevice(const int deviceCount)
void HotPlugStateCallback(const VzDeviceInfo *pInfo, int status, void *contex)
{
cout << "uri " << status << " " << pInfo->uri << " " << (status == 0 ? "add" : "remove") << endl;
cout << "alia " << status << " " << pInfo->alias << " " << (status == 0 ? "add" : "remove") << endl;
cout << "alias " << status << " " << pInfo->alias << " " << (status == 0 ? "add" : "remove") << endl;

if (status == 0)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ class Sensor {
void HandleCallback(const VzDeviceInfo* pInfo, int status)
{
cout << "uri " << status << " " << pInfo->uri << " " << (status == 0 ? "add" : "remove") << endl;
cout << "alia " << status << " " << pInfo->alias << " " << (status == 0 ? "add" : "remove") << endl;
cout << "alias " << status << " " << pInfo->alias << " " << (status == 0 ? "add" : "remove") << endl;

if (status == 0)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ bool InitDevice(const int deviceCount)
void HotPlugStateCallback(const VzDeviceInfo *pInfo, int status, void *contex)
{
cout << "uri " << status << " " << pInfo->uri << " " << (status == 0 ? "add" : "remove") << endl;
cout << "alia " << status << " " << pInfo->alias << " " << (status == 0 ? "add" : "remove") << endl;
cout << "alias " << status << " " << pInfo->alias << " " << (status == 0 ? "add" : "remove") << endl;

if (status == 0)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ class Sensor {
void HandleCallback(const VzDeviceInfo* pInfo, int status)
{
cout << "uri " << status << " " << pInfo->uri << " " << (status == 0 ? "add" : "remove") << endl;
cout << "alia " << status << " " << pInfo->alias << " " << (status == 0 ? "add" : "remove") << endl;
cout << "alias " << status << " " << pInfo->alias << " " << (status == 0 ? "add" : "remove") << endl;

if (status == 0)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ bool InitDevice(const int deviceCount)
void HotPlugStateCallback(const VzDeviceInfo *pInfo, int status, void *contex)
{
cout << "uri " << status << " " << pInfo->uri << " " << (status == 0 ? "add" : "remove") << endl;
cout << "alia " << status << " " << pInfo->alias << " " << (status == 0 ? "add" : "remove") << endl;
cout << "alias " << status << " " << pInfo->alias << " " << (status == 0 ? "add" : "remove") << endl;

if (status == 0)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ class Sensor {
void HandleCallback(const VzDeviceInfo* pInfo, int status)
{
cout << "uri " << status << " " << pInfo->uri << " " << (status == 0 ? "add" : "remove") << endl;
cout << "alia " << status << " " << pInfo->alias << " " << (status == 0 ? "add" : "remove") << endl;
cout << "alias " << status << " " << pInfo->alias << " " << (status == 0 ? "add" : "remove") << endl;

if (status == 0)
{
Expand Down
7 changes: 4 additions & 3 deletions Ubuntu18.04/Include/VzenseNebula_types.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
#include <stdint.h>
#include "VzenseNebula_enums.h"

#ifndef __cplusplus
#include <stdbool.h>
#endif

typedef uint16_t VzDepthPixel; //!< Depth image pixel type in 16-bit
typedef uint16_t VzGray16Pixel; //!< Gray image pixel type in 16-bit
typedef uint8_t VzGray8Pixel; //!< Gray image pixel type in 8-bit
Expand Down Expand Up @@ -165,9 +169,6 @@ typedef struct
int exposureTime; //When the control mode is AE, exposureTime represents the maximum exposure time.
//When the control mode is Manual, exposureTime represents the current exposure time.
} VzExposureTimeParams;



/**
* @brief Error informations about the device
*/
Expand Down
Binary file modified Ubuntu18.04/Lib/Drivers/libgc2053.so
Binary file not shown.
Binary file modified Ubuntu18.04/Lib/Drivers/libsony_cw_2022.so
Binary file not shown.
2 changes: 1 addition & 1 deletion Ubuntu18.04/Lib/libNebula_api.so.1.2
Binary file removed Ubuntu18.04/Lib/libNebula_api.so.1.2.4
Binary file not shown.
Binary file added Ubuntu18.04/Lib/libNebula_api.so.1.2.7
Binary file not shown.
11 changes: 11 additions & 0 deletions Ubuntu18.04/ReleaseNotes.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
Ver1.2.7
1.Add sleep 1000ms in the VZ_SetWorkMode api
2.Optimizate code and fix some errors

Ver1.2.6
1.Optimizate the code for checking the device remove

Ver1.2.5
1.Optimizate the code for checking the device status
2.Add memset before memcy for IP

Ver1.2.4
1.Optimizate code check the time from frame ready to get frame is out of 1s or not

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ bool InitDevice(const int deviceCount)
void HotPlugStateCallback(const VzDeviceInfo *pInfo, int status, void *contex)
{
cout << "uri " << status << " " << pInfo->uri << " " << (status == 0 ? "add" : "remove") << endl;
cout << "alia " << status << " " << pInfo->alias << " " << (status == 0 ? "add" : "remove") << endl;
cout << "alias " << status << " " << pInfo->alias << " " << (status == 0 ? "add" : "remove") << endl;

if (status == 0)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ class Sensor {
void HandleCallback(const VzDeviceInfo* pInfo, int status)
{
cout << "uri " << status << " " << pInfo->uri << " " << (status == 0 ? "add" : "remove") << endl;
cout << "alia " << status << " " << pInfo->alias << " " << (status == 0 ? "add" : "remove") << endl;
cout << "alias " << status << " " << pInfo->alias << " " << (status == 0 ? "add" : "remove") << endl;

if (status == 0)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ bool InitDevice(const int deviceCount)
void HotPlugStateCallback(const VzDeviceInfo *pInfo, int status, void *contex)
{
cout << "uri " << status << " " << pInfo->uri << " " << (status == 0 ? "add" : "remove") << endl;
cout << "alia " << status << " " << pInfo->alias << " " << (status == 0 ? "add" : "remove") << endl;
cout << "alias " << status << " " << pInfo->alias << " " << (status == 0 ? "add" : "remove") << endl;

if (status == 0)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ class Sensor {
void HandleCallback(const VzDeviceInfo* pInfo, int status)
{
cout << "uri " << status << " " << pInfo->uri << " " << (status == 0 ? "add" : "remove") << endl;
cout << "alia " << status << " " << pInfo->alias << " " << (status == 0 ? "add" : "remove") << endl;
cout << "alias " << status << " " << pInfo->alias << " " << (status == 0 ? "add" : "remove") << endl;

if (status == 0)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ bool InitDevice(const int deviceCount)
void HotPlugStateCallback(const VzDeviceInfo *pInfo, int status, void *contex)
{
cout << "uri " << status << " " << pInfo->uri << " " << (status == 0 ? "add" : "remove") << endl;
cout << "alia " << status << " " << pInfo->alias << " " << (status == 0 ? "add" : "remove") << endl;
cout << "alias " << status << " " << pInfo->alias << " " << (status == 0 ? "add" : "remove") << endl;

if (status == 0)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ class Sensor {
void HandleCallback(const VzDeviceInfo* pInfo, int status)
{
cout << "uri " << status << " " << pInfo->uri << " " << (status == 0 ? "add" : "remove") << endl;
cout << "alia " << status << " " << pInfo->alias << " " << (status == 0 ? "add" : "remove") << endl;
cout << "alias " << status << " " << pInfo->alias << " " << (status == 0 ? "add" : "remove") << endl;

if (status == 0)
{
Expand Down
Binary file modified Windows/Bin/x64/DSImgPreProcess.dll
Binary file not shown.
Binary file modified Windows/Bin/x64/Drivers/gc2053.dll
Binary file not shown.
Binary file modified Windows/Bin/x64/Drivers/sony_cw_2022.dll
Binary file not shown.
Binary file modified Windows/Bin/x64/Nebula_api.dll
Binary file not shown.
Binary file modified Windows/Bin/x86/DSImgPreProcess.dll
Binary file not shown.
Binary file modified Windows/Bin/x86/Drivers/gc2053.dll
Binary file not shown.
Binary file modified Windows/Bin/x86/Drivers/sony_cw_2022.dll
Binary file not shown.
Binary file modified Windows/Bin/x86/Nebula_api.dll
Binary file not shown.
7 changes: 4 additions & 3 deletions Windows/Include/VzenseNebula_types.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
#include <stdint.h>
#include "VzenseNebula_enums.h"

#ifndef __cplusplus
#include <stdbool.h>
#endif

typedef uint16_t VzDepthPixel; //!< Depth image pixel type in 16-bit
typedef uint16_t VzGray16Pixel; //!< Gray image pixel type in 16-bit
typedef uint8_t VzGray8Pixel; //!< Gray image pixel type in 8-bit
Expand Down Expand Up @@ -165,9 +169,6 @@ typedef struct
int exposureTime; //When the control mode is AE, exposureTime represents the maximum exposure time.
//When the control mode is Manual, exposureTime represents the current exposure time.
} VzExposureTimeParams;



/**
* @brief Error informations about the device
*/
Expand Down
Binary file modified Windows/Lib/x64/Nebula_api.lib
Binary file not shown.
Binary file modified Windows/Lib/x86/Nebula_api.lib
Binary file not shown.
Binary file not shown.
Binary file modified Windows/PrecompiledSamples/DS77C_OpenCVSample/Drivers/gc2053.dll
Binary file not shown.
Binary file not shown.
Binary file modified Windows/PrecompiledSamples/DS77C_OpenCVSample/Nebula_api.dll
Binary file not shown.
Binary file modified Windows/PrecompiledSamples/DS77_OpenCVSample/DSImgPreProcess.dll
Binary file not shown.
Binary file modified Windows/PrecompiledSamples/DS77_OpenCVSample/Drivers/gc2053.dll
Binary file not shown.
Binary file not shown.
Binary file modified Windows/PrecompiledSamples/DS77_OpenCVSample/Nebula_api.dll
Binary file not shown.
Binary file modified Windows/PrecompiledSamples/DS86_OpenCVSample/DSImgPreProcess.dll
Binary file not shown.
Binary file modified Windows/PrecompiledSamples/DS86_OpenCVSample/Drivers/gc2053.dll
Binary file not shown.
Binary file not shown.
Binary file modified Windows/PrecompiledSamples/DS86_OpenCVSample/Nebula_api.dll
Binary file not shown.
11 changes: 11 additions & 0 deletions Windows/ReleaseNotes.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
Ver1.2.7
1.Add sleep 1000ms in the VZ_SetWorkMode api
2.Optimizate code and fix some errors

Ver1.2.6
1.Optimizate the code for checking the device remove

Ver1.2.5
1.Optimizate the code for checking the device status
2.Add memset before memcy for IP

Ver1.2.4
1.Optimizate code check the time from frame ready to get frame is out of 1s or not

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ bool InitDevice(const int deviceCount)
void HotPlugStateCallback(const VzDeviceInfo *pInfo, int status, void *contex)
{
cout << "uri " << status << " " << pInfo->uri << " " << (status == 0 ? "add" : "remove") << endl;
cout << "alia " << status << " " << pInfo->alias << " " << (status == 0 ? "add" : "remove") << endl;
cout << "alias " << status << " " << pInfo->alias << " " << (status == 0 ? "add" : "remove") << endl;

if (status == 0)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ class Sensor {
void HandleCallback(const VzDeviceInfo* pInfo, int status)
{
cout << "uri " << status << " " << pInfo->uri << " " << (status == 0 ? "add" : "remove") << endl;
cout << "alia " << status << " " << pInfo->alias << " " << (status == 0 ? "add" : "remove") << endl;
cout << "alias " << status << " " << pInfo->alias << " " << (status == 0 ? "add" : "remove") << endl;

if (status == 0)
{
Expand Down
Loading

0 comments on commit 4e8f31a

Please sign in to comment.