Changeset 116 for trunk/wmdemo

Timestamp:

05/16/07 19:40:30 (2 years ago)

Author:

dsmith

Message:

deprecated cwiid_{connect,disconnect,command}, added cwiid_{open,close,request_status,set_led,set_rumble,set_rpt_mode}

Files:

• trunk/wmdemo/wmdemo.c (modified) (8 diffs)

trunk/wmdemo/wmdemo.c

@@ -75 +75 @@
-        /* Connect to the wiimote */
-        printf("Put Wiimote in discoverable mode now (press 1+2)...\n");
-connect
+open
-                fprintf(stderr, "Unable to connect to wiimote\n");
-                return -1;
@@ -111 +111 @@
-                case '5':
-                        toggle_bit(rumble, 1);
-command(wiimote, CWIID_CMD_RUMBLE
+set_rumble(wiimote
-                                fprintf(stderr, "Error setting rumble\n");
-                        }
@@ -158 +158 @@
-                        break;
-                case 'r':
-command(wiimote, CWIID_CMD_STATUS, 0
+request_status(wiimote
-                                fprintf(stderr, "Error requesting status message\n");
-                        }
@@ -182 +182 @@
-        }
-
-disconnect
+close
-                fprintf(stderr, "Error on wiimote disconnect\n");
-                return -1;
@@ -192 +192 @@
-void set_led_state(cwiid_wiimote_t *wiimote, unsigned char led_state)
-{
-command(wiimote, CWIID_CMD_LED
+set_led(wiimote
-                fprintf(stderr, "Error setting LEDs \n");
-        }
@@ -199 +199 @@
-void set_rpt_mode(cwiid_wiimote_t *wiimote, unsigned char rpt_mode)
-{
-command(wiimote, CWIID_CMD_RPT_MODE
+set_rpt_mode(wiimote
-                fprintf(stderr, "Error setting report mode\n");
-        }
@@ -357 +357 @@
-                        break;
-                case CWIID_MESG_ERROR:
-disconnect
+close
-                                fprintf(stderr, "Error on wiimote disconnect\n");
-                                exit(-1);
@@ -369 +369 @@
-        }
-}
-