Merge pull request #169 from aj-ptw/fix-bdf

Update file type from .edf to .bdf
OpenBCI · 656561e906c69b4a737af56d5641bc800fdb131c · aj-ptw committed on GitHub Jun 27, 2017 · Jun 27, 2017 · 656561e
2 parents a44abd5 + b709b67
commit 656561e906c69b4a737af56d5641bc800fdb131c
Unified Split

Showing with 9 additions and 4 deletions.

+5 −0 CHANGELOG.md

+2 −2 OpenBCI_GUI/DataLogging.pde

+2 −2 OpenBCI_GUI/OpenBCI_GUI.pde
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# 2.2.1
+
+### Bug Fixes
+* Addresses #121 - `.edf` incompatible changed ending to `.bdf` 
+
 # 2.2.0
 
 ### Bug Fixes
diff --git a/OpenBCI_GUI/DataLogging.pde b/OpenBCI_GUI/DataLogging.pde
@@ -940,9 +940,9 @@ public class OutputFile_BDF {
    * @returns {String} - A fully qualified name of an output file with `str`.
    */
   private String getFileName(String s) {
-    String output = "SavedData"+System.getProperty("file.separator")+"OpenBCI-EDF-";
+    String output = "SavedData"+System.getProperty("file.separator")+"OpenBCI-BDF-";
     output += s;
-    output += ".edf";
+    output += ".bdf";
     return output;
   }
 
diff --git a/OpenBCI_GUI/OpenBCI_GUI.pde b/OpenBCI_GUI/OpenBCI_GUI.pde
@@ -978,7 +978,7 @@ void introAnimation() {
     textLeading(24);
     fill(31, 69, 110, transparency);
     textAlign(CENTER, CENTER);
-    text("OpenBCI GUI v2.2.0\nJune 2017", width/2, height/2 + width/9);
+    text("OpenBCI GUI v2.2.1\nJune 2017", width/2, height/2 + width/9);
   }
 
   //exit intro animation at t2
@@ -1038,4 +1038,4 @@ PVector getWindowLocation(String renderer) {
   }
   return l;
 }
-//END OF CODE FOR FIXING WEIRD EXIT CRASH ISSUE -- 7/27/16 ===========================
+//END OF CODE FOR FIXING WEIRD EXIT CRASH ISSUE -- 7/27/16 ===========================