allow to enable the use of cwiid_open(dev,dongle,flags) by use of defines

svn path=/trunk/externals/hardware/wiimote/; revision=12697

1 files changed, 373 insertions, 374 deletions

diff --git a/wiimote.c b/wiimote.c
index ffcb765..6044dfa 100644
--- a/wiimote.c
+++ b/wiimote.c
@@ -21,7 +21,7 @@
 // ===================================================================
 
 //  ChangeLog:
-//  2008-04-14 Florian Krebs 
+//  2008-04-14 Florian Krebs
 //  * adapt wiimote external for the actual version of cwiid (0.6.00)
 //  2009-09-14 IOhannes m zmölnig
 //    * made it compile without private cwiid-headers
@@ -35,27 +35,27 @@
 #include <math.h>
 #include <cwiid.h>
 
-#define PI	3.14159265358979323
+#define PI   3.14159265358979323
 
 // class and struct declarations for wiimote pd external:
 static t_class *wiimote_class;
 typedef struct _wiimote
 {
-	t_object x_obj; // standard pd object (must be first in struct)
-	
-	cwiid_wiimote_t *wiimote; // individual wiimote handle per pd object, represented in libcwiid
+   t_object x_obj; // standard pd object (must be first in struct)
 
-	t_float connected;
-	int wiimoteID;
+   cwiid_wiimote_t *wiimote; // individual wiimote handle per pd object, represented in libcwiid
 
-	int reportMode;
+   t_float connected;
+   int wiimoteID;
 
-	struct acc_cal acc_cal; /* calibration for built-in accelerometer */
-	struct acc_cal nc_acc_cal;  /* calibration for nunchuk accelerometer */
+   int reportMode;
+
+   struct acc_cal acc_cal; /* calibration for built-in accelerometer */
+   struct acc_cal nc_acc_cal;  /* calibration for nunchuk accelerometer */
   struct balance_cal balance_cal;
 
-	// outlets:
-	t_outlet *outlet_data;	
+   // outlets:
+   t_outlet *outlet_data;
 
   struct timespec*basetime;
   double baselogicaltime;
@@ -78,7 +78,7 @@ static int addWiimoteObject(t_wiimote*x, int id) {
   t_wiimoteList*newentry=NULL;
   if(NULL!=wl) {
     while(wl->next) {
-      
+
       if(wl->x == x) {
         pd_error(x, "[wiimote]: already bound to Wii%02d", wl->id);
         return 0;
@@ -98,7 +98,7 @@ static int addWiimoteObject(t_wiimote*x, int id) {
 
   if(wl)
     wl->next=newentry;
-  else 
+  else
     g_wiimoteList=newentry;
 
   return 1;
@@ -148,16 +148,16 @@ static void removeWiimoteObject(const t_wiimote*x) {
 
 
 static void print_timestamp(struct timespec*timestamp, struct timespec*reference) {
-	double t0=timestamp->tv_sec*1000. + (timestamp->tv_nsec) / 1000000.;
-	double t1=0;
-	double t=0;
-	if(reference) {
-		t1=reference->tv_sec*1000. + (reference->tv_nsec) / 1000000.;
-	}
+   double t0=timestamp->tv_sec*1000. + (timestamp->tv_nsec) / 1000000.;
+   double t1=0;
+   double t=0;
+   if(reference) {
+      t1=reference->tv_sec*1000. + (reference->tv_nsec) / 1000000.;
+   }
 
-	t=t0-t1;
+   t=t0-t1;
 
-	post("timestamp: %f = %f-%f", (t), t0, t1);
+   post("timestamp: %f = %f-%f", (t), t0, t1);
 }
 
 static void wiimote_setbasetime(t_wiimote*x) {
@@ -189,7 +189,7 @@ static double wiimote_timestamp2logicaltime(t_wiimote*x, struct timespec*timesta
 
 #if 0
   print_timestamp(timestamp, x->basetime);
-  post("logical time: %f = %f - %f", clock_gettimesince(x->baselogicaltime), now, x->baselogicaltime); 
+  post("logical time: %f = %f - %f", clock_gettimesince(x->baselogicaltime), now, x->baselogicaltime);
 #endif
   //post("diff = %f = %f - %f", realdelay-pddelay, realdelay, pddelay);
 
@@ -205,7 +205,7 @@ typedef struct _wiimoteMsgList {
   union cwiid_mesg*mesg;
   double timestamp;
   t_wiimote*x;
-  struct _wiimoteMsgList*next; 
+  struct _wiimoteMsgList*next;
 } t_wiimoteMsgList;
 
 t_wiimoteMsgList*g_wiimoteMsgList=NULL;
@@ -214,7 +214,7 @@ static void addWiimsg(union cwiid_mesg mesg, double timestamp)
 {
 
 }
-	
+
 
 
 
@@ -222,21 +222,21 @@ static void addWiimsg(union cwiid_mesg mesg, double timestamp)
 // ==============================================================
 static void wiimote_debug(t_wiimote *x)
 {
-	post("\n======================");
-	if (x->connected) post("Wiimote (id: %d) is connected.", x->wiimoteID);
-	else post("Wiimote (id: %d) is NOT connected.", x->wiimoteID);
+   post("\n======================");
+   if (x->connected) post("Wiimote (id: %d) is connected.", x->wiimoteID);
+   else post("Wiimote (id: %d) is NOT connected.", x->wiimoteID);
   post("acceleration: %s", (x->reportMode & CWIID_RPT_ACC)?"ON":"OFF");
   post("IR: %s", (x->reportMode & CWIID_RPT_IR)?"ON":"OFF");
   post("extensions: %s",  (x->reportMode & CWIID_RPT_EXT)?"ON":"OFF");
-	post("");
-	post("Accelerometer calibration: zero=(%d,%d,%d) one=(%d,%d,%d)",				 
-			 x->acc_cal.zero[CWIID_X], x->acc_cal.zero[CWIID_Y], x->acc_cal.zero[CWIID_Z],
-			 x->acc_cal.one [CWIID_X], x->acc_cal.one [CWIID_Y], x->acc_cal.one [CWIID_Z]);
-	post("Nunchuk calibration:      zero=(%d,%d,%d) one=(%d,%d,%d)",
-			 x->nc_acc_cal.zero[CWIID_X], x->nc_acc_cal.zero[CWIID_Y], x->nc_acc_cal.zero[CWIID_Z],
-			 x->nc_acc_cal.one [CWIID_X], x->nc_acc_cal.one [CWIID_Y], x->nc_acc_cal.one [CWIID_Z]);
-			 
-	
+   post("");
+   post("Accelerometer calibration: zero=(%d,%d,%d) one=(%d,%d,%d)",
+          x->acc_cal.zero[CWIID_X], x->acc_cal.zero[CWIID_Y], x->acc_cal.zero[CWIID_Z],
+          x->acc_cal.one [CWIID_X], x->acc_cal.one [CWIID_Y], x->acc_cal.one [CWIID_Z]);
+   post("Nunchuk calibration:      zero=(%d,%d,%d) one=(%d,%d,%d)",
+          x->nc_acc_cal.zero[CWIID_X], x->nc_acc_cal.zero[CWIID_Y], x->nc_acc_cal.zero[CWIID_Z],
+          x->nc_acc_cal.one [CWIID_X], x->nc_acc_cal.one [CWIID_Y], x->nc_acc_cal.one [CWIID_Z]);
+
+
 
 }
 
@@ -244,139 +244,139 @@ static void wiimote_debug(t_wiimote *x)
 
 static void wiimote_cwiid_battery(t_wiimote *x, int battery)
 {
-	t_atom ap[1];
-	t_float bat=(1.f*battery) / CWIID_BATTERY_MAX;
+   t_atom ap[1];
+   t_float bat=(1.f*battery) / CWIID_BATTERY_MAX;
 
-	SETFLOAT(ap+0, bat);
+   SETFLOAT(ap+0, bat);
 
-	outlet_anything(x->outlet_data, gensym("battery"), 1, ap);
+   outlet_anything(x->outlet_data, gensym("battery"), 1, ap);
 }
 
 // Button handler:
 static void wiimote_cwiid_btn(t_wiimote *x, struct cwiid_btn_mesg *mesg)
 {
-	t_atom ap[2];
-	SETFLOAT(ap+0, (mesg->buttons & 0xFF00)>>8);
-	SETFLOAT(ap+1, mesg->buttons & 0x00FF);
-	outlet_anything(x->outlet_data, gensym("button"), 2, ap);
+   t_atom ap[2];
+   SETFLOAT(ap+0, (mesg->buttons & 0xFF00)>>8);
+   SETFLOAT(ap+1, mesg->buttons & 0x00FF);
+   outlet_anything(x->outlet_data, gensym("button"), 2, ap);
 }
 
 
 static void wiimote_cwiid_acc(t_wiimote *x, struct cwiid_acc_mesg *mesg)
 {
-	double a_x, a_y, a_z;
-	t_atom ap[3];
-		
-	a_x = ((double)mesg->acc[CWIID_X] - x->acc_cal.zero[CWIID_X]) / (x->acc_cal.one[CWIID_X] - x->acc_cal.zero[CWIID_X]);
-	a_y = ((double)mesg->acc[CWIID_Y] - x->acc_cal.zero[CWIID_Y]) / (x->acc_cal.one[CWIID_Y] - x->acc_cal.zero[CWIID_Y]);
-	a_z = ((double)mesg->acc[CWIID_Z] - x->acc_cal.zero[CWIID_Z]) / (x->acc_cal.one[CWIID_Z] - x->acc_cal.zero[CWIID_Z]);
-		
-	/*
-		double a, roll, pitch;
-		a = sqrt(pow(a_x,2)+pow(a_y,2)+pow(a_z,2));
-		roll = atan(a_x/a_z);
-		if (a_z <= 0.0) roll += PI * ((a_x > 0.0) ? 1 : -1);
-		roll *= -1;
-		pitch = atan(a_y/a_z*cos(roll));
-	*/
-
-		
-	SETFLOAT(ap+0, a_x);
-	SETFLOAT(ap+1, a_y);
-	SETFLOAT(ap+2, a_z);
-	outlet_anything(x->outlet_data, gensym("acceleration"), 3, ap);
-	
+   double a_x, a_y, a_z;
+   t_atom ap[3];
+
+   a_x = ((double)mesg->acc[CWIID_X] - x->acc_cal.zero[CWIID_X]) / (x->acc_cal.one[CWIID_X] - x->acc_cal.zero[CWIID_X]);
+   a_y = ((double)mesg->acc[CWIID_Y] - x->acc_cal.zero[CWIID_Y]) / (x->acc_cal.one[CWIID_Y] - x->acc_cal.zero[CWIID_Y]);
+   a_z = ((double)mesg->acc[CWIID_Z] - x->acc_cal.zero[CWIID_Z]) / (x->acc_cal.one[CWIID_Z] - x->acc_cal.zero[CWIID_Z]);
+
+   /*
+      double a, roll, pitch;
+      a = sqrt(pow(a_x,2)+pow(a_y,2)+pow(a_z,2));
+      roll = atan(a_x/a_z);
+      if (a_z <= 0.0) roll += PI * ((a_x > 0.0) ? 1 : -1);
+      roll *= -1;
+      pitch = atan(a_y/a_z*cos(roll));
+   */
+
+
+   SETFLOAT(ap+0, a_x);
+   SETFLOAT(ap+1, a_y);
+   SETFLOAT(ap+2, a_z);
+   outlet_anything(x->outlet_data, gensym("acceleration"), 3, ap);
+
 }
 
 static void wiimote_cwiid_ir(t_wiimote *x, struct cwiid_ir_mesg *mesg)
 {
-	unsigned int i;
-
-	//post("IR (valid,x,y,size) #%d: %d %d %d %d", i, data->ir_data.ir_src[i].valid, data->ir_data.ir_src[i].x, data->ir_data.ir_src[i].y, data->ir_data.ir_src[i].size);
-	for (i=0; i<CWIID_IR_SRC_COUNT; i++){		
-		if (mesg->src[i].valid) {
-			t_atom ap[4];
-			SETFLOAT(ap+0, i);
-			SETFLOAT(ap+1, mesg->src[i].pos[CWIID_X]);
-			SETFLOAT(ap+2, mesg->src[i].pos[CWIID_Y]);
-			SETFLOAT(ap+3, mesg->src[i].size);
-			outlet_anything(x->outlet_data, gensym("ir"), 4, ap);
-		}
-	}
+   unsigned int i;
+
+   //post("IR (valid,x,y,size) #%d: %d %d %d %d", i, data->ir_data.ir_src[i].valid, data->ir_data.ir_src[i].x, data->ir_data.ir_src[i].y, data->ir_data.ir_src[i].size);
+   for (i=0; i<CWIID_IR_SRC_COUNT; i++){
+      if (mesg->src[i].valid) {
+         t_atom ap[4];
+         SETFLOAT(ap+0, i);
+         SETFLOAT(ap+1, mesg->src[i].pos[CWIID_X]);
+         SETFLOAT(ap+2, mesg->src[i].pos[CWIID_Y]);
+         SETFLOAT(ap+3, mesg->src[i].size);
+         outlet_anything(x->outlet_data, gensym("ir"), 4, ap);
+      }
+   }
 }
 
 static void wiimote_cwiid_nunchuk(t_wiimote *x, struct cwiid_nunchuk_mesg *mesg)
 {
-	t_atom ap[4];
-	double a_x, a_y, a_z;
-
-	a_x = ((double)mesg->acc[CWIID_X] - x->nc_acc_cal.zero[CWIID_X]) / (x->nc_acc_cal.one[CWIID_X] - x->nc_acc_cal.zero[CWIID_X]);
-	a_y = ((double)mesg->acc[CWIID_Y] - x->nc_acc_cal.zero[CWIID_Y]) / (x->nc_acc_cal.one[CWIID_Y] - x->nc_acc_cal.zero[CWIID_Y]);
-	a_z = ((double)mesg->acc[CWIID_Z] - x->nc_acc_cal.zero[CWIID_Z]) / (x->nc_acc_cal.one[CWIID_Z] - x->nc_acc_cal.zero[CWIID_Z]);
-
-	/*
-	double a, roll, pitch;
-	a = sqrt(pow(a_x,2)+pow(a_y,2)+pow(a_z,2));
-	roll = atan(a_x/a_z);
-	if (a_z <= 0.0) roll += PI * ((a_x > 0.0) ? 1 : -1);
-	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 */
-	SETSYMBOL(ap+0, gensym("button"));
-	SETFLOAT (ap+1, (t_float)mesg->buttons);
-	outlet_anything(x->outlet_data, gensym("nunchuk"), 2, ap);
-	
-
-	/* nunchuk button */
-	SETSYMBOL(ap+0, gensym("acceleration"));
-	SETFLOAT (ap+1, a_x);
-	SETFLOAT (ap+2, a_y);
-	SETFLOAT (ap+3, a_z);
-	outlet_anything(x->outlet_data, gensym("nunchuk"), 4, ap);
-	
-	/* nunchuk button */
-	SETSYMBOL(ap+0, gensym("stick"));
-	SETFLOAT (ap+1, mesg->stick[CWIID_X]);
-	SETFLOAT (ap+2, mesg->stick[CWIID_Y]);
-	outlet_anything(x->outlet_data, gensym("nunchuk"), 3, ap);
+   t_atom ap[4];
+   double a_x, a_y, a_z;
+
+   a_x = ((double)mesg->acc[CWIID_X] - x->nc_acc_cal.zero[CWIID_X]) / (x->nc_acc_cal.one[CWIID_X] - x->nc_acc_cal.zero[CWIID_X]);
+   a_y = ((double)mesg->acc[CWIID_Y] - x->nc_acc_cal.zero[CWIID_Y]) / (x->nc_acc_cal.one[CWIID_Y] - x->nc_acc_cal.zero[CWIID_Y]);
+   a_z = ((double)mesg->acc[CWIID_Z] - x->nc_acc_cal.zero[CWIID_Z]) / (x->nc_acc_cal.one[CWIID_Z] - x->nc_acc_cal.zero[CWIID_Z]);
+
+   /*
+   double a, roll, pitch;
+   a = sqrt(pow(a_x,2)+pow(a_y,2)+pow(a_z,2));
+   roll = atan(a_x/a_z);
+   if (a_z <= 0.0) roll += PI * ((a_x > 0.0) ? 1 : -1);
+   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 */
+   SETSYMBOL(ap+0, gensym("button"));
+   SETFLOAT (ap+1, (t_float)mesg->buttons);
+   outlet_anything(x->outlet_data, gensym("nunchuk"), 2, ap);
+
+
+   /* nunchuk button */
+   SETSYMBOL(ap+0, gensym("acceleration"));
+   SETFLOAT (ap+1, a_x);
+   SETFLOAT (ap+2, a_y);
+   SETFLOAT (ap+3, a_z);
+   outlet_anything(x->outlet_data, gensym("nunchuk"), 4, ap);
+
+   /* nunchuk button */
+   SETSYMBOL(ap+0, gensym("stick"));
+   SETFLOAT (ap+1, mesg->stick[CWIID_X]);
+   SETFLOAT (ap+2, mesg->stick[CWIID_Y]);
+   outlet_anything(x->outlet_data, gensym("nunchuk"), 3, ap);
 }
 
 #ifdef CWIID_RPT_CLASSIC
 static void wiimote_cwiid_classic(t_wiimote *x, struct cwiid_classic_mesg *mesg)
 {
-	t_atom ap[3];
+   t_atom ap[3];
 
-	//	t_float scale = 1.f / ((uint16_t)0xFFFF);
+   //   t_float scale = 1.f / ((uint16_t)0xFFFF);
 
-	SETSYMBOL(ap+0, gensym("left_stick"));
-	SETFLOAT (ap+1, mesg->l_stick[CWIID_X]);
-	SETFLOAT (ap+2, mesg->l_stick[CWIID_Y]);
-	outlet_anything(x->outlet_data, gensym("classic"), 3, ap);
+   SETSYMBOL(ap+0, gensym("left_stick"));
+   SETFLOAT (ap+1, mesg->l_stick[CWIID_X]);
+   SETFLOAT (ap+2, mesg->l_stick[CWIID_Y]);
+   outlet_anything(x->outlet_data, gensym("classic"), 3, ap);
 
-	SETSYMBOL(ap+0, gensym("right_stick"));
-	SETFLOAT (ap+1, mesg->r_stick[CWIID_X]);
-	SETFLOAT (ap+2, mesg->r_stick[CWIID_Y]);
-	outlet_anything(x->outlet_data, gensym("classic"), 3, ap);
+   SETSYMBOL(ap+0, gensym("right_stick"));
+   SETFLOAT (ap+1, mesg->r_stick[CWIID_X]);
+   SETFLOAT (ap+2, mesg->r_stick[CWIID_Y]);
+   outlet_anything(x->outlet_data, gensym("classic"), 3, ap);
 
 
-	SETSYMBOL(ap+0, gensym("left"));
-	SETFLOAT (ap+1, mesg->l);
-	outlet_anything(x->outlet_data, gensym("classic"), 2, ap);
+   SETSYMBOL(ap+0, gensym("left"));
+   SETFLOAT (ap+1, mesg->l);
+   outlet_anything(x->outlet_data, gensym("classic"), 2, ap);
 
-	SETSYMBOL(ap+0, gensym("right"));
-	SETFLOAT (ap+1, mesg->r);
-	outlet_anything(x->outlet_data, gensym("classic"), 2, ap);
+   SETSYMBOL(ap+0, gensym("right"));
+   SETFLOAT (ap+1, mesg->r);
+   outlet_anything(x->outlet_data, gensym("classic"), 2, ap);
 
 
-	SETSYMBOL(ap+0, gensym("button"));
-	SETFLOAT(ap+1, (mesg->buttons & 0xFF00)>>8);
-	SETFLOAT(ap+2, mesg->buttons & 0x00FF);
+   SETSYMBOL(ap+0, gensym("button"));
+   SETFLOAT(ap+1, (mesg->buttons & 0xFF00)>>8);
+   SETFLOAT(ap+2, mesg->buttons & 0x00FF);
 
-	outlet_anything(x->outlet_data, gensym("classic"), 3, ap);
+   outlet_anything(x->outlet_data, gensym("classic"), 3, ap);
 
 
 }
@@ -392,7 +392,7 @@ static void wiimote_cwiid_balance_output(t_wiimote *x, t_symbol*s, uint16_t valu
     17kg per sensor is 68kg, 1/2 of the advertised Japanese weight limit.
   */
 #define WIIMOTE_BALANCE_CALWEIGHT 1700.f
-	t_atom ap[2];
+   t_atom ap[2];
 
   t_float weight=0;
   t_float falue=value;
@@ -405,141 +405,141 @@ static void wiimote_cwiid_balance_output(t_wiimote *x, t_symbol*s, uint16_t valu
   } else {
     weight=falue;
   }
-	SETSYMBOL(ap+0, s);
-	SETFLOAT (ap+1, weight);
-	outlet_anything(x->outlet_data, gensym("balance"), 2, ap);
+   SETSYMBOL(ap+0, s);
+   SETFLOAT (ap+1, weight);
+   outlet_anything(x->outlet_data, gensym("balance"), 2, ap);
 }
 
 static void wiimote_cwiid_balance(t_wiimote *x, struct cwiid_balance_mesg *mesg)
 {
-	wiimote_cwiid_balance_output(x, gensym("right_top"),    mesg->right_top,    x->balance_cal.right_top);
-	wiimote_cwiid_balance_output(x, gensym("right_bottom"), mesg->right_bottom, x->balance_cal.right_bottom);
-	wiimote_cwiid_balance_output(x, gensym("left_top"),     mesg->left_top,     x->balance_cal.left_top);
-	wiimote_cwiid_balance_output(x, gensym("left_bottom"),  mesg->left_bottom,  x->balance_cal.left_bottom);
+   wiimote_cwiid_balance_output(x, gensym("right_top"),    mesg->right_top,    x->balance_cal.right_top);
+   wiimote_cwiid_balance_output(x, gensym("right_bottom"), mesg->right_bottom, x->balance_cal.right_bottom);
+   wiimote_cwiid_balance_output(x, gensym("left_top"),     mesg->left_top,     x->balance_cal.left_top);
+   wiimote_cwiid_balance_output(x, gensym("left_bottom"),  mesg->left_bottom,  x->balance_cal.left_bottom);
 }
 #endif
 
 #ifdef CWIID_RPT_MOTIONPLUS
 static void wiimote_cwiid_motionplus(t_wiimote *x, struct cwiid_motionplus_mesg *mesg)
 {
-	t_atom ap[4];
-	t_float scale = 1.f;// / ((uint16_t)0xFFFF);
+   t_atom ap[4];
+   t_float scale = 1.f;// / ((uint16_t)0xFFFF);
 
-	t_float phi  = scale*mesg->angle_rate[CWIID_PHI];
-	t_float theta= scale*mesg->angle_rate[CWIID_THETA];
-	t_float psi  = scale*mesg->angle_rate[CWIID_PSI];
+   t_float phi  = scale*mesg->angle_rate[CWIID_PHI];
+   t_float theta= scale*mesg->angle_rate[CWIID_THETA];
+   t_float psi  = scale*mesg->angle_rate[CWIID_PSI];
 
-	t_float phi_speed   = 1.;
-	t_float theta_speed = 1.;
-	t_float psi_speed   = 1.;
+   t_float phi_speed   = 1.;
+   t_float theta_speed = 1.;
+   t_float psi_speed   = 1.;
 
 
-	SETSYMBOL(ap+0, gensym("low_speed"));
+   SETSYMBOL(ap+0, gensym("low_speed"));
 #ifdef HAVE_CWIID_MOTIONPLUS_LOWSPEED
-	phi_speed  = mesg->low_speed[CWIID_PHI];
-	theta_speed= mesg->low_speed[CWIID_THETA];
-	psi_speed  = mesg->low_speed[CWIID_PSI];
+   phi_speed  = mesg->low_speed[CWIID_PHI];
+   theta_speed= mesg->low_speed[CWIID_THETA];
+   psi_speed  = mesg->low_speed[CWIID_PSI];
 #endif
-	SETFLOAT (ap+1, phi_speed);
-	SETFLOAT (ap+2, theta_speed);
-	SETFLOAT (ap+3, psi_speed);
-	outlet_anything(x->outlet_data, gensym("motionplus"), 4, ap);
+   SETFLOAT (ap+1, phi_speed);
+   SETFLOAT (ap+2, theta_speed);
+   SETFLOAT (ap+3, psi_speed);
+   outlet_anything(x->outlet_data, gensym("motionplus"), 4, ap);
 
 
-	SETSYMBOL(ap+0, gensym("angle_rate"));
-	SETFLOAT (ap+1, phi);
-	SETFLOAT (ap+2, theta);
-	SETFLOAT (ap+3, psi);
-	outlet_anything(x->outlet_data, gensym("motionplus"), 4, ap);
+   SETSYMBOL(ap+0, gensym("angle_rate"));
+   SETFLOAT (ap+1, phi);
+   SETFLOAT (ap+2, theta);
+   SETFLOAT (ap+3, psi);
+   outlet_anything(x->outlet_data, gensym("motionplus"), 4, ap);
 }
 #endif
 
 
 
 static void wiimote_cwiid_message(t_wiimote *x, union cwiid_mesg*mesg) {
-	switch (mesg->type) {
-	case CWIID_MESG_STATUS:
-		wiimote_cwiid_battery(x, mesg->status_mesg.battery);
-		switch (mesg->status_mesg.ext_type) {
-		case CWIID_EXT_NONE:
-			verbose(1, "No extension attached");
-			break;
-		case CWIID_EXT_NUNCHUK:
+   switch (mesg->type) {
+   case CWIID_MESG_STATUS:
+      wiimote_cwiid_battery(x, mesg->status_mesg.battery);
+      switch (mesg->status_mesg.ext_type) {
+      case CWIID_EXT_NONE:
+         verbose(1, "No extension attached");
+         break;
+      case CWIID_EXT_NUNCHUK:
 #ifdef CWIID_RPT_NUNCHCUK
-			post("Nunchuk extension attached");
-			if(cwiid_get_acc_cal(x->wiimote, CWIID_EXT_NUNCHUK, &x->nc_acc_cal)) {
-				post("Unable to retrieve nunchuk calibration");
-			} else {
-				post("Retrieved nunchuk calibration: zero=(%02d,%02d,%02d) one=(%02d,%02d,%02d)",
-						 x->nc_acc_cal.zero[CWIID_X],
-						 x->nc_acc_cal.zero[CWIID_Y],
-						 x->nc_acc_cal.zero[CWIID_Z],
-						 x->nc_acc_cal.one [CWIID_X],
-						 x->nc_acc_cal.one [CWIID_Y],
-						 x->nc_acc_cal.one [CWIID_Z]);
-			}
-			break;
+         post("Nunchuk extension attached");
+         if(cwiid_get_acc_cal(x->wiimote, CWIID_EXT_NUNCHUK, &x->nc_acc_cal)) {
+            post("Unable to retrieve nunchuk calibration");
+         } else {
+            post("Retrieved nunchuk calibration: zero=(%02d,%02d,%02d) one=(%02d,%02d,%02d)",
+                   x->nc_acc_cal.zero[CWIID_X],
+                   x->nc_acc_cal.zero[CWIID_Y],
+                   x->nc_acc_cal.zero[CWIID_Z],
+                   x->nc_acc_cal.one [CWIID_X],
+                   x->nc_acc_cal.one [CWIID_Y],
+                   x->nc_acc_cal.one [CWIID_Z]);
+         }
+         break;
 #endif
 #ifdef CWIID_RPT_CLASSIC
-		case CWIID_EXT_CLASSIC:
-			post("Classic controller attached. There is no real support for this yet.");
-			break;
+      case CWIID_EXT_CLASSIC:
+         post("Classic controller attached. There is no real support for this yet.");
+         break;
 #endif
 #ifdef CWIID_RPT_BALANCE
-		case CWIID_EXT_BALANCE:
-			if(cwiid_get_balance_cal(x->wiimote, &x->balance_cal)) {
-				post("Unable to retrieve balance calibration");
+      case CWIID_EXT_BALANCE:
+         if(cwiid_get_balance_cal(x->wiimote, &x->balance_cal)) {
+            post("Unable to retrieve balance calibration");
       }
-			break;
+         break;
 #endif
 #ifdef CWIID_RPT_MOTIONPLUS
-		case CWIID_EXT_MOTIONPLUS:
-			post("MotionPlus controller attached.");
-			/* no calibration needed for MotionPlus */
-			break;
+      case CWIID_EXT_MOTIONPLUS:
+         post("MotionPlus controller attached.");
+         /* no calibration needed for MotionPlus */
+         break;
 #endif
-		case CWIID_EXT_UNKNOWN:
-			post("Unknown extension attached");
-			break;
-		default:
-			post("ext mesg %d unknown", mesg->status_mesg.ext_type);
-			break;
-		}
-		break;
-	case CWIID_MESG_BTN:
-		wiimote_cwiid_btn(x, &mesg->btn_mesg);
-		break;
-	case CWIID_MESG_ACC:
-		wiimote_cwiid_acc(x, &mesg->acc_mesg);
-		break;
-	case CWIID_MESG_IR:
-		wiimote_cwiid_ir(x, &mesg->ir_mesg);
-		break;
+      case CWIID_EXT_UNKNOWN:
+         post("Unknown extension attached");
+         break;
+      default:
+         post("ext mesg %d unknown", mesg->status_mesg.ext_type);
+         break;
+      }
+      break;
+   case CWIID_MESG_BTN:
+      wiimote_cwiid_btn(x, &mesg->btn_mesg);
+      break;
+   case CWIID_MESG_ACC:
+      wiimote_cwiid_acc(x, &mesg->acc_mesg);
+      break;
+   case CWIID_MESG_IR:
+      wiimote_cwiid_ir(x, &mesg->ir_mesg);
+      break;
 #ifdef CWIID_RPT_NUNCHUK
-	case CWIID_MESG_NUNCHUK:
-		wiimote_cwiid_nunchuk(x, &mesg->nunchuk_mesg);
-		break;
+   case CWIID_MESG_NUNCHUK:
+      wiimote_cwiid_nunchuk(x, &mesg->nunchuk_mesg);
+      break;
 #endif
 #ifdef CWIID_RPT_CLASSIC
-	case CWIID_MESG_CLASSIC:
-		wiimote_cwiid_classic(x, &mesg->classic_mesg);
-		// todo
-		break;
+   case CWIID_MESG_CLASSIC:
+      wiimote_cwiid_classic(x, &mesg->classic_mesg);
+      // todo
+      break;
 #endif
 #ifdef CWIID_RPT_MOTIONPLUS
-	case CWIID_MESG_MOTIONPLUS:
-		wiimote_cwiid_motionplus(x, &mesg->motionplus_mesg);
-		break;
+   case CWIID_MESG_MOTIONPLUS:
+      wiimote_cwiid_motionplus(x, &mesg->motionplus_mesg);
+      break;
 #endif
 #ifdef CWIID_RPT_BALANCE
-	case CWIID_MESG_BALANCE:
-		wiimote_cwiid_balance(x, &mesg->balance_mesg);
-		break;
+   case CWIID_MESG_BALANCE:
+      wiimote_cwiid_balance(x, &mesg->balance_mesg);
+      break;
 #endif
-	default:
-		post("mesg %d unknown", (mesg->type));
-		break;
-	}
+   default:
+      post("mesg %d unknown", (mesg->type));
+      break;
+   }
 }
 
 #if 0
@@ -592,7 +592,7 @@ static void wiimote_dequeue(void*nada)
 
 
 static void wiimote_queue(t_wiimote*x, union cwiid_mesg*mesg, double timestamp)
-{ 
+{
   /* add mesg to the queue with a Pd timestamp */
   t_wiimoteMsgList*wl=g_wiimoteMsgList;
   t_wiimoteMsgList*lastentry=NULL;
@@ -657,7 +657,7 @@ static void wiimote_dequeue(void*nada)
 
 
 static void wiimote_queue(t_wiimote*x, union cwiid_mesg*mesg, double timestamp)
-{ 
+{
   /* add mesg to the queue with a Pd timestamp */
   t_wiimoteMsgList*wl=g_wiimoteMsgList;
 
@@ -689,7 +689,7 @@ static void wiimote_queue(t_wiimote*x, union cwiid_mesg*mesg, double timestamp)
 static void cwiid_callback(cwiid_wiimote_t *wiimote, int mesg_count,
                     union cwiid_mesg mesg_array[], struct timespec *timestamp)
 {
-	int i;
+   int i;
   t_wiimote *x=NULL;
   double pd_timestamp=0;
 
@@ -702,9 +702,9 @@ static void cwiid_callback(cwiid_wiimote_t *wiimote, int mesg_count,
   }
   x=getWiimoteObject(cwiid_get_id(wiimote));
   if(NULL==x) {
-		post("no wiimote loaded: %d%",cwiid_get_id(wiimote));
+      post("no wiimote loaded: %d%",cwiid_get_id(wiimote));
     return;
-	}
+   }
 
   pd_timestamp=wiimote_timestamp2logicaltime(x, timestamp);
 
@@ -714,40 +714,40 @@ static void cwiid_callback(cwiid_wiimote_t *wiimote, int mesg_count,
 #else
     wiimote_cwiid_message(x, mesg_array+i);
 #endif
-	}
+   }
 }
 
 // ==============================================================
 
 static void wiimote_status(t_wiimote *x)
 {
-	if(x->connected) {
-		if (cwiid_request_status(x->wiimote)) {
-			pd_error(x, "error requesting status message");
-		}
-	}
+   if(x->connected) {
+      if (cwiid_request_status(x->wiimote)) {
+         pd_error(x, "error requesting status message");
+      }
+   }
 }
 
 
 static void wiimote_resetReportMode(t_wiimote *x)
 {
-	if (x->connected)	{
-		verbose(1, "changing report mode for Wii%02d to %d", x->wiimoteID, x->reportMode);
-		if (cwiid_command(x->wiimote, CWIID_CMD_RPT_MODE, x->reportMode)) {
-			post("wiimote error: problem setting report mode.");
-		}
-	}
+   if (x->connected)   {
+      verbose(1, "changing report mode for Wii%02d to %d", x->wiimoteID, x->reportMode);
+      if (cwiid_command(x->wiimote, CWIID_CMD_RPT_MODE, x->reportMode)) {
+         post("wiimote error: problem setting report mode.");
+      }
+   }
 }
 
 
 static void wiimote_setReportMode(t_wiimote *x, t_floatarg r)
 {
-	if (r >= 0) {
-		x->reportMode = (int) r;
-		wiimote_resetReportMode(x);
-	}	else {
-		return;
-	}
+   if (r >= 0) {
+      x->reportMode = (int) r;
+      wiimote_resetReportMode(x);
+   }   else {
+      return;
+   }
 }
 
 
@@ -776,15 +776,15 @@ static void wiimote_report(t_wiimote*x, t_symbol*s, int onoff)
   }
 
   if(CWIID_RPT_MOTIONPLUS==flag) {
-		int err=0;
-		if(onoff) {
-			err=cwiid_enable(x->wiimote, CWIID_FLAG_MOTIONPLUS);
-		} else {
-			err=cwiid_disable(x->wiimote, CWIID_FLAG_MOTIONPLUS);
-		}
-		if(err) {
-			pd_error(x, "turning %s motionplus returned %d", (flag?"on":"off"), err);
-		}
+      int err=0;
+      if(onoff) {
+         err=cwiid_enable(x->wiimote, CWIID_FLAG_MOTIONPLUS);
+      } else {
+         err=cwiid_disable(x->wiimote, CWIID_FLAG_MOTIONPLUS);
+      }
+      if(err) {
+         pd_error(x, "turning %s motionplus returned %d", (flag?"on":"off"), err);
+      }
   }
 
   if(flag!=-1) {
@@ -794,48 +794,48 @@ static void wiimote_report(t_wiimote*x, t_symbol*s, int onoff)
       x->reportMode &= ~flag;
     }
   }
-	wiimote_resetReportMode(x);
+   wiimote_resetReportMode(x);
 }
 
 static void wiimote_reportAcceleration(t_wiimote *x, t_floatarg f)
 {
-	wiimote_report(x, gensym("acceleration"), f);
+   wiimote_report(x, gensym("acceleration"), f);
 }
 
 static void wiimote_reportIR(t_wiimote *x, t_floatarg f)
 {
-	wiimote_report(x, gensym("ir"), f);
+   wiimote_report(x, gensym("ir"), f);
 }
 
 static void wiimote_reportNunchuk(t_wiimote *x, t_floatarg f)
 {
-	wiimote_report(x, gensym("nunchuk"), f);
+   wiimote_report(x, gensym("nunchuk"), f);
 }
 
 static void wiimote_reportMotionplus(t_wiimote *x, t_floatarg f)
 {
-	wiimote_report(x, gensym("motionplus"), f);
+   wiimote_report(x, gensym("motionplus"), f);
 }
 
 static void wiimote_setRumble(t_wiimote *x, t_floatarg f)
 {
-	if (x->connected)
-	{
-		if (cwiid_command(x->wiimote, CWIID_CMD_RUMBLE, f)) post("wiimote error: problem setting rumble.");
-	}
+   if (x->connected)
+   {
+      if (cwiid_command(x->wiimote, CWIID_CMD_RUMBLE, f)) post("wiimote error: problem setting rumble.");
+   }
 }
 
 static void wiimote_setLED(t_wiimote *x, t_floatarg f)
 {
-	// some possible values:
-	// CWIID_LED0_ON		0x01
-	// CWIID_LED1_ON		0x02
-	// CWIID_LED2_ON		0x04
-	// CWIID_LED3_ON		0x08
-	if (x->connected)
-	{
-		if (cwiid_command(x->wiimote, CWIID_CMD_LED, f)) post("wiimote error: problem setting LED.");
-	}
+   // some possible values:
+   // CWIID_LED0_ON      0x01
+   // CWIID_LED1_ON      0x02
+   // CWIID_LED2_ON      0x04
+   // CWIID_LED3_ON      0x08
+   if (x->connected)
+   {
+      if (cwiid_command(x->wiimote, CWIID_CMD_LED, f)) post("wiimote error: problem setting LED.");
+   }
 }
 
 
@@ -851,41 +851,42 @@ static void wiimote_setLED(t_wiimote *x, t_floatarg f)
 
 static void wiimote_doConnect(t_wiimote *x, t_symbol *addr, t_symbol *dongaddr)
 {
-	bdaddr_t bdaddr;
-	unsigned int flags =  CWIID_FLAG_MESG_IFC;
-
-	bdaddr_t  dong_bdaddr;
-	bdaddr_t* dong_bdaddr_ptr=&dong_bdaddr;
-
-	// determine address:
-	if (NULL==addr || addr==gensym("")) {
-		post("Searching automatically...");		
-		bdaddr = *BDADDR_ANY;
-	}	else {
-		str2ba(addr->s_name, &bdaddr);
-		post("Connecting to given address...");
-		post("Press buttons 1 and 2 simultaneously.");
-		} 
-
-	// determine dongleaddress:
-	if (NULL==dongaddr || dongaddr==gensym("")) {
-		post("Binding automatically...");		
-		dong_bdaddr_ptr = NULL;		
-	}	else {
-		str2ba(dongaddr->s_name, &dong_bdaddr);
-	} 	
-	// connect:
+   bdaddr_t bdaddr;
+   unsigned int flags =  CWIID_FLAG_MESG_IFC;
+
+   bdaddr_t  dong_bdaddr;
+   bdaddr_t* dong_bdaddr_ptr=&dong_bdaddr;
+
+   // determine address:
+   if (NULL==addr || addr==gensym("")) {
+      post("Searching automatically...");
+      bdaddr = *BDADDR_ANY;
+   } else {
+      str2ba(addr->s_name, &bdaddr);
+      post("Connecting to given address...");
+      post("Press buttons 1 and 2 simultaneously.");
+      }
 
+   // determine dongleaddress:
+   if (NULL==dongaddr || dongaddr==gensym("")) {
+      post("Binding automatically...");
+      dong_bdaddr_ptr = NULL;
+   }   else {
+      str2ba(dongaddr->s_name, &dong_bdaddr);
+   }
+   // connect:
 
-#if 0
+
+#ifdef CWIID_OPEN_WITH_DONGLE
+  verbose(1,"wiimote: opening with dongle '%s'", dongaddr->s_name);
   x->wiimote = cwiid_open(&bdaddr, dong_bdaddr_ptr, flags);
 #else
-#warning multi-dongle support missing...
+# warning multi-dongle support missing...
   x->wiimote = cwiid_open(&bdaddr, flags);
 #endif
 
   if(NULL==x->wiimote) {
-		post("wiimote error: unable to connect");
+      post("wiimote error: unable to connect");
     return;
   }
 
@@ -896,25 +897,25 @@ static void wiimote_doConnect(t_wiimote *x, t_symbol *addr, t_symbol *dongaddr)
   }
 
   x->wiimoteID= cwiid_get_id(x->wiimote);
-  
+
   post("wiimote %i is successfully connected", x->wiimoteID);
 
-	if(cwiid_get_acc_cal(x->wiimote, CWIID_EXT_NONE, &x->acc_cal)) {
+   if(cwiid_get_acc_cal(x->wiimote, CWIID_EXT_NONE, &x->acc_cal)) {
     post("Unable to retrieve accelerometer calibration");
   } else {
     post("Retrieved wiimote calibration: zero=(%02d,%02d,%02d) one=(%02d,%02d,%02d)",
-				 x->acc_cal.zero[CWIID_X],
-				 x->acc_cal.zero[CWIID_Y],
-				 x->acc_cal.zero[CWIID_Z],
-				 x->acc_cal.one [CWIID_X],
-				 x->acc_cal.one [CWIID_Y],
-				 x->acc_cal.one [CWIID_Z]);
+             x->acc_cal.zero[CWIID_X],
+             x->acc_cal.zero[CWIID_Y],
+             x->acc_cal.zero[CWIID_Z],
+             x->acc_cal.one [CWIID_X],
+             x->acc_cal.one [CWIID_Y],
+             x->acc_cal.one [CWIID_Z]);
   }
 
   x->connected = 1;
 
-	x->reportMode |= CWIID_RPT_STATUS;
-	x->reportMode |= CWIID_RPT_BTN;
+   x->reportMode |= CWIID_RPT_STATUS;
+   x->reportMode |= CWIID_RPT_BTN;
   wiimote_resetReportMode(x);
 
   if (cwiid_set_mesg_callback(x->wiimote, &cwiid_callback)) {
@@ -932,31 +933,30 @@ static void wiimote_doConnect(t_wiimote *x, t_symbol *addr, t_symbol *dongaddr)
 
 static void wiimote_discover(t_wiimote *x)
 {
-	post("Put the wiimote into discover mode by pressing buttons 1 and 2 simultaneously.");
-		
-	wiimote_doConnect(x, NULL, NULL);
-	if (!(x->connected))
-	{
-		post("Error: could not find any wiimotes. Please ensure that bluetooth is enabled, and that the 		'hcitool scan' command lists your Nintendo device.");
-	}
+   post("Put the wiimote into discover mode by pressing buttons 1 and 2 simultaneously.");
+
+   wiimote_doConnect(x, NULL, NULL);
+   if (!(x->connected))
+   {
+      post("Error: could not find any wiimotes. Please ensure that bluetooth is enabled, and that the       'hcitool scan' command lists your Nintendo device.");
+   }
 }
 
 static void wiimote_doDisconnect(t_wiimote *x)
 {
-		
-	if (x->connected)
-	{
-		if (cwiid_close(x->wiimote)) {
-			post("wiimote error: problems when disconnecting.");
-		} 
-		else {
-			post("disconnect successfull, resetting values");
+
+   if (x->connected)
+   {
+      if (cwiid_close(x->wiimote)) {
+         post("wiimote error: problems when disconnecting.");
+      }
+      else {
+         post("disconnect successfull, resetting values");
             removeWiimoteObject(x);
-			x->connected = 0;
-		}
-	}
-	else post("device is not connected");
-	
+         x->connected = 0;
+      }
+   }
+   else post("device is not connected");
 }
 
 
@@ -965,35 +965,35 @@ static void wiimote_doDisconnect(t_wiimote *x)
 
 static void *wiimote_new(t_symbol*s, int argc, t_atom *argv)
 {
-	t_wiimote *x = (t_wiimote *)pd_new(wiimote_class);
+   t_wiimote *x = (t_wiimote *)pd_new(wiimote_class);
 
-	// create outlets:
-	x->outlet_data = outlet_new(&x->x_obj, NULL);
+   // create outlets:
+   x->outlet_data = outlet_new(&x->x_obj, NULL);
 
-	// initialize toggles:
-	x->connected = 0;
-	x->wiimoteID = -1;
+   // initialize toggles:
+   x->connected = 0;
+   x->wiimoteID = -1;
 
   x->basetime=NULL;
   x->baselogicaltime=0.;
-	
+
   // connect if user provided an address as an argument:
   if (argc==2) {
-		post("[%s] connecting to provided address...", s->s_name);
-		if (argv->a_type == A_SYMBOL)	{
-			wiimote_doConnect(x, NULL, atom_getsymbol(argv));
-		} else {
-			error("[wiimote] expects either no argument, or a bluetooth address as an argument. eg, 00:19:1D:70:CE:72");
-			return NULL;
-		}
-	}
-	return (x);
+      post("[%s] connecting to provided address...", s->s_name);
+      if (argv->a_type == A_SYMBOL)   {
+         wiimote_doConnect(x, NULL, atom_getsymbol(argv));
+      } else {
+         error("[wiimote] expects either no argument, or a bluetooth address as an argument. eg, 00:19:1D:70:CE:72");
+         return NULL;
+      }
+   }
+   return (x);
 }
 
 
 static void wiimote_free(t_wiimote* x)
 {
-	wiimote_doDisconnect(x);
+   wiimote_doDisconnect(x);
   /* cleanup the queue */
 
   /* free the clock */
@@ -1006,33 +1006,32 @@ void wiimote_setup(void)
 {
   g_clock = clock_new(NULL, (t_method)wiimote_dequeue);
 
-	wiimote_class = class_new(gensym("wiimote"), (t_newmethod)wiimote_new, (t_method)wiimote_free, sizeof(t_wiimote), CLASS_DEFAULT, A_GIMME, 0);
+   wiimote_class = class_new(gensym("wiimote"), (t_newmethod)wiimote_new, (t_method)wiimote_free, sizeof(t_wiimote), CLASS_DEFAULT, A_GIMME, 0);
 
-	class_addmethod(wiimote_class, (t_method) wiimote_debug, gensym("debug"), 0);
-	class_addmethod(wiimote_class, (t_method) wiimote_status, gensym("status"), 0);
+   class_addmethod(wiimote_class, (t_method) wiimote_debug, gensym("debug"), 0);
+   class_addmethod(wiimote_class, (t_method) wiimote_status, gensym("status"), 0);
 
 
-	/* connection settings */
-	class_addmethod(wiimote_class, (t_method) wiimote_doConnect, gensym("connect"), A_DEFSYMBOL, A_DEFSYMBOL, 0);
-	class_addmethod(wiimote_class, (t_method) wiimote_doDisconnect, gensym("disconnect"), 0);
-	class_addmethod(wiimote_class, (t_method) wiimote_discover, gensym("discover"), 0);
+   /* connection settings */
+   class_addmethod(wiimote_class, (t_method) wiimote_doConnect, gensym("connect"), A_DEFSYMBOL, A_DEFSYMBOL, 0);
+   class_addmethod(wiimote_class, (t_method) wiimote_doDisconnect, gensym("disconnect"), 0);
+   class_addmethod(wiimote_class, (t_method) wiimote_discover, gensym("discover"), 0);
 
 
-	/* query data */
-	class_addmethod(wiimote_class, (t_method) wiimote_report, gensym("report"), A_SYMBOL, A_FLOAT, 0);
+   /* query data */
+   class_addmethod(wiimote_class, (t_method) wiimote_report, gensym("report"), A_SYMBOL, A_FLOAT, 0);
 
-	class_addmethod(wiimote_class, (t_method) wiimote_setReportMode, gensym("setReportMode"), A_FLOAT, 0);
-	class_addmethod(wiimote_class, (t_method) wiimote_reportAcceleration, gensym("reportAcceleration"), A_FLOAT, 0);
-	class_addmethod(wiimote_class, (t_method) wiimote_reportIR, gensym("reportIR"), A_FLOAT, 0);
+   class_addmethod(wiimote_class, (t_method) wiimote_setReportMode, gensym("setReportMode"), A_FLOAT, 0);
+   class_addmethod(wiimote_class, (t_method) wiimote_reportAcceleration, gensym("reportAcceleration"), A_FLOAT, 0);
+   class_addmethod(wiimote_class, (t_method) wiimote_reportIR, gensym("reportIR"), A_FLOAT, 0);
 
-	class_addmethod(wiimote_class, (t_method) wiimote_reportNunchuk, gensym("reportNunchuck"), A_FLOAT, 0);
-	class_addmethod(wiimote_class, (t_method) wiimote_reportNunchuk, gensym("reportNunchuk"), A_FLOAT, 0);
-	class_addmethod(wiimote_class, (t_method) wiimote_reportMotionplus, gensym("reportMotionplus"), A_FLOAT, 0);
+   class_addmethod(wiimote_class, (t_method) wiimote_reportNunchuk, gensym("reportNunchuck"), A_FLOAT, 0);
+   class_addmethod(wiimote_class, (t_method) wiimote_reportNunchuk, gensym("reportNunchuk"), A_FLOAT, 0);
+   class_addmethod(wiimote_class, (t_method) wiimote_reportMotionplus, gensym("reportMotionplus"), A_FLOAT, 0);
 
 
-	/* set things on the wiimote */
-	class_addmethod(wiimote_class, (t_method) wiimote_setRumble, gensym("setRumble"), A_FLOAT, 0);
-	class_addmethod(wiimote_class, (t_method) wiimote_setLED, gensym("setLED"), A_FLOAT, 0);
+   /* set things on the wiimote */
+   class_addmethod(wiimote_class, (t_method) wiimote_setRumble, gensym("setRumble"), A_FLOAT, 0);
+   class_addmethod(wiimote_class, (t_method) wiimote_setLED, gensym("setLED"), A_FLOAT, 0);
 }
 
-