Skip to content

Commit e2e99ae

Browse files
authored
Merge pull request #527 from OpenBCI/development
Development to master v4.1.2
2 parents 274df0b + 4055807 commit e2e99ae

197 files changed

Lines changed: 249773 additions & 32882 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitignore

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,15 @@ OpenBCI_GUI/temp.txt
66
OpenBCI_GUI/t-temp.txt
77
OpenBCI_GUI/build/source/*.java
88
*.app
9-
OpenBCI_GUI/SavedData
9+
OpenBCI_GUI/SavedData/*.txt
10+
OpenBCI_GUI/SavedData/*.bdf
11+
OpenBCI_GUI/SavedData/*.csv
12+
OpenBCI_GUI/SavedData/Settings
13+
OpenBCI_GUI/SavedData/Screenshots
1014
OpenBCI_GUI/SavedData/EEG_Data/SDconverted-*
1115
OpenBCI_GUI/data/EEG_Data/*
1216
OpenBCI_GUI/data/OpenBCIHub/*
13-
OpenBCI_GUI/application.*.zip
1417
OpenBCI_GUI/application.*
18+
OpenBCI_GUI/openbcigui_*
1519
*.autosave
20+
.vscode/*

CHANGELOG.md

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,61 @@
1+
# v4.1.2
2+
Use OpenBCIHub v2.0.8 please.
3+
4+
## Beta 2
5+
6+
### Improvements
7+
* Add additional button hover text
8+
* Console log message cleanup
9+
10+
### Bug Fixes
11+
* Fix #418, #493, #506, #422, and #509
12+
13+
## Beta 1
14+
15+
### Improvements
16+
* Shorten file names in playback history when needed
17+
* New coloring for Band Power widget
18+
* Smooth and filter dropdowns added to Band Power
19+
* Improved axis labels on Band Power widget
20+
* Cleaned up some console output
21+
* On windows, properly scale for High DPI displays
22+
23+
### Bug Fixes
24+
* Fix crash when opening the console window
25+
* Fix crash when selecting a playback file from the playback widget
26+
* Fix crash when loading old settings file
27+
* Fix buttons being clicked under dropdowns
28+
29+
## Beta 0
30+
31+
### New Features
32+
* Expert mode button to toggle advanced keyboard shortcuts
33+
* Clear GUI settings button w/ confirmation
34+
35+
### Improvements
36+
* New icon for "back to start" button in Playback mode
37+
* Playback History widget functionality and appearance
38+
* Optimized playback history
39+
* Adjust Networking Widget appearance and scaling
40+
* Explicitly warn users when the HUB is not running
41+
42+
### Bug Fixes
43+
* Fixed: Ganglion accelerometer starts "on" but data not streaming
44+
* Fixed: LSL streaming in standalone GUI
45+
46+
# v4.1.1
47+
Use OpenBCIHub v2.0.7 please.
48+
49+
## Beta 0
50+
51+
### New Features
52+
* Added Console Log window in the GUI, so users can diagnose and report issues
53+
54+
### Bug Fixes
55+
* Time in status line is not updated every seconds #443
56+
* Playback Mode: Playback slider and start data stream clears graphs #438
57+
* Load correct default settings for FFT X and Y axis
58+
159
# v4.1.0
260

361
Use OpenBCIHub v2.0.6 please.

ISSUE_TEMPLATE.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ The version is displayed on startup.
1616

1717
## Running standalone app
1818

19-
Are you running the downloaded app or are you running from Processing 3
19+
Are you running the downloaded app or are you running from Processing?
2020

2121
## Type of OpenBCI Board
2222

@@ -25,3 +25,7 @@ Cyton/Cyton+Daisy/Ganglion
2525
## Are you using a WiFi Shield?
2626

2727
Yes/No
28+
29+
## Console Log
30+
31+
Paste any relevant text from the console window here

OpenBCI_GUI/AndroidManifest.xml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package=""
4-
android:versionCode="1"
5-
android:versionName="1.0">
6-
<uses-sdk android:minSdkVersion="10" />
7-
<application android:label=""
8-
android:icon="@drawable/icon"
9-
android:debuggable="true">
10-
<activity android:name="">
11-
<intent-filter>
12-
<action android:name="android.intent.action.MAIN" />
13-
<category android:name="android.intent.category.LAUNCHER" />
14-
</intent-filter>
15-
</activity>
16-
</application>
3+
package=""
4+
android:versionCode="1"
5+
android:versionName="1.0">
6+
<uses-sdk android:minSdkVersion="10" />
7+
<application android:label=""
8+
android:icon="@drawable/icon"
9+
android:debuggable="true">
10+
<activity android:name="">
11+
<intent-filter>
12+
<action android:name="android.intent.action.MAIN" />
13+
<category android:name="android.intent.category.LAUNCHER" />
14+
</intent-filter>
15+
</activity>
16+
</application>
1717
</manifest>

0 commit comments

Comments
 (0)