Revert "Muse lsl connection timeout argument (#200)" (#214)

This reverts commit 524ce0e.

muselsl/__main__.py

@@ -17,7 +17,6 @@ def main():
                 -n --name       Device name (e.g. Muse-41D2).
                 -b --backend    BLE backend to use. can be auto, bluemuse, gatt or bgapi.
                 -i --interface  The interface to use, 'hci0' for gatt or a com port for bgapi.
-                -t --timeout    Length of timeout before giving up on connecting to an identified device.
                 -p --ppg        Include PPG data
                 -c --acc        Include accelerometer data
                 -g --gyro       Include gyroscope data
@@ -42,7 +41,6 @@ def main():
                 -n --name       Device name (e.g. Muse-41D2).
                 -b --backend    BLE backend to use. can be auto, bluemuse, gatt or bgapi.
                 -i --interface  The interface to use, 'hci0' for gatt or a com port for bgapi.
-                -t --timeout    Length of timeout before giving up on connecting to an identified device.
         ''')
 
     parser.add_argument('command', help='Command to run.')

muselsl/backends.py

@@ -32,16 +32,15 @@ def scan(self, timeout=10):
             raise bleak
         devices = _wait(bleak.BleakScanner.discover(timeout))
         return [{'name':device.name, 'address':device.address} for device in devices]
-    def connect(self, address, connection_timeout=None):
-        result = BleakDevice(self, address, connection_timeout)
+    def connect(self, address):
+        result = BleakDevice(self, address)
         result.connect()
         return result
 
 class BleakDevice:
-    def __init__(self, adapter, address, connection_timeout=None):
+    def __init__(self, adapter, address):
         self._adapter = adapter
-        self._timeout = connection_timeout
-        self._client = bleak.BleakClient(address, timeout=self._timeout)  # <- CRITICAL timeout value HERE
+        self._client = bleak.BleakClient(address)
     def connect(self):
         _wait(self._client.connect())
         self._adapter.connected.add(self)

muselsl/cli.py

@@ -63,13 +63,6 @@ def stream(self):
             default=None,
             help=
             "The interface to use, 'hci0' for gatt or a com port for bgapi.")
-        parser.add_argument(
-            "-t",
-            "--timeout",
-            dest="timeout",
-            type=float,
-            default=10.0,
-            help="Length of timeout before giving up on connecting to an identified device.")
         parser.add_argument("-P",
             "--preset",
             type=int,
@@ -111,7 +104,7 @@ def stream(self):
         from . import stream
 
         stream(args.address, args.backend, args.interface, args.name, args.ppg,
-               args.acc, args.gyro, args.disable_eeg, args.preset, args.disable_light, args.timeout)
+               args.acc, args.gyro, args.disable_eeg, args.preset, args.disable_light)
 
     def record(self):
         parser = argparse.ArgumentParser(
@@ -180,13 +173,6 @@ def record_direct(self):
             default=None,
             help=
             "The interface to use, 'hci0' for gatt or a com port for bgapi.")
-        parser.add_argument(
-            "-t",
-            "--timeout",
-            dest="timeout",
-            type=float,
-            default=10.0,
-            help="Length of timeout before giving up on connecting to an identified device.")
         parser.add_argument(
             "-d",
             "--duration",
@@ -204,7 +190,7 @@ def record_direct(self):
         args = parser.parse_args(sys.argv[2:])
         from . import record_direct
         record_direct(args.duration, args.address, args.filename, args.backend,
-                      args.interface, args.name, args.timeout)
+                      args.interface, args.name)
 
     def view(self):
         parser = argparse.ArgumentParser(

muselsl/constants.py

@@ -41,7 +41,7 @@
 MUSE_GYRO_SCALE_FACTOR = 0.0074768
 
 MUSE_SCAN_TIMEOUT = 10.5
-# AUTO_DISCONNECT_DELAY = 3
+AUTO_DISCONNECT_DELAY = 3
 
 LSL_SCAN_TIMEOUT = 5
 LSL_BUFFER = 360

muselsl/muse.py

@@ -31,8 +31,7 @@ def __init__(self,
                  time_func=time,
                  name=None,
                  preset=None,
-                 disable_light=False,
-                 timeout=None):
+                 disable_light=False):
         """Initialize
 
         callback_eeg -- callback for eeg data, function(data, timestamps)
@@ -46,7 +45,6 @@ def __init__(self,
         """
 
         self.address = address
-        self.timeout = timeout
         self.name = name
         self.callback_eeg = callback_eeg
         self.callback_telemetry = callback_telemetry
@@ -78,7 +76,7 @@ def connect(self, interface=None):
             else:
                 logger.info('Connecting to %s: %s...' % (self.name
                                                    if self.name else 'Muse',
-                                                   self.address, int(self.timeout)))
+                                                   self.address))
                 if self.backend == 'gatt':
                     self.interface = self.interface or 'hci0'
                     self.adapter = pygatt.GATTToolBackend(self.interface)
@@ -89,7 +87,7 @@ def connect(self, interface=None):
                         serial_port=self.interface)
 
                 self.adapter.start()
-                self.device = self.adapter.connect(self.address, self.timeout)
+                self.device = self.adapter.connect(self.address)
                 if(self.preset != None):
                     self.select_preset(self.preset)
 

muselsl/record.py

@@ -183,8 +183,7 @@ def record_direct(duration,
                   filename=None,
                   backend='auto',
                   interface=None,
-                  name=None,
-                  timeout=None):
+                  name=None):
     if backend == 'bluemuse':
         raise (NotImplementedError(
             'Direct record not supported with BlueMuse backend. Use record after starting stream instead.'
@@ -212,8 +211,7 @@ def save_eeg(new_samples, new_timestamps):
         eeg_samples.append(new_samples)
         timestamps.append(new_timestamps)
 
-    muse = Muse(address, save_eeg, backend=backend, timeout=timeout)
-    print("Recording direct received", str(timeout), "for timeout!")
+    muse = Muse(address, save_eeg, backend=backend)
     muse.connect()
     muse.start()
 

muselsl/stream.py

@@ -11,7 +11,7 @@
 from . import backends
 from . import helper
 from .muse import Muse
-from .constants import MUSE_SCAN_TIMEOUT,  \
+from .constants import MUSE_SCAN_TIMEOUT, AUTO_DISCONNECT_DELAY,  \
     MUSE_NB_EEG_CHANNELS, MUSE_SAMPLING_EEG_RATE, LSL_EEG_CHUNK,  \
     MUSE_NB_PPG_CHANNELS, MUSE_SAMPLING_PPG_RATE, LSL_PPG_CHUNK, \
     MUSE_NB_ACC_CHANNELS, MUSE_SAMPLING_ACC_RATE, LSL_ACC_CHUNK, \
@@ -133,7 +133,7 @@ def stream(
     eeg_disabled=False,
     preset=None,
     disable_light=False,
-    timeout=None
+    timeout=AUTO_DISCONNECT_DELAY,
 ):
     # If no data types are enabled, we warn the user and return immediately.
     if eeg_disabled and not ppg_enabled and not acc_enabled and not gyro_enabled:
@@ -216,7 +216,8 @@ def push(data, timestamps, outlet):
         push_gyro = partial(push, outlet=gyro_outlet) if gyro_enabled else None
 
         muse = Muse(address=address, callback_eeg=push_eeg, callback_ppg=push_ppg, callback_acc=push_acc, callback_gyro=push_gyro,
-                    backend=backend, interface=interface, name=name, preset=preset, disable_light=disable_light, timeout=timeout)
+                    backend=backend, interface=interface, name=name, preset=preset, disable_light=disable_light)
+
         didConnect = muse.connect()
 
         if(didConnect):