Merge pull request #103 from aj-ptw/development

Development

Author: AJ Keller

OpenBCI_GUI/GanglionSync.pde

@@ -674,4 +674,4 @@ class OpenBCI_Ganglion {
     controlPanel.open();
     output("Ganglion now in bootloader mode! Enjoy!");
   }
-};
+};

OpenBCI_GUI/OpenBCI_GUI.pde

@@ -5,7 +5,7 @@
 //
 //   Created: Chip Audette, Oct 2013 - May 2014
 //   Modified: Conor Russomanno & Joel Murphy, August 2014 - Dec 2014
-//   Modified (v2.0): Conor Russomanno & Joel Murphy, June 2016
+//   Modified (v2.0): Conor Russomanno & Joel Murphy (AJ Keller helped too), June 2016
 //
 //   Requires gwoptics graphing library for processing.  Built on V0.5.0
 //   http://www.gwoptics.org/processing/gwoptics_p5lib/
@@ -399,6 +399,9 @@ void hubStart() {
     if (isWindows()) {
       println("OpenBCI_GUI: hubStart: OS Detected: Windows");
       nodeHubby = launch(dataPath("Ganglion Hub.exe"));
+    } else if (isLinux()) {
+      println("OpenBCI_GUI: hubStart: OS Detected: Linux");
+      nodeHubby = exec(dataPath("Ganglion Hub"));
     } else {
       println("OpenBCI_GUI: hubStart: OS Detected: Mac");
       nodeHubby = launch(dataPath("Ganglion Hub.app"));
@@ -421,6 +424,14 @@ boolean hubStop() {
   }
 }
 
+/**
+ * @description Helper function to determine if the system is linux or not.
+ * @return {boolean} true if os is linux, false otherwise.
+ */
+private boolean isLinux() {
+  return System.getProperty("os.name").toLowerCase().indexOf("linux") > -1;
+}
+
 /**
  * @description Helper function to determine if the system is windows or not.
  * @return {boolean} true if os is windows, false otherwise.
@@ -1015,4 +1026,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 ===========================