Fix TimeSeries output over LSL

Author: retiutut

Networking-Test-Kit/LSL/lslStreamTest.py

@@ -9,7 +9,7 @@
 
 # create a new inlet to read from the stream
 inlet = StreamInlet(streams[0])
-duration = 5
+duration = 10
 
 sleep(1)
 
@@ -24,12 +24,13 @@ def testLSLSamplingRate():
         # get chunks of samples
         chunk, timestamp = inlet.pull_chunk()
         if chunk:
+            print("\nNew chunk!")
             numChunks += 1
             # print( len(chunk) )
             totalNumSamples += len(chunk)
-            # print(chunk);
+            # print(chunk)
             for sample in chunk:
-                # print(sample)
+                print(sample)
                 validSamples += 1
 
     print( "Number of Chunks and Samples == {} , {}".format(numChunks, totalNumSamples) )

OpenBCI_GUI/W_Networking.pde

@@ -957,7 +957,7 @@ class W_Networking extends Widget {
     // Fix #644 - Remove confusing #Chan textfield from Networking Widget and
     // account for this here
     private int getDataTypeNumChanLSL(String dataType) {
-        if (dataType.equals("TimeSeries")) {
+        if (dataType.equals("TimeSeriesFilt") || dataType.equals("TimeSeriesRaw")) {
             return currentBoard.getNumEXGChannels();
         } else if (dataType.equals("Focus")) {
             return 1;
@@ -1383,15 +1383,17 @@ class Stream extends Thread {
             }
 
         } else if (this.protocol.equals("LSL")) {
-
-            for (int i = 0; i < newDataFromBuffer.length; i++) {
-                for (int j = 0; j < newDataFromBuffer[i].length; j++) {
-                    dataToSend[j + numExgChannels * i] = newDataFromBuffer[i][j];
+            int numChannels = newDataFromBuffer.length;
+            int numSamples = newDataFromBuffer[0].length;
+            float[] _dataToSend = new float[numChannels * numSamples];
+            for (int sample = 0; sample < numSamples; sample++) {
+                for (int channel = 0; channel < numChannels; channel++) {
+                    _dataToSend[channel + sample * numChannels] = newDataFromBuffer[channel][sample];
                 }
             }
             // From LSLLink Library: The time stamps of other samples are automatically
             // derived based on the sampling rate of the stream.
-            outlet_data.push_chunk(dataToSend);
+            outlet_data.push_chunk(_dataToSend);
 
         } else if (this.protocol.equals("Serial")) {