Skip to content

Commit a35642f

Browse files
committed
Update README.md and CMakeLists.txt for v0.4.2
Signed-off-by: Benn Snyder <[email protected]>
1 parent 43d44e9 commit a35642f

File tree

3 files changed

+30
-12
lines changed

3 files changed

+30
-12
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ include (SetupDirectories)
4848

4949
set (PROJECT_VER_MAJOR 0)
5050
set (PROJECT_VER_MINOR 4)
51-
set (PROJECT_VER_PATCH 1)
51+
set (PROJECT_VER_PATCH 2)
5252
set (PROJECT_VER
5353
"${PROJECT_VER_MAJOR}.${PROJECT_VER_MINOR}.${PROJECT_VER_PATCH}")
5454
set (PROJECT_APIVER

README.md

Lines changed: 28 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,25 @@ For the examples, you'll need
3535
cd build
3636
cmake -L ..
3737
make
38-
38+
3939
# if you don't have `make` or don't want color output
4040
# cmake --build .
4141

42-
You can also specify a build with debug symbols:
42+
For some newer Kinect models, audio must be enabled for tilt and LED control:
43+
44+
cmake -L .. -DBUILD_AUDIO=ON
45+
46+
You can specify a build with debug symbols:
4347

4448
cmake -L .. -DCMAKE_BUILD_TYPE=debug
4549
# or with optimizations
4650
# cmake -L .. -DCMAKE_BUILD_TYPE=RelWithDebInfo
4751

52+
You can build .deb, .rpm, and/or .tgz packages with `cpack`:
53+
54+
cmake .. -L -DBUILD_CPACK_DEB=ON -DBUILD_CPACK_RPM=ON -DBUILD_CPACK_TGZ=ON
55+
cpack
56+
4857
## OSX
4958

5059
If you don't have a package manager, install [Homebrew](http://brew.sh/).
@@ -55,11 +64,11 @@ For a manual build, see [the wiki](http://openkinect.org/wiki/Getting_Started#Ma
5564
brew install libfreenect
5665
# or get the very latest:
5766
# brew install --HEAD libfreenect
58-
67+
5968
### MacPorts
6069

6170
sudo port install git-core cmake libusb libtool
62-
71+
6372
Continue with [Fetch & Build](#fetch-build).
6473

6574

@@ -76,12 +85,12 @@ Continue with this section for a manual build.
7685
sudo apt-get install git-core cmake pkg-config build-essential libusb-1.0-0-dev
7786
sudo adduser $USER video
7887
sudo adduser $USER plugdev # necessary?
79-
88+
8089
# only if you are building the examples:
8190
sudo apt-get install libglut3-dev libxmu-dev libxi-dev
82-
91+
8392
Continue with [Fetch & Build](#fetch-build).
84-
93+
8594
There is also a [debian branch](https://github.com/OpenKinect/libfreenect/tree/debian) for packaging purposes.
8695

8796
### Gentoo Linux
@@ -127,6 +136,15 @@ Wrappers are not guaranteed to be API stable or up to date.
127136
For example, start with [demo_cv_async.py](https://gihub.com/OpenKinect/libfreenect/tree/master/wrappers/python/devmo_cv_async.py).
128137

129138

139+
# Code Contributions
140+
141+
In order of importance:
142+
143+
- Make sure to sign commits: `git commit -s`
144+
- Use a [feature branch](https://www.atlassian.com/git/workflows#!workflow-feature-branch) in your own fork and target master with pull requests
145+
- Tab indentation, no trailing whitespace
146+
147+
130148
# Maintainers
131149

132150
Ongoing Development and Maintenance by the OpenKinect Community
@@ -158,16 +176,16 @@ http://www.apache.org/licenses/LICENSE-2.0
158176
http://www.gnu.org/licenses/gpl-2.0.txt
159177
160178
If you redistribute this file in source form, modified or unmodified,
161-
you may:
179+
you may:
162180
163181
- Leave this header intact and distribute it under the same terms,
164182
accompanying it with the APACHE20 and GPL2 files, or
165183
- Delete the Apache 2.0 clause and accompany it with the GPL2 file, or
166-
- Delete the GPL v2 clause and accompany it with the APACHE20 file
184+
- Delete the GPL v2 clause and accompany it with the APACHE20 file
167185
168186
In all cases you must keep the copyright notice intact and include a
169187
copy of the CONTRIB file.
170-
188+
171189
Binary distributions must follow the binary distribution requirements
172190
of either License.
173191
```

src/flags.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ FN_INTERNAL int write_cmos_register(freenect_device *dev, uint16_t reg, uint16_t
218218
cmdbuf[1] = reg | 0x8000;
219219
cmdbuf[2] = value;
220220

221-
FN_DEBUG("write_cmos_register: 0x%04x <= 0x%02x\n", reg, value);
221+
FN_DEBUG("write_cmos_register: 0x%04x <= 0x%04x\n", reg, value);
222222
int res = send_cmd(dev, 0x95, cmdbuf, 6, replybuf, 6);
223223
if (res < 0)
224224
FN_ERROR("write_cmos_register: send_cmd() returned %d\n", res);

0 commit comments

Comments
 (0)