Changeset 116

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/ChangeLog (modified) (1 diff)
• trunk/libcwiid/command.c (modified) (3 diffs)
• trunk/libcwiid/connect.c (modified) (4 diffs)
• trunk/libcwiid/cwiid.h (modified) (3 diffs)
• trunk/wmdemo/wmdemo.c (modified) (8 diffs)
• trunk/wmgui/main.c (modified) (8 diffs)
• trunk/wminput/main.c (modified) (7 diffs)
• trunk/wminput/plugins/ir_ptr/ir_ptr.c (modified) (2 diffs)
• trunk/wminput/uinput.c (modified) (3 diffs)

trunk/ChangeLog

@@ +1 @@
+2007-05-16 L. Donnie Smith <cwiid@abstrakraft.org>
+        libcwiid
+        * removed error_pipe
+        * fixed error message reporting
+        * changed cwiid_connect, cwiid_disconnect to cwiid_open, cwiid_close
+          (added macros for backward compatibility)
+        * split cwiid_command into cwiid_request_status, cwiid_set_led,
+          cwiid_set_rumble, cwiid_set_rpt_mode (kept cwiid_command for backward
+          compatibility)
+
+        wmdemo
+        * updated for function name changes
+
+        wmgui
+        * updated for function name changes
+
+        wminput
+        * updated for function name changes
+
-2007-05-14 L. Donnie Smith <cwiid@abstrakraft.org>
-        libcwiid

trunk/libcwiid/command.c

