Updated version to 5.0.3.3.

Author: OpenNI

CHANGES

@@ -1,7 +1,34 @@
 Detailed Change log:
 --------------------
 
-Version 5.0.1.31 (Stable version - Apr 11th 2010)
+Version 5.0.3.3 (Stable version - Jul 5th 2011)
+-----------------------------------------------
+  * Linux: Allow installation to a different directory (for cross-compilation mainly).
+  * Workaround firmware bug: if no depth, IR timestamps are corrupt. Use host clock for timestamps instead.
+  * Bug Fix: unregistering USB event callback when destroying sensor to prevent crash when unplugging device.
+  * XnExportedSensorDevice now only enumerates devices that weren't created in the context yet.
+
+Version 5.0.2.3 (Stable version - May 3rd 2011)
+-----------------------------------------------
+  * Fixed use of deprecated CreateProductionTree().
+  * Bug Fix: playing XNS files in applications using deprecated API might cause memory leaks.
+  * Bug Fix: serial number was in hex format instead of decimal one.
+  * Make sure SensorV2 nodes will only use SensorV2 device (up to now they only checked it's a PrimeSense device).
+
+Version 5.0.1.33 (Unstable version - Apr 18th 2011)
+---------------------------------------------------
+  * CE4100: adding support in makefiles, redist and install.
+  * CE4100: default is now BULK with compressed formats.
+  
+Version 5.0.1.32 (Unstable version - Apr 11th 2011)
+---------------------------------------------------
+  * Fixing log prints of resolutions (-1 appeared as MAX_UINT64...) to the resolution name.
+  * Linux Bug Fix: Server creates two log files, one in the client folder and one in /var/log/primesense/XnSensorServer
+  * Fixed a memory leak when rewinding old XNS files.
+  * Win32: WIX installer (replacing NSIS)
+  * Fixed wrong version in XnDeviceFile
+
+Version 5.0.1.31 (Stable version - Apr 11th 2011)
 -------------------------------------------------
   * Fix BULK timeout - it was too small...
   * Bug Fix: IR only works in QVGA...

Include/XnCommon.h

@@ -21,10 +21,6 @@
 *****************************************************************************/
 
 
-
-
-
-
 #ifndef __XN_COMMON_H__
 #define __XN_COMMON_H__
 
@@ -59,4 +55,4 @@ typedef enum XnPrimeSenseErrorModules
 #define XN_PS_STATUS_MESSAGE_MAP_END(module)								\
 	XN_STATUS_MESSAGE_MAP_END_FROM(XN_ERROR_GROUP_PRIMESENSE, module)
 
-#endif // __XN_COMMON_H__
+#endif // __XN_COMMON_H__

Include/XnPsVersion.h

@@ -41,9 +41,9 @@
 /** Xiron minor version. */ 
 #define XN_PS_MINOR_VERSION 0
 /** Xiron maintenance version. */ 
-#define XN_PS_MAINTENANCE_VERSION 1
+#define XN_PS_MAINTENANCE_VERSION 3
 /** Xiron build version. */ 
-#define XN_PS_BUILD_VERSION 32
+#define XN_PS_BUILD_VERSION 3
 
 /** Xiron version (in brief string format): "Major.Minor.Maintenance (Build)" */ 
 #define XN_PS_BRIEF_VERSION_STRING \

Platform/Linux-x86/Build/EngineLibMakefile

@@ -21,5 +21,5 @@ INC_DIRS += \
 
 BIN_DIR = ../../Bin
 
-include /usr/include/ni/CommonMakefile
+include ../CommonCppMakefile
 

Platform/Linux-x86/Build/Utils/EngineUtilMakefile

@@ -21,4 +21,4 @@ INC_DIRS += \
 
 BIN_DIR = ../../../Bin
 
-include /usr/include/ni/CommonMakefile
+include ../../CommonCppMakefile

Platform/Linux-x86/CreateRedist/RedistMaker

@@ -1,10 +1,17 @@
 #!/bin/bash -e
 
-use_4100=0
-if [ "$1" == "4100" ]
-then
-use_4100=1
-fi
+case $1 in
+x86 | "")
+	PLATFORM="x86" ;;
+CE4100)
+	PLATFORM="CE4100" ;;
+Arm)
+        PLATFORM="Arm" ;;
+*)
+	echo "Unknown platform"
+	exit 1
+	;;
+esac
 
 SCRIPT_DIR=`pwd`
 
