Skip to content

Commit fb5d53b

Browse files
authored
Merge branch 'development' into ganglion-native-ble
2 parents c0f13e9 + afb3ecf commit fb5d53b

5 files changed

Lines changed: 84 additions & 4 deletions

File tree

CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
# v5.1.1
22

33
### Bug Fixes
4+
- Fix LSL AvgBandPower data type only one value is sent #1098
45

56
### Improvements
6-
77
- Update to BrainFlow 5.5.0
88
- Add feature to connect to Ganglion using Native Bluetooth [#1080](https://github.com/OpenBCI/OpenBCI_GUI/issues/1080)
99

10+
1011
# v5.1.0
1112

1213
### Bug Fixes
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
# If BrainFlow Python binding is not installed: pip install brainflow
2+
# BrainFlow Documentation: https://brainflow.readthedocs.io/en/stable/SupportedBoards.html#streaming-board
3+
# When used with the OpenBCI GUI, the same version (or very close) should be used on both sides.
4+
# This test accepts a stream from the Synthetic mode in the OpenBCI GUI.
5+
6+
import time
7+
from brainflow.board_shim import (
8+
BoardShim,
9+
BrainFlowInputParams,
10+
BoardIds,
11+
BrainFlowPresets,
12+
)
13+
from brainflow.data_filter import DataFilter
14+
15+
16+
def main():
17+
BoardShim.enable_dev_board_logger()
18+
19+
# use synthetic board for demo
20+
params = BrainFlowInputParams()
21+
params.ip_port = 6677
22+
params.ip_address = "225.1.1.1"
23+
params.master_board = BoardIds.SYNTHETIC_BOARD
24+
board_id = BoardIds.STREAMING_BOARD
25+
26+
board = BoardShim(board_id, params)
27+
board.prepare_session()
28+
board.start_stream()
29+
time.sleep(10)
30+
data_default = board.get_board_data(preset=BrainFlowPresets.DEFAULT_PRESET)
31+
board.stop_stream()
32+
board.release_session()
33+
DataFilter.write_file(data_default, "default.csv", "w")
34+
print(data_default)
35+
36+
37+
if __name__ == "__main__":
38+
main()
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
# If BrainFlow Python binding is not installed: pip install brainflow
2+
# BrainFlow Documentation: https://brainflow.readthedocs.io/en/stable/SupportedBoards.html#streaming-board
3+
# BrainFlow Multiple Streamers Example: https://github.com/brainflow-dev/brainflow/blob/master/python_package/examples/tests/multiple_streamers.py
4+
# When used with the OpenBCI GUI, the same version (or very close) should be used on both sides.
5+
# This test connects directly to an OpenBCI board, or Synthetic board, and streams it out to the OpenBCI GUI.
6+
7+
import time
8+
9+
from brainflow.board_shim import (
10+
BoardShim,
11+
BrainFlowInputParams,
12+
BoardIds,
13+
BrainFlowPresets,
14+
)
15+
from brainflow.data_filter import DataFilter
16+
17+
18+
def main():
19+
BoardShim.enable_dev_board_logger()
20+
21+
# use synthetic board for demo
22+
params = BrainFlowInputParams()
23+
board_id = BoardIds.SYNTHETIC_BOARD.value
24+
25+
presets = BoardShim.get_board_presets(board_id)
26+
print(presets)
27+
28+
board = BoardShim(board_id, params)
29+
board.prepare_session()
30+
board.add_streamer("file://streamer_default.csv:w")
31+
board.add_streamer("streaming_board://225.1.1.1:6677")
32+
board.start_stream()
33+
time.sleep(30)
34+
data_default = board.get_board_data(preset=BrainFlowPresets.DEFAULT_PRESET)
35+
board.stop_stream()
36+
board.release_session()
37+
DataFilter.write_file(data_default, "default.csv", "w")
38+
39+
40+
if __name__ == "__main__":
41+
main()

OpenBCI_GUI/OpenBCI_GUI.pde

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ import http.requests.*;
6161
// Global Variables & Instances
6262
//------------------------------------------------------------------------
6363
//Used to check GUI version in TopNav.pde and displayed on the splash screen on startup
64-
String localGUIVersionString = "v5.1.1-alpha.0";
65-
String localGUIVersionDate = "July 2022";
64+
String localGUIVersionString = "v5.1.1-alpha.1";
65+
String localGUIVersionDate = "January 2023";
6666
String guiLatestVersionGithubAPI = "https://api.github.com/repos/OpenBCI/OpenBCI_GUI/releases/latest";
6767
String guiLatestReleaseLocation = "https://github.com/OpenBCI/OpenBCI_GUI/releases/latest";
6868
Boolean guiIsUpToDate;

OpenBCI_GUI/W_Networking.pde

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1070,7 +1070,7 @@ class W_Networking extends Widget {
10701070
} else if (dataType.equals("EMG")) {
10711071
return currentBoard.getNumEXGChannels();
10721072
} else if (dataType.equals("AvgBandPower")) {
1073-
return 1;
1073+
return 5;
10741074
} else if (dataType.equals("BandPower")) {
10751075
return 5;
10761076
} else if (dataType.equals("Pulse")) {

0 commit comments

Comments
 (0)