From 03450d44b45679ae43f0ac2e0f033f0e8ddedebd Mon Sep 17 00:00:00 2001
From: Michael Dietz <mjdietzx@gmail.com>
Date: Fri, 26 Feb 2016 11:09:48 +0100
Subject: [PATCH 1/4] Add CRC module to calculate crc 16 for image validation.

---
 dist/crc16.js | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)
 create mode 100644 dist/crc16.js

diff --git a/dist/crc16.js b/dist/crc16.js
new file mode 100644
index 0000000..d1514b2
--- /dev/null
+++ b/dist/crc16.js
@@ -0,0 +1,65 @@
+/* @license
+ *
+ * CRC-CCITT (0xFFFF) library.
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2016
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+ // https://github.com/umdjs/umd
+(function(global, factory) {
+
+    if (typeof exports === 'object') {
+        // CommonJS (Node)
+        module.exports = factory();
+    } else if (typeof define === 'function' && define.amd) {
+        // AMD
+        define(factory);
+    } else {
+        // Browser global (with support for web workers)
+        global.crc16 = factory();
+    }
+
+}(this, function() {
+    'use strict';
+
+    /**
+     * Copied from Nordic's command line tool nrf.exe.
+     * https://github.com/NordicSemiconductor/pc-nrfutil/blob/master/nordicsemi/dfu/crc16.py
+     */
+    return function (binaryData) {
+        var crc = 0xFFFF;
+        var view = new Uint8Array(binaryData);
+        
+        var i;
+        
+        for (i = 0; i < view.byteLength; i++) {
+            crc = (crc >> 8 & 0x00FF) | (crc << 8 & 0xFF00);
+            crc ^= view[i];
+            crc ^= (crc & 0x00FF) >> 4;
+            crc ^= (crc << 8) << 4;
+            crc ^= ((crc & 0x00FF) << 4) << 1;
+        }
+        
+        return (crc & 0xFFFF);
+    };
+}));

From c551b074f3a68ddc2e00d2920e2c489e543b2fbf Mon Sep 17 00:00:00 2001
From: Michael Dietz <mjdietzx@gmail.com>
Date: Fri, 26 Feb 2016 11:17:03 +0100
Subject: [PATCH 2/4] Use the CRC we generate for the image in the init packet.

---
 dist/dfu.js      | 3 ++-
 example_node.js  | 4 +++-
 example_web.html | 4 +++-
 index.js         | 4 +++-
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/dist/dfu.js b/dist/dfu.js
index 47a706d..45f827d 100644
--- a/dist/dfu.js
+++ b/dist/dfu.js
@@ -162,10 +162,11 @@
         return view;
     }
 
