diff --git a/include/openni2/OniCTypes.h b/include/openni2/OniCTypes.h index 700c823..24b86aa 100644 --- a/include/openni2/OniCTypes.h +++ b/include/openni2/OniCTypes.h @@ -79,7 +79,6 @@ typedef struct char uri[ONI_MAX_STR]; char vendor[ONI_MAX_STR]; char name[ONI_MAX_STR]; - char serialNumber[ONI_MAX_STR]; uint16_t usbVendorId; uint16_t usbProductId; } OniDeviceInfo; diff --git a/include/openni2/OniVersion.h b/include/openni2/OniVersion.h index 1e47da9..9319981 100644 --- a/include/openni2/OniVersion.h +++ b/include/openni2/OniVersion.h @@ -26,7 +26,7 @@ #define ONI_VERSION_MAJOR 2 #define ONI_VERSION_MINOR 3 #define ONI_VERSION_MAINTENANCE 0 -#define ONI_VERSION_BUILD 86 +#define ONI_VERSION_BUILD 85 /** OpenNI version (in brief string format): "Major.Minor.Maintenance (Build)" */ #define ONI_BRIEF_VERSION_STRING \ @@ -34,7 +34,7 @@ ONI_STRINGIFY(ONI_VERSION_MAJOR) "." \ ONI_STRINGIFY(ONI_VERSION_MINOR) "." \ ONI_STRINGIFY(ONI_VERSION_MAINTENANCE) \ - " (Build " ONI_STRINGIFY(ONI_VERSION_BUILD) "-beta6)" + " (Build " ONI_STRINGIFY(ONI_VERSION_BUILD) ")" /** OpenNI version (in numeric format): (OpenNI major version * 100000000 + OpenNI minor version * 1000000 + OpenNI maintenance version * 10000 + OpenNI build version). */ #define ONI_VERSION (ONI_VERSION_MAJOR*100000000 + ONI_VERSION_MINOR*1000000 + ONI_VERSION_MAINTENANCE*10000 + ONI_VERSION_BUILD) diff --git a/include/openni2/OpenNI.h b/include/openni2/OpenNI.h index 36c4a1b..d5ebc01 100644 --- a/include/openni2/OpenNI.h +++ b/include/openni2/OpenNI.h @@ -399,8 +399,6 @@ class DeviceInfo : private OniDeviceInfo const char* getVendor() const { return vendor; } /** Returns the device name for this device. */ const char* getName() const { return name; } - /** Returns the device serialNumber for this device. */ - const char* getSerialNumber() const { return serialNumber; } /** Returns the USB VID code for this device. */ uint16_t getUsbVendorId() const { return usbVendorId; } /** Returns the USB PID code for this device. */ diff --git a/include/openni2/PS1080.h b/include/openni2/PS1080.h index 75c7ea5..8c07d25 100644 --- a/include/openni2/PS1080.h +++ b/include/openni2/PS1080.h @@ -322,8 +322,7 @@ enum XN_MODULE_MOTHERBOARD_TEMP_COMP = 0x10810022, //For third customer platform read/write SN XN_MODULE_PROPERTY_DEVICE_SN = 0x10810024, - //PublicBoard - XN_MODULE_PROPERTY_PUBLIC_BOARD_SENSOR_POWER = 0x10810025, + /*******************************************************************/ diff --git a/include/openni2_redist/arm/OpenNI2/Drivers/libOniFile.so b/include/openni2_redist/arm/OpenNI2/Drivers/libOniFile.so old mode 100644 new mode 100755 index 823ef61..3785b3e Binary files a/include/openni2_redist/arm/OpenNI2/Drivers/libOniFile.so and b/include/openni2_redist/arm/OpenNI2/Drivers/libOniFile.so differ diff --git a/include/openni2_redist/arm/OpenNI2/Drivers/liborbbec.so b/include/openni2_redist/arm/OpenNI2/Drivers/liborbbec.so old mode 100644 new mode 100755 index e24cf19..ce31eba Binary files a/include/openni2_redist/arm/OpenNI2/Drivers/liborbbec.so and b/include/openni2_redist/arm/OpenNI2/Drivers/liborbbec.so differ diff --git a/include/openni2_redist/arm/PS1080Console b/include/openni2_redist/arm/PS1080Console old mode 100644 new mode 100755 index 51d2654..096cbd8 Binary files a/include/openni2_redist/arm/PS1080Console and b/include/openni2_redist/arm/PS1080Console differ diff --git a/include/openni2_redist/arm/SimpleRead b/include/openni2_redist/arm/SimpleRead old mode 100644 new mode 100755 index 1a05e98..addc652 Binary files a/include/openni2_redist/arm/SimpleRead and b/include/openni2_redist/arm/SimpleRead differ diff --git a/include/openni2_redist/arm/libDepthUtils.a b/include/openni2_redist/arm/libDepthUtils.a index c3f7616..e13efdf 100644 Binary files a/include/openni2_redist/arm/libDepthUtils.a and b/include/openni2_redist/arm/libDepthUtils.a differ diff --git a/include/openni2_redist/arm/libOpenNI2.so b/include/openni2_redist/arm/libOpenNI2.so old mode 100644 new mode 100755 index 3e9f8ea..b091050 Binary files a/include/openni2_redist/arm/libOpenNI2.so and b/include/openni2_redist/arm/libOpenNI2.so differ diff --git a/include/openni2_redist/arm64/NiViewer b/include/openni2_redist/arm64/NiViewer index 11cf4f2..facf4b4 100755 Binary files a/include/openni2_redist/arm64/NiViewer and b/include/openni2_redist/arm64/NiViewer differ diff --git a/include/openni2_redist/arm64/OpenNI2/Drivers/libOniFile.so b/include/openni2_redist/arm64/OpenNI2/Drivers/libOniFile.so old mode 100644 new mode 100755 index 360f424..4f66d9f Binary files a/include/openni2_redist/arm64/OpenNI2/Drivers/libOniFile.so and b/include/openni2_redist/arm64/OpenNI2/Drivers/libOniFile.so differ diff --git a/include/openni2_redist/arm64/OpenNI2/Drivers/liborbbec.so b/include/openni2_redist/arm64/OpenNI2/Drivers/liborbbec.so old mode 100644 new mode 100755 index 70a51dd..3739778 Binary files a/include/openni2_redist/arm64/OpenNI2/Drivers/liborbbec.so and b/include/openni2_redist/arm64/OpenNI2/Drivers/liborbbec.so differ diff --git a/include/openni2_redist/arm64/PS1080Console b/include/openni2_redist/arm64/PS1080Console index ca10500..9ad5da2 100755 Binary files a/include/openni2_redist/arm64/PS1080Console and b/include/openni2_redist/arm64/PS1080Console differ diff --git a/include/openni2_redist/arm64/SimpleRead b/include/openni2_redist/arm64/SimpleRead index 0838d8c..943aed3 100755 Binary files a/include/openni2_redist/arm64/SimpleRead and b/include/openni2_redist/arm64/SimpleRead differ diff --git a/include/openni2_redist/arm64/libDepthUtils.a b/include/openni2_redist/arm64/libDepthUtils.a index 719c6ee..dd2c200 100644 Binary files a/include/openni2_redist/arm64/libDepthUtils.a and b/include/openni2_redist/arm64/libDepthUtils.a differ diff --git a/include/openni2_redist/arm64/libOpenNI2.so b/include/openni2_redist/arm64/libOpenNI2.so old mode 100644 new mode 100755 index 8a6b465..327a4e0 Binary files a/include/openni2_redist/arm64/libOpenNI2.so and b/include/openni2_redist/arm64/libOpenNI2.so differ diff --git a/include/openni2_redist/x64/NiViewer b/include/openni2_redist/x64/NiViewer index abc258d..08c812c 100755 Binary files a/include/openni2_redist/x64/NiViewer and b/include/openni2_redist/x64/NiViewer differ diff --git a/include/openni2_redist/x64/OpenNI2/Drivers/libOniFile.so b/include/openni2_redist/x64/OpenNI2/Drivers/libOniFile.so old mode 100644 new mode 100755 index 5ad27d8..195df60 Binary files a/include/openni2_redist/x64/OpenNI2/Drivers/libOniFile.so and b/include/openni2_redist/x64/OpenNI2/Drivers/libOniFile.so differ diff --git a/include/openni2_redist/x64/OpenNI2/Drivers/liborbbec.so b/include/openni2_redist/x64/OpenNI2/Drivers/liborbbec.so old mode 100644 new mode 100755 index 34a5fda..a01f4b7 Binary files a/include/openni2_redist/x64/OpenNI2/Drivers/liborbbec.so and b/include/openni2_redist/x64/OpenNI2/Drivers/liborbbec.so differ diff --git a/include/openni2_redist/x64/PS1080Console b/include/openni2_redist/x64/PS1080Console index 2a733c2..d81ee93 100755 Binary files a/include/openni2_redist/x64/PS1080Console and b/include/openni2_redist/x64/PS1080Console differ diff --git a/include/openni2_redist/x64/SimpleRead b/include/openni2_redist/x64/SimpleRead index 7199804..485fe53 100755 Binary files a/include/openni2_redist/x64/SimpleRead and b/include/openni2_redist/x64/SimpleRead differ diff --git a/include/openni2_redist/x64/libDepthUtils.a b/include/openni2_redist/x64/libDepthUtils.a index 8a2969c..e4e8121 100644 Binary files a/include/openni2_redist/x64/libDepthUtils.a and b/include/openni2_redist/x64/libDepthUtils.a differ diff --git a/include/openni2_redist/x64/libOpenNI2.so b/include/openni2_redist/x64/libOpenNI2.so old mode 100644 new mode 100755 index b0abd71..241e6b0 Binary files a/include/openni2_redist/x64/libOpenNI2.so and b/include/openni2_redist/x64/libOpenNI2.so differ