16mm
/
intval3
1
0
Fork 0
Code Issues 1 Pull Requests 9 Projects Releases Wiki Activity

Push dev work to master #2

Merged
sixteenmillimeter merged 416 commits from dev into master 2018-07-19 15:29:02 +00:00
Conversation 0 Commits 416 Files Changed 85 +5 -6
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 57efee6d7f - Show all commits

11
lib/ble/index.js
View File

@ -3,7 +3,11 @@
/** @module ble */ /** @module ble */
/** Bluetooth Low Energy module */ /** Bluetooth Low Energy module */
const util = require('util')
const os = require('os')
const log = require('../log')('ble')
const wifi = require('../wifi')
const DEVICE_NAME = process.env.DEVICE_ID || 'intval3' const DEVICE_NAME = process.env.DEVICE_ID || 'intval3'
const SERVICE_ID = process.env.SERVICE_ID || 'intval3_ble' const SERVICE_ID = process.env.SERVICE_ID || 'intval3_ble'
@ -13,13 +17,8 @@ const NETWORK = os.networkInterfaces()
const MAC = getMac() || spoofMac() const MAC = getMac() || spoofMac()
process.env.BLENO_DEVICE_NAME += '_' + MAC process.env.BLENO_DEVICE_NAME += '_' + MAC
const os = require('os')
const bleno = require('bleno') const bleno = require('bleno')
const util = require('util')
const log = require('../log')('ble')
const wifi = require('../wifi')
let currentWifi = 'disconnected' let currentWifi = 'disconnected'
let getState let getState
@ -135,7 +134,7 @@ class BLE {
bleno.on('stateChange', state => { bleno.on('stateChange', state => {
log.info('stateChange', { state : state }) log.info('stateChange', { state : state })
if (state === 'poweredOn') { if (state === 'poweredOn') {
log.info('Starting advertising', { DEVICE_NAME: DEVICE_NAME }) log.info('Starting advertising', { DEVICE_NAME: DEVICE_NAME, DEVICE_ID : process.env.BLENO_DEVICE_NAME })
bleno.startAdvertising(DEVICE_NAME, [CHAR_ID]) bleno.startAdvertising(DEVICE_NAME, [CHAR_ID])
} else { } else {
bleno.stopAdvertising() bleno.stopAdvertising()