diff --git a/_locales/en/messages.json b/_locales/en/messages.json index 51114e7d..8c14b6d2 100755 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -205,7 +205,7 @@ "message": "Optional USB Permissions" }, "default_optional_permissions_text": { - "message": "Due to addition of Naze32PRO to the supported hardware family, Configurator requires USB access to allow firmware flashing via DFU" + "message": "To allow flashing some newer flight controllers, Configurator requires USB access" }, "default_request_optional_permissions": { "message": "Request Optional Permissions" @@ -1192,4 +1192,4 @@ "controlAxisAux8": { "message": "AUX 8" } -} \ No newline at end of file +} diff --git a/js/protocols/stm32usbdfu.js b/js/protocols/stm32usbdfu.js index 90c60ad0..c17963db 100644 --- a/js/protocols/stm32usbdfu.js +++ b/js/protocols/stm32usbdfu.js @@ -296,9 +296,6 @@ STM32DFU_protocol.prototype.upload_procedure = function (step) { var bytes_flashed_total = 0; // used for progress bar var wBlockNum = 2; // required by DFU - // start - self.loadAddress(address, write); - var write = function () { if (bytes_flashed < self.hex.data[flashing_block].bytes) { var bytes_to_write = ((bytes_flashed + 2048) <= self.hex.data[flashing_block].bytes) ? 2048 : (self.hex.data[flashing_block].bytes - bytes_flashed); @@ -353,6 +350,10 @@ STM32DFU_protocol.prototype.upload_procedure = function (step) { } } } + + // start + self.loadAddress(address, write); + break; case 5: // verify diff --git a/tabs/landing.js b/tabs/landing.js index 9845c0e0..7f1b118d 100644 --- a/tabs/landing.js +++ b/tabs/landing.js @@ -10,7 +10,7 @@ TABS.landing.initialize = function (callback) { } $('#content').load("./tabs/landing.html", function () { - //check_usb_permissions(); // temporary enabled in dev branch, should be commented out untill DFU support goes live + check_usb_permissions(); // check for permissions require for USB DFU support // translate to user-selected language localize();