Merge pull request #1009 from OpenBCI/development

Development 5.0.9

Author: retiutut

CHANGELOG.md

@@ -1,3 +1,12 @@
+# v5.0.9
+
+### Bug Fixes
+* Change TimeSeries y-axis textfields to labels to increase performance and fix font on some Macs
+
+### Improvements
+* For Cyton, only allow checking impedance on one channel at a time #983
+* Make new Cyton Signal Check Widget #983
+
 # v5.0.8
 
 ### Bug Fixes

OpenBCI_GUI/ADS1299SettingsBoard.pde

@@ -143,6 +143,7 @@ class ADS1299Settings {
 
     public ADS1299SettingsValues values;
     public ADS1299SettingsValues previousValues;
+    private ADS1299SettingsValues defaultValues;
 
     protected Board board;
     protected ADS1299SettingsBoard settingsBoard;
@@ -152,6 +153,7 @@ class ADS1299Settings {
         settingsBoard = (ADS1299SettingsBoard)theBoard;
         values = new ADS1299SettingsValues();
         previousValues = new ADS1299SettingsValues();
+        defaultValues = new ADS1299SettingsValues();
 
         int channelCount = board.getNumEXGChannels();
 
@@ -185,6 +187,10 @@ class ADS1299Settings {
         values.previousBias = values.bias.clone();
         values.previousSrb2 = values.srb2.clone();
         values.previousInputType = values.inputType.clone();
+
+        String currentVals = getJson();
+        Gson gson = new Gson();
+        defaultValues = gson.fromJson(currentVals, ADS1299SettingsValues.class);
     }
 
     public boolean loadSettingsValues(String filename) {
@@ -271,6 +277,26 @@ class ADS1299Settings {
         return success;
     }
 
+    //Return true if all commits are successful
+    public boolean commitDefaultsAllAtOnce() {
+        StringBuilder sb = new StringBuilder();
+        for (int i = 0; i < board.getNumEXGChannels(); i++) {
+            String command = String.format("x%c%d%d%d%d%d%dX", settingsBoard.getChannelSelector(i),
+                                        defaultValues.powerDown[i].ordinal(), defaultValues.gain[i].ordinal(),
+                                        defaultValues.inputType[i].ordinal(), defaultValues.bias[i].ordinal(),
+                                        defaultValues.srb2[i].ordinal(), defaultValues.srb1[i].ordinal());
+            sb.append(command);
+        }
+        return board.sendCommand(sb.toString()).getKey().booleanValue();
+    }
+
+    //Return true if all commits are successful
+    public void revertAllChannelsToDefaultValues() {
+        Gson gson = new GsonBuilder().setPrettyPrinting().create();
+        String defaultValsAsString = gson.toJson(defaultValues);
+        values = gson.fromJson(defaultValsAsString, ADS1299SettingsValues.class);
+    }
+
     public void saveAllLastValues() {
         String lastVals = getJson();
         Gson gson = new Gson();
@@ -285,6 +311,14 @@ class ADS1299Settings {
         previousValues.srb1[chan] = values.srb1[chan];
     }
 
+    public void revertToLastValues(int chan) {
+        values.gain[chan] = previousValues.gain[chan];
+        values.inputType[chan] = previousValues.inputType[chan];
+        values.bias[chan] = previousValues.bias[chan];
+        values.srb2[chan] = previousValues.srb2[chan];
+        values.srb1[chan] = previousValues.srb1[chan];
+    }
+
     public boolean equalsLastValues(int chan) {        
         boolean equal = previousValues.gain[chan] == values.gain[chan] &&
                         previousValues.inputType[chan] == values.inputType[chan] &&
@@ -294,6 +328,15 @@ class ADS1299Settings {
                         ;
         return equal;
     }
+
+    //Get previous or current values as a string
+    public String getValuesString(int chan, ADS1299SettingsValues vals) {
+        String commandString = String.format("x%c%d%d%d%d%d%dX", settingsBoard.getChannelSelector(chan),
+                                        vals.powerDown[chan].ordinal(), vals.gain[chan].ordinal(),
+                                        vals.inputType[chan].ordinal(), vals.bias[chan].ordinal(),
+                                        vals.srb2[chan].ordinal(), vals.srb1[chan].ordinal());
+        return commandString;
+    }
 }
 
 interface ADS1299SettingsBoard {

OpenBCI_GUI/ADS1299SettingsController.pde

@@ -491,9 +491,14 @@ class ADS1299SettingsController {
         c = isActive ? (boardSettings.values.srb1[chan] == Srb1.CONNECT ? yesOnColor : noOffColor) : darkNotActive;   
         srb1Lists[chan].setValue(boardSettings.values.srb1[chan].ordinal());
         srb1Lists[chan].setColorBackground(c);
-        srb1Lists[chan].setLock(!isActive);
+        srb1Lists[chan].setLock(!isActive);  
+    }
 
-        
+    public void updateAllChanSettingsDropdowns() {
+        for (int i = 0; i < currentBoard.getNumEXGChannels(); i++) {
+            updateChanSettingsDropdowns(i, currentBoard.isEXGChannelActive(i));
+            setHasUnappliedSettings(i, false);
+        }
     }
 
     private class SLCallbackListener implements CallbackListener {

OpenBCI_GUI/BoardCyton.pde

@@ -249,6 +249,8 @@ implements ImpedanceSettingsBoard, AccelerometerCapableBoard, AnalogCapableBoard
 
     private ADS1299Settings currentADS1299Settings;
     private boolean[] isCheckingImpedance;
+    protected boolean[] isCheckingImpedanceN;
+    protected boolean[] isCheckingImpedanceP;
 
     // same for all channels
     private final double brainflowGain = 24.0;
@@ -267,6 +269,11 @@ implements ImpedanceSettingsBoard, AccelerometerCapableBoard, AnalogCapableBoard
         isCheckingImpedance = new boolean[getNumEXGChannels()];
         Arrays.fill(isCheckingImpedance, false);
 
+        isCheckingImpedanceN= new boolean[getNumEXGChannels()];
+        isCheckingImpedanceP= new boolean[getNumEXGChannels()];
+        Arrays.fill(isCheckingImpedanceN, false);
+        Arrays.fill(isCheckingImpedanceP, false);
+
         // The command 'd' is automatically sent by brainflow on prepare_session
         currentADS1299Settings = new CytonDefaultSettings(this);
         useDynamicScaler = true;
@@ -416,9 +423,120 @@ implements ImpedanceSettingsBoard, AccelerometerCapableBoard, AnalogCapableBoard
         isCheckingImpedance[channel] = active;
     }
 
+    //Use this method instead of the one above!
+    public Pair<Boolean, String> setCheckingImpedanceCyton(final int channel, final boolean active, final boolean _isN) {
+
+        char p = '0';
+        char n = '0';
+        //Build a command string so we can send 1 command to Cyton instead of 2!
+        //Hopefully, this lowers the chance of confusing the board with multiple commands sent quickly
+        StringBuilder fullCommand = new StringBuilder();
+
+        //println("CYTON_IMP_CHECK -- Attempting to change channel== " + channel + " || isActive == " + active);
+
+        if (active) {
+            
+            currentADS1299Settings.saveLastValues(channel);
+
+            currentADS1299Settings.values.gain[channel] = Gain.X1;
+            currentADS1299Settings.values.inputType[channel] = InputType.NORMAL;
+            currentADS1299Settings.values.bias[channel] = Bias.INCLUDE;
+            currentADS1299Settings.values.srb2[channel] = Srb2.DISCONNECT;
+            currentADS1299Settings.values.srb1[channel] = Srb1.DISCONNECT;
+
+            fullCommand.append(currentADS1299Settings.getValuesString(channel, currentADS1299Settings.values));
+            
+            if (_isN) {
+                n = '1';
+            } else {
+                p = '1';
+            }
+
+        } else {
+            //Revert ADS channel settings to what user had before checking impedance on this channel
+            currentADS1299Settings.revertToLastValues(channel);
+            fullCommand.append(currentADS1299Settings.getValuesString(channel, currentADS1299Settings.values));
+            //println("CYTON REVERTING TO PREVIOUS ADS SETTINGS");
+        }
+        
+        // Format the impedance command string. Example: z 4 1 0 Z
+        String impedanceCommandString = String.format("z%c%c%cZ", channelSelectForSettings[channel], p, n);
+        fullCommand.append(impedanceCommandString);
+        final String commandToSend = fullCommand.toString();
+
+        final Pair<Boolean, String> fullResponse = sendCommand(commandToSend);
+        boolean response = fullResponse.getKey().booleanValue();
+        if (!response) {
+            outputWarn("Cyton Impedance Check - Error sending impedance command to board.");
+            if (active) {
+                currentADS1299Settings.revertToLastValues(channel);
+                return new ImmutablePair<Boolean, String>(false, "Error");
+            }
+        }
+
+        if (_isN) {
+            isCheckingImpedanceN[channel] = active;
+        } else {
+            isCheckingImpedanceP[channel] = active;
+        }
+
+        return fullResponse;
+    }
+
     @Override
+    //General check that is a method for all impedance boards
     public boolean isCheckingImpedance(int channel) {
-        return isCheckingImpedance[channel];
+        return isCheckingImpedanceN[channel] || isCheckingImpedanceP[channel];
+    }
+
+    //Specifically check the status of N or P pins
+    public boolean isCheckingImpedanceNorP(int channel, boolean _isN) {
+        if (_isN) {
+            return isCheckingImpedanceN[channel];
+        }
+        return isCheckingImpedanceP[channel];
+    }
+
+    //Returns <pin, channel> if found
+    //Return <null,null> if not checking on any channels
+    public Pair<Boolean, Integer> isCheckingImpedanceOnAnyChannelsNorP() {
+        Boolean is_n_pin = true;
+        for (int i = 0; i < isCheckingImpedanceN.length; i++) {
+            if (isCheckingImpedanceN[i]) {
+                return new ImmutablePair<Boolean, Integer>(is_n_pin, Integer.valueOf(i));
+            }
+            if (isCheckingImpedanceP[i]) {
+                is_n_pin = false;
+                return new ImmutablePair<Boolean, Integer>(is_n_pin, Integer.valueOf(i));
+            }
+        }
+        return new ImmutablePair<Boolean, Integer>(null, null);
+    }
+
+    //Returns the channel number where impedance check is currently active, otherwise return null
+    //Less detailed than the previous method
+    @Override
+    public Integer isCheckingImpedanceOnChannel() {
+        //printArray(isCheckingImpedance);
+        for (int i = 0; i < isCheckingImpedance.length; i++) {
+            if (isCheckingImpedance(i)) {
+                return i;
+            }
+        }
+        return null;
+    }
+
+    public void forceStopImpedanceFrontEnd(Integer channel, Boolean _isN) {
+        if (channel == null || _isN == null) {
+            outputError("OOPS! Are you sure you know what you are doing with this method? Please pass non-null values.");
+            return;
+        }
+
+        if (_isN) {
+            isCheckingImpedanceN[channel] = false;
+        } else {
+            isCheckingImpedanceP[channel] = false;
+        }
     }
 
     @Override

OpenBCI_GUI/BoardGalea.pde

@@ -270,6 +270,17 @@ implements ImpedanceSettingsBoard, EDACapableBoard, PPGCapableBoard, BatteryInfo
         return isCheckingImpedance[channel];
     }
 
+    //Returns the channel number where impedance check is currently active, otherwise return null
+    @Override
+    public Integer isCheckingImpedanceOnChannel() {
+        for (int i = 0; i < isCheckingImpedance.length; i++) {
+            if (isCheckingImpedance[i]) {
+                return i;
+            }
+        }
+        return null;
+    }
+
     @Override
     protected double[][] getNewDataInternal() {
         double[][] data = super.getNewDataInternal();