Skip to content

Commit

Permalink
Merge pull request #397 from andrewjaykeller/updates
Browse files Browse the repository at this point in the history
FIX: version numbers
  • Loading branch information
AJ Keller authored Nov 6, 2018
2 parents da302d5 + bb172e1 commit a71bd55
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 3 deletions.
14 changes: 14 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
# v4.0.2

Use OpenBCIHub v2.0.2 please.

### New Features

* Timestamps in CSV now come from the OpenBCIHub
* Playback widget with recent file history
* Update GUI button and version check

### Breaking Changes

* Now sending and receiving from the hub in JSON!

# v4.0.0

Use OpenBCIHub v2.0.0 please.
Expand Down
2 changes: 1 addition & 1 deletion OpenBCI_GUI/Info.plist.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<key>CFBundleShortVersionString</key>
<string>3</string>
<key>CFBundleVersion</key>
<string>4.0.0-alpha.2</string>
<string>4.0.2</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>NSHumanReadableCopyright</key>
Expand Down
4 changes: 2 additions & 2 deletions OpenBCI_GUI/OpenBCI_GUI.pde
Original file line number Diff line number Diff line change
Expand Up @@ -352,8 +352,8 @@ Boolean settingsLoadedCheck = false; //Used to determine if settings are done lo
final int initTimeoutThreshold = 12000; //Timeout threshold in milliseconds

//Used to check GUI version in TopNav.pde and displayed on the splash screen on startup
String localGUIVersionString = "v4.0.0-alpha.2";
String localGUIVersionDate = "September 2018";
String localGUIVersionString = "v4.0.2";
String localGUIVersionDate = "November 2018";
String guiLatestReleaseLocation = "https://github.com/OpenBCI/OpenBCI_GUI/releases/latest";
Boolean guiVersionCheckHasOccured = false;

Expand Down

0 comments on commit a71bd55

Please sign in to comment.