Skip to content

Commit 1e1d261

Browse files
marcanmarcan
committed
Formatting and whitespace fixes
Signed-off-by: Hector Martin <[email protected]>
1 parent ceb1858 commit 1e1d261

File tree

10 files changed

+61
-66
lines changed

10 files changed

+61
-66
lines changed

‎c/examples/CMakeLists.txt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ if (BUILD_EXAMPLES)
1414

1515
add_executable(glview glview.c)
1616
find_library (PTHREAD pthread)
17-
IF(PROJECT_OS_OSX)
18-
set(CMAKE_EXE_LINKER_FLAGS "-framework OpenGL -framework GLUT")
19-
target_link_libraries(glview freenect)
20-
ELSE()
21-
target_link_libraries(glview freenect GL GLU glut m)
22-
ENDIF()
17+
if(PROJECT_OS_OSX)
18+
set(CMAKE_EXE_LINKER_FLAGS "-framework OpenGL -framework GLUT")
19+
target_link_libraries(glview freenect)
20+
else()
21+
target_link_libraries(glview freenect GL GLU glut m)
22+
endif()
2323

2424
install (TARGETS glview
2525
DESTINATION bin)

‎c/examples/glview.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ int main(int argc, char **argv)
249249
v = powf(v, 3)* 6;
250250
t_gamma[i] = v*6*256;
251251
}
252-
252+
253253
g_argc = argc;
254254
g_argv = argv;
255255

@@ -260,11 +260,11 @@ int main(int argc, char **argv)
260260

261261
int nr_devices = freenect_num_devices (f_ctx);
262262
printf ("Number of devices found: %d\n", nr_devices);
263-
263+
264264
int user_device_number = 0;
265265
if (argc > 1)
266266
user_device_number = atoi(argv[1]);
267-
267+
268268

269269
if (nr_devices < 1)
270270
return 1;
@@ -285,7 +285,7 @@ int main(int argc, char **argv)
285285
printf("pthread_create failed\n");
286286
return 1;
287287
}
288-
288+
289289
freenect_start_depth(f_dev);
290290
freenect_start_rgb(f_dev);
291291

‎c/include/libfreenect.h‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -50,16 +50,16 @@ typedef enum {
5050
} freenect_rgb_format;
5151

5252
typedef enum {
53-
LED_OFF = 0,
54-
LED_GREEN = 1,
55-
LED_RED = 2,
56-
LED_YELLOW = 3,
57-
LED_BLINK_YELLOW = 4,
58-
LED_BLINK_GREEN = 5,
59-
LED_BLINK_RED_YELLOW = 6
53+
LED_OFF = 0,
54+
LED_GREEN = 1,
55+
LED_RED = 2,
56+
LED_YELLOW = 3,
57+
LED_BLINK_YELLOW = 4,
58+
LED_BLINK_GREEN = 5,
59+
LED_BLINK_RED_YELLOW = 6
6060
} freenect_led_options;
6161

62-
typedef enum {
62+
typedef enum {
6363
FREENECT_FORMAT_11_BIT = 0,
6464
FREENECT_FORMAT_10_BIT = 1
6565
} freenect_depth_format;
@@ -100,7 +100,6 @@ int freenect_start_rgb(freenect_device *dev);
100100
int freenect_stop_depth(freenect_device *dev);
101101
int freenect_stop_rgb(freenect_device *dev);
102102

103-
104103
int freenect_set_tilt_in_degrees(freenect_device *dev, double angle);
105104
int freenect_set_tilt_in_radians(freenect_device *dev, double angle);
106105
int freenect_set_led(freenect_device *dev, freenect_led_options option);

‎c/lib/CMakeLists.txt‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,10 @@ find_library (PTHREAD pthread)
2626
target_link_libraries (freenect ${CMAKE_THREAD_LIBS_INIT} ${USB_LIBRARIES})
2727
target_link_libraries (freenectstatic ${CMAKE_THREAD_LIBS_INIT} ${USB_LIBRARIES})
2828

29-
3029
add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/inits.c
31-
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/geninits.py
32-
MAIN_DEPENDENCY inits.txt
33-
COMMAND python ${CMAKE_CURRENT_SOURCE_DIR}/geninits.py ${CMAKE_CURRENT_SOURCE_DIR}/inits.txt ${CMAKE_CURRENT_BINARY_DIR}/inits.c)
30+
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/geninits.py
31+
MAIN_DEPENDENCY inits.txt
32+
COMMAND python ${CMAKE_CURRENT_SOURCE_DIR}/geninits.py ${CMAKE_CURRENT_SOURCE_DIR}/inits.txt ${CMAKE_CURRENT_BINARY_DIR}/inits.c)
3433

