Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor the creation and playback of OpenBCI GUI data files #1120

Merged
merged 8 commits into from
May 15, 2023
Merged

Refactor the creation and playback of OpenBCI GUI data files #1120

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
cb83977
Refactor creation and playback of OpenBCI CSV files
retiutut Feb 8, 2023
67a5e0c
Remove try/catch in DataLogger.pde
retiutut Feb 8, 2023
71c514b
Add classes and methods for all DataSourcePlayback boards
retiutut Feb 13, 2023
7dcd64d
Remove BatteryInfo, EDA, and PPG boards from this repo
retiutut Mar 14, 2023
f007e5a
Fix line endings in datawriterodf, fileboard, signalcheckthresholds, …
retiutut May 5, 2023
489c27a
Add comment clarifying usage of MenuList Class in CustomCp5Classes.pde
retiutut May 5, 2023
1311886
Fix bug in names of SessionSettings getPath() method
retiutut May 9, 2023
a83527f
Update changelog and bump to version 5.1.1-alpha.3
retiutut May 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions OpenBCI_GUI/BatteryInfoCapableBoard.pde
View file
Open in desktop

This file was deleted.

104 changes: 1 addition & 103 deletions OpenBCI_GUI/BoardBrainFlowSynthetic.pde
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,9 @@ import brainflow.*;

import org.apache.commons.lang3.tuple.Pair;

class BoardBrainFlowSynthetic extends BoardBrainFlow
implements AccelerometerCapableBoard, PPGCapableBoard, EDACapableBoard, BatteryInfoCapableBoard {
class BoardBrainFlowSynthetic extends BoardBrainFlow implements AccelerometerCapableBoard {
retiutut marked this conversation as resolved.
Show resolved Hide resolved

private int[] accelChannelsCache = null;
private int[] edaChannelsCache = null;
private int[] ppgChannelsCache = null;
private Integer batteryChannelCache = null;
private int numChannels = 0;
private volatile boolean[] activeChannels = null;

Expand Down Expand Up @@ -97,80 +93,12 @@ implements AccelerometerCapableBoard, PPGCapableBoard, EDACapableBoard, BatteryI
return accelChannelsCache;
}

@Override
public boolean isPPGActive() {
return true;
}

@Override
public void setPPGActive(boolean active) {
outputWarn("PPG is always active for BrainflowSyntheticBoard");
}

@Override
public int[] getPPGChannels() {
if(ppgChannelsCache == null) {
try {
ppgChannelsCache = BoardShim.get_ppg_channels(getBoardIdInt());

} catch (BrainFlowError e) {
e.printStackTrace();
}
}

return ppgChannelsCache;
}

@Override
public boolean isEDAActive() {
return true;
}

@Override
public void setEDAActive(boolean active) {
outputWarn("EDA is always active for BrainflowSyntheticBoard");
}

@Override
public int[] getEDAChannels() {
if (edaChannelsCache == null) {
try {
edaChannelsCache = BoardShim.get_eda_channels(getBoardIdInt());

} catch (BrainFlowError e) {
e.printStackTrace();
}
}

return edaChannelsCache;
}

@Override
public Integer getBatteryChannel() {
if (batteryChannelCache == null) {
try {
batteryChannelCache = BoardShim.get_battery_channel(getBoardIdInt());
} catch (BrainFlowError e) {
e.printStackTrace();

}
}

return batteryChannelCache;
}

@Override
protected void addChannelNamesInternal(String[] channelNames) {
for (int i=0; i<getEDAChannels().length; i++) {
channelNames[getEDAChannels()[i]] = "EDA Channel " + i;
}
for (int i=0; i<getPPGChannels().length; i++) {
channelNames[getPPGChannels()[i]] = "PPG Channel " + i;
}
for (int i=0; i<getAccelerometerChannels().length; i++) {
channelNames[getAccelerometerChannels()[i]] = "Accel Channel " + i;
}
channelNames[getBatteryChannel()] = "Battery Info Channel";
}

@Override
Expand All @@ -186,38 +114,8 @@ implements AccelerometerCapableBoard, PPGCapableBoard, EDACapableBoard, BatteryI
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();
}
};
1 change: 1 addition & 0 deletions OpenBCI_GUI/CustomCp5Classes.pde
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@ class ButtonHelpText{
////////////////////////////////////////////////////////////////////////////////////
// MENULIST CLASS //
// Based on ControlP5 Processing Library example, written by Andreas Schlegel //
// WARNING: This class does not respond well to being resized -RW 5/5/23 //
////////////////////////////////////////////////////////////////////////////////////
public class MenuList extends controlP5.Controller {

Expand Down
Loading