@@ -21,14 +28,8 @@ rm -rf Final
 rm -rf ../Redist
 
 # Build Engine
-if [ "$use_4100" == "1" ]
-then
-cd ../Build
-./Make.4100
-cd -
-else
-make -C ../Build
-fi
+make PLATFORM=$PLATFORM -C ../Build clean
+make PLATFORM=$PLATFORM -C ../Build
 
 # create redist folder structure
 mkdir -p ../Redist
@@ -47,17 +48,26 @@ cp ../Bin/Release/libXnFormats.* ../Redist/Lib
 cp ../Bin/Release/libXnCore.* ../Redist/Lib
 cp ../Bin/Release/XnSensorServer ../Redist/Bin
 cp ../Install/* ../Redist/Install
-cp ../../../Data/GlobalDefaults.ini ../Redist/Config
 cp install.sh ../Redist
 
+# fix GlobalDefaults according to platform
+if [ "$PLATFORM" == "CE4100" ]; then
+	# change default UsbInterface to BULK and default image+depth format to compressed
+	cat ../../../Data/GlobalDefaults.ini | sed 's/[;]*UsbInterface=.*/UsbInterface=2/' | sed 's/[;]*InputFormat=.*/InputFormat=1/' > ../Redist/Config/GlobalDefaults.ini
+else
+	cp ../../../Data/GlobalDefaults.ini ../Redist/Config
+fi
+
 # create tar
 mkdir -p Final
 cd ../Redist
 
 if [ "`uname -s`" == "Darwin" ]; then
 	TAR_TARGET="MacOSX"
-elif [ "$use_4100" == "1" ]; then
+elif [ "$PLATFORM" == "CE4100" ]; then
 	TAR_TARGET="CE4100"
+elif [ "$PLATFORM" == "Arm" ]; then
+	TAR_TARGET="Arm"
 elif [ "`uname -m`" == "i686" ]; then
 	TAR_TARGET="Linux32"
 elif [ "`uname -m`" == "x86_64" ]; then

Platform/Linux-x86/CreateRedist/install.sh

@@ -1,48 +1,90 @@
-#!/bin/bash -e
-
-SCRIPT_DIR=`pwd`/`dirname $0`
-
-INSTALL_LIB=/usr/lib
-INSTALL_BIN=/usr/bin
-INSTALL_ETC=/usr/etc/primesense
-INSTALL_RULES=/etc/udev/rules.d
-
-if [ "`uname -s`" == "Darwin" ]; then
+#!/bin/sh -e
+
+usage="
+Usage: $0 [OPTIONS]
+Installs PrimeSense Sensor Driver to current machine.
+
+-i,--install
+	Installs PrimeSense Sensor Driver (default mode)
+-u,--uninstall
+	Uninstalls PrimeSense Sensor Driver.
+-c,--cross-compile-rootfs <path>
+	Used for cross-compiling. Installs PrimeSense Sensor Driver to <path> instead of '/'.
+-h,--help
+	Shows this help screen.
+"
+
+OS_NAME=`uname -s`
+
+case $OS_NAME in
+Darwin)
     MODULES="libXnDeviceSensorV2.dylib libXnDeviceFile.dylib"
-else
+    ;;
+*)
     MODULES="libXnDeviceSensorV2.so libXnDeviceFile.so"
-fi
+    ;;
+esac
 
 RULES_FILE="55-primesense-usb.rules"
 
-# read arguments
-INSTALL="1"
+# create file list
+SCRIPT_DIR=`pwd`/`dirname $0`
 
