Merge remote-tracking branch 'origin/build-id-hotfix' into development

Author: lkasso

lib/metawear.js

@@ -298,11 +298,15 @@ function onDisconnect(context, caller, handler) {
 }
 
 MetaWear.prototype.updateFirmwareToRev = function (rev, callback) {
+  this.updateFirmwareToRevAndFlavor(rev, 'vanilla', callback);
+}
+
+MetaWear.prototype.updateFirmwareToRevAndFlavor = function (rev, flavor, callback) {
   var sanitaizedCallback = (typeof callback === 'function') ? callback : function () { };
   // Helper block to do the update
   var doUpdate = function () {
     debug('updating...');
-    findAndPerformDfu.call(this, rev, function (error) {
+    findAndPerformDfu.call(this, rev, flavor, function (error) {
       debug('metaboot updateFirmware: ' + error);
       sanitaizedCallback(error);
     });
@@ -317,7 +321,8 @@ MetaWear.prototype.updateFirmwareToRev = function (rev, callback) {
         sanitaizedCallback(error);
         return;
       }
-      if (firmwareRev === rev) {
+      var currentFlavor = MetaWear.mbl_mw_settings_get_firware_build_id(this.board).toString();
+      if ((firmwareRev === rev) && (currentFlavor === flavor)) {
         sanitaizedCallback(null);
         return;
       }
@@ -370,7 +375,7 @@ MetaWear.prototype.updateFirmwareWithUrl = function (url, callback) {
   }.bind(this));
 };
 
-function findAndPerformDfu(firmwareRev, callback) {
+function findAndPerformDfu(firmwareRev, flavor, callback) {
   this.readModelNumber(function (error, modelNumber) {
     if (error) {
       console.error(error);
@@ -386,12 +391,12 @@ function findAndPerformDfu(firmwareRev, callback) {
       }
       debug('hardwareRev: ' + hardwareRev);
       // Use the zip firmware if it exists
-      var url = firmwareUrl(hardwareRev, modelNumber, firmwareRev, 'firmware.zip');
+      var url = firmwareUrl(hardwareRev, modelNumber, flavor, firmwareRev, 'firmware.zip');
       urlExists(url, function (err, exists) {
         if (exists) {
           this.updateFirmwareWithUrl(url, callback);
         } else {
-          url = firmwareUrl(hardwareRev, modelNumber, firmwareRev, 'firmware.bin');
+          url = firmwareUrl(hardwareRev, modelNumber, flavor, firmwareRev, 'firmware.bin');
           urlExists(url, function (err, exists) {
             if (exists) {
               this.updateFirmwareWithUrl(url, callback);
@@ -405,8 +410,8 @@ function findAndPerformDfu(firmwareRev, callback) {
   }.bind(this));
 }
 
-function firmwareUrl(hardwareRev, modelNumber, firmwareRev, filename) {
-  return "https://mbientlab.com/releases/metawear/" + hardwareRev + "/" + modelNumber + "/vanilla/" + firmwareRev + "/" + filename;
+function firmwareUrl(hardwareRev, modelNumber, flavor, firmwareRev, filename) {
+  return "https://mbientlab.com/releases/metawear/" + hardwareRev + "/" + modelNumber + "/" + flavor + "/" + firmwareRev + "/" + filename;
 }
 
 function download(url, dest, cb) {