Merge remote-tracking branch 'openbci/master'

brainflow-dev · Feb 12, 2020 · 2111f23 · 2111f23
2 parents bd850c3 + 59e5542
commit 2111f23
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -344,6 +344,10 @@ compiled/
 python/flowcat.egg-info/
 .Rproj.user
 
+# Docs build files
+docs/_build/*
+docs/Doxyfile*
+
 # Build files
 java-package/brainflow/target
 java-package/brainflow/.classpath

diff --git a/docs/_static/custom.css b/docs/_static/custom.css
@@ -5,4 +5,10 @@
 
 .wy-side-nav-search > div.version {
   color: #000;
+}
+
+.wy-nav-content {
+  max-width: 100%;
+  position: relative;
+  overflow: auto;
 }
diff --git a/src/board_controller/openbci/ganglion_bglib/helpers.cpp b/src/board_controller/openbci/ganglion_bglib/helpers.cpp
@@ -73,15 +73,10 @@ namespace GanglionLib
         }
 
         const struct ble_msg *msg = ble_get_msg_hdr (hdr);
-
-        if (!msg)
+        if (msg)
         {
-            exit_code = (int)GanglionLib::GENERAL_ERROR;
-            delete[] data;
-            return 1;
+            msg->handler (data);
         }
-
-        msg->handler (data);
         delete[] data;
         return 0;
     }