roll back SDK to 2.3.0.85 for issue #176

orbbec · Feb 10, 2023 · 8093afb · 8093afb
1 parent af55012
commit 8093afb
Show file tree

Hide file tree

Showing 24 changed files with 3 additions and 7 deletions.
diff --git 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
@@ -26,15 +26,15 @@
 #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 \
 	"Standard "\
 	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
@@ -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
@@ -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
diff --git a/include/openni2_redist/arm/OpenNI2/Drivers/liborbbec.so b/include/openni2_redist/arm/OpenNI2/Drivers/liborbbec.so
diff --git a/include/openni2_redist/arm/PS1080Console b/include/openni2_redist/arm/PS1080Console
diff --git a/include/openni2_redist/arm/SimpleRead b/include/openni2_redist/arm/SimpleRead
diff --git a/include/openni2_redist/arm/libDepthUtils.a b/include/openni2_redist/arm/libDepthUtils.a
diff --git a/include/openni2_redist/arm/libOpenNI2.so b/include/openni2_redist/arm/libOpenNI2.so
diff --git a/include/openni2_redist/arm64/NiViewer b/include/openni2_redist/arm64/NiViewer
diff --git a/include/openni2_redist/arm64/OpenNI2/Drivers/libOniFile.so b/include/openni2_redist/arm64/OpenNI2/Drivers/libOniFile.so
diff --git a/include/openni2_redist/arm64/OpenNI2/Drivers/liborbbec.so b/include/openni2_redist/arm64/OpenNI2/Drivers/liborbbec.so
diff --git a/include/openni2_redist/arm64/PS1080Console b/include/openni2_redist/arm64/PS1080Console
diff --git a/include/openni2_redist/arm64/SimpleRead b/include/openni2_redist/arm64/SimpleRead
diff --git a/include/openni2_redist/arm64/libDepthUtils.a b/include/openni2_redist/arm64/libDepthUtils.a
diff --git a/include/openni2_redist/arm64/libOpenNI2.so b/include/openni2_redist/arm64/libOpenNI2.so
diff --git a/include/openni2_redist/x64/NiViewer b/include/openni2_redist/x64/NiViewer
diff --git a/include/openni2_redist/x64/OpenNI2/Drivers/libOniFile.so b/include/openni2_redist/x64/OpenNI2/Drivers/libOniFile.so
diff --git a/include/openni2_redist/x64/OpenNI2/Drivers/liborbbec.so b/include/openni2_redist/x64/OpenNI2/Drivers/liborbbec.so
diff --git a/include/openni2_redist/x64/PS1080Console b/include/openni2_redist/x64/PS1080Console
diff --git a/include/openni2_redist/x64/SimpleRead b/include/openni2_redist/x64/SimpleRead
diff --git a/include/openni2_redist/x64/libDepthUtils.a b/include/openni2_redist/x64/libDepthUtils.a
diff --git a/include/openni2_redist/x64/libOpenNI2.so b/include/openni2_redist/x64/libOpenNI2.so