-while (( "$#" )); do
-	case "$1" in
-	"-i")
-		INSTALL="1"
+LIB_FILES=`ls $SCRIPT_DIR/Lib/*`
+BIN_FILES=`ls $SCRIPT_DIR/Bin/*`
+
+rootfs=
+
+# parse command line
+while [ "$1" ]; do
+	case $1 in
+	-i|--install)
+		install=yes
+		;;
+	-u|--uninstall)
+		uninstall=yes
+		;;
+	-c|--cross-staging-dir)
+		shift
+		rootfs=$1
 		;;
-	"-u")
-		INSTALL="0"
+	-h|--help) 
+		echo "$usage"
+		exit 0
 		;;
 	*)
-		echo "Usage: $0 [options]"
-		echo "Available options:"
-		printf "\t-i\tInstall (default)\n"
-		printf "\t-u\tUninstall\n"
+		echo "Unrecognized option $1"
 		exit 1
-		;;		
 	esac
 	shift
 done
 
-# create file list
-LIB_FILES=`ls $SCRIPT_DIR/Lib/*`
-BIN_FILES=`ls $SCRIPT_DIR/Bin/*`
+# default mode is install
+if [ ! "$install" = yes ] && [ ! "$uninstall" = yes ]; then
+	install=yes
+fi
+
+# validity check
+if [ "$install" = yes ] && [ "$uninstall" = yes ]; then
+	echo "-i and -u flags cannot be used together!"
+	exit 1
+fi
 
-if [ "$INSTALL" == "1" ]; then
+INSTALL_LIB=$rootfs/usr/lib
+INSTALL_BIN=$rootfs/usr/bin
+INSTALL_ETC=$rootfs/usr/etc/primesense
+INSTALL_RULES=$rootfs/etc/udev/rules.d
+SERVER_LOGS_DIR=$rootfs/var/log/primesense/XnSensorServer
 
+# make all calls into OpenNI run in this filesystem
+export OPEN_NI_INSTALL_PATH=$rootfs
+# make sure the staging dir OpenNI is the one being run
+export LD_LIBRARY_PATH=$INSTALL_LIB
+
+if [ "$install" = yes ]; then
+	printf "Installing PrimeSense Sensor\n"
+	printf "****************************\n\n"
+	
     # create config dir
     printf "creating config dir $INSTALL_ETC..."
     mkdir -p $INSTALL_ETC
@@ -61,7 +103,7 @@ if [ "$INSTALL" == "1" ]; then
     # register modules
     for module in $MODULES; do
         printf "registering module '$module' with OpenNI..."
-	niReg -r $INSTALL_LIB/$module $INSTALL_ETC
+		$INSTALL_BIN/niReg -r $INSTALL_LIB/$module $INSTALL_ETC
         printf "OK\n"
     done
 
@@ -78,9 +120,9 @@ if [ "$INSTALL" == "1" ]; then
 
     # create server log dir
     printf "creating server logs dir..."
-    mkdir -p /var/log/primesense/XnSensorServer
+    mkdir -p $SERVER_LOGS_DIR
     # make this dir readable and writable by all (we allow anyone to delete logs)
-    chmod a+w /var/log/primesense/XnSensorServer
+    chmod a+w $SERVER_LOGS_DIR
     printf "OK\n"
 
     if [ "`uname -s`" != "Darwin" ]; then
@@ -90,12 +132,17 @@ if [ "$INSTALL" == "1" ]; then
         printf "OK\n"
     fi
 
-else #uninstall
+	printf "\n*** DONE ***\n\n"
+
+elif [ "$uninstall" = yes ]; then
+
+	printf "Uninstalling PrimeSense Sensor\n"
+	printf "******************************\n\n"
 
     # unregister modules
     for module in $MODULES; do
     	printf "unregistering module '$module' from OpenNI..."
-        if niReg -u $INSTALL_LIB/$module; then
+        if $INSTALL_BIN/niReg -u $INSTALL_LIB/$module; then
             printf "OK\n"
         fi
     done
@@ -126,6 +173,6 @@ else #uninstall
         printf "OK\n"
     fi
 
-fi
+	printf "\n*** DONE ***\n\n"
 
-printf "\n*** DONE ***\n\n"
+fi