Add a networking frame lock for each stream

- allows for multiple streams
- Tested using networking test kit

Author: retiutut

Networking-Test-Kit/LSL/lslStreamTest_3Streams.py

@@ -1,60 +1,60 @@
-"""Example program to demonstrate how to read a multi-channel time-series
-from LSL in a chunk-by-chunk manner (which is more efficient).
-
-Please restart this script if you change one of the data types.
-Also, the # Chan should match the data type (Examples: 1 for Focus, 3 for Accel)
-
-"""
-
-from pylsl import StreamInlet, resolve_stream
-import time
-
-numStreams = 3
-duration_seconds = 20
-# first resolve an EEG stream on the lab network
-print("looking for an EEG stream...")
-stream_1 = resolve_stream('type', 'EEG')
-stream_2 = resolve_stream('type', 'AUX')
-stream_3 = resolve_stream('type', 'FOCUS')
-
-# create a new inlet to read from the stream
-inlet = StreamInlet(stream_1[0])
-intlet_2 = StreamInlet(stream_2[0])
-intlet_3 = StreamInlet(stream_3[0])
-
-def testLSLSamplingRates():
-    print( "Testing Sampling Rates for {} seconds".format(duration_seconds) )
-    start = time.time()
-    num_samples_1 = 0
-    num_samples_2 = 0
-    num_samples_3 = 0
-    while time.time() < start + duration_seconds:
-    # get a new sample (you can also omit the timestamp part if you're not
-    # interested in it)
-        for i in range(numStreams):
-            if i == 0:
-                chunk, timestamps = inlet.pull_chunk()
-                if timestamps:
-                    for sample in chunk:
-                        if sample:
-                            num_samples_1 += 1
-                            #print(sample)
-            elif i == 1:
-                chunk, timestamps_2 = intlet_2.pull_chunk()
-                if timestamps_2:
-                    for sample in chunk:
-                        num_samples_2 += 1
-                        #print(sample)
-            elif i == 2:
-                chunk, timestamps_3 = intlet_3.pull_chunk()
-                if timestamps_3:
-                    for sample in chunk:
-                        num_samples_3 += 1
-                        #print(sample)
-            #print("Stream", i + 1, " == ", chunk)
-    print( "Stream 1 Sampling Rate == ", num_samples_1 / duration_seconds, " | Type : EEG")
-    print( "Stream 2 Sampling Rate == ", num_samples_2 / duration_seconds, " | Type : AUX")
-    print( "Stream 3 Sampling Rate == ", num_samples_3 / duration_seconds, " | Type : FOCUS")
-
-
+"""Example program to demonstrate how to read a multi-channel time-series
+from LSL in a chunk-by-chunk manner (which is more efficient).
+
+Please restart this script if you change one of the data types.
+Also, the # Chan should match the data type (Examples: 1 for Focus, 3 for Accel)
+
+"""
+
+from pylsl import StreamInlet, resolve_stream
+import time
+
+numStreams = 3
+duration_seconds = 10
+# first resolve an EEG stream on the lab network
+print("looking for an EEG stream...")
+stream_1 = resolve_stream('type', 'EEG')
+stream_2 = resolve_stream('type', 'AUX')
+stream_3 = resolve_stream('type', 'FOCUS')
+
+# create a new inlet to read from the stream
+inlet = StreamInlet(stream_1[0])
+inlet_2 = StreamInlet(stream_2[0])
+inlet_3 = StreamInlet(stream_3[0])
+
+def testLSLSamplingRates():
+    print( "Testing Sampling Rates for {} seconds".format(duration_seconds) )
+    start = time.time()
+    num_samples_1 = 0
+    num_samples_2 = 0
+    num_samples_3 = 0
+    while time.time() < start + duration_seconds:
+    # get a new sample (you can also omit the timestamp part if you're not
+    # interested in it)
+        for i in range(numStreams):
+            if i == 0:
+                chunk, timestamps = inlet.pull_chunk()
+                if timestamps:
+                    for sample in chunk:
+                        if sample:
+                            num_samples_1 += 1
+                            #print(sample)
+            elif i == 1:
+                chunk, timestamps_2 = inlet_2.pull_chunk()
+                if timestamps_2:
+                    for sample in chunk:
+                        num_samples_2 += 1
+                        #print(sample)
+            elif i == 2:
+                chunk, timestamps_3 = inlet_3.pull_chunk()
+                if timestamps_3:
+                    for sample in chunk:
+                        num_samples_3 += 1
+                        #print(sample)
+            #print("Stream", i + 1, " == ", chunk)
+    print( "Stream 1 Sampling Rate == ", num_samples_1 / duration_seconds, " | Type : EEG")
+    print( "Stream 2 Sampling Rate == ", num_samples_2 / duration_seconds, " | Type : AUX")
+    print( "Stream 3 Sampling Rate == ", num_samples_3 / duration_seconds, " | Type : FOCUS")
+
+
 testLSLSamplingRates()

Networking-Test-Kit/LSL/lslStreamTest_PullSample.py

@@ -0,0 +1,36 @@
+"""Here we show that we can use push_sample to send and pull_chunk to receive a sample."""
+import time
+from pylsl import StreamInlet, resolve_stream
+from time import sleep
+
+# first resolve an EEG stream on the lab network
+print("looking for an EEG stream...")
+streams = resolve_stream('type', 'FOCUS')
+
+# create a new inlet to read from the stream
+inlet = StreamInlet(streams[0])
+duration = 5
+
+sleep(1)
+
+def testLSLSamplingRate():
+    start = time.time()
+    totalNumSamples = 0
+    validSamples = 0
+    numChunks = 0
+    print( "Testing Sampling Rates..." )
+
+    while time.time() <= start + duration:
+        # print(time.time())
+        # get chunks of samples
+        sample, timestamp = inlet.pull_chunk()
+        if sample:
+            print(sample)
+            validSamples += 1
+
+    #print( "Number of Chunks and Samples == {} , {}".format(numChunks, totalNumSamples) )
+    #print( "Valid Samples and Duration == {} / {}".format(validSamples, duration) )
+    print( "Avg Sampling Rate == {}".format(validSamples / duration) )
+
+
+testLSLSamplingRate()

OpenBCI_GUI/OpenBCI_GUI.pde

@@ -521,7 +521,7 @@ synchronized void draw() {
             reinitRequested = false;
         }
         if (systemMode == SYSTEMMODE_POSTINIT) {
-            w_networking.networkingFrameLock.compareAndSet(false, true);
+            w_networking.compareAndSetNetworkingFrameLocks();
         }
     } else if (systemMode == SYSTEMMODE_INTROANIMATION) {
         if (settings.introAnimationInit == 0) {