From b3c0c390c464a27a5bdf66bbb98853b00c87e57a Mon Sep 17 00:00:00 2001 From: Ryan Pavlik Date: Mon, 10 Dec 2012 14:16:45 -0600 Subject: [PATCH] Astyle the examples. --- example-sdl/sdl.c | 217 +++++++++++++++++++++------------------- example/example.c | 246 ++++++++++++++++++++++++++++++---------------- 2 files changed, 280 insertions(+), 183 deletions(-) diff --git a/example-sdl/sdl.c b/example-sdl/sdl.c index e8162aa..97a9470 100644 --- a/example-sdl/sdl.c +++ b/example-sdl/sdl.c @@ -56,7 +56,7 @@ #define MAX_WIIMOTES 2 GLint width = 1024, height = 768; -GLfloat backColor[4] = {1.0,1.0,1.0,1.0}; +GLfloat backColor[4] = {1.0, 1.0, 1.0, 1.0}; wiimote** wiimotes = NULL; @@ -65,11 +65,11 @@ int xcoord = 0; int ycoord = 0; #ifdef WIN32 - DWORD last_render; +DWORD last_render; #else - struct timeval last_render; - int last_sec = 0; - int fps = 0; +struct timeval last_render; +int last_sec = 0; +int fps = 0; #endif enum render_mode_t { @@ -123,39 +123,45 @@ void set_material(struct material_t* mptr); void resize_window(GLint new_width, GLint new_height); void handle_event(struct wiimote_t* wm) { - if (IS_JUST_PRESSED(wm, WIIMOTE_BUTTON_PLUS)) + if (IS_JUST_PRESSED(wm, WIIMOTE_BUTTON_PLUS)) { wiiuse_motion_sensing(wm, 1); - if (IS_JUST_PRESSED(wm, WIIMOTE_BUTTON_MINUS)) + } + if (IS_JUST_PRESSED(wm, WIIMOTE_BUTTON_MINUS)) { wiiuse_motion_sensing(wm, 0); + } - if (IS_JUST_PRESSED(wm, WIIMOTE_BUTTON_UP)) + if (IS_JUST_PRESSED(wm, WIIMOTE_BUTTON_UP)) { wiiuse_set_ir(wm, 1); - if (IS_JUST_PRESSED(wm, WIIMOTE_BUTTON_DOWN)) + } + if (IS_JUST_PRESSED(wm, WIIMOTE_BUTTON_DOWN)) { wiiuse_set_ir(wm, 0); + } - if (IS_JUST_PRESSED(wm, WIIMOTE_BUTTON_B)) + if (IS_JUST_PRESSED(wm, WIIMOTE_BUTTON_B)) { wiiuse_toggle_rumble(wm); + } if (IS_JUST_PRESSED(wm, WIIMOTE_BUTTON_ONE)) { int level; WIIUSE_GET_IR_SENSITIVITY(wm, &level); - wiiuse_set_ir_sensitivity(wm, level+1); + wiiuse_set_ir_sensitivity(wm, level + 1); } if (IS_JUST_PRESSED(wm, WIIMOTE_BUTTON_TWO)) { int level; WIIUSE_GET_IR_SENSITIVITY(wm, &level); - wiiuse_set_ir_sensitivity(wm, level-1); + wiiuse_set_ir_sensitivity(wm, level - 1); } - #if 0 +#if 0 if (IS_JUST_PRESSED(wm, WIIMOTE_BUTTON_A)) { - if (render_mode == IR) + if (render_mode == IR) { render_mode = TEAPOT; - else + } else { render_mode = IR; + } resize_window(width, height); } - #endif +#endif } #define DRAW_TRIANGLE(x, y, z, s) do { \ @@ -166,52 +172,57 @@ void handle_event(struct wiimote_t* wm) { int can_render() { /* quick fps limit to ~60fps -- not too fancy, could be better */ - #ifdef WIN32 - if (GetTickCount() < (last_render + 16)) - return 0; - last_render = GetTickCount(); - return 1; - #else - struct timeval now; - long elapsed_usec = 0; +#ifdef WIN32 + if (GetTickCount() < (last_render + 16)) { + return 0; + } + last_render = GetTickCount(); + return 1; +#else + struct timeval now; + long elapsed_usec = 0; - gettimeofday(&now, NULL); + gettimeofday(&now, NULL); - if (now.tv_usec > 1000000) { - now.tv_usec -= 1000000; - ++now.tv_sec; - } + if (now.tv_usec > 1000000) { + now.tv_usec -= 1000000; + ++now.tv_sec; + } - if (now.tv_sec > last_render.tv_sec) - elapsed_usec = ((now.tv_sec - last_render.tv_sec) * 1000000); + if (now.tv_sec > last_render.tv_sec) { + elapsed_usec = ((now.tv_sec - last_render.tv_sec) * 1000000); + } - if (now.tv_usec > last_render.tv_usec) - elapsed_usec += now.tv_usec - last_render.tv_usec; - else - elapsed_usec += last_render.tv_usec - now.tv_usec; + if (now.tv_usec > last_render.tv_usec) { + elapsed_usec += now.tv_usec - last_render.tv_usec; + } else { + elapsed_usec += last_render.tv_usec - now.tv_usec; + } - if (time(NULL) > last_sec) { - printf("fps: %i\n", fps); - fps = 0; - last_sec = time(NULL); - } + if (time(NULL) > last_sec) { + printf("fps: %i\n", fps); + fps = 0; + last_sec = time(NULL); + } - if (elapsed_usec < 16000) - return 0; + if (elapsed_usec < 16000) { + return 0; + } - last_render = now; - ++fps; + last_render = now; + ++fps; - return 1; - #endif + return 1; +#endif } void display() { int i, wm; float size = 5; - if (!can_render()) + if (!can_render()) { return; + } glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); glMatrixMode(GL_MODELVIEW); @@ -223,37 +234,39 @@ void display() { glDisable(GL_LIGHTING); glBegin(GL_TRIANGLES); - /* green center */ - glColor3f(0.0, 1.0, 0.0); - DRAW_TRIANGLE(width/2, height/2, 0, size); + /* green center */ + glColor3f(0.0, 1.0, 0.0); + DRAW_TRIANGLE(width / 2, height / 2, 0, size); glEnd(); for (wm = 0; wm < MAX_WIIMOTES; ++wm) { glBegin(GL_TRIANGLES); - /* red ir */ - glColor3f(1.0, 0.0, 0.0); - for (i = 0; i < 4; ++i) { - if (wiimotes[wm]->ir.dot[i].visible) - DRAW_TRIANGLE(wiimotes[wm]->ir.dot[i].rx, wiimotes[wm]->ir.dot[i].ry, 0, size); + /* red ir */ + glColor3f(1.0, 0.0, 0.0); + for (i = 0; i < 4; ++i) { + if (wiimotes[wm]->ir.dot[i].visible) { + DRAW_TRIANGLE(wiimotes[wm]->ir.dot[i].rx, wiimotes[wm]->ir.dot[i].ry, 0, size); } + } - /* yellow corrected ir */ - glColor3f(1.0, 1.0, 0.0); - for (i = 0; i < 4; ++i) { - if (wiimotes[wm]->ir.dot[i].visible) - DRAW_TRIANGLE(wiimotes[wm]->ir.dot[i].x, wiimotes[wm]->ir.dot[i].y, 0, size); + /* yellow corrected ir */ + glColor3f(1.0, 1.0, 0.0); + for (i = 0; i < 4; ++i) { + if (wiimotes[wm]->ir.dot[i].visible) { + DRAW_TRIANGLE(wiimotes[wm]->ir.dot[i].x, wiimotes[wm]->ir.dot[i].y, 0, size); } + } - /* blue cursor */ - glColor3f(0.0, 0.0, 1.0); - DRAW_TRIANGLE(wiimotes[wm]->ir.x, wiimotes[wm]->ir.y-size, 0, size); + /* blue cursor */ + glColor3f(0.0, 0.0, 1.0); + DRAW_TRIANGLE(wiimotes[wm]->ir.x, wiimotes[wm]->ir.y - size, 0, size); glEnd(); } } else { /* draw the teapot */ gluLookAt(0.0, 0.0, -5.0, - 0.0, 0.0, 0.0, - 0.0, 1.0, 0.0); + 0.0, 0.0, 0.0, + 0.0, 1.0, 0.0); glEnable(GL_LIGHTING); glEnable(GL_LIGHT0); @@ -300,8 +313,9 @@ void resize_window(GLint new_width, GLint new_height) { width = new_width; height = new_height; - if (new_height == 0) + if (new_height == 0) { new_height = 1; + } SDL_SetVideoMode(width, height, 16, SDL_RESIZABLE | SDL_OPENGL); @@ -310,10 +324,11 @@ void resize_window(GLint new_width, GLint new_height) { glMatrixMode(GL_PROJECTION); glLoadIdentity(); - if (render_mode == IR) + if (render_mode == IR) { gluOrtho2D(0, width, height, 0); - else - gluPerspective(60.0f, (float)new_width/(float)new_height, 0.1f, 100.0f); + } else { + gluPerspective(60.0f, (float)new_width / (float)new_height, 0.1f, 100.0f); + } glMatrixMode(GL_MODELVIEW); glLoadIdentity(); @@ -321,8 +336,9 @@ void resize_window(GLint new_width, GLint new_height) { width = new_width; height = new_height; - for (wm = 0; wm < MAX_WIIMOTES; ++wm) + for (wm = 0; wm < MAX_WIIMOTES; ++wm) { wiiuse_set_ir_vres(wiimotes[wm], width, height); + } } #ifndef WIN32 @@ -337,12 +353,13 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine wiimotes = wiiuse_init(MAX_WIIMOTES); found = wiiuse_find(wiimotes, MAX_WIIMOTES, 5); - if (!found) + if (!found) { return 0; + } connected = wiiuse_connect(wiimotes, MAX_WIIMOTES); - if (connected) + if (connected) { printf("Connected to %i wiimotes (of %i found).\n", connected, found); - else { + } else { printf("Failed to connect to any wiimote.\n"); return 0; } @@ -350,11 +367,11 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine wiiuse_set_leds(wiimotes[1], WIIMOTE_LED_2 | WIIMOTE_LED_4); wiiuse_rumble(wiimotes[0], 1); - #ifndef WIN32 - usleep(200000); - #else - Sleep(200); - #endif +#ifndef WIN32 + usleep(200000); +#else + Sleep(200); +#endif wiiuse_rumble(wiimotes[0], 0); @@ -379,49 +396,47 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine height = wiimotes[0]->ir.vres[1]; SDL_SetVideoMode(width, height, 16, SDL_RESIZABLE | SDL_OPENGL); - for (wm = 0; wm < MAX_WIIMOTES; ++wm) + for (wm = 0; wm < MAX_WIIMOTES; ++wm) { wiiuse_set_ir_vres(wiimotes[wm], width, height); + } /* set OpenGL stuff */ glEnable(GL_DEPTH_TEST); - glEnable(GL_LIGHTING); + glEnable(GL_LIGHTING); glEnable(GL_NORMALIZE); glEnable(GL_BLEND); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - glDepthFunc(GL_LEQUAL); - glClearColor(0, 0, 0, 0); + glDepthFunc(GL_LEQUAL); + glClearColor(0, 0, 0, 0); /* set the size of the window */ resize_window(width, height); display(); - #ifdef WIN32 - last_render = GetTickCount(); - #endif +#ifdef WIN32 + last_render = GetTickCount(); +#endif while (1) { SDL_Event event; if (SDL_PollEvent(&event)) { switch (event.type) { - case SDL_VIDEORESIZE: - { - /* resize the window */ - resize_window(event.resize.w, event.resize.h); - break; - } - case SDL_QUIT: - { - /* shutdown */ - SDL_Quit(); - wiiuse_cleanup(wiimotes, MAX_WIIMOTES); - return 0; - } - default: - { - } + case SDL_VIDEORESIZE: { + /* resize the window */ + resize_window(event.resize.w, event.resize.h); + break; + } + case SDL_QUIT: { + /* shutdown */ + SDL_Quit(); + wiiuse_cleanup(wiimotes, MAX_WIIMOTES); + return 0; + } + default: { + } } } diff --git a/example/example.c b/example/example.c index f35f907..22bed24 100644 --- a/example/example.c +++ b/example/example.c @@ -58,59 +58,85 @@ void handle_event(struct wiimote_t* wm) { printf("\n\n--- EVENT [id %i] ---\n", wm->unid); /* if a button is pressed, report it */ - if (IS_PRESSED(wm, WIIMOTE_BUTTON_A)) printf("A pressed\n"); - if (IS_PRESSED(wm, WIIMOTE_BUTTON_B)) printf("B pressed\n"); - if (IS_PRESSED(wm, WIIMOTE_BUTTON_UP)) printf("UP pressed\n"); - if (IS_PRESSED(wm, WIIMOTE_BUTTON_DOWN)) printf("DOWN pressed\n"); - if (IS_PRESSED(wm, WIIMOTE_BUTTON_LEFT)) printf("LEFT pressed\n"); - if (IS_PRESSED(wm, WIIMOTE_BUTTON_RIGHT)) printf("RIGHT pressed\n"); - if (IS_PRESSED(wm, WIIMOTE_BUTTON_MINUS)) printf("MINUS pressed\n"); - if (IS_PRESSED(wm, WIIMOTE_BUTTON_PLUS)) printf("PLUS pressed\n"); - if (IS_PRESSED(wm, WIIMOTE_BUTTON_ONE)) printf("ONE pressed\n"); - if (IS_PRESSED(wm, WIIMOTE_BUTTON_TWO)) printf("TWO pressed\n"); - if (IS_PRESSED(wm, WIIMOTE_BUTTON_HOME)) printf("HOME pressed\n"); + if (IS_PRESSED(wm, WIIMOTE_BUTTON_A)) { + printf("A pressed\n"); + } + if (IS_PRESSED(wm, WIIMOTE_BUTTON_B)) { + printf("B pressed\n"); + } + if (IS_PRESSED(wm, WIIMOTE_BUTTON_UP)) { + printf("UP pressed\n"); + } + if (IS_PRESSED(wm, WIIMOTE_BUTTON_DOWN)) { + printf("DOWN pressed\n"); + } + if (IS_PRESSED(wm, WIIMOTE_BUTTON_LEFT)) { + printf("LEFT pressed\n"); + } + if (IS_PRESSED(wm, WIIMOTE_BUTTON_RIGHT)) { + printf("RIGHT pressed\n"); + } + if (IS_PRESSED(wm, WIIMOTE_BUTTON_MINUS)) { + printf("MINUS pressed\n"); + } + if (IS_PRESSED(wm, WIIMOTE_BUTTON_PLUS)) { + printf("PLUS pressed\n"); + } + if (IS_PRESSED(wm, WIIMOTE_BUTTON_ONE)) { + printf("ONE pressed\n"); + } + if (IS_PRESSED(wm, WIIMOTE_BUTTON_TWO)) { + printf("TWO pressed\n"); + } + if (IS_PRESSED(wm, WIIMOTE_BUTTON_HOME)) { + printf("HOME pressed\n"); + } /* * Pressing minus will tell the wiimote we are no longer interested in movement. * This is useful because it saves battery power. */ - if (IS_JUST_PRESSED(wm, WIIMOTE_BUTTON_MINUS)) + if (IS_JUST_PRESSED(wm, WIIMOTE_BUTTON_MINUS)) { wiiuse_motion_sensing(wm, 0); + } /* * Pressing plus will tell the wiimote we are interested in movement. */ - if (IS_JUST_PRESSED(wm, WIIMOTE_BUTTON_PLUS)) + if (IS_JUST_PRESSED(wm, WIIMOTE_BUTTON_PLUS)) { wiiuse_motion_sensing(wm, 1); + } /* * Pressing B will toggle the rumble * * if B is pressed but is not held, toggle the rumble */ - if (IS_JUST_PRESSED(wm, WIIMOTE_BUTTON_B)) + if (IS_JUST_PRESSED(wm, WIIMOTE_BUTTON_B)) { wiiuse_toggle_rumble(wm); + } - if (IS_JUST_PRESSED(wm, WIIMOTE_BUTTON_UP)) + if (IS_JUST_PRESSED(wm, WIIMOTE_BUTTON_UP)) { wiiuse_set_ir(wm, 1); - if (IS_JUST_PRESSED(wm, WIIMOTE_BUTTON_DOWN)) + } + if (IS_JUST_PRESSED(wm, WIIMOTE_BUTTON_DOWN)) { wiiuse_set_ir(wm, 0); + } - /* - * Motion+ support - */ - if (IS_JUST_PRESSED(wm, WIIMOTE_BUTTON_ONE)) - { - if(WIIUSE_USING_EXP(wm)) - wiiuse_set_motion_plus(wm, 2); // nunchuck pass-through - else - wiiuse_set_motion_plus(wm, 1); // standalone - } + /* + * Motion+ support + */ + if (IS_JUST_PRESSED(wm, WIIMOTE_BUTTON_ONE)) { + if (WIIUSE_USING_EXP(wm)) { + wiiuse_set_motion_plus(wm, 2); // nunchuck pass-through + } else { + wiiuse_set_motion_plus(wm, 1); // standalone + } + } - if (IS_JUST_PRESSED(wm, WIIMOTE_BUTTON_TWO)) - { - wiiuse_set_motion_plus(wm, 0); // off - } + if (IS_JUST_PRESSED(wm, WIIMOTE_BUTTON_TWO)) { + wiiuse_set_motion_plus(wm, 0); // off + } /* if the accelerometer is turned on then print angles */ if (WIIUSE_USING_ACC(wm)) { @@ -131,8 +157,9 @@ void handle_event(struct wiimote_t* wm) { /* go through each of the 4 possible IR sources */ for (; i < 4; ++i) { /* check if the source is visible */ - if (wm->ir.dot[i].visible) + if (wm->ir.dot[i].visible) { printf("IR source %i: (%u, %u)\n", i, wm->ir.dot[i].x, wm->ir.dot[i].y); + } } printf("IR cursor: (%u, %u)\n", wm->ir.x, wm->ir.y); @@ -144,8 +171,12 @@ void handle_event(struct wiimote_t* wm) { /* nunchuk */ struct nunchuk_t* nc = (nunchuk_t*)&wm->exp.nunchuk; - if (IS_PRESSED(nc, NUNCHUK_BUTTON_C)) printf("Nunchuk: C pressed\n"); - if (IS_PRESSED(nc, NUNCHUK_BUTTON_Z)) printf("Nunchuk: Z pressed\n"); + if (IS_PRESSED(nc, NUNCHUK_BUTTON_C)) { + printf("Nunchuk: C pressed\n"); + } + if (IS_PRESSED(nc, NUNCHUK_BUTTON_Z)) { + printf("Nunchuk: Z pressed\n"); + } printf("nunchuk roll = %f\n", nc->orient.roll); printf("nunchuk pitch = %f\n", nc->orient.pitch); @@ -157,21 +188,51 @@ void handle_event(struct wiimote_t* wm) { /* classic controller */ struct classic_ctrl_t* cc = (classic_ctrl_t*)&wm->exp.classic; - if (IS_PRESSED(cc, CLASSIC_CTRL_BUTTON_ZL)) printf("Classic: ZL pressed\n"); - if (IS_PRESSED(cc, CLASSIC_CTRL_BUTTON_B)) printf("Classic: B pressed\n"); - if (IS_PRESSED(cc, CLASSIC_CTRL_BUTTON_Y)) printf("Classic: Y pressed\n"); - if (IS_PRESSED(cc, CLASSIC_CTRL_BUTTON_A)) printf("Classic: A pressed\n"); - if (IS_PRESSED(cc, CLASSIC_CTRL_BUTTON_X)) printf("Classic: X pressed\n"); - if (IS_PRESSED(cc, CLASSIC_CTRL_BUTTON_ZR)) printf("Classic: ZR pressed\n"); - if (IS_PRESSED(cc, CLASSIC_CTRL_BUTTON_LEFT)) printf("Classic: LEFT pressed\n"); - if (IS_PRESSED(cc, CLASSIC_CTRL_BUTTON_UP)) printf("Classic: UP pressed\n"); - if (IS_PRESSED(cc, CLASSIC_CTRL_BUTTON_RIGHT)) printf("Classic: RIGHT pressed\n"); - if (IS_PRESSED(cc, CLASSIC_CTRL_BUTTON_DOWN)) printf("Classic: DOWN pressed\n"); - if (IS_PRESSED(cc, CLASSIC_CTRL_BUTTON_FULL_L)) printf("Classic: FULL L pressed\n"); - if (IS_PRESSED(cc, CLASSIC_CTRL_BUTTON_MINUS)) printf("Classic: MINUS pressed\n"); - if (IS_PRESSED(cc, CLASSIC_CTRL_BUTTON_HOME)) printf("Classic: HOME pressed\n"); - if (IS_PRESSED(cc, CLASSIC_CTRL_BUTTON_PLUS)) printf("Classic: PLUS pressed\n"); - if (IS_PRESSED(cc, CLASSIC_CTRL_BUTTON_FULL_R)) printf("Classic: FULL R pressed\n"); + if (IS_PRESSED(cc, CLASSIC_CTRL_BUTTON_ZL)) { + printf("Classic: ZL pressed\n"); + } + if (IS_PRESSED(cc, CLASSIC_CTRL_BUTTON_B)) { + printf("Classic: B pressed\n"); + } + if (IS_PRESSED(cc, CLASSIC_CTRL_BUTTON_Y)) { + printf("Classic: Y pressed\n"); + } + if (IS_PRESSED(cc, CLASSIC_CTRL_BUTTON_A)) { + printf("Classic: A pressed\n"); + } + if (IS_PRESSED(cc, CLASSIC_CTRL_BUTTON_X)) { + printf("Classic: X pressed\n"); + } + if (IS_PRESSED(cc, CLASSIC_CTRL_BUTTON_ZR)) { + printf("Classic: ZR pressed\n"); + } + if (IS_PRESSED(cc, CLASSIC_CTRL_BUTTON_LEFT)) { + printf("Classic: LEFT pressed\n"); + } + if (IS_PRESSED(cc, CLASSIC_CTRL_BUTTON_UP)) { + printf("Classic: UP pressed\n"); + } + if (IS_PRESSED(cc, CLASSIC_CTRL_BUTTON_RIGHT)) { + printf("Classic: RIGHT pressed\n"); + } + if (IS_PRESSED(cc, CLASSIC_CTRL_BUTTON_DOWN)) { + printf("Classic: DOWN pressed\n"); + } + if (IS_PRESSED(cc, CLASSIC_CTRL_BUTTON_FULL_L)) { + printf("Classic: FULL L pressed\n"); + } + if (IS_PRESSED(cc, CLASSIC_CTRL_BUTTON_MINUS)) { + printf("Classic: MINUS pressed\n"); + } + if (IS_PRESSED(cc, CLASSIC_CTRL_BUTTON_HOME)) { + printf("Classic: HOME pressed\n"); + } + if (IS_PRESSED(cc, CLASSIC_CTRL_BUTTON_PLUS)) { + printf("Classic: PLUS pressed\n"); + } + if (IS_PRESSED(cc, CLASSIC_CTRL_BUTTON_FULL_R)) { + printf("Classic: FULL R pressed\n"); + } printf("classic L button pressed: %f\n", cc->l_shoulder); printf("classic R button pressed: %f\n", cc->r_shoulder); @@ -183,15 +244,33 @@ void handle_event(struct wiimote_t* wm) { /* guitar hero 3 guitar */ struct guitar_hero_3_t* gh3 = (guitar_hero_3_t*)&wm->exp.gh3; - if (IS_PRESSED(gh3, GUITAR_HERO_3_BUTTON_STRUM_UP)) printf("Guitar: Strum Up pressed\n"); - if (IS_PRESSED(gh3, GUITAR_HERO_3_BUTTON_STRUM_DOWN)) printf("Guitar: Strum Down pressed\n"); - if (IS_PRESSED(gh3, GUITAR_HERO_3_BUTTON_YELLOW)) printf("Guitar: Yellow pressed\n"); - if (IS_PRESSED(gh3, GUITAR_HERO_3_BUTTON_GREEN)) printf("Guitar: Green pressed\n"); - if (IS_PRESSED(gh3, GUITAR_HERO_3_BUTTON_BLUE)) printf("Guitar: Blue pressed\n"); - if (IS_PRESSED(gh3, GUITAR_HERO_3_BUTTON_RED)) printf("Guitar: Red pressed\n"); - if (IS_PRESSED(gh3, GUITAR_HERO_3_BUTTON_ORANGE)) printf("Guitar: Orange pressed\n"); - if (IS_PRESSED(gh3, GUITAR_HERO_3_BUTTON_PLUS)) printf("Guitar: Plus pressed\n"); - if (IS_PRESSED(gh3, GUITAR_HERO_3_BUTTON_MINUS)) printf("Guitar: Minus pressed\n"); + if (IS_PRESSED(gh3, GUITAR_HERO_3_BUTTON_STRUM_UP)) { + printf("Guitar: Strum Up pressed\n"); + } + if (IS_PRESSED(gh3, GUITAR_HERO_3_BUTTON_STRUM_DOWN)) { + printf("Guitar: Strum Down pressed\n"); + } + if (IS_PRESSED(gh3, GUITAR_HERO_3_BUTTON_YELLOW)) { + printf("Guitar: Yellow pressed\n"); + } + if (IS_PRESSED(gh3, GUITAR_HERO_3_BUTTON_GREEN)) { + printf("Guitar: Green pressed\n"); + } + if (IS_PRESSED(gh3, GUITAR_HERO_3_BUTTON_BLUE)) { + printf("Guitar: Blue pressed\n"); + } + if (IS_PRESSED(gh3, GUITAR_HERO_3_BUTTON_RED)) { + printf("Guitar: Red pressed\n"); + } + if (IS_PRESSED(gh3, GUITAR_HERO_3_BUTTON_ORANGE)) { + printf("Guitar: Orange pressed\n"); + } + if (IS_PRESSED(gh3, GUITAR_HERO_3_BUTTON_PLUS)) { + printf("Guitar: Plus pressed\n"); + } + if (IS_PRESSED(gh3, GUITAR_HERO_3_BUTTON_MINUS)) { + printf("Guitar: Minus pressed\n"); + } printf("Guitar whammy bar: %f\n", gh3->whammy_bar); printf("Guitar joystick angle: %f\n", gh3->js.ang); @@ -207,15 +286,14 @@ void handle_event(struct wiimote_t* wm) { /* printf("Raw: TL:%d TR:%d BL:%d BR:%d\n", wb->rtl, wb->rtr, wb->rbl, wb->rbr); */ } - if(wm->exp.type == EXP_MOTION_PLUS || - wm->exp.type == EXP_MOTION_PLUS_NUNCHUK) - { - printf("Motion+ angular rates (deg/sec): pitch:%03.2f roll:%03.2f yaw:%03.2f\n", - wm->exp.mp.angle_rate_gyro.pitch, - wm->exp.mp.angle_rate_gyro.roll, - wm->exp.mp.angle_rate_gyro.yaw); - } - } + if (wm->exp.type == EXP_MOTION_PLUS || + wm->exp.type == EXP_MOTION_PLUS_NUNCHUK) { + printf("Motion+ angular rates (deg/sec): pitch:%03.2f roll:%03.2f yaw:%03.2f\n", + wm->exp.mp.angle_rate_gyro.pitch, + wm->exp.mp.angle_rate_gyro.roll, + wm->exp.mp.angle_rate_gyro.yaw); + } +} /** * @brief Callback that handles a read event. @@ -241,8 +319,9 @@ void handle_read(struct wiimote_t* wm, byte* data, unsigned short len) { printf("\n\n--- DATA READ [wiimote id %i] ---\n", wm->unid); printf("finished read of size %i\n", len); for (; i < len; ++i) { - if (!(i%16)) + if (!(i % 16)) { printf("\n"); + } printf("%x ", data[i]); } printf("\n\n"); @@ -296,13 +375,16 @@ void test(struct wiimote_t* wm, byte* data, unsigned short len) { short any_wiimote_connected(wiimote** wm, int wiimotes) { int i; - if(!wm) return 0; - - for(i = 0; i < wiimotes; i++) { - if(wm[i] && WIIMOTE_IS_CONNECTED(wm[i])) - return 1; + if (!wm) { + return 0; } - + + for (i = 0; i < wiimotes; i++) { + if (wm[i] && WIIMOTE_IS_CONNECTED(wm[i])) { + return 1; + } + } + return 0; } @@ -337,7 +419,7 @@ int main(int argc, char** argv) { */ found = wiiuse_find(wiimotes, MAX_WIIMOTES, 5); if (!found) { - printf ("No wiimotes found.\n"); + printf("No wiimotes found.\n"); return 0; } @@ -351,9 +433,9 @@ int main(int argc, char** argv) { * This will return the number of established connections to the found wiimotes. */ connected = wiiuse_connect(wiimotes, MAX_WIIMOTES); - if (connected) + if (connected) { printf("Connected to %i wiimotes (of %i found).\n", connected, found); - else { + } else { printf("Failed to connect to any wiimote.\n"); return 0; } @@ -441,8 +523,8 @@ int main(int argc, char** argv) { * threshold values. By default they are the same * as the wiimote. */ - /* wiiuse_set_nunchuk_orient_threshold((struct nunchuk_t*)&wiimotes[i]->exp.nunchuk, 90.0f); */ - /* wiiuse_set_nunchuk_accel_threshold((struct nunchuk_t*)&wiimotes[i]->exp.nunchuk, 100); */ + /* wiiuse_set_nunchuk_orient_threshold((struct nunchuk_t*)&wiimotes[i]->exp.nunchuk, 90.0f); */ + /* wiiuse_set_nunchuk_accel_threshold((struct nunchuk_t*)&wiimotes[i]->exp.nunchuk, 100); */ printf("Nunchuk inserted.\n"); break; @@ -460,15 +542,15 @@ int main(int argc, char** argv) { printf("Guitar Hero 3 controller inserted.\n"); break; - case WIIUSE_MOTION_PLUS_ACTIVATED: - printf("Motion+ was activated\n"); - break; + case WIIUSE_MOTION_PLUS_ACTIVATED: + printf("Motion+ was activated\n"); + break; case WIIUSE_NUNCHUK_REMOVED: case WIIUSE_CLASSIC_CTRL_REMOVED: case WIIUSE_GUITAR_HERO_3_CTRL_REMOVED: case WIIUSE_WII_BOARD_CTRL_REMOVED: - case WIIUSE_MOTION_PLUS_REMOVED: + case WIIUSE_MOTION_PLUS_REMOVED: /* some expansion was removed */ handle_ctrl_status(wiimotes[i]); printf("An expansion was removed.\n");