Merge branch 'master' into f/serial

Author: thegecko

README.md

@@ -69,7 +69,10 @@ this.hid = new DAPjs.HID(device);
 // open hid device
 await this.hid.open();
 dapDevice = new DAPjs.DAP(this.hid);
-this.target = new DAPjs.FlashTarget(dapDevice, DAPjs.FlashTargets.get(this.deviceCode));
+// contains flash algorithms data and memory map
+let flashAlgorithmsData = {};
+let flashAlgorithm = new DAPjs.FlashAlgorithm(flashAlgorithmsData, this.deviceCode);
+this.target = new DAPjs.FlashTarget(dapDevice, flashAlgorithm);
 
 // init and halt target
 await this.target.init();

examples/flash.js

@@ -46,14 +46,14 @@ function getFileName() {
     });
 }
 
-// Load a file, returning a buffer
-function loadFile(fileName) {
+// Load a file
+function loadFile(fileName, isJson=false) {
     var file = fs.readFileSync(fileName);
-    return new Uint8Array(file).buffer;
+    return isJson ? JSON.parse(file) : new Uint8Array(file).buffer;
 }
 
-// Download a file, returning a buffer
-function downloadFile(url) {
+// Download a file
+function downloadFile(url, isJson=false) {
     return new Promise((resolve, reject) => {
         console.log("Downloading file...");
         var scheme = (url.indexOf("https") === 0) ? https : http;
@@ -67,7 +67,12 @@ function downloadFile(url) {
                 if (response.statusCode !== 200) return reject(response.statusMessage);
 
                 var download = Buffer.concat(data);
-                resolve(new Uint8Array(download).buffer);
+                if (isJson) {
+                    resolve(JSON.parse(data));
+                }
+                else {
+                    resolve(new Uint8Array(download).buffer);
+                }
             });
         })
         .on("error", error => {
@@ -110,9 +115,17 @@ function getTarget(device) {
     return hid.open()
     .then(() => {
         console.log("Device opened");
-
+        // Load flashing algorithms
+        var flashAlgorithmsFile = "flash_targets/flash_targets.json";
+        if (flashAlgorithmsFile.indexOf("http") === 0) return downloadFile(flashAlgorithmsFile, true);
+        return loadFile(flashAlgorithmsFile, true);
+    })
+    .then((flashAlgorithms) => {
+        console.log("Flash algorithms loaded");
         var dapDevice = new DAPjs.DAP(hid);
-        target = new DAPjs.FlashTarget(dapDevice, DAPjs.FlashTargets.get(deviceCode));
+        var flashAlgorithm = new DAPjs.FlashAlgorithm(flashAlgorithms, deviceCode);
+        if (!flashAlgorithm.flashAlgo) throw new Error("Flash algorithm not found for this board.");
+        target = new DAPjs.FlashTarget(dapDevice, flashAlgorithm);
         return target.init();
     })
     .then(() => {
@@ -123,6 +136,10 @@ function getTarget(device) {
         console.log("Target halted");
         return target;
     })
+    .catch(error => {
+        console.log(error.message || error);
+        process.exit();
+    });
 }
 
 // Update device using image buffer

examples/web.html

@@ -261,27 +261,37 @@
                 log("Device opened.");
 
                 this.dapDevice = new DAPjs.DAP(this.hid);
-                this.serial = new DAPjs.Serial(dapDevice);
-                this.target = new DAPjs.FlashTarget(this.dapDevice, DAPjs.FlashTargets.get(this.deviceCode));
 
-                log("Initialising device.");
+                const xhr = new XMLHttpRequest();
+                xhr.responseType = "json";
+                xhr.open("GET", "../flash_targets/flash_targets.json", true);
+                xhr.onload = async (e) => {
+                    if (xhr.status !== 200) return log(xhr.statusText);
 
-                await this.target.init();
+                    let flashAlgorithm = new DAPjs.FlashAlgorithm(xhr.response, this.deviceCode);
+                    if (!flashAlgorithm.flashAlgo) return log("No flashing algorithm can be found for this board.");
 
-                log("Halting target.");
-                await this.target.halt();
-                log("Target halted.");
+                    this.serial = new DAPjs.Serial(dapDevice);
+                    this.target = new DAPjs.FlashTarget(this.dapDevice, flashAlgorithm);
 
-                const [imp, isa, type] = await this.target.readCoreType();
-                log(`Connected to an ARM ${DAPjs.CoreNames.get(type)} (${DAPjs.ISANames.get(isa)})`);
+                    log("Initialising device.");
+                    await this.target.init();
 
-                document.getElementById("connect").disabled = true;
+                    log("Halting target.");
+                    await this.target.halt();
+                    log("Target halted.");
 
-                const elements = Array.from(document.querySelectorAll(".when-connected"));
+                    const [imp, isa, type] = await this.target.readCoreType();
+                    log(`Connected to an ARM ${DAPjs.CoreNames.get(type)} (${DAPjs.ISANames.get(isa)})`);
+                    document.getElementById("connect").disabled = true;
 
-                for (const elem of elements) {
-                    elem.disabled = false;
-                }
+                    const elements = Array.from(document.querySelectorAll(".when-connected"));
+
+                    for (const elem of elements) {
+                        elem.disabled = false;
+                    }
+                };
+                xhr.send();
             }
 
             async function halt() {