rik/libwiiuse
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

De-duplicate handling of wiimote accelerometer data.

Browse Source
This commit is contained in:
Ryan Pavlik
2012-06-28 17:24:41 -05:00
parent 300c91398d
commit 9124fa7cc7
1 changed files with 22 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/events.c
View File

@@ -294,6 +294,24 @@ static void clear_dirty_reads(struct wiimote_t* wm) {
} }
} }
/**
* @brief Handle accel data in a wiimote message.
*
* @param wm Pointer to a wiimote_t structure.
* @param msg The message specified in the event packet.
*/
static void handle_wm_accel(struct wiimote_t* wm, byte* msg) {
wm->accel.x = msg[2];
wm->accel.y = msg[3];
wm->accel.z = msg[4];
/* calculate the remote orientation */
calculate_orientation(&wm->accel_calib, &wm->accel, &wm->orient, WIIMOTE_IS_FLAG_SET(wm, WIIUSE_SMOOTHING));
/* calculate the gforces on each axis */
calculate_gforce(&wm->accel_calib, &wm->accel, &wm->gforce);
}
/** /**
* @brief Analyze the event that occurred on a wiimote. * @brief Analyze the event that occurred on a wiimote.
@@ -319,15 +337,7 @@ void propagate_event(struct wiimote_t* wm, byte event, byte* msg) {
/* button - motion */ /* button - motion */
wiiuse_pressed_buttons(wm, msg); wiiuse_pressed_buttons(wm, msg);
wm->accel.x = msg[2]; handle_wm_accel(wm, msg);
wm->accel.y = msg[3];
wm->accel.z = msg[4];
/* calculate the remote orientation */
calculate_orientation(&wm->accel_calib, &wm->accel, &wm->orient, WIIMOTE_IS_FLAG_SET(wm, WIIUSE_SMOOTHING));
/* calculate the gforces on each axis */
calculate_gforce(&wm->accel_calib, &wm->accel, &wm->gforce);
break; break;
} }
@@ -360,12 +370,7 @@ void propagate_event(struct wiimote_t* wm, byte event, byte* msg) {
/* button - motion - expansion */ /* button - motion - expansion */
wiiuse_pressed_buttons(wm, msg); wiiuse_pressed_buttons(wm, msg);
wm->accel.x = msg[2]; handle_wm_accel(wm, msg);
wm->accel.y = msg[3];
wm->accel.z = msg[4];
calculate_orientation(&wm->accel_calib, &wm->accel, &wm->orient, WIIMOTE_IS_FLAG_SET(wm, WIIUSE_SMOOTHING));
calculate_gforce(&wm->accel_calib, &wm->accel, &wm->gforce);
handle_expansion(wm, msg+5); handle_expansion(wm, msg+5);
@@ -376,12 +381,7 @@ void propagate_event(struct wiimote_t* wm, byte event, byte* msg) {
/* button - motion - ir */ /* button - motion - ir */
wiiuse_pressed_buttons(wm, msg); wiiuse_pressed_buttons(wm, msg);
wm->accel.x = msg[2]; handle_wm_accel(wm, msg);
wm->accel.y = msg[3];
wm->accel.z = msg[4];
calculate_orientation(&wm->accel_calib, &wm->accel, &wm->orient, WIIMOTE_IS_FLAG_SET(wm, WIIUSE_SMOOTHING));
calculate_gforce(&wm->accel_calib, &wm->accel, &wm->gforce);
/* ir */ /* ir */
calculate_extended_ir(wm, msg+5); calculate_extended_ir(wm, msg+5);
@@ -404,12 +404,7 @@ void propagate_event(struct wiimote_t* wm, byte event, byte* msg) {
/* button - motion - ir - expansion */ /* button - motion - ir - expansion */
wiiuse_pressed_buttons(wm, msg); wiiuse_pressed_buttons(wm, msg);
wm->accel.x = msg[2]; handle_wm_accel(wm, msg);
wm->accel.y = msg[3];
wm->accel.z = msg[4];
calculate_orientation(&wm->accel_calib, &wm->accel, &wm->orient, WIIMOTE_IS_FLAG_SET(wm, WIIUSE_SMOOTHING));
calculate_gforce(&wm->accel_calib, &wm->accel, &wm->gforce);
handle_expansion(wm, msg+15); handle_expansion(wm, msg+15);