Update master with hardware work from dev branch #3

Merged
sixteenmillimeter merged 9 commits from dev into master 2018-10-04 17:09:25 +00:00
2 changed files with 1769 additions and 3445 deletions
Showing only changes of commit 6b093dedd0 - Show all commits

5166
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -24,21 +24,21 @@
}, },
"homepage": "https://github.com/sixteenmillimeter/intval3#readme", "homepage": "https://github.com/sixteenmillimeter/intval3#readme",
"dependencies": { "dependencies": {
"bleno": "^0.4.2", "bleno": "^0.5.0",
"cron": "^1.2.1", "cron": "^1.2.1",
"gpio": "^0.2.7", "gpio": "^0.2.7",
"node-ipc": "^9.1.0", "node-ipc": "^9.1.0",
"node-persist": "^2.1.0", "node-persist": "^2.1.0",
"onoff": "^1.1.5", "onoff": "^1.1.5",
"restify": "^5.2.0", "restify": "^7.2.1",
"rpio": "^0.9.20", "rpio": "^0.9.20",
"sqlite3": "^3.1.13", "sqlite3": "^4.0.2",
"squel": "^5.12.0", "squel": "^5.12.0",
"uuid": "^3.1.0", "uuid": "^3.1.0",
"winston": "^2.3.1" "winston": "^2.3.1"
}, },
"devDependencies": { "devDependencies": {
"jsdoc-to-markdown": "^3.0.0", "jsdoc-to-markdown": "^4.0.1",
"qunit": "^2.5.0" "qunit": "^2.6.2"
} }
} }