Push dev work to master #2

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

View File

@ -89,6 +89,7 @@ function onWifiRead (offset, callback) {
const result = bleno.Characteristic.RESULT_SUCCESS const result = bleno.Characteristic.RESULT_SUCCESS
const wifiRes = {} const wifiRes = {}
let data let data
log.info('Getting wifi data for onWifiRead')
wifi.list((err, list) => { wifi.list((err, list) => {
if (err) { if (err) {
result = bleno.Characteristic.RESULT_UNLIKELY_ERROR result = bleno.Characteristic.RESULT_UNLIKELY_ERROR

View File

@ -64,7 +64,7 @@ class Wifi {
data = data.replace(networkPattern, _entry) data = data.replace(networkPattern, _entry)
} }
_entry = null _entry = null
fs.writeFile(filePath, data, 'utf8', this._writeConfigCb) //fs.writeFile(filePath, data, 'utf8', this._writeConfigCb)
} }
/** /**
* (internal function) Invoked after config file is written, * (internal function) Invoked after config file is written,