Skip to content

Commit

Permalink
Merge pull request #79 from retiutut/v2.0.6
Browse files Browse the repository at this point in the history
V2.0.6
  • Loading branch information
daniellasry authored Feb 21, 2019
2 parents a47c073 + 9491c4e commit 9f26d8c
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 11 deletions.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2016 OpenBCI
Copyright (c) 2019 OpenBCI

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,8 @@ All packaging actions are handled by [electron-builder](https://github.com/elect

**Note:** There are various icons and bitmap files in `resources` directory. Those are used in installers and intended to be replaced by your own graphics.

**Note:** After OpenBCI NPM package update (ex. [@openbci/cyton](https://www.npmjs.com/package/@openbci/cyton)), use `npm run clean-install` and then `npm run release`.

# License

Released under the MIT license.
10 changes: 5 additions & 5 deletions app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "openbci-electron-hub",
"productName": "OpenBCIHub",
"description": "OpenBCIHub",
"version": "2.0.5",
"version": "2.0.6",
"author": "AJ Keller <[email protected]>",
"copyright": "© 2018, OpenBCI inc.",
"homepage": "http://openbci.com",
Expand All @@ -15,9 +15,9 @@
"lodash": "^4.16.6",
"menubar": "^5.1.0",
"node-ssdp": "^3.2.1",
"openbci-cyton": "^1.1.3",
"openbci-ganglion": "^1.2.0",
"openbci-utilities": "^0.2.7",
"openbci-wifi": "^0.4.1"
"@openbci/cyton": "^2.0.1",
"@openbci/ganglion": "^2.0.0",
"@openbci/utilities": "^1.0.0",
"@openbci/wifi": "^1.0.1"
}
}
11 changes: 11 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
# v2.0.6

### New Features

- Add "clean-install" script to package.json

### Bug Fixes

- Update OpenBCI npm module names
- Fix Mac built-in BLE functionality

# v2.0.5

### Bug Fixes
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
"scripts": {
"postinstall": "node ./node_modules/electron-builder/out/install-app-deps.js",
"build": "gulp build",
"clean-install": "cd app && rm -rf node_modules && git clean -fX && npm install",
"prerelease": "gulp build --env=production",
"release": "build --publish never",
"release-win32": "build --ia32 --publish never",
Expand Down
10 changes: 5 additions & 5 deletions src/background.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
import net from "net";
import Ganglion from "openbci-ganglion"; // native npm module
import Wifi from "openbci-wifi";
import { Constants } from "openbci-utilities";
import Cyton from "openbci-cyton";
import Ganglion from "@openbci/ganglion"; // native npm module
import Wifi from "@openbci/wifi";
import { constants } from "@openbci/utilities";
import Cyton from "@openbci/cyton";
import menubar from "menubar";
import * as _ from "lodash";
import { ipcMain, dialog } from "electron";
import path from "path";
import ip from "ip";

/** TCP */
const k = Constants;
const k = constants;
const kTcpActionSet = "set";
const kTcpActionStart = "start";
const kTcpActionStatus = "status";
Expand Down

0 comments on commit 9f26d8c

Please sign in to comment.