More fWiine merging

Conflicts:

	src/events.c
	src/motion_plus.c
	src/wiiuse.h
This commit is contained in:
Jan Ciger
2011-09-14 08:59:48 -05:00
committed by Ryan Pavlik
parent 541cbb5156
commit 9b5ef23276
6 changed files with 41 additions and 24 deletions

View File

@@ -45,7 +45,10 @@ extern "C" {
/** @{ */
void motion_plus_disconnected(struct motion_plus_t* mp);
void motion_plus_event(struct motion_plus_t* mp, byte* msg);
void motion_plus_event(struct motion_plus_t* mp, int exp_type, byte* msg);
void wiiuse_motion_plus_handshake(struct wiimote_t *wm, byte *data,unsigned short len);
/** @} */
#ifdef __cplusplus