Changeset 470 in flair-src for trunk/tools/Controller

Timestamp:

Mar 10, 2022, 2:18:58 PM (3 years ago)

Author:

Sanahuja Guillaume

Message:

add timeout for ds3 input event

Location:

trunk/tools/Controller/DualShock3/src

Files:

• DualShock3.cpp (modified) (2 diffs)
• DualShock3.h (modified) (1 diff)

trunk/tools/Controller/DualShock3/src/DualShock3.cpp

@@ -382 +382 @@
     return parse_report_sixaxis_ds3(report, nr);
   } else if (connectionType == UsbEvent) {
-    return parse_input_event();
+    return parse_input_event(100);
   }
   return false;
@@ -391 +391 @@
 }
 
-bool DualShock3::parse_input_event(void) {
+bool DualShock3::parse_input_event(int timeout_ms) {
   struct input_event ev[64];
-        int i, rd;
-
+  int i, rd;
+  fd_set set;
+  struct timeval timeout;
+  
+  FD_ZERO(&set);         // clear the set
+  FD_SET(usb_fd, &set); // add our file descriptor to the set
+
+  timeout.tv_sec = 0;
+  timeout.tv_usec = timeout_ms * 1000;
+
+  int rv = select(FD_SETSIZE, &set, NULL, NULL, &timeout);
+    
+  if (rv <=0) {
+    return false;
+  }
+    
   rd = read(usb_fd, ev, sizeof(struct input_event) * 64);
 

trunk/tools/Controller/DualShock3/src/DualShock3.h

@@ -79 +79 @@
   void setup_device(struct motion_dev *dev);
   bool parse_report_sixaxis_ds3(unsigned char *r, int len);
-  bool parse_input_event(void);
+  bool parse_input_event(int timeout_ms);
   int mystr2ba(const char *s, bdaddr_t *ba);
   char *myba2str(const bdaddr_t *ba);