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 15 additions and 0 deletions
Showing only changes of commit 52194e0b41 - Show all commits

View File

@ -49,6 +49,7 @@ function createBLE () {
ble.on('dir', bDir)
ble.on('exposure', bExposure)
ble.on('delay', bDelay)
ble.on('counter', bCounter)
}
//Restify functions
@ -364,6 +365,20 @@ function bDelay (obj, cb) {
return cb()
}
function bCounter (obj, cb) {
let counter = 0
if (typeof obj.counter !== 'undefined') {
if (typeof obj.counter !== 'string') {
counter = parseInt(obj.counter)
} else {
counter = obj.counter
}
}
intval.setCounter(counter)
log.info('counter', { method : 'ble', counter : counter })
return cb()
}
function index (req, res, next) {
fs.readFile(INDEXPATH, 'utf8', (err, data) => {
if (err) {