@@ -16 +16 @@
- *
- *  ChangeLog:
+ *  2007-05-16 L. Donnie Smith <cwiid@abstrakraft.org>
+ *  * added cwiid_request_status, cwiid_set_let, cwiid_set_rumble,
+ *    cwiid_set_rpt_mode
+ *
- *  2007-04-24 L. Donnie Smith <cwiid@abstrakraft.org>
- *  * rewrite for API overhaul
@@ -45 +49 @@
-#include "cwiid_internal.h"
-
-#define CMD_BUF_LEN     21
-int cwiid_command(struct wiimote *wiimote, enum cwiid_command command,
-                  int flags) {
-
-
-
-
+
+
-        switch (command) {
-        case CWIID_CMD_STATUS:
-
-
-
-
-
+
-                break;
-        case CWIID_CMD_LED:
-
-
-
-
-
-
+
-                break;
-        case CWIID_CMD_RUMBLE:
-
-
-
-
-
-
+
-                break;
-        case CWIID_CMD_RPT_MODE:
-update
+ret = cwiid_set
-                break;
-        default:
@@ -85 +72 @@
-
-        return ret;
+}
+
+int cwiid_request_status(cwiid_wiimote_t *wiimote)
+{
+        unsigned char data;
+
+        data = 0;
+        if (send_report(wiimote, 0, RPT_STATUS_REQ, 1, &data)) {
+                cwiid_err(wiimote, "Status request error");
+                return -1;
+        }
+
+        return 0;
+}
+
+int cwiid_set_led(cwiid_wiimote_t *wiimote, uint8_t led)
+{
+        unsigned char data;
+
+        /* TODO: assumption: char assignments are atomic, no mutex lock needed */
+        wiimote->state.led = led & 0x0F;
+        data = wiimote->state.led << 4;
+        if (send_report(wiimote, 0, RPT_LED_RUMBLE, 1, &data)) {
+                cwiid_err(wiimote, "Report send error (led)");
+                return -1;
+        }
+
+        return 0;
+}
+
+int cwiid_set_rumble(cwiid_wiimote_t *wiimote, uint8_t rumble)
+{
+        unsigned char data;
+
+        /* TODO: assumption: char assignments are atomic, no mutex lock needed */
+        wiimote->state.rumble = rumble ? 1 : 0;
+        data = wiimote->state.led << 4;
+        if (send_report(wiimote, 0, RPT_LED_RUMBLE, 1, &data)) {
+                cwiid_err(wiimote, "Report send error (led)");
+                return -1;
+        }
+
+        return 0;
+}
+
+int cwiid_set_rpt_mode(cwiid_wiimote_t *wiimote, uint8_t rpt_mode)
+{
+        return update_rpt_mode(wiimote, rpt_mode);
-}
-

trunk/libcwiid/connect.c

@@ -18 +18 @@
- *  2007-05-16 L. Donnie Smith <cwiid@abstrakraft.org>
- *  * remove error_pipe init and destruct
+ *  * renamed connect and disconnect to open and close
- *
- *  2007-04-24 L. Donnie Smith <cwiid@abstrakraft.org>
@@ -58 +59 @@
-static int wiimote_id = 0;
-
-connect
+open
-{
-        struct wiimote *wiimote = NULL;
@@ -194 +195 @@
-        memset(&wiimote->state, 0, sizeof wiimote->state);
-        wiimote->mesg_callback = NULL;
-command(wiimote, CWIID_CMD_LED
-command(wiimote, CWIID_CMD_STATUS, 0
+set_led(wiimote
+request_status(wiimote
-
-        return wiimote;
@@ -272 +273 @@
-}
-
-disconnect
+close
-{
-        void *pthread_ret;

trunk/libcwiid/cwiid.h

@@ -16 +16 @@
- *
- *  ChangeLog:
+ *  2007-05-16 L. Donnie Smith <cwiid@abstrakraft.org>
+ *  * changed cwiid_connect, cwiid_disconnect to cwiid_open, cwiid_close
+ *  * added cwiid_request_status, cwiid_set_let, cwiid_set_rumble,
+ *    cwiid_set_rpt_mode
+ *
- *  2007-05-14 L. Donnie Smith <cwiid@abstrakraft.org>
- *  * added timestamp to message functions
@@ -298 +303 @@
-
-/* Connection */
-
-
+
+
+
+
-
-int cwiid_get_id(cwiid_wiimote_t *wiimote);
@@ -319 +326 @@
-int cwiid_command(cwiid_wiimote_t *wiimote, enum cwiid_command command,
-                  int flags);
+int cwiid_request_status(cwiid_wiimote_t *wiimote);
+int cwiid_set_led(cwiid_wiimote_t *wiimote, uint8_t led);
+int cwiid_set_rumble(cwiid_wiimote_t *wiimote, uint8_t rumble);
+int cwiid_set_rpt_mode(cwiid_wiimote_t *wiimote, uint8_t rpt_mode);
-int cwiid_read(cwiid_wiimote_t *wiimote, uint8_t flags, uint32_t offset,
-               uint16_t len, void *data);

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 @@
-        }
-}
-

trunk/wmgui/main.c

@@ -16 +16 @@
- *
- *  ChangeLog:
+ *  2007-05-16 L. Donnie Smith <cwiid@abstrakraft.org>
+ *  * changed cwiid_{connect,disconnect,command} to
+ *    cwiid_{open,close,request_status|set_led|set_rumble|set_rpt_mode}
+ *
- *  2007-05-14 L. Donnie Smith <cwiid@abstrakraft.org>
- *  * added timestamp to message callback
@@ -635 +639 @@
-                "Put Wiimote in discoverable mode (press 1+2) and press OK",
-                 GTK_WINDOW(winMain));
-connect
+open
-                message(GTK_MESSAGE_ERROR, "Unable to connect", GTK_WINDOW(winMain));
-                status("No connection");
@@ -642 +646 @@
-                message(GTK_MESSAGE_ERROR, "Error setting callback",
-                        GTK_WINDOW(winMain));
-disconnect
+close
-                        message(GTK_MESSAGE_ERROR, "Error on disconnect",
-                                GTK_WINDOW(winMain));
@@ -657 +661 @@
-                set_gui_state();
-                set_report_mode();
-command(wiimote, CWIID_CMD_STATUS, 0
+request_status(wiimote
-        }
-
@@ -667 +671 @@
-void menuDisconnect_activate(void)
-{
-disconnect
+close
-                message(GTK_MESSAGE_ERROR, "Error on disconnect", GTK_WINDOW(winMain));
-        }
@@ -747 +751 @@
-                  (gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(chkLED4))
-                    ? CWIID_LED4_ON : 0);
-command(wiimote, CWIID_CMD_LED
+set_led(wiimote
-                        message(GTK_MESSAGE_ERROR, "error setting LEDs",
-                                GTK_WINDOW(winMain));
@@ -757 +761 @@
-{
-        if (wiimote) {
-command(wiimote, CWIID_CMD_RUMBLE
+set_rumble(wiimote
-                  gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(chkRumble)))) {
-                        message(GTK_MESSAGE_ERROR, "error setting rumble",
@@ -997 +1001 @@
-                rpt_mode |= CWIID_RPT_EXT;
-        }
-command(wiimote, CWIID_CMD_RPT_MODE
+set_rpt_mode(wiimote
-                message(GTK_MESSAGE_ERROR, "error setting report mode",
-                        GTK_WINDOW(winMain));

trunk/wminput/main.c

@@ -16 +16 @@
- *
- *  ChangeLog:
+ *  2007-05-16 L. Donnie Smith <cwiid@abstrakraft.org>
+ *  * changed cwiid_{connect,disconnect,command} to
+ *    cwiid_{open,close,request_status|set_led|set_rumble|set_rpt_mode}
+ *
- *  2007-05-14 L. Donnie Smith <cwiid@abstrakraft.org>
- *  * added timestamp to message callback
@@ -165 +169 @@
-                }
-        }
-connect
+open
-                wminput_err("unable to connect");
-                conf_unload(&conf);
@@ -181 +185 @@
-                        wminput_err("error on %s init", conf.plugins[i].name);
-                        conf_unload(&conf);
-disconnect
+close
-                        return -1;
-                }
@@ -188 +192 @@
-        if (wminput_set_report_mode()) {
-                conf_unload(&conf);
-disconnect
+close
-                return -1;
-        }
@@ -199 +203 @@
-                wminput_err("error starting uinput listen thread");
-                conf_unload(&conf);
-disconnect
+close
-                return -1;
-        }
@@ -227 +231 @@
-
-        /* disconnect */
-disconnect
+close
-                wminput_err("error on disconnect");
-                ret = -1;
@@ -261 +265 @@
-        }
-
-command(wiimote, CWIID_CMD_RPT_MODE
+set_rpt_mode(wiimote
-                wminput_err("error setting report mode");
-                return -1;

trunk/wminput/plugins/ir_ptr/ir_ptr.c

@@ -16 +16 @@
- *
- *  ChangeLog:
+ *  2007-05-16 L. Donnie Smith <cwiid@abstrakraft.org>
+ *  * changed cwiid_{connect,disconnect,command} to
+ *    cwiid_{open,close,request_status|set_led|set_rumble|set_rpt_mode}
+ *
- *  2007-04-24 L. Donnie Smith <cwiid@abstrakraft.org>
- *  * updated for API overhaul
@@ -245 +249 @@
-        }
-        if (flags != old_flags) {
-command(wiimote, CWIID_CMD_LED
+set_led(wiimote
-        }
-        old_flags = flags;

trunk/wminput/uinput.c

@@ -16 +16 @@
- *
- *  ChangeLog:
+ *  2007-05-16 L. Donnie Smith <cwiid@abstrakraft.org>
+ *  * changed cwiid_{connect,disconnect,command} to
+ *    cwiid_{open,close,request_status|set_led|set_rumble|set_rpt_mode}
+ *
- *  2007-04-09 L. Donnie Smith <cwiid@abstrakraft.org>
- *  * updated for libcwiid rename
@@ -259 +263 @@
-                                        wminput_err("Error on ff upload begin");
-                                }
-command(data->wiimote, CWIID_CMD_RUMBLE
+set_rumble(data->wiimote
-                                        wminput_err("Error setting rumble");
-                                }
@@ -271 +275 @@
-                                        wminput_err("Error on ff erase begin");
-                                }
-command(data->wiimote, CWIID_CMD_RUMBLE
+set_rumble(data->wiimote
-                                        wminput_err("Error clearing rumble");
-                                }