Skip to content

Commit 88149c9

Browse files
committed
Offset Nunchuk cal_g by cal_zero
1 parent bd28e19 commit 88149c9

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

wiiuse/nunchuk.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,11 @@ int nunchuk_handshake(struct wiimote_t *wm,struct nunchuk_t *nc,ubyte *data,uwor
5555
nc->accel_calib.cal_zero.x = (data[offset + 0]<<2)|((data[offset + 3]>>4)&3);
5656
nc->accel_calib.cal_zero.y = (data[offset + 1]<<2)|((data[offset + 3]>>2)&3);
5757
nc->accel_calib.cal_zero.z = (data[offset + 2]<<2)|(data[offset + 3]&3);
58-
nc->accel_calib.cal_g.x = (data[offset + 4]<<2)|((data[offset + 7]>>4)&3);
59-
nc->accel_calib.cal_g.y = (data[offset + 5]<<2)|((data[offset + 7]>>2)&3);
60-
nc->accel_calib.cal_g.z = (data[offset + 6]<<2)|(data[offset + 7]&3);
58+
59+
nc->accel_calib.cal_g.x = (((data[offset + 4]<<2)|((data[offset + 7]>>4)&3)) - nc->accel_calib.cal_zero.x);
60+
nc->accel_calib.cal_g.y = (((data[offset + 5]<<2)|((data[offset + 7]>>2)&3)) - nc->accel_calib.cal_zero.y);
61+
nc->accel_calib.cal_g.z = (((data[offset + 6]<<2)|(data[offset + 7]&3)) - nc->accel_calib.cal_zero.z);
62+
6163
nc->js.max.x = data[offset + 8];
6264
nc->js.min.x = data[offset + 9];
6365
nc->js.center.x = data[offset + 10];

0 commit comments

Comments
 (0)