diff options
| author | IOhannes m zmölnig <zmoelnig@users.sourceforge.net> | 2010-05-14 07:49:55 +0000 |
|---|---|---|
| committer | IOhannes m zmölnig <zmoelnig@users.sourceforge.net> | 2010-05-14 07:49:55 +0000 |
| commit | 1478947b6264ccd24b892d135358484fe4cbd296 (patch) | |
| tree | bb8de6ca0a7a78824c444bf354002599813ed0c3 | |
| parent | 05921ecae66e9357add9138d582d9788687ebbd8 (diff) | |
protect motionplus and nunchuk against out-of-date libcwiid headers
svn path=/trunk/externals/hardware/wiimote/; revision=13543
| -rw-r--r-- | wiimote.c | 11 |
1 files changed, 9 insertions, 2 deletions
@@ -51,8 +51,12 @@ typedef struct _wiimote int reportMode; struct acc_cal acc_cal; /* calibration for built-in accelerometer */ +#ifdef CWIID_RPT_NUNCHUK struct acc_cal nc_acc_cal; /* calibration for nunchuk accelerometer */ - struct balance_cal balance_cal; +#endif +#ifdef CWIID_RPT_BALANCE + struct balance_cal balance_cal; +#endif // outlets: t_outlet *outlet_data; @@ -319,6 +323,7 @@ static void wiimote_cwiid_ir(t_wiimote *x, struct cwiid_ir_mesg *mesg) } } +#ifdef CWIID_RPT_NUNCHUK static void wiimote_cwiid_nunchuk(t_wiimote *x, struct cwiid_nunchuk_mesg *mesg) { t_atom ap[4]; @@ -336,7 +341,6 @@ static void wiimote_cwiid_nunchuk(t_wiimote *x, struct cwiid_nunchuk_mesg *mesg) roll *= -1; pitch = atan(a_y/a_z*cos(roll)); */ - if (mesg->buttons & CWIID_NUNCHUK_BTN_C) {} if (mesg->buttons & CWIID_NUNCHUK_BTN_Z) {} /* nunchuk button */ @@ -358,6 +362,7 @@ static void wiimote_cwiid_nunchuk(t_wiimote *x, struct cwiid_nunchuk_mesg *mesg) SETFLOAT (ap+2, mesg->stick[CWIID_Y]); outlet_anything(x->outlet_data, gensym("nunchuk"), 3, ap); } +#endif #ifdef CWIID_RPT_CLASSIC static void wiimote_cwiid_classic(t_wiimote *x, struct cwiid_classic_mesg *mesg) @@ -843,6 +848,7 @@ static void wiimote_report(t_wiimote*x, t_symbol*s, int onoff) pd_error(x, "unknown report mode '%s'", s->s_name); } +#ifdef CWIID_RPT_MOTIONPLUS if(CWIID_RPT_MOTIONPLUS==flag) { if(x->connected) { int err=0; @@ -856,6 +862,7 @@ static void wiimote_report(t_wiimote*x, t_symbol*s, int onoff) } } } +#endif if(flag!=-1) { if(onoff) { |