Skip to content

Commit 9e600fd

Browse files
committed
update brainflow version
Signed-off-by: Andrey Parfenov <[email protected]>
1 parent 603d855 commit 9e600fd

23 files changed

+18
-25
lines changed

.idea/compiler.xml

+6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/gradle.xml

+3-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/runConfigurations.xml

-12
This file was deleted.
21 MB
Binary file not shown.

app/src/main/java/com/example/brainflowplot/ui/dataplot/DataPlotFragment.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -90,11 +90,11 @@ public void run() {
9090
tmpArray = tempArray;
9191
}
9292
for (int i = 0; i < DataActivity.channels.length; i++) {
93-
DataFilter.perform_bandstop(tmpArray[DataActivity.channels[i]], DataActivity.samplingRate, 50.0, 4.0, 2,
93+
DataFilter.perform_bandstop(tmpArray[DataActivity.channels[i]], DataActivity.samplingRate, 48.0, 52.0, 2,
9494
FilterTypes.BUTTERWORTH.get_code (), 0.0);
95-
DataFilter.perform_bandstop(tmpArray[DataActivity.channels[i]], DataActivity.samplingRate, 60.0, 4.0, 2,
95+
DataFilter.perform_bandstop(tmpArray[DataActivity.channels[i]], DataActivity.samplingRate, 58.0, 62.0, 2,
9696
FilterTypes.BUTTERWORTH.get_code (), 0.0);
97-
DataFilter.perform_bandpass(tmpArray[DataActivity.channels[i]], DataActivity.samplingRate, 24.0, 47.0, 2,
97+
DataFilter.perform_bandpass(tmpArray[DataActivity.channels[i]], DataActivity.samplingRate, 2.0, 47.0, 2,
9898
FilterTypes.BUTTERWORTH.get_code (), 0.0);
9999
}
100100
// downsampling

app/src/main/java/com/example/brainflowplot/ui/psdplot/PSDPlotFragment.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import brainflow.BrainFlowError;
2323
import brainflow.DataFilter;
2424
import brainflow.FilterTypes;
25-
import brainflow.WindowFunctions;
25+
import brainflow.WindowOperations;
2626

2727

2828
public class PSDPlotFragment extends Fragment {
@@ -77,18 +77,18 @@ public void run() {
7777
int numDataPoints = DataFilter.get_nearest_power_of_two(DataActivity.samplingRate * windowSize);
7878
double[][] tmpArray = DataActivity.boardShim.get_current_board_data(numDataPoints);
7979
for (int i = 0; i < DataActivity.channels.length; i++) {
80-
DataFilter.perform_bandstop(tmpArray[DataActivity.channels[i]], DataActivity.samplingRate, 50.0, 4.0, 2,
80+
DataFilter.perform_bandstop(tmpArray[DataActivity.channels[i]], DataActivity.samplingRate, 48.0, 52.0, 2,
8181
FilterTypes.BUTTERWORTH.get_code (), 0.0);
82-
DataFilter.perform_bandstop(tmpArray[DataActivity.channels[i]], DataActivity.samplingRate, 60.0, 4.0, 2,
82+
DataFilter.perform_bandstop(tmpArray[DataActivity.channels[i]], DataActivity.samplingRate, 58.0, 62.0, 2,
8383
FilterTypes.BUTTERWORTH.get_code (), 0.0);
84-
DataFilter.perform_bandpass(tmpArray[DataActivity.channels[i]], DataActivity.samplingRate, 24.0, 47.0, 2,
84+
DataFilter.perform_bandpass(tmpArray[DataActivity.channels[i]], DataActivity.samplingRate, 2.0, 47.0, 2,
8585
FilterTypes.BUTTERWORTH.get_code (), 0.0);
8686
}
8787
// prepare data to plot
8888
for (int i = 0; i < DataActivity.channels.length; i++) {
8989
double[] channel = tmpArray[DataActivity.channels[i]];
9090
int nfft = DataFilter.get_nearest_power_of_two(DataActivity.samplingRate) * 2;
91-
Pair<double[], double[]> psd = DataFilter.get_psd_welch (channel, nfft, nfft / 2, DataActivity.samplingRate, WindowFunctions.HANNING.get_code());
91+
Pair<double[], double[]> psd = DataFilter.get_psd_welch (channel, nfft, nfft / 2, DataActivity.samplingRate, WindowOperations.HANNING.get_code());
9292
int count = psd.getKey().length;
9393
DataPoint[] values = new DataPoint[count];
9494
for (int j = 0; j < count; j++) {

0 commit comments

Comments
 (0)