Changeset 290 in flair-src for trunk

Timestamp:

Jan 8, 2019, 5:45:23 PM (6 years ago)

Author:

Sanahuja Guillaume

Message:

support for multiple ds3 in usb

Location:

trunk

Files:

• lib/FlairCore/src/FrameworkManager_impl.cpp (modified) (1 diff)
• lib/FlairSensorActuator/src/HostEthController.cpp (modified) (1 diff)
• tools/Controller/DualShock3/src/DualShock3.cpp (modified) (4 diffs)

trunk/lib/FlairCore/src/FrameworkManager_impl.cpp

@@ -226 +226 @@
 
   // socket file_socket, doit être créé en premier, cf station sol
-  Printf("Connecting to %s:%i\n", address.c_str(), port);
+  Printf("Connecting to FlairGCS on %s:%i\n", address.c_str(), port);
   //file_sock = GetSocket(address, port);
   com_sock = GetSocket();

trunk/lib/FlairSensorActuator/src/HostEthController.cpp

@@ -49 +49 @@
       bitsPerAxis(_bitsPerAxis), dataFrameBuffer(NULL),
       meaningfulDataAvailable(false) {
+        
+  Thread::Info("Trying to connect to %s:%d\n", targetAddress.c_str(), targetPort);
+  
   tabWidget = new TabWidget(tab->NewRow(), name);
 

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

@@ -39 +39 @@
 #include <bluetooth/hci.h>
 #include <bluetooth/hci_lib.h>
+#include <sys/file.h>
 
 #define USB_DIR_IN 0x80
@@ -156 +157 @@
       dev_name << "/dev/hidraw" << i;
       if ((usb_fd = open(dev_name.str().c_str(), O_RDONLY)) >= 0) {
-        int res = 0;
+        int res=flock(usb_fd, LOCK_EX|LOCK_NB);
+        if(res<0) {
+          Thread::Warn("%s seems to be locked by another application\n", dev_name.str().c_str());
+          close(usb_fd);
+          continue;
+        }
+        
         struct hidraw_devinfo info;
-
         res = ioctl(usb_fd, HIDIOCGRAWINFO, &info);
         if (res < 0) {
-          Thread::Err("ioctl error (HIDIOCGRAWINFO) on %s\n",
-                      dev_name.str().c_str());
+          Thread::Err("ioctl error (HIDIOCGRAWINFO) on %s\n",dev_name.str().c_str());
         } else {
           // Printf("%x %x\n", info.vendor, info.product);
@@ -171 +176 @@
           }
         }
+        flock(usb_fd, LOCK_UN);
         close(usb_fd);
       }
@@ -193 +199 @@
 DualShock3::~DualShock3() {
   if (connectionType == Usb) {
+    flock(usb_fd, LOCK_UN);
     close(usb_fd);
   }