3534
# Install the header file
3635
install (FILES "../include/libfreenect.h"

‎c/lib/accelerometers.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,10 @@ int freenect_get_raw_accelerometers(freenect_device *dev, int16_t* x, int16_t* y
5353

5454
int freenect_get_mks_accelerometers(freenect_device *dev, double* x, double* y, double* z)
5555
{
56-
//the documentation for the accelerometer (http://www.kionix.com/Product%20Sheets/KXSD9%20Product%20Brief.pdf)
57-
//states there are 819 counts/g
56+
//the documentation for the accelerometer (http://www.kionix.com/Product%20Sheets/KXSD9%20Product%20Brief.pdf)
57+
//states there are 819 counts/g
5858
int16_t ix, iy, iz;
59-
int ret = freenect_get_raw_accelerometers(dev,&ix,&iy,&iz);
59+
int ret = freenect_get_raw_accelerometers(dev,&ix,&iy,&iz);
6060

6161
*x = (double)ix/FREENECT_COUNTS_PER_G*GRAVITY;
6262
*y = (double)iy/FREENECT_COUNTS_PER_G*GRAVITY;

‎c/lib/cameras.c‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ static void send_init(freenect_device *dev)
284284

285285
chdr->magic[0] = 0x47;
286286
chdr->magic[1] = 0x4d;
287-
287+
288288
for (i=0; i<num_inits; i++) {
289289
const struct caminit *ip = &inits[i];
290290
chdr->cmd = ip->command;
@@ -353,6 +353,7 @@ int freenect_start_depth(freenect_device *dev)
353353
send_init(dev);
354354
return res;
355355
}
356+
356357
int freenect_start_rgb(freenect_device *dev)
357358
{
358359
int res;
@@ -375,6 +376,7 @@ int freenect_stop_depth(freenect_device *dev)
375376
printf("%s NOT IMPLEMENTED YET\n", __FUNCTION__);
376377
return 0;
377378
}
379+
378380
int freenect_stop_rgb(freenect_device *dev)
379381
{
380382
printf("%s NOT IMPLEMENTED YET\n", __FUNCTION__);

‎c/lib/core.c‎

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -55,23 +55,24 @@ int freenect_process_events(freenect_context *ctx)
5555

5656
int freenect_num_devices(freenect_context *ctx)
5757
{
58-
libusb_device **devs; //pointer to pointer of device, used to retrieve a list of devices
59-
ssize_t cnt = libusb_get_device_list (ctx->usb.ctx, &devs); //get the list of devices
60-
if (cnt < 0)
61-
return (-1);
62-
63-
int nr = 0, i = 0;
64-
struct libusb_device_descriptor desc;
65-
for (i = 0; i < cnt; ++i)
66-
{
67-
int r = libusb_get_device_descriptor (devs[i], &desc);
68-
if (r < 0)
69-
continue;
70-
if (desc.idVendor == MS_MAGIC_VENDOR && desc.idProduct == MS_MAGIC_CAMERA_PRODUCT)
71-
nr++;
72-
}
73-
74-
libusb_free_device_list (devs, 1); // free the list, unref the devices in it
58+
libusb_device **devs; //pointer to pointer of device, used to retrieve a list of devices
59+
ssize_t cnt = libusb_get_device_list (ctx->usb.ctx, &devs); //get the list of devices
60+
61+
if (cnt < 0)
62+
return (-1);
63+
64+
int nr = 0, i = 0;
65+
struct libusb_device_descriptor desc;
66+
for (i = 0; i < cnt; ++i)
67+
{
68+
int r = libusb_get_device_descriptor (devs[i], &desc);
69+
if (r < 0)
70+
continue;
71+
if (desc.idVendor == MS_MAGIC_VENDOR && desc.idProduct == MS_MAGIC_CAMERA_PRODUCT)
72+
nr++;
73+
}
74+
75+
libusb_free_device_list (devs, 1); // free the list, unref the devices in it
7576

7677
return (nr);
7778
}
@@ -108,6 +109,7 @@ void freenect_set_user(freenect_device *dev, void *user)
108109
{
109110
dev->user_data = user;
110111
}
112+
111113
void *freenect_get_user(freenect_device *dev)
112114
{
113115
return dev->user_data;

‎c/lib/motors.c‎

Lines changed: 14 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -36,34 +36,28 @@
3636
const double MAX_TILT_ANGLE = 31;
3737
const double MIN_TILT_ANGLE = -31;
3838

39-
4039
int freenect_set_tilt_in_degrees(freenect_device *dev, double angle)
4140
{
42-
int ret;
43-
uint8_t empty[0x1];
44-
angle = (((angle<MIN_TILT_ANGLE)?MIN_TILT_ANGLE:angle)>MAX_TILT_ANGLE)?MAX_TILT_ANGLE:((angle<MIN_TILT_ANGLE)?MIN_TILT_ANGLE:angle);
45-
angle = angle * 2;
46-
ret = fnusb_control(&dev->usb_motor, 0x40, 0x31, (uint16_t)angle, 0x0, empty, 0x0);
47-
return ret;
48-
41+
int ret;
42+
uint8_t empty[0x1];
43+
angle = (((angle<MIN_TILT_ANGLE)?MIN_TILT_ANGLE:angle)>MAX_TILT_ANGLE)?MAX_TILT_ANGLE:((angle<MIN_TILT_ANGLE)?MIN_TILT_ANGLE:angle);
44+
angle = angle * 2;
45+
ret = fnusb_control(&dev->usb_motor, 0x40, 0x31, (uint16_t)angle, 0x0, empty, 0x0);
46+
return ret;
4947
}
5048

5149
int freenect_set_tilt_in_radians(freenect_device *dev, double angle)
5250
{
53-
int ret;
54-
angle = angle/M_PI*180;
55-
ret = freenect_set_tilt_in_degrees(dev,angle);
56-
return ret;
57-
51+
int ret;
52+
angle = angle/M_PI*180;
53+
ret = freenect_set_tilt_in_degrees(dev,angle);
54+
return ret;
5855
}
5956

6057
int freenect_set_led(freenect_device *dev, freenect_led_options option)
6158
{
62-
int ret;
63-
uint8_t empty[0x1];
64-
ret = fnusb_control(&dev->usb_motor, 0x40, 0x06, (uint16_t)option, 0x0, empty, 0x0);
65-
return ret;
66-
59+
int ret;
60+
uint8_t empty[0x1];
61+
ret = fnusb_control(&dev->usb_motor, 0x40, 0x06, (uint16_t)option, 0x0, empty, 0x0);
62+
return ret;
6763
}
68-
69-

‎c/lib/usb_libusb10.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ int fnusb_open_subdevices(freenect_device *dev, int index)
9696
if (libusb_open (devs[i], &dev->usb_cam.dev) != 0)
9797
return (-1);
9898
// Claim the camera
99-
if (!dev->usb_cam.dev)
99+
if (!dev->usb_cam.dev)
100100
return (-1);
101101
libusb_claim_interface (dev->usb_cam.dev, 0);
102102
start_cam = true;

‎c/lib/usb_libusb10.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@
5555
#define RGB_PKTBUF 1920
5656
#endif
5757

58-
5958
typedef struct {
6059
libusb_context *ctx;
6160
int should_free_ctx;

0 commit comments

Comments
 (0)