Permalink
Browse files

Initial kinect compatability

  • Loading branch information...
1 parent c07c3eb commit 48f6059b232840e7aa4d671c7dfa3545fff907d8 @avin2 committed Dec 9, 2010
View
@@ -82,7 +82,7 @@ InputFormat=3
;Registration=1
; Registration Type. 0 - Don't care (default), 1 - use hardware accelaration, 2 - perform in software
-;RegistrationType=0
+RegistrationType=2
; Hole Filler. 0 - Off, 1 - On (default)
;HoleFilter=1
@@ -137,7 +137,7 @@ InputFormat=3
;FPS=30
; Input format. 0 - BAYER (1.3MP or 2.0MP only), 1 - Compressed YUV422 (default), 2 - Jpeg, 5 - Uncompressed YUV422, 6 - Uncompressed 8-bit BAYER
-InputFormat=5
+InputFormat=6
; Anti Flicker. 0 - Off (default), 50 - 50Hz, 60 - 60 Hz.
;Flicker=50
@@ -4,4 +4,5 @@ SYSFS{idProduct}=="0300",SYSFS{idVendor}=="1d27",MODE="666",OWNER="xxx",GROUP="u
SYSFS{idProduct}=="0400",SYSFS{idVendor}=="1d27",MODE="666",OWNER="xxx",GROUP="users"
SYSFS{idProduct}=="0500",SYSFS{idVendor}=="1d27",MODE="666",OWNER="xxx",GROUP="users"
SYSFS{idProduct}=="0600",SYSFS{idVendor}=="1d27",MODE="666",OWNER="xxx",GROUP="users"
+SYSFS{idProduct}=="02AE",SYSFS{idVendor}=="045E",MODE="666",OWNER="xxx",GROUP="users"
@@ -37,14 +37,14 @@ SetCompressor ZLIB
;*** General ***
;***************
!define EE_VER "5.0.0"
-!define EE_NAME "PrimeSensor ${EE_VER} for Windows"
+!define EE_NAME "PrimeSensor ${EE_VER} for Windows (Kinect Mod)"
!define env_hklm 'HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"'
!define OPENNI_VER "1.0.0"
!define OPENNI_NAME "PrimeSense - OpenNI ${OPENNI_VER} for Windows"
Var OPEN_NI_INST
Name "${EE_NAME}"
-OutFile "Output\Sensor-Win32-${EE_VER}.exe"
+OutFile "Output\SensorKinect-Win32-${EE_VER}.exe"
InstallDir "$PROGRAMFILES\Prime Sense\Sensor"
;*******************************
@@ -125,6 +125,9 @@ Section "Sensor" Sensor
File "/oname=$INSTDIR\Bin\XnDeviceFile.dll" ..\redist\Bin\XnDeviceFile.dll
File "/oname=$INSTDIR\Bin\XnSensorServer.exe" ..\redist\Bin\XnSensorServer.exe
File "/oname=$INSTDIR\Data\GlobalDefaults.ini" ..\redist\Data\GlobalDefaults.ini
+
+ SetOutPath "$INSTDIR\Driver"
+ File /r ..\driver\*.*
; Register it in OpenNI
ReadRegStr $OPEN_NI_INST HKLM "Software\OpenNI" "InstallDir"
@@ -91,7 +91,7 @@ class XnDataProcessor
/* The number of bytes received so far (since last time this member was reset). */
XnUInt32 m_nBytesReceived;
/* Stores last packet ID */
- XnUInt16 m_nLastPacketID;
+ XnUInt8 m_nLastPacketID;
/* The name of the stream. */
const XnChar* m_csName;
@@ -34,10 +34,10 @@
//---------------------------------------------------------------------------
// Defines
//---------------------------------------------------------------------------
-#define XN_SENSOR_VENDOR_ID 0x1D27
+#define XN_SENSOR_VENDOR_ID 0x045E
#define XN_SENSOR_2_0_PRODUCT_ID 0x0200
#define XN_SENSOR_5_0_PRODUCT_ID 0x0500
-#define XN_SENSOR_6_0_PRODUCT_ID 0x0600
+#define XN_SENSOR_6_0_PRODUCT_ID 0x02AE
#if XN_PLATFORM == XN_PLATFORM_WIN32
#include <initguid.h>
@@ -88,7 +88,8 @@ typedef struct XnSensorProtocolResponseHeader
{
XnUInt16 nMagic;
XnUInt16 nType;
- XnUInt16 nReserve;
+ XnUInt8 nReserve;
+ XnUInt8 nUnknown;
XnUInt16 nBufSize;
XnUInt32 nTimeStamp;
} XnSensorProtocolResponseHeader;
@@ -111,8 +111,8 @@ enum EPsProtocolOpCodes_V017
typedef enum
{
XN_HOST_PROTOCOL_ALGORITHM_DEPTH_INFO = 0x00,
- XN_HOST_PROTOCOL_ALGORITHM_REGISTRATION = 0x02,
- XN_HOST_PROTOCOL_ALGORITHM_PADDING = 0x03,
+ XN_HOST_PROTOCOL_ALGORITHM_REGISTRATION = 0x40,
+ XN_HOST_PROTOCOL_ALGORITHM_PADDING = 0x41,
XN_HOST_PROTOCOL_ALGORITHM_BLANKING = 0x06,
XN_HOST_PROTOCOL_ALGORITHM_FREQUENCY = 0x80
} XnHostProtocolAlgorithmType;

0 comments on commit 48f6059

Please sign in to comment.