Skip to content

Commit 2111f23

Browse files
committed
Merge remote-tracking branch 'openbci/master'
2 parents bd850c3 + 59e5542 commit 2111f23

File tree

3 files changed

+12
-7
lines changed

3 files changed

+12
-7
lines changed

.gitignore

+4
Original file line numberDiff line numberDiff line change
@@ -344,6 +344,10 @@ compiled/
344344
python/flowcat.egg-info/
345345
.Rproj.user
346346

347+
# Docs build files
348+
docs/_build/*
349+
docs/Doxyfile*
350+
347351
# Build files
348352
java-package/brainflow/target
349353
java-package/brainflow/.classpath

docs/_static/custom.css

+6
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,10 @@
55

66
.wy-side-nav-search > div.version {
77
color: #000;
8+
}
9+
10+
.wy-nav-content {
11+
max-width: 100%;
12+
position: relative;
13+
overflow: auto;
814
}

src/board_controller/openbci/ganglion_bglib/helpers.cpp

+2-7
Original file line numberDiff line numberDiff line change
@@ -73,15 +73,10 @@ namespace GanglionLib
7373
}
7474

7575
const struct ble_msg *msg = ble_get_msg_hdr (hdr);
76-
77-
if (!msg)
76+
if (msg)
7877
{
79-
exit_code = (int)GanglionLib::GENERAL_ERROR;
80-
delete[] data;
81-
return 1;
78+
msg->handler (data);
8279
}
83-
84-
msg->handler (data);
8580
delete[] data;
8681
return 0;
8782
}

0 commit comments

Comments
 (0)