Push dev work to master #2

Merged
sixteenmillimeter merged 416 commits from dev into master 2018-07-19 15:29:02 +00:00
1 changed files with 23 additions and 17 deletions
Showing only changes of commit 58f8d09775 - Show all commits

View File

@ -11,6 +11,7 @@ function capitalize (s) {
class Blootstrap { class Blootstrap {
constructor () { constructor () {
this._onData = () => {} this._onData = () => {}
try {
ipc.connectTo('blootstrap_ble', () => { ipc.connectTo('blootstrap_ble', () => {
ipc.of.blootstrap_ble.on('connect', () => { ipc.of.blootstrap_ble.on('connect', () => {
log.info('connect', `Connected to the blootstrap_ble service`) log.info('connect', `Connected to the blootstrap_ble service`)
@ -26,10 +27,15 @@ class Blootstrap {
}) })
ipc.of.blootstrap_ble.on('error', (err) => { ipc.of.blootstrap_ble.on('error', (err) => {
if (err.code === 'EACCES') { if (err.code === 'EACCES') {
log.warn('error', `Cannot access ipc`) log.warn('ble', `Cannot access ipc`)
} else {
log.error('ble', { error : err })
} }
}) })
}) })
} catch (e) {
log.error('connectTo', { error : e })
}
} }
/** /**
* Binds functions to events that are triggered by BLE messages * Binds functions to events that are triggered by BLE messages