port changes (#1075)

* data format change (#42)

Author: Andrey1994

CHANGELOG.md

@@ -3,7 +3,7 @@
 ### Bug Fixes
 
 ### Improvements
-* Update to BrainFlow 5.0.1
+* Update to BrainFlow 5.1.0
 
 # v5.1.0
 

OpenBCI_GUI/AccelerometerCapableBoard.pde

@@ -8,4 +8,8 @@ interface AccelerometerCapableBoard {
     public boolean canDeactivateAccelerometer();
 
     public int[] getAccelerometerChannels();
+
+    public List<double[]> getDataWithAccel(int maxSamples);
+
+    public int getAccelSampleRate();
 };

OpenBCI_GUI/AnalogCapableBoard.pde

@@ -8,4 +8,8 @@ interface AnalogCapableBoard {
     public boolean canDeactivateAnalog();
 
     public int[] getAnalogChannels();
+
+    public List<double[]> getDataWithAnalog(int maxSamples);
+
+    public int getAnalogSampleRate();
 };

OpenBCI_GUI/AuxDataBoard.pde

@@ -0,0 +1,15 @@
+
+interface AuxDataBoard {
+
+    public List<double[]> getAuxData(int maxSamples);
+
+    public String[] getAuxChannelNames();
+
+    public double[][] getAuxFrameData();
+
+    public int getAuxSampleRate();
+
+    public int getNumAuxChannels();
+
+    public int getAuxTimestampChannel();
+};

OpenBCI_GUI/BatteryInfoCapableBoard.pde

@@ -2,4 +2,8 @@
 interface BatteryInfoCapableBoard {
 
     public Integer getBatteryChannel();
+
+    public List<double[]> getDataWithBatteryInfo(int maxSamples);
+
+    public int getBatteryInfoSampleRate();
 };

OpenBCI_GUI/BoardBrainFlowStreaming.pde

@@ -26,7 +26,7 @@ public enum BrainFlowStreaming_Boards
     }
 }
 
-class BoardBrainFlowStreaming extends BoardBrainFlow implements AccelerometerCapableBoard {
+class BoardBrainFlowStreaming extends BoardBrainFlow {
 
     private BoardIds masterBoardId;
     private String ipAddress;
@@ -93,35 +93,6 @@ class BoardBrainFlowStreaming extends BoardBrainFlow implements AccelerometerCap
         // do nothing here
     }
 
-    @Override
-    public boolean isAccelerometerActive() {
-        if (getAccelerometerChannels().length != 0) {
-            return true;
-        }
-        return false;
-    }
-
-    @Override
-    public void setAccelerometerActive(boolean active) {
-        // nothing
-    }
-
-    @Override
-    public boolean canDeactivateAccelerometer() {
-        return false;
-    }
-
-    @Override
-    public int[] getAccelerometerChannels() {
-        try {
-            return BoardShim.get_accel_channels(masterBoardId.get_code());
-        } catch (BrainFlowError e) {
-            // nothing
-        }
-
-        return new int[0];
-    }
-
     @Override
     protected PacketLossTracker setupPacketLossTracker() {
         if (masterBoardId == BoardIds.CYTON_DAISY_BOARD) {

OpenBCI_GUI/BoardBrainFlowSynthetic.pde

@@ -180,4 +180,44 @@ implements AccelerometerCapableBoard, PPGCapableBoard, EDACapableBoard, BatteryI
         return new PacketLossTracker(getSampleIndexChannel(), getTimestampChannel(),
                                     minSampleIndex, maxSampleIndex);
     }
+
+    @Override
+    public List<double[]> getDataWithAccel(int maxSamples) {
+        return getData(maxSamples);
+    }
+
+    @Override
+    public List<double[]> getDataWithPPG(int maxSamples) {
+        return getData(maxSamples);
+    }
+
+    @Override
+    public List<double[]> getDataWithEDA(int maxSamples) {
+        return getData(maxSamples);
+    }
+
+    @Override
+    public List<double[]> getDataWithBatteryInfo(int maxSamples) {
+        return getData(maxSamples);
+    }
+
+    @Override
+    public int getAccelSampleRate() {
+        return getSampleRate();
+    }
+
+    @Override
+    public int getPPGSampleRate() {
+        return getSampleRate();
+    }
+
+    @Override
+    public int getEDASampleRate() {
+        return getSampleRate();
+    }
+
+    @Override
+    public int getBatteryInfoSampleRate() {
+        return getSampleRate();
+    }
 };

OpenBCI_GUI/BoardBrainflow.pde

@@ -37,6 +37,8 @@ abstract class BoardBrainFlow extends Board {
                 e.printStackTrace();
             }
             boardShim.prepare_session();
+            if (brainflowStreamer != "")
+                boardShim.add_streamer(brainflowStreamer);
             return true; 
 
         } catch (Exception e) {
@@ -75,7 +77,7 @@ abstract class BoardBrainFlow extends Board {
         }
 
         try {
-            boardShim.start_stream (450000, brainflowStreamer);
+            boardShim.start_stream (450000);
             streaming = true;
         }
         catch (BrainFlowError e) {

OpenBCI_GUI/BoardCyton.pde

@@ -310,6 +310,21 @@ implements ImpedanceSettingsBoard, AccelerometerCapableBoard, AnalogCapableBoard
         return currentADS1299Settings.isChannelActive(channelIndex);
     }
 
+    @Override
+    public int getAccelSampleRate() {
+        return getSampleRate();
+    }
+
+    @Override
+    public int getAnalogSampleRate() {
+        return getSampleRate();
+    }
+
+    @Override
+    public int getDigitalSampleRate() {
+        return getSampleRate();
+    }
+
     @Override
     public boolean isAccelerometerActive() {
         return getBoardMode() == CytonBoardMode.DEFAULT;
@@ -632,4 +647,19 @@ implements ImpedanceSettingsBoard, AccelerometerCapableBoard, AnalogCapableBoard
     public void setUseDynamicScaler(boolean val) {
         useDynamicScaler = val;
     }
+
+    @Override
+    public List<double[]> getDataWithAccel(int maxSamples) {
+        return getData(maxSamples);
+    }
+
+    @Override
+    public List<double[]> getDataWithAnalog(int maxSamples) {
+        return getData(maxSamples);
+    }
+
+    @Override
+    public List<double[]> getDataWithDigital(int maxSamples) {
+        return getData(maxSamples);
+    }
 };