From 0daaf52c7cccaa3bb3c69da557f377f5be6f1e13 Mon Sep 17 00:00:00 2001 From: Thibaud Date: Wed, 30 May 2018 11:30:18 +0200 Subject: [PATCH] Reformat code --- main.c | 157 ++++++-------------------------------------------------- spnav.c | 43 +++++++++------- spnav.h | 32 ++++++------ 3 files changed, 57 insertions(+), 175 deletions(-) diff --git a/main.c b/main.c index 06b7b74..58e5ad4 100644 --- a/main.c +++ b/main.c @@ -5,105 +5,6 @@ #define SPNAV_VENDOR_ID 0x046d #define SPNAV_PRODUCT_ID 0xc626 -// enum { -// TRANSLATION = 1, -// ROTATION = 2, -// BUTTON = 3 -// }; - -// struct event_motion { -// int type; -// int x, y, z; -// int rx, ry, rz; -// unsigned int period; -// int *data; -// }; - -// struct event_button { -// int type; -// int press; -// int bnum; -// }; - -// typedef union spnav_event { -// int type; -// struct event_motion motion; -// struct event_button button; -// } spnav_event; - -// static bool INTERRUPTED = false; - -// int spnav_convert_input(int first, unsigned char val) { -// switch (val) { -// case 0: -// return first; -// case 1: -// return first + 255; -// case 254: -// return -512 + first; -// case 255: -// return -255 + first; -// default: -// return 0; -// } -// } - -// spnav_event read_event(hid_device *device, int ms) { -// spnav_event ev; -// unsigned char buf[64]; -// int nbytes = hid_read_timeout(device, buf, sizeof(buf), ms); -// if (nbytes < 0) { -// // TODO : error handling -// wprintf(L"error hid_read"); -// } else if (nbytes == 0) { -// ev.type = 0; -// } -// ev.type = buf[0]; - -// switch (ev.type) { -// case TRANSLATION: -// ev.type = 0; - -// ev.motion.x = spnav_convert_input((buf[1] & 0x0000ff), buf[2]); -// ev.motion.y = spnav_convert_input((buf[3] & 0x0000ff), buf[4]); -// ev.motion.z = spnav_convert_input((buf[5] & 0x0000ff), buf[6]); -// //wprintf(L"Translation x=%d, y=%d, z=%d\n", ev.motion.x, ev.motion.y, ev.motion.z); -// break; -// case ROTATION: -// ev.type = 1; -// ev.motion.rx = spnav_convert_input((buf[1] & 0x0000ff), buf[2]); -// ev.motion.ry = spnav_convert_input((buf[3] & 0x0000ff), buf[4]); -// ev.motion.rz = spnav_convert_input((buf[5] & 0x0000ff), buf[6]); -// //wprintf(L"Rotation rx=%d, ry=%d, rz=%d\n", ev.motion.rx, ev.motion.ry, ev.motion.rz); -// break; -// case BUTTON: -// wprintf(L"Buttons: %d %d\n", /* btn 1 */buf[1] & 0x01, /* btn 2 */ buf[1] & 0x02); -// break; -// } -// return ev; -// } - -// void set_led(hid_device *dev, char state) { -// const unsigned char led_data[2] = {0x04, state}; -// // led_data[0] = 0x04; -// // led_data[1] = state; -// int nbytes = hid_write(dev, led_data, sizeof(led_data)); -// wprintf(L"Bytes written : %d\n", nbytes); -// } - -// void spnav_stop(hid_device *dev) { -// set_led(dev, 0); -// hid_close(dev); -// hid_exit(); -// } - -// void sighandler(int signo) { -// if (signo == SIGINT) { -// wprintf(L"Stopping...\n"); -// INTERRUPTED = true; -// } -// } - #include #include #include "spnav.h" @@ -113,57 +14,31 @@ static bool INTERRUPTED = false; void sighandler(int signo) { if (signo == SIGINT) { INTERRUPTED = true; - } + } } -int main(int argc, char const *argv[]) -{ +int main(int argc, char const* argv[]) { signal(SIGINT, sighandler); - /* - // Initialize the hidapi library - hid_init(); - // Open the device using the VID, PID, - // and optionally the Serial number. - hid_device *handle = hid_open(SPNAV_VENDOR_ID, SPNAV_PRODUCT_ID, NULL); - - set_led(handle, 1); + spnav_event ev; + spnav_open(); + spnav_sensitivity(0.1); + spnav_deadzone(10); + for (;;) { + spnav_wait_event_timeout(&ev, 400); - while (1) { - spnav_event ev = read_event(handle, 400); - if (ev.type == 0) { - wprintf(L"x=%d y=%d z=%d rx=%d ry=%d rz=%d\n", - ev.motion.x, ev.motion.y, ev.motion.z, ev.motion.rx, ev.motion.ry, ev.motion.rz); - } else { - wprintf(L"ev.type : %d\n", ev.type); - } - - if (INTERRUPTED) { - break; - } - } - spnav_stop(handle); - return 0; - */ - spnav_event ev; - spnav_open(); - spnav_sensitivity(0.1); - spnav_deadzone(10); - for (;;) { - spnav_wait_event_timeout(&ev, 400); - - switch (ev.type) { - case MOTION: + switch (ev.type) { + case MOTION: printf("x=%d, y=%d, z=%d ", ev.motion.x, ev.motion.y, ev.motion.z); printf("rx=%d, ry=%d, rz=%d\n", ev.motion.rx, ev.motion.ry, ev.motion.rz); break; case BUTTON: printf("bnum=%d, pressed=%d\n", ev.button.bnum, ev.button.press); break; - } + } - if (INTERRUPTED) { - break; - } - } - spnav_close(); + if (INTERRUPTED) { + break; + } + } + spnav_close(); } diff --git a/spnav.c b/spnav.c index a74434e..5555f2b 100644 --- a/spnav.c +++ b/spnav.c @@ -4,10 +4,16 @@ #include "spnav.h" #include "hidapi.h" +#define DEBUG #ifdef DEBUG -#define DEBUG_PRINT(...) do{ fprintf( stderr, __VA_ARGS__ ); } while( false ) +#define DEBUG_PRINT(...) \ + do { \ + fprintf(stderr, __VA_ARGS__); \ + } while (false) #else -#define DEBUG_PRINT(...) do{ } while ( false ) +#define DEBUG_PRINT(...) \ + do { \ + } while (false) #endif enum { @@ -20,7 +26,7 @@ static bool IS_OPEN = false; /* Sensitivity is multiplied with every motion (1.0 normal). */ static double SPNAV_SENS = 1.0; static int SPNAV_DEADZONE_THRESHOLD = 5; -/* HID device for SpaceNavigator mouse */ +/* HID device for SpaceNavigator mouse */ hid_device *device = NULL; int convert_input(int first, unsigned char val) { @@ -41,7 +47,7 @@ int convert_input(int first, unsigned char val) { bool in_deadzone(unsigned char *data, int threshold) { /* data[0] is the event type */ int i; - for (i=1; i threshold) { return false; } @@ -50,7 +56,7 @@ bool in_deadzone(unsigned char *data, int threshold) { return true; } -int read_event(hid_device *device, spnav_event* ev, int ms) { +int read_event(hid_device *device, spnav_event *ev, int ms) { unsigned char buf[64]; int nbytes = hid_read_timeout(device, buf, sizeof(buf), ms); if (nbytes < 0) { @@ -64,14 +70,14 @@ int read_event(hid_device *device, spnav_event* ev, int ms) { switch (ev->type) { case TRANSLATION: - if (in_deadzone(buf, SPNAV_DEADZONE_THRESHOLD)) { + if (in_deadzone(buf, SPNAV_DEADZONE_THRESHOLD)) { ev->type = 0; return ev->type; } ev->motion.type = 1; - ev->motion.x = (int) (SPNAV_SENS * convert_input((buf[1] & 0x0000ff), buf[2])); - ev->motion.z = - (int) (SPNAV_SENS * convert_input((buf[3] & 0x0000ff), buf[4])); - ev->motion.y = - (int) (SPNAV_SENS * convert_input((buf[5] & 0x0000ff), buf[6])); + ev->motion.x = (int)(SPNAV_SENS * convert_input((buf[1] & 0x0000ff), buf[2])); + ev->motion.z = -(int)(SPNAV_SENS * convert_input((buf[3] & 0x0000ff), buf[4])); + ev->motion.y = -(int)(SPNAV_SENS * convert_input((buf[5] & 0x0000ff), buf[6])); // DEBUG_PRINT("Translation x=%d, y=%d, z=%d\n", ev->motion.x, ev->motion.y, ev->motion.z); break; case ROTATION: @@ -80,9 +86,9 @@ int read_event(hid_device *device, spnav_event* ev, int ms) { return ev->type; } ev->motion.type = 1; - ev->motion.rx = -(int) (SPNAV_SENS * convert_input((buf[1] & 0x0000ff), buf[2])); - ev->motion.rz = -(int) (SPNAV_SENS * convert_input((buf[3] & 0x0000ff), buf[4])); - ev->motion.ry = (int) (SPNAV_SENS * convert_input((buf[5] & 0x0000ff), buf[6])); + ev->motion.rx = -(int)(SPNAV_SENS * convert_input((buf[1] & 0x0000ff), buf[2])); + ev->motion.rz = -(int)(SPNAV_SENS * convert_input((buf[3] & 0x0000ff), buf[4])); + ev->motion.ry = (int)(SPNAV_SENS * convert_input((buf[5] & 0x0000ff), buf[6])); // DEBUG_PRINT("Rotation rx=%d, ry=%d, rz=%d\n", ev->motion.rx, ev->motion.ry, ev->motion.rz); break; case BTN: @@ -101,7 +107,7 @@ int set_led(hid_device *dev, char state) { int nbytes = hid_write(dev, led_data, sizeof(led_data)); if (nbytes != sizeof(led_data)) { DEBUG_PRINT("set_led(): hid_write() has written %d bytes (should be %ld)\n", - nbytes, sizeof(led_data)); + nbytes, sizeof(led_data)); return -1; } return nbytes; @@ -117,7 +123,7 @@ int spnav_open() { // Initialize the hidapi library hid_init(); // Open the device using the VID, PID, - // and optionally the Serial number. + // and optionally the Serial number. device = hid_open(SPNAV_VENDOR_ID, SPNAV_PRODUCT_ID, NULL); if (device == NULL) { DEBUG_PRINT("hid_open() failed!"); @@ -146,7 +152,8 @@ int spnav_wait_event(spnav_event *event) { DEBUG_PRINT("spnav_wait_event(): device not connected.\n"); return -1; } - return read_event(device, event, -1);; + return read_event(device, event, -1); + ; } int spnav_wait_event_timeout(spnav_event *event, int milliseconds) { @@ -154,7 +161,8 @@ int spnav_wait_event_timeout(spnav_event *event, int milliseconds) { DEBUG_PRINT("spnav_wait_event_timeout(): device not connected.\n"); return -1; } - return read_event(device, event, milliseconds);; + return read_event(device, event, milliseconds); + ; } int spnav_sensitivity(double sens) { @@ -176,6 +184,3 @@ int spnav_deadzone(int value) { DEBUG_PRINT("Deadzone threshold set to %d\n", value); return 0; } -/* -int spnav_wait_event(spnav_event *event); -int spnav_poll_event(spnav_event *event, int timeout); */ \ No newline at end of file diff --git a/spnav.h b/spnav.h index 6d9bef2..fecd311 100644 --- a/spnav.h +++ b/spnav.h @@ -1,16 +1,18 @@ #ifndef SPNAV_H__ #define SPNAV_H__ +#include + #define SPNAV_VENDOR_ID 0x046d #define SPNAV_PRODUCT_ID 0xc626 #define SPNAV_NAXIS 6 #ifdef _WIN32 - #define SPNAV_API_EXPORT __declspec(dllexport) - #define SPNAV_API_CALL +#define SPNAV_API_EXPORT __declspec(dllexport) +#define SPNAV_API_CALL #else - #define SPNAV_API_EXPORT /**< API export macro */ - #define SPNAV_API_CALL /**< API call macro */ +#define SPNAV_API_EXPORT /**< API export macro */ +#define SPNAV_API_CALL /**< API call macro */ #endif #define SPNAV_API_EXPORT_CALL SPNAV_API_EXPORT SPNAV_API_CALL /**< API export and call macro*/ @@ -22,23 +24,23 @@ enum event_type { }; struct event_motion { - int type; - int x, y, z; - int rx, ry, rz; - unsigned int period; - int *data; + int type; + int x, y, z; + int rx, ry, rz; + unsigned int period; + int *data; }; struct event_button { - int type; - bool press; - int bnum; + int type; + bool press; + int bnum; }; typedef union spnav_event { - int type; - struct event_motion motion; - struct event_button button; + int type; + struct event_motion motion; + struct event_button button; } spnav_event; #ifdef __cplusplus