Skip to content

Commit

Permalink
Merge pull request #87 from OpenBCI/development
Browse files Browse the repository at this point in the history
master <-- development v2.0.7
  • Loading branch information
daniellasry authored Mar 13, 2019
2 parents 3456b6f + 4c14054 commit 0665699
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 5 deletions.
4 changes: 2 additions & 2 deletions app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
"name": "openbci-electron-hub",
"productName": "OpenBCIHub",
"description": "OpenBCIHub",
"version": "2.0.6",
"version": "2.0.7",
"author": "AJ Keller <[email protected]>",
"copyright": "© 2018, OpenBCI inc.",
"copyright": "© 2019, OpenBCI inc.",
"homepage": "http://openbci.com",
"license": "MIT",
"main": "background.js",
Expand Down
7 changes: 7 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
# v2.0.7

### Bug Fixes

- Display Cyton firmware in GUI OpenBCI/OpenBCI_GUI#449
- Cyton serial SD card mode causes GUI init to fail OpenBCI/OpenBCI_GUI#386

# v2.0.6

### New Features
Expand Down
6 changes: 3 additions & 3 deletions src/background.js
Original file line number Diff line number Diff line change
Expand Up @@ -975,7 +975,7 @@ const _processConnectSerial = (msg, client) => {
kTcpTypeConnect,
kTcpCodeSuccess,
{
firmare: cyton.getInfo().firmware.raw
firmware: cyton.getInfo().firmware.raw
}
);
// cyton.on(k.OBCIEmitterRawDataPacket, console.log);
Expand Down Expand Up @@ -2542,7 +2542,7 @@ const _processSdSerial = (msg, client) => {
.sdStart(msg.command)
.then(() => {
writeCodeToClientOfType(client, kTcpTypeSd, kTcpCodeSuccess, {
action: kTcpActionStop,
action: kTcpActionStart,
protocol: kTcpProtocolSerial
});
// client.write(`${kTcpCmdSd},${kTcpCodeSuccess},${kTcpActionStart}${kTcpStop}`);
Expand All @@ -2553,7 +2553,7 @@ const _processSdSerial = (msg, client) => {
kTcpTypeSd,
kTcpCodeErrorUnknown,
{
action: kTcpActionStart,
action: kTcpActionStop,
message: err.message,
protocol: kTcpProtocolSerial
}
Expand Down

0 comments on commit 0665699

Please sign in to comment.