-    function provision(device, arrayBuffer, imageType) {
+    function provision(device, arrayBuffer, imageType, crc) {
         return new Promise(function(resolve, reject) {
             var versionChar = null;
             imageType = imageType || ImageType.Application;
+            initPacket.crc = crc;
 
             connect(device)
             .then(function(chars) {
diff --git a/example_node.js b/example_node.js
index 7bc7f72..ab43162 100644
--- a/example_node.js
+++ b/example_node.js
@@ -1,5 +1,6 @@
 var dfu = require('./index').dfu;
 var hex2bin = require('./index').hex2bin;
+var crc16 = require('./index').crc16;
 var fs = require('fs');
 
 var log = console.log;
@@ -40,8 +41,9 @@ dfu.findDevice({ services: [0x180D] })
     var hex = file.toString();
     var buffer = hex2bin(hex);
     log("file length: " + buffer.byteLength);
+    var crc = crc16(buffer);
 
-    return dfu.provision(device, buffer);
+    return dfu.provision(device, buffer, 4, crc);
 })
 .then(() => process.exit())
 .catch(error => {
diff --git a/example_web.html b/example_web.html
index 1020141..f8347b4 100644
--- a/example_web.html
+++ b/example_web.html
@@ -27,6 +27,7 @@
 
     <script src="dist/dfu.js"></script>
     <script src="dist/hex2bin.js"></script>
+    <script src="dist/crc16.js"></script>
 
     <script>
         var resultsEl = document.getElementById("results");
@@ -68,8 +69,9 @@
                 .then(hex => {
                     var buffer = hex2bin(hex);
                     log("downloaded length: " + buffer.byteLength);
+                    var crc = crc16(buffer);
 
-                    return dfu.provision(device, buffer);
+                    return dfu.provision(device, buffer, 4, crc);
                 })
                 .then(() => {
                     log('dfu complete');
diff --git a/index.js b/index.js
index dcd4750..a7c72f0 100644
--- a/index.js
+++ b/index.js
@@ -2,8 +2,10 @@ require('bleat');
 
 var dfu = require('./dist/dfu');
 var hex2bin = require('./dist/hex2bin');
+var crc16 = require('./dist/crc16');
 
 module.exports = {
     dfu: dfu,
-    hex2bin: hex2bin
+    hex2bin: hex2bin,
+    crc16: crc16
 };
\ No newline at end of file

From 423fbf07a27f6a22b40b01eb44cd8a51a2267d5b Mon Sep 17 00:00:00 2001
From: Michael Dietz <mjdietzx@gmail.com>
Date: Fri, 26 Feb 2016 11:42:42 +0100
Subject: [PATCH 3/4] CRC is not required for mbed. Really shouldn't be seen by
 user.

---
 dist/crc16.js | 1 +
 dist/dfu.js   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/dist/crc16.js b/dist/crc16.js
index d1514b2..017627d 100644
--- a/dist/crc16.js
+++ b/dist/crc16.js
@@ -45,6 +45,7 @@
     /**
      * Copied from Nordic's command line tool nrf.exe.
      * https://github.com/NordicSemiconductor/pc-nrfutil/blob/master/nordicsemi/dfu/crc16.py
+     * CRC-CCITT (0xFFFF).
      */
     return function (binaryData) {
         var crc = 0xFFFF;
diff --git a/dist/dfu.js b/dist/dfu.js
index 45f827d..28ce01f 100644
--- a/dist/dfu.js
+++ b/dist/dfu.js
@@ -166,7 +166,7 @@
         return new Promise(function(resolve, reject) {
             var versionChar = null;
             imageType = imageType || ImageType.Application;
-            initPacket.crc = crc;
+            initPacket.crc = crc || 0xFFFF; // Not used in mbed/ older bootloader revisions.
 
             connect(device)
             .then(function(chars) {

From 3829145e51989710238d02bb79080a84d81a4b00 Mon Sep 17 00:00:00 2001
From: Michael Dietz <mjdietzx@gmail.com>
Date: Fri, 26 Feb 2016 15:35:27 +0100
Subject: [PATCH 4/4] Change order of parameters of provision().

---
 dist/dfu.js      | 4 ++--
 example_node.js  | 2 +-
 example_web.html | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dist/dfu.js b/dist/dfu.js
index 28ce01f..a490392 100644
--- a/dist/dfu.js
+++ b/dist/dfu.js
@@ -162,11 +162,11 @@
         return view;
     }
 
-    function provision(device, arrayBuffer, imageType, crc) {
+    function provision(device, arrayBuffer, crc, imageType) {
         return new Promise(function(resolve, reject) {
             var versionChar = null;
-            imageType = imageType || ImageType.Application;
             initPacket.crc = crc || 0xFFFF; // Not used in mbed/ older bootloader revisions.
+            imageType = imageType || ImageType.Application;
 
             connect(device)
             .then(function(chars) {
diff --git a/example_node.js b/example_node.js
index ab43162..8568252 100644
--- a/example_node.js
+++ b/example_node.js
@@ -43,7 +43,7 @@ dfu.findDevice({ services: [0x180D] })
     log("file length: " + buffer.byteLength);
     var crc = crc16(buffer);
 
-    return dfu.provision(device, buffer, 4, crc);
+    return dfu.provision(device, buffer, crc);
 })
 .then(() => process.exit())
 .catch(error => {
diff --git a/example_web.html b/example_web.html
index f8347b4..d5a82fd 100644
--- a/example_web.html
+++ b/example_web.html
@@ -71,7 +71,7 @@
                     log("downloaded length: " + buffer.byteLength);
                     var crc = crc16(buffer);
 
-                    return dfu.provision(device, buffer, 4, crc);
+                    return dfu.provision(device, buffer, crc); // dfu.ImageType.Application is the default value for the fourth parameter. Specify this if you want to upload a softdevice/bootloader.
                 })
                 .then(() => {
                     log('dfu complete');