Changeset d087284c9fe3be67c74edd495b443683ce4ce6af

Timestamp:

07/29/07 18:08:00 (5 years ago)

Author:

dsmith <dsmith@…>

git-author:

L. Donnie Smith <donnie.smith@gatech.edu> / 2007-07-29T18:08:00Z+0000

Parents:

8dfafdd3df12e09ce36b9d0018fbf3718b14c9a5

Children:

f74d95ef1b141f63caaf55d5f29bd5df1ff9cdb0

git-committer:

dsmith <dsmith@918edb2d-ff29-0410-9de2-eb38e7f22bc7> / 2007-07-29T18:08:00Z+0000

Message:

fixed wait forever logic

git-svn-id: http://abstrakraft.org/cwiid/svn/trunk@138 918edb2d-ff29-0410-9de2-eb38e7f22bc7

Files:

• ChangeLog (modified) (1 diff)
• wminput/main.c (modified) (4 diffs)

ChangeLog

@@ +1 @@
+2007-07-29 L. Donnie Smith <cwiid@abstrakraft.org>
+        wminput
+        * fixed wait forever logic
+
 2007-07-28 L. Donnie Smith <cwiid@abstrakraft.org>
         configure.ac

wminput/main.c

@@ -16 +16 @@
  *
  *  ChangeLog:
+ *  2007-07-29 L. Donnie Smith <cwiid@abstrakraft.org>
+ *  * fixed wait forever logic
+ *
  *  2007-07-28 L. Donnie Smith <cwiid@abstrakraft.org>
  *  * added config.h include
@@ -232 +235 @@
         printf("Put Wiimote in discoverable mode now (press 1+2)...\n");
         if (wait_forever) {
-                if (cwiid_find_wiimote(&bdaddr, -1)) {
-                        wminput_err("error finding wiimote");
+                if (!bacmp(&bdaddr, BDADDR_ANY)) {
+                        if (cwiid_find_wiimote(&bdaddr, -1)) {
+                                wminput_err("error finding wiimote");
+                                conf_unload(&conf);
+                                return -1;
+                        }
+                }
+                /* TODO: avoid continuously calling cwiid_open */
+                /* TODO: kill error messages on failed cwiid_open calls */
+                while (!(wiimote = cwiid_open(&bdaddr, CWIID_FLAG_MESG_IFC)));
+        }
+        else {
+                if ((wiimote = cwiid_open(&bdaddr, CWIID_FLAG_MESG_IFC)) == NULL) {
+                        wminput_err("unable to connect");
                         conf_unload(&conf);
                         return -1;
                 }
-        }
-        if ((wiimote = cwiid_open(&bdaddr, CWIID_FLAG_MESG_IFC)) == NULL) {
-                wminput_err("unable to connect");
-                conf_unload(&conf);
-                return -1;
         }
         if (cwiid_set_mesg_callback(wiimote, &cwiid_callback)) {
@@ -310 +320 @@
         sigaddset(&sigset, SIGTERM);
         sigaddset(&sigset, SIGINT);
+        sigaddset(&sigset, SIGUSR1);
         sigprocmask(SIG_BLOCK, &sigset, NULL);
         sigwait(&sigset, &signum);
@@ -388 +399 @@
                         break;
                 case CWIID_MESG_ERROR:
-                        if (kill(getpid(),SIGINT)) {
-                                wminput_err("Error sending SIGINT");
+                        if (kill(getpid(),SIGUSR1)) {
+                                wminput_err("Error sending SIGUSR1");
                         }
                         break;