Merge pull request #619 from OpenBCI/development

4.1.6 Stable Release w/ Fixes

Author: retiutut

CHANGELOG.md

@@ -1,6 +1,9 @@
 # v4.1.6
 Use OpenBCIHub v2.1.0 please.
 
+### Improvements
+* Fix LSL streaming more than one data type #592
+
 ## Beta 0
 
 ### Improvements

Networking-Test-Kit/LSL/lslStreamTest.py

@@ -0,0 +1,16 @@
+"""Example program to show how to read a multi-channel time series from LSL."""
+
+from pylsl import StreamInlet, resolve_stream
+
+# first resolve an EEG stream on the lab network
+print("looking for an EEG stream...")
+streams = resolve_stream('type', 'EEG')
+
+# create a new inlet to read from the stream
+inlet = StreamInlet(streams[0])
+
+while True:
+    # get a new sample (you can also omit the timestamp part if you're not
+    # interested in it)
+    sample, timestamp = inlet.pull_sample()
+    print(timestamp, sample)

Networking-Test-Kit/LSL/lslStreamTest_3Streams.py

@@ -0,0 +1,38 @@
+"""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
+
+numStreams = 3
+# first resolve an EEG stream on the lab network
+print("looking for an EEG stream...")
+stream1 = resolve_stream('name', 'obci_eeg1')
+stream2 = resolve_stream('name', 'obci_eeg2')
+stream3 = resolve_stream('name', 'obci_eeg3')
+
+# create a new inlet to read from the stream
+inlet = StreamInlet(stream1[0])
+inlet2 = StreamInlet(stream2[0])
+inlet3 = StreamInlet(stream3[0])
+
+while True:
+    for i in range(numStreams):
+        # get a new sample (you can also omit the timestamp part if you're not
+        # interested in it)
+        if i == 0:
+            chunk, timestamps = inlet.pull_chunk()
+            if timestamps:
+                print("Stream", i + 1, " == ", chunk)
+        elif i == 1:
+            chunk, timestamps = inlet2.pull_chunk()
+            if timestamps:
+                print("Stream", i + 1, " == ", chunk)
+        elif i == 2:
+            chunk, timestamps = inlet3.pull_chunk()
+            if timestamps:
+                print("Stream", i + 1, " == ", chunk)

OpenBCI_GUI/ControlPanel.pde

@@ -1797,15 +1797,6 @@ class SerialBox {
         autoConnect.setHelpText("Attempt to auto-connect to Cyton. Try \"Manual\" if this does not work.");
         popOutRadioConfigButton = new Button(x + w - 70 - padding, y + padding*3 + 4, 70, 24,"Manual >",fontInfo.buttonLabel_size);
         popOutRadioConfigButton.setHelpText("Having trouble connecting to Cyton? Click here to access Radio Configuration tools.");
-
-        serialList = new MenuList(cp5, "serialList", w - padding*2, 72, p4);
-        // println(w-padding*2);
-        serialList.setPosition(x + padding, y + padding*3 + 8);
-        serialPorts = Serial.list();
-        for (int i = 0; i < serialPorts.length; i++) {
-            String tempPort = serialPorts[(serialPorts.length-1) - i]; //list backwards... because usually our port is at the bottom
-            serialList.addItem(makeItem(tempPort));
-        }
     }
 
     public void update() {

OpenBCI_GUI/Info.plist.tmpl

@@ -23,7 +23,7 @@
         <key>CFBundleShortVersionString</key>
         <string>4</string>
         <key>CFBundleVersion</key>
-        <string>4.1.6-beta.0</string>
+        <string>4.1.6</string>
         <key>CFBundleSignature</key>
         <string>????</string>
         <key>NSHumanReadableCopyright</key>

OpenBCI_GUI/OpenBCI_GUI.pde

@@ -56,7 +56,7 @@ import com.sun.jna.Pointer;
 //                       Global Variables & Instances
 //------------------------------------------------------------------------
 //Used to check GUI version in TopNav.pde and displayed on the splash screen on startup
-String localGUIVersionString = "v4.1.6-beta.0";
+String localGUIVersionString = "v4.1.6";
 String localGUIVersionDate = "September 2019";
 String guiLatestReleaseLocation = "https://github.com/OpenBCI/OpenBCI_GUI/releases/latest";
 Boolean guiVersionCheckHasOccured = false;
@@ -839,6 +839,7 @@ void initSystem() throws Exception {
             outputError("Failed to connect. Check that the device is powered on and in range.");
         }
         controlPanel.open();
+        systemMode = SYSTEMMODE_PREINIT; // leave this here
     }
 
     //reset init variables

OpenBCI_GUI/W_Networking.pde

@@ -192,9 +192,11 @@ class W_Networking extends Widget {
             if (stream2!=null) {
                 stream2.run();
             }
-            if (stream2!=null) {
-                stream2.run();
+            if (stream3!=null) {
+                stream3.run();
             }
+            //Setting this var here fixes #592 to allow multiple LSL streams
+            dataProcessing.newDataToSend = false;
         }
 
         checkTopNovEvents();
@@ -1297,8 +1299,7 @@ class Stream extends Thread {
                     } else if (this.dataType.equals("SSVEP")) {
                         sendSSVEPData();
                     }
-                    setDataFalse();
-                    // newData = false;
+                    //setDataFalse(); //Wait until all streams are done, Fixes 592
                 }
             }
         }
@@ -1344,6 +1345,7 @@ class Stream extends Thread {
             dataProcessing.newDataToSend = false;
         }
     }
+
     /* This method contains all of the policies for sending data types */
     void sendTimeSeriesData() {