projects
/
kinect-audio-setup.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
d6e1871
)
Remove trailing spaces here and there
author
Antonio Ospite <ao2@ao2.it>
Sat, 9 Jan 2016 12:32:31 +0000
(13:32 +0100)
committer
Antonio Ospite <ao2@ao2.it>
Sat, 9 Jan 2016 14:13:31 +0000
(15:13 +0100)
Makefile
patch
|
blob
|
history
kinect_fetch_fw
patch
|
blob
|
history
kinect_upload_fw/kinect_upload_fw.c
patch
|
blob
|
history
windows/README.asciidoc
patch
|
blob
|
history
windows/kinect_upload_fw.bat
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index
7675311
..
05c505a
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-1,5
+1,5
@@
all:
all:
- $(MAKE) -C kinect_upload_fw
+ $(MAKE) -C kinect_upload_fw
install:
$(MAKE) -C kinect_upload_fw install
install:
$(MAKE) -C kinect_upload_fw install
diff --git
a/kinect_fetch_fw
b/kinect_fetch_fw
index
d45571d
..
3459dca
100755
(executable)
--- a/
kinect_fetch_fw
+++ b/
kinect_fetch_fw
@@
-33,7
+33,7
@@
trap "exit 2" 1 2 3 15
cat << EOM
cat << EOM
-This script is going to download the UAC Firmware for the Microsoft
+This script is going to download the UAC Firmware for the Microsoft
Kinect Sensor device from the Microsoft Kinect for Windows SDK:
http://kinectforwindows.org/
Kinect Sensor device from the Microsoft Kinect for Windows SDK:
http://kinectforwindows.org/
diff --git
a/kinect_upload_fw/kinect_upload_fw.c
b/kinect_upload_fw/kinect_upload_fw.c
index
5f29f71
..
1bd4102
100644
(file)
--- a/
kinect_upload_fw/kinect_upload_fw.c
+++ b/
kinect_upload_fw/kinect_upload_fw.c
@@
-306,7
+306,7
@@
int main(int argc, char *argv[]) {
goto out_libusb_close;
}
goto out_libusb_close;
}
- /*
+ /*
* Checking that the configuration has not changed, as suggested in
* http://libusb.sourceforge.net/api-1.0/caveats.html
*/
* Checking that the configuration has not changed, as suggested in
* http://libusb.sourceforge.net/api-1.0/caveats.html
*/
diff --git
a/windows/README.asciidoc
b/windows/README.asciidoc
index
00ec5e4
..
646f309
100644
(file)
--- a/
windows/README.asciidoc
+++ b/
windows/README.asciidoc
@@
-40,16
+40,16
@@
Compiling kinect_upload_fw
Using kinect_upload_fw.exe on Windows
-------------------------------------
Using kinect_upload_fw.exe on Windows
-------------------------------------
-First of all, make sure the drivers from ''libfreenect'' are installed, they are
+First of all, make sure the drivers from ''libfreenect'' are installed, they are
under ''platform/windows/inf''.
Download the MSR Kinect SDK from:
http://download.microsoft.com/download/8/4/C/84C9EF40-EE49-42C2-AE26-C6E30921182F/KinectSDK32.msi
under ''platform/windows/inf''.
Download the MSR Kinect SDK from:
http://download.microsoft.com/download/8/4/C/84C9EF40-EE49-42C2-AE26-C6E30921182F/KinectSDK32.msi
-Explore ''KinectSDK32.msi'' using 7-zip from http://www.7-zip.org, extract the
-''media1.cab'' file in it and extract the firmware file from ''media1.cab'', the
+Explore ''KinectSDK32.msi'' using 7-zip from http://www.7-zip.org, extract the
+''media1.cab'' file in it and extract the firmware file from ''media1.cab'', the
firmware file is named ''UACFirmware.*''.
firmware file is named ''UACFirmware.*''.
-Put ''kinect_upload_fw.exe'', the firmware file and ''kinect_upload_fw.bat''
-file in the same directory and double_click on the ''kinect_upload_fw.bat''
+Put ''kinect_upload_fw.exe'', the firmware file and ''kinect_upload_fw.bat''
+file in the same directory and double_click on the ''kinect_upload_fw.bat''
file.
file.
diff --git
a/windows/kinect_upload_fw.bat
b/windows/kinect_upload_fw.bat
index
3757670
..
d388666
100644
(file)
--- a/
windows/kinect_upload_fw.bat
+++ b/
windows/kinect_upload_fw.bat
@@
-1,14
+1,14
@@
-REM First of all, make sure the drivers from ''libfreenect'' are installed,
\r
+REM First of all, make sure the drivers from ''libfreenect'' are installed,
\r
REM they are in ''platform/windows/inf'' in the libfreenect code base..
\r
REM they are in ''platform/windows/inf'' in the libfreenect code base..
\r
-REM
\r
+REM
\r
REM Download the MSR Kinect SDK from:
\r
REM http://download.microsoft.com/download/8/4/C/84C9EF40-EE49-42C2-AE26-C6E30921182F/KinectSDK32.msi
\r
REM Download the MSR Kinect SDK from:
\r
REM http://download.microsoft.com/download/8/4/C/84C9EF40-EE49-42C2-AE26-C6E30921182F/KinectSDK32.msi
\r
-REM
\r
-REM Explore ''KinectSDK32.msi'' using 7-zip from http://www.7-zip.org, extract the
\r
+REM
\r
+REM Explore ''KinectSDK32.msi'' using 7-zip from http://www.7-zip.org, extract the
\r
REM ''media1.cab'' file in it and get the firmware file, named ''UACFirmware.*''
\r
REM ''media1.cab'' file in it and get the firmware file, named ''UACFirmware.*''
\r
-REM
\r
-REM Put ''kinect_upload_fw.exe'', the firmware file and ''kinect_upload_fw.bat''
\r
-REM file in the same directory and double_click on the ''kinect_upload_fw.bat''
\r
+REM
\r
+REM Put ''kinect_upload_fw.exe'', the firmware file and ''kinect_upload_fw.bat''
\r
+REM file in the same directory and double_click on the ''kinect_upload_fw.bat''
\r
REM file.
\r
\r
Set FIRMWARE="UACFirmware.C9C6E852_35A3_41DC_A57D_BDDEB43DFD04"
\r
REM file.
\r
\r
Set FIRMWARE="UACFirmware.C9C6E852_35A3_41DC_A57D_BDDEB43DFD04"
\r