GitHub/web-bluetooth-dfu
1
0
Fork 0
mirror of https://github.com/thegecko/web-bluetooth-dfu.git synced 2025-12-12 20:18:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/thegecko/web-bluetooth-dfu

Browse Source
This commit is contained in:
Michael Dietz
2016-02-25 09:25:31 +01:00
parent dc8e5fc177 0459cf2975
commit ba4984cba9
2 changed files with 36 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.jshintrc
View File

@@ -1,3 +0,0 @@
{
"esversion": 6
}

72
dist/dfu.js vendored
View File

@@ -93,7 +93,7 @@
} }
} }
function log(message) { function log(message) {
loggers.forEach(logger => { loggers.forEach(function(logger) {
logger(message); logger(message);
}); });
} }
@@ -116,7 +116,7 @@
return new Promise(function(resolve, reject) { return new Promise(function(resolve, reject) {
/* /*
// TODO: once disconnect event is implemented we should resolve in its callback... // TODO: once disconnect event is implemented we should resolve in its callback...
device.addEventListener("gattserverdisconnected", () => { device.addEventListener("gattserverdisconnected", function() {
log("DFU Target issued GAP Disconnect and reset into Bootloader/DFU mode."); log("DFU Target issued GAP Disconnect and reset into Bootloader/DFU mode.");
resolve(device); resolve(device);
}); });
@@ -124,24 +124,24 @@
var characteristics = null; var characteristics = null;
connect(device) connect(device)
.then(chars => { .then(function(chars) {
log("enabling notifications"); log("enabling notifications");
characteristics = chars; characteristics = chars;
return characteristics.controlChar.startNotifications(); return characteristics.controlChar.startNotifications();
}) })
.then(() => { .then(function() {
log("writing modeData"); log("writing modeData");
return characteristics.controlChar.writeValue(new Uint8Array([1, 4])); return characteristics.controlChar.writeValue(new Uint8Array([1, 4]));
}) })
.then(() => { .then(function() {
log("modeData written"); log("modeData written");
// Hack to gracefully disconnect without disconnect event // Hack to gracefully disconnect without disconnect event
setTimeout(() => { setTimeout(function() {
characteristics.server.disconnect(); characteristics.server.disconnect();
resolve(device); resolve(device);
}, 2000); }, 2000);
}) })
.catch(error => { .catch(function(error) {
error = "writeMode error: " + error; error = "writeMode error: " + error;
log(error); log(error);
reject(error); reject(error);
@@ -174,11 +174,11 @@
imageType = imageType || ImageType.Application; imageType = imageType || ImageType.Application;
connect(device) connect(device)
.then(chars => { .then(function(chars) {
versionChar = chars.versionChar; versionChar = chars.versionChar;
if (versionChar) { // Older DFU implementations (from older Nordic SDKs < 7.0) have no DFU Version characteristic. if (versionChar) { // Older DFU implementations (from older Nordic SDKs < 7.0) have no DFU Version characteristic.
return versionChar.readValue() return versionChar.readValue()
.then(data => { .then(function(data) {
console.log('read versionChar'); console.log('read versionChar');
var view = new DataView(data); var view = new DataView(data);
var major = view.getUint8(0); var major = view.getUint8(0);
@@ -190,10 +190,10 @@
return transfer(chars, arrayBuffer, imageType, 6, 0); return transfer(chars, arrayBuffer, imageType, 6, 0);
} }
}) })
.then(() => { .then(function() {
resolve(); resolve();
}) })
.catch(error => { .catch(function(error) {
log(error); log(error);
reject(error); reject(error);
}); });
@@ -218,38 +218,38 @@
} }
device.connectGATT() device.connectGATT()
.then(gattServer => { .then(function(gattServer) {
// Connected // Connected
server = gattServer; server = gattServer;
log("connected to device"); log("connected to device");
return server.getPrimaryService(serviceUUID); return server.getPrimaryService(serviceUUID);
}) })
.then(primaryService => { .then(function(primaryService) {
log("found DFU service"); log("found DFU service");
service = primaryService; service = primaryService;
return service.getCharacteristic(controlUUID); return service.getCharacteristic(controlUUID);
}) })
.then(characteristic => { .then(function(characteristic) {
log("found control characteristic"); log("found control characteristic");
controlChar = characteristic; controlChar = characteristic;
return service.getCharacteristic(packetUUID); return service.getCharacteristic(packetUUID);
}) })
.then(characteristic => { .then(function(characteristic) {
log("found packet characteristic"); log("found packet characteristic");
packetChar = characteristic; packetChar = characteristic;
service.getCharacteristic(versionUUID) service.getCharacteristic(versionUUID)
// Older DFU implementations (from older Nordic SDKs) have no DFU Version characteristic. So this may fail. // Older DFU implementations (from older Nordic SDKs) have no DFU Version characteristic. So this may fail.
.then(characteristic => { .then(function(characteristic) {
log("found version characteristic"); log("found version characteristic");
versionChar = characteristic; versionChar = characteristic;
complete(); complete();
}) })
.catch(error => { .catch(function(error) {
log("info: no version characteristic found"); log("info: no version characteristic found");
complete(); complete();
}); });
}) })
.catch(error => { .catch(function(error) {
error = "connect error: " + error; error = "connect error: " + error;
log(error); log(error);
reject(error); reject(error);
@@ -277,12 +277,12 @@
log("enabling notifications"); log("enabling notifications");
controlChar.startNotifications() controlChar.startNotifications()
.then(() => { .then(function() {
controlChar.addEventListener('characteristicvaluechanged', handleControl); controlChar.addEventListener('characteristicvaluechanged', handleControl);
log("sending imagetype: " + imageType); log("sending imagetype: " + imageType);
return controlChar.writeValue(new Uint8Array([OPCODE.START_DFU, imageType])); return controlChar.writeValue(new Uint8Array([OPCODE.START_DFU, imageType]));
}) })
.then(() => { .then(function() {
log("sent start"); log("sent start");
var softLength = (imageType === ImageType.SoftDevice) ? arrayBuffer.byteLength : 0; var softLength = (imageType === ImageType.SoftDevice) ? arrayBuffer.byteLength : 0;
@@ -297,10 +297,10 @@
return packetChar.writeValue(view); return packetChar.writeValue(view);
}) })
.then(() => { .then(function() {
log("sent image size: " + arrayBuffer.byteLength); log("sent image size: " + arrayBuffer.byteLength);
}) })
.catch(error => { .catch(function(error) {
error = "start error: " + error; error = "start error: " + error;
log(error); log(error);
reject(error); reject(error);
@@ -327,13 +327,13 @@
if(req_opcode === OPCODE.START_DFU && majorVersion > 6) { // init packet is not used in SDK v6 (so not used in mbed). if(req_opcode === OPCODE.START_DFU && majorVersion > 6) { // init packet is not used in SDK v6 (so not used in mbed).
log('write init packet'); log('write init packet');
controlChar.writeValue(new Uint8Array([OPCODE.INITIALIZE_DFU_PARAMETERS, 0])) controlChar.writeValue(new Uint8Array([OPCODE.INITIALIZE_DFU_PARAMETERS, 0]))
.then(() => { .then(function() {
return packetChar.writeValue(generateInitPacket()); return packetChar.writeValue(generateInitPacket());
}) })
.then(() => { .then(function() {
return controlChar.writeValue(new Uint8Array([OPCODE.INITIALIZE_DFU_PARAMETERS, 1])); return controlChar.writeValue(new Uint8Array([OPCODE.INITIALIZE_DFU_PARAMETERS, 1]));
}) })
.catch(error => { .catch(function(error) {
error = "error writing dfu init parameters: " + error; error = "error writing dfu init parameters: " + error;
log(error); log(error);
reject(error); reject(error);
@@ -349,15 +349,15 @@
view.setUint16(1, interval, LITTLE_ENDIAN); view.setUint16(1, interval, LITTLE_ENDIAN);
controlChar.writeValue(view) controlChar.writeValue(view)
.then(() => { .then(function() {
log("sent packet count: " + interval); log("sent packet count: " + interval);
return controlChar.writeValue(new Uint8Array([OPCODE.RECEIVE_FIRMWARE_IMAGE])); return controlChar.writeValue(new Uint8Array([OPCODE.RECEIVE_FIRMWARE_IMAGE]));
}) })
.then(() => { .then(function() {
log("sent receive"); log("sent receive");
return writePacket(packetChar, arrayBuffer, 0); return writePacket(packetChar, arrayBuffer, 0);
}) })
.catch(error => { .catch(function(error) {
error = "error sending packet count: " + error; error = "error sending packet count: " + error;
log(error); log(error);
reject(error); reject(error);
@@ -367,7 +367,7 @@
log('check length'); log('check length');
controlChar.writeValue(new Uint8Array([OPCODE.REPORT_RECEIVED_IMAGE_SIZE])) controlChar.writeValue(new Uint8Array([OPCODE.REPORT_RECEIVED_IMAGE_SIZE]))
.catch(error => { .catch(function(error) {
error = "error checking length: " + error; error = "error checking length: " + error;
log(error); log(error);
reject(error); reject(error);
@@ -379,7 +379,7 @@
log('validate...'); log('validate...');
controlChar.writeValue(new Uint8Array([OPCODE.VALIDATE_FIRMWARE])) controlChar.writeValue(new Uint8Array([OPCODE.VALIDATE_FIRMWARE]))
.catch(error => { .catch(function(error) {
error = "error validating: " + error; error = "error validating: " + error;
log(error); log(error);
reject(error); reject(error);
@@ -389,20 +389,20 @@
log('complete, reset...'); log('complete, reset...');
/* /*
// TODO: Resolve in disconnect event handler when implemented in Web Bluetooth API. // TODO: Resolve in disconnect event handler when implemented in Web Bluetooth API.
controlChar.service.device.addEventListener("gattserverdisconnected", () => { controlChar.service.device.addEventListener("gattserverdisconnected", function() {
resolve(); resolve();
}); });
*/ */
controlChar.writeValue(new Uint8Array([OPCODE.ACTIVATE_IMAGE_AND_RESET])) controlChar.writeValue(new Uint8Array([OPCODE.ACTIVATE_IMAGE_AND_RESET]))
.then(() => { .then(function() {
log('image activated and dfu target reset'); log('image activated and dfu target reset');
// Hack to gracefully disconnect without disconnect event // Hack to gracefully disconnect without disconnect event
setTimeout(() => { setTimeout(function() {
chars.server.disconnect(); chars.server.disconnect();
resolve(); resolve();
}, 2000); }, 2000);
}) })
.catch(error => { .catch(function(error) {
error = "error resetting: " + error; error = "error resetting: " + error;
log(error); log(error);
reject(error); reject(error);
@@ -428,14 +428,14 @@
var view = new Uint8Array(packet); var view = new Uint8Array(packet);
packetChar.writeValue(view) packetChar.writeValue(view)
.then(() => { .then(function() {
count ++; count ++;
offset += packetSize; offset += packetSize;
if (count < interval && offset < arrayBuffer.byteLength) { if (count < interval && offset < arrayBuffer.byteLength) {
writePacket(packetChar, arrayBuffer, count); writePacket(packetChar, arrayBuffer, count);
} }
}) })
.catch(error => { .catch(function(error) {
error = "writePacket error: " + error; error = "writePacket error: " + error;
log(error); log(error);
}); });