rm dynamic scaler option, it will be only in brainflow (#1082)

* rm dynamic scaler option, it will be only in brainflow

Signed-off-by: Andrey Parfenov <a1994ndrey@gmail.com>

Author: Andrey1994

OpenBCI_GUI/ADS1299SettingsBoard.pde

@@ -345,6 +345,4 @@ interface ADS1299SettingsBoard {
     public ADS1299Settings getADS1299Settings();
     public char getChannelSelector(int channel);
     public double getGain(int channel);
-    public void setUseDynamicScaler(boolean val);
-    public boolean getUseDynamicScaler();
 };

OpenBCI_GUI/BoardCyton.pde

@@ -252,16 +252,12 @@ implements ImpedanceSettingsBoard, AccelerometerCapableBoard, AnalogCapableBoard
     protected boolean[] isCheckingImpedanceN;
     protected boolean[] isCheckingImpedanceP;
 
-    // same for all channels
-    private final double brainflowGain = 24.0;
-
     private int[] accelChannelsCache = null;
     private int[] analogChannelsCache = null;
 
     protected String serialPort = "";
     protected String ipAddress = "";
     private CytonBoardMode currentBoardMode = CytonBoardMode.DEFAULT;
-    private boolean useDynamicScaler;
 
     public BoardCyton() {
         super();
@@ -276,7 +272,6 @@ implements ImpedanceSettingsBoard, AccelerometerCapableBoard, AnalogCapableBoard
 
         // The command 'd' is automatically sent by brainflow on prepare_session
         currentADS1299Settings = new CytonDefaultSettings(this);
-        useDynamicScaler = true;
     }
 
     // implement mandatory abstract functions
@@ -554,24 +549,6 @@ implements ImpedanceSettingsBoard, AccelerometerCapableBoard, AnalogCapableBoard
         }
     }
 
-    @Override
-    protected double[][] getNewDataInternal() {
-        double[][] data = super.getNewDataInternal();
-        int[] exgChannels = getEXGChannels();
-        for (int i = 0; i < exgChannels.length; i++) {
-            for (int j = 0; j < data[exgChannels[i]].length; j++) {
-                // brainflow assumes a fixed gain of 24. Undo brainflow's scaling and apply new scale.
-                double currentGain = 1.0;
-                if (useDynamicScaler) {
-                    currentGain = currentADS1299Settings.values.gain[i].getScalar();
-                }
-                double scalar = brainflowGain / currentGain;
-                data[exgChannels[i]][j] *= scalar;
-            }
-        }
-        return data;
-    }
-
     @Override
     public ADS1299Settings getADS1299Settings() {
         return currentADS1299Settings;
@@ -638,16 +615,6 @@ implements ImpedanceSettingsBoard, AccelerometerCapableBoard, AnalogCapableBoard
         return getADS1299Settings().values.gain[channel].getScalar();
     }
 
-    @Override
-    public boolean getUseDynamicScaler() {
-        return useDynamicScaler;
-    }
-
-    @Override
-    public void setUseDynamicScaler(boolean val) {
-        useDynamicScaler = val;
-    }
-
     @Override
     public List<double[]> getDataWithAccel(int maxSamples) {
         return getData(maxSamples);

OpenBCI_GUI/Extras.pde

@@ -469,10 +469,7 @@ class DataStatus {
         }
 
         if (currentBoard instanceof ADS1299SettingsBoard) {
-            double scaler =  (4.5 / (pow (2, 23) - 1) / 1.0 * 1000000.);
-            if (((ADS1299SettingsBoard)currentBoard).getUseDynamicScaler()) {
-                scaler =  (4.5 / (pow (2, 23) - 1) / ((ADS1299SettingsBoard)currentBoard).getGain(channel) * 1000000.);
-            }
+            double scaler =  (4.5 / (pow (2, 23) - 1) / ((ADS1299SettingsBoard)currentBoard).getGain(channel) * 1000000.);
             double maxVal = scaler * pow (2, 23);
             int numSeconds = 3;
             int nPoints = numSeconds * currentBoard.getSampleRate();