Skip to content

Commit

Permalink
Merge pull request #527 from OpenBCI/development
Browse files Browse the repository at this point in the history
Development to master v4.1.2
  • Loading branch information
daniellasry authored May 19, 2019
2 parents 274df0b + 4055807 commit e2e99ae
Show file tree
Hide file tree
Showing 197 changed files with 249,773 additions and 32,882 deletions.
9 changes: 7 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,15 @@ OpenBCI_GUI/temp.txt
OpenBCI_GUI/t-temp.txt
OpenBCI_GUI/build/source/*.java
*.app
OpenBCI_GUI/SavedData
OpenBCI_GUI/SavedData/*.txt
OpenBCI_GUI/SavedData/*.bdf
OpenBCI_GUI/SavedData/*.csv
OpenBCI_GUI/SavedData/Settings
OpenBCI_GUI/SavedData/Screenshots
OpenBCI_GUI/SavedData/EEG_Data/SDconverted-*
OpenBCI_GUI/data/EEG_Data/*
OpenBCI_GUI/data/OpenBCIHub/*
OpenBCI_GUI/application.*.zip
OpenBCI_GUI/application.*
OpenBCI_GUI/openbcigui_*
*.autosave
.vscode/*
58 changes: 58 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,61 @@
# v4.1.2
Use OpenBCIHub v2.0.8 please.

## Beta 2

### Improvements
* Add additional button hover text
* Console log message cleanup

### Bug Fixes
* Fix #418, #493, #506, #422, and #509

## Beta 1

### Improvements
* Shorten file names in playback history when needed
* New coloring for Band Power widget
* Smooth and filter dropdowns added to Band Power
* Improved axis labels on Band Power widget
* Cleaned up some console output
* On windows, properly scale for High DPI displays

### Bug Fixes
* Fix crash when opening the console window
* Fix crash when selecting a playback file from the playback widget
* Fix crash when loading old settings file
* Fix buttons being clicked under dropdowns

## Beta 0

### New Features
* Expert mode button to toggle advanced keyboard shortcuts
* Clear GUI settings button w/ confirmation

### Improvements
* New icon for "back to start" button in Playback mode
* Playback History widget functionality and appearance
* Optimized playback history
* Adjust Networking Widget appearance and scaling
* Explicitly warn users when the HUB is not running

### Bug Fixes
* Fixed: Ganglion accelerometer starts "on" but data not streaming
* Fixed: LSL streaming in standalone GUI

# v4.1.1
Use OpenBCIHub v2.0.7 please.

## Beta 0

### New Features
* Added Console Log window in the GUI, so users can diagnose and report issues

### Bug Fixes
* Time in status line is not updated every seconds #443
* Playback Mode: Playback slider and start data stream clears graphs #438
* Load correct default settings for FFT X and Y axis

# v4.1.0

Use OpenBCIHub v2.0.6 please.
Expand Down
6 changes: 5 additions & 1 deletion ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ The version is displayed on startup.

## Running standalone app

Are you running the downloaded app or are you running from Processing 3
Are you running the downloaded app or are you running from Processing?

## Type of OpenBCI Board

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

Yes/No

## Console Log

Paste any relevant text from the console window here
28 changes: 14 additions & 14 deletions OpenBCI_GUI/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package=""
android:versionCode="1"
android:versionName="1.0">
<uses-sdk android:minSdkVersion="10" />
<application android:label=""
android:icon="@drawable/icon"
android:debuggable="true">
<activity android:name="">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
</application>
package=""
android:versionCode="1"
android:versionName="1.0">
<uses-sdk android:minSdkVersion="10" />
<application android:label=""
android:icon="@drawable/icon"
android:debuggable="true">
<activity android:name="">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
</application>
</manifest>
Loading

0 comments on commit e2e99ae

Please sign in to comment.