Skip to content

Commit 5b1bf4e

Browse files
committed
Fix compiler warning by anonymizing enum; touch up indentation
Signed-off-by: Benn Snyder <[email protected]>
1 parent 3850ad8 commit 5b1bf4e

File tree

1 file changed

+25
-27
lines changed

1 file changed

+25
-27
lines changed

src/tilt.c

Lines changed: 25 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -235,33 +235,30 @@ int freenect_set_tilt_degs(freenect_device *dev, double angle)
235235
return ret;
236236
}
237237

238-
239238
FN_INTERNAL int fnusb_set_led_alt(libusb_device_handle * dev, freenect_context * ctx, freenect_led_options state)
240239
{
241-
typedef enum {
242-
LED_ALT_OFF = 1,
243-
LED_ALT_BLINK_GREEN = 2,
244-
LED_ALT_SOLID_GREEN = 3,
245-
LED_ALT_SOLID_RED = 4,
246-
}led_alt_state;
247-
248-
int transferred = 0;
249-
int res = 0;
250-
251-
//The LED states are different between K4W/1473 and older 1414
252-
if( state == LED_GREEN ){
253-
state = (freenect_led_options)LED_ALT_SOLID_GREEN;
254-
}else if( state == LED_RED ){
255-
state = (freenect_led_options)LED_ALT_SOLID_RED;
256-
}else if( state == LED_YELLOW ){
257-
state = (freenect_led_options)LED_ALT_SOLID_GREEN;
258-
}else if( state == LED_OFF ){
259-
state = (freenect_led_options)LED_ALT_OFF;
260-
}else if( state == LED_BLINK_GREEN ){
261-
state = (freenect_led_options)LED_ALT_BLINK_GREEN;
262-
}else{
263-
state = LED_GREEN;
264-
}
240+
enum
241+
{
242+
LED_ALT_OFF = 1,
243+
LED_ALT_BLINK_GREEN = 2,
244+
LED_ALT_SOLID_GREEN = 3,
245+
LED_ALT_SOLID_RED = 4,
246+
};
247+
248+
//The LED states are different between K4W/1473 and older 1414
249+
if( state == LED_GREEN ){
250+
state = (freenect_led_options)LED_ALT_SOLID_GREEN;
251+
}else if( state == LED_RED ){
252+
state = (freenect_led_options)LED_ALT_SOLID_RED;
253+
}else if( state == LED_YELLOW ){
254+
state = (freenect_led_options)LED_ALT_SOLID_GREEN;
255+
}else if( state == LED_OFF ){
256+
state = (freenect_led_options)LED_ALT_OFF;
257+
}else if( state == LED_BLINK_GREEN ){
258+
state = (freenect_led_options)LED_ALT_BLINK_GREEN;
259+
}else{
260+
state = LED_GREEN;
261+
}
265262

266263
fn_alt_motor_command cmd;
267264
cmd.magic = fn_le32(0x06022009);
@@ -272,8 +269,9 @@ FN_INTERNAL int fnusb_set_led_alt(libusb_device_handle * dev, freenect_context *
272269

273270
unsigned char buffer[20];
274271
memcpy(buffer, &cmd, 20);
275-
276-
res = libusb_bulk_transfer(dev, 0x01, buffer, 20, &transferred, 100);
272+
273+
int transferred = 0;
274+
int res = libusb_bulk_transfer(dev, 0x01, buffer, 20, &transferred, 100);
277275
if (res != 0) {
278276
FN_WARNING("fnusb_set_led_alt(): libusb_bulk_transfer failed: %d (transferred = %d)\n", res, transferred);
279277
return res;

0 commit comments

Comments